Add Futurist Blackguard and Hecaton Arhaun

mpq/arr/flingy.txt

@@ -566,10 +566,10 @@ Pilgrim
 Large Protoss Laser
 Vorvrokor
 Bactalisk
-Extended Flingy #360
+Blackguard
-Extended Flingy #361
+Arhaun Projectile
-Extended Flingy #362
+Arhaun Base
-Extended Flingy #363
+Arhaun Turret
 Extended Flingy #364
 Extended Flingy #365
 Extended Flingy #366

mpq/arr/images.txt

@@ -2046,11 +2046,11 @@ Skibact Scab Shadow
 Vorvrokor
 Bactalisk
 Stasis Cell Shadow
-Extended Image #1046
+Blackguard
-Extended Image #1047
+Blackguard Shadow
-Extended Image #1048
+Arhaun Base
-Extended Image #1049
+Arhaun Turret
-Extended Image #1050
+Arhaun Shadow
 Extended Image #1051
 Extended Image #1052
 Extended Image #1053

mpq/arr/sfxdata.txt

@@ -3510,17 +3510,17 @@ Cikralisk Death 01
 Cikralisk Death 02
 Cikralisk Death 03
 Apostle Revive 01
-Extended Sound #1
+Blackguard Charge 01
-Extended Sound #1
+Blackguard Charge 02
-Extended Sound #1
+Blackguard Charge 03
-Extended Sound #1
+Blackguard Charge 04
-Extended Sound #1
+Blackguard Weaponfire 01
-Extended Sound #1
+Blackguard Weaponfire 02
-Extended Sound #1
+Blackguard Weaponfire 03
-Extended Sound #1
+Blackguard Weaponfire 04
-Extended Sound #1
+Arhaun Weaponfire 01
-Extended Sound #1
+Arhaun Weaponfire 02
-Extended Sound #1
+Arhaun Weaponfire 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -3510,3 +3510,14 @@ cm\z\cikralisk\dth-01.wav
 cm\z\cikralisk\dth-02.wav
 cm\z\cikralisk\dth-02.wav
 cm\t\apostle\revive-01.wav
+cm\f-t\blackguard\ch-01.wav
+cm\f-t\blackguard\ch-02.wav
+cm\f-t\blackguard\ch-03.wav
+cm\f-t\blackguard\ch-04.wav
+cm\f-t\blackguard\wf-01.wav
+cm\f-t\blackguard\wf-02.wav
+cm\f-t\blackguard\wf-03.wav
+cm\f-t\blackguard\wf-04.wav
+cm\f-t\arhaun\wf-01.wav
+cm\f-t\arhaun\wf-02.wav
+cm\f-t\arhaun\wf-03.wav

mpq/arr/sprites.txt

@@ -1009,9 +1009,9 @@ Askosi Structure Rubble (Small)
 Large Protoss Laser
 Vorvrokor
 Bactalisk
-Extended Sprite #1
+Blackguard
-Extended Sprite #1
+Arhaun Base
-Extended Sprite #1
+Arhaun Turret
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -487,9 +487,9 @@ Zerg Vespene Depleted
 Terran Beacon
 Protoss Beacon
 Zerg Beacon
-Extended Unit #262
+Terran Blackguard
-Extended Unit #263
+Terran Arhaun (Base)
-Extended Unit #264
+Arhaun Turret
 Extended Unit #265
 Extended Unit #266
 Extended Unit #267

mpq/arr/weapons.txt

@@ -238,8 +238,8 @@ Gauss Slugger (Maverick Futurist)
 Needle Spores (Hydralisk Orkoti)
 Inzor Reflux (Inzorthrokor)
 Mining Saber (Pilgrim)
-Extended Weapon #111
+Asoni Carbine (Blackguard)
-Extended Weapon #112
+Phlegethon Cannons (Arhaun)
 Extended Weapon #113
 Extended Weapon #114
 Extended Weapon #115

mpq/scripts/iscript_terran.txt

@@ -1898,7 +1898,8 @@ SpecialState1 	SkryrokorLocal00
 Phalanx_Tank_TurretInit:
     playfram            0x00
 Phalanx_Tank_TurretLocal00:
-    waitrand            63 75
+	wait				1
+    waitrand            62 74
     randcondjmp        	230 Phalanx_Tank_TurretLocal00
     sigorder            8
     randcondjmp        	127 Phalanx_Tank_TurretLocal01
