From e3c8199ca304bc04b3f3cc9410d2c35c116915d0 Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Sat, 6 Jul 2024 19:36:55 +0200
Subject: [PATCH] Fix a bug with Roaches in race-swapped WoL missions

---
 .../Base.SC2Data/GameData/EffectData.xml             |  2 +-
 .../Base.SC2Data/GameData/RequirementData.xml        |  4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml    |  3 +++
 .../Base.SC2Data/GameData/ValidatorData.xml          |  4 ++++
 .../Base.SC2Data/GameData/WeaponData.xml             | 12 ++++++------
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 3874568b2..8813a9cb0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -4249,7 +4249,7 @@
         <Death value="Disintegrate"/>
     </CEffectDamage>
     <CEffectApplyBehavior id="AP_BileDuctsApplyBehavior">
-        <ValidatorArray index="0" value="UseBileDucts"/>
+        <ValidatorArray index="0" value="AP_UseBileDucts"/>
         <EditorCategories value="Race:Zerg"/>
         <Behavior value="AP_BileDucts"/>
     </CEffectApplyBehavior>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 01d792e70..15b516f0c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3431,4 +3431,8 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountBehaviorVoidRaySwarmDamageBoostCompleteOnlyAtUnit"/>
     </CRequirement>
+    <CRequirement id="AP_HaveHotSEnhancedBileDucts">
+        <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="CountUpgradeHotSEnhancedBileDuctsCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 0c7a76b25..4ac82a676 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5907,4 +5907,7 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_VoidRaySwarmDamageBoost" State="CompleteOnlyAtUnit"/>
     </CRequirementCountBehavior>
+    <CRequirementCountUpgrade id="AP_CountUpgradeHotSEnhancedBileDuctsCompleteOnly">
+        <Count Link="AP_HotSEnhancedBileDucts" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index b6436d096..78093c810 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -5527,4 +5527,8 @@
     <CValidatorUnitType id="AP_IsInterceptorTaldarim">
         <Value value="AP_InterceptorTaldarim"/>
     </CValidatorUnitType>
+    <CValidatorPlayerRequirement id="AP_UseBileDucts">
+        <Find value="1"/>
+        <Value value="AP_HaveHotSEnhancedBileDucts"/>
+    </CValidatorPlayerRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index a9798dff0..13ffeac40 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -1183,9 +1183,9 @@
         <DisplayEffect value="AP_RoachUMelee"/>
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="0.5"/>
-        <Marker Link="Weapon/AcidSaliva"/>
+        <Marker Link="Weapon/AP_AcidSaliva"/>
         <Cost>
-            <Cooldown Link="Weapon/AcidSaliva"/>
+            <Cooldown Link="Weapon/AP_AcidSaliva"/>
         </Cost>
         <Period value="2"/>
         <Effect value="AP_RoachMeleeSet"/>
@@ -1239,9 +1239,9 @@
         <!-- Missing in Vanilla -->
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="0.5"/>
-        <Marker Link="Weapon/RoachCorpser"/>
+        <Marker Link="Weapon/AP_RoachCorpser"/>
         <Cost>
-            <Cooldown Link="Weapon/RoachCorpser"/>
+            <Cooldown Link="Weapon/AP_RoachCorpser"/>
         </Cost>
         <Period value="2"/>
         <Effect value="AP_RoachVileCorpserMeleeSet"/>
@@ -1255,9 +1255,9 @@
         <DisplayEffect value="AP_RoachVileUMelee"/>
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="0.5"/>
-        <Marker Link="Weapon/RoachVile"/>
+        <Marker Link="Weapon/AP_RoachVile"/>
         <Cost>
-            <Cooldown Link="Weapon/RoachVile"/>
+            <Cooldown Link="Weapon/AP_RoachVile"/>
         </Cost>
         <Period value="2"/>
         <Effect value="AP_RoachVileMeleeSet"/>