Deploy Vespene Ridge refineries; Fix numerous internal issues

mpq/arr/flingy.txt

@@ -539,9 +539,9 @@ White Circle (Instant)
 Kazitrith Cesiant
 Cleric (Futurist)
 Piety Ward
-Extended Flingy #333
+Sieve
-Extended Flingy #334
+Cedent
-Extended Flingy #335
+Eskigant
 Extended Flingy #336
 Extended Flingy #337
 Extended Flingy #338

mpq/arr/images.txt

@@ -343,7 +343,7 @@ Rhynadon (Badlands) Shadow
 Bengalaas (Jungle)
 Bengalaas (Jungle) Shadow
 Vespene Geyser
-Vespene Geyser2
+Vespene Geyser Underlay
 Vespene Geyser Shadow
 Mineral Field Type1
 Mineral Field Type1 Shadow
@@ -1968,14 +1968,14 @@ Cleric (Futurist) Shadow
 Cleric (Futurist) Remains
 Piety Ward
 Piety Ward Shadow
-Extended Image #968
+Sieve
-Extended Image #969
+Sieve Shadow
-Extended Image #970
+Vespene Ridge Underlay
-Extended Image #971
+Cedent
-Extended Image #972
+Cedent Shadow
-Extended Image #973
+Cedent Warp Flash
-Extended Image #974
+Eskigant
-Extended Image #975
+Eskigant Shadow
 Extended Image #976
 Extended Image #977
 Extended Image #978

mpq/arr/sprites.txt

@@ -965,9 +965,9 @@ Gorgrokor Remains
 Kazitrith Cesiant
 Cleric (Futurist)
 Piety Ward
-Extended Sprite #1
+Sieve
-Extended Sprite #1
+Cedent
-Extended Sprite #1
+Eskigant
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -417,9 +417,9 @@ Zerg Inzorthrokor (Imicren)
 Volatile Egg
 Terran Piety Ward
 Terran Cleric (Futurist)
-Extended Unit #192
+Terran Sieve
-Extended Unit #193
+Protoss Cedent
-Extended Unit #194
+Zerg Eskigant
 Extended Unit #195
 Extended Unit #196
 Extended Unit #197

mpq/arr/weapons.txt

@@ -222,7 +222,7 @@ Flamethrower (Harakan, Golden)
 Corrosive Bioplasma (Iziralisk)
 Phase Claws (Cicatus)
 Phase Blades (Zealot, Starbound)
-Extended Weapon #95
+Astral Blaster (Ecclesiast, Khalendric)
 Extended Weapon #96
 Extended Weapon #97
 Extended Weapon #98

mpq/scripts/iscript.txt

@@ -11526,12 +11526,12 @@ TemplarArchivesWarpIn:
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 158 Assimilator (protoss\assim.grp)
+# 158 Aquifer (protoss\assim.grp)
 .headerstart
 IsId          	167
 Type          	27
-Init          	AssimilatorInit
+Init          	AquiferInit
-Death         	AssimilatorDeath
+Death         	AquiferDeath
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
 Unused1       	[NONE]
@@ -11546,12 +11546,12 @@ WalkingToIdle 	[NONE]
 SpecialState1 	[NONE]
 SpecialState2 	[NONE]
 AlmostBuilt   	[NONE]
-Built         	AssimilatorBuilt
+Built         	AquiferBuilt
 Landing       	[NONE]
 LiftOff       	[NONE]
-IsWorking     	AssimilatorBuilt
+IsWorking     	AquiferBuilt
-WorkingToIdle 	AssimilatorBuilt
+WorkingToIdle 	AquiferBuilt
-WarpIn        	AssimilatorWarpIn
+WarpIn        	AquiferWarpIn
 Unused3       	[NONE]
 StarEditInit  	[NONE]
 Disable       	ScourgeLocal00
@@ -11561,18 +11561,18 @@ Enable        	ScourgeLocal00
 .headerend
 # ----------------------------------------------------------------------------- #
 
-AssimilatorInit:
+AquiferInit:
-	imgul             	160 0 0	# Assimilator Shadow (protoss\pasShad.grp)
+	imgul             	160 0 0 # Aquifer Shadow (protoss\pasShad.grp)
-	playfram          	0x00	# Frame set 0
+	playfram          	0x00
 	goto              	ScourgeLocal00
 
-AssimilatorDeath:
+AquiferDeath:
 	playsnd           	7 # Misc\ExploLrg.wav
 	sprol             	222 0 0	# Explosion (Large) (thingy\tBangX.grp)
 	wait              	3
 	end
 
-AssimilatorBuilt:
+AquiferBuilt:
 	waitrand          	5 50
 	creategasoverlays 	0
 	waitrand          	5 50
@@ -11586,24 +11586,11 @@ AssimilatorBuilt:
 	waitrand          	5 50
 	creategasoverlays 	2
 	waitrand          	5 50
-	goto              	AssimilatorBuilt
+	goto              	AquiferBuilt
 
-AssimilatorWarpIn:
+AquiferWarpIn:
-	imgol             	159 0 0	# Assimilator Warp Flash (protoss\assim.grp)
+	imgol             	159 0 0 # Aquifer Warp Flash (protoss\assim.grp)
-	waitrand          	5 50 
+	goto              	AquiferBuilt
-	creategasoverlays 	0 
-	waitrand          	5 50 
-	creategasoverlays 	3 
-	waitrand          	5 50 
-	creategasoverlays 	2 
-	waitrand          	5 50 
-	creategasoverlays 	3 
-	waitrand          	5 50 
-	creategasoverlays 	0 
-	waitrand          	5 50 
-	creategasoverlays 	2 
-	waitrand          	5 50 
-	goto              	AssimilatorBuilt
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
@@ -13104,7 +13091,7 @@ WarpAnchorSpecialState1:
 # 150 Witness Warp Flash (protoss\witness.grp)
 # 154 Zealot Warp Flash (protoss\zealot.grp)
 # 156 Templar Archives Warp Flash (protoss\archives.grp)
-# 159 Assimilator Warp Flash (protoss\assim.grp)
+# 159 Aquifer Warp Flash (protoss\assim.grp)
 # 162 Observatory Warp Flash (protoss\beacon.grp)
 # 165 Citadel of Adun Warp Flash (protoss\citadel.grp)
 # 169 Forge Warp Flash (protoss\forge.grp)
@@ -13530,11 +13517,11 @@ VespeneGeyserDeath:
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 345 Vespene Geyser2 (neutral\geyser.grp)
+# 345 Vespene Geyser Underlay (neutral\geyser.grp)
 .headerstart
 IsId          	202
 Type          	20
-Init          	VespeneGeyser2Init
+Init          	VespeneGeyserUnderlayInit
 Death         	VespeneGeyserDeath
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
@@ -13559,7 +13546,7 @@ WarpIn        	[NONE]
 .headerend
 # ----------------------------------------------------------------------------- #
 
-VespeneGeyser2Init:
+VespeneGeyserUnderlayInit:
 	playframtile      	0x00
 	imgul             	346 0 0 # Vespene Geyser Shadow (neutral\geyShad.grp)
 	goto              	ScourgeLocal00
@@ -41870,7 +41857,7 @@ UnitBrightenEffectHeaderDeath:
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 1002 Vespene Ridge
+# 1002 Vespene Ridge (cm\neutral\vespene-ridge.grp)
 .headerstart
 IsId          	669
 Type          	20
@@ -51763,4 +51750,162 @@ KazitrithCesiantInit:
 	playfram          	0x00
 	goto              	ScourgeLocal00
 	