@@ -1910,11 +1911,11 @@ Phalanx_Tank_TurretLocal00:
     goto                Phalanx_Tank_TurretLocal00
 
 Phalanx_Tank_TurretLocal01:
-    turn1cwise          1
+    turn1cwise
     wait                3
-    turn1cwise          1
+    turn1cwise
     wait                3
-    turn1cwise          1
+    turn1cwise
     goto                Phalanx_Tank_TurretLocal00
 
 Phalanx_Tank_TurretGndAttkInit:
@@ -18847,3 +18848,117 @@ MaelstromHitInit:
 	playfram          	8
 	wait              	2
 	end
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2048 Blackguard (cm\faction-t\blackguard.grp)
+.headerstart
+IsId          	820
+Type          	12
+Init          	BlackguardInit
+Death         	MadcapDeath
+GndAttkInit   	BlackguardGndAttkInit
+AirAttkInit   	BlackguardGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	BlackguardGndAttkRpt
+AirAttkRpt    	BlackguardGndAttkRpt
+CastSpell     	[NONE]
+GndAttkToIdle 	MadcapGndAttkToIdle
+AirAttkToIdle 	MadcapGndAttkToIdle
+Unused2       	[NONE]
+Walking       	MadcapWalking
+WalkingToIdle 	MadcapWalkingToIdle
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+BlackguardInit:
+	imgul             	2049 0 0 # Blackguard Shadow (cm\faction-t\blackguard-shadow.grp)
+	goto				MadcapWalkingToIdle
+
+BlackguardGndAttkInit:
+	playfram          	0x100
+	wait				1
+	playfram			0x120
+	wait				1
+	playfram			0x140
+BlackguardGndAttkRpt:
+	wait				1
+	nobrkcodestart
+	playsndbtwn			3512 3515 # Blackguard weapon charge 01, 02, 03, 04
+	wait				1
+	playfram			0x180
+	wait				11
+	attack
+	playfram          	0x1A0
+	wait              	1
+	playfram          	0x180
+	nobrkcodeend
+	gotorepeatattk
+	ignorerest
+	goto				MadcapGndAttkToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2050 Arhaun Base (cm\faction-t\arhaun-base.grp)
+.headerstart
+IsId          	821
+Type          	12
+Init          	Arhaun_Base_Init
+Death         	Goliath_Base_Death
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	Goliath_Base_Unused1
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	Goliath_Base_Walking
+WalkingToIdle 	Goliath_Base_WalkingToIdle
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+Arhaun_Base_Init:
+	imgul             	2052 0 0 # Arhaun Shadow (cm\faction-t\arhaun-shadow.grp)
+	goto				Goliath_Base_WalkingToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2051 Arhaun Turret (cm\faction-t\arhaun-turret.grp)
+.headerstart
+IsId          	822
+Type          	12
+Init          	Goliath_Turret_Init
+Death         	Generic_Wait1End
+GndAttkInit   	Arhaun_Turret_GndAttkInit
+AirAttkInit   	Arhaun_Turret_GndAttkInit
+Unused1       	[NONE]
+GndAttkRpt    	Arhaun_Turret_GndAttkInit
+AirAttkRpt    	Arhaun_Turret_GndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	Goliath_Turret_Init
+AirAttkToIdle 	Goliath_Turret_Init
+Unused2       	[NONE]
+Walking       	Goliath_Turret_Walking
+WalkingToIdle 	Goliath_Turret_Init
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+Arhaun_Turret_GndAttkInit:
+	wait				1
+	nobrkcodestart
+	playfram          	0xdd
+	playsndbtwn         3520 3522 # Arhaun weaponfire 01, 02, 03
+	attackwith        	1
+	attackwith        	1
+	wait              	1
+	playfram          	0x00
+	wait              	1
+	nobrkcodeend
+	gotorepeatattk
+	ignorerest
+	goto              	Goliath_Turret_Init

patchnotes.md

@@ -24,3 +24,9 @@
 
 **Audiovisuals:**
 - New fidget animations for tank mode Phalanx (c. DF)
+
+## Terran
+- **NEW:** [Blackguard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackguard):
+	- Futurist Federation; long-range penetrating infantry; replaces Madcap
+- **NEW:** [Arhaun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/arhaun):
+	- Hecaton Coalition; anti-ground strike walker; replaces Goliath