From 32b094d4c72ad7dc22b5cfbae76451447bc652f6 Mon Sep 17 00:00:00 2001
From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:44:03 -0400
Subject: [PATCH] fixing force field shattering

---
 .../Base.SC2Data/GameData/AbilData.xml                | 11 +++++++++++
 .../Base.SC2Data/GameData/UnitData.xml                |  5 +++--
 .../Base.SC2Data/GameData/UnitData.xml                |  8 ++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 922aa8198..7d09d889f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -11011,4 +11011,15 @@
         <!-- Should fix Mind control-related issues -->
         <MaxCount value="2"/>
     </CAbilArmMagazine>
+    <CAbilEffectTarget id="AP_Shatter">
+        <Flags index="AutoCast" value="1"/>
+        <Flags index="AutoCastOn" value="1"/>
+        <Flags index="ReExecutable" value="1"/>
+        <Effect index="0" value="Suicide"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="Shatter"/>
+        <Range value="0.1"/>
+        <AutoCastRange value="1"/>
+        <AutoCastFilters value="Ground,Massive;Structure,Missile,Destructible,Stasis,Dead,Hidden,Hallucination"/>
+        <Arc value="360"/>
+    </CAbilEffectTarget>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 467c8daa1..a740fbacc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15849,8 +15849,9 @@
         <Collide index="Colossus" value="1"/>
         <Collide index="ForceField" value="1"/>
         <Collide index="Small" value="1"/>
-        <LifeStart value="200"/>
-        <LifeMax value="200"/>
+        <LifeStart value="15"/>
+        <LifeMax value="15"/>
+        <AbilArray Link="AP_Shatter"/>
         <Radius value="1.5"/>
         <SeparationRadius value="0"/>
         <InnerRadius value="0.5"/>
diff --git a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 6dec031f4..7ee5c6846 100644
--- a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Catalog>
+    <CUnit id="ForceField">
+        <AbilArray Link="AP_Shatter"/>
+        <!-- Do not give this unit a footprint because that can allow units to walk into unpathable areas -->
+    </CUnit>
     <CUnit id="TechReactor">
         <!-- Override -->
         <!-- Add-on stealing -->
@@ -56,4 +60,4 @@
             <LayoutButtons Face="AP_MagrailMunitions" Type="AbilCmd" AbilCmd="AP_MagrailMunitionsMarine,Execute" Row="2" Column="1"/>
         </CardLayouts>
     </CUnit>
-</Catalog>
\ No newline at end of file
+</Catalog>