Add Upstart Shaman and Morrigan; Update Cosmoscope model; Add many SFX

mpq/arr/flingy.txt

@@ -715,8 +715,8 @@ Hydrokor (Goszirith)
 Nihilist
 Maverick (Golden)
 Gladius (Order)
-Extended Flingy #509
-Extended Flingy #510
+Shaman (Upstart, Support)
+Shaman (Upstart, Adrenaline)
 Extended Flingy #511
 Extended Flingy #512
 Extended Flingy #513

mpq/arr/images.txt

@@ -2472,10 +2472,10 @@ Gladius (Order)
 Gladius (Order) Shadow
 Gladius (Order) Engine
 Gladius (Order) Warp Flash
-Extended Image #1472
-Extended Image #1473
-Extended Image #1474
-Extended Image #1475
+Droleth Mutate
+Shaman (Upstart, Support)
+Shaman (Upstart) Shadow
+Shaman (Upstart, Adrenaline)
 Extended Image #1476
 Extended Image #1477
 Extended Image #1478

mpq/arr/sfxdata.txt

@@ -4321,31 +4321,31 @@ Paraclete Weaponfire 02
 Paraclete Weaponfire 03
 Paraclete Cast 01
 Function Ambient 01
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Cosmoscope Ambient 01
+Morrigan Weaponfire 01
+Morrigan Weaponfire 02
+Morrigan Weaponfire 03
+Morrigan Weaponfire 04
+Morrigan Weaponfire 05
+Morrigan Weaponfire 06
+Error Askosi
+Maverick (Golden) Weaponfire 01
+Maverick (Golden) Weaponfire 02
+Maverick (Golden) Weaponfire 03
+Maverick (Golden) Weaponfire 04
+Maverick (Golden) Weaponfire 05
+Maverick (Golden) Weaponfire 06
+Cloak Attack On
+Cloak Attack Off
+Cloak Damage On 01
+Cloak Damage On 02
+Cloak Damage On 03
+Cloak Damage Off 01
+Cloak Damage Off 02
+Askosi Structure Placement 01
+Iconoclast Weaponfire 01
+Iconoclast Weaponfire 02
+Iconoclast Weaponfire 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -4142,7 +4142,7 @@ cm\a\a-construction-end-01.wav
 cm\a\a-rescue-01.wav
 cm\a\_building\landlock\wht-01.wav
 cm\a\_building\function\wht-01.wav
-cm\a\_building\cosmoscope-wht-01.wav
+cm\a\_building\cosmoscope\wht-01.wav
 cm\a\a-explosion-medium-01.wav
 cm\a\a-explosion-medium-02.wav
 cm\a\a-explosion-medium-03.wav
@@ -4321,3 +4321,28 @@ cm\a\paraclete\wf-02.wav
 cm\a\paraclete\wf-03.wav
 cm\a\paraclete\cast-01.wav
 cm\a\_building\function\amb-01.wav
+cm\a\_building\cosmoscope\amb-01.wav
+cm\f-t\morrigan\wf-01.wav
+cm\f-t\morrigan\wf-02.wav
+cm\f-t\morrigan\wf-03.wav
+cm\f-t\morrigan\wf-04.wav
+cm\f-t\morrigan\wf-05.wav
+cm\f-t\morrigan\wf-06.wav
+cm\advisors\error-askosi.wav
+cm\f-t\maverick-golden\wf-01.wav
+cm\f-t\maverick-golden\wf-02.wav
+cm\f-t\maverick-golden\wf-03.wav
+cm\f-t\maverick-golden\wf-04.wav
+cm\f-t\maverick-golden\wf-05.wav
+cm\f-t\maverick-golden\wf-06.wav
+cm\t\cloak-attack-on.wav
+cm\t\cloak-attack-off.wav
+cm\b\cloak-damage-on-01.wav
+cm\b\cloak-damage-on-02.wav
+cm\b\cloak-damage-on-03.wav
+cm\b\cloak-damage-off-01.wav
+cm\b\cloak-damage-off-02.wav
+cm\a\a-placement-01.wav
+cm\a\iconoclast\wf-01.wav
+cm\a\iconoclast\wf-02.wav
+cm\a\iconoclast\wf-03.wav

mpq/arr/sprites.txt

@@ -1187,8 +1187,8 @@ Morrigan Remains
 Maverick (Golden)
 Maverick (Golden) Remains
 Gladius (Order)