-## Next free IsId: 802
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1970 Sieve (cm\terran\sieve.grp)
+.headerstart
+IsId          	802
+Type          	20
+Init          	SieveInit
+Death         	ReservoirDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	ReservoirSpecialState1
+SpecialState2 	ReservoirSpecialState2
+AlmostBuilt   	ReservoirAlmostBuilt
+Built         	ReservoirBuilt
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	ScourgeLocal00
+WorkingToIdle 	ReservoirBuilt
+WarpIn        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+SieveInit:
+	imgul             	1971 0 0 # Sieve Shadow (cm\terran\sieve-shadow.grp)
+	playfram          	1
+	goto              	ReservoirLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1972 Vespene Ridge Underlay (cm\neutral\vespene-ridge.grp)
+.headerstart
+IsId          	803
+Type          	20
+Init          	VespeneRidgeUnderlayInit
+Death         	VespeneRidgeDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	ScourgeLocal00
+SpecialState2 	ScourgeLocal00
+AlmostBuilt   	ScourgeLocal00
+Built         	ScourgeLocal00
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	ScourgeLocal00
+WorkingToIdle 	ScourgeLocal00
+WarpIn        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+VespeneRidgeUnderlayInit:
+	playframtile      	0x00
+	imgul             	1209 0 0 # Vespene Ridge Shadow (cm\neutral\vespene-ridge-shadow.grp)
+	goto              	ScourgeLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1973 Cedent (cm\protoss\cedent.grp)
+.headerstart
+IsId          	804
+Type          	27
+Init          	CedentInit
+Death         	AquiferDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	AquiferBuilt
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	AquiferBuilt
+WorkingToIdle 	AquiferBuilt
+WarpIn        	CedentWarpIn
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	ScourgeLocal00
+Burrow        	[NONE]
+UnBurrow      	[NONE]
+Enable        	ScourgeLocal00
+.headerend
+# ----------------------------------------------------------------------------- #
+
+CedentInit:
+	imgul             	1974 0 0 # Cedent Shadow (cm\protoss\cedent-shadow.grp)
+	playfram          	0x00
+	goto              	ScourgeLocal00
+
+CedentWarpIn:
+	imgol             	1975 0 0 # Cedent Warp Flash (cm\protoss\cedent.grp)
+	goto              	VespeneRidgeSpecialState1
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1976 Eskigant (cm\zerg\eskigant.grp)
+.headerstart
+IsId          	805
+Type          	20
+Init          	EskigantInit
+Death         	ExcisantDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	EskigantAlmostBuilt
+Built         	ExcisantBuilt
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	ExcisantIsWorking
+WorkingToIdle 	ExcisantIsWorking
+WarpIn        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+EskigantInit:
+	imgul             	1977 0 0 # Eskigant Shadow (cm\zerg\eskigant.grp)
+	playfram          	0x00
+	goto              	ScourgeLocal00
+
+EskigantAlmostBuilt:
+	imgol             	108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp)
+	goto				ExcisantBuilt
+	
+## Next free IsId: 806

patchnotes.md

@@ -3,32 +3,61 @@
 
 This patch will include new features, balance adjustments, bugfixes, and audiovisual improvements.
 
-Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zip) for easier setup and maintenance! Version 2.2 and up now includes an automatic download of CrownLink, a networking alternative for Cosmonarchy!
+Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zip) for easier setup and maintenance! It now includes automatic setup and updates for CrownLink, a networking alternative for Cosmonarchy!
 
-We are still hunting for desyncs! Please submit your `Critical` and `Sync Randoms` text files from the `logs` folder to the **cm-issues** "[Desync error megathread](https://discord.com/channels/139276012058968064/1251318131671175198)" on [our Discord server](https://discord.com/invite/s5SKBmY).
+## Game Flow
+- Added ridge refineries with no tech requirement for all races, boosting ridge yields from 3 vespene to 5 vespene
+
+## Bugfixes
+- **Stability:**
+	- Fixed numerous issues contributing to undefined behavior, resulting in desyncs, crashes, or aberrant results (a. DF)
+- **Gameplay:**
+	- **Sevenstep - Mind Matter:**
+		- Can no longer self-apply on large units (r. Kenoli)
+		- No longer fires if the source Sevenstep is in a transport (r. Kenoli)
+	- Resolved mnemonic hotkey conflict between Ultrokor and Akistrokor morphs (r. jakulangski)
+- **AI:**
+	- Fixed AI still being able to make Masons via Quarries (r. jakulangski)
 
 ## Audiovisuals
 - Updated sprite for:
+	- Dracadin (c. Solstice)
 	- Rogue Gallery
 - Added visual effect for:
 	- Blackjack (passive state switch)
 
 ## Terran
+- **NEW:** [Sieve](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sieve)
+	- Ridge-based vespene processor
 - **NEW:** [Cleric (Futurist)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cleric-futurist):
 	- Protective infantry; can deploy [Piety Wards](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/piety-ward)
 
 ## Protoss
+- [Gladius](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gladius):
+	- Armor 2 » 1
+	- **Plasma Flurry:**
+		- Weapon damage 15 » 12
+- [Steward](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/steward):
+	- **Pulse Cannon:**
+		- Weapon damage 8 » 6
 - [Rogue Gallery](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/rogue-gallery):
 	- Reduced collision size by ~10%
 - [Grand Library](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/grand-library):
 	- Reduced collision size by ~8%
+- **NEW:** [Cedent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cedent)
+	- Ridge-based vespene processor
 
 ## Zerg
 - [Protathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/protathalor):
 	- Build time 25 » 22
+- [Bactalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/bactalisk):
+	- **Corrosive Acid:**
+		- Weapon cooldown 1.17 » 1.25
 - [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk):
 	- Build time 30 » 25
 - [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk):
 	- HP 380 » 600
+- **NEW:** [Eskigant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/eskigant)
+	- Ridge-based vespene processor
 - **NEW:** [Kazitrith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kazitrith-cesiant):
 	- Support cell to boost combat prowess of nearby allies; mutated from Cagrant Cesiant