Update Southpaw model; Add Philoc (Futurist Federation); Fix misc faction unit availability

mpq/arr/flingy.txt

@@ -488,7 +488,7 @@ Vilgoleth
 Madrigal Turret (Imperioso)
 Madrigal (Furia Mode)
 Madrigal Turret (Furia)
-Extended Flingy #282
+Philoc
 Extended Flingy #283
 Extended Flingy #284
 Extended Flingy #285

mpq/arr/images.txt

@@ -1743,9 +1743,9 @@ Vilgoleth
 Madrigal Turret (Imperioso)
 Madrigal Base (Furia)
 Madrigal Turret (Furia)
-Extended Image #743
+Philoc
-Extended Image #744
+Philoc Shadow
-Extended Image #745
+Philoc Engines
 Extended Image #746
 Extended Image #747
 Extended Image #748

mpq/arr/sprites.txt

@@ -479,16 +479,16 @@ Unknown Desert
 10/5 Desert
 12/1 Desert Overlay
 11/3 Desert
-Lurker Egg
+Lakizilisk Egg (unused)
-Devourer
+Vithrilisk
-Devourer Death
+Vithrilisk Death
-Lurker Remnants
+Lakizilisk Remnants
-Lurker
+Lakizilisk
-Dark Archon Energy
+Mind Tyrant Energy
-Corsair
+Lanifect
-Dark Templar (Unit)
+Cabalist
-Medic
+Cleric
-Medic Remnants
+Cleric Remnants
 Valkyrie
 Scantid (Desert)
 Kakaru (Twilight)
@@ -535,7 +535,7 @@ Ghitorokor
 Aurora
 Panoptus
 Centaur
-Southpaw
+Unused
 Centaur Missile
 Augur
 Vorval Pond
@@ -873,7 +873,7 @@ Vilgoleth
 Madrigal Turret (Imperioso)
 Madrigal (Furia Mode)
 Madrigal Turret (Furia)
-Extended Sprite #1
+Philoc
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -326,7 +326,7 @@ Zerg Begrothilisk
 Zerg Oztukrokor
 Zerg Kethrostalor
 Zerg Rakzilisk
-Unused Unit ID
+Terran Philoc
 Zerg Begrozith Barrow
 Zerg Chokralgant Chazsal
 Protoss Bulwark

mpq/arr/weapons.txt

@@ -201,7 +201,7 @@ Discoid Railgun (Savant, Piercing)
 Geometric Rifle (Sevenstep, Piercing)
 Twinstrike Cannons (Matador)
 Cylindrical Blaster (Analogue)
-Extended Weapon #74
+Heirloom Batteries (Philoc)
 Extended Weapon #75
 Extended Weapon #76
 Extended Weapon #77

mpq/scripts/iscript.txt

@@ -28653,16 +28653,16 @@ Type          	21
 Init          	GorgonInit
 Death         	GorgonDeath
 GndAttkInit   	GorgonGndAttkInit
-AirAttkInit   	GorgonAirAttkInit
+AirAttkInit   	GorgonGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	GorgonGndAttkInit
-AirAttkRpt    	GorgonAirAttkInit
+AirAttkRpt    	GorgonGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	GorgonGndAttkToIdle
 AirAttkToIdle 	GorgonGndAttkToIdle
 Unused2       	[NONE]
 Walking       	GorgonWalking
-WalkingToIdle 	GorgonWalkingToIdle
+WalkingToIdle 	WraithGndAttkToIdle
 SpecialState1 	[NONE]
 SpecialState2 	[NONE]
 AlmostBuilt   	[NONE]
@@ -28679,21 +28679,10 @@ GorgonInit:
 	imgul             	1147 0 42 # Gorgon Shadow (cm\terran\gorgon.grp)
 GorgonGndAttkToIdle:
 	playfram          	0x00
-	goto              	GorgonWalkingToIdle
+	goto              	WraithGndAttkToIdle
-
-GorgonWalkingToIdle:
-	setvertpos        	0
-	wait 				8
-	setvertpos        	0
-	wait 				8
-	setvertpos        	-1
-	wait 				8
-	setvertpos        	0
-	wait 				8
-	goto              	GorgonWalkingToIdle
 
 GorgonDeath:
-	playsndbtwn			1249 1251
+	playsndbtwn			1249 1251 # Gorgon death 01, 02, 03
 	imgol             	333 0 0	# Explosion2 (Medium) (thingy\tBangL.grp)
 	wait              	3
 	lowsprul			844 0 42 # Terran Unit Rubble Medium
