Initial work on Quadriga; Askosi development, tweaks, and implementations

mpq/arr/flingy.txt

@@ -627,7 +627,7 @@ Intendent
 Object
 Abutment
 Proscenium
-Extended Flingy #421
+Quadriga
 Extended Flingy #422
 Extended Flingy #423
 Extended Flingy #424

mpq/arr/images.txt

@@ -2224,10 +2224,10 @@ Abutment
 Abutment Shadow
 Proscenium
 Proscenium Shadow
-Extended Image #1224
-Extended Image #1225
-Extended Image #1226
-Extended Image #1227
+Quadriga
+Quadriga Shadow
+Quadriga Engines
+Quadriga Afterburners
 Extended Image #1228
 Extended Image #1229
 Extended Image #1230

mpq/arr/orders.txt

@@ -120,7 +120,7 @@ Unburrow
 Use Ability (Dark Swarm)
 Use Ability (Parasite)
 Use Ability (Spawn Broodling)
-Use Ability (Lobotomy Warhead old)
+Use Ability (Hijack)
 Unknown
 Idle (Nuclear Silo)
 Attack (Nuke)

mpq/arr/sfxdata.txt

@@ -4092,10 +4092,10 @@ Rove Banter 01
 Rove Banter 02
 Rove Banter 03
 Rove Banter 04
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Pilgrim Weaponfire 01
+Pilgrim Weaponfire 02
+Pilgrim Weaponfire 03
+Pilgrim Weaponfire 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -4059,6 +4059,7 @@ cm\a\avatar\wf-03.wav
 cm\a\deploy-01.wav
 cm\a\deploy-02.wav
 cm\a\deploy-03.wav
+cm\a\a-unit-deploy-01.wav
 cm\a\cardinal\wf-01.wav
 cm\a\cardinal\wf-02.wav
 cm\a\cardinal\wf-03.wav
@@ -4067,4 +4068,31 @@ cm\a\cardinal\wh-02.wav
 cm\a\cardinal\wh-03.wav
 cm\a\rove\wf-01.wav
 cm\a\rove\wf-02.wav
-cm\a\rove\wf-03.wav
+cm\a\rove\wf-03.wav
+cm\a\rove\rdy-01.wav
+cm\a\rove\rdy-02.wav
+cm\a\rove\rdy-03.wav
+cm\a\rove\wht-01.wav
+cm\a\rove\wht-02.wav
+cm\a\rove\wht-03.wav
+cm\a\rove\wht-04.wav
+cm\a\rove\yes-01.wav
+cm\a\rove\yes-02.wav
+cm\a\rove\yes-03.wav
+cm\a\rove\yes-04.wav
+cm\a\rove\agg-01.wav
+cm\a\rove\agg-02.wav
+cm\a\rove\agg-03.wav
+cm\a\rove\agg-04.wav
+cm\a\rove\hlp-01.wav
+cm\a\rove\hlp-02.wav
+cm\a\rove\hlp-03.wav
+cm\a\rove\hlp-04.wav
+cm\a\rove\bnt-01.wav
+cm\a\rove\bnt-02.wav
+cm\a\rove\bnt-03.wav
+cm\a\rove\bnt-04.wav
+cm\a\pilgrim\wf-01.wav
+cm\a\pilgrim\wf-02.wav
+cm\a\pilgrim\wf-03.wav
+cm\a\pilgrim\wf-04.wav

mpq/arr/sprites.txt

@@ -1078,7 +1078,7 @@ Intendent
 Object
 Abutment
 Proscenium
-Extended Sprite #564
+Quadriga
 Extended Sprite #565
 Extended Sprite #566
 Extended Sprite #567

mpq/arr/units.txt

@@ -539,12 +539,12 @@ Zerg Overmind (The Fall)
 Askosi Avatar
 Askosi Abutment
 Askosi Proscenium
-Extended Unit #314
-Extended Unit #315
-Extended Unit #316
-Extended Unit #317
-Extended Unit #318
-Extended Unit #319
+Terran Quadriga (Golden Republic)
+Askosi Thaumalogue
+Askosi Petract
+Askosi Crematorium
+Askosi Zylode
+Askosi Astrolabe
 Extended Unit #320
 Extended Unit #321
 Extended Unit #322

mpq/rez/stat.txt

@@ -389,7 +389,7 @@ e<1><4>Warp in Rogue Gallery <1>(<3>E<1>)<10>Profane disciple production.<0>
 <0>
 <0>
 <0>
-<0>
+e<3><4>Salvage <1>(<3>E<1>)<10>Orders the builder to deconstruct the target mechanical unit or structure, returning up to 33% of its resource cost during the channel.<0>
 e<3><4>Rapid Rendezvous <1>(<3>E<1>)<10>Leaps to the target ground ally within 5 range.<0>
 c<3><4>Hijack <1>(<3>C<1>)<10>Leaps to the target hostile, attaching to the victim and slowing their movement speed by 50%.<10><10>After 5 seconds, the Askosi combatant becomes the target.<0>
 e<3><4>Rematerialize <1>(<3>E<1>)<10>Pulls a target ally within 4 range to the combatant's location.<0>
@@ -883,7 +883,7 @@ Invalid target.<0>
 Must target damaged units or complete structures.<0>
 Must target Terran units.<0>
 Invalid target.<0>
-Must target non-robotic ground units.<0>
+Must target ground units.<0>
 Must target ground.<0>
 Target out of range.<0>
 Target is too close.<0>
@@ -902,8 +902,8 @@ Must target non-hovering ground units.<0>
 Must target passable terrain.<0>
 b<1><4>Install Bounty <1>(<3>B<1>)<10>Resplendent town center.<0>
 Bounty Requires<10>   Cipher AND Gauntlet<0>
