Tweak Mason animations; Make misc bugfixes; Overhaul latency menu

mpq/arr/flingy.txt

@@ -625,8 +625,8 @@ Grandstand (Vision)
 Mimic
 Intendent
 Object
-Extended Flingy #419
-Extended Flingy #420
+Abutment
+Proscenium
 Extended Flingy #421
 Extended Flingy #422
 Extended Flingy #423

mpq/arr/images.txt

@@ -2220,10 +2220,10 @@ Intendent
 Intendent Shadow
 Object
 Object Shadow
-Extended Image #1220
-Extended Image #1221
-Extended Image #1222
-Extended Image #1223
+Abutment
+Abutment Shadow
+Proscenium
+Proscenium Shadow
 Extended Image #1224
 Extended Image #1225
 Extended Image #1226

mpq/arr/sprites.txt

@@ -1076,8 +1076,8 @@ Grandstand (Vision)
 Mimic
 Intendent
 Object
-Extended Sprite #562
-Extended Sprite #563
+Abutment
+Proscenium
 Extended Sprite #564
 Extended Sprite #565
 Extended Sprite #566

mpq/arr/units.txt

@@ -537,8 +537,8 @@ Zerg Cerebrate (The Fall)
 Zerg Overmind (With Shell, The Fall)
 Zerg Overmind (The Fall)
 Askosi Avatar
-Extended Unit #312
-Extended Unit #313
+Askosi Abutment
+Askosi Proscenium
 Extended Unit #314
 Extended Unit #315
 Extended Unit #316

mpq/rez/stat.txt

@@ -456,18 +456,18 @@ e<1><4>Profanate Empress <1>(<3>E<1>)<10>Reinforcing destroyer.<0>
 <0>
 Iron Foundry requires:<10>   Daedala<0>
 f<1><4>Build Iron Foundry <1>(<3>F<1>)<10>Advanced vehicle production.<0>
-<0>
+Proscenium requires:<10>   Cipher AND Gauntlet<0>
 z<1><4>Mutate into Kazitrith Cesiant <1>(<3>Z<1>)<10>Support cell.<0>
 ¤<3><4>Plethoral Gestation <2>(passive)<10>This strain is not consumed by tissue construction, and emerges when its work is complete.<0>
 ¤<3><4>Aberrant Gestation <2>(passive)<10>This strain mutates directly into advanced tissues.<0>
 ¤<3><4>Radiant Rifts <2>(passive)<10>Upon completing a harvest, Artisans channel for 2 seconds, returning their cargo at the end of the channel.<0>
-<0>
+r<1><4>Install Proscenium <1>(<3>R<1>)<10>Advanced biotic production.<0>
 ¤<3><4>Wear and Tear <2>(passive)<10>When under half health, Blackjacks lose 33% movement and attack speeds.<0>
 t<1><4>Morph into Gosvileth <1>(<3>T<1>)<10>Advanced worker strain.<0>
 ¤<3><4>Criticality <2>(passive)<10>Victims of the Aspirant are debuffed for 2 seconds. If killed during this time, they create a 2-range energy field that lasts 5 seconds and restores 4 shields or HP per second for all allied ground combatants.<0>
-<0>
+Abutment requires:<10>   Cipher AND Gauntlet<0>
 Gosvil Aspect requires:<10>   Irol Iris<0>
-<0>
+r<1><4>Install Abutment <1>(<3>R<1>)<10>Vespene processor.<0>
 a<1><4>Assemble Artisan <1>(<3>A<1>)<10>Advanced harvester.<0>
 ¤<3><4>Caustic Discharge <2>(passive)<10>Keskathalor attacks create a pool of acid that deals 30 impact damage over 5 seconds to all ground targets. Targets that move through the acid gain 150% movement speed for 3 seconds.<0>
 ¤<3><4>Ion Field <2>(passive)<10>Diadem attacks leave behind a field that deals 100 damage over 10 seconds to all ground targets. Units that move through the field gain 150% attack speed for 2 seconds.<0>
@@ -1244,7 +1244,7 @@ Talos requires:<10>   Quarry<0>
 t<1><4>Build Talos <1>(<3>T<1>)<10>Airborne worker.<0>
 <0>
 ¤<3><4>Deathless Procession <2>(passive)<10>This combatant gains 25% movement speed while its shields hold.<0>
-a<3><4>Nanorepair <1>(<3>A<1>)<10>Heals a target ground ally for 9 HP per second. While being healed by at least one Cleric, the ally gains +1 armor.<0>
+a<3><4>Nanorepair <1>(<3>A<1>)<10>Heals a target ground ally for 9 HP per second. While being healed by a Cleric, the ally gains +2 armor.<0>
 x<1><4>Warp in Engram <1>(<3>X<1>)<10>Heavy tower.<0>
 a<3><4>Heal <1>(<3>A<1>)<10>Heals a target ground ally for 9 HP per second.<0>
 <27><0><4>Rescind Control <1>(<3>ESC<1>)<0>

mpq/scripts/iscript_askosi.txt

@@ -2290,4 +2290,145 @@ ObjectWalkingToIdle:
 ObjectSpecialState1:
 	playfram			0x00
 	wait				12
