remove unnecessary fixes

Ahli · May 20, 2024 · 8fd7453 · 8fd7453
1 parent 6f93b6c
commit 8fd7453
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git a/AhliObs.SC2Mod/GameData.version b/AhliObs.SC2Mod/GameData.version
diff --git 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,19 +384,14 @@ 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
 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=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
@@ -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