-Extended Sprite #673
-Extended Sprite #674
+Shaman (Upstart, Support)
+Shaman (Upstart, Adrenaline)
 Extended Sprite #675
 Extended Sprite #676
 Extended Sprite #677

mpq/arr/weapons.txt

@@ -303,9 +303,9 @@ Eyelets (Proselyte)
 Alko Ashgun (Scralia)
 Phase Rifle (Maverick Golden)
 Plasma Flurry (Gladius Order)
-Extended Weapon #176
-Extended Weapon #177
-Extended Weapon #178
+Epitaph Grenade Launcher (Morrigan)
+Scalpel Cannon (Shaman Upstart)
+Reactive Blaster (Manifold Starbound)
 Extended Weapon #179
 Extended Weapon #180
 Extended Weapon #181

mpq/rez/stat.txt

@@ -316,9 +316,9 @@
 Spider Mines<0>
 Goremasts<0>
 Piety Wards<0>
-<0>
-<0>
-<0>
+Morrigan Requires:<10>   Covenant<0>
+f<1><4>Train Morrigan <1>(<3>G<1>)<10>Crowd-control infantry.<0>
+¤<3><4>Dampening Field <2>(passive)<10>This combatant becomes cloaked for 2 seconds after attacking.<0>
 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>
@@ -1752,7 +1752,7 @@ t<1><4>Train Apostle <1>(<3>T<1>)<10>Reanimation specialist.<0>
 <0>
 <0>
 <0>
-<0>
+s<1><4>Build Shaman <1>(<3>S<1>)<10>Augmenting support vehicle.<0>
 ¤<3><4>Martyrous Tempest <2>(passive)<10>On death, Archons release a Psionic Storm that lasts for 10 seconds.<0>
 x<3><4>Skryspawn <1>(<3>X<1>)<10>Channels to spawn 6 Skryrokors over 3 seconds.<0>
 Gestating...<0>
@@ -2302,8 +2302,8 @@ Eyelets<0>
 Alko Ashgun<0>
 Phase Rifle<0>
 Plasma Flurry<0>
-<0>
-<0>
+Epitaph Grenade Launcher<0>
+Scalpel Cannon<0>
 <0>
 <0>
 <0>

mpq/samase/unitdef.txt

@@ -141,7 +141,7 @@ military goremast = 567
 military broadside = 568
 military vulture_upstart = 570
 military maverick_upstart = 573
-military eidolon_upstart = 575
+military morrigan = 575
 military ajax = 576
 military maverick_golden = 580
 military shaman_upstart = 581

mpq/scripts/iscript_askosi.txt

@@ -1504,7 +1504,7 @@ CosmoscopeSpecialState1:
 	goto              	SkryrokorLocal00
 
 CosmoscopeAlmostBuilt:
-	playfram          	6
+	playfram          	9
 	goto              	SkryrokorLocal00
 
 CosmoscopeBuilt:
@@ -1522,8 +1522,12 @@ CosmoscopeIsWorking:
 	wait              	2
 	playfram          	5
 	wait              	2
-	playfram          	0x00
-	wait              	6
+	playfram          	6
+	wait              	2
+	playfram          	7
+	wait              	2
+	playfram          	8
+	wait              	2
 	goto              	CosmoscopeIsWorking
 
 CosmoscopeDisable:
@@ -4220,8 +4224,10 @@ IconoclastGndAttkInit:
 	wait				1
 	nobrkcodestart
 	playfram			0x00
+	playsndbtwn			4345 4347 # Iconoclast weaponfire 01, 02, 03
 	attackwith			1
 	wait 				2
+	playsndbtwn			4345 4347 # Iconoclast weaponfire 01, 02, 03
 	attackwith			1
 	wait 				1
 	nobrkcodeend

mpq/scripts/iscript_terran.txt

@@ -15461,7 +15461,7 @@ SpecialState1 	ShamanSupportModeSpecialState1
 # ----------------------------------------------------------------------------- #
 
 ShamanSupportModeInit:
-	imgul             	1227 0 4 # Shaman Shadow (cm\terran\shaman-shadow.grp)
+	imgulnextid			0 0 # Shaman Shadow (cm\terran\shaman-shadow.grp)
 	playfram          	0x00
 	goto              	ShamanSupportModeGndAttkToIdle
 
