Skip to content

Commit

Permalink
Merge pull request #7 from Hector839/patch-1.7
Browse files Browse the repository at this point in the history 
Patch 1.7
  • Loading branch information
@Hector839
Hector839 committed Oct 2, 2022
2 parents 8b5f8ac + ba119d3 commit d601dfb
Show file tree
Hide file tree
Showing 22 changed files with 24,641 additions and 6,175 deletions.
360 changes: 228 additions & 132 deletions addon/scripts/!fight.attack.object.stationTactics.xml
View file

Large diffs are not rendered by default.

2,211 changes: 1,196 additions & 1,015 deletions addon/scripts/!fight.attack.object.xml
View file

Large diffs are not rendered by default.

1,715 changes: 1,715 additions & 0 deletions addon/scripts/Mayhem.BuildStation.xml
View file

Large diffs are not rendered by default.

811 changes: 619 additions & 192 deletions addon/scripts/Mayhem.Conquer.xml
View file

Large diffs are not rendered by default.

1,486 changes: 1,486 additions & 0 deletions addon/scripts/Mayhem.GameCreator.AddOutpostWares.xml
View file

Large diffs are not rendered by default.

7,473 changes: 7,473 additions & 0 deletions addon/scripts/Mayhem.GameCreator.Populate.xml
View file

Large diffs are not rendered by default.

1,680 changes: 1,038 additions & 642 deletions addon/scripts/Mayhem.GameCreator.SpawnXenons.xml
View file

Large diffs are not rendered by default.

676 changes: 401 additions & 275 deletions addon/scripts/Mayhem.IsClaimable.xml
View file

Large diffs are not rendered by default.

346 changes: 209 additions & 137 deletions addon/scripts/Mayhem.Task.OCVInvader.Leader.xml
View file

Large diffs are not rendered by default.

311 changes: 244 additions & 67 deletions addon/scripts/Mayhem.Task.Squadron.Rearguard.xml
View file

Large diffs are not rendered by default.

66 changes: 47 additions & 19 deletions addon/scripts/ZH.CI.End.xml
View file
Expand Up @@ -204,7 +204,7 @@
</line>
<line linenr="023" indent="" />
<line linenr="024" indent="">
<comment>* remove sector variable (claims can expire again)</comment>
<comment>* remove sector variable and claim</comment>
</line>
<line linenr="025" indent="">
<var>$target</var>
Expand Down Expand Up @@ -242,11 +242,29 @@
<text>=</text>
<var>null</var>
</line>
<line linenr="027" indent="" />
<line linenr="028" indent="">
<comment>* remove operation data</comment>
<line linenr="027" indent="" interruptable="@">
<text>=</text>
<text> </text>
<var>[NULL]</var>
<text>-&gt;</text>
<text> </text>
<text>call</text>
<text> </text>
<text>script</text>
<text> </text>
<call>Mayhem.CancelClaim</call>
<text> </text>
<text>:</text>
<text> </text>
<text>sector</text>
<text>=</text>
<var>$target</var>
</line>
<line linenr="028" indent="" />
<line linenr="029" indent="">
<comment>* remove operation data</comment>
</line>
<line linenr="030" indent="">
<var>$members</var>
<text> </text>
<text>=</text>
Expand All @@ -260,7 +278,7 @@
<text>=</text>
<var>0</var>
</line>
<line linenr="030" indent="">
<line linenr="031" indent="">
<text>table</text>
<text> </text>
<text>set</text>
Expand All @@ -277,7 +295,7 @@
<text> </text>
<var>0</var>
</line>
<line linenr="031" indent="">
<line linenr="032" indent="">
<text>table</text>
<text> </text>
<text>set</text>
Expand All @@ -294,7 +312,7 @@
<text> </text>
<var>null</var>
</line>
<line linenr="032" indent="">
<line linenr="033" indent="">
<text>table</text>
<text> </text>
<text>set</text>
Expand All @@ -311,11 +329,11 @@
<text> </text>
<var>$members</var>
</line>
<line linenr="033" indent="" />
<line linenr="034" indent="">
<line linenr="034" indent="" />
<line linenr="035" indent="">
<comment>* restart Battlegroups</comment>
</line>
<line linenr="035" indent="" interruptable="@">
<line linenr="036" indent="" interruptable="@">
<text>=</text>
<text> </text>
<var>[NULL]</var>
Expand All @@ -337,8 +355,8 @@
<text>=</text>
<text>'battleGroup'</text>
</line>
<line linenr="036" indent="" />
<line linenr="037" indent="">
<line linenr="037" indent="" />
<line linenr="038" indent="">
<text>return</text>
<text> </text>
<var>null</var>
Expand All @@ -362,7 +380,7 @@
<sval type="string" val="XS.Iterator1" />
<sval type="string" val="target" />
</sval>
<sval type="array" size="23">
<sval type="array" size="24">
<sval type="array" size="4">
<sval type="int" val="158" />
<sval type="int" val="5" />
Expand Down Expand Up @@ -489,6 +507,16 @@
<sval type="int" val="0" />
<sval type="int" val="0" />
</sval>
<sval type="array" size="8">
<sval type="int" val="102" />
<sval type="string" val="Mayhem.CancelClaim" />
<sval type="int" val="-2147483647" />
<sval type="int" val="131075" />
<sval type="int" val="12" />
<sval type="int" val="1" />
<sval type="int" val="131074" />
<sval type="int" val="8" />
</sval>
<sval type="array" size="4">
<sval type="int" val="128" />
<sval type="int" val="5" />
Expand Down Expand Up @@ -588,28 +616,28 @@
<sval type="array" size="3">
<sval type="int" val="15" />
<sval type="int" val="1" />
<sval type="string" val="remove sector variable (claims can expire again)" />
<sval type="string" val="remove sector variable and claim" />
</sval>
<sval type="array" size="2">
<sval type="int" val="17" />
<sval type="int" val="18" />
<sval type="int" val="2" />
</sval>
<sval type="array" size="3">
<sval type="int" val="17" />
<sval type="int" val="18" />
<sval type="int" val="1" />
<sval type="string" val="remove operation data" />
</sval>
<sval type="array" size="2">
<sval type="int" val="21" />
<sval type="int" val="22" />
<sval type="int" val="2" />
</sval>
<sval type="array" size="3">
<sval type="int" val="21" />
<sval type="int" val="22" />
<sval type="int" val="1" />
<sval type="string" val="restart Battlegroups" />
</sval>
<sval type="array" size="2">
<sval type="int" val="22" />
<sval type="int" val="23" />
<sval type="int" val="2" />
</sval>
</sval>
Expand Down

0 comments on commit d601dfb

Please sign in to comment.