Implement Protoss tech crunch; Remove dual-birth Ocsal Larvae interactions; Implement Ocsal Cesiant; Tweak Bactalisk cost; Fix misc AI issues

mpq/arr/flingy.txt

@@ -336,7 +336,7 @@ Mason Christmas
 Scribe Christmas
 Droleth Christmas
 Cikralisk
-Larvosk Colony
+Larvosk Cesiant
 Captaincy
 Iron Foundry
 Mineral Field 1 Christmas
@@ -492,7 +492,7 @@ Philoc
 Sevenstep Projectile
 Omnivale
 Lodestone
-Extended Flingy #286
+Ocsal Cesiant
 Extended Flingy #287
 Extended Flingy #288
 Extended Flingy #289

mpq/arr/images.txt

@@ -1308,8 +1308,8 @@ Mason Christmas
 Scribe Christmas
 Droleth Christmas
 Tethzorokor
-Larvosk Colony
-Larvosk Colony Shadow
+Larvosk Cesiant
+Larvosk Cesiant Shadow
 Captaincy
 Captaincy Shadow
 Iron Foundry
@@ -1760,8 +1760,8 @@ Lodestone
 Lodestone Connector
 Lodestone Overlay
 Lodestone Shadow
-Extended Image #760
-Extended Image #761
+Ocsal Cesiant
+Ocsal Cesiant Shadow
 Extended Image #762
 Extended Image #763
 Extended Image #764

mpq/arr/sprites.txt

@@ -667,7 +667,7 @@ Mason (Christmas)
 Scribe (Christmas)
 Droleth (Christmas)
 Cikralisk
-Larvosk Colony
+Larvosk Cesiant
 Captaincy
 Iron Foundry
 Mineral Field 01 (Christmas)
@@ -880,7 +880,7 @@ Sevenstep Rail
 Quazilisk (April Fools)
 Omnivale
 Lodestone
-Extended Sprite #1
+Ocsal Cesiant
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -352,8 +352,8 @@ Zerg Nephrilosk
 Protoss Vagrant Shade
 Protoss Accantor
 Zerg Ocsal Larva
-Zerg Ocsal Colony
-Zerg Kazitrith Colony
+Zerg Ocsal Cesiant
+Zerg Kazitrith Cesiant
 BTN Ocsal Larva - Swarm
 BTN Ocsal Larva - Assault
 BTN Ocsal Larva - Control

mpq/samase/config.ini

@@ -64,7 +64,8 @@ equivalent_ids = Add(cagrant_cesiant, spirtith_cesiant)
 equivalent_ids = Add(cagrant_cesiant, skortrith_cesiant)
 equivalent_ids = Add(cagrant_cesiant, nydus_cesiant)
 equivalent_ids = Add(spraith_cesiant, spirtith_cesiant)
-equivalent_ids = Add(surkith_coolony, skortrith_cesiant)
+equivalent_ids = Add(surkith_cesiant, skortrith_cesiant)
+equivalent_ids = Add(larvosk_cesiant, ocsal_cesiant)
 equivalent_ids = Add(irol_iris, othstol_oviform)
 equivalent_ids = Add(othstol_oviform, orboth_omlia)
 equivalent_ids = Add(quazeth_pool, liivral_pond)

patchnotes.md

@@ -6,7 +6,8 @@ More rebalancings, more new sprites, more bugfixes - it's another hefty CMBW pat
 
 ## Summary
 - Mason and Scribe training time is now 14 seconds, matching the Droleth
-- Quarry and Larvosk Cesiant are tier 2; Embassy price has increased
+- Quarry and Larvosk Cesiant are now tier 2; Embassy price has increased
+- Protoss tech crunched, removing Cenotaph, Sanctum of Sorrow, Lattice, Sequestered Icon, Astral Omen, and Fleet Beacon
 - Several price adjustments have occurred across all races and tech tiers, aiming for better balance between resource spending and making it less feasible to get high-power armies *and* achieve fast tech timings
 
 ## Game modes
