Tweak Cardinal, Radix, Zoryusthaleth, Lakizilisk; Tweak many audiovisuals; Add Cardinal unit responses

mpq/arr/flingy.txt

@@ -717,9 +717,9 @@ Maverick (Golden)
 Gladius (Order)
 Shaman (Upstart, Support)
 Shaman (Upstart, Adrenaline)
-Extended Flingy #511
-Extended Flingy #512
-Extended Flingy #513
+Ammo Crate
+Medkit
+Battery Cell
 Extended Flingy #514
 Extended Flingy #515
 Extended Flingy #516

mpq/arr/images.txt

@@ -2476,15 +2476,15 @@ Droleth Mutate
 Shaman (Upstart, Support)
 Shaman (Upstart) Shadow
 Shaman (Upstart, Adrenaline)
-Extended Image #1476
-Extended Image #1477
-Extended Image #1478
-Extended Image #1479
-Extended Image #1480
-Extended Image #1481
-Extended Image #1482
-Extended Image #1483
-Extended Image #1484
+Ammo Crate
+Ammo Crate Shadow
+Ammo Crate Shadow (Carried)
+Medkit
+Medkit Shadow
+Medkit Shadow (Carried)
+Battery Cell
+Battery Cell Shadow
+Battery Cell Shadow (Carried)
 Extended Image #1485
 Extended Image #1486
 Extended Image #1487

mpq/arr/sfxdata.txt

@@ -4346,25 +4346,25 @@ Askosi Structure Placement 01
 Iconoclast Weaponfire 01
 Iconoclast Weaponfire 02
 Iconoclast Weaponfire 03
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Cardinal Ready 01
+Cardinal Ready 02
+Cardinal Ready 03
+Cardinal Selected 01
+Cardinal Selected 02
+Cardinal Selected 03
+Cardinal Selected 04
+Cardinal Order Passive 01
+Cardinal Order Passive 02
+Cardinal Order Passive 03
+Cardinal Order Passive 04
+Cardinal Order Aggressive 01
+Cardinal Order Aggressive 02
+Cardinal Order Aggressive 03
+Cardinal Order Aggressive 04
+Cardinal Under Attack 01
+Cardinal Under Attack 02
+Cardinal Under Attack 03
+Cardinal Under Attack 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -4345,4 +4345,23 @@ cm\b\cloak-damage-off-02.wav
 cm\a\a-placement-01.wav
 cm\a\iconoclast\wf-01.wav
 cm\a\iconoclast\wf-02.wav
-cm\a\iconoclast\wf-03.wav
+cm\a\iconoclast\wf-03.wav
+cm\a\cardinal\rdy-01.wav
+cm\a\cardinal\rdy-02.wav
+cm\a\cardinal\rdy-03.wav
+cm\a\cardinal\wht-01.wav
+cm\a\cardinal\wht-02.wav
+cm\a\cardinal\wht-03.wav
+cm\a\cardinal\wht-04.wav
+cm\a\cardinal\yes-01.wav
+cm\a\cardinal\yes-02.wav
+cm\a\cardinal\yes-03.wav
+cm\a\cardinal\yes-04.wav
+cm\a\cardinal\agg-01.wav
+cm\a\cardinal\agg-02.wav
+cm\a\cardinal\agg-03.wav
+cm\a\cardinal\agg-04.wav
+cm\a\cardinal\hlp-01.wav
+cm\a\cardinal\hlp-02.wav
+cm\a\cardinal\hlp-03.wav
+cm\a\cardinal\hlp-04.wav

mpq/arr/sprites.txt

@@ -1189,9 +1189,9 @@ Maverick (Golden) Remains
 Gladius (Order)
 Shaman (Upstart, Support)
 Shaman (Upstart, Adrenaline)
-Extended Sprite #675
-Extended Sprite #676
-Extended Sprite #677
+Ammo Crate
+Medkit
+Battery Cell
 Extended Sprite #678
 Extended Sprite #679
 Extended Sprite #680

mpq/arr/units.txt

@@ -633,9 +633,9 @@ Bloodsummon Nihilist
 Faction Selection Askosi
 Terran Fleshthief (Nydus)
 Forerunner Lumen
-Extended Unit #408
-Extended Unit #409
-Extended Unit #410
+Ammo Crate
+Medkit
+Battery Cell
 Extended Unit #411
 Extended Unit #412
 Extended Unit #413

mpq/scripts/iscript_general.txt

@@ -5194,4 +5194,35 @@ MachinamentumDisable:
 MachinamentumEnable:
 	playfram          	0
 	wait              	1
