Update Askosi T2 and make misc balance tweaks

mpq/arr/images.txt

@@ -2275,7 +2275,7 @@ Zylode
 Zylode Shadow
 Astrolabe
 Astrolabe Shadow
-Extended Image #1275
+Ash Heap Overlay
 Extended Image #1276
 Extended Image #1277
 Extended Image #1278

mpq/arr/units.txt

@@ -561,7 +561,7 @@ Zerg Zethalor (Orkoti)
 Zerg Scrylyleth (Zorthos)
 Askosi Bestiary
 Askosi Conduit
-Extended Unit #336
+Askosi Thaumalogue (Embedded)
 Extended Unit #337
 Extended Unit #338
 Extended Unit #339

mpq/rez/stat.txt

@@ -1090,7 +1090,7 @@ g<1><4>Assemble Golem <1>(<3>G<1>)<10>Sturdy frontline drone.<0>
 t<1><4>Build Mantle <1>(<3>T<1>)<10>Walker outpost.<0>
 ¤<3><4>Apollyoid Adhesive <2>(passive)<10>Flame-based attacks set victims alight, rending 1 armor per stack, and dealing 3 damage every second.<10><10>Apollyoid Adhesive burns itself out after 2 seconds of not being stacked.<0>
 ¤<3><4>Sustaining Sermon <2>(passive)<10>Every second strike, the Cardinal's weapon releases a restorative pulse, granting to all allies within 3 range a heal equal to damage dealt.<0>
-¤<3><4>Impact Dissipation <2>(passive)<10>Each time this combatant is attacked by a hostile, it gains 33% increased movement speed for 2 seconds.<0>
+¤<3><4>Impact Dissipation <2>(passive)<10>Each time this combatant is attacked by a hostile, it gains 33% increased movement speed for 3 seconds.<0>
 Mining Efficiency<0>
 ¤<3><4>Schematic Unity <2>(passive)<10>Up to 5 Askosi workers can collaborate on construction efforts.<10>When Dyads assist in construction, they increase construction rate by 30%.<0>
 ¤<3><4>Shared Designs <2>(passive)<10>Up to 5 Askosi workers can collaborate on construction efforts.<10>Each additional Pilgrim increases construction rate by 20%.<0>
@@ -1112,7 +1112,7 @@ d<1><4>Train Madcap <1>(<3>D<1>)<10>Mechanized infantry.<0>
 g<3><4>Land Grab <1>(<3>G<1>)<10>Orders the Wyvern to fire its weapon at the target site.<0>
 r<1><4>Warp in Strident Stratum <1>(<3>R<1>)<10>Utilitarian production.<0>
 Mantle requires:<10>   Atlas<0>
-¤<3><4>Power Overload <2>(passive)<10>Victims of this combatant emit a Booming Blast once per second for every point of armor they have.<0>
+¤<3><4>Power Overload <2>(passive)<10>Victims of this combatant sustain 5 damage once per second for every point of armor they have.<0>
 r<1><4>Build Wyvern <1>(<3>R<1>)<10>Area-denial corvette.<0>
 v<1><4>Train Savant <1>(<3>V<1>)<10>Versatile infantry.<0>
 z<1><4>Build Apothecary <1>(<3>Z<1>)<10>Alchemical outpost.<0>
@@ -1223,15 +1223,15 @@ w<1><4>Warp in Xenolith <1>(<3>W<1>)<10>Recalling relay.<0>
 Advanced Warps require:<10>   Basic Warp<0>
 Empowered Warps require:<10>   Advanced Warp<0>
 Supreme Warps require:<10>   Empowered Warp<0>
-¤<3><4>Writhing Web <2>(passive)<10>For every allied Sovroleth within 8 range, lose 5% movement speed and gain 5% weapon range.<0>
+¤<3><4>Writhing Web <2>(passive)<10>For every allied Sovroleth within 8 range, lose 6% movement speed and gain 6% weapon range.<0>
 ¤<3><4>Babylon Plating <2>(passive)<10>Phalanxes gain +4 armor while in Tank mode.<0>
 Ogun requires:<10>   Quarry<0>
 ¤<3><4>Blood Tithe <2>(passive)<10>When an Apostle attacks a target, allies within 3 range of the Apostle are healed for 5 HP.<0>
 e<1><4>Build Cyclops <1>(<3>E<1>)<10>Crowd-controlling walker.<0>
 ¤<3><4>Nanite Drones <2>(passive)<10>While in Smithy Mode, Oguns repair all structures within 4 range.<0>
 Nanite Drones:<10>   Must be in Smithy Mode<0>
