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

Fixed error when the Compiler tries to convert some pbTrainerBattle code to TrainerBattle.start

Browse Source
This commit is contained in:
Maruno17
2022-05-24 18:56:33 +01:00
parent eab69f213a
commit ebf83649ec
1 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -908,12 +908,33 @@ module Compiler
return ret return ret
end end
# Splits the given code string into an array of parameters (all strings),
# using "," as the delimiter. It will not split in the middle of a string
# parameter. Used to extract parameters from a script call in an event.
def split_string_with_quotes(str)
ret = []
new_str = ""
in_msg = false
str.scan(/./) do |s|
if s == "," && !in_msg
ret.push(new_str.strip)
new_str = ""
else
in_msg = !in_msg if s == "\""
new_str += s
end
end
new_str.strip!
ret.push(new_str) if !new_str.empty?
return ret
end
def replace_old_battle_scripts(event, list, index) def replace_old_battle_scripts(event, list, index)
changed = false changed = false
script = list[index].parameters[1] script = list[index].parameters[1]
if script[/^\s*pbWildBattle\((.+)\)\s*$/] if script[/^\s*pbWildBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = split_string_with_quotes($1) # Split on commas
list[index].parameters[1] = sprintf("WildBattle.start(#{battle_params[0].strip}, #{battle_params[1].strip})") list[index].parameters[1] = sprintf("WildBattle.start(#{battle_params[0]}, #{battle_params[1]})")
old_indent = list[index].indent old_indent = list[index].indent
new_events = [] new_events = []
if battle_params[3] && battle_params[3][/false/] if battle_params[3] && battle_params[3][/false/]
@@ -922,15 +943,15 @@ module Compiler
if battle_params[4] && battle_params[4][/true/] if battle_params[4] && battle_params[4][/true/]
push_script(new_events, "setBattleRule(\"canLose\")", old_indent) push_script(new_events, "setBattleRule(\"canLose\")", old_indent)
end end
if battle_params[2] && battle_params[2].strip != "1" if battle_params[2] && battle_params[2] != "1"
push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[2].strip})", old_indent) push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[2]})", old_indent)
end end
list[index, 0] = new_events if new_events.length > 0 list[index, 0] = new_events if new_events.length > 0
changed = true changed = true
elsif script[/^\s*pbDoubleWildBattle\((.+)\)\s*$/] elsif script[/^\s*pbDoubleWildBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = split_string_with_quotes($1) # Split on commas
pkmn1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" pkmn1 = "#{battle_params[0]}, #{battle_params[1]}"
pkmn2 = "#{battle_params[2].strip}, #{battle_params[3].strip}" pkmn2 = "#{battle_params[2]}, #{battle_params[3]}"
list[index].parameters[1] = sprintf("WildBattle.start(#{pkmn1}, #{pkmn2})") list[index].parameters[1] = sprintf("WildBattle.start(#{pkmn1}, #{pkmn2})")
old_indent = list[index].indent old_indent = list[index].indent
new_events = [] new_events = []
@@ -940,16 +961,16 @@ module Compiler
if battle_params[4] && battle_params[6][/true/] if battle_params[4] && battle_params[6][/true/]
push_script(new_events, "setBattleRule(\"canLose\")", old_indent) push_script(new_events, "setBattleRule(\"canLose\")", old_indent)
end end
if battle_params[2] && battle_params[4].strip != "1" if battle_params[2] && battle_params[4] != "1"
push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[4].strip})", old_indent) push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[4]})", old_indent)
end end
list[index, 0] = new_events if new_events.length > 0 list[index, 0] = new_events if new_events.length > 0
changed = true changed = true
elsif script[/^\s*pbTripleWildBattle\((.+)\)\s*$/] elsif script[/^\s*pbTripleWildBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = split_string_with_quotes($1) # Split on commas
pkmn1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" pkmn1 = "#{battle_params[0]}, #{battle_params[1]}"
pkmn2 = "#{battle_params[2].strip}, #{battle_params[3].strip}" pkmn2 = "#{battle_params[2]}, #{battle_params[3]}"
pkmn3 = "#{battle_params[4].strip}, #{battle_params[5].strip}" pkmn3 = "#{battle_params[4]}, #{battle_params[5]}"
list[index].parameters[1] = sprintf("WildBattle.start(#{pkmn1}, #{pkmn2}, #{pkmn3})") list[index].parameters[1] = sprintf("WildBattle.start(#{pkmn1}, #{pkmn2}, #{pkmn3})")
old_indent = list[index].indent old_indent = list[index].indent
new_events = [] new_events = []
@@ -959,22 +980,26 @@ module Compiler
if battle_params[4] && battle_params[8][/true/] if battle_params[4] && battle_params[8][/true/]
push_script(new_events, "setBattleRule(\"canLose\")", old_indent) push_script(new_events, "setBattleRule(\"canLose\")", old_indent)
end end
if battle_params[2] && battle_params[6].strip != "1" if battle_params[2] && battle_params[6] != "1"
push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[6].strip})", old_indent) push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[6]})", old_indent)
end end
list[index, 0] = new_events if new_events.length > 0 list[index, 0] = new_events if new_events.length > 0
changed = true changed = true
elsif script[/^\s*pbTrainerBattle\((.+)\)\s*$/] elsif script[/^\s*pbTrainerBattle\((.+)\)\s*$/]
battle_params = $1.split(",") echoln ""
trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" echoln $1
trainer1 += ", #{battle_params[4].strip}" if battle_params[4] && battle_params[4].strip != "nil" battle_params = split_string_with_quotes($1) # Split on commas
echoln battle_params
trainer1 = "#{battle_params[0]}, #{battle_params[1]}"
trainer1 += ", #{battle_params[4]}" if battle_params[4] && battle_params[4] != "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 = []
if battle_params[2] && !battle_params[2].strip.empty? && battle_params[2].strip != "nil" if battle_params[2] && !battle_params[2].empty? && battle_params[2] != "nil"
speech = battle_params[2].gsub(/^\s*_I\(\s*"\s*/, "") echoln battle_params[2]
speech.gsub!(/\"\s*\)\s*$/, "").strip speech = battle_params[2].gsub(/^\s*_I\(\s*"\s*/, "").gsub(/\"\s*\)\s*$/, "")
push_comment(new_events, "EndSpeech: #{speech}", old_indent) echoln speech
push_comment(new_events, "EndSpeech: #{speech.strip}", old_indent)
end end
if battle_params[3] && battle_params[3][/true/] if battle_params[3] && battle_params[3][/true/]
push_script(new_events, "setBattleRule(\"double\")", old_indent) push_script(new_events, "setBattleRule(\"double\")", old_indent)
@@ -982,69 +1007,64 @@ module Compiler
if battle_params[5] && battle_params[5][/true/] if battle_params[5] && battle_params[5][/true/]
push_script(new_events, "setBattleRule(\"canLose\")", old_indent) push_script(new_events, "setBattleRule(\"canLose\")", old_indent)
end end
if battle_params[6] && battle_params[6].strip != "1" if battle_params[6] && battle_params[6] != "1"
push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[6].strip})", old_indent) push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[6]})", old_indent)
end end
list[index, 0] = new_events if new_events.length > 0 list[index, 0] = new_events if new_events.length > 0
changed = true changed = true
elsif script[/^\s*pbDoubleTrainerBattle\((.+)\)\s*$/] elsif script[/^\s*pbDoubleTrainerBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = split_string_with_quotes($1) # Split on commas
trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" trainer1 = "#{battle_params[0]}, #{battle_params[1]}"
trainer1 += ", #{battle_params[2].strip}" if battle_params[2] && battle_params[2].strip != "nil" trainer1 += ", #{battle_params[2]}" if battle_params[2] && battle_params[2] != "nil"
trainer2 = "#{battle_params[4].strip}, #{battle_params[5].strip}" trainer2 = "#{battle_params[4]}, #{battle_params[5]}"
trainer2 += ", #{battle_params[6].strip}" if battle_params[6] && battle_params[6].strip != "nil" trainer2 += ", #{battle_params[6]}" if battle_params[6] && battle_params[6] != "nil"
list[index].parameters[1] = "TrainerBattle.start(#{trainer1}, #{trainer2})" list[index].parameters[1] = "TrainerBattle.start(#{trainer1}, #{trainer2})"
old_indent = list[index].indent old_indent = list[index].indent
new_events = [] new_events = []
if battle_params[3] && !battle_params[3].strip.empty? && battle_params[3].strip != "nil" if battle_params[3] && !battle_params[3].empty? && battle_params[3] != "nil"
speech = battle_params[3].gsub(/^\s*_I\(\s*"\s*/, "") speech = battle_params[3].gsub(/^\s*_I\(\s*"\s*/, "").gsub(/\"\s*\)\s*$/, "")
speech.gsub!(/\"\s*\)\s*$/, "").strip push_comment(new_events, "EndSpeech1: #{speech.strip}", old_indent)
push_comment(new_events, "EndSpeech1: #{speech}", old_indent)
end end
if battle_params[7] && !battle_params[7].strip.empty? && battle_params[7].strip != "nil" if battle_params[7] && !battle_params[7].empty? && battle_params[7] != "nil"
speech = battle_params[7].gsub(/^\s*_I\(\s*"\s*/, "") speech = battle_params[7].gsub(/^\s*_I\(\s*"\s*/, "").gsub(/\"\s*\)\s*$/, "")
speech.gsub!(/\"\s*\)\s*$/, "").strip push_comment(new_events, "EndSpeech2: #{speech.strip}", old_indent)
push_comment(new_events, "EndSpeech2: #{speech}", old_indent)
end end
if battle_params[8] && battle_params[8][/true/] if battle_params[8] && battle_params[8][/true/]
push_script(new_events, "setBattleRule(\"canLose\")", old_indent) push_script(new_events, "setBattleRule(\"canLose\")", old_indent)
end end
if battle_params[9] && battle_params[9].strip != "1" if battle_params[9] && battle_params[9] != "1"
push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[9].strip})", old_indent) push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[9]})", old_indent)
end end
list[index, 0] = new_events if new_events.length > 0 list[index, 0] = new_events if new_events.length > 0
changed = true changed = true
elsif script[/^\s*pbTripleTrainerBattle\((.+)\)\s*$/] elsif script[/^\s*pbTripleTrainerBattle\((.+)\)\s*$/]
battle_params = $1.split(",") battle_params = split_string_with_quotes($1) # Split on commas
trainer1 = "#{battle_params[0].strip}, #{battle_params[1].strip}" trainer1 = "#{battle_params[0]}, #{battle_params[1]}"
trainer1 += ", #{battle_params[2].strip}" if battle_params[2] && battle_params[2].strip != "nil" trainer1 += ", #{battle_params[2]}" if battle_params[2] && battle_params[2] != "nil"
trainer2 = "#{battle_params[4].strip}, #{battle_params[5].strip}" trainer2 = "#{battle_params[4]}, #{battle_params[5]}"
trainer2 += ", #{battle_params[6].strip}" if battle_params[6] && battle_params[6].strip != "nil" trainer2 += ", #{battle_params[6]}" if battle_params[6] && battle_params[6] != "nil"
trainer3 = "#{battle_params[8].strip}, #{battle_params[9].strip}" trainer3 = "#{battle_params[8]}, #{battle_params[9]}"
trainer3 += ", #{battle_params[10].strip}" if battle_params[10] && battle_params[10].strip != "nil" trainer3 += ", #{battle_params[10]}" if battle_params[10] && battle_params[10] != "nil"
list[index].parameters[1] = "TrainerBattle.start(#{trainer1}, #{trainer2}, #{trainer3})" list[index].parameters[1] = "TrainerBattle.start(#{trainer1}, #{trainer2}, #{trainer3})"
old_indent = list[index].indent old_indent = list[index].indent
new_events = [] new_events = []
if battle_params[3] && !battle_params[3].strip.empty? && battle_params[3].strip != "nil" if battle_params[3] && !battle_params[3].empty? && battle_params[3] != "nil"
speech = battle_params[3].gsub(/^\s*_I\(\s*"\s*/, "") speech = battle_params[3].gsub(/^\s*_I\(\s*"\s*/, "").gsub(/\"\s*\)\s*$/, "")
speech.gsub!(/\"\s*\)\s*$/, "").strip push_comment(new_events, "EndSpeech1: #{speech.strip}", old_indent)
push_comment(new_events, "EndSpeech1: #{speech}", old_indent)
end end
if battle_params[7] && !battle_params[7].strip.empty? && battle_params[7].strip != "nil" if battle_params[7] && !battle_params[7].empty? && battle_params[7] != "nil"
speech = battle_params[7].gsub(/^\s*_I\(\s*"\s*/, "") speech = battle_params[7].gsub(/^\s*_I\(\s*"\s*/, "").gsub(/\"\s*\)\s*$/, "")
speech.gsub!(/\"\s*\)\s*$/, "").strip push_comment(new_events, "EndSpeech2: #{speech.strip}", old_indent)
push_comment(new_events, "EndSpeech2: #{speech}", old_indent)
end end
if battle_params[7] && !battle_params[7].strip.empty? && battle_params[11].strip != "nil" if battle_params[7] && !battle_params[7].empty? && battle_params[11] != "nil"
speech = battle_params[11].gsub(/^\s*_I\(\s*"\s*/, "") speech = battle_params[11].gsub(/^\s*_I\(\s*"\s*/, "").gsub(/\"\s*\)\s*$/, "")
speech.gsub!(/\"\s*\)\s*$/, "").strip push_comment(new_events, "EndSpeech3: #{speech.strip}", old_indent)
push_comment(new_events, "EndSpeech3: #{speech}", old_indent)
end end
if battle_params[12] && battle_params[12][/true/] if battle_params[12] && battle_params[12][/true/]
push_script(new_events, "setBattleRule(\"canLose\")", old_indent) push_script(new_events, "setBattleRule(\"canLose\")", old_indent)
end end
if battle_params[13] && battle_params[13].strip != "1" if battle_params[13] && battle_params[13] != "1"
push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[13].strip})", old_indent) push_script(new_events, "setBattleRule(\"outcome\", #{battle_params[13]})", old_indent)
end end
list[index, 0] = new_events if new_events.length > 0 list[index, 0] = new_events if new_events.length > 0
changed = true changed = true