From 8fd74530cc176ca68549f2b67903580f3bc1b89e Mon Sep 17 00:00:00 2001
From: Christoph Ahlers <Ahli@users.noreply.github.com>
Date: Mon, 20 May 2024 11:24:58 +0200
Subject: [PATCH] remove unnecessary fixes

---
 .../Base.SC2Data/GameData/ActorData.xml       |   7 ------
 .../Base.SC2Data/GameData/EffectData.xml      |   3 ---
 .../Base.SC2Data/GameData/UnitData.xml        |  10 ---------
 AhliObs.SC2Mod/DocumentHeader                 | Bin 28423 -> 28564 bytes
 AhliObs.SC2Mod/DocumentInfo                   |   3 +++
 AhliObs.SC2Mod/DocumentInfo.version           | Bin 44 -> 44 bytes
 AhliObs.SC2Mod/GameData.version               | Bin 44 -> 44 bytes
 AhliObs.SC2Mod/PreloadAssetDB.txt             |  20 ++----------------
 .../LocalizedData/GameStrings.txt             |   2 ++
 9 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/AhliObs.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/AhliObs.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index ef69100..26677a6 100644
--- a/AhliObs.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/AhliObs.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -249,11 +249,4 @@
         <CustomUnitStatusOffset value="0,105"/>
         <CustomUnitStatusAttachment value="Ref_Origin"/>
     </CActorUnit>
-    <CActorModel id="PlaceholderModelOrbitalCommand" parent="PlaceholderModelStaticPosition">
-        <On Terms="ActorCreation; ModelIsLowQuality" Send="AnimGroupApply B {} {} Instant"/>
-        <On Terms="ActorCreation; ModelIsLowQuality" Send="AnimSetPausedAll"/>
-    </CActorModel>
-    <CActorUnit id="ThornLizard">
-        <DeathArray index="Normal" ModelLink="ThornLizardDeath"/>
-    </CActorUnit>
 </Catalog>
diff --git a/AhliObs.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/AhliObs.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 167df1d..09dc810 100644
--- a/AhliObs.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/AhliObs.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -5,7 +5,4 @@
     <CEffectSet id="AHLI_ArchonDTDTDies"/>
     <CEffectSet id="AHLI_PowerLevelLost"/>
     <CEffectSet id="AHLI_PowerLevelGained"/>
-    <CEffectDamage id="MULEFate">
-        <Death value="Timeout"/>
-    </CEffectDamage>
 </Catalog>
diff --git a/AhliObs.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/AhliObs.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index f921041..4c8d9db 100644
--- a/AhliObs.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/AhliObs.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -21,16 +21,6 @@
     <CUnit id="RefineryRich">
         <LeaderAlias value="Refinery"/>
     </CUnit>
-    <CUnit id="ShieldBattery">
-        <CardLayouts index="0">
-            <LayoutButtons index="0" Face="Stop" AbilCmd="stop,Stop" Row="0" Column="1"/>
-            <LayoutButtons index="1" Face="CancelBuilding" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
-            <LayoutButtons index="2" Face="ShieldBatteryRecharge" AbilCmd="ShieldBatteryRechargeEx5,Execute" Row="0" Column="0"/>
-            <LayoutButtons Face="ShieldBatteryRecharge" AbilCmd="ShieldBatteryRechargeEx5,Execute" Row="0" Column="0"/>
-            <LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
-            <LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
-        </CardLayouts>
-    </CUnit>
     <CUnit id="StarportReactor">
         <LeaderAlias value="Reactor"/>
     </CUnit>