-<0>
-<0>
+Must target completed units.<0>
+Must target enemy units or allied embedded units.<0>
 <0>
 <0>
 <0>
@@ -1287,7 +1287,7 @@ q<1><4>Build Quarry <1>(<3>Q<1>)<10>Auxiliary worker production.<0>
 <0>
 v<5><4>Morph into Vithrilisk <1>(<3>V<1>)<10>Heavy fighter strain.<0>
 c<1><4>Train Cleric <1>(<3>C<1>)<10>Support infantry.<0>
-<0>
+v<1><4>Build Quadriga <1>(<3>V<1>)<10>Reinforced gunboat.<0>
 v<1><4>Build Valkyrie <1>(<3>V<1>)<10>Air superiority corvette.<0>
 r<1><4>Warp in Lanifect <1>(<3>R<1>)<10>Air superiority fighter.<0>
 a<1><4>Profanate Cabalist <1>(<3>A<1>)<10>Cloaked melee assassin.<0>

mpq/samase/unitdef.txt

@@ -60,6 +60,7 @@ military madrigal_hecaton = 504
 military vulture_hecaton = 506
 military madrigal_hecaton_furia = 508
 military valkyrie_hecaton = 520
+military quadriga = 541
 
 # Protoss factional units
 military adherent = 400
@@ -72,6 +73,7 @@ military ashguard = 424
 military dracadin_order = 430
 military manifold_starbound = 437
 military simulacrum_astral = 522
+military warlock = 523
 
 # Zerg factional units
 military nathrelisk = 402
@@ -83,6 +85,7 @@ military hydralisk_orkoti = 436
 building yblyleth = 438
 military azanthrokor = 511
 military sovrokor = 519
+military garvrokor = 521
 
 # Terran military units
 military maverick = 0

mpq/scripts/iscript_askosi.txt

@@ -714,12 +714,12 @@ MissionaryGndAttkRpt:
 	wait              	1
 	playfram          	0x20
 	wait              	1
-	nobrkcodeend
 	playfram          	0x40
 	attackwith			1
 	wait              	1
 	playfram          	0x20
 	wait              	1
+	nobrkcodeend
 	gotorepeatattk
 	ignorerest
 MissionaryGndAttkToIdle:
@@ -915,11 +915,16 @@ VicarGndAttkRpt:
 	wait              	1
 	playfram          	0xcc
 	wait              	1
-	nobrkcodeend
+	playfram          	0xbb
+	attackwith			1
+	wait              	1
+	playfram          	0xcc
+	wait              	1
 	playfram          	0xaa
 	wait              	1
 	playfram          	0x99
 	wait              	1
+	nobrkcodeend
 	gotorepeatattk
 	ignorerest
 VicarGndAttkToIdle:

mpq/scripts/iscript_terran.txt

@@ -20440,4 +20440,66 @@ VultureHecatonSpecialState1:
 	attackwith        	1
 	sigorder          	1
 	wait              	1
-	end
+	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2226 Quadriga (cm\faction-t\quadriga.grp)
+.headerstart
+IsId          	840
+Type          	12
+Init          	QuadrigaInit
+Death         	QuadrigaDeath
+GndAttkInit   	QuadrigaAirAttkInit
+AirAttkInit   	QuadrigaAirAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	QuadrigaAirAttkInit
+AirAttkRpt    	QuadrigaAirAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	TrojanLocal00
+AirAttkToIdle 	TrojanLocal00
+Unused2       	[NONE]
+Walking       	QuadrigaWalking
+WalkingToIdle 	QuadrigaWalkingToIdle
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+QuadrigaInit:
+	imgulnextid			0 42 # Quadriga Shadow (cm\faction-t\quadriga.grp)
+	playfram          	0x00
+	goto              	TrojanLocal00
+
+QuadrigaDeath:
+	playsnd           	1040 # Terran\FRIGATE\TVkDth00.WAV
+	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			844 0 42 # Terran Unit Rubble Medium
+	wait              	1
+	end
+
+QuadrigaAirAttkInit:
+	wait              	2
+	nobrkcodestart
+	attackwith        	2
+	wait				6
+	attackwith        	2
+	wait				6
+	attackwith        	2
+	wait				6
+	attackwith        	2
+	wait				6
+	attackwith        	2
+	nobrkcodeend
+	gotorepeatattk
+	goto              	TrojanLocal00
+
+QuadrigaWalking:
+	setvertpos        	0
+	imgol             	2228 0 0 # Quadriga Engines (cm\faction-t\quadriga-engine.grp)
+	sigorder          	64
+	goto              	SkryrokorLocal00
+
+QuadrigaWalkingToIdle:
+	orderdone         	64
+	goto              	TrojanLocal00

mpq/scripts/iscript_zerg.txt

@@ -1026,7 +1026,7 @@ GeszithalorGndAttkToIdle:
 
 GeszithalorDeath:
 	playsnd           	852	# Zerg\Geszithalor\ZGuDth00.WAV
-	imgol             	28 0 0	# Geszithalor Death (zerg\zguDeath.grp)
+	imgol             	28 0 0 # Geszithalor Death (zerg\zguDeath.grp)
 	wait              	1
 	lowsprul			186 0 42 # Zerg Building Rubble Small
 	wait              	1
@@ -14789,7 +14789,7 @@ CherbrathalorGndAttkToIdle:
 CherbrathalorDeath:
 	playsnd           	878	# Zerg\Ultra\ZUlDth00.WAV
 	imgol             	28 0 0 # Geszithalor Death (zerg\zguDeath.grp)
-	wait              	2
+	wait              	12
 	lowsprul			186 0 0 # Zerg Building Rubble Small
 	wait              	1
 	end