Skip to content

Commit

Permalink
bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@EnvyDragon
EnvyDragon committed Nov 29, 2024
1 parent a17de6e commit 74fd3ad
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 7 deletions.
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_the_dig.SC2Map/DocumentHeader
View file
Binary file not shown.
10 changes: 8 additions & 2 deletions Maps/ArchipelagoCampaign/WoL/ap_the_dig.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr", false);
}
else {
libABFE498B_gv_aP_Triggers_skipCutscenes = true;
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, false);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
PlayerSetRace(1, "Zerg");
Expand Down Expand Up @@ -872,7 +873,7 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) {
UnitCargoCreate(UnitFromId(317), "AP_Marine", 4);
UnitCargoCreate(UnitFromId(317), "AP_Medic", 2);
}
autoE010A74A_g = UnitGroup("AP_SCV", gv_p7_ABANDONED_BASE, RegionFromId(10), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
autoE010A74A_g = UnitGroup(null, gv_p7_ABANDONED_BASE, RegionFromId(10), UnitFilter((1 << c_targetFilterWorker), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
autoE010A74A_u = UnitGroupCount(autoE010A74A_g, c_unitCountAll);
for (;; autoE010A74A_u -= 1) {
autoE010A74A_var = UnitGroupUnitFromEnd(autoE010A74A_g, autoE010A74A_u);
Expand Down Expand Up @@ -1119,6 +1120,11 @@ bool gt_MMDropoff_Func (bool testConds, bool runActions) {
else {
}
UnitSetCustomValue(UnitFromId(317), 0, (UnitGetCustomValue(UnitFromId(317), 0) + 1.0));
if ((libNtve_gf_UnitGroupIsDead(UnitCargoGroup(UnitFromId(317))) == true)) {
Wait(1.0, c_timeGame);
UnitIssueOrder(UnitFromId(317), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(489)), c_orderQueueReplace);
}

return true;
}

Expand Down Expand Up @@ -6043,7 +6049,7 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) {
libNtve_gf_MakeUnitInvulnerable(gv_tHEONEDOOR, false);
UnitIssueOrder(gv_tHEONEDRILL, OrderTargetingUnit(AbilityCommand("AttackAllowsInvulnerable", 0), gv_tHEONEDOOR), c_orderQueueReplace);
UnitSetPropertyFixed(gv_tHEONEDOOR, c_unitPropLifePercent, 100.0);
autoF6C0C4EE_g = UnitGroup(null, gv_p7_ABANDONED_BASE, RegionEntireMap(), UnitFilter((1 << c_targetFilterWorker), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
autoF6C0C4EE_g = UnitGroup(null, gv_p7_ABANDONED_BASE, RegionEntireMap(), UnitFilter((1 << c_targetFilterWorker), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32))), 0);
autoF6C0C4EE_u = UnitGroupCount(autoF6C0C4EE_g, c_unitCountAll);
for (;; autoF6C0C4EE_u -= 1) {
autoF6C0C4EE_var = UnitGroupUnitFromEnd(autoF6C0C4EE_g, autoF6C0C4EE_u);
Expand Down
118 changes: 113 additions & 5 deletions Maps/ArchipelagoCampaign/WoL/ap_the_dig.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,11 +467,27 @@
</Element>
<Element Type="FunctionCall" Id="01E12388">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="6EB70F0F"/>
<FunctionCall Type="FunctionCall" Id="707DC48F"/>
<FunctionCall Type="FunctionCall" Id="1A048376"/>
<FunctionCall Type="FunctionCall" Id="F9A02568"/>
<FunctionCall Type="FunctionCall" Id="A041843E"/>
</Element>
<Element Type="FunctionCall" Id="6EB70F0F">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="37696DF9"/>
<Parameter Type="Param" Id="AF06D633"/>
</Element>
<Element Type="Param" Id="37696DF9">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Library="ABFE498B" Id="8CF8B2F6"/>
</Element>
<Element Type="Param" Id="AF06D633">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="707DC48F">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
Expand Down Expand Up @@ -3315,9 +3331,7 @@
</Element>
<Element Type="Param" Id="F1479A18">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
<Value>AP_SCV</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000231"/>
</Element>
<Element Type="Param" Id="010F3854">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
Expand All @@ -3330,7 +3344,7 @@
</Element>
<Element Type="Param" Id="E8C3C265">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
<Value>-;Missile,Dead,Hidden</Value>
<Value>Worker;Missile,Dead,Hidden</Value>
<ValueType Type="unitfilter"/>
</Element>
<Element Type="Param" Id="27F1F037">
Expand Down Expand Up @@ -7798,6 +7812,7 @@
<Action Type="FunctionCall" Id="BE04FE28"/>
<Action Type="FunctionCall" Id="36505A94"/>
<Action Type="FunctionCall" Id="B2F098AF"/>
<Action Type="FunctionCall" Id="28493335"/>
</Element>
<Element Type="FunctionCall" Id="70EFB7EB">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000208"/>
Expand Down Expand Up @@ -8790,6 +8805,99 @@
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="28493335">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="D105DFB0"/>
<FunctionCall Type="FunctionCall" Id="55A926A8"/>
<FunctionCall Type="FunctionCall" Id="ED9F7989"/>
</Element>
<Element Type="FunctionCall" Id="D105DFB0">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="5474B56A"/>
<Parameter Type="Param" Id="05FEB42A"/>
</Element>
<Element Type="Param" Id="5474B56A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000419"/>
<Value>1.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="Param" Id="05FEB42A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000420"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
</Element>
<Element Type="FunctionCall" Id="55A926A8">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000089"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="6FD4C8EC"/>
<Parameter Type="Param" Id="7298D0A8"/>
<Parameter Type="Param" Id="1AD88404"/>
</Element>
<Element Type="Param" Id="6FD4C8EC">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000156"/>
<ValueType Type="unit"/>
<ValueId Id="317"/>
</Element>
<Element Type="Param" Id="7298D0A8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000157"/>
<FunctionCall Type="FunctionCall" Id="8645C428"/>
</Element>
<Element Type="FunctionCall" Id="8645C428">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="43F16BA5"/>
<Parameter Type="Param" Id="E732A4DB"/>
<Parameter Type="Param" Id="217DA9A8"/>
</Element>
<Element Type="Param" Id="E732A4DB">
<ParameterDef Type="ParamDef" Library="Ntve" Id="B796880B"/>
<Value>move</Value>
<ValueType Type="abilcmd"/>
</Element>
<Element Type="Param" Id="217DA9A8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="32BBED47"/>
<ValueType Type="point"/>
<ValueId Id="489"/>
</Element>
<Element Type="Param" Id="1AD88404">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000158"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000039"/>
</Element>
<Element Type="FunctionCall" Id="ED9F7989">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="123AE21C"/>
<Parameter Type="Param" Id="1C46D812"/>
<Parameter Type="Param" Id="E376FECB"/>
</Element>
<Element Type="Param" Id="123AE21C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="F0BE15FE"/>
</Element>
<Element Type="FunctionCall" Id="F0BE15FE">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0D42CF15"/>
<Parameter Type="Param" Id="D42D0C67"/>
</Element>
<Element Type="Param" Id="D42D0C67">
<ParameterDef Type="ParamDef" Library="Ntve" Id="86677A66"/>
<FunctionCall Type="FunctionCall" Id="3D0BD2C8"/>
</Element>
<Element Type="FunctionCall" Id="3D0BD2C8">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000233"/>
<Parameter Type="Param" Id="3C1E235A"/>
</Element>
<Element Type="Param" Id="3C1E235A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000403"/>
<ValueType Type="unit"/>
<ValueId Id="317"/>
</Element>
<Element Type="Param" Id="1C46D812">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="E376FECB">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Trigger" Id="3063B3B0">
<Event Type="FunctionCall" Id="EACBC68E"/>
<Condition Type="FunctionCall" Id="8D46A084"/>
Expand Down Expand Up @@ -55953,7 +56061,7 @@
</Element>
<Element Type="Param" Id="DD279107">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
<Value>Worker;Missile,Dead,Hidden</Value>
<Value>Worker;Missile,Dead</Value>
<ValueType Type="unitfilter"/>
</Element>
<Element Type="Param" Id="E53DE5EB">
Expand Down
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_the_dig.SC2Map/Triggers.version
View file
Binary file not shown.

0 comments on commit 74fd3ad

Please sign in to comment.