Implement faction selection for Protoss and Zerg; Implement Adherent and Nathrelisk

mpq/arr/flingy.txt

@@ -503,10 +503,10 @@ Skithrok Scab
 Qilin
 Auriel
 Spoke Shell
-Extended Flingy #297
+Adherent
-Extended Flingy #298
+Extatus
-Extended Flingy #299
+Nathrelisk
-Extended Flingy #300
+Iziralisk
 Extended Flingy #301
 Extended Flingy #302
 Extended Flingy #303

mpq/arr/images.txt

@@ -1790,18 +1790,18 @@ Rotary Connector
 Auriel
 Auriel Shadow
 Spoke Shell
-Extended Image #790
+Adherent
-Extended Image #791
+Adherent Shadow
-Extended Image #792
+Extatus
-Extended Image #793
+Extatus Shadow
-Extended Image #794
+Extatus Engines
-Extended Image #795
+Nathrelisk
-Extended Image #796
+Nathrelisk Shadow
-Extended Image #797
+Nathrelisk Birth
-Extended Image #798
+Iziralisk
-Extended Image #799
+Iziralisk Shadow
-Extended Image #800
+Iziralisk Birth
-Extended Image #801
+Iziralisk Remains
 Extended Image #802
 Extended Image #803
 Extended Image #804

mpq/arr/sprites.txt

@@ -893,10 +893,10 @@ Qilin
 Auriel
 Legionnaire Teleport Effect
 Spoke Shell
-Extended Sprite #1
+Adherent
-Extended Sprite #1
+Extatus
-Extended Sprite #1
+Nathrelisk
-Extended Sprite #1
+Iziralisk
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -386,7 +386,7 @@ Terran Lodestone
 Floor Hatch
 Terran Treasury
 Terran Lodestone (Standalone)
-Faction Selection
+Faction Selection Terran
 Select Faction 1
 Select Faction 2
 Select Faction 3
@@ -398,12 +398,12 @@ Zerg Vornath Pond
 Zerg Skibact Scab
 Terran Qilin
 Terran Auriel
-Extended Unit #173
+Protoss Adherent
-Extended Unit #174
+Protoss Extatus
-Extended Unit #175
+Zerg Nathrelisk
-Extended Unit #176
+Zerg Iziralisk
-Extended Unit #177
+Faction Selection Protoss
-Extended Unit #178
+Faction Selection Zerg
 Extended Unit #179
 Extended Unit #180
 Extended Unit #181

mpq/arr/weapons.txt

@@ -208,8 +208,8 @@ Talismanic Weaver (Potentate)
 Phase Saber (Potentate)
 Dispatch Shotgun (Hotshot)
 Quarternary Rifle (Auriel)
-Extended Weapon #81
+Phase Blade (Adherent)
-Extended Weapon #82
+Signaling Spores (Nathrelisk)
 Extended Weapon #83
 Extended Weapon #84
 Extended Weapon #85

mpq/samase/config.ini

@@ -42,11 +42,13 @@ unit_morph_prerequisites = Add(othstoleth, alaszileth, 1)
 unit_morph_prerequisites = Add(zethrokor, vorvrokor, 1)
 unit_morph_prerequisites = Add(quazilisk, liiralisk, 1)
 unit_morph_prerequisites = Add(nathrokor, kalkalisk, 1)
+unit_morph_prerequisites = Add(nathrelisk, kalkalisk, 1)
 unit_morph_prerequisites = Add(cikralisk, ghitorokor, 1)
 unit_morph_prerequisites = Add(protathalor, sovroleth, 1)
 unit_morph_prerequisites = Add(mutalisk, tosgrilisk, 1)
 unit_morph_prerequisites = Add(hydralisk, bactalisk, 1)
 unit_morph_prerequisites = Add(izirokor, tethzorokor, 1)
+#unit_morph_prerequisites = Add(iziralisk, tethzorokor, 1)
 unit_morph_prerequisites = Add(skithrokor, vithrilisk, 1)
 unit_morph_prerequisites = Add(geszithalor, alkajelisk, 1)
 unit_morph_prerequisites = Add(konvilisk, tetcaerokor, 1)
@@ -84,12 +86,14 @@ morph_train_ai = Add(othstoleth, alaszileth)
 morph_train_ai = Add(zethrokor, vorvrokor)
 morph_train_ai = Add(quazilisk, liiralisk)
 morph_train_ai = Add(nathrokor, kalkalisk)
+morph_train_ai = Add(nathrelisk, kalkalisk)
 morph_train_ai = Add(cikralisk, ghitorokor)
 morph_train_ai = Add(protathalor, sovroleth)
 morph_train_ai = Add(mutalisk, tosgrilisk)
 morph_train_ai = Remove(mutalisk, vithrilisk)
 morph_train_ai = Add(hydralisk, bactalisk)
 morph_train_ai = Add(izirokor, tethzorokor)
