DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 22:24:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dynamic shadows not disappearing after a transfer, fixed events not seeing the player at a distance if facing left, fixed crash when starting a battle against two trainers

Browse Source
This commit is contained in:
Maruno17
2021-04-28 23:25:35 +01:00
parent 17d1344e74
commit 1685bbc4d4
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Overworld/001_Overworld.rb
View File

@@ -369,7 +369,7 @@ def pbEventCanReachPlayer?(event, player, distance)
when 2 # Down
real_distance = player.y - event.y - 1
when 4 # Left
real_distance = event.x - player.x + 1
real_distance = event.x - player.x - 1
when 6 # Right
real_distance = player.x - event.x - event.width
when 8 # Up

10
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -368,12 +368,12 @@ def pbTrainerBattleCore(*args)
foePartyStarts = []
for arg in args
raise _INTL("Expected an array of trainer data, got {1}.",arg) if !arg.is_a?(Array)
if arg.is_a?(NPCTrainer)
foeTrainers.push(arg)
if arg[0].is_a?(NPCTrainer)
foeTrainers.push(arg[0])
foePartyStarts.push(foeParty.length)
arg.party.each { |pkmn| foeParty.push(pkmn) }
foeEndSpeeches.push(arg.lose_text)
foeItems.push(arg.items)
arg[0].party.each { |pkmn| foeParty.push(pkmn) }
foeEndSpeeches.push(arg[0].lose_text)
foeItems.push(arg[0].items)
else
# [trainer type, trainer name, ID, speech (optional)]
trainer = pbLoadTrainer(arg[0],arg[1],arg[2])