mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-01-19 18:44:45 +00:00
Mine Kill Restoration (#1203)
* restored experience awarded from mine kills; removed situations where mine damage no longer works * Update ZoningOperations.scala Rearranging order and priority of conditions
This commit is contained in:
parent
cacb9ad18a
commit
306e2a63c0
|
|
@ -3073,23 +3073,24 @@ class ZoningOperations(
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (!setAvatar && tplayer.spectator) {
|
setAvatar = true
|
||||||
context.self ! SessionActor.SetMode(SpectatorMode) //should reload spectator status
|
player.allowInteraction = true
|
||||||
|
upstreamMessageCount = 0
|
||||||
|
if (tplayer.spectator) {
|
||||||
|
if (!setAvatar) {
|
||||||
|
context.self ! SessionActor.SetMode(SpectatorMode) //should reload spectator status
|
||||||
|
}
|
||||||
|
} else if (
|
||||||
|
!account.gm && /* gm's are excluded */
|
||||||
|
Config.app.game.promotion.active && /* play versus progress system must be active */
|
||||||
|
BattleRank.withExperience(tplayer.avatar.bep).value <= Config.app.game.promotion.broadcastBattleRank && /* must be below a certain battle rank */
|
||||||
|
tavatar.scorecard.Lives.isEmpty && /* first life after login */
|
||||||
|
tavatar.scorecard.CurrentLife.prior.isEmpty && /* no revives */
|
||||||
|
tplayer.History.size == 1 /* did nothing but come into existence */
|
||||||
|
) {
|
||||||
|
ZoningOperations.reportProgressionSystem(context.self)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
upstreamMessageCount = 0
|
|
||||||
player.allowInteraction = true
|
|
||||||
setAvatar = true
|
|
||||||
if (
|
|
||||||
!account.gm && /* gm's are excluded */
|
|
||||||
Config.app.game.promotion.active && /* play versus progress system must be active */
|
|
||||||
BattleRank.withExperience(tplayer.avatar.bep).value <= Config.app.game.promotion.broadcastBattleRank && /* must be below a certain battle rank */
|
|
||||||
tavatar.scorecard.Lives.isEmpty && /* first life after login */
|
|
||||||
tavatar.scorecard.CurrentLife.prior.isEmpty && /* no revives */
|
|
||||||
tplayer.History.size == 1 /* did nothing but come into existence */
|
|
||||||
) {
|
|
||||||
ZoningOperations.reportProgressionSystem(context.self)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue