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

Fixing up merge

Browse Source
This commit is contained in:
Maruno17
2020-10-18 22:08:55 +01:00
parent 3c2b97c21a
commit c4e69d0a2e
4 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,6 @@
module Compiler
module_function
#=============================================================================
# Add new map files to the map tree.
#=============================================================================
@@ -579,7 +581,7 @@ module Compiler
end
push_script(firstpage.list,"setBattleRule(\"double\")") if doublebattle
push_script(firstpage.list,sprintf("setBattleRule(\"backdrop\",\"%s\")",safequote(backdrop))) if backdrop
push_script(firstpage.list,sprintf("setBattleRule(\"outcomeVar\",%d)",outcomeVar)) if outcome>1
push_script(firstpage.list,sprintf("setBattleRule(\"outcomeVar\",%d)",outcome)) if outcome>1
push_script(firstpage.list,"setBattleRule(\"canLose\")") if continue
espeech = (endspeeches[0]) ? sprintf("_I(\"%s\")",safequote2(endspeeches[0])) : "nil"
if battleid>0
@@ -628,7 +630,7 @@ module Compiler
push_text(rematchpage.list,battles[i],1)
push_script(rematchpage.list,"setBattleRule(\"double\")",1) if doublebattle
push_script(rematchpage.list,sprintf("setBattleRule(\"backdrop\",%s)",safequote(backdrop)),1) if backdrop
push_script(rematchpage.list,sprintf("setBattleRule(\"outcomeVar\",%d)",outcomeVar),1) if outcome>1
push_script(rematchpage.list,sprintf("setBattleRule(\"outcomeVar\",%d)",outcome),1) if outcome>1
push_script(rematchpage.list,"setBattleRule(\"canLose\")",1) if continue
espeech = nil
if endspeeches.length>0