@@ -21584,3 +21584,394 @@ MaverickGoldenWalking:
 	wait              	1
 	playfram          	0x80
 	goto              	MaverickGoldenWalking
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2475 Shaman (Upstart) Support Mode (cm\f-t\shaman-upstart.grp)
+.headerstart
+IsId          	854
+Type          	13
+Init          	ShamanUpstartSupportModeInit
+Death         	ShamanUpstartSupportModeDeath
+GndAttkInit   	ShamanUpstartSupportGndAttkInit
+AirAttkInit   	ShamanUpstartSupportGndAttkInit
+Unused1       	ShamanUpstartSupportModeUnused1
+GndAttkRpt    	ShamanUpstartSupportGndAttkInit
+AirAttkRpt    	ShamanUpstartSupportGndAttkInit
+CastSpell     	ShamanUpstartSupportModeCastSpell
+GndAttkToIdle 	ShamanUpstartSupportModeGndAttkToIdle
+AirAttkToIdle 	ShamanUpstartSupportModeGndAttkToIdle
+Unused2       	[NONE]
+Walking       	ShamanUpstartSupportModeWalking
+WalkingToIdle 	ShamanUpstartSupportModeGndAttkToIdle
+SpecialState1 	ShamanUpstartSupportModeSpecialState1
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ShamanUpstartSupportModeInit:
+	imgulnextid			0 0 # Shaman (Upstart) Shadow (cm\f-t\shaman-upstart-shadow.grp)
+	playfram          	0x00
+	goto              	ShamanUpstartSupportModeGndAttkToIdle
+
+ShamanUpstartSupportModeGndAttkToIdle:
+	playfram          	0x00
+	setvertpos        	1
+	wait 				8
+	setvertpos        	2
+	wait 				8
+	setvertpos        	1
+	wait 				8
+	setvertpos        	0
+	wait 				8
+	goto              	ShamanUpstartSupportModeGndAttkToIdle
+
+ShamanUpstartSupportModeDeath:
+	playsndbtwn       	2834 2835 # Shaman Death 01, 02
+	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			821 0 0 # Shaman Remains
+	wait				1
+	end
+
+ShamanUpstartSupportModeUnused1:
+	wait				1
+	nobrkcodestart
+	playsndbtwn			1705 1706 # Shaman Death Reversed 01, 02
+	sprol				742 0 0 # Orange Explosion Medium Reversed
+	setfldirect			12
+	wait				12
+	nobrkcodeend
+	goto				ShamanUpstartSupportModeGndAttkToIdle
+	
+ShamanUpstartSupportGndAttkInit:
+	wait				1
+	playfram			0x20
+	playsndbtwn			2775 2776 # Cuirass weapon fire 01, 02
+	attack
+	wait				1
+	playfram			0x00
+	gotorepeatattk
+	goto				ShamanUpstartSupportModeGndAttkToIdle
+
+ShamanUpstartSupportModeCastSpell:
+	playfram          	0x00
+	wait              	6
+	goto              	ShamanUpstartSupportModeGndAttkToIdle
+
+ShamanUpstartSupportModeWalking:
+	setvertpos        	0 
+	goto              	SkryrokorLocal00
+
+ShamanUpstartSupportModeSpecialState1:
+	attackwith        	1
+	sigorder          	1
+	wait              	1
+	end
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2477 Shaman Adrenaline Mode (cm\f-t\shaman-upstart.grp)
+.headerstart
+IsId          	855
+Type          	14
+Init          	ShamanAdrenalineModeInit
+Death         	ShamanAdrenalineModeDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	ShamanAdrenalineModeUnused1
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	ShamanAdrenalineModeGndAttkToIdle
+GndAttkToIdle 	ShamanAdrenalineModeGndAttkToIdle
+AirAttkToIdle 	ShamanAdrenalineModeGndAttkToIdle
+Unused2       	[NONE]
+Walking       	SkryrokorLocal00
+WalkingToIdle 	SkryrokorLocal00
+SpecialState1 	ShamanAdrenalineModeSpecialState2
+SpecialState2 	ShamanAdrenalineModeSpecialState2
+AlmostBuilt   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+ShamanAdrenalineModeInit:
+	imgul				2476 0 0 # Shaman Shadow (cm\f-t\shaman-upstart-shadow.grp)
+	wait              	1
+	playsnd           	2429 # Shaman Adrenaline Transform
+	setflspeed        	0
+	playfram          	0x00
+	wait              	2
+	playfram          	0x40
+	wait              	3
+	playfram          	0x60
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	playfram          	0xA0
+	wait              	1
+	playfram          	0xC0
+	wait              	1
+	playfram          	0xE0
+	wait              	6
+	sigorder          	1
+	goto              	ShamanAdrenalineModeGndAttkToIdle
+
+ShamanAdrenalineModeGndAttkToIdle:
+	playfram          	0x100
+	wait              	2
+	playfram          	0x120
+	wait              	2
+	playfram          	0x140
+	wait              	2
+	playfram          	0x160
+	wait              	2
+	playfram          	0x180
+	wait              	2
+	playfram          	0x1A0
+	wait              	2
+	playfram          	0x1C0
+	wait              	2
+	playfram          	0x1E0
+	wait              	2
+	playfram          	0x200
+	wait              	2
+	goto				ShamanAdrenalineModeGndAttkToIdle
+
+ShamanAdrenalineModeDeath:
+	playsndbtwn       	2834 2835 # Shaman Death 01, 02
+	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
+	wait              	3
+	lowsprul			845 0 0 # Terran Unit Rubble Small
+	wait              	1
+	end
+
+ShamanAdrenalineModeUnused1:
+	wait				1
+	nobrkcodestart
+	playsndbtwn			1705 1706 # Shaman Death Reversed 01, 02
+	sprol				742 0 0 # Orange Explosion Medium Reversed
+	setfldirect			12
+	wait				12
+	nobrkcodeend
+	goto				ShamanAdrenalineModeGndAttkToIdle
+
+ShamanAdrenalineModeSpecialState2:
+	playsnd           	2430 # Matador Tank Transform
+	playfram          	0xE0
+	wait              	1
+	playfram          	0xC0
+	wait              	1
+	playfram          	0xA0
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	playfram          	0x60
+	wait              	3
+	playfram          	0x40
+	wait              	1
+	playfram          	0x00
+	wait              	6
+	sigorder          	1
+	goto              	SkryrokorLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2313 Morrigan (cm\f-t\morrigan.grp)
+.headerstart
+IsId          	856
+Type          	13
+Init          	MorriganInit
+Death         	MorriganDeath
+GndAttkInit   	MorriganGndAttkInit
+AirAttkInit   	MorriganGndAttkInit
+Unused1       	MorriganUnused1
+GndAttkRpt    	MorriganGndAttkRpt
+AirAttkRpt    	MorriganGndAttkRpt
+CastSpell     	MorriganCastSpell
+GndAttkToIdle 	MorriganGndAttkToIdle
+AirAttkToIdle 	MorriganGndAttkToIdle
+Unused2       	[NONE]
+Walking       	MorriganWalking
+WalkingToIdle 	MorriganWalkingToIdle
+SpecialState1 	MorriganSpecialState1
+.headerend
+# ----------------------------------------------------------------------------- #
+
+MorriganInit:
+	imgulnextid			0 0 # Morrigan Shadow (cm\f-t\morrigan-shadow.grp)
+MorriganWalkingToIdle:
+	playfram          	0x60
+MorriganLocal00:
+	wait				63
+	randcondjmp       	25 MorriganLocal01
+	randcondjmp       	128 MorriganLocal02
+	goto              	MorriganLocal00
+
+MorriganLocal01:
+	playfram          	0x00
+	wait              	1
+	playfram          	0x20
+	wait              	1
+	playfram          	0x40
+	randcondjmp       	192 MorriganLocal03
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	wait              	6
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	wait              	6
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	goto              	MorriganLocal04
+
+MorriganLocal04:
+	playfram          	0x20
+	wait              	1
+	playfram          	0x00
+	wait              	1
+	goto              	MorriganWalkingToIdle
+
+MorriganLocal03:
+	wait              	13
+	playfram          	0x20
+	wait              	1
+	playfram          	0x00
+	wait              	1
+	goto              	MorriganWalkingToIdle
+
+MorriganLocal02:
+	playfram          	0x80
+	wait              	1
+	playfram          	0xA0
+	wait              	1
+	turnrand          	3
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	goto              	MorriganWalkingToIdle
+
+MorriganDeath:
+	playsnd           	238 # Terran\GHOST\TGhDth00.wav
+	goto				EidolonDeathInit
+	
+MorriganUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect			0
+	playsnd				1166 # Morrigan revive 01
+	playfram			423
+	wait				2
+	playfram			422
+	wait				2
+	playfram			421
+	wait				2
+	playfram			420
+	wait				2
+	playfram			419
+	wait				2
+	playfram			418
+	wait				2
+	playfram			417
+	wait				2
+	playfram			416
+	wait				2
+	setfldirect			12
+	nobrkcodeend
+	goto				MorriganWalkingToIdle
+
+MorriganGndAttkInit:
+	playfram          	0x00
+	wait              	1
+	playfram          	0x20
+	wait              	1
+	sigorder			32
+	playfram          	0x40
+	wait				1
+MorriganGndAttkRpt:
+	wait              	1
+	nobrkcodestart
+	attack
+	playsndbtwn			4324 4329 # Morrigan weaponfire 01, 02, 03, 04, 05, 06
+	playfram          	0x180
+	wait              	1
+	playfram          	0x40
+	nobrkcodeend
+	gotorepeatattk
+	ignorerest
+MorriganGndAttkToIdle:
+	playfram          	0x11
+	wait              	1
+	playfram          	0x00
+	wait              	1
+	goto              	MorriganWalkingToIdle
+
+MorriganCastSpell:
+	nobrkcodestart
+	wait              	1
+	playsnd           	240 # Terran\GHOST\TGhLkd00.wav
+	castspell
+	playfram          	0x180
+	wait              	2
+	playfram          	0x40
+	nobrkcodeend
+	gotorepeatattk
+	sigorder          	2
+	goto              	MorriganGndAttkToIdle
+
+MorriganWalking:
+	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
+	playfram          	0x100
+	move              	4
+	wait              	1
+	playfram          	0x120
+	move              	4
+	wait              	1
+	playfram          	0x140
+	move              	4
+	wait              	1
+	playfram          	0x160
+	move              	4
+	wait              	1
+	playfram          	0x60
+	goto              	MorriganWalking
+
+MorriganSpecialState1:
+	playfram          	0x00
+	wait              	1
+	playfram          	0x20
+	wait              	1
+	playfram          	0x40
+	wait              	1
+	goto              	SkryrokorLocal00

