Merge branch 'pr/43' into refactor

This commit is contained in:
Maruno17
2020-10-17 14:40:52 +01:00
18 changed files with 201 additions and 106 deletions

View File

@@ -667,9 +667,9 @@ module PokemonDebugMixin
when "ownership"
cmd = 0
loop do
gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.otgender]
msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.ot,gender,pkmn.publicID,pkmn.trainerID),
_INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.ot,gender,pkmn.publicID,pkmn.trainerID)
gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.owner.gender]
msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id),
_INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id)
][pkmn.foreign?($Trainer) ? 1 : 0]
cmd = pbShowCommands(msg,[
_INTL("Make player's"),
@@ -680,25 +680,23 @@ module PokemonDebugMixin
break if cmd<0
case cmd
when 0 # Make player's
pkmn.trainerID = $Trainer.id
pkmn.ot = $Trainer.name
pkmn.otgender = $Trainer.gender
pkmn.owner = Pokemon::Owner.new_from_trainer($Trainer)
when 1 # Set OT's name
pkmn.ot = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE)
pkmn.owner.name = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE)
when 2 # Set OT's gender
cmd2 = pbShowCommands(_INTL("Set OT's gender."),
[_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.otgender)
pkmn.otgender = cmd2 if cmd2>=0
[_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.owner.gender)
pkmn.owner.gender = cmd2 if cmd2>=0
when 3 # Random foreign ID
pkmn.trainerID = $Trainer.getForeignID
pkmn.owner.id = $Trainer.getForeignID
when 4 # Set foreign ID
params = ChooseNumberParams.new
params.setRange(0,65535)
params.setDefaultValue(pkmn.publicID)
params.setDefaultValue(pkmn.owner.public_id)
val = pbMessageChooseNumber(
_INTL("Set the new ID (max. 65535)."),params) { pbUpdate }
pkmn.trainerID = val
pkmn.trainerID |= val << 16
pkmn.owner.id = val
pkmn.owner.id |= val << 16
end
end
#===========================================================================