Added speed order viewer in battle debug menu, Pokemon#foreign? now defaults to comparing to the player

This commit is contained in:
Maruno17
2021-12-07 23:28:14 +00:00
parent 6b841b78d3
commit 514ef510f1
2 changed files with 23 additions and 2 deletions

View File

@@ -828,9 +828,9 @@ class Pokemon
@owner = new_owner @owner = new_owner
end end
# @param trainer [Player, NPCTrainer] the trainer to compare to the original trainer # @param trainer [Player, NPCTrainer, nil] the trainer to compare to the original trainer
# @return [Boolean] whether the given trainer is not this Pokémon's original trainer # @return [Boolean] whether the given trainer is not this Pokémon's original trainer
def foreign?(trainer) def foreign?(trainer = $player)
return @owner.id != trainer.id || @owner.name != trainer.name return @owner.id != trainer.id || @owner.name != trainer.name
end end

View File

@@ -17,6 +17,8 @@ poke_ball_failed - both for Ball Fetch
View party screen for each trainer's team, be able to edit properties of Pokémon View party screen for each trainer's team, be able to edit properties of Pokémon
that aren't in battle. that aren't in battle.
Choose each battler's next action.
=end =end
#=============================================================================== #===============================================================================
@@ -370,3 +372,22 @@ BattleDebugMenuCommands.register("mega_evolution", {
end end
} }
}) })
BattleDebugMenuCommands.register("speed_order", {
"parent" => "main",
"name" => _INTL("Battler Speed Order"),
"description" => _INTL("Show all battlers in order from fastest to slowest."),
"always_show" => true,
"effect" => proc { |battle|
battlers = []
battlers = battle.allBattlers.map { |b| [b, b.pbSpeed] }
battlers.sort! { |a, b| b[1] <=> a[1] }
commands = []
battlers.each do |value|
b = value[0]
commands.push(sprintf("[%d] %s (speed: %d)", b.index, b.pbThis, value[1]))
end
pbMessage("\\ts[]" + _INTL("Battlers are listed from fastest to slowest. Speeds include modifiers."),
commands, -1)
}
})