diff --git a/mods/ca/bits/thwk.shp b/mods/ca/bits/thwk.shp index 46c34799b0..143733f6d5 100644 Binary files a/mods/ca/bits/thwk.shp and b/mods/ca/bits/thwk.shp differ diff --git a/mods/ca/bits/thwkicnh.shp b/mods/ca/bits/thwkicnh.shp index 0bbf4ed30c..6e8aed6a19 100644 Binary files a/mods/ca/bits/thwkicnh.shp and b/mods/ca/bits/thwkicnh.shp differ diff --git a/mods/ca/bits/thwkm.shp b/mods/ca/bits/thwkm.shp index 40e003599e..621b1f5fdb 100644 Binary files a/mods/ca/bits/thwkm.shp and b/mods/ca/bits/thwkm.shp differ diff --git a/mods/ca/bits/thwkmgrey.shp b/mods/ca/bits/thwkmgrey.shp deleted file mode 100644 index 621b1f5fdb..0000000000 Binary files a/mods/ca/bits/thwkmgrey.shp and /dev/null differ diff --git a/mods/ca/bits/thwktempty.shp b/mods/ca/bits/thwktempty.shp deleted file mode 100644 index 15e39e4551..0000000000 Binary files a/mods/ca/bits/thwktempty.shp and /dev/null differ diff --git a/mods/ca/bits/thwktfull.shp b/mods/ca/bits/thwktfull.shp deleted file mode 100644 index 2a71caa9d3..0000000000 Binary files a/mods/ca/bits/thwktfull.shp and /dev/null differ diff --git a/mods/ca/bits/thwktfullgrey.shp b/mods/ca/bits/thwktfullgrey.shp deleted file mode 100644 index 8fc4642fba..0000000000 Binary files a/mods/ca/bits/thwktfullgrey.shp and /dev/null differ diff --git a/mods/ca/bits/upg-thwkicnh.shp b/mods/ca/bits/upg-thwkicnh.shp new file mode 100644 index 0000000000..5270590d7b Binary files /dev/null and b/mods/ca/bits/upg-thwkicnh.shp differ diff --git a/mods/ca/rules/upgrades.yaml b/mods/ca/rules/upgrades.yaml index 6ad46f7105..3afd0ace8d 100644 --- 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 index ef45b5399a..87e1f55028 100644 --- 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 index 8959fdba00..e690d4d6c5 100644 --- 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 index 0056e4524d..789d33c699 100644 --- 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 index adda8853b8..890caba7f5 100644 --- 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 \ No newline at end of file