Implement Rozirokor; Add neutral garrison reset; Add more config options

mpq/arr/flingy.txt

@@ -700,7 +700,7 @@ Cybrene
 Raynor Vulture
 Scralia
 Endbore Electricity
-Extended Flingy #494
+Rozirokor
 Extended Flingy #495
 Extended Flingy #496
 Extended Flingy #497

mpq/arr/images.txt

@@ -2399,11 +2399,11 @@ Endbore Electricity
 Civilian Death
 Civilian Remains
 Pilgrim Remains
-Extended Image #1399
+Rozirokor
-Extended Image #1400
+Rozirokor Shadow
-Extended Image #1401
+Rozirokor Remains
-Extended Image #1402
+Rozirokor Birth
-Extended Image #1403
+Rozirokor Mutate
 Extended Image #1404
 Extended Image #1405
 Extended Image #1406

mpq/arr/sprites.txt

@@ -1158,8 +1158,8 @@ Scralia
 Endbore Electricity
 Civilian Remnants
 Pilgrim Remnants
-Extended Sprite #644
+Rozirokor
-Extended Sprite #645
+Rozirokor Remains
 Extended Sprite #646
 Extended Sprite #647
 Extended Sprite #648

mpq/arr/units.txt

@@ -614,9 +614,9 @@ Big Infested Kerrigan
 Raynor Vulture
 Duke Battlecruiser
 Askosi Scralia
-Extended Unit #389
+Zerg Rozirokor (Imicren)
-Extended Unit #390
+Bloodsummon Thrombocyte
-Extended Unit #391
+Bloodsummon Grimoire
 Extended Unit #392
 Extended Unit #393
 Extended Unit #394

mpq/rez/stat.txt

@@ -1339,9 +1339,9 @@ Must target units with energy.<0>
 <0>
 <0>
 <0>
-<0>
+Rozirokor requires:<10>   Hydrith Den<0>
 z<1><4>Morph to Izirokor <1>(<3>Z<1>)<10>Close-combat strain.<0>
-<0>
+z<1><4>Morph to Rozirokor <1>(<3>Z<1>)<10>Close-combat strain.<0>
 Izirokor requires:<10>   Hydrith Den<0>
 t<1><4>Morph into Keskathalor <1>(<3>T<1>)<10>Artillery strain.<0>
 Keskathalor requires:<10>   Geszkath Grotto<0>

mpq/samase/unitdef.txt

@@ -84,10 +84,14 @@ military inzorthrokor = 415
 military quazrokor = 422
 military lakizilisk_zorthos = 425
 military hydralisk_orkoti = 436
-building yblyleth = 438
+military yblyleth = 438
 military azanthrokor = 511
 military sovrokor = 519
 military garvrokor = 521
+military zethalor = 559
+military scrylyleth = 560
+military zoltorokor = 604
+military rozirokor = 616
 
 # Terran military units
 military maverick = 0

mpq/scripts/iscript_zerg.txt

