Tweak Atreus; Remodel Atreus and Zethrokor; Add Khalendric Simulacrum and Idol

mpq/arr/flingy.txt

@@ -704,9 +704,9 @@ Rozirokor
 Zytryleth
 Camazotz
 Grimoire
-Extended Flingy #498
+Simulacrum (Khalendric)
-Extended Flingy #499
+Idol (Khalendric)
-Extended Flingy #500
+Thrombocyte
 Extended Flingy #501
 Extended Flingy #502
 Extended Flingy #503

mpq/arr/images.txt

@@ -2422,14 +2422,14 @@ Bloodsummon Unit Rubble Small
 Bloodsummon Unit Rubble Medium
 Bloodsummon Ritual
 Vornath Pond Shadow
-Extended Image #1422
+Atreus Remains
-Extended Image #1423
+Simulacrum (Khalendric)
-Extended Image #1424
+Simulacrum (Khalendric) Shadow
-Extended Image #1425
+Idol (Khalendric)
-Extended Image #1426
+Idol (Khalendric) Shadow
-Extended Image #1427
+Idol (Khalendric) Remains
-Extended Image #1428
+Thrombocyte
-Extended Image #1429
+Thrombocyte Shadow
 Extended Image #1430
 Extended Image #1431
 Extended Image #1432

mpq/arr/sprites.txt

@@ -1168,11 +1168,11 @@ Bloodsummon Rubble Large
 Bloodsummon Unit Rubble Tiny
 Bloodsummon Unit Rubble Small
 Bloodsummon Unit Rubble Medium
-Extended Sprite #654
+Atreus Remains
-Extended Sprite #655
+Simulacrum (Khalendric)
-Extended Sprite #656
+Idol (Khalendric)
-Extended Sprite #657
+Idol (Khalendric) Remains
-Extended Sprite #658
+Thrombocyte
 Extended Sprite #659
 Extended Sprite #660
 Extended Sprite #661

mpq/arr/techdata.txt

@@ -51,7 +51,7 @@ Preylock (Askosi)
 Lobotomy Grenade (Goska dupe)
 Skryspawn (Stroluum)
 Puppeteer (Askosi)
-Extended Tech #10
+Blood Burst (Bloodsummon)
 Extended Tech #11
 Extended Tech #12
 Extended Tech #13

mpq/arr/units.txt

@@ -619,8 +619,8 @@ Bloodsummon Thrombocyte
 Bloodsummon Grimoire
 Zerg Zytryleth (Zorthos)
 Terran Camazotz (Nydus Trinity)
-Extended Unit #394
+Protoss Simulacrum (Khalendric)
-Extended Unit #395
+Protoss Idol (Khalendric)
 Extended Unit #396
 Extended Unit #397
 Extended Unit #398

mpq/rez/stat.txt

@@ -1005,9 +1005,9 @@ Lekrot Requires<10>   Panoply OR Lotiro<0>
 t<1><4>Install Hearthshard <1>(<3>S<1>)<10>Immortal relay.<0>
 Hearthshard Requires<10>   Panoply OR Lotiro<0>
 Zytryleth Requires:<10>   Othstol Oviform<0>
-<0>
+t<1><4>Bleed Thrombocyte <1>(<3>T<1>)<10>Regenerative biode.<0>
-<0>
+b<3><4>Bloody Burst <1>(<3>B<1>)<10>Bursts the Thrombocyte, releasing a pulse that heals allies within 3 range for the Thrombocyte's current health.<0>
-<0>
+¤<3><4>Coagulation <2>(passive)<10>This combatant's attacks heal allies equal to damage dealt.<0>
 <0>
 <0>
 <0>

mpq/scripts/iscript_askosi.txt

@@ -3663,9 +3663,6 @@ GenericRemnantsThreeDeath:
 	playfram          	2
 	wait              	255
 	wait				24
-	playfram          	3
-	wait              	255
-	wait				24
 	end
 
 # ----------------------------------------------------------------------------- #

mpq/scripts/iscript_bloodsummon.txt

@@ -707,4 +707,138 @@ LiftedTerranStructureDeath:
 LiftedTerranStructureDeath_Small:
 	lowsprul          	273 0 42 # Terran Building Rubble (Small) (thingy\RubbleS.grp)
 	wait              	1