@@ -67,6 +68,12 @@ More rebalancings, more new sprites, more bugfixes - it's another hefty CMBW pat
 	- Fixed Sevenstep projectile movement being slower than intended
 	- Town centers are no longer placeable near Vespene Ridges in quasifog (r. Mystery Meat)
 	- Caphrolosk and Gathtelosk mutation shortcut conflicts have been resolved (r. neblime)
+- AI:
+	- Extra defenses are no longer considered requestable unless workers or structures are being attacked
+	- Fixed request processing for the following units:
+		- Mind Tyrant
+		- Gladius
+		- Exemplar
 - Audiovisuals:
 	- Magenta, Rainbow New, and Patriotic Freedom are no longer rollable as player colors
 	- Delay between ally under attack notices has increased
@@ -167,27 +174,48 @@ More rebalancings, more new sprites, more bugfixes - it's another hefty CMBW pat
 	- Now moves 10% slower
 - [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot):
 	- Armor now 1, from 0
+- [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire):
+	- Now trained from Gateway
 - [Hierophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/hierophant):
 	- Mineral and gas costs now 100/75, from 125/50
 	- Weapon cooldown now 0.625, from 0.666
 	- Initial attack windup now 3 frames long, from 6, increasing responsivity
+	- Now trained from Gateway
+- [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan):
+	- Now trained from Rogue Gallery
+- [Mind Tyrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/mind-tyrant):
+	- Now trained from Prostration Stage
 - [Simulacrum](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/simulacrum):
 	- Time cost now 18, from 20
 	- Movement speed now ~22% faster
 - [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold):
 	- Mineral and time costs now 75/22, from 100/25
 	- HP now 70, from 80
+- [Golem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/golem):
+	- Now trained from Lattice
 - [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol):
 	- Now has Interception
 	- Now moves ~10% slower
+	- Now trained from Lattice
+- [Accantor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/accantor):
+	- Now trained from Ardent Authority
 - [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect):
 	- HP now 200, from 180
 	- Weapon damage now 30, from 40
 	- Weapon cooldown now 1.33, from 1.5
 	- Now moves ~11% faster
 	- Collision now ~8% smaller
+	- Now trained from Ardent Authority
 - [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora):
 	- Time cost now 22, from 25
+- [Gladius](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gladius):
+	- Now trained from Stargate
+- [Exemplar](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/exemplar):
+	- Now trained from Stargate
+- [Empyrean](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/empyrean):
+	- Now trained from Argosy
+- [Solarion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/solarion):
+	- Now trained from Argosy
 - [Embassy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/embassy):
 	- Gas and time costs now 75/45, from 50/35
 	- HP now 500, from 400
@@ -207,6 +235,8 @@ More rebalancings, more new sprites, more bugfixes - it's another hefty CMBW pat
 	- HP now 250, from 220
 	- Shields now 120, from 100
 	- Now has Interception
+- Cenotaph, Sanctum of Sorrow, Automaton Register, Sequestered Icon, Astral Omen, Fleet Beacon:
+	- Removed
 
 ## Zerg
 - [Quazilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/quazilisk):
@@ -233,6 +263,8 @@ More rebalancings, more new sprites, more bugfixes - it's another hefty CMBW pat
 	- Attack windup now 2 frames long, from 4, increasing responsivity
 - [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor):
 	- Armor now 1, from 2
+- [Bactalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/bactalisk):
+	- Mineral and time costs now 100/25, from 75/15
 - [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor):
 	- Now benefits from Saber Siphon
 - [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk):
@@ -263,6 +295,8 @@ More rebalancings, more new sprites, more bugfixes - it's another hefty CMBW pat
 	- **New passive:** Caustic Fission
 		- Gains +1 bounce for every 4 range travelled
 	- Now requires Geszkath Grotto, from Alkaj Chasm
+- [Hachirosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hachirosk):
+	- Time cost now 60, from 65
 - [Excisant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/excisant):
 	- Time cost now 35, from 45
 - [Larvosk Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/larvosk-cesiant):