@@ -18245,3 +18245,289 @@ ScrylylethUnBurrow:
 	wait              	1
 	sigorder          	4
 	goto              	ScrylylethWalkingToIdle
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 2401 Rozirokor (cm\zerg\rozirokor.grp)
+.headerstart
+IsId          	840
+Type          	26
+Init          	RozirokorInit
+Death         	RozirokorDeath
+GndAttkInit   	RozirokorGndAttkInit
+AirAttkInit   	RozirokorGndAttkInit
+Unused1       	RozirokorUnused1
+GndAttkRpt    	RozirokorGndAttkRpt
+AirAttkRpt    	RozirokorGndAttkRpt
+CastSpell     	[NONE]
+GndAttkToIdle 	RozirokorGndAttkToIdle
+AirAttkToIdle 	RozirokorGndAttkToIdle
+Unused2       	[NONE]
+Walking       	RozirokorWalking
+WalkingToIdle 	RozirokorWalkingToIdle
+SpecialState1 	SkryrokorLocal00
+SpecialState2 	RozirokorSpecialState2
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	[NONE]
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	[NONE]
+Burrow        	RozirokorBurrow
+UnBurrow      	RozirokorUnburrow
+Enable        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+RozirokorInit:
+	imgul             	1473 0 0 # Rozirokor Shadow (cm\zerg\rozirokor-shad.grp)
+	goto				RozirokorWalkingToIdle
+RozirokorGndAttkToIdle:
+	playfram          	0xAA
+	goto              	RozirokorLocal00
+
+RozirokorLocal00:
+	wait              	62
+	randcondjmp       	128 RozirokorLocal01
+	goto              	RozirokorLocal00
+
+RozirokorLocal01:
+	playfram          	0x99
+	wait              	1
+	playfram          	0xAA
+	wait              	1
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xCC
+	wait              	4
+	randcondjmp			34 RozirokorLocal02
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xAA
+	wait              	1
+	playfram          	0x99
+	wait              	1
+	goto              	RozirokorWalkingToIdle
+
+RozirokorLocal02:
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xAA
+	wait              	3
+	randcondjmp       	62 RozirokorLocal03
+	randcondjmp       	51 RozirokorLocal04
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xCC
+	wait              	1
+	playfram          	0xBB
+	wait              	1
+	goto              	RozirokorWalkingToIdle
+
+RozirokorLocal03:
+	playfram          	0x99
+	wait              	4
+	playfram          	0x11
+	wait              	1
+	turnccwise         	1
+	playfram          	0x22
+	wait              	1
+	turnccwise         	1
+	playfram          	0x33
+	wait              	1
+	turnccwise         	1
+	playfram          	0x22
+	wait              	1
+	turnccwise         	1
+	playfram          	0x11
+	wait              	1
+	turnccwise         	1
+	goto              	RozirokorWalkingToIdle
+
+RozirokorLocal04:
+	playfram          	0x99
+	wait              	4
+	playfram          	0x11
+	wait              	1
+	turncwise         	1
+	playfram          	0x22
+	wait              	1
+	turncwise         	1
+	playfram          	0x33
+	wait              	1
+	turncwise         	1
+	playfram          	0x22
+	wait              	1
+	turncwise         	1
+	playfram          	0x11
+	wait              	1
+	turncwise         	1
+	goto              	RozirokorWalkingToIdle
+
+RozirokorDeath:
+	playsnd           	1506 # Rozirokor death 01
+	setfldirect       	0
+	playfram          	459
+	wait              	2
+	playfram          	460
+	wait              	2
+	playfram          	461
+	wait              	2
+	playfram          	462
+	wait              	2
+	playfram          	463
+	wait              	2
+	playfram          	464
+	wait              	2
+	playfram          	465
+	wait              	2
+	playfram          	466
+	wait              	2
+	lowsprul          	763 0 0 # Rozirokor Remnants (cm\zerg\rozirokor-corpse.grp)
+	wait              	2
+	end
+	
+RozirokorUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect       	0
+	playsnd				1181
+	playfram			639
+	wait				2
+	playfram			638
+	wait				2
+	playfram			637
+	wait				2
+	playfram			636
+	wait				2
+	playfram			635
+	wait				2
+	playfram			634
+	wait				2
+	playfram			633
+	wait				2
+	playfram			632
+	wait				2
+	playfram			631
+	wait				2
+	playfram			630
+	wait				2
+	setfldirect       	14
+	nobrkcodeend
+	goto				RozirokorWalkingToIdle
+
+RozirokorGndAttkInit:
+	playfram          	0x99
+	wait				1
+	playfram			0xAA
+RozirokorGndAttkRpt:
+	wait              	1
+	nobrkcodestart
+	playsndbtwn			3141 3144 # Tethzorokor weaponfire 01, 02, 03, 04
+	wait              	1
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xCC
+	attackmelee       	2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV
+	wait              	2
+	playfram          	0xDD
+	wait              	2
+	playfram          	0xEE
+	wait              	1
+	playfram          	0xFF
+	wait              	2
+	playfram          	0x110
+	wait              	1
+	playfram          	0x121
+	wait              	1
+	nobrkcodeend
+	playfram          	0x132
+	wait              	1
+	gotorepeatattk
+	goto              	RozirokorGndAttkToIdle
+
+RozirokorWalking:
+	move              	5
+	wait              	1
+	playfram          	0x11
+	move              	5
+	wait              	1
+	playfram          	0x22
+	move              	5
+	wait              	1
+	playfram          	0x33
+	move              	5
+	wait              	1
+	playfram          	0x44
+	move              	5
+	wait              	1
+	playfram          	0x55
+	move              	5
+	wait              	1
+	playfram          	0x66
+	move              	5
+	wait              	1
+	playfram          	0x77
+	move              	5
+	wait              	1
+	playfram          	0x88
+	goto              	RozirokorWalking
+	
+RozirokorWalkingToIdle:
+	playfram          	0x0
+	goto              	RozirokorLocal00
+	
+RozirokorSpecialState2:
+	playfram			0x187
+	goto				SkryrokorLocal00
+
+RozirokorBurrow:
+	imgol             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0x143
+	wait              	1
+	playfram          	0x154
+	wait              	1
+	playfram          	0x165
+	wait              	1
+	playfram          	0x176
+	wait              	1
+	playfram          	0x187
+	imgol             	423 15 12 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -15 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 -12 -3 # Burrowing Dust (thingy\bDust.grp)
+	wait              	1
+	playfram          	0x198
+	wait              	1
+	playfram          	0x1A9
+	wait              	1
+	sigorder          	4
+	playfram			0x1BA
+	goto				SkryrokorLocal00
+
+RozirokorUnburrow:
+	wait 				1
+	waitrand          	1 2
+	imgul             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0x1A9
+	wait              	1
+	playfram          	0x198
+	wait              	1
+	playfram          	0x187
+	wait              	1
+	playfram          	0x176
+	imgol             	423 12 -15 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 -12 -12 # Burrowing Dust (thingy\bDust.grp)
+	wait              	1
+	playfram          	0x165
+	wait              	1
+	playfram          	0x154
+	wait              	1
+	sigorder          	4
+	setfldirect			14
+	goto              	RozirokorWalkingToIdle