+#morph_train_ai = Add(iziralisk, tethzorokor)
 morph_train_ai = Add(skithrokor, vithrilisk)
 morph_train_ai = Add(geszithalor, alkajelisk)
 morph_train_ai = Add(konvilisk, tetcaerokor)

mpq/scripts/iscript.txt

@@ -35803,9 +35803,7 @@ LegionnaireInit:
 	imgul             	1339 0 0 # Legionnaire Shadow (cm\protoss\legionnaire-shad.grp)
 LegionnaireWalkingToIdle:
 	playfram          	0x00
-LegionnaireLocal00:
+	goto				ScourgeLocal00
-	wait				125
-	goto              	LegionnaireLocal00
 
 LegionnaireDeath:
 	playsnd           	678	# Protoss\ZEALOT\PZeDth00.WAV
@@ -35865,7 +35863,7 @@ LegionnaireWalking:
 
 LegionnaireWarpIn:
 	imgol             	154 0 0 # Zealot Warp Flash (protoss\zealot.grp)
-	goto              	LegionnaireLocal00
+	goto              	ScourgeLocal00
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
@@ -51956,4 +51954,100 @@ SpokeShellDeath:
 	wait              	1
 	end
 	
-## Next free IsId: 768
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1792 Adherent (cm\faction-p\adherent.grp)
+.headerstart
+IsId          	768
+Type          	21
+Init          	AdherentInit
+Death         	LegionnaireDeath
+GndAttkInit   	AdherentGndAttkInit
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	AdherentGndAttkInit
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	LegionnaireGndAttkToIdle
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	LegionnaireWalking
+WalkingToIdle 	LegionnaireWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	LegionnaireWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+AdherentInit:
+	imgul             	1793 0 0 # Adherent Shadow (cm\faction-p\adherent-shadow.grp)
+	goto				LegionnaireWalkingToIdle
+	
+AdherentGndAttkInit:
+	playfram          	0x100
+	nobrkcodestart
+	wait              	2
+	playsndbtwn			1231 1234 # Amaranth weaponfire 01, 02, 03, 04
+	playfram          	0x120
+	wait              	1
+	playfram          	0x140
+	attackmelee       	1 1897 # Legionnaire weapon hit 01
+	wait              	1
+	playfram          	0x160
+	wait              	1
+	nobrkcodeend
+	playfram          	0x120
+	wait              	1
+	gotorepeatattk
+	ignorerest
+	goto				LegionnaireGndAttkToIdle
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1797 Nathrelisk (cm\faction-z\nathrelisk.grp)
+.headerstart
+IsId          	769
+Type          	12
+Init          	NathreliskInit
+Death         	NathrokorDeath
+GndAttkInit   	NathreliskGndAttkInit
+AirAttkInit   	NathreliskGndAttkInit
+Unused1       	[NONE]
+GndAttkRpt    	NathreliskGndAttkInit
+AirAttkRpt    	NathreliskGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	NathrokorGndAttkToIdle
+AirAttkToIdle 	NathrokorGndAttkToIdle
+Unused2       	[NONE]
+Walking       	NathrokorWalking
+WalkingToIdle 	NathrokorGndAttkToIdle
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+NathreliskInit:
+	imgul             	1798 0 42 # Nathrelisk Shadow (cm\faction-z\nathrelisk.grp)
+	playfram          	0x00
+	wait				2
+	goto				NathrokorGndAttkToIdle
+
+NathreliskGndAttkInit:
+    playfram            0x00
+    wait                1
+	nobrkcodestart
+    playfram            0x20
+	playsnd				1326 # Nathrokor weaponfire 01
+	attack
+    wait                1
+	playfram			0x00
+	nobrkcodeend
+    gotorepeatattk
+    goto                NathrokorGndAttkToIdle
+	
+## Next free IsId: 770

patchnotes.md

@@ -24,6 +24,10 @@ Patch goals include:
 	- Added "unit_color" custom trigger condition
 	- Added "kill", "move_unit", "set_unit_stat", and "set_unit_behavior" custom trigger actions
 
+## Game modes
+- Faction Wars:
+	- Protoss and Zerg faction selection has been made available
+
 ## Maps
 - HYDRA refurbished -> vz02 is now available
 
@@ -85,3 +89,9 @@ Patch goals include:
 - [Auriel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/auriel):
 	- Hecaton (replaces Apostle at Captaincy)
 	- Mid-range infantry with a powerful damage over time effect. Incinerates corpses to create Apollyoid fields.
+- [Adherent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/adherent):
+	- Sacred (replaces Legionnaire at Gateway)
+	- Durable melee brawler with increased movement speed 
+- [Nathrelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrelisk):
+	- Zorthos (replaces Nathrokor)
+	- Sustaining fighter strain that releases a short-lived healing field on attack