Rebalance Stargate as a tier 2 factory

CMBW-editor/ai/cm_protoss_atown.asc3

@@ -449,12 +449,6 @@ script_id PARx
 #	p_need 1 sanctum_of_sorrow
 	return
 	
-	:need_waywardlure
-	wait 12
-	bring 13 AtL 1 wayward_lure Loc.63 blank_return
-	p_need 1 wayward_lure
-	return
-	
 	:need_monumentofsin
 	wait 12
 	bring 13 AtL 1 monument_of_sin Loc.63 blank_return

CMBW-editor/ai/cm_terran.asc3

@@ -1272,7 +1272,7 @@ script_id TMCx
 	
 	:under_attack_by_ground_calc
 	var AtL|Wait under_attack_var 1 13
-	player_combat 17 13 63 False Jump maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|silvertongue|sevenstep|silvertongue|vulture|cyclops|goliath|blackjack|matador|phalanx|phalanx_siege_mode|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|zealot|dracadin|ecclesiast|legionnaire|hierophant|amaranth|atreus|herald|cantavis|vagrant|cabalist|pariah|charlatan|archon|optecton|patriarch|apostate|augur|manifold|simulacrum|idol|golem|accantor|architect|demiurge|zethrokor|quazilisk|vorvrokor|liiralisk|cikralisk|protathalor|axitrilisk|mortothrokor|hydralisk|izirokor|bactalisk|tethzorokor|kagralisk|evigrilisk|keskathalor|zoryusthaleth|lakizilisk|konvilisk|vilgorokor|rilirokor|ultrokor|zobriolisk|aspirant|cohort|tarasque Any under_attack_by_ground_calc_fin 13
+	player_combat 17 13 63 False Jump maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|hypnagogue|sevenstep|silvertongue|vulture|cyclops|goliath|blackjack|matador|phalanx|phalanx_siege_mode|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|zealot|dracadin|ecclesiast|legionnaire|hierophant|amaranth|atreus|herald|cantavis|vagrant|cabalist|charlatan|pariah|potentate|sycophant|archon|optecton|patriarch|manifold|simulacrum|idol|golem|accantor|architect|demiurge|zethrokor|quazilisk|vorvrokor|liiralisk|cikralisk|protathalor|axitrilisk|mortothrokor|hydralisk|izirokor|bactalisk|tethzorokor|kagralisk|evigrilisk|keskathalor|zoryusthaleth|lakizilisk|konvilisk|vilgorokor|rilirokor|ultrokor|zobriolisk|aspirant|cohort|tarasque Group_Buildings|mason|talos under_attack_by_ground_calc_fin 13
 	var Set under_attack_by_ground_var 1 13
 	
 	:under_attack_by_ground_calc_fin
@@ -1281,7 +1281,7 @@ script_id TMCx
 	
 	:under_attack_by_air_calc
 	var Ex|Wait under_attack_var 1 13
-	player_combat 17 13 63 False Jump talos|wraith|gorgon|wyvern|valkyrie|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos|artisan|barghest|vassal|empress|aurora|panoptus|lanifect|gladius|exemplar|magister|epigraph|didact|empyrean|solarion|star_sovereign|anthelion|gosvileth|nathrokor|kalkalisk|mutalisk|ghitorokor|sovroleth|tosgrilisk|skithrokor|vithrilisk|almaksalisk|geszithalor|algoztalisk|alkajelisk|gorgrokor|rililisk|zarcavrokor|tetcaerokor|akistrokor|luminary Any under_attack_by_air_calc_fin 13
+	player_combat 17 13 63 False Jump talos|wraith|gorgon|wyvern|valkyrie|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos|artisan|barghest|vassal|empress|aurora|panoptus|lanifect|gladius|exemplar|magister|epigraph|didact|empyrean|solarion|star_sovereign|anthelion|gosvileth|nathrokor|kalkalisk|mutalisk|ghitorokor|sovroleth|tosgrilisk|skithrokor|vithrilisk|almaksalisk|geszithalor|algoztalisk|alkajelisk|gorgrokor|rililisk|zarcavrokor|tetcaerokor|akistrokor|luminary Group_Buildings|mason|talos under_attack_by_air_calc_fin 13
 	var Set under_attack_by_air_var 1 13
 	
 	:under_attack_by_air_calc_fin
@@ -2237,6 +2237,19 @@ script_id TMCx
 	wait 3600
 	return
 	