-<0>
+¤<3><4>Retaliation Assembly<2>(passive)<10>Upon taking fatal damage while mobile, Thaumalogues embed themselves into the surface, becoming immobile and more heavily-armored. During this time, they gain increased 50% attack speed when damaged.<0>
-<0>
+¤<3><4>Scrapworld: Ash Heap <2>(passive)<10>This combatant's attacks debuff hostiles for 2 seconds. While debuffed, the hostiles lose 1 armor every 2 seconds.<10>If a victim dies during this time, its corpse is turned to ash, spreading the armor debuff to hostiles within 2 range.<0>
 ¤<3><4>Corpse Cocoon <2>(passive)<10>Corpses touched by this strain are consumed, transforming into eggs that spawn an additional combatant. The gestation time is equal to half of the strain's build time.<0>
 <0>
 <0>

mpq/scripts/iscript_askosi.txt

@@ -2766,7 +2766,7 @@ AphoristWalking:
 # 239 Thaumalogue (cm\askosi\thaumalogue.grp)
 .headerstart
 IsId          	34
-Type          	12
+Type          	21
 Init          	ThaumalogueInit
 Death         	ThaumalogueDeath
 GndAttkInit   	ThaumalogueGndAttkInit
@@ -2780,7 +2780,15 @@ AirAttkToIdle 	ThaumalogueGndAttkToIdle
 Unused2       	[NONE]
 Walking       	ThaumalogueWalking
 WalkingToIdle 	ThaumalogueWalkingToIdle
-SpecialState1 	[NONE]
+SpecialState1 	ObjectSpecialState1
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	[NONE]
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -2922,10 +2930,6 @@ ThaumalogueGndAttkRpt:
 	wait              	1
 	playfram          	0x40
 	wait              	1
-	playfram          	0x60
-	wait              	1
-	playfram          	0x40
-	wait              	1
 	nobrkcodeend
 	gotorepeatattk
 	ignorerest
@@ -3548,4 +3552,46 @@ GenericRemnantsThreeDeath:
 	playfram          	3
 	wait              	255
 	wait				24
+	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2277 Ash Heap Overlay (cm\askosi\a-fire-v.grp)
+.headerstart
+IsId          	42
+Type          	1
+Init          	Flames_Small_Init
+Death         	Flames_Small_Death
+.headerend
+# ----------------------------------------------------------------------------- #
+
+Flames_Small_Init:
+	playfram          	0x00
+	wait              	2
+	playfram          	1
+	wait              	2
+	playfram          	2
+	wait              	2
+	playfram          	3
+	wait              	2
+	playfram          	4
+	wait              	2
+	playfram          	5
+	wait              	2
+	playfram          	6
+	wait              	2
+	playfram          	7
+	wait              	2
+	playfram          	8
+	wait              	2
+	playfram          	9
+	wait              	2
+	playfram          	10
+	wait              	2
+	playfram          	11
+	wait              	2
+	goto              	Flames_Small_Init
+
+Flames_Small_Death:
+	wait              	1 
 	end

mpq/scripts/iscript_protoss.txt

@@ -1512,9 +1512,9 @@ WarpIn        	ZealotWarpIn
 # ----------------------------------------------------------------------------- #
 
 ZealotInit:
-	imgul             	152 0 0 # Zealot Shadow (protoss\pzeShad.grp)
+	imgulnextid			0 0 # Zealot Shadow (protoss\zealot-shadow.grp)
 ZealotWalkingToIdle:
-	playfram          	0x55
+	playfram          	0xC0
 ZealotLocal00:
 	wait              	62
 	randcondjmp       	64 ZealotLocal01
@@ -1523,7 +1523,7 @@ ZealotLocal00:
 ZealotLocal01:
 	playfram          	0x00
 	wait              	1
-	playfram          	0x22
+	playfram          	0x40
 ZealotLocal03:
 	wait              	1
 	waitrand          	14 21
@@ -1555,20 +1555,20 @@ ZealotLocal04:
 ZealotDeath:
 	playsnd           	678	# Protoss\ZEALOT\PZeDth00.WAV
 	setfldirect       	0
-	playfram          	221
+	playfram          	416
 	wait              	2
