Fix Christmas celebrations; Use new Mason model

mpq/arr/flingy.txt

@@ -619,9 +619,9 @@ Sovrokor
 Valkyrie (Hecaton)
 Garvrokor
 Simulacrum (Astral)
-Extended Flingy #413
-Extended Flingy #414
-Extended Flingy #415
+Grandstand (Cannon)
+Grandstand (Holdout)
+Grandstand (Vision)
 Extended Flingy #416
 Extended Flingy #417
 Extended Flingy #418

mpq/arr/images.txt

@@ -2208,12 +2208,12 @@ Simulacrum (Astral) Shadow
 Herald Glow
 Maverick Remains (Futurist)
 Vulture (Hecaton) Engines
-Extended Image #1208
-Extended Image #1209
-Extended Image #1210
-Extended Image #1211
-Extended Image #1212
-Extended Image #1213
+Grandstand (Cannon)
+Grandstand (Cannon) shadow
+Grandstand (Holdout)
+Grandstand (Holdout) shadow
+Grandstand (Vision)
+Grandstand (Vision) shadow
 Extended Image #1214
 Extended Image #1215
 Extended Image #1216

mpq/arr/sprites.txt

@@ -1070,9 +1070,9 @@ Garvrokor
 Simulacrum (Astral)
 Herald Glow
 Maverick Remains (Futurist)
-Extended Sprite #556
-Extended Sprite #557
-Extended Sprite #558
+Grandstand (Cannon)
+Grandstand (Holdout)
+Grandstand (Vision)
 Extended Sprite #559
 Extended Sprite #560
 Extended Sprite #561

mpq/arr/units.txt

@@ -456,7 +456,7 @@ Askosi Emissary
 Askosi Inkblot
 Askosi Tirade
 Askosi Arch
-Askosi Grandstand
+Askosi Grandstand (Cannon)
 Askosi Chantry
 Askosi Radix
 Askosi Cipher
@@ -530,8 +530,8 @@ Scenario Unit 5
 Scenario Unit 6
 Scenario Unit 7
 Scenario Unit 8
-Extended Unit #305
-Extended Unit #306
+Askosi Grandstand (Holdout)
+Askosi Grandstand (Vision)
 Extended Unit #307
 Extended Unit #308
 Extended Unit #309

mpq/arr/weapons.txt

@@ -180,7 +180,7 @@ Spirtith Spores (Spirtith Colony)
 Usko Scrapray (Helion)
 Skortra Tendril (Skortrith Colony)
 Ikta Driver (Tirade)
-Reforming Carbine (Avatar)
+Arte Driver (Grandstand)
 Through the Looking Glass (Hypnagogue)
 Wordsmith Railgun (Silvertongue)
 Sunsplit Beam (Optecton)

mpq/scripts/iscript_askosi.txt

@@ -218,7 +218,7 @@ WarpIn        	[NONE]
 # ----------------------------------------------------------------------------- #
 
 PilgrimInit:
-	imgul             	2042 0 0 # Legionnaire Shadow (cm\protoss\legionnaire-shad.grp)
+	imgul             	2042 0 0 # Pilgrim Shadow (cm\askosi\pilgrim-shadow.grp)
 	goto				PilgrimWalkingToIdle
 
 PilgrimDeath:
@@ -459,7 +459,7 @@ RadixDisable:
 IsId          	4
 Type          	24
 Init          	ChantryInit
-Death         	LandlockDeath
+Death         	ChantryDeath
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
 Unused1       	[NONE]
@@ -491,6 +491,14 @@ ChantryInit:
 	playfram          	0x00
 	imgul             	2072 0 0 # Chantry Shadow (cm\askosi\chantry-shadow.grp)
 	goto              	ChantryIsWorking
+	
+ChantryDeath:
+	playsnd           	7 # Misc\ExploLrg.wav
+	imgol             	215 0 0 # Explosion (Large) (thingy\tBangX.grp)
+	wait              	3
+	lowsprul          	1007 0 0 # Askosi Structure Rubble (Small) (cm\askosi\a-rubble-small.grp)
+	wait              	1
+	end
 
 ChantrySpecialState1:
 	playfram          	0
@@ -1829,4 +1837,61 @@ GenericRemnantsFiveDeath:
 	playfram          	4
 	wait              	255
 	wait				24
-	end
+	end
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2210 Grandstand (Cannon) (cm\askosi\grandstand.grp)
+.headerstart
+IsId          	21
+Type          	27
+Init          	GrandstandInit
+Death         	ChantryDeath
+GndAttkInit   	GrandstandGndAttkInit
+AirAttkInit   	GrandstandGndAttkInit
+Unused1       	[NONE]
+GndAttkRpt    	GrandstandGndAttkInit
+AirAttkRpt    	GrandstandGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	GrandstandBuilt
+AirAttkToIdle 	GrandstandBuilt
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	SkryrokorLocal00
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	GrandstandBuilt
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	GrandstandBuilt
+WorkingToIdle 	GrandstandBuilt
+WarpIn        	[NONE]
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	SkryrokorLocal00
+Burrow        	[NONE]
+UnBurrow      	[NONE]
+Enable        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+GrandstandInit:
+	imgul             	2211 0 0 # Grandstand (Cannon) Shadow (cm\askosi\grandstand-shadow.grp)
+	goto              	GrandstandBuilt
+
+GrandstandBuilt:
+	playfram			0x00
+	wait				255
+	goto              	GrandstandBuilt
+
+GrandstandGndAttkInit:
+	playfram          	0
+	wait              	1
+	attack
+	playsndbtwn			1157 1159 # Grandstand weaponfire 01, 02, 03
+	imgol				1163 0 -52 # Grandstand muzzle flash
+	wait				2
+	gotorepeatattk
+	ignorerest
+	goto				GrandstandBuilt

