mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-10 06:34:59 +00:00
Bugfixes and small additions (#109)
* Add a converter for Player charsets in metadara * Fixed Sprite position editor not working with new shadow filenames. Also added check for custom shadows * Fixed pbTrainerBattleCore not working with NPC Trainer argument * Fixed typo which caused crash with old trainers.txt format * Fixed reference to non-existent variable which crashed the trainertype editor
This commit is contained in:
@@ -368,11 +368,11 @@ def pbTrainerBattleCore(*args)
|
||||
foePartyStarts = []
|
||||
for arg in args
|
||||
if arg.is_a?(NPCTrainer)
|
||||
foeTrainers.push(arg[0])
|
||||
foeTrainers.push(arg)
|
||||
foePartyStarts.push(foeParty.length)
|
||||
arg[0].party.each { |pkmn| foeParty.push(pkmn) }
|
||||
foeEndSpeeches.push(arg[0].lose_text)
|
||||
foeItems.push(arg[0].items)
|
||||
arg.party.each { |pkmn| foeParty.push(pkmn) }
|
||||
foeEndSpeeches.push(arg.lose_text)
|
||||
foeItems.push(arg.items)
|
||||
elsif arg.is_a?(Array) # [trainer type, trainer name, ID, speech (optional)]
|
||||
trainer = pbLoadTrainer(arg[0],arg[1],arg[2])
|
||||
pbMissingTrainer(arg[0],arg[1],arg[2]) if !trainer
|
||||
|
||||
@@ -834,7 +834,7 @@ def pbSweetScent
|
||||
end
|
||||
viewport.dispose
|
||||
enctype = $PokemonEncounters.encounter_type
|
||||
if enctype < 0 || !$PokemonEncounters.encounter_possible_here? ||
|
||||
if enctype || !$PokemonEncounters.encounter_possible_here? ||
|
||||
!pbEncounter(enctype)
|
||||
pbMessage(_INTL("There appears to be nothing here..."))
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user