+	:wait_buildstart_towncenter
+	bring 13 AtL_W 1 ministry|treasury Loc.63 blank
+	return
+	
+	:wait_build_towncenter
+	wait 12
+	notowns ministry wait_build_towncenter_2
+	return
+	
+	:wait_build_towncenter_2
+	notowns treasury wait_build_towncenter
+	return
+	
 	:expansion_init_area_town
 	call init_area_town
 	goto expansion_body
@@ -2249,15 +2262,21 @@ script_id TMCx
 	bld 1 ministry 180
 	goto expansion_main
 	
+	:expansion_body_quarry
+	wait 12
+	notowns atlas expansion_body_quarry
+	bld 1 quarry 179
+	stop
+	
 	:expansion_body_treasury
 	bld 1 treasury 180
-	bld 1 quarry 120
+	multi expansion_body_quarry
 	
 	:expansion_main
 	multi expansion_worker_start
-	w_bldstart 1 ministry
+	call wait_buildstart_towncenter
 	var Set try_expand_var 0 13
-	w_bld 1 ministry
+	call wait_build_towncenter
 	multi count_expansion
 	var Ex|Jump skip_building_var 1 idle 13
 	placeholder_count Local AtL|Jump 2 Group_Buildings idle 13

CMBW-editor/ai/cm_zerg_atown.asc3

@@ -37,7 +37,7 @@ script_id ZARx
 	goto idle
 	
 	:build_order_expansion
-	bring 13 AtL_W 1 hachirosk|caphrolosk|gathtelosk|larvosk_colony Loc.63 blank
+	bring 13 AtL_W 1 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 blank
 	var Ex|Jump pref_assault 1 build_assault_fin2 13
 	var Ex|Jump pref_swarm 1 build_swarm_fin2 13
 	var Ex|Jump pref_sunblot 1 build_sunblot_fin2 13
@@ -212,8 +212,8 @@ script_id ZARx
 	wait 12
 	local 255 Ex 0 larva expansion_worker_standard_loop
 	var AtL|WF(240) can_worker_all_var 1 13
-	bring 13 AtL 4 hachirosk|caphrolosk|gathtelosk|larvosk_colony Loc.63 expansion_worker_standard_loop_maximum
+	bring 13 AtL 4 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 expansion_worker_standard_loop_maximum
-	bring 13 AtL 3 hachirosk|caphrolosk|gathtelosk|larvosk_colony Loc.63 expansion_worker_standard_loop_medium
+	bring 13 AtL 3 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 expansion_worker_standard_loop_medium
 	wait 120
 	local 255 AtL 12 droleth|gosvileth expansion_worker_standard_loop
 	call worker_conditions
@@ -280,7 +280,7 @@ script_id ZARx
 	:need_irol
 	wait 24
 	bring 13 AtL 1 irol_iris|irulent_ivoa|othstol_oviform|orboth_omlia Loc.63 blank
-	bring 13 AtM 3 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_irol
+	bring 13 AtM 3 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_irol
 	bring 13 Ex 0 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_irol
 	bring 13 AtM 1 excisant Loc.63 need_irol
 	call main_wait_450
@@ -300,7 +300,7 @@ script_id ZARx
 	wait 24
 	bring 13 AtL 1 irulent_ivoa|othstol_oviform|orboth_omlia Loc.63 blank
 	notowns irol_iris need_irulent
-	bring 13 AtM 4 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_irulent
+	bring 13 AtM 4 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_irulent
 	bring 13 Ex 1 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_irulent
 	bring 13 AtM 2 excisant Loc.63 need_irulent
 	call main_wait_450
@@ -325,7 +325,7 @@ script_id ZARx
 	wait 24
 	bring 13 AtL 1 othstol_oviform|orboth_omlia Loc.63 blank
 	bring 13 Ex 0 irol_iris|irulent_ivoa Loc.63 need_othstol
-	bring 13 AtM 5 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_othstol
+	bring 13 AtM 5 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_othstol
 	bring 13 Ex 2 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_othstol
 	bring 13 AtM 4 excisant Loc.63 need_othstol
 	call main_wait_450
@@ -344,7 +344,7 @@ script_id ZARx
 	wait 24
 	bring 13 AtL 1 orboth_omlia Loc.63 blank
 	notowns othstol_oviform need_orboth
-	bring 13 AtM 7 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_orboth
+	bring 13 AtM 7 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_orboth
 	bring 13 Ex 4 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_orboth
 	bring 13 AtM 4 excisant Loc.63 need_orboth
 	call main_wait_450
@@ -387,7 +387,7 @@ script_id ZARx
 	var AtL|wait town_count_var 1 13
 	wait 12
 	bring 13 Ex 0 droleth|gosvileth Loc.63 request_larvosk
-	add_bld 255 larvosk_colony 1 10 109
+	add_bld 255 larvosk_cesiant 1 10 109
 	return
 	
 	:wHachirosk
@@ -510,7 +510,7 @@ script_id ZARx
 	wait 90
 	call main_wait_150
 	var Ex|Wait can_build_static_defense_var 1 13
-	add_bld 255 surkith_colony 1 5 106
+	add_bld 255 surkith_cesiant 1 5 106
 	wait 450
 	
 	:request_surkith_loop
@@ -518,26 +518,26 @@ script_id ZARx
 	wait 12
 	local 255 Ex 0 hachirosk|caphrolosk|gathtelosk request_surkith_loop
 	bring 13 Ex 0 droleth|gosvileth Loc.63 request_surkith_loop
-	bring 13 AtL 1 cagrant_colony Loc.63 request_surkith_loop
+	bring 13 AtL 1 cagrant_cesiant Loc.63 request_surkith_loop
 	res 13 AtL_C Ore 125 request_surkith_check
 	wait 90
 	call main_wait_150
 	goto request_surkith_loop
 	
 	:request_surkith_check
-	local 255 AtL 5 surkith_colony request_surkith_check_2
+	local 255 AtL 5 surkith_cesiant request_surkith_check_2
-	add_bld 255 surkith_colony 1 5 106
+	add_bld 255 surkith_cesiant 1 5 106
 	var Ex|Jump under_attack_by_ground_var 1 add_return_wait_960 13
 	goto add_return_wait_1440
 	
 	:request_surkith_check_2
 	var Ex|Jump under_attack_by_ground_var 1 request_surkith_check_3 13
 	var AtM|Jump mining_count_var 2 add_return_wait_960 13
-	add_bld 255 surkith_colony 1 7 106
+	add_bld 255 surkith_cesiant 1 7 106
 	goto add_return_wait_960
 	
 	:request_surkith_check_3
-	add_bld 255 surkith_colony 1 10 106
+	add_bld 255 surkith_cesiant 1 10 106
 	goto add_return_wait_960
 	
 	:request_spraith
@@ -545,7 +545,7 @@ script_id ZARx
 	wait 90
 	call main_wait_150
 	var Ex|Wait can_build_static_defense_var 1 13
-	add_bld 255 spraith_colony 1 5 106
+	add_bld 255 spraith_cesiant 1 5 106
 	wait 450
 	
 	:request_spraith_loop
@@ -553,26 +553,26 @@ script_id ZARx
 	wait 12
 	local 255 Ex 0 hachirosk|caphrolosk|gathtelosk request_spraith_loop
 	bring 13 Ex 0 droleth|gosvileth Loc.63 request_spraith_loop
-	bring 13 AtL 1 cagrant_colony Loc.63 request_spraith_loop
+	bring 13 AtL 1 cagrant_cesiant Loc.63 request_spraith_loop
 	res 13 AtL_C Ore 125 request_spraith_check
 	wait 60
 	call main_wait_300
 	goto request_spraith_loop
 	
 	:request_spraith_check
-	local 255 AtL 3 spraith_colony request_spraith_check_2
+	local 255 AtL 3 spraith_cesiant request_spraith_check_2
-	add_bld 255 spraith_colony 1 10 106
+	add_bld 255 spraith_cesiant 1 10 106
 	var Ex|Jump under_attack_by_air_var 1 add_return_wait_960 13
 	goto add_return_wait_1440
 	
 	:request_spraith_check_2
 	var Ex|Jump under_attack_by_air_var 1 request_spraith_check_3 13
 	var AtM|Jump mining_count_var 2 add_return_wait_960 13
-	add_bld 255 spraith_colony 1 7 106
+	add_bld 255 spraith_cesiant 1 7 106
 	goto add_return_wait_960
 	
 	:request_spraith_check_3
-	add_bld 255 spraith_colony 1 10 106
+	add_bld 255 spraith_cesiant 1 10 106
 	goto add_return_wait_960
 	
 	:production_cycle
@@ -637,26 +637,26 @@ script_id ZARx
 	return
 	
 	:production_cycle_check
-	var Ex|Call prefLarvoskColony 1 production_larvosk_colony 13
+	var Ex|Call prefLarvoskcesiant 1 production_larvosk_cesiant 13
 	var Ex|Call prefHachirosk 1 production_hachirosk 13
 	var Ex|Call prefCaphrolosk 1 production_caphrolosk 13
 	var Ex|Call prefGathtelosk 1 production_gathtelosk 13
 	var AtL|Call mining_count_var 5 production_gathtelosk 13
 	var AtL|Call mining_count_var 3 production_caphrolosk 13
 	res 13 AtL_C Any 500 production_hachirosk