-	end
+	end
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2262 Thrombocyte (cm\b\thrombocyte.grp)
+.headerstart
+IsId          	1
+Type          	26
+Init          	ThrombocyteInit
+Death         	ThrombocyteDeath
+GndAttkInit   	ThrombocyteGndAttkInit
+AirAttkInit   	ThrombocyteGndAttkInit
+Unused1       	ThrombocyteUnused1
+GndAttkRpt    	ThrombocyteGndAttkInit
+AirAttkRpt    	ThrombocyteGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	ThrombocyteGndAttkToIdle
+AirAttkToIdle 	ThrombocyteGndAttkToIdle
+Unused2       	[NONE]
+Walking       	ThrombocyteWalking
+WalkingToIdle 	ThrombocyteWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	[NONE]
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	[NONE]
+Burrow        	[NONE]
+UnBurrow      	[NONE]
+Enable        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ThrombocyteInit:
+	imgulnextid			0 2 # Thrombocyte Shadow (cm\b\thrombocyte-shadow.grp)
+ThrombocyteWalkingToIdle:
+	playfram          	0x00
+	goto				SkryrokorLocal00
+
+ThrombocyteDeath:
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+    playsndbtwn         1707 1708 # Quazilisk death 01, 02
+	playfram			0x240
+	wait              	1
+	playfram			0x260
+	wait              	1
+	playfram			0x280
+	wait              	1
+	playfram			0x2A0
+	wait              	2
+	lowsprul			1168 0 0 # Bloodsummon Unit Rubble Small
+	wait              	1
+	end
+	
+ThrombocyteUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect       	0 
+	playsnd				1171
+	playfram			0x210
+#	wait				2
+#	playfram			0xaa
+#	wait				2
+#	playfram			0xbb
+#	wait				2
+#	playfram			0xcc
+#	wait				2
+#	playfram			0xdd
+#	wait				2
+#	playfram			0xee
+#	wait				2
+#	playfram			0xff
+#	wait				2
+	wait				14
+	setfldirect			10
+	nobrkcodeend
+	goto				ThrombocyteGndAttkToIdle
+
+ThrombocyteGndAttkInit:
+    playfram            0x120
+    wait                1
+	nobrkcodestart
+    playfram            0x140
+    wait                1
+    playfram            0x160
+    wait                1
+    playsndbtwn         2014 2015 # Liiralisk attack 01, 02
+	attack
+    playfram            0x180
+    wait                1
+    playfram            0x1A0
+    wait                1
+    playfram            0x1C0
+    wait                1
+    playfram            0x1E0
+    wait                1
+    playfram            0x200
+    wait                1
+	nobrkcodeend
+    gotorepeatattk
+    ignorerest
+ThrombocyteGndAttkToIdle:
+    playfram            0x00
+    wait                1
+    goto                ThrombocyteWalkingToIdle
+
+ThrombocyteWalking:
+	move              	6
+	wait              	1
+	playfram          	0x220
+	move              	6
+	wait              	1
+	playfram          	0x240
+	move              	6
+	wait              	1
+	playfram          	0x260
+	move              	6
+	wait              	1 
+	playfram          	0x280
+	move              	6
+	wait              	1
+	playfram          	0x2A0
+	move              	6
+	wait              	1
+	playfram          	0x2C0
+	move              	6
+	wait              	1
+	playfram          	0x2E0
+	goto              	ThrombocyteWalking

mpq/scripts/iscript_protoss.txt

@@ -7620,15 +7620,22 @@ AtreusDeath:
 	end
 
 AtreusGndAttkInit:
-	playfram          	0x00
+	playfram          	0x240
-AtreusGndAttkRpt:
 	wait				1
+	playfram			0x260
+	wait				1
+AtreusGndAttkRpt:
 	nobrkcodestart
-	playfram			0x220
+	wait				1
+	playfram			0x2A0
 	playsndbtwn			1788 1790 # Atreus weapon fire 01, 02, 03
 	attackwith        	1
 	wait				1
-	playfram			0x00
+	playfram			0x280
+	wait				1
+	playfram			0x260
+	wait				1
+	playfram			0x240
 	wait				1
 	nobrkcodeend
 	gotorepeatattk
@@ -7638,30 +7645,6 @@ AtreusGndAttkRpt:
 AtreusWalking:
 	move              	6
 	wait				1
-	playfram          	0x20
-	move              	6
-	wait				1
-	playfram          	0x40
-	move				6
-	wait				1
-	playfram          	0x60
-	move				6
-	wait				1
-	playfram          	0x80
-	move				6
-	wait				1
-	playfram          	0xA0
-	move				6
-	wait				1
-	playfram          	0xC0
-	move				6
-	wait				1
-	playfram          	0xE0
-	move				6
-	wait				1
-	playfram          	0x100
-	move				6
-	wait				1
 	playfram          	0x120
 	move				6
 	wait				1
