diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_goliath.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_goliath.dds
new file mode 100644
index 000000000..1ab73ace1
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_goliath.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
similarity index 100%
rename from Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
rename to Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-terran-goliath-mengsk.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-terran-goliath-mengsk.dds
new file mode 100644
index 000000000..4b4ecd3c4
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-terran-goliath-mengsk.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_diff.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_diff.dds
new file mode 100644
index 000000000..f93eaa5b3
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_diff.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_spec.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_spec.dds
new file mode 100644
index 000000000..5876dbf51
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_spec.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/wireframe-terran-goliath-mengsk.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/wireframe-terran-goliath-mengsk.dds
new file mode 100644
index 000000000..2ac6766f9
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/wireframe-terran-goliath-mengsk.dds differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP.m3
new file mode 100644
index 000000000..623c2531e
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP_Death.m3 b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP_Death.m3
new file mode 100644
index 000000000..853c7d59c
Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP_Death.m3 differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 91caf0dae..cfa8a447b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -3937,6 +3937,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -12342,9 +12357,13 @@
-
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 05631e5f7..e7129470b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -1440,6 +1440,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3158,9 +3190,7 @@
-
-
-
+
@@ -3178,30 +3208,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8489,6 +8496,7 @@
+
@@ -8539,6 +8547,9 @@
+
+
+
@@ -40268,4 +40279,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/Assets.txt b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/Assets.txt
index a6b6e5c88..22b7df632 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/Assets.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/Assets.txt
@@ -101,4 +101,5 @@ UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Marauder=Assets\Textures\u
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_SiegeTank=Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_siegetank.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Viking=Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_viking.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Thor=Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_thor.dds
-UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Marine=AP\Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
\ No newline at end of file
+UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Marine=AP\Assets\Custom\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
+UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Goliath=AP\Assets\Custom\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_goliath.dds
\ No newline at end of file
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AttachMethodData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AttachMethodData.xml
index 6e3431f16..86d63b4a5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AttachMethodData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AttachMethodData.xml
@@ -80,6 +80,12 @@
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 3279d2de1..2149fb695 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -207,12 +207,16 @@
+
+
+
+
@@ -8898,4 +8902,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 784b80691..9a4ecc966 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4681,6 +4681,9 @@
+
+
+
@@ -6515,4 +6518,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index a60201106..84fe362a2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -21116,4 +21116,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index 271b28d63..defa1c30a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -20081,4 +20081,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index c5b0f365b..23583feda 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4021,4 +4021,10 @@
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index b82443d74..2d8988b21 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6637,4 +6637,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index c2def8e20..3098bc6a7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -1246,8 +1246,8 @@
-
-
+
+
@@ -3662,7 +3662,7 @@
-
+
@@ -4287,8 +4287,8 @@
-
-
+
+
@@ -7420,7 +7420,8 @@
-
+
+
@@ -28738,4 +28739,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 074ed32c8..730491630 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -774,6 +774,9 @@
+
+
+
@@ -857,6 +860,12 @@
+
+
+
+
+
+
@@ -1047,6 +1056,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1101,6 +1130,14 @@
+
+
+
+
+
+
+
+
@@ -2712,6 +2749,14 @@
+
+
+
+
+
+
+
+
@@ -3767,6 +3812,8 @@
+
+
@@ -3875,6 +3922,8 @@
+
+
@@ -3984,6 +4033,8 @@
+
+
@@ -5718,6 +5769,7 @@
+
@@ -5748,6 +5800,7 @@
+
@@ -5778,6 +5831,7 @@
+
@@ -5808,6 +5862,7 @@
+
@@ -5838,6 +5893,7 @@
+
@@ -5868,6 +5924,7 @@
+
@@ -5897,6 +5954,7 @@
+
@@ -5927,6 +5985,7 @@
+
@@ -5956,6 +6015,7 @@
+
@@ -5986,6 +6046,7 @@
+
@@ -6041,6 +6102,14 @@
+
+
+
+
+
+
+
+
@@ -6096,6 +6165,14 @@
+
+
+
+
+
+
+
+
@@ -6151,6 +6228,14 @@
+
+
+
+
+
+
+
+
@@ -6206,6 +6291,14 @@
+
+
+
+
+
+
+
+
@@ -6261,6 +6354,14 @@
+
+
+
+
+
+
+
+
@@ -6316,6 +6417,14 @@
+
+
+
+
+
+
+
+
@@ -6370,6 +6479,14 @@
+
+
+
+
+
+
+
+
@@ -6424,6 +6541,14 @@
+
+
+
+
+
+
+
+
@@ -6478,6 +6603,14 @@
+
+
+
+
+
+
+
+
@@ -6533,6 +6666,14 @@
+
+
+
+
+
+
+
+
@@ -8885,6 +9026,7 @@
+
@@ -12102,6 +12244,8 @@
+
+
@@ -12111,6 +12255,8 @@
+
+
@@ -12937,6 +13083,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14759,6 +14922,12 @@
+
+
+
+
+
+
@@ -14911,6 +15080,14 @@
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index df2c90116..e268205c6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -6549,4 +6549,10 @@
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index ee713db7b..0804914e4 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -3923,4 +3923,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
index d2369473f..73a88f6e5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
@@ -3104,6 +3104,30 @@ void lib15EF4C78_gf_AP_Player_updateBlackhammerWeapons (unit lp_unit) {
}
}
+void lib15EF4C78_gf_AP_Player_updateBulwarkCompanyWeapons (unit lp_unit) {
+ // Automatic Variable Declarations
+ // Implementation
+ UnitWeaponRemove(lp_unit, "AP_GoliathMengskL1Fake");
+ UnitWeaponRemove(lp_unit, "AP_GoliathMengskL2Fake");
+ UnitWeaponRemove(lp_unit, "AP_GoliathMengskL3Fake");
+ UnitWeaponRemove(lp_unit, "AP_GoliathMengskL4Fake");
+ if ((UnitHasBehavior(lp_unit, "AP_MengskVeteranL1Tracker") == true)) {
+ UnitWeaponAdd(lp_unit, "AP_GoliathMengskL1Fake", null);
+ }
+ if ((UnitHasBehavior(lp_unit, "AP_MengskVeteranL2Tracker") == true)) {
+ UnitWeaponAdd(lp_unit, "AP_GoliathMengskL2Fake", null);
+ }
+ if ((UnitHasBehavior(lp_unit, "AP_MengskVeteranL3Tracker") == true)) {
+ UnitWeaponAdd(lp_unit, "AP_GoliathMengskL3Fake", null);
+ }
+ if ((UnitHasBehavior(lp_unit, "AP_MengskVeteranL4Tracker") == true)) {
+ UnitWeaponAdd(lp_unit, "AP_GoliathMengskL4Fake", null);
+ }
+ if (true) {
+ UnitWeaponAdd(lp_unit, "AP_GoliathMengskL1Fake", null);
+ }
+}
+
void lib15EF4C78_gf_RemoveUnusedStartingUnits (unitgroup lp_startingUnits, string lp_desiredFaction, bool lp_hiveUpgrade) {
// Automatic Variable Declarations
unitgroup autoA0E4A284_g;
@@ -8335,6 +8359,42 @@ void lib15EF4C78_gt_AP_Player_onBlackhammerTransform_Init () {
TriggerAddEventUnitAbility(lib15EF4C78_gt_AP_Player_onBlackhammerTransform, null, AbilityCommand("AP_ThorMengskSiege", 0), c_unitAbilStageComplete, false);
}
+//--------------------------------------------------------------------------------------------------
+// Trigger: AP_Player_onBulwarkCompanyLevelChange
+//--------------------------------------------------------------------------------------------------
+bool lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange_Func (bool testConds, bool runActions) {
+ // Variable Declarations
+ unit lv_unit;
+
+ // Automatic Variable Declarations
+ // Variable Initialization
+ lv_unit = EventUnit();
+
+ // Conditions
+ if (testConds) {
+ if (!((UnitGetType(lv_unit) == "AP_GoliathMengsk"))) {
+ return false;
+ }
+ }
+
+ // Actions
+ if (!runActions) {
+ return true;
+ }
+
+ lib15EF4C78_gf_AP_Player_updateBulwarkCompanyWeapons(lv_unit);
+ return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange_Init () {
+ lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange = TriggerCreate("lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange_Func");
+ TriggerAddEventUnitBehaviorChange(lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange, null, "AP_MengskVeteranL1Tracker", c_unitBehaviorChangeActivate);
+ TriggerAddEventUnitBehaviorChange(lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange, null, "AP_MengskVeteranL2Tracker", c_unitBehaviorChangeActivate);
+ TriggerAddEventUnitBehaviorChange(lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange, null, "AP_MengskVeteranL3Tracker", c_unitBehaviorChangeActivate);
+ TriggerAddEventUnitBehaviorChange(lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange, null, "AP_MengskVeteranL4Tracker", c_unitBehaviorChangeActivate);
+}
+
//--------------------------------------------------------------------------------------------------
// Trigger: AP_Player_Merc_ArrayInit
//--------------------------------------------------------------------------------------------------
@@ -8853,6 +8913,7 @@ void lib15EF4C78_InitTriggers () {
lib15EF4C78_gt_AP_Player_onShockDivisionTransform_Init();
lib15EF4C78_gt_AP_Player_onBlackhammerLevelChange_Init();
lib15EF4C78_gt_AP_Player_onBlackhammerTransform_Init();
+ lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange_Init();
lib15EF4C78_gt_AP_Player_Merc_ArrayInit_Init();
lib15EF4C78_gt_AP_Player_MercCompoundUpdateCounts_Init();
lib15EF4C78_gt_AP_Player_MercCompoundOnMercUse_Init();
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
index d898d9b59..7f839c2a4 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78_h.galaxy
@@ -384,6 +384,7 @@ void lib15EF4C78_gf_CM_Mengsk_ForceMorphTrooper (unit lp_trooper, unit lp_pickup
void lib15EF4C78_gf_AP_Player_updatePrideOfAugustgradWeapons (unit lp_unit);
void lib15EF4C78_gf_AP_Player_updateShockDivisionWeapons (unit lp_unit);
void lib15EF4C78_gf_AP_Player_updateBlackhammerWeapons (unit lp_unit);
+void lib15EF4C78_gf_AP_Player_updateBulwarkCompanyWeapons (unit lp_unit);
void lib15EF4C78_gf_RemoveUnusedStartingUnits (unitgroup lp_startingUnits, string lp_desiredFaction, bool lp_hiveUpgrade);
void lib15EF4C78_gf_ReplaceGasStructure (unit lp_gasStructure, string lp_desiredFaction);
void lib15EF4C78_gf_ReplaceWorker (unit lp_worker, string lp_desiredFaction);
@@ -523,6 +524,7 @@ trigger lib15EF4C78_gt_AP_Player_onShockDivisionLevelChange;
trigger lib15EF4C78_gt_AP_Player_onShockDivisionTransform;
trigger lib15EF4C78_gt_AP_Player_onBlackhammerLevelChange;
trigger lib15EF4C78_gt_AP_Player_onBlackhammerTransform;
+trigger lib15EF4C78_gt_AP_Player_onBulwarkCompanyLevelChange;
trigger lib15EF4C78_gt_AP_Player_Merc_ArrayInit;
trigger lib15EF4C78_gt_AP_Player_MercCompoundUpdateCounts;
trigger lib15EF4C78_gt_AP_Player_MercCompoundOnMercUse;
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/ui/layout/custom/ap_coop_unitstatus_mengsk.sc2layout b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/ui/layout/custom/ap_coop_unitstatus_mengsk.sc2layout
index ac12c91b5..74bd8866c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/ui/layout/custom/ap_coop_unitstatus_mengsk.sc2layout
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/ui/layout/custom/ap_coop_unitstatus_mengsk.sc2layout
@@ -238,6 +238,14 @@
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader
index 39c25193b..5380dac08 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader and b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/GameText.version b/Mods/ArchipelagoPlayer.SC2Mod/GameText.version
index cc6db4906..9a1f6d1b4 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/GameText.version and b/Mods/ArchipelagoPlayer.SC2Mod/GameText.version differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
index 1be29ade3..fa05dc94c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
@@ -58,6 +58,7 @@
+
@@ -75,5 +76,8 @@
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
index a7b6dfb10..37f59ef12 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Triggers
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
@@ -62604,6 +62604,7 @@
+
cM_Mengsk_XPHungryUnits
@@ -67371,6 +67372,510 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Clean up the weapons
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL1Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL2Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL3Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL4Fake
+
+
+
+
+
+ Setup the weapon for UI display
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL1Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL1Tracker
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL2Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL2Tracker
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL3Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL3Tracker
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL4Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL4Tracker
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengskL1Fake
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL1Tracker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL2Tracker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL3Tracker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_MengskVeteranL4Tracker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengsk
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version
index 152b2d6a1..f41869686 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version and b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index c88f6084e..d81601c37 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -570,3 +570,4 @@ Button/Hotkey/AP_TrooperMengskSpecializeFlamethrower=F
Button/Hotkey/AP_TrooperMengskSpecializeImproved=G
Button/Hotkey/AP_TrooperMengskBuild=B
Button/Hotkey/AP_MarineMengsk=A
+Button/Hotkey/AP_GoliathMengsk=G
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 45108ead1..8cbbde7e3 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1140,6 +1140,7 @@ Button/Name/AP_GhostMengskSuperCloak=Labyrinth Cloak
Button/Name/AP_GhostSCBWLockdown=Lockdown
Button/Name/AP_GlialReconstitution=Glial Reconstitution
Button/Name/AP_Goliath=Build Goliath
+Button/Name/AP_GoliathMengsk=Build Bulwark Company
Button/Name/AP_GraviticDrive=Gravitic Drive
Button/Name/AP_GravitonBeam=Graviton Beam
Button/Name/AP_GravitonBeamVoidCampaign=Graviton Beam
@@ -2006,6 +2007,7 @@ Button/Name/AP_TrooperMengskSpecializeImproved=Equip B-2 High-Cal LMG
Button/Name/AP_TrooperMengskBuild=Build Combat Structure
Button/Name/AP_TrooperMengskWeaponDrop=Advanced Alloys
Button/Name/AP_LeadFarmer=Hail of Lead
+Button/Name/AP_NovaUnitLockdown=Lockdown Missiles
Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals damage over seconds.
Button/Tooltip/AP_250mmStrikeCannonsMengsk=Stuns target unit. Deals
Button/Tooltip/AP_250mmStrikeCannonsMengskDamageL1=
@@ -2382,6 +2384,7 @@ Button/Tooltip/AP_GhostMengskSuperCloak=Cloaks Emperor's Shadow for seconds. Affected units cannot attack, move or use abilities, disabling passive Detection and Cloaking.
Button/Tooltip/AP_GlialReconstitution=Increases movement speed.
Button/Tooltip/AP_Goliath=Heavy-fire support unit.Can attack ground and air units.
+Button/Tooltip/AP_GoliathMengsk=Royal Guard heavy-fire support unit.Can attack ground and air units.
Button/Tooltip/AP_GoliathShapedHull=Increases Goliath life by 25.
Button/Tooltip/AP_GraviticDrive=Increases the movement speed of Warp Prisms.
Button/Tooltip/AP_GravitonBeam=Makes the target unit float in the air, disabling its abilities and dealing damage over time. Effect lasts up to .Massive units are immune.
@@ -2397,6 +2400,7 @@ Button/Tooltip/AP_GuardianShield=Creates a range 4 aura that reduces all incomin
Button/Tooltip/AP_HERC=Front-line infantry. Can use Grapple.Can attack ground units.
Button/Tooltip/AP_HHReaperFly=Allows the Reaper to fly for seconds. While flying, the Reaper can attack air units.
Button/Tooltip/AP_HHVikingPiercingAttacks=Attacks in Assault Mode pierce, dealing damage to enemy units behind the target.
+Button/Tooltip/AP_HHVikingPiercingAttacksGoliath=Ground attacks pierce, dealing damage to enemy units behind the target.
Button/Tooltip/AP_HHVikingRockets=Launches rockets at the target unit. Each rocket deals ( vs armored) damage.
Button/Tooltip/AP_HHWidowMineDeathBlossom=Reduce Sentinel Missile Cooldown by . When killed the Widow Mine will launch 5 Sentinel Missiles at random nearby targets that deal (+ vs. shields) area damage.
Button/Tooltip/AP_HHWidowMineRangeAttack=Sentinel missile range is increased by 50%.
@@ -3391,6 +3395,13 @@ Button/Tooltip/AP_TrooperMengskSpecializeImproved=Arms the Trooper with a more p
Button/Tooltip/AP_TrooperMengskBuild=A list of combat structures.
Button/Tooltip/AP_TrooperMengskWeaponDrop=Advanced weapons are dropped on ground on death to be able to be picked up by an another Dominion Trooper.
Button/Tooltip/AP_LeadFarmer=Son's of Korhal Gauss Rifle deals splash damage in a small area around the target.
+Button/Tooltip/AP_GoliathMengskRank1=Rank 1: Air attacks do full damage to all targets.
+Button/Tooltip/AP_GoliathMengskRank1Preview=Rank 1: Air attacks do full damage to all targets.
+Button/Tooltip/AP_GoliathMengskRank2=Rank 2: Gains the Shredder Rounds ability.
+Button/Tooltip/AP_GoliathMengskRank2Preview=Rank 2: Gains the Shredder Rounds ability.
+Button/Tooltip/AP_GoliathMengskRank3=Rank 3: Gains the Lockdown Missiles ability.
+Button/Tooltip/AP_GoliathMengskRank3Preview=Rank 3: Gains the Lockdown Missiles ability.
+Button/Tooltip/AP_NovaUnitLockdown=Stuns and disables the detection of mechanical units hit by the Bulwark Company's anti-air attacks for seconds.Heroic units are immune.
Effect/Name/AP_250mmStrikeCannonsApplyBehavior=250mm Strike Cannons (Apply Behavior)
Effect/Name/AP_250mmStrikeCannonsCreatePersistent=250mm Strike Cannons (Create Persistent)
Effect/Name/AP_250mmStrikeCannonsDamage=250mm Strike Cannons (Damage)
@@ -5187,6 +5198,8 @@ RequirementNode/Tooltip/AP_GTECountBehaviorMengskVeterancyVikingMengskCompleteOn
RequirementNode/Tooltip/AP_GTECountBehaviorMengskVeterancyVikingMengskCompleteOnlyAtUnit4=Rank: 3
RequirementNode/Tooltip/AP_GTECountBehaviorMengskVeterancyMarineMengskCompleteOnlyAtUnit2=Rank: 1
RequirementNode/Tooltip/AP_GTECountBehaviorMengskVeterancyMarineMengskCompleteOnlyAtUnit4=Rank: 3
+RequirementNode/Tooltip/AP_GTECountBehaviorMengskVeterancyGoliathMengskCompleteOnlyAtUnit3=Rank: 2
+RequirementNode/Tooltip/AP_GTECountBehaviorMengskVeterancyGoliathMengskCompleteOnlyAtUnit4=Rank: 3
RequirementNode/Tooltip/AP_LTCountUnitInterceptorPurifierQueuedOrBetterAtUnit8=Trireme must have fewer than 8 Interceptors
RequirementNode/Tooltip/AP_LTCountUnitInterceptorQueuedOrBetterAtUnit8=Carrier must have fewer than 8 Interceptors
RequirementNode/Tooltip/AP_LTCountUnitInterceptorTaldarimQueuedOrBetterAtUnit8=Skylord must have fewer than 8 Interceptors
@@ -5679,6 +5692,7 @@ Unit/Name/AP_Zergling=Zergling
Unit/Name/AP_ZerglingRespawnControllerUnit=Zergling Reconstitution Controller Unit
Unit/Name/AP_ZerglingRespawnWeapon=Zergling Reconstitution Weapon
Unit/Name/AP_MarineMengsk=Son of Korhal
+Unit/Name/AP_GoliathMengsk=Bulwark Company
Unit/ShieldArmorName/AP_DefensiveMatrixShields=Defensive Matrix
Unit/ShieldArmorName/AP_NovaShieldArmor=Terran Energy Shields
Unit/ShieldArmorName/AP_TerranShieldArmor=Terran Energy Shields
@@ -6425,6 +6439,7 @@ Weapon/Name/AP_TrooperMengskFlamethrower=CPO-7 Salamander Flamethrower
Weapon/Name/AP_TrooperMengsk=Ferromag SMG
Weapon/Name/AP_TrooperMengskRocket=Hailstorm Launcher
Weapon/Name/AP_TrooperMengskImproved=B-2 High-Cal LMG
+Weapon/Name/AP_GoliathMengskL1Fake=Twin Autocannons (Ground)Hellfire Missile Pack (Air)
Weapon/Tip/AP_AcidSpines=
Weapon/Tip/AP_BaseLaserBatteryMengskL1Fake=Deals damage to ground targets and damage to air targets.
Weapon/Tip/AP_BaseLaserBatteryMengskL2Fake=Deals damage to ground targets and damage to air targets.
@@ -6454,3 +6469,7 @@ Weapon/Tip/AP_VoidRayChargeBeamBounce=Deals damage to secondary target if not charged, ( vs Armored) damage to secondary targets if halfway charged, ( vs Armored) damage to secondary targets damage if fully charged.
Weapon/Tip/AP_VoidRayChargeBeamRange=Deals ( vs Armored) damage if halfway charged, ( vs Armored) damage if fully charged.
Weapon/Tip/AP_VoidRayPurifierWeaponInfo=Generates 1 new beam every seconds, to a maximum of .
+Weapon/Tip/AP_GoliathMengskL1Fake=Ground Attack:Damage: Range: Weapon Speed: Air Attack:Damage: + vs ArmoredAttacks: Range: Weapon Speed:
+Weapon/Tip/AP_GoliathMengskL2Fake=Ground Attack:Damage: Range: Weapon Speed: Air Attack:Damage: Attacks: Range: Weapon Speed:
+Weapon/Tip/AP_GoliathMengskL3Fake=Ground Attack:Damage: Range: Weapon Speed: Air Attack:Damage: Attacks: Range: Weapon Speed:
+Weapon/Tip/AP_GoliathMengskL3Fake=Ground Attack:Damage: Range: Weapon Speed: Air Attack:Damage: Attacks: Range: Weapon Speed:
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index c3fb7079e..900ffe9e7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -4,6 +4,7 @@ Category/Name/lib_15EF4C78_07B1D199=TerranUnits
Category/Name/lib_15EF4C78_07BAB3B5=Transformer Land
Category/Name/lib_15EF4C78_08D1ACFC=Confusion
Category/Name/lib_15EF4C78_0D2EF023=Hero Revive
+Category/Name/lib_15EF4C78_0E533547=Bulwark Company
Category/Name/lib_15EF4C78_0F8DA55E=MengkskNuke
Category/Name/lib_15EF4C78_1034387E=Tech Lab
Category/Name/lib_15EF4C78_103E52F1=Util
@@ -151,6 +152,7 @@ FunctionDef/Name/lib_15EF4C78_275885FD=Handle Kerrigan Death
FunctionDef/Name/lib_15EF4C78_279CD883=AP_Player_setCoopHeroPanelUnit
FunctionDef/Name/lib_15EF4C78_2953149F=Set Hero Reviver Cocoon
FunctionDef/Name/lib_15EF4C78_2A71E457=PU_TargetingSetInstructionText
+FunctionDef/Name/lib_15EF4C78_2DB15839=AP_Player_updateBulwarkCompanyWeapons
FunctionDef/Name/lib_15EF4C78_2E1B3C2C=Spear of Adun Energy
FunctionDef/Name/lib_15EF4C78_2EE529B4=NM_HeroTypeFromUnitType
FunctionDef/Name/lib_15EF4C78_2F6D9BC7=AP_Player_UnitIsMindControlled
@@ -412,6 +414,7 @@ ParamDef/Name/lib_15EF4C78_D354F56C=Flags
ParamDef/Name/lib_15EF4C78_D5230579=Instant
ParamDef/Name/lib_15EF4C78_D5D42FF7=Enable
ParamDef/Name/lib_15EF4C78_D63247B4=Trooper
+ParamDef/Name/lib_15EF4C78_D68F7D73=unit
ParamDef/Name/lib_15EF4C78_D6A98D5D=Duration
ParamDef/Name/lib_15EF4C78_D6D4871C=Target Point
ParamDef/Name/lib_15EF4C78_D847A707=TargetPoint
@@ -544,6 +547,7 @@ Trigger/Name/lib_15EF4C78_4AA07320=PM_SoATargetingEffectFired
Trigger/Name/lib_15EF4C78_4C0CB8EF=AP_Player_Terran_MercCompoundTabSetInfantry
Trigger/Name/lib_15EF4C78_4F658D16=ZerglingRespawnFindPrimaryOnZerglingDeath
Trigger/Name/lib_15EF4C78_5108DB61=AP_Player_Zerg_MercCompoundTabSetBroodWar
+Trigger/Name/lib_15EF4C78_511B3A86=AP_Player_onBulwarkCompanyLevelChange
Trigger/Name/lib_15EF4C78_51684111=CM_Mengsk_WeaponPickupRegister
Trigger/Name/lib_15EF4C78_51FE7576=AP_Player_Merc_ArrayInit
Trigger/Name/lib_15EF4C78_533D5678=PM_CinematicModeOff
@@ -897,6 +901,7 @@ Variable/Name/lib_15EF4C78_7B894238=CU_HeroDialogShieldLabel
Variable/Name/lib_15EF4C78_7B90BD21=currentPlayer
Variable/Name/lib_15EF4C78_7BC74BD0=AP_Player_KerriganLevel
Variable/Name/lib_15EF4C78_7BD30748=ZS_SwarmHeroUIDamageTimer
+Variable/Name/lib_15EF4C78_7C6533B0=unit
Variable/Name/lib_15EF4C78_7CD77619=Damage Bar
Variable/Name/lib_15EF4C78_7D389C68=ZS_SwarmHeroUIDialogNameLabel
Variable/Name/lib_15EF4C78_7D4DD316=Index
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 9570c3d31..8bfa13f0c 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -262,7 +262,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranUnits2 (int lp_player, int lp_bitArr
libABFE498B_gf_AP_Triggers_Terran_unlockEmperorsShadow, // 3
libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooper, // 4
libABFE498B_gf_AP_Triggers_Terran_unlockSonOfKorhal, // 5
- ap_triggers_PlayerConsumer_sig, // 6
+ libABFE498B_gf_AP_Triggers_Terran_unlockBulwarkCompany, // 6
ap_triggers_PlayerConsumer_sig, // 7
ap_triggers_PlayerConsumer_sig, // 8
ap_triggers_PlayerConsumer_sig, // 9
@@ -2029,6 +2029,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBlackhammer (int lp_player) {
// Automatic Variable Declarations
// Implementation
TechTreeUnitAllow(lp_player, "AP_FactoryMengsk", true);
+ TechTreeUnitAllow(lp_player, "AP_Armory", true);
TechTreeUnitAllow(lp_player, "AP_ThorMengsk", true);
}
@@ -2056,6 +2057,13 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockSonOfKorhal (int lp_player) {
TechTreeUnitAllow(lp_player, "AP_MarineMengsk", true);
}
+void libABFE498B_gf_AP_Triggers_Terran_unlockBulwarkCompany (int lp_player) {
+ // Automatic Variable Declarations
+ // Implementation
+ TechTreeUnitAllow(lp_player, "AP_FactoryMengsk", true);
+ TechTreeUnitAllow(lp_player, "AP_GoliathMengsk", true);
+}
+
void libABFE498B_gf_AP_Triggers_Terran_unlockWarPigs (int lp_player) {
// Automatic Variable Declarations
// Implementation
@@ -4825,6 +4833,7 @@ void libABFE498B_gf_AP_Triggers_clearTerranTech (int lp_player) {
TechTreeUnitAllow(lp_player, "AP_GhostMengskResourceEfficiency", false);
TechTreeUnitAllow(lp_player, "AP_TrooperMengsk", false);
TechTreeUnitAllow(lp_player, "AP_MarineMengsk", false);
+ TechTreeUnitAllow(lp_player, "AP_GoliathMengsk", false);
TechTreeUnitAllow(lp_player, "AP_WarPig", false);
TechTreeUnitAllow(lp_player, "AP_DevilDog", false);
TechTreeUnitAllow(lp_player, "AP_HammerSecurity", false);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 966a05de1..ad9d907f8 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -193,6 +193,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBlackhammer (int lp_player);
void libABFE498B_gf_AP_Triggers_Terran_unlockAegisGuard (int lp_player);
void libABFE498B_gf_AP_Triggers_Terran_unlockEmperorsShadow (int lp_player);
void libABFE498B_gf_AP_Triggers_Terran_unlockSonOfKorhal (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockBulwarkCompany (int lp_player);
void libABFE498B_gf_AP_Triggers_Terran_unlockWarPigs (int lp_player);
void libABFE498B_gf_AP_Triggers_Terran_unlockDevilDogs (int lp_player);
void libABFE498B_gf_AP_Triggers_Terran_unlockHammerSecurities (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index 5bb688720..c3f413b15 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader and b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
index f8c756ff8..034473309 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version and b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 192d6daa6..83234832c 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2359,7 +2359,7 @@
libABFE498B_gf_AP_Triggers_Terran_unlockEmperorsShadow, // 3
libABFE498B_gf_AP_Triggers_Terran_unlockDominionTrooper, // 4
libABFE498B_gf_AP_Triggers_Terran_unlockSonOfKorhal, // 5
- ap_triggers_PlayerConsumer_sig, // 6
+ libABFE498B_gf_AP_Triggers_Terran_unlockBulwarkCompany, // 6
ap_triggers_PlayerConsumer_sig, // 7
ap_triggers_PlayerConsumer_sig, // 8
ap_triggers_PlayerConsumer_sig, // 9
@@ -9629,6 +9629,7 @@
+
@@ -13144,6 +13145,7 @@
+
@@ -13176,6 +13178,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_Armory
+
+
+
@@ -13428,6 +13450,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_FactoryMengsk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengsk
+
+
+
@@ -37169,6 +37247,7 @@
+
@@ -38113,6 +38192,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_GoliathMengsk
+
+
+
Mercs
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index 663b3c68c..1f3b46cee 100644
Binary files a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version and b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version differ
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 236f4dcb3..c52c50836 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -121,6 +121,7 @@ FunctionDef/Name/lib_ABFE498B_01C499CC=AP_Triggers_Terran_unlockBansheeProgressi
FunctionDef/Name/lib_ABFE498B_023384E7=AP_Triggers_Protoss_unlockAirArmor
FunctionDef/Name/lib_ABFE498B_0293BB66=AP_Triggers_Terran_unlockDominionTrooperB2HighCalLMG
FunctionDef/Name/lib_ABFE498B_030295B8=AP_Triggers_Terran_unlockDominionTrooperAdvancedAlloys
+FunctionDef/Name/lib_ABFE498B_0338F10A=AP_Triggers_Terran_unlockBulwarkCompany
FunctionDef/Name/lib_ABFE498B_03390008=AP_Triggers_Zerg_ImpalerAdativeTalons
FunctionDef/Name/lib_ABFE498B_034197E3=AP_Triggers_Terran_unlockWraithAdvancedLaserTechnology
FunctionDef/Name/lib_ABFE498B_034CD106=AP_Triggers_Protoss_unlockPhoenixAiur
@@ -1774,6 +1775,7 @@ ParamDef/Name/lib_ABFE498B_F99A3CFA=player
ParamDef/Name/lib_ABFE498B_F9C6B303=bitArrayValue
ParamDef/Name/lib_ABFE498B_FA130FC2=player
ParamDef/Name/lib_ABFE498B_FA31C4D9=bitArrayValue
+ParamDef/Name/lib_ABFE498B_FA6460EA=player
ParamDef/Name/lib_ABFE498B_FB11386D=player
ParamDef/Name/lib_ABFE498B_FB1AC57D=level
ParamDef/Name/lib_ABFE498B_FB6CFB95=player