mpq/scripts/iscript_general.txt

@@ -3630,9 +3630,33 @@ EnergyRegenOverlayDeath:
 # 1676 Santa Hat - Extra Large - 17
 .headerstart
 IsId          	722
-Type          	1
+Type          	24
 Init          	SantaHatInit
 Death         	SantaHatDeath
+GndAttkInit   	SantaHatLocal00
+AirAttkInit   	SantaHatLocal00
+Unused1       	SantaHatLocal00
+GndAttkRpt    	SantaHatLocal00
+AirAttkRpt    	SantaHatLocal00
+CastSpell     	SantaHatLocal00
+GndAttkToIdle 	SantaHatLocal00
+AirAttkToIdle 	SantaHatLocal00
+Unused2       	SantaHatLocal00
+Walking       	SantaHatLocal00
+WalkingToIdle 	SantaHatLocal00
+SpecialState1 	SantaHatLocal00
+SpecialState2 	SantaHatLocal00
+AlmostBuilt   	SantaHatLocal00
+Built         	SantaHatLocal00
+Landing       	SantaHatLocal00
+LiftOff       	SantaHatLocal00
+IsWorking     	SantaHatLocal00
+WorkingToIdle 	SantaHatLocal00
+WarpIn        	SantaHatLocal00
+Unused3       	SantaHatLocal00
+StarEditInit  	SantaHatLocal00
+Disable       	SantaHatLocal00
+Burrow        	SantaHatLocal00
 .headerend
 # ----------------------------------------------------------------------------- #
 

mpq/scripts/iscript_protoss.txt

@@ -1148,14 +1148,14 @@ IsId          	158
 Type          	21
 Init          	CantavisInit
 Death         	CantavisDeath
-GndAttkInit   	[NONE]
-AirAttkInit   	[NONE]
+GndAttkInit   	CantavisGndAttkInit
+AirAttkInit   	CantavisGndAttkInit
 Unused1       	CantavisUnused1
-GndAttkRpt    	[NONE]
-AirAttkRpt    	[NONE]
+GndAttkRpt    	CantavisGndAttkInit
+AirAttkRpt    	CantavisGndAttkInit
 CastSpell     	CantavisCastSpell
 GndAttkToIdle 	CantavisGndAttkToIdle
-AirAttkToIdle 	[NONE]
+AirAttkToIdle 	CantavisGndAttkToIdle
 Unused2       	CantavisUnused2
 Walking       	CantavisWalking
 WalkingToIdle 	CantavisWalkingToIdle
@@ -1235,6 +1235,25 @@ CantavisUnused1:
 	setfldirect       	12
 	nobrkcodeend
 	goto				CantavisWalkingToIdle
+	
+CantavisGndAttkInit:
+	playsnd           	101	# Bullet\LaserB.wav
+	playfram          	0x00
+	wait              	1
+	nobrkcodestart
+	playfram          	0x11
+	wait              	1
+	playfram          	0x22
+	wait              	1
+	playfram          	0x33
+	wait              	1
+	attackwith        	1
+	playfram          	0x44
+	wait              	1
+	nobrkcodeend
+	gotorepeatattk
+	playfram          	0x66
+	goto              	CantavisGndAttkToIdle
 
 CantavisCastSpell:
 	playfram          	0x00

mpq/scripts/iscript_terran.txt

@@ -1503,11 +1503,11 @@ MasonUnused1:
 MasonGndAttkInit:
 	setvertpos        	0
 	wait              	1
-	playfram          	0x22
+	playfram          	0x40
 	attackwith        	1
 	playsndbtwn       	35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav
 	wait              	1
-	playfram          	0x11
+	playfram          	0x20
 	wait              	1
 	gotorepeatattk
 	goto              	SkryrokorLocal00
@@ -1531,11 +1531,11 @@ MasonAlmostBuilt:
 	setvertpos        	0
 	wait              	1
 MasonLocal00:
-	playfram          	0x22
+	playfram          	0x40
 	useweapon         	14 # Fusion Cutter (Harvest) (Fusion Cutter)
 	sigorder			32
 	wait              	1
-	playfram          	0x11
+	playfram          	0x20
 	wait 				12
 	goto              	MasonLocal00
 	

patchnotes.md

@@ -13,7 +13,7 @@
 
 ## Audiovisuals
 - New model for: (c. Solstice)
-	- **Maverick** (incl. Futurist variant), **Vulture** (incl. Hecaton variant), **Herald**
+	- **Mason**, **Maverick** (incl. Futurist variant), **Vulture** (incl. Hecaton variant), **Herald**
 - New portrait for: (c. Solstice)
 	- **Herald**
 - Modified models for: (c. Solstice)