Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing morphling, and tyrannozor issues #244

Merged
merged 1 commit into from
Aug 4, 2024
Merged

Fixing morphling, and tyrannozor issues #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Base.SC2Data/GameData/UnitData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
</CardLayouts>
<CardLayouts index="2">
<LayoutButtons index="0" AbilCmd="AP_MorphlingToPrimalIgniterMerge,SelectedUnits"/>
<LayoutButtons index="1" removed="1"/>
</CardLayouts>
</CUnit>
<CUnit id="Anteplott">
Expand Down
4 changes: 2 additions & 2 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7756,7 +7756,7 @@
<CardLayouts CardId="MPr">
<LayoutButtons Face="AP_MorphlingToPrimalIgniterMerge" Type="AbilCmd" AbilCmd="AP_MorphlingToPrimalIgniterMerge,0" Row="1" Column="1"/>
<LayoutButtons Face="AP_MorphlingToTyrannozorMerge" Type="AbilCmd" AbilCmd="AP_MorphlingToTyrannozorMerge,0" Row="2" Column="3"/>
<LayoutButtons Face="AP_MorphlingToTyrannozorMerge" Type="AbilCmd" AbilCmd="AP_MorphlingToTyrannozorMergeDummy,0" Row="2" Column="2"/>
<LayoutButtons Face="AP_MorphlingToTyrannozorMerge" Type="AbilCmd" AbilCmd="AP_MorphlingToTyrannozorMergeDummy,0" Row="2" Column="3"/>
<LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
</CardLayouts>
<EditorCategories value="ObjectType:Unit,ObjectFamily:Melee"/>
Expand Down Expand Up @@ -25131,7 +25131,7 @@
<SeparationRadius value="1"/>
<InnerRadius value="0.75"/>
<CargoSize value="8"/>
<SubgroupPriority value="174"/>
<SubgroupPriority value="9"/>
<MinimapRadius value="1.5"/>
<EditorCategories value="ObjectFamily:FactionPrimal,ObjectType:Unit"/>
<GlossaryCategory value="Unit/Category/AP_ZergUnits"/>
Expand Down
6 changes: 6 additions & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5663,6 +5663,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_SIBunkerCargo (int lp_player) {
void libABFE498B_gf_AP_Triggers_Zerg_unlockTyrannozor (int lp_player) {
// Automatic Variable Declarations
// Implementation
libABFE498B_gf_AP_Triggers_Zerg_unlockHive(lp_player);
TechTreeUnitAllow(lp_player, "AP_UltraliskCavern", true);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_TyrannozorMerge", 0), true);
if ((libABFE498B_gv_aP_Triggers_Option_enableMorphling == true)) {
Expand Down Expand Up @@ -5696,6 +5697,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockLurker (int lp_player) {

if ((libABFE498B_gv_aP_Triggers_Option_enableMorphling == true)) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_EnableMorphling", 1);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToLurker", 0), true);
}

}
Expand All @@ -5712,6 +5714,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockImpaler (int lp_player) {

if ((libABFE498B_gv_aP_Triggers_Option_enableMorphling == true)) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_EnableMorphling", 1);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToImpaler", 0), true);
}

}
Expand Down Expand Up @@ -5752,6 +5755,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockRavager (int lp_player) {
// Automatic Variable Declarations
// Implementation
libABFE498B_gf_AP_Triggers_Zerg_unlockLair(lp_player);
TechTreeUnitAllow(lp_player, "AP_RoachWarren", true);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphToRavager", 0), true);
if ((libABFE498B_gv_aP_Triggers_Option_enableMorphling == true)) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_EnableMorphling", 1);
Expand Down Expand Up @@ -6287,6 +6291,8 @@ void libABFE498B_gf_AP_Triggers_clearZergTech (int lp_player) {
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_SIBarracksTrain", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToTyrannozorMerge", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_TyrannozorMerge", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToImpaler", 0), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("AP_MorphlingToLurker", 0), false);
TechTreeUnitAllow(lp_player, "AP_InfestedMedic", false);
TechTreeUnitAllow(lp_player, "AP_InfestedSiegeTank", false);
TechTreeUnitAllow(lp_player, "AP_InfestedBanshee", false);
Expand Down
112 changes: 112 additions & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/Triggers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45058,6 +45058,7 @@
<Identifier>AP_Triggers_Zerg_unlockTyrannozor</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="192C7F8E"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="A4E25B17"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="5560F4A7"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3DA3F025"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3AB44669"/>
Expand All @@ -45072,6 +45073,14 @@
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="A4E25B17">
<FunctionDef Type="FunctionDef" Library="ABFE498B" Id="B7CFB995"/>
<Parameter Type="Param" Library="ABFE498B" Id="47F295AB"/>
</Element>
<Element Type="Param" Id="47F295AB">
<ParameterDef Type="ParamDef" Library="ABFE498B" Id="B9BA73BB"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="192C7F8E"/>
</Element>
<Element Type="FunctionCall" Id="5560F4A7">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
<Parameter Type="Param" Library="ABFE498B" Id="31995360"/>
Expand Down Expand Up @@ -45441,6 +45450,7 @@
<Element Type="FunctionCall" Id="24852EB8">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1B841E37"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="93EC6531"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="0D02DE47"/>
</Element>
<Element Type="FunctionCall" Id="1B841E37">
Expand All @@ -45465,6 +45475,26 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="FunctionCall" Id="93EC6531">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Library="ABFE498B" Id="EEBBFAA9"/>
<Parameter Type="Param" Library="ABFE498B" Id="C6B3DBD1"/>
<Parameter Type="Param" Library="ABFE498B" Id="75EEA8C1"/>
</Element>
<Element Type="Param" Id="EEBBFAA9">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="EC65FDCB"/>
</Element>
<Element Type="Param" Id="C6B3DBD1">
<ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
</Element>
<Element Type="Param" Id="75EEA8C1">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
<Value>AP_MorphlingToLurker</Value>
<ValueType Type="abilcmd"/>
</Element>
<Element Type="FunctionCall" Id="0D02DE47">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -45623,6 +45653,7 @@
<Element Type="FunctionCall" Id="0426D5BB">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E8ACDE11"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="0CEF1E51"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2D8E111E"/>
</Element>
<Element Type="FunctionCall" Id="E8ACDE11">
Expand All @@ -45647,6 +45678,26 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="FunctionCall" Id="0CEF1E51">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Library="ABFE498B" Id="4DCAD28B"/>
<Parameter Type="Param" Library="ABFE498B" Id="48548BC8"/>
<Parameter Type="Param" Library="ABFE498B" Id="0B479DCE"/>
</Element>
<Element Type="Param" Id="4DCAD28B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="0F39508B"/>
</Element>
<Element Type="Param" Id="48548BC8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
</Element>
<Element Type="Param" Id="0B479DCE">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
<Value>AP_MorphlingToImpaler</Value>
<ValueType Type="abilcmd"/>
</Element>
<Element Type="FunctionCall" Id="2D8E111E">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -46035,6 +46086,7 @@
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="4BD1322F"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4AC9CE47"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2B711E54"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="3D9C6D4C"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8502B7BB"/>
</Element>
Expand All @@ -46056,6 +46108,26 @@
<ParameterDef Type="ParamDef" Library="ABFE498B" Id="DF88F744"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="4BD1322F"/>
</Element>
<Element Type="FunctionCall" Id="2B711E54">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
<Parameter Type="Param" Library="ABFE498B" Id="FC52736D"/>
<Parameter Type="Param" Library="ABFE498B" Id="35D3927D"/>
<Parameter Type="Param" Library="ABFE498B" Id="23A8925D"/>
</Element>
<Element Type="Param" Id="FC52736D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
</Element>
<Element Type="Param" Id="35D3927D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
<Value>AP_RoachWarren</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="23A8925D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="4BD1322F"/>
</Element>
<Element Type="FunctionCall" Id="3D9C6D4C">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
<Parameter Type="Param" Library="ABFE498B" Id="B8E1FCAC"/>
Expand Down Expand Up @@ -51041,6 +51113,8 @@
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4B6B87DB"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="709D9D10"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="91A05A7A"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="1255D929"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="857BEFAA"/>
<FunctionCall Type="Comment" Library="ABFE498B" Id="A934B4B3"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2516DC61"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E6C428FF"/>
Expand Down Expand Up @@ -51555,6 +51629,44 @@
<Value>AP_TyrannozorMerge</Value>
<ValueType Type="abilcmd"/>
</Element>
<Element Type="FunctionCall" Id="1255D929">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
<Parameter Type="Param" Library="ABFE498B" Id="2478BB00"/>
<Parameter Type="Param" Library="ABFE498B" Id="34E40A24"/>
<Parameter Type="Param" Library="ABFE498B" Id="1CEFE87E"/>
</Element>
<Element Type="Param" Id="2478BB00">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="422B4FD0"/>
</Element>
<Element Type="Param" Id="34E40A24">
<ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
</Element>
<Element Type="Param" Id="1CEFE87E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
<Value>AP_MorphlingToImpaler</Value>
<ValueType Type="abilcmd"/>
</Element>
<Element Type="FunctionCall" Id="857BEFAA">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0F7C3248"/>
<Parameter Type="Param" Library="ABFE498B" Id="4AB2ECDD"/>
<Parameter Type="Param" Library="ABFE498B" Id="E0B32E17"/>
<Parameter Type="Param" Library="ABFE498B" Id="949903E3"/>
</Element>
<Element Type="Param" Id="4AB2ECDD">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BFF56EB0"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="422B4FD0"/>
</Element>
<Element Type="Param" Id="E0B32E17">
<ParameterDef Type="ParamDef" Library="Ntve" Id="09B7BAEA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
</Element>
<Element Type="Param" Id="949903E3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9B01128C"/>
<Value>AP_MorphlingToLurker</Value>
<ValueType Type="abilcmd"/>
</Element>
<Element Type="Comment" Id="A934B4B3">
<Comment>
Mercs
Expand Down