patchnotes.md

@@ -28,6 +28,7 @@
 	- Mimicry no longer fails to account for weapon factor in many cases (r. shopkeeper dog)
 	- **Egocent**s no longer fail to mimic barrage attacks properly (r. Londier)
 	- Mimicry no longer procs on ability weapons (r. Londier)
+	- 
 - **Audiovisual:**
 	- Corrected strings for **Izirokor** tech-enable on **Skibact Scab** and **Tethvith Swamp** (r. Mimika)
 	- Fixed bad shield overlay for **Vulture (Hecaton)** (r. Londier)
@@ -40,12 +41,16 @@
 	- Landlock, Radix, Function (c. fasswawds)
 - Resized model for:
 	- Talos, Cyprian
+- Modified model for Maverick
 - Modified unit responses for Vorvrokor
+- New error and structure placement SFX for Askosi (c. lolrsk8s)
 - New weapon SFX for:
 	- Alzurokor (c. lolrsk8s)
-	- Paraclete
+	- Iconoclast, Paraclete
 - New cast SFX for Paraclete
-- New training SFX for Function
+- New training SFX for:
+	- Function, Cosmoscope
+- New cloaking SFX for damage cloak (e.g. Vestige; c. lolrsk8s)
 
 ## Terran
 - [Maverick](https://cosmonarchy.com/terran/maverick):
@@ -96,6 +101,10 @@
 ## Protoss
 - [Gateway](https://cosmonarchy.com/protoss/gateway):
 	- Resource costs 175/0 » 150/0
+- [Atreus](https://cosmonarchy.com/protoss/atreus):
+	- **Dauntlet Disruption Cannon:**
+		- Weapon damage 12 » 10
+		- Weapon range 5 » 4
 
 ## Protoss factions
 - **NEW:** [Gladius (Order)](https://cosmonarchy.com/protoss/gladius-order):
@@ -110,12 +119,13 @@
 		- Weapon damage 4 » 5
 - [Vorvrokor](https://cosmonarchy.com/zerg/vorvrokor):
 	- Resource cost 50/0 » 75/0
+	- HP 80 » 90
 	- Armor 1 » 2
 	- Movement speed 9.1 » 9.8
 	- Collision size increased by ~23%
 - [Zoryusthaleth](https://cosmonarchy.com/zerg/zoryusthaleth):
 	- Resource cost 175/0 » 200/0
-- [Lakizilisk]():
+- [Lakizilisk](https://cosmonarchy.com/zerg/lakizilisk):
 	- **Subterranean Spines:**
 		- Weapon damage 12 » 15
 		- Weapon cooldown 1.63 » 1.75