Add THWK Upg

Clean up
Inq8 · Dec 30, 2023 · e1011ad · e1011ad
1 parent 7d5d404
commit e1011ad
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 14 deletions.
diff --git a/mods/ca/bits/thwk.shp b/mods/ca/bits/thwk.shp
diff --git a/mods/ca/bits/thwkicnh.shp b/mods/ca/bits/thwkicnh.shp
diff --git a/mods/ca/bits/thwkm.shp b/mods/ca/bits/thwkm.shp
diff --git a/mods/ca/bits/thwkmgrey.shp b/mods/ca/bits/thwkmgrey.shp
diff --git a/mods/ca/bits/thwktempty.shp b/mods/ca/bits/thwktempty.shp
diff --git a/mods/ca/bits/thwktfull.shp b/mods/ca/bits/thwktfull.shp
diff --git a/mods/ca/bits/thwktfullgrey.shp b/mods/ca/bits/thwktfullgrey.shp
diff --git a/mods/ca/bits/upg-thwkicnh.shp b/mods/ca/bits/upg-thwkicnh.shp
diff --git a/mods/ca/rules/upgrades.yaml b/mods/ca/rules/upgrades.yaml
@@ -260,16 +260,33 @@ bjet.upgrade:
 		Name: Research: Bombardier
 	Buildable:
 		BuildPaletteOrder: 30
-		Prerequisites: ~player.gdi, gtek, ~bombard.strat, ~techlevel.high
+		Prerequisites: ~player.gdi, gtek, ~techlevel.high
 		Description: Allows construction of Bombardiers.\n\nReplaces: JumpJet Trooper
 	TooltipExtras:
-		Strengths: + Strong vs Buildingsn\n+ Increased range
+		Strengths: + Strong vs Buildings\n+ Increased range
 		Weaknesses: – Slow projectiles\n– Increased cost
 	Valued:
 		Cost: 1000
 	RenderSprites:
 		Image: bjet.upgrade
 
+thwk.upgrade:
+	Inherits: ^Upgrade
+	Tooltip:
+		Name: Research: Tomahawk Launcher
+	Buildable:
+		BuildPaletteOrder: 30
+		IconPalette: chrometd
+		Prerequisites: ~player.gdi, gtek, ~bombard.strat, ~techlevel.high
+		Description: Allows construction of Tomahawk Missile Launchers.
+	TooltipExtras:
+		Strengths: + Strong vs Buildings\n+ Extremely long range
+		Weaknesses: – Projectiles can be shot down\n– Slow rate of fire
+	Valued:
+		Cost: 1000
+	RenderSprites:
+		Image: thwk.upgrade
+
 tow.upgrade:
 	Inherits: ^Upgrade
 	Tooltip:

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
@@ -6879,7 +6879,7 @@ THWK:
 		AddToArmyValue: true
 	Buildable:
 		BuildPaletteOrder: 240
-		Prerequisites: gtek, ~vehicles.htnk, ~techlevel.high
+		Prerequisites: gtek, ~thwk.upgrade, ~techlevel.high
 		Queue: VehicleSQ, VehicleMQ
 		IconPalette: chrometd
 		Description: Long-range incendiary missile artillery.
@@ -6911,9 +6911,9 @@ THWK:
 		PauseOnCondition: empdisable || being-warped
 	WithSpriteTurret@OneMissile:
 		RequiresCondition: loaded
-	WithSpriteTurret@NoMissiles:
+	WithSpriteTurret@NoMissile:
 		RequiresCondition: !loaded
-		Sequence: turret0
+		Sequence: turret-empty
 	MissileSpawnerMaster:
 		Actors: TH
 		RespawnTicks: 249

diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml
@@ -825,7 +825,7 @@ v3:
 
 th:
 	idle:
-		Filename: thwkmgrey.shp
+		Filename: thwkm.shp
 		Facings: 32
 		ZOffset: 2046
 

diff --git a/mods/ca/sequences/upgrades.yaml b/mods/ca/sequences/upgrades.yaml
@@ -74,6 +74,10 @@ bjet.upgrade:
 	icon:
 		Filename: upg-bjeticon.shp
 
+thwk.upgrade:
+	icon:
+		Filename: upg-thwkicnh.shp
+
 tow.upgrade:
 	icon:
 		Filename: upg-towicon.shp

diff --git a/mods/ca/sequences/vehicles.yaml b/mods/ca/sequences/vehicles.yaml
@@ -2329,15 +2329,13 @@ thwk:
 		Facings: 32
 		UseClassicFacings: True
 	turret:
-		Filename: thwktfullgrey.shp
-		Facings: 32
-		UseClassicFacings: True
-	turret1:
-		Filename: thwktfullgrey.shp
+		Filename: thwk.shp
+		Start: 32
 		Facings: 32
 		UseClassicFacings: True
-	turret0:
-		Filename: thwktempty.shp
+	turret-empty:
+		Filename: thwk.shp
+		Start: 64
 		Facings: 32
 		UseClassicFacings: True
 	icon:
@@ -2351,7 +2349,8 @@ thwk.destroyed:
 		UseClassicFacings: True
 		ZOffset: -512
 	turret:
-		Filename: thwktempty.shp
+		Filename: thwk.shp
+		Start: 64
 		Facings: 32
 		UseClassicFacings: True
 		ZOffset: -512