DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed type-boosting Gems being consumed when they shouldn't, fixed compiler error relating to replacing battle-starting methods

Browse Source
This commit is contained in:
Maruno17
2022-05-19 13:42:21 +01:00
parent e9cd62b8b6
commit 5fb8218098
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Scripts/011_Battle/005_AI/006_AI_Move_Utilities.rb
View File

@@ -390,6 +390,7 @@ class Battle::AI
Battle::ItemEffects.triggerDamageCalcFromUser( Battle::ItemEffects.triggerDamageCalcFromUser(
user.item, user, target, move, multipliers, baseDmg, type user.item, user, target, move, multipliers, baseDmg, type
) )
user.effects[PBEffects::GemConsumed] = nil # Untrigger consuming of Gems
end end
end end
if skill >= PBTrainerAI.bestSkill && if skill >= PBTrainerAI.bestSkill &&

1
Data/Scripts/019_Utilities/001_Utilities.rb
View File

@@ -219,6 +219,7 @@ def pbChangePlayer(id)
meta = GameData::PlayerMetadata.get(id) meta = GameData::PlayerMetadata.get(id)
return false if !meta return false if !meta
$player.character_ID = id $player.character_ID = id
return true
end end
def pbTrainerName(name = nil, outfit = 0) def pbTrainerName(name = nil, outfit = 0)

6
Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb
View File

@@ -964,7 +964,7 @@ module Compiler
elsif script[/^\s*pbTrainerBattle\((.+)\)\s*$/] elsif script[/^\s*pbTrainerBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = $1.split(",")
trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}"
trainer1 += ", #{battle_params[4].strip}" if battle_params[4].strip != "nil" trainer1 += ", #{battle_params[4].strip}" if battle_params[4] && battle_params[4].strip != "nil"
list[index].parameters[1] = "TrainerBattle.start(#{trainer1})" list[index].parameters[1] = "TrainerBattle.start(#{trainer1})"
old_indent = list[index].indent old_indent = list[index].indent
new_events = [] new_events = []
@@ -987,7 +987,7 @@ module Compiler
elsif script[/^\s*pbDoubleTrainerBattle\((.+)\)\s*$/] elsif script[/^\s*pbDoubleTrainerBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = $1.split(",")
trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}"
trainer1 += ", #{battle_params[2].strip}" if battle_params[2].strip != "nil" trainer1 += ", #{battle_params[2].strip}" if battle_params[2] && battle_params[2].strip != "nil"
trainer2 = "#{battle_params[4].strip}, #{battle_params[5].strip}" trainer2 = "#{battle_params[4].strip}, #{battle_params[5].strip}"
trainer2 += ", #{battle_params[6].strip}" if battle_params[6] && battle_params[6].strip != "nil" trainer2 += ", #{battle_params[6].strip}" if battle_params[6] && battle_params[6].strip != "nil"
list[index].parameters[1] = "TrainerBattle.start(#{trainer1}, #{trainer2})" list[index].parameters[1] = "TrainerBattle.start(#{trainer1}, #{trainer2})"
@@ -1014,7 +1014,7 @@ module Compiler
elsif script[/^\s*pbTripleTrainerBattle\((.+)\)\s*$/] elsif script[/^\s*pbTripleTrainerBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = $1.split(",")
trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}"
trainer1 += ", #{battle_params[2].strip}" if battle_params[2].strip != "nil" trainer1 += ", #{battle_params[2].strip}" if battle_params[2] && battle_params[2].strip != "nil"
trainer2 = "#{battle_params[4].strip}, #{battle_params[5].strip}" trainer2 = "#{battle_params[4].strip}, #{battle_params[5].strip}"
trainer2 += ", #{battle_params[6].strip}" if battle_params[6] && battle_params[6].strip != "nil" trainer2 += ", #{battle_params[6].strip}" if battle_params[6] && battle_params[6].strip != "nil"
trainer3 = "#{battle_params[8].strip}, #{battle_params[9].strip}" trainer3 = "#{battle_params[8].strip}, #{battle_params[9].strip}"