Skip to content

Commit

Permalink
Mine Kill Restoration (#1203)
Browse files Browse the repository at this point in the history
* restored experience awarded from mine kills; removed situations where mine damage no longer works

* Update ZoningOperations.scala

Rearranging order and priority of conditions
  • Loading branch information
Fate-JH authored May 17, 2024
1 parent cacb9ad commit 306e2a6
Showing 1 changed file with 16 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3073,23 +3073,24 @@ class ZoningOperations(
}
})
}
if (!setAvatar && tplayer.spectator) {
context.self ! SessionActor.SetMode(SpectatorMode) //should reload spectator status
setAvatar = true
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)
}
}

/**
Expand Down

0 comments on commit 306e2a6

Please sign in to comment.