-	call production_larvosk_colony
+	call production_larvosk_cesiant
 	call production_hachirosk
 	call production_caphrolosk
 	call production_gathtelosk
 	return
 	
-	:production_larvosk_colony
+	:production_larvosk_cesiant
 	wait 12
 	var AtL|Jump prod_cycle_var 1 blank_return 13
 	bring 13 Ex 0 droleth|gosvileth Loc.63 blank_return
-	bring 13 AtL 1 cagrant_colony Loc.63 blank_return
+	bring 13 AtL 1 cagrant_cesiant Loc.63 blank_return
-	local 255 AtL 30 larvosk_colony blank_return
+	local 255 AtL 30 larvosk_cesiant blank_return
-	add_bld 255 larvosk_colony 1 30 100
+	add_bld 255 larvosk_cesiant 1 30 100
 	call add_return_wait_960
 	goto production_cycle_success
 	

CMBW-editor/grafting/Orders.txt

@@ -25,10 +25,13 @@
 
 5:                  # [5] Bunker Guard
   0xFF02            # Current unit is...
-  125               # [125] Bunker
+  125               # [125] Anchor
   0xFF01            # Or
   0xFF02            # Current unit is...
   370               # [370] Dugout
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  384               # [384] Lodestone
   0xFFFF            # ==End of List==
 
 6:                  # [6] Ignore
@@ -472,6 +475,9 @@
   0xFF01            # Or
   0xFF02            # Current unit is...
   354               # [354] Ocsal Colony
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 79:                 # [79] Harvest1
@@ -523,10 +529,13 @@
 
 95:                 # [95] Pick Up3
   0xFF02            # Current unit is...
-  125               # [125] Bunker
+  125               # [125] Anchor
   0xFF01            # Or
   0xFF02            # Current unit is...
   370               # [370] Dugout
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  384               # [384] Lodestone
   0xFFFF            # ==End of List==
 
 97:                 # [97] Powerup2
@@ -549,6 +558,9 @@
   0xFF01            # Or
   0xFF02            # Current unit is...
   133               # [133] Gathtelosk
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  384               # [384] Omnivale
   0xFFFF            # ==End of List==
 
 102:                # [102] Spread Creep

CMBW-editor/grafting/Tech.txt

@@ -113,19 +113,19 @@
 
 9:                  # [9] Select Shared - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 10:                 # [10] Personnel Cloaking
@@ -292,19 +292,19 @@
 
 28:                 # [28] Select Control - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 29:                 # [29] Grief of All Gods - Star Sovereign
@@ -329,19 +329,19 @@
 
 33:                 # [33] Select Swarm - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 34:                 # [34] Healing - Cleric
@@ -369,19 +369,19 @@
 
 38:                 # [38] Select Assault - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 39:                 # [39] Emergency Detonation - Terran Structure

patchnotes.md

@@ -52,6 +52,15 @@ Patch goals include:
 - [Empress](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/empress):
 	- Time cost now 50, from 60
 	- HP now 200, from 180
+- [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora):
+	- Time cost now 20, from 22
+	- HP now 80, from 75
+	- Armor now 1, from 0
+	- Armor penetration now 1, from 0
+- [Lanifect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/lanifect):
+	- HP now 100, from 90
+- [Panoptus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/panoptus):
+	- Shields now 70, from 50
 - [Exemplar](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/exemplar):
 	- Gas and time costs now 125/50, from 100/40
 	- Weapon cooldown now 1.13, from 1.08
@@ -64,7 +73,7 @@ Patch goals include:
 - [Engram](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/engram):
 	- Weapon splash radii now 12/24/36, from 24/36/48
 - [Grand Library](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/grand-library):
-	- Time cost now 50, from 45
+	- Time cost now 55, from 45
 - [Rogue Gallery](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/rogue-gallery):
 	- Time cost now 50, from 45
 - [Prostration Stage](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/prostration-stage):
@@ -76,6 +85,9 @@ Patch goals include:
 - [Synthetic Synod](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/synthetic-synod):
 	- Time cost now 70, from 60
 	- HP now 850, from 750
+- [Stargate](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/stargate):
+	- Mineral, gas, and time costs now 200/150/60, from 125/125/55
+	- Shields now 350, from 300
 - [Argosy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/argosy):
 	- Time cost now 60, from 50
 - **NEW:** [Potentate](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/potentate):