Add Radix model; Add Order Gladius variant

mpq/arr/flingy.txt

@@ -714,7 +714,7 @@ Alzurokor (Imicren)
 Hydrokor (Goszirith)
 Nihilist
 Maverick (Golden)
-Extended Flingy #508
+Gladius (Order)
 Extended Flingy #509
 Extended Flingy #510
 Extended Flingy #511

mpq/arr/images.txt

@@ -2467,11 +2467,11 @@ Maverick (Golden) Remains
 Garvrokor Shadow
 Garvrokor Birth
 Garvrokor Remains
-Extended Image #1467
+Mine Restock Overlay
-Extended Image #1468
+Gladius (Order)
-Extended Image #1469
+Gladius (Order) Shadow
-Extended Image #1470
+Gladius (Order) Engine
-Extended Image #1471
+Gladius (Order) Warp Flash
 Extended Image #1472
 Extended Image #1473
 Extended Image #1474

mpq/arr/sfxdata.txt

@@ -4315,7 +4315,7 @@ Vorvrokor Order Passive 04
 Vorvrokor Under Attack 01
 Vorvrokor Under Attack 02
 Vorvrokor Under Attack 03
-Extended Sound #1
+Mine Restock 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -4314,4 +4314,5 @@ cm\z\vorvrokor\yes-03.wav
 cm\z\vorvrokor\yes-04.wav
 cm\z\vorvrokor\hlp-01.wav
 cm\z\vorvrokor\hlp-02.wav
-cm\z\vorvrokor\hlp-03.wav
+cm\z\vorvrokor\hlp-03.wav
+cm\t\mine\restock-01.wav

mpq/arr/sprites.txt

@@ -1186,7 +1186,7 @@ Eidolon (Nydus) Remains
 Morrigan Remains
 Maverick (Golden)
 Maverick (Golden) Remains
-Extended Sprite #672
+Gladius (Order)
 Extended Sprite #673
 Extended Sprite #674
 Extended Sprite #675

mpq/arr/weapons.txt

@@ -302,7 +302,7 @@ Goremasts (Vulture Upstart)
 Eyelets (Proselyte)
 Alko Ashgun (Scralia)
 Phase Rifle (Maverick Golden)
-Extended Weapon #175
+Plasma Flurry (Gladius Order)
 Extended Weapon #176
 Extended Weapon #177
 Extended Weapon #178

mpq/rez/stat.txt

@@ -323,7 +323,7 @@ f<1><4>Bestow Maverick <1>(<3>F<1>)<10>Disciplined infantry.<0>
 ¤<3><4>Accelerated Speech <2>(passive)<10>While the Missionary is within 2 range of its target, it gains +2 armor penetration.<0>
 ¤<3><4>Flanking Spines <2>(passive)<10>When targeting debuffed enemies, Almaksalisk attacks ignore armor.<0>
 Anchor Attack requires:<10>   Loaded ranged combatant<0>
-<0>
+¤<3><4>Fabrication <2>(passive)<10>Raynor's Vulture automatically restocks one Spider Mine every 10 seconds.<0>
 e<3><4>Lay Spider Mines <1>(<3>E<1>)<10>Places a Spider Mine at the target site. Spider Mines explode on hostiles that trip them, dealing significant splash damage.<0>
 ¤<3><4>Autophagy <2>(passive)<10>On death, Vilgorokors transform into Vilgoleths and immediately spawn 2 Rilirokors.<0>
 ¤<3><4>Heretical Bedlam <2>(passive)<10>Dying hostiles that were struck by the Pariah in the last 2 seconds have their corpses ascended after 1 second.<0>
@@ -1136,7 +1136,7 @@ t<1><4>Build Magnetar <1>(<3>T<1>)<10>Undeniable cruiser.<0>
 ¤<3><4>Mitosis <2>(passive)<10>Upon taking damage, this strain incubates, spawning one Rilirokor after a two-second delay.<10>This status cannot be applied if the strain is already incubating.<0>
 w<1><4>Build Cuirass <1>(<3>W<1>)<10>Durable frontline walker.<0>
 ¤<3><4>Stonewall Protocol <2>(passive)<10>Upon taking fatal damage, the Cuirass deactivates, regains 50 HP, and begins self-repairing for 15 HP per second until fully-healed. If the Cuirass is dealt fatal damage again before it can fully repair, it is destroyed.<0>
-<0>
+g<1><4>Warp in Gladius <1>(<3>G<1>)<10>Sustaining corvette.<0>
 r<5><4>Morph into Iroleth <1>(<3>R<1>)<10>Transport strain. Provides detection.<0>
 <0>
 t<1><4>Build Lodestone <1>(<3>T<1>)<10>Defensive emplacement. Detects hidden enemies.<0>