@@ -28702,30 +28691,17 @@ GorgonDeath:
 
 GorgonGndAttkInit:
 	wait              	1
-	playsndbtwn			1252 1253
+	playsndbtwn			1252 1253 # Gorgon weaponfire 01, 02
 	attack
 	sigorder 			32
-	wait 1
+	wait 				1
 	gotorepeatattk
-	goto              	GorgonWalkingToIdle
+	goto              	WraithGndAttkToIdle
-
-GorgonLocal00:
-	wait              	125
-	goto              	GorgonLocal00
-
-GorgonAirAttkInit:
-	wait              	1
-	playsndbtwn			1252 1253
-	attack
-	sigorder 			32
-	wait              	1
-	gotorepeatattk
-	goto              	GorgonWalkingToIdle
 
 GorgonWalking:
 	setvertpos        	0
 	imgol             	1198 0 0 # Gorgon Engines (cm\terran\gorgon-engine.grp)
-	goto              	GorgonLocal00
+	goto              	WraithLocal00
 	
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
@@ -28745,7 +28721,7 @@ GndAttkToIdle 	PhobosGndAttkToIdle
 AirAttkToIdle 	PhobosGndAttkToIdle
 Unused2       	[NONE]
 Walking       	PhobosWalking
-WalkingToIdle 	PhobosWalkingToIdle
+WalkingToIdle 	ScourgeLocal00
 SpecialState1 	[NONE]
 SpecialState2 	[NONE]
 AlmostBuilt   	[NONE]
@@ -28762,11 +28738,7 @@ PhobosInit:
 	imgul             	1151 0 42 # Phobos Shadow (cm\terran\phobos.grp)
 PhobosGndAttkToIdle:
 	playfram          	0x00
-	goto              	PhobosWalkingToIdle
+	goto              	ScourgeLocal00
-
-PhobosWalkingToIdle:
-	wait				125
-	goto              	PhobosWalkingToIdle
 
 PhobosDeath:
 	playsnd           	177	# Terran\BATTLE\tbaDth00.wav
@@ -28790,20 +28762,16 @@ PhobosGndAttkInit:
 	wait				1
 	nobrkcodeend
 	gotorepeatattk
-	goto              	PhobosWalkingToIdle
+	goto              	ScourgeLocal00
-
-PhobosLocal00:
-	wait              	125
-	goto              	PhobosLocal00
 
 PhobosWalking:
 	setvertpos        	0
 	imgol             	1162 0 0 # Phobos Engines (cm\terran\phobos-engine.grp)
-	goto              	PhobosLocal00
+	goto              	ScourgeLocal00
 	
 PhobosCastSpell:
 	imgolorig         	543 # Yamato Gun Overlay (thingy\eycBlast.grp)
-	goto				PhobosLocal00
+	goto				ScourgeLocal00
 	
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
@@ -28814,10 +28782,10 @@ Type          	12
 Init          	PenumbraInit
 Death         	PenumbraDeath
 GndAttkInit   	PenumbraGndAttkInit
-AirAttkInit   	PenumbraAirAttkInit
+AirAttkInit   	PenumbraGndAttkInit
 Unused1       	PenumbraUnused1
 GndAttkRpt    	PenumbraGndAttkInit
-AirAttkRpt    	PenumbraAirAttkInit
+AirAttkRpt    	PenumbraGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	PenumbraGndAttkToIdle
 AirAttkToIdle 	PenumbraGndAttkToIdle
@@ -28832,11 +28800,7 @@ PenumbraInit:
 	imgul             	1153 0 0 # Penumbra shadow (cm\terran\penumbra-shad.grp)
 PenumbraWalkingToIdle:
 	playfram          	0x110
-	goto              	PenumbraLocal00
+	goto              	ScourgeLocal00
-
-PenumbraLocal00:
-	wait              	125 
-	goto              	PenumbraLocal00
 
 PenumbraDeath:
 	playsndbtwn			1742 1743 # Penumbra death 01, 02
@@ -28891,29 +28855,6 @@ PenumbraGndAttkToIdle:
 	wait				2
 	goto              	PenumbraWalkingToIdle
 
-PenumbraAirAttkInit:
-	playfram          	0x110
-	wait				2
-	nobrkcodestart
-	playsndbtwn			1199 1202
-	attack
-	playfram			0x165
-	wait				2
-	playfram			0x154
-	wait				2
-	playfram			0x143
-	wait				2
-	playfram			0x132
-	wait				2
-	playfram			0x121
-	nobrkcodeend
-	wait				2
-	playfram			0x110
-	gotorepeatattk
-	ignorerest
-	wait				2
-	goto              	PenumbraWalkingToIdle
-
 PenumbraWalking:
 	move              	3 
 	wait              	1
@@ -47980,17 +47921,27 @@ SouthpawDeath:
 	end
 
 SouthpawGndAttkInit:
+	playfram			0x00
 	wait              	1
 	nobrkcodestart
+	playfram			0x20
 	playsndbtwn			2442 2443 # Southpaw weaponfire 01, 02
 	attackwith			1
-	wait				2
+	wait				1
+	playfram			0x00
+	wait				1
+	playfram			0x40
 	playsndbtwn			2442 2443 # Southpaw weaponfire
 	attackwith			1
-	wait				2
+	wait				1
+	playfram			0x00
+	wait				1
+	playfram			0x60
 	playsndbtwn			2442 2443 # Southpaw weaponfire
 	attackwith			1
 	wait				1
+	playfram			0x00
+	wait				1
 	nobrkcodeend
 	gotorepeatattk
 	goto              	SouthpawLocal00
@@ -51641,6 +51592,57 @@ Type          	1
 Init          	SpiderMineExplosionDeath
 Death         	ScourgeExplosionDeath
 .headerend
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1745 Philoc (cm\faction\philoc.grp)
+.headerstart
+IsId          	751
+Type          	12
+Init          	PhilocInit
+Death         	PhilocDeath
+GndAttkInit   	PhilocGndAttkInit
+AirAttkInit   	PhilocGndAttkInit
+Unused1       	[NONE]
+GndAttkRpt    	PhilocGndAttkInit
+AirAttkRpt    	PhilocGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	WraithGndAttkToIdle
+AirAttkToIdle 	WraithGndAttkToIdle
+Unused2       	[NONE]
+Walking       	PhilocWalking
+WalkingToIdle 	WraithGndAttkToIdle
+SpecialState1 	[NONE]
+.headerend
 # ----------------------------------------------------------------------------- #
 
-# Next free isid: 751
+PhilocInit:
+	imgulnextid         0 42 # Philoc Shadow (terran\philoc.grp)
+	playfram          	0x00
+	goto              	WraithGndAttkToIdle
+
+PhilocDeath:
+	playsnd           	257 # Terran\PHOENIX\TPhDth00.WAV
+	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			844 0 42 # Terran Unit Rubble Medium
+	end
+
+PhilocGndAttkInit:
+	nobrkcodestart
+	wait              	1
+	playfram			0x20
+	attackwith        	1
+	playsnd           	74 # Bullet\TPhFi100.wav
+	wait				1
+	playfram			0x00
+	gotorepeatattk
+	nobrkcodeend
+	goto              	WraithLocal00
+
+PhilocWalking:
+	setvertpos        	0
+	imgol             	1747 0 0 # Philoc Engines (terran\wraith-engine.grp)
+	goto              	WraithLocal00
+
+# Next free isid: 752

patchnotes.md

@@ -2,7 +2,7 @@
 
 ## Designer's Notes
 
-Much of this update is targeted at bringing AI back up to snuff, to complement the latest campaign mission developments. Bugfixes and stability improvements are also featured.
+Much of this update is targeted at bringing AI back up to snuff, to complement the latest campaign mission developments. Bugfixes and stability improvements are also featured, with the hope of achieving sufficient stability for a 1v1 tournament later this month!
 
 ## Bugfixes
 - More nullsprite crashes have been protected against
@@ -13,4 +13,17 @@ Much of this update is targeted at bringing AI back up to snuff, to complement t
 
 ## AI
 - Worker allocation has been better optimized for the new resource model (c. Veeq7)
-- AI should now harvest from more than 3 vespene nodes (c. Veeq7)
+- AI should now harvest from more than 3 vespene nodes (c. Veeq7)
+
+## Audiovisuals
+- New model for:
+	- Southpaw
+
+## Factions
+- Futurist Federation now enables:
+	- Philoc from Starpad (replaces Wraith)
+- Golden Republic now enables:
+	- Aspirant from Fulcrum (replaces Goliath)
+- Nydus Trinity now enables:
+	- Cohort from Barracks (replaces Cyprian)
+	- Tarasque from Fulcrum with attached Palladium (replaces Phalanx)