Skip to content

Commit

Permalink
Fix some unit-related bugs in Harvest of Screams
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Oct 29, 2024
1 parent b7c1a49 commit 96f8016
Show file tree
Hide file tree
Showing 5 changed files with 196 additions and 16 deletions.
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader
View file
Binary file not shown.
23 changes: 21 additions & 2 deletions Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2565,6 +2565,7 @@ void gt_UrsadonMatriarchKilledUpdateObjective_Init () {
bool gt_StartFirstFlashFreezeQ_Func (bool testConds, bool runActions) {
// Variable Declarations
unit lv_currentUnit;
fixed lv_xp;

// Automatic Variable Declarations
unitgroup autoB8CFF056_g;
Expand Down Expand Up @@ -2653,12 +2654,12 @@ bool gt_StartFirstFlashFreezeQ_Func (bool testConds, bool runActions) {
for (;; autoB8CFF056_u -= 1) {
autoB8CFF056_var = UnitGroupUnitFromEnd(autoB8CFF056_g, autoB8CFF056_u);
if (autoB8CFF056_var == null) { break; }
if ((autoB8CFF056_var != gv_kerrigan) && (UnitGetType(autoB8CFF056_var) != "AutomatedExtractor") && (UnitGetType(autoB8CFF056_var) != "AP_RavagerCocoon")) {
if ((autoB8CFF056_var != gv_kerrigan) && (UnitGetType(autoB8CFF056_var) != "AutomatedExtractor") && (UnitGetType(autoB8CFF056_var) != "AP_RavagerCocoon") && (UnitGetType(autoB8CFF056_var) != "AP_MedicMengsk")) {
gf_ReplaceUnit(autoB8CFF056_var);
}
else {
if ((UnitGetType(autoB8CFF056_var) == "AP_RavagerCocoon")) {
libNtve_gf_ReplaceUnit(EventUnit(), "AP_Ravager", libNtve_ge_ReplaceUnitOptions_NewUnitsDefault);
libNtve_gf_ReplaceUnit(autoB8CFF056_var, "AP_Ravager", libNtve_ge_ReplaceUnitOptions_NewUnitsDefault);
}

}
Expand Down Expand Up @@ -7928,6 +7929,10 @@ bool gt_MidRecoverBroodCleanup_Func (bool testConds, bool runActions) {
unit auto4A7A874E_var;
unitgroup auto70E43AFD_g;
int auto70E43AFD_u;
unitgroup auto0CD05F86_g;
int auto0CD05F86_u;
unitgroup autoC8D6CBD4_g;
int autoC8D6CBD4_u;
unitgroup autoB411E046_g;
int autoB411E046_u;
unit autoB411E046_var;
Expand Down Expand Up @@ -8043,6 +8048,20 @@ bool gt_MidRecoverBroodCleanup_Func (bool testConds, bool runActions) {
if (lv_unit == null) { break; }
libA472B13C_gf_ReplaceUnit(lv_unit);
}
auto0CD05F86_g = UnitGroup("AP_Marauder", gv_pLAYER_01_USER, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
auto0CD05F86_u = UnitGroupCount(auto0CD05F86_g, c_unitCountAll);
for (;; auto0CD05F86_u -= 1) {
lv_unit = UnitGroupUnitFromEnd(auto0CD05F86_g, auto0CD05F86_u);
if (lv_unit == null) { break; }
libA472B13C_gf_ReplaceUnit(lv_unit);
}
autoC8D6CBD4_g = UnitGroup("AP_Slayer", gv_pLAYER_01_USER, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
autoC8D6CBD4_u = UnitGroupCount(autoC8D6CBD4_g, c_unitCountAll);
for (;; autoC8D6CBD4_u -= 1) {
lv_unit = UnitGroupUnitFromEnd(autoC8D6CBD4_g, autoC8D6CBD4_u);
if (lv_unit == null) { break; }
libA472B13C_gf_ReplaceUnit(lv_unit);
}
lib15EF4C78_gf_ZerglingRespawnSetPrimaryHatchery(gv_pLAYER_01_USER, gv_startingHatchery);
lib15EF4C78_gf_AP_Player_clearZerglingRespawnChargesFromPlayer(gv_pLAYER_01_USER);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
Expand Down
188 changes: 174 additions & 14 deletions Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15394,6 +15394,7 @@
</Element>
<Element Type="Trigger" Id="3A803A12">
<Variable Type="Variable" Id="2619CB07"/>
<Variable Type="Variable" Id="6BD1A403"/>
<Event Type="FunctionCall" Id="8921D281"/>
<Condition Type="FunctionCall" Id="5D5DDAD1"/>
<Condition Type="FunctionCall" Id="92601358"/>
Expand All @@ -15419,6 +15420,16 @@
<Element Type="Param" Id="88601DB5">
<Preset Type="PresetValue" Library="Ntve" Id="D6EA4D09"/>
</Element>
<Element Type="Variable" Id="6BD1A403">
<VariableType>
<Type Value="fixed"/>
</VariableType>
<Value Type="Param" Id="36E72ADF"/>
</Element>
<Element Type="Param" Id="36E72ADF">
<Value>0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="FunctionCall" Id="8921D281">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000041"/>
<Parameter Type="Param" Id="31ACE3B5"/>
Expand Down Expand Up @@ -16528,11 +16539,24 @@
<Element Type="FunctionCall" Id="462D191A">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
<FunctionCall Type="FunctionCall" Id="EE050117"/>
<FunctionCall Type="FunctionCall" Id="623FD45A"/>
<FunctionCall Type="FunctionCall" Id="0B041627"/>
<FunctionCall Type="FunctionCall" Id="0BB801FF"/>
<FunctionCall Type="FunctionCall" Id="7FD7116A"/>
<FunctionCall Type="FunctionCall" Id="F621E8F0"/>
<FunctionCall Type="FunctionCall" Id="F6041F66"/>
</Element>
<Element Type="FunctionCall" Id="EE050117">
<FunctionDef Type="FunctionDef" Id="614A336A"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="7BBC7D5F"/>
</Element>
<Element Type="Param" Id="7BBC7D5F">
<ParameterDef Type="ParamDef" Id="186C654D"/>
<FunctionCall Type="FunctionCall" Id="7BA01A8E"/>
</Element>
<Element Type="FunctionCall" Id="7BA01A8E">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
</Element>
<Element Type="FunctionCall" Id="623FD45A">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
Expand All @@ -16552,7 +16576,7 @@
<FunctionCall Type="FunctionCall" Id="BCC92CB8"/>
</Element>
<Element Type="FunctionCall" Id="BCC92CB8">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000092"/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
</Element>
<Element Type="Param" Id="EC9DF4A6">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C9FA4297"/>
Expand Down Expand Up @@ -16596,18 +16620,6 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="0B041627">
<FunctionDef Type="FunctionDef" Id="614A336A"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="B6B640A7"/>
</Element>
<Element Type="Param" Id="B6B640A7">
<ParameterDef Type="ParamDef" Id="186C654D"/>
<FunctionCall Type="FunctionCall" Id="2FF2D984"/>
</Element>
<Element Type="FunctionCall" Id="2FF2D984">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
</Element>
<Element Type="FunctionCall" Id="0BB801FF">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -16694,6 +16706,38 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="F6041F66">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="C60495B6"/>
<Parameter Type="Param" Id="E8887197"/>
<Parameter Type="Param" Id="2AA83BFF"/>
</Element>
<Element Type="Param" Id="C60495B6">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="677DB84D"/>
</Element>
<Element Type="FunctionCall" Id="677DB84D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000079"/>
<Parameter Type="Param" Id="E55C7C8F"/>
</Element>
<Element Type="Param" Id="E55C7C8F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000138"/>
<FunctionCall Type="FunctionCall" Id="F31B4178"/>
</Element>
<Element Type="FunctionCall" Id="F31B4178">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
</Element>
<Element Type="Param" Id="E8887197">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="500677B2"/>
</Element>
<Element Type="Param" Id="2AA83BFF">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>AP_MedicMengsk</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="9E014DF2">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
<Parameter Type="Param" Id="FD85FF8B"/>
Expand Down Expand Up @@ -54548,6 +54592,8 @@
<Action Type="FunctionCall" Id="A312E47C"/>
<Action Type="FunctionCall" Id="A841F1D0"/>
<Action Type="FunctionCall" Id="70E43AFD"/>
<Action Type="FunctionCall" Id="0CD05F86"/>
<Action Type="FunctionCall" Id="C8D6CBD4"/>
<Action Type="FunctionCall" Id="DD4597A2"/>
<Action Type="FunctionCall" Id="5495A107"/>
<Action Type="FunctionCall" Id="8BE4E61C"/>
Expand Down Expand Up @@ -55736,6 +55782,120 @@
<ParameterDef Type="ParamDef" Library="A472B13C" Id="05E6B62B"/>
<Variable Type="Variable" Id="EB6045B9"/>
</Element>
<Element Type="FunctionCall" Id="0CD05F86">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000327"/>
<Parameter Type="Param" Id="6DA77095"/>
<Parameter Type="Param" Id="39D4441B"/>
<FunctionCall Type="FunctionCall" Id="E7981690"/>
</Element>
<Element Type="Param" Id="6DA77095">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000618"/>
<FunctionCall Type="FunctionCall" Id="DCAA9AF7"/>
</Element>
<Element Type="FunctionCall" Id="DCAA9AF7">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
<Parameter Type="Param" Id="0BDD6C0C"/>
<Parameter Type="Param" Id="CFD1439E"/>
<Parameter Type="Param" Id="52546D17"/>
<Parameter Type="Param" Id="2D0F4CE9"/>
<Parameter Type="Param" Id="58FDDDDD"/>
</Element>
<Element Type="Param" Id="0BDD6C0C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
<Value>AP_Marauder</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="CFD1439E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
<Variable Type="Variable" Id="F00A88F4"/>
</Element>
<Element Type="Param" Id="52546D17">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
<FunctionCall Type="FunctionCall" Id="34083187"/>
</Element>
<Element Type="FunctionCall" Id="34083187">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
</Element>
<Element Type="Param" Id="2D0F4CE9">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
<Value>-;Missile,Dead,Hidden</Value>
<ValueType Type="unitfilter"/>
</Element>
<Element Type="Param" Id="58FDDDDD">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
<Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
</Element>
<Element Type="Param" Id="39D4441B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000617"/>
<Variable Type="Variable" Id="EB6045B9"/>
</Element>
<Element Type="FunctionCall" Id="E7981690">
<FunctionDef Type="FunctionDef" Library="A472B13C" Id="419BA0A0"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000007"/>
<Parameter Type="Param" Id="D8CD41CD"/>
</Element>
<Element Type="Param" Id="D8CD41CD">
<ParameterDef Type="ParamDef" Library="A472B13C" Id="05E6B62B"/>
<Variable Type="Variable" Id="EB6045B9"/>
</Element>
<Element Type="FunctionCall" Id="C8D6CBD4">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000327"/>
<Parameter Type="Param" Id="0CBBC15A"/>
<Parameter Type="Param" Id="3D2AC1A3"/>
<FunctionCall Type="FunctionCall" Id="CFE8AA60"/>
</Element>
<Element Type="Param" Id="0CBBC15A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000618"/>
<FunctionCall Type="FunctionCall" Id="0E5E67DD"/>
</Element>
<Element Type="FunctionCall" Id="0E5E67DD">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
<Parameter Type="Param" Id="B9F4DCF8"/>
<Parameter Type="Param" Id="92865CA4"/>
<Parameter Type="Param" Id="62ED6289"/>
<Parameter Type="Param" Id="E2F689AE"/>
<Parameter Type="Param" Id="44B54255"/>
</Element>
<Element Type="Param" Id="B9F4DCF8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
<Value>AP_Slayer</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="92865CA4">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
<Variable Type="Variable" Id="F00A88F4"/>
</Element>
<Element Type="Param" Id="62ED6289">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
<FunctionCall Type="FunctionCall" Id="DBB551B2"/>
</Element>
<Element Type="FunctionCall" Id="DBB551B2">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
</Element>
<Element Type="Param" Id="E2F689AE">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
<Value>-;Missile,Dead,Hidden</Value>
<ValueType Type="unitfilter"/>
</Element>
<Element Type="Param" Id="44B54255">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
<Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
</Element>
<Element Type="Param" Id="3D2AC1A3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000617"/>
<Variable Type="Variable" Id="EB6045B9"/>
</Element>
<Element Type="FunctionCall" Id="CFE8AA60">
<FunctionDef Type="FunctionDef" Library="A472B13C" Id="419BA0A0"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000007"/>
<Parameter Type="Param" Id="F94E310A"/>
</Element>
<Element Type="Param" Id="F94E310A">
<ParameterDef Type="ParamDef" Library="A472B13C" Id="05E6B62B"/>
<Variable Type="Variable" Id="EB6045B9"/>
</Element>
<Element Type="FunctionCall" Id="DD4597A2">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="4035B049"/>
<Parameter Type="Param" Id="521B6033"/>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...oCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ Variable/Name/6669DA2B=RandomLine
Variable/Name/668F6CFC=AP South Matriarch
Variable/Name/66E7973D=StartingZergling
Variable/Name/684DF003=UrsadonMatriarchPingWest
Variable/Name/6BD1A403=xp
Variable/Name/6C95AB86=PsiLinkSpiresDestroyed
Variable/Name/739498FC=FlashFreezeRetreatLineDelivered
Variable/Name/74811DD4=MapMusicTrack
Expand Down

0 comments on commit 96f8016

Please sign in to comment.