@@ -7684,6 +7667,11 @@ AtreusWalking:
 	move				6
 	wait				1
 	playfram          	0x200
+	move				6
+	wait				1
+	playfram          	0x220
+	move				6
+	wait				1
 	goto				AtreusWalking
 
 AtreusWarpIn:

mpq/scripts/iscript_zerg.txt

@@ -2384,7 +2384,7 @@ Enable        	[NONE]
 ZethrokorInit:
 	imgul             	55 0 -1 # Zethrokor Shadow (zerg\zzeShad.grp)
 ZethrokorGndAttkToIdle:
-	playfram          	0x55
+	playfram          	0x00
 	goto              	ZethrokorLocal00
 
 ZethrokorLocal00:
@@ -2454,22 +2454,23 @@ ZethrokorLocal03:
 	goto              	ZethrokorGndAttkToIdle
 
 ZethrokorDeath:
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
 	playsnd           	896 # Zerg\Zergling\ZZeDth00.WAV
 	setfldirect       	0
 	playfram          	289
 	wait              	2
 	playfram          	290
 	wait              	2
-	playfram          	291
+#	playfram          	291
-	wait              	2
+#	wait              	2
-	playfram          	292
+#	playfram          	292
-	wait              	2
+#	wait              	2
-	playfram          	293
+#	playfram          	293
-	wait              	2
+#	wait              	2
-	playfram          	294
+#	playfram          	294
-	wait              	2
+#	wait              	2
-	playfram          	295
+#	playfram          	295
-	wait              	2
+	wait              	1
 	lowsprul          	160 0 0	# Zethrokor Remnants (zerg\zzeDeath.grp)
 	wait              	1
 	end

patchnotes.md

@@ -26,6 +26,7 @@
 	- Flying workers and **Dyad**s now use iscript-based movement, removing acceleration and eliminating rare visual and harvesting bugs
 	- Flyers can now correctly be loaded into air garrisons (e.g. Askosi Grandstand)
 	- **Scrapworld: Gold Rush** now correctly accounts for the resource cost of dual- and triple-birth units (r. shopkeeper dog)
+	- Computer-controlled **Cantavis** now spam **Psionic Storm** casts less frequently
 	- **Skryokor**s are now appropriately treated as Broodspawn for timed life and incubation purposes (r. jakulangski)
 	- Lardfix: Protected against rare AI breakage from niche town configurations (c. DF)
 	- **Nydus Trinity Eidolon**s now correctly regenerate life at a higher rate when cloaked (r. jakulangski)
@@ -34,12 +35,13 @@
 	- Fixed **Endbore** weapon name (r. Concealed Organic)
 	- Fixed "dead pixels" in Askosi UI
 	- Fixed bad gas puff coordinates for Installation Vespene Ridges (r. BtyB)
+	- Corrected **Spraith Cesiant** shadow (r. Mimika)
 
 ## Audiovisuals
 - Updated Askosi UI to be GREEN! (c. DF)
 - Updated background graphics for Options and CrownLink Join menus (c. Jesse)
 - New models for:
-	- Amaranth (c. Baelethal)
+	- Amaranth, Atreus, Zethrokor (c. Baelethal)
 	- Inzorthrokor (Imicren), Iziralisk (Zorthos)
 - New death SFX for:
 	- Striga (c. Milia)
@@ -83,11 +85,13 @@
 - [Artisan](https://cosmonarchy.com/protoss/artisan):
 	- Movement speed 4.16 » 4 (~4% reduction)
 - [Atreus](https://cosmonarchy.com/protoss/atreus):
+	- Resource costs 200/25 » 175/50
 	- HP 200 » 160
+	- Shields 100 » 80
 	- Armor 2 » 3
 	- Speed 4.8 » 6
 	- **Dauntless Disruption Cannon:**
-		- Weapon damage 20 » 15
+		- Weapon damage 20 » 12
 		- Weapon range 7 » 5
 		- Attack cooldown 1.25 » 1
 	- **Interception** removed
@@ -113,6 +117,10 @@
 	- Shields 250 » 300
 - [Stargate](https://cosmonarchy.com/protoss/stargate):
 	- Resource costs 200/200 » 200/150
+- **NEW:** [Simulacrum (Khalendric)](https://cosmonarchy.com/protoss/simulacrum-khalendric):
+	- **Khalendric Knights:** Simulacrum variant with **Last Orders** (e.g. Aurora)
+- **NEW:** [Idol (Khalendric)](https://cosmonarchy.com/protoss/idol-khalendric):
+	- **Khalendric Knights:** Idol variant with **Signify** (e.g. Hierophant)
 
 ## Zerg
 - **Bone of Reflection:**