diff --git a/AhliObs.SC2Mod/DocumentHeader b/AhliObs.SC2Mod/DocumentHeader
index 6fb441ca5518036ea09552fa319c843ba7c8f503..f1b2e09a4c233671fa4c3d6e561bc27842faf450 100644
GIT binary patch
delta 78
zcmZp_$2jFaql$--b1(-31A|d80|O%~1210&BLfIC0mYh2tP?<ZqKYeH-o~sy0?bAx
bW|NmPMQ%<PydVqYm`>int-sk^|AIXL*@6_{

delta 62
zcmbPopRxTOql$--b1(-31A|d80|O%~1NZDCMg|aO0*Z+i6!n7eL={)YoQ+w31U4TO
MyePZ*i2en80O(;7X#fBK

diff --git a/AhliObs.SC2Mod/DocumentInfo b/AhliObs.SC2Mod/DocumentInfo
index 6b2d5ec..94d8546 100644
--- a/AhliObs.SC2Mod/DocumentInfo
+++ b/AhliObs.SC2Mod/DocumentInfo
@@ -42,6 +42,7 @@
             <Value>1.20</Value>
             <Value>1.21</Value>
             <Value>1.22</Value>
+            <Value>1.23</Value>
         </Version>
         <Date>
             <Value>11/21/2019</Value>
@@ -67,6 +68,7 @@
             <Value>1/24/2023</Value>
             <Value>7/23/2023</Value>
             <Value>8/22/2023</Value>
+            <Value>5/20/2024</Value>
         </Date>
         <Notes>
             <Value>1,31</Value>
@@ -92,6 +94,7 @@
             <Value>223,224,225</Value>
             <Value>226,227,228,229,230,231,232,233,234,235,236,237,238,239,240</Value>
             <Value>241,242,243,244</Value>
+            <Value>245,246</Value>
         </Notes>
     </PatchNote>
 </DocInfo>
diff --git a/AhliObs.SC2Mod/DocumentInfo.version b/AhliObs.SC2Mod/DocumentInfo.version
index b0ced8f0352ebf4f28964b0e1588658e9a964ac9..f334a75037fb83a48465d8a4cbd7e0b773df5ac6 100644
GIT binary patch
literal 44
ocmYdJNiEJ#%gbb9U|`_OU}Rtg(jdSK#2`KgklrEYoyG{H0jDkn)&Kwi

literal 44
pcmYdJNiEJ#%gbb9U|^V?#K^!3q(Oiih(UaIAl>ulNeUy71^~#+2r>Ww

diff --git a/AhliObs.SC2Mod/GameData.version b/AhliObs.SC2Mod/GameData.version
index c7e7f3cc73c78fd8db555d242a69ae4706333180..d195ed3be30a400547e6edc513465177d20ef305 100644
GIT binary patch
literal 44
ocmYdJNi9xHNla&AU|`_OU}Rtg(jdSK#2~%`kUlT!oyG{H0i;O<<p2Nx

literal 44
pcmYdJNi9xHNla&AU|^V?#K^!3q(Oiih(UZ=AYHiQX$m8d1^~iv2g?8e

diff --git a/AhliObs.SC2Mod/PreloadAssetDB.txt b/AhliObs.SC2Mod/PreloadAssetDB.txt
index 066247c..63acde5 100644
--- a/AhliObs.SC2Mod/PreloadAssetDB.txt
+++ b/AhliObs.SC2Mod/PreloadAssetDB.txt
@@ -274,14 +274,6 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
 Model=Invisible,##id##
 Sound=Doodad_##id##
 Texture=LogoBlank
-id=ThornLizard
-path=Assets\Textures\.dds
-asset=Wireframe-Critter-thornlizard,btn-upgrade-protoss-shieldslevel0,ui_ingame_workercount_bg
-Actor=CliffLocalSelection,CliffLocalSelectionObserver,CliffPreSelection,CliffPreSelectionObserver,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,CritterExplosion,DeadAnimationMacro,EditorSelection,FlyerHelperSplat,FlyerShadow,GroundLocalFlashingSelection,GroundLocalSelection,GroundLocalSelectionObserver,GroundPreSelection,GroundPreSelectionObserver,GroundShadow,GroundSyncFlashingSelection,GroundSyncSelection,ModelPretargetGround,PlaceholderModel,PlacementModel,PortraitActor,PrimaryGroundSyncSelectionObserver,SecondaryGroundSyncSelectionObserver,Snapshot,SoundEmitter,TerrainMgr,UnitDeathModel,UnitDeathModelUnscaled,UnitDeathSound,UnitDeathVoice,UnitFootprint,UnitSound
-Model=Invisible,ProtossSmallUnitDeathLow,StaticPortrait,TerranSmallUnitDeathLow,##id##,##id##Death,ZergSmallUnitDeathLow
-Sound=Karak_What,##id##_Ambience
-id=PlaceholderModelOrbitalCommand
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Behavior]
 id=PowerUserQueue
@@ -316,9 +308,6 @@ asset=Assets\Textures\btn-missing-kaeo.dds
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Effect]
-id=MULEFate
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Alert=MULEExpired
 id=AHLI_OverlordTransportDies
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AHLI_ArchonHTHTDies
@@ -383,7 +372,7 @@ id=FactoryTechLab
 Abil=BarracksTechLabMorph,BuildInProgress,##id##Research,StarportTechLabMorph,TechLabMorph,que5Addon
 Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,##id##,##id##Splat,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,TerranFlamesSmallBuilding,UnitPointsTextAll
 Behavior=AddonIsWorking,BarracksTechLab,##id##,StarportTechLab,TerranBuildingBurnDown