patchnotes.md

@@ -11,7 +11,9 @@
 
 ## User Interface
 - Added more desync logging (c. Veeq7)
+- Added user-configurable window flash for when another player joins your lobby (c. Jesse)
 - Reorganized replay options to `Misc` tab (c. Jesse)
+- Added user-configurable Askosi player color preferences
 
 ## Bugfixes
 - **Stability:**
@@ -19,6 +21,8 @@
 - **Gameplay:**
 	- **Scrapworld: Gold Rush** now correctly accounts for the resource cost of dual- and triple-birth units (r. shopkeeper dog)
 	- Lardfix: Protected against rare AI breakage from niche town configurations (c. DF)
+- **Audiovisuals:**
+	- Fixed **Endbore** weapon name (r. Concealed Organic)
 
 ## Audiovisuals
 - Updated background graphics for Options and CrownLink Join menus (c. Jesse)
@@ -27,6 +31,11 @@
 
 # Balance
 
+## Neutral
+- Neutral garrisons (e.g. the Tencendur on Magnetron):
+	- Now eject units when taking fatal damage, heal to full life, and become stunned for 10 seconds
+	- Can only be destroyed if they take fatal damage during the 10 second stun window
+
 ## Terran
 - [Vulture](https://cosmonarchy.com/terran/vulture):
 	- Vision range 8 » 7
@@ -91,6 +100,8 @@
 		- Weapon cooldown 0.42 » 0.67
 - [Sovrokor](https://cosmonarchy.com/zerg/sovrokor):
 	- Now considered a Sire
+- **NEW:** [Rozirokor](https://cosmonarchy.com/zerg/rozirokor):
+	- **Imicren Tendril:** Izirokor replacement. Has Saber Siphon.
 
 ## Askosi
 - **Impact Dissipation:**