-	goto              	MachinamentumWorkingToIdle
+	goto              	MachinamentumWorkingToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2478 Ammo Crate (cm\n\ammocrate.grp)
+.headerstart
+IsId          	385
+Type          	1
+Init          	AmmoCrateInit
+Death         	AmmoCrateDeath
+.headerend
+# ----------------------------------------------------------------------------- #
+
+AmmoCrateInit:
+	playfram          	0x00
+	pwrupcondjmp      	AmmoCrateLocal00
+	imgul             	2479 0 0 # Ammo Crate Shadow (Ground) (cm\n\ammocrate-shadow.grp)
+	goto              	AmmoCrateLocal01
+
+AmmoCrateLocal01:
+	wait              	125 
+	goto              	AmmoCrateLocal01
+
+AmmoCrateLocal00:
+	wait              	1 
+	switchul          	2480 # Ammo Crate Shadow (Carried) (cm\n\ammocrate-shadow.grp)
+	goto              	AmmoCrateLocal01
+
+AmmoCrateDeath:
+	imgol             	332 0 0	# Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3 
+	end

mpq/scripts/iscript_terran.txt

@@ -20968,13 +20968,22 @@ CamazotzGndAttkRpt:
 	wait              	1
 	playsndbtwn			4261 4263 # Camazotz weaponfire 01, 02, 03
 	imgoluselo			2056 0 0 # Green projection attack
-	playfram          	0x20
-	attkshiftproj     	52
-	wait              	1
-	attkshiftproj     	80
+	playfram			0x20
+	attkshiftproj		24
+	sigorder			32
+	wait              	1
+	attkshiftproj		54
+	sigorder			32
+	wait				1
+	attkshiftproj		82
+	sigorder			32
+	wait              	1
+	playfram			0x00
+	attkshiftproj		112
+	sigorder			32
+	wait              	1
+	attkshiftproj		140
 	sigorder			32
-	wait              	5
-	playfram          	0x00
 	wait              	2
 	ignorerest
 CamazotzGndAttkToIdle:

patchnotes.md

@@ -28,10 +28,10 @@
 	- Mimicry no longer fails to account for weapon factor in many cases (r. shopkeeper dog)
 	- **Egocent**s no longer fail to mimic barrage attacks properly (r. Londier)
 	- Mimicry no longer procs on ability weapons (r. Londier)
-	- 
 - **Audiovisual:**
 	- Corrected strings for **Izirokor** tech-enable on **Skibact Scab** and **Tethvith Swamp** (r. Mimika)
 	- Fixed bad shield overlay for **Vulture (Hecaton)** (r. Londier)
+	- Buttons for **Tiangou** and **Cutlass** now show as disabled when no **Scrapyard** is built (r. Pisens)
 	- **Cyclops (Futurist)** now uses its unique shadow and attack sequence instead of the standard variant's (r. lolrsk8s)
 	- Corrected tooltip for **Kagralisk** weapon string (r. Krankendau)
 
@@ -42,8 +42,12 @@
 - Resized model for:
 	- Talos, Cyprian
 - Modified model for:
-	- Maverick, Maverick (Futurist), Shaman
+	- Maverick, Maverick (Futurist), Shaman, Phontis
+	- Zethrokor, Liiralisk, Izirokor (c. Solstice)
+- Added weapon launch offsets for:
+	- Aphorist, Silversoul, Ghostwrit, Phontis, Iconoclast, Crematorium
 - Modified unit responses for Vorvrokor
+- New unit responses for Cardinal
 - New error and structure placement SFX for Askosi (c. lolrsk8s)
 - New weapon SFX for:
 	- Alzurokor (c. lolrsk8s)
@@ -127,15 +131,24 @@
 	- Movement speed 9.1 » 9.8
 	- Collision size increased by ~23%
 - [Zoryusthaleth](https://cosmonarchy.com/zerg/zoryusthaleth):
-	- Resource cost 175/0 » 200/0
+	- Resource costs 175/0 » 200/0
+	- Build time 28 » 25
+	- HP 200 » 220
 - [Lakizilisk](https://cosmonarchy.com/zerg/lakizilisk):
+	- Resource costs 75/75 » 100/75
+	- Build time 30 » 28
+	- HP 140 » 150
 	- **Subterranean Spines:**
 		- Weapon damage 12 » 15
 		- Weapon cooldown 1.63 » 1.75
 
 ## Askosi
-- **Shared Designs**
+- **Shared Designs:**
 	- Team building from **Pilgrim**s and **Constituent**s now increases build rate by 25% per worker, from 20%
+- [Cardinal](https://cosmonarchy.com/askosi/cardinal):
+	- Resource costs 75/25 » 100/25
+- [Radix](https://cosmonarchy.com/askosi/radix):
+	- Resource costs 100/0 » 125/0
 
 ## Askosi factions
 - **NEW: Sons of Ash**