-	goto				SkryrokorLocal00
+	goto				SkryrokorLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2222 Abutment (cm\askosi\abutment.grp)
+.headerstart
+IsId          	26
+Type          	24
+Init          	AbutmentInit
+Death         	AbutmentDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	AbutmentSpecialState1
+SpecialState2 	AbutmentSpecialState2
+AlmostBuilt   	AbutmentAlmostBuilt
+Built         	AbutmentBuilt
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	SkryrokorLocal00
+WorkingToIdle 	AbutmentBuilt
+WarpIn        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+AbutmentInit:
+	imgulnextid			0 0 # Abutment Shadow (cm\askosi\abutment-shadow.grp)
+	playfram          	1
+AbutmentLocal00:
+	wait              	5
+	waitrand          	5 50
+	creategasoverlays 	0
+	waitrand          	5 50
+	creategasoverlays 	2
+	waitrand          	5 50
+	creategasoverlays 	1
+	waitrand          	5 50
+	creategasoverlays 	2
+	waitrand          	5 50
+	creategasoverlays 	0
+	waitrand          	5 50
+	creategasoverlays 	1
+	waitrand          	5 50
+	creategasoverlays 	2
+	goto              	AbutmentLocal00
+
+AbutmentDeath:
+	playsnd           	7 # Misc\ExploLrg.wav
+	sprol             	272 0 0 # Building Explosion (Large) (thingy\tBangX.grp)
+	wait              	3
+	end
+
+AbutmentSpecialState1:
+	playfram          	11
+	goto              	AbutmentLocal00
+
+AbutmentSpecialState2:
+	playfram          	11
+	goto              	AbutmentLocal00
+
+AbutmentAlmostBuilt:
+	playfram          	11
+	goto              	AbutmentLocal00
+
+AbutmentBuilt:
+	playfram          	0x00
+	wait              	5
+AbutmentLocal01:
+	creategasoverlays 	0
+	wait              	20
+	waitrand          	5 100
+	goto              	AbutmentLocal01
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2224 Proscenium (cm\askosi\proscenium.grp)
+.headerstart
+IsId          	27
+Type          	24
+Init          	ProsceniumInit
+Death         	LandlockDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	SkryrokorLocal00
+WalkingToIdle 	SkryrokorLocal00
+SpecialState1 	ProsceniumSpecialState1
+SpecialState2 	SkryrokorLocal00
+AlmostBuilt   	ProsceniumAlmostBuilt
+Built         	ProsceniumBuilt
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	ProsceniumIsWorking
+WorkingToIdle 	ProsceniumBuilt
+WarpIn        	[NONE]
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	ProsceniumDisable
+Burrow        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ProsceniumInit:
+	playfram          	0x00
+	imgulnextid			0 0 # Proscenium Shadow (cm\askosi\proscenium-shadow.grp)
+	goto              	SkryrokorLocal00
+
+ProsceniumSpecialState1:
+	playfram          	0
+	goto              	SkryrokorLocal00
+
+ProsceniumAlmostBuilt:
+	playfram          	0
+	goto              	SkryrokorLocal00
+
+ProsceniumBuilt:
+	playfram          	0x00
+	goto              	SkryrokorLocal00
+
+ProsceniumIsWorking:
+	playfram          	1
+	wait              	2
+	playfram          	0
+	waitrand			1 2
+	goto              	ProsceniumIsWorking
+
+ProsceniumDisable:
+	goto              	SkryrokorLocal00

mpq/scripts/iscript_terran.txt

@@ -8727,13 +8727,15 @@ ApostleDeath:
 	playfram          	0x00
 	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
 	wait              	2
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
 	lowsprul          	565 0 0	# Apostle Remnants (cm\terran\apostle-death.grp)
-	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
-	wait              	5
-	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
-	wait              	5
-	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
-	wait              	9
 	end
 
 ApostleUnused1:
@@ -13142,13 +13144,15 @@ AutocratDeath:
 	playfram          	0x00
 	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
 	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	wait              	5
 	lowsprul          	230 0 0 # Eidolon Remnants (terran\tghDeath.grp)
-	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
-	wait              	5
-	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
-	wait              	5
-	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
-	wait              	9
 	end
 
 AutocratUnused1:

patchnotes.md

@@ -9,6 +9,10 @@
 
 # Core changes
 
+## Options menu
+- Added additional latency options to the latency menu (c. Jesse)
+	- *We will eventually retire DBC thanks to these new options!*
+
 ## Desyncs
 - Disabled celebrations (e.g. Christmas) from appearing in Ranked play, reducing desync count from mismatched active skins
 - Enabled desync errors to be reported more than once per session (no longer have to restart client between desync errors)
@@ -21,6 +25,8 @@
 ## Bugfixes
 - **Stability**
 	- Protected against a rare crash related to issuing orders via minimap (r. Newt, c. DF)
+- **Gameplay:**
+	- Prevented **Anodyne Annex** from applying to allied units (r. Moonpaw)
 - **Audiovisual**
 	- Fixed missing construction SFX for **Ogun**
 	- Corrected Herald wireframe (r. TheBeaver99)
@@ -32,7 +38,7 @@
 	- **Cleric** (c. DeltaCadmius & Solstice), incl. **Futurist Federation** variant
 	- **Simulacrum** (c. DeltaCadimus). incl. **Astral Omen** variant
 - Modified sprites for:
-	- **Maverick**, **Harakan**, **Cyprian** (c. Solstice)
+	- **Mason**, **Maverick**, **Harakan**, **Cyprian** (c. Solstice)
 - New portrait for:
 	- **Simulacrum** (c. DeltaCadimus)
 - New unit responses for: