Implement Ogun & Cannibal; Tweak Valkyrie & Ancile; Fix a crash

mpq/arr/flingy.txt

@@ -573,9 +573,9 @@ Arhaun Turret
 Morningstar Radiation Field
 Zozarc Gorge
 Autocort
-Extended Flingy #367
+Ogun (Tank Mode)
-Extended Flingy #368
+Ogun (Smithy Mode)
-Extended Flingy #369
+Cannibal
 Extended Flingy #370
 Extended Flingy #371
 Extended Flingy #372

mpq/arr/images.txt

@@ -2057,12 +2057,12 @@ Zozarc Gorge Shadow
 Cikralisk Attack Overlay
 Autocort
 Autocort Shadow
-Extended Image #1057
+Ogun (Tank Mode)
-Extended Image #1058
+Ogun Shadow (Tank Mode)
-Extended Image #1059
+Ogun (Smithy Mode)
-Extended Image #1060
+Ogun Shadow (Smithy Mode)
-Extended Image #1061
+Cannibal
-Extended Image #1062
+Cannibal Shadow
 Extended Image #1063
 Extended Image #1064
 Extended Image #1065

mpq/arr/sfxdata.txt

@@ -3532,10 +3532,10 @@ Smoochie Boy Weaponfire 01
 Smoochie Boy Weaponfire 02
 Smoochie Boy Weaponfire 03
 Zozarc Gorge Selected 01
-Extended Sound #1
+Cannibal Weaponfire 01
-Extended Sound #1
+Cannibal Weaponfire 02
-Extended Sound #1
+Cannibal Weaponfire 03
-Extended Sound #1
+Cannibal Weaponfire 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -3531,4 +3531,8 @@ cm\faultline\smoochie-boy\wh-04.wav
 cm\faultline\smoochie-boy\wf-01.wav
 cm\faultline\smoochie-boy\wf-02.wav
 cm\faultline\smoochie-boy\wf-03.wav
-cm\z\_building\zozarc-gorge.wav
+cm\z\_building\zozarc-gorge.wav
+cm\f-t\cannibal\wf-01.wav
+cm\f-t\cannibal\wf-02.wav
+cm\f-t\cannibal\wf-03.wav
+cm\f-t\cannibal\wf-04.wav

mpq/arr/sprites.txt

@@ -1015,9 +1015,9 @@ Arhaun Turret
 Morningstar Radiation Field
 Zozarc Gorge
 Autocort
-Extended Sprite #1
+Ogun (Tank Mode)
-Extended Sprite #1
+Ogun (Smithy Mode)
-Extended Sprite #1
+Cannibal
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -492,10 +492,10 @@ Terran Arhaun (Base)
 Arhaun Turret
 Terran Addon Submenu
 Zerg Zozarc Gorge
-Terran Ogun
+Terran Ogun (Worker Mode)
 Protoss Autocort
-Extended Unit #269
+Terran Cannibal (Upstart)
-Extended Unit #270
+Terran Ogun (Smithy Mode)
 Extended Unit #271
 Extended Unit #272
 Francisco Goska

mpq/arr/weapons.txt

@@ -47,7 +47,7 @@ Plasmid Spores (Alkajelisk)
 Acid Spore (Geszithalor)
 Serrated Cleavers (Gorgrokor)
 Glave Wurm (Mutalisk)
-Parasitic Spores (Alkajelisk)
+Dispatch Pistols (Proselyte)
 Corrosive Acid (Bactalisk)
 Jupiter Driver (Pazuzu)
 Seeker Spores (Spraith Cesiant)
@@ -55,7 +55,7 @@ Subterranean Tentacle (Surkith Cesiant)
 Skittering Spores (Skithrokor)
 Suicide (Skryrokor)
 Parasitic Excision (Matraleth ability)
-Salvage (Talos)
+Twintorch (Dyad)
 Screaming Venom 2 (Keskathalor)
 Dark Swarm (Isthrathaleth ability)
 Plague (Isthrathaleth ability)
@@ -75,9 +75,9 @@ Photon Blasters (Aurora)
 Plasma Missiles (Panoptus)
 Aeon's Madness (Augur)
 Plasma Torpedo (Exemplar)
-Phase Disruptor Cannon (Didact)
+Aruo Twinshot (Missionary)
 Neutron Cannon (Magister)
-Pulse Cannon (Steward)
+Pulse Cannons (Steward)
 Prismatic Cannon (Warden)
 Swarming Spores (Rililisk)
 Plasma Shell (Accantor) (deprecated)
@@ -152,10 +152,10 @@ Blindside Rockets (Sundog)
 Twinstrike Flamethrowers (Matador)
 Bisecting Blades (Zarcavrokor)
 Bones of Reflection
-Retractor Batteries (Pegasus)
+Scepter Orma Scrapray
-Lancet Missiles (Pegasus)
+Ersa Driver (Intendent)
 Chimera Cannons (Hippogriff)
-Axis Drivers (Oberon)
+Alru Burstray (Intendent)
 Pegasus Missiles (Hippogriff)
 Lazarus Salvo (Aion)
 Stellar Torch (Herald)
@@ -177,16 +177,16 @@ Geometric Rifle (Sevenstep)
 Kaleidoscope Cannon (Hypnagogue)
 Cleaving Maw (Tetcaerokor)
 Spirtith Spores (Spirtith Colony)
-Signatory Salvo (Ambassador)
+Usko Scrapray (Helion)
 Skortra Tendril (Skortrith Colony)
-Excellency Laser Batteries (Heir)
+Ikta Driver (Tirade)
-Hades Cannon (Horseman)
+Reforming Carbine (Avatar)
 Through the Looking Glass (Hypnagogue)
 Wordsmith Railgun (Silvertongue)
 Sunsplit Beam (Optecton)
-Skybond Ray (Optecton)
+Particle Ray (Autocort)
 Ironhand Weaver (Patriarch)
-Nominee Burst Rifle (Thespian)
+Angeltear Missiles (Madrigal Hecaton)
 Embalming Spores (Selkerilisk)
 Congealing Spores (Elthrazalisk)
 Plasma Shell (Accantor)
@@ -231,7 +231,7 @@ Phase Cremator (Ashguard)
 Successive Spines (Lakizilisk, Zorthos)
 Rapid Spines (Zobriolisk A)
 Quazrok Spray (Quazrokor)
-Phase Disruptor (Dracadin)
+Phase Disruptor (Dracadin Order)
 Moonbound Salvo (Tiangou)
 Revenant Rifle (Nydus Eidolon)
 Gauss Slugger (Maverick Futurist)
@@ -241,7 +241,7 @@ Mining Saber (Pilgrim)
 Asoni Carbine (Blackguard)
 Phlegethon Cannons (Arhaun)
 Homing Spore (Liiralisk)
-Extended Weapon #114
+Zulu Sidekicks (Cannibal)
 Extended Weapon #115
 Extended Weapon #116
 Extended Weapon #117

mpq/samase/unitdef.txt

@@ -55,6 +55,7 @@ military tiangou = 433
 military maverick_futurist = 435
 military blackguard = 489
 military arhaun = 490
+military cannibal = 496
 
 # Protoss factional units
 military adherent = 400
@@ -96,6 +97,8 @@ military valkyrie = 58
 
 # Terran NGS units
 building talos = 20
+building ogun_worker = 494
+building ogun_smithy = 497
 #
 military apostle = 10
 military shaman = 15

mpq/scripts/iscript_terran.txt

@@ -18970,4 +18970,272 @@ Arhaun_Turret_GndAttkInit:
 	nobrkcodeend
 	gotorepeatattk
 	ignorerest
-	goto              	Goliath_Turret_Init
+	goto              	Goliath_Turret_Init
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1586 Cannibal (cm\terran\cannibal.grp)
+.headerstart
+IsId          	829
+Type          	12
+Init          	CannibalInit
+Death         	CannibalDeath
+GndAttkInit   	CannibalGndAttkInit
+AirAttkInit   	CannibalGndAttkInit
+Unused1       	SkryrokorLocal00
+GndAttkRpt    	CannibalGndAttkRpt
+AirAttkRpt    	CannibalGndAttkRpt
+CastSpell     	CannibalCastSpell
+GndAttkToIdle 	CannibalGndAttkToIdle
+AirAttkToIdle 	CannibalGndAttkToIdle
+Unused2       	[NONE]
+Walking       	CannibalWalking
+WalkingToIdle 	CannibalWalkingToIdle
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+CannibalInit:
+	imgul             	2064 0 0 # Cannibal Shadow (cm\faction-t\cannibal.grp)
+CannibalWalkingToIdle:
+	playfram			0x00
+	goto				CannibalLocal00
+
+CannibalLocal00:
+	wait              	125
+	goto              	CannibalLocal00
+
+CannibalDeath:
+	playsndbtwn       	276 277 # Maverick death 01, 02
+	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait				3
+	lowsprul          	820 0 0 # Cannibal Remains (cm\terran\cannibal-remains.grp)
+	wait              	1
+	end
+
+CannibalGndAttkInit:
+	playfram          	0x120
+	wait              	1
+	playfram          	0x160
+CannibalGndAttkRpt:
+	wait              	1
+	nobrkcodestart
+	playfram          	0x1E0
+	attackwith        	1
+	wait              	1
+	playfram          	0x1C0
+	wait              	1
+	playfram          	0x180
+	wait              	1
+	nobrkcodeend
+	gotorepeatattk
+	ignorerest
+CannibalGndAttkToIdle:
+	playfram			0x160
+	wait				1
+	playfram			0x140
+	wait				1
+	goto              	CannibalWalkingToIdle
+
+CannibalCastSpell:
+	wait              	1
+	goto              	CannibalGndAttkToIdle
+
+CannibalWalking:
+	move              	3
+	wait              	1
+	playfram          	0x80
+	move              	3
+	wait              	1
+	playfram          	0xA0
+	move              	3
+	wait              	1
+	playfram          	0xC0
+	move              	3
+	wait              	1
+	playfram          	0xE0
+	move              	3
+	wait              	1
+	playfram          	0x100
+	move              	3
+	wait              	1
+	playfram          	0x20
+	move              	3
+	wait              	1
+	playfram          	0x40
+	move              	3
+	wait              	1
+	playfram          	0x60
+	goto              	CannibalWalking
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2059 Ogun Worker Mode (cm\terran\ogun.grp)
+.headerstart
+IsId          	830
+Type          	15
+Init          	OgunInit
+Death         	OgunDeath
+GndAttkInit   	OgunGndAttkInit
+AirAttkInit   	OgunGndAttkInit
+Unused1       	OgunUnused1
+GndAttkRpt    	OgunGndAttkInit
+AirAttkRpt    	OgunGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	InfestedTerranWalkingToIdle
+AirAttkToIdle 	InfestedTerranWalkingToIdle
+Unused2       	[NONE]
+Walking       	OgunWalking
+WalkingToIdle 	InfestedTerranWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	OgunGndAttkInit
+.headerend
+# ----------------------------------------------------------------------------- #
+
+OgunInit:
+	imgul             	2060 0 0 # Ogun Shadow (cm\terran\ogun-shadow.grp)
+	playfram          	0x00
+	goto              	InfestedTerranWalkingToIdle
+
+OgunDeath:
+	playsndbtwn       	1385 1386 # Ogun death 01, 02
+	imgol             	332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			845 0 0 # Terran Unit Rubble Small
+	wait              	1
+	end
+
+OgunUnused1:
+	wait				1
+	nobrkcodestart
+	playsndbtwn			1705 1706 # Shaman revive 01, 02
+	sprol				742 0 0
+	setfldirect			12
+	wait				12
+	nobrkcodeend
+	goto				InfestedTerranWalkingToIdle
+
+OgunGndAttkInit:
+	playfram          	0x00
+	setvertpos        	0
+	wait              	1
+	useweapon         	14 # Fusion Cutter (Harvest) (Fusion Cutter)
+	sigorder			32
+	wait				13
+	goto              	OgunGndAttkInit
+
+OgunWalking:
+	playfram			0x20
+	move				4
+	wait				1
+	playfram			0x40
+	move				4
+	wait				1
+	playfram			0x60
+	move				4
+	wait				1
+	playfram			0x80
+	move				4
+	wait				1
+	playfram			0xA0
+	move				4
+	wait				1
+	playfram			0xC0
+	move				4
+	wait				1
+	playfram			0xE0
+	move				4
+	wait				1
+	goto              	OgunWalking
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2061 Ogun Smithy Mode (cm\terran\ogun.grp)
+.headerstart
+IsId          	831
+Type          	14
+Init          	OgunSmithyModeInit
+Death         	OgunSmithyModeDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	OgunSmithyModeUnused1
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	OgunSmithyModeGndAttkToIdle
+AirAttkToIdle 	OgunSmithyModeGndAttkToIdle
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	SkryrokorLocal00
+SpecialState1 	OgunSmithyModeSpecialState2
+SpecialState2 	OgunSmithyModeSpecialState2
+AlmostBuilt   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+OgunSmithyModeInit:
+	imgul             	2062 0 0 # Ogun Shadow (cm\terran\ogun-shadow.grp)
+	wait              	1
+	playsnd           	2429 # Ogun Smithy Transform
+	setflspeed        	0
+	playfram          	0x120
+	wait              	1
+	playfram          	0x140
+	wait              	1
+	playfram          	0x160
+	wait              	1
+	playfram          	0x180
+	wait              	6
+	sigorder          	1
+	goto              	OgunSmithyModeGndAttkToIdle
+
+OgunSmithyModeGndAttkToIdle:
+	playfram          	0x180
+	wait				1
+	playfram          	0x1A0
+	wait				1
+	playfram          	0x1C0
+	wait				1
+	playfram          	0x1E0
+	wait				1
+	playfram          	0x200
+	wait				1
+	playfram          	0x220
+	wait				1
+	playfram          	0x240
+	wait				1
+	playfram          	0x260
+	wait				1
+	goto				OgunSmithyModeGndAttkToIdle
+
+OgunSmithyModeDeath:
+	playsndbtwn       	1385 1386 # Ogun death 01, 02
+	imgol             	332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			845 0 0 # Terran Unit Rubble Small
+	wait              	1
+	end
+
+OgunSmithyModeUnused1:
+	wait				1
+	nobrkcodestart
+	playsndbtwn			1705 1706 # Shaman revive 01, 02
+	sprol				742 0 0
+	setfldirect			12
+	wait				12
+	nobrkcodeend
+	goto				OgunSmithyModeGndAttkToIdle
+
+OgunSmithyModeSpecialState2:
+	playsnd           	2430 # Ogun Tank Transform
+	playfram          	0x160
+	wait              	1
+	playfram          	0x140
+	wait              	1
+	playfram          	0x120
+	wait              	1
+	playfram          	0x00
+	wait              	6
+	sigorder          	1
+	goto              	SkryrokorLocal00

patchnotes.md

@@ -9,14 +9,31 @@
 - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes!
 
 ## Bugfixes
+- **Stability:**
+	- Resolved a common crash after warping in a Monument of Sin (r. HitEmUp & Sosij, c. DF)
 - **AI:**
 	- Resolved an issue preventing Zerg AI from making **Axtoth Axis** and related units (r. GreenEggs'NSpam)
 - **Audiovisual:**
+	- Fixed icon display for **Solarion** hangar (r. jakulangski, c. DF)
 	- Corrected filenames for a few miscellaneous sound files (r. Mimika)
 
+## Terran
+- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie):
+	- **Halo Rockets:**
+		- Weapon range 6 » 7
+		- Weapon still fired at 6 range, improving chase potential
+- [Ancile](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ancile):
+	- Vision range 10 » 8
+- **NEW:** [Ogun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ogun):
+	- Sturdy constructor with a repair-oriented deployment
+	- Trained from Ministry or Treasury; requires Quarry
+- **NEW:** [Cannibal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cannibal):
+	- **Upstart only!** Raiding infantry; replaces Cyprian
+
 ## Protoss
 - **NEW:** [Autocort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/autocort):
-	- Advanced constructor with personal power field; trained from Embassy
+	- Advanced constructor with personal power field
+	- Trained from Embassy
 
 ## Zerg
 - [Sovroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sovroleth):