-	playfram          	222
+	playfram          	417
 	wait              	2
 	lowsprul			815 0 0 # Zealot Remains
-	playfram          	223
+	playfram          	418
 	wait              	2
-	playfram          	224
+	playfram          	419
 	wait              	2
-	playfram          	225
+	playfram          	420
 	wait              	2
-	playfram          	226
+	playfram          	421
 	wait              	2
-	playfram          	227
+	playfram          	422
 	wait              	2
 	end
 	
@@ -1577,17 +1577,17 @@ ZealotUnused1:
 	nobrkcodestart
 	setfldirect       	0 
 	playsnd				1187
-	playfram			226
+	playfram			422
 	wait				2
-	playfram			225
+	playfram			421
 	wait				2
-	playfram			224
+	playfram			420
 	wait				2
-	playfram			223
+	playfram			419
 	wait				2
-	playfram			222
+	playfram			418
 	wait				2
-	playfram			221
+	playfram			417
 	wait				2
 	setfldirect       	12
 	nobrkcodeend
@@ -1598,22 +1598,22 @@ ZealotGndAttkInit:
 	wait              	1
 ZealotGndAttkRpt:
 	playsndrand       	2 662 663 # Protoss\ZEALOT\pzeAtt00.WAV | Protoss\ZEALOT\pzeAtt01.WAV
-	playfram          	0x11
+	playfram          	0x20
 	wait              	1
 	nobrkcodestart
-	playfram          	0x22
+	playfram          	0x40
 	wait              	1
-	playfram          	0x33
+	playfram          	0x60
 	wait              	1
-	playfram          	0x44
+	playfram          	0x80
     attackmelee         1 1897 # Legionnaire weapon hit 01
 	wait              	1
-	playfram          	0x33
+	playfram          	0x60
 	wait              	1
-	playfram          	0x22
+	playfram          	0x40
 	attackmelee       	1 0
 	wait              	1
-	playfram          	0x11
+	playfram          	0x20
 	wait              	1
 	playfram          	0x00
 	nobrkcodeend
@@ -1625,28 +1625,28 @@ ZealotGndAttkToIdle:
 ZealotWalking:
 	move              	4
 	wait              	1
-	playfram          	0x55
+	playfram          	0xA0
 	move              	4
 	wait              	1
-	playfram          	0x66
+	playfram          	0xC0
 	move              	4
 	wait              	1
-	playfram          	0x77
+	playfram          	0xE0
 	move              	4
 	wait              	1
-	playfram          	0x88
+	playfram          	0x100
 	move              	4
 	wait              	1
-	playfram          	0x99
+	playfram          	0x120
 	move              	4
 	wait              	1
-	playfram          	0xaa
+	playfram          	0x140
 	move              	4
 	wait              	1
-	playfram          	0xbb
+	playfram          	0x160
 	move              	4
 	wait              	1
-	playfram          	0xcc
+	playfram          	0x180
 	goto              	ZealotWalking
 
 ZealotWarpIn:

patchnotes.md

@@ -18,13 +18,12 @@
 ## Bugfixes
 - **Stability:**
 	- Fixed Grandstand cargo crash (r. ConcealedOrganic)
-- **Desyncs:**
-	- The following mechanics should now be desync-proof:
-		- **Sovroleth** weapon range increase
 - **Audiovisual**
 	- Fixed vespene and supply icons for Askosi (c. Jesse)
 
 ## Audiovisuals
+- New sprite for:
+	- **Zealot** (c. Solstice)
 - New unit responses for:
 	- **Striga** (c. OunceOfMilia)
 
@@ -45,14 +44,26 @@
 - [Argosy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/argosy):
 	- Build time 70 » 75
 
+## Zerg
+- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor):
+	- HP 240 » 220
+
 ## Askosi
 - [Dyad](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dyad):
 	- Resource costs 50/50 » 50/25
 - [Rove](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/rove):
 	- Armor 1 » 0
+- [Intendent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/intendent):
+	- Armor 2 » 1
+	- **Ersa Driver:**
+		- Weapon range 6 » 5
 - [Helion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/helion):
 	- **Usko Scrapray:**
 		- Weapon cooldown 0.63 » 0.5
+- [Tirade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/tirade):
+	- Armor 2 » 1
+	- **Ikta Driver:**
+		- Weapon damage 10 » 7
 - [Cipher](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cipher):
 	- Build time 65 » 75
 - [Gauntlet](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/gauntlet):