-Button=Cancel,CancelBuilding,CycloneResearchLockOnDamageUpgrade,ResearchDrillClaws,ResearchHighCapacityBarrels,ResearchSmartServos
+Button=Cancel,CancelBuilding,CycloneResearchHurricaneThrusters,ResearchDrillClaws,ResearchHighCapacityBarrels,ResearchSmartServos
 Unit=TechLab
 id=FactoryReactor
 Abil=BarracksReactorMorph,BuildInProgress,ReactorMorph,StarportReactorMorph
@@ -395,7 +384,7 @@ id=StarportTechLab
 Abil=BarracksTechLabMorph,BuildInProgress,FactoryTechLabMorph,##id##Research,TechLabMorph,que5Addon
 Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,##id##,##id##Splat,TerrainMgr,TerranFlamesSmallBuilding,UnitPointsTextAll
 Behavior=AddonIsWorking,BarracksTechLab,FactoryTechLab,##id##,TerranBuildingBurnDown
-Button=BansheeSpeed,Cancel,CancelBuilding,ResearchBansheeCloak
+Button=BansheeSpeed,Cancel,CancelBuilding,ResearchBansheeCloak,ResearchRavenInterferenceMatrix
 Unit=TechLab
 id=StarportReactor
 Abil=BarracksReactorMorph,BuildInProgress,FactoryReactorMorph,ReactorMorph
@@ -403,11 +392,6 @@ Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,Comm
 Behavior=BarracksReactor,FactoryReactor,##id##,TerranBuildingBurnDown
 Button=CancelBuilding
 Unit=Reactor
-id=ShieldBattery
-Abil=BuildInProgress,##id##RechargeEx5,stop
-Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,##id##,ShieldImpact,TerrainMgr,UnitPointsTextAll
-Behavior=BatteryEnergy,PowerUserQueueSmall
-Button=CancelBuilding,##id##Recharge,Stop
 id=AssimilatorRich
 Abil=BuildInProgress
 Actor=##id##,##id##Splat,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
diff --git a/AhliObs.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/AhliObs.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index ffb11ce..2142288 100644
--- a/AhliObs.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/AhliObs.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -258,6 +258,8 @@ DocInfo/PatchNote241=SC2 Bug Fixes/Changes:
 DocInfo/PatchNote242=- removed now unnecessary fixes as they are now included in SC2
 DocInfo/PatchNote243=- fixed Orbital Command's landing preview model not being displayed
 DocInfo/PatchNote244=- fixed Shield Battery's hotkey menu containing two Recharge buttons
+DocInfo/PatchNote245=SC2 Bug Fixes/Changes:
+DocInfo/PatchNote246=- removed now unnecessary fixes as they are now included in SC2
 DocInfo/Screenshot01=Use with Ahli's modified observer UIs for the full expanded observing feature experience!
 DocInfo/Website=https://github.com/Ahli/AhliObs-SC2-Mod
 Effect/Name/AHLI_PowerLevelGained=AHLI_PowerLevelGained