@@ -2301,7 +2301,7 @@ Goremasts<0>
 Eyelets<0>
 Alko Ashgun<0>
 Phase Rifle<0>
-<0>
+Plasma Flurry<0>
 <0>
 <0>
 <0>

mpq/scripts/iscript_askosi.txt

@@ -439,7 +439,7 @@ Burrow        	[NONE]
 
 RadixInit:
 	playfram          	0x00
-	imgul             	2076 0 0 # Radix Shadow (cm\a\radix-shadow.grp)
+	imgulnextid			2 -2 # Radix Shadow (cm\a\radix-shadow.grp)
 	goto              	SkryrokorLocal00
 
 RadixSpecialState1:
@@ -447,7 +447,7 @@ RadixSpecialState1:
 	goto              	SkryrokorLocal00
 
 RadixAlmostBuilt:
-	playfram          	2
+	playfram          	7
 	goto              	SkryrokorLocal00
 
 RadixBuilt:
@@ -457,8 +457,18 @@ RadixBuilt:
 RadixIsWorking:
 	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          	0
-	waitrand			1 2
+	wait				5
 	goto              	RadixIsWorking
 
 RadixDisable:

mpq/scripts/iscript_protoss.txt

@@ -15973,4 +15973,81 @@ CabalistStarboundWalkingToIdle:
 
 CabalistStarboundWarpIn:
 	imgol             	2123 0 0 # CabalistStarbound Warp Flash (cm\protoss\cabalist-starbound.grp)
-	goto              	CabalistStarboundWalkingToIdle
+	goto              	CabalistStarboundWalkingToIdle
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2470 Gladius (Order) (cm\f-p\gladius-order.grp)
+.headerstart
+IsId          	737
+Type          	21
+Init          	GladiusOrderInit
+Death         	GladiusOrderDeath
+GndAttkInit   	GladiusOrderGndAttkInit
+AirAttkInit   	GladiusOrderGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	GladiusOrderGndAttkInit
+AirAttkRpt    	GladiusOrderGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	GladiusOrderGndAttkToIdle
+AirAttkToIdle 	GladiusOrderGndAttkToIdle
+Unused2       	[NONE]
+Walking       	GladiusOrderWalking
+WalkingToIdle 	GladiusOrderWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	GladiusOrderWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+GladiusOrderInit:
+	imgulnextid			0 42 # Gladius (Order) Shadow (cm\f-p\gladius-order.grp)
+GladiusOrderGndAttkToIdle:
+	playfram          	0x00
+	goto              	GladiusOrderWalkingToIdle
+
+GladiusOrderWalkingToIdle:
+	setvertpos        	0
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	setvertpos        	-1
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	goto              	GladiusOrderWalkingToIdle
+
+GladiusOrderDeath:
+	playsnd           	533	# Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0	# Explosion1 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			846 0 42 # Protoss Unit Rubble Medium
+	wait              	1
+	end
+
+GladiusOrderGndAttkInit:
+	nobrkcodestart
+	playsndbtwn       	1926 1928 # GladiusOrder weaponfire 01, 02, 03
+	playfram			0x20
+	attackwith        	1
+	wait              	2
+	playfram			0x00
+	nobrkcodeend
+	gotorepeatattk
+	goto              	SkryrokorLocal00
+
+GladiusOrderWalking:
+	setvertpos        	0
+	imgol             	2472 0 0 # Gladius (Order) Engines (cm\f-p\gladius-order-engine.grp)
+	playfram          	0x00
+	goto              	SkryrokorLocal00
+
+GladiusOrderWarpIn:
+	imgol             	2473 0 0 # Gladius (Order) Warp Flash (cm\f-p\gladius-order.grp)
+	goto              	GladiusOrderWalkingToIdle

patchnotes.md

@@ -32,7 +32,7 @@
 ## Audiovisuals
 - New models for:
 	- Vorvrokor (c. Baelethal)
-	- Landlock (c. fasswawds)
+	- Landlock, Radix (c. fasswawds)
 - Resized model for Talos
 - Modified unit responses for Vorvrokor
 - New weapon SFX for Alzurokor (c. lolrsk8s)
@@ -82,6 +82,10 @@
 - [Gateway](https://cosmonarchy.com/protoss/gateway):
 	- Resource costs 175/0 » 150/0
 
+## Protoss factions
+- **NEW:** [Gladius (Order)](https://cosmonarchy.com/protoss/gladius-order):
+	- Order of the Sacred Saber Gladius variant. Has Triumphant Rise (a la Herald / Archon).
+
 ## Zerg
 - [Zethrokor](https://cosmonarchy.com/zerg/zethrokor):
 	- Resource cost 25/0 » 50/0