29 March 2023 update; March Madness is official!

CMBW-editor/ai/cm_protoss.asc3

@@ -2127,7 +2127,7 @@ script_id PMCx
 	w_bld 1 pylon
 	multi request_static_defense
 	call main_wait_1200
-	multi production_cycle
+	resarea 255 AtL 255 Ore 1 production_cycle
 	call main_wait_1800
 	var Ex|Wait build_done_var 1 13
 	call main_wait_1200

CMBW-editor/ai/cm_terran.asc3

@@ -138,10 +138,10 @@ script_id TMCx
 	
 	:select_preferences
 	# personalities
-	dth 13 Ex_C 1 disruption_web_unit prefPArmor
+	dth 13 Ex_C 1 disruption_web_unit select_personality_armor
-	dth 13 Ex_C 2 disruption_web_unit prefPRaider
+	dth 13 Ex_C 2 disruption_web_unit select_personality_raider
-	dth 13 Ex_C 3 disruption_web_unit prefPOrbital
+	dth 13 Ex_C 3 disruption_web_unit select_personality_orbital
-	dth 13 Ex_C 9 disruption_web_unit prefPScenario
+	dth 13 Ex_C 9 disruption_web_unit select_personality_scenario
 	# military
 	dth 13 AtL_C 1 maverick prefUMaverick
 	dth 13 AtL_C 1 harakan prefUHarakan
@@ -270,73 +270,73 @@ script_id TMCx
 	dth 13 Set 0 quarry blank
 	return
 	
-	:prefPArmor
+	:select_personality_armor
 	var Set pref_armor 1 13
 	var Set pref_raider 0 13
 	var Set pref_orbital 0 13
 	var Set pref_scenario 0 13
 	return
 	
-	:prefPRaider
+	:select_personality_raider
 	var Set pref_armor 0 13
 	var Set pref_raider 1 13
 	var Set pref_orbital 0 13
 	var Set pref_scenario 0 13
 	return
 	
-	:prefPOrbital
+	:select_personality_orbital
 	var Set pref_armor 0 13
 	var Set pref_raider 0 13
 	var Set pref_orbital 1 13
 	var Set pref_scenario 0 13
 	return
 	
-	:prefPScenario
+	:select_personality_scenario
 	var Set pref_armor 0 13
 	var Set pref_raider 0 13
 	var Set pref_orbital 0 13
 	var Set pref_scenario 1 13
-	call prefPScenarioCheck
+	call select_personality_scenario_check
 	return
 	
-	:prefPScenarioLite
+	:select_personality_scenario_lite
 	var Set pref_scenario_lite 1 13
 	dth 13 Set 0 cyprian blank
 	return
 	
-	:prefPScenarioCheck
+	:select_personality_scenario_check
-	dth 13 Ex 2 scanner_sweep prefPScenario_OneForTheFuture
+	dth 13 Ex 2 scanner_sweep select_personality_scenario_OneForTheFuture
-#	dth 13 Ex 3 scanner_sweep prefPScenario_TheLostGods
+#	dth 13 Ex 3 scanner_sweep select_personality_scenario_TheLostGods
 	return
 	
-	:prefPScenario_OneForTheFuture
+	:select_personality_scenario_OneForTheFuture
-	dth 13 Ex_M 1 right_pit_door prefPScenario_OneForTheFuture_WallStreetWar
+	dth 13 Ex_M 1 right_pit_door select_personality_scenario_OneForTheFuture_WallStreetWar
-	dth 13 Ex_M 4 right_pit_door prefPScenario_OneForTheFuture_PastaMasta
+	dth 13 Ex_M 4 right_pit_door select_personality_scenario_OneForTheFuture_PastaMasta
-	dth 13 Ex_M 7 right_pit_door prefPScenario_OneForTheFuture_FavoredFiction
+	dth 13 Ex_M 7 right_pit_door select_personality_scenario_OneForTheFuture_FavoredFiction
 	return
 	
-	:prefPScenario_OneForTheFuture_WallStreetWar
+	:select_personality_scenario_OneForTheFuture_WallStreetWar
 	wait 12
 	var Set pref_armor 1 13
 	var AtL|Wait mining_count_var 4 13
 	var Set pref_armor 0 13
 	var Set pref_orbital 1 13
 	var AtM|Wait mining_count_var 3 13
-	goto prefPScenario_OneForTheFuture_WallStreetWar
+	goto select_personality_scenario_OneForTheFuture_WallStreetWar
 	
-	:prefPScenario_OneForTheFuture_PastaMasta
+	:select_personality_scenario_OneForTheFuture_PastaMasta
-	dth 13 Ex 5 t_tank_turret prefPScenario_OneForTheFuture_PastaMasta_TonyTron
+	dth 13 Ex 5 t_tank_turret select_personality_scenario_OneForTheFuture_PastaMasta_TonyTron
 	stop
 	
-	:prefPScenario_OneForTheFuture_PastaMasta_TonyTron
+	:select_personality_scenario_OneForTheFuture_PastaMasta_TonyTron
 	var Set pref_orbital 1 13
 	stop
 	
-	:prefPScenario_OneForTheFuture_FavoredFiction
+	:select_personality_scenario_OneForTheFuture_FavoredFiction
-	dth 13 Ex 5 t_tank_turret prefPScenario_OneForTheFuture_FavoredFiction_Ullen
+	dth 13 Ex 5 t_tank_turret select_personality_scenario_OneForTheFuture_FavoredFiction_Ullen
 	stop
 	
-	:prefPScenario_OneForTheFuture_FavoredFiction_Ullen
+	:select_personality_scenario_OneForTheFuture_FavoredFiction_Ullen
 	var Set pref_armor 1 13
 	stop
 	
@@ -1320,22 +1320,6 @@ script_id TMCx
 	var Ex|Wait build_gas_var 1 13
 	aictrl build_gas
 	var Ex|Wait build_gas_var 1 13
-	
-	:gas_requests
-	resarea 255 Ex 255 Gas 0 blank
-#	bld 1 reservoir 105
-	resarea 255 AtM 255 Gas 6000 blank
-	wait 600
-#	bld 2 reservoir 104
-	resarea 255 AtM 255 Gas 11000 blank
-	wait 600
-#	bld 3 reservoir 103
-	resarea 255 AtM 255 Gas 16000 blank
-	wait 600
-#	bld 4 reservoir 102
-	resarea 255 AtM 255 Gas 21000 blank
-	wait 600
-#	bld 5 reservoir 101
 	stop
 	
 	:define_maxes
@@ -2030,7 +2014,7 @@ script_id TMCx
 	
 	:worker_request_advanced
 	local 255 AtL 28 mason|talos blank_return
-	notowns atlas blank_return
+	notowns parthenon blank_return
 	local 255 AtL 10 talos blank_return
 	queue 1 talos parthenon 255 Local Loc.63 100
 	wait 150
@@ -2207,14 +2191,14 @@ script_id TMCx
 	
 	:expansion_request_cut_all
 	call expansion_request_cut_most
-	var Set can_worker_var 0 13 # sub?
+	var Sub can_worker_var 0 13
 	return
 	
 	:expansion_request_reset
 	var Set can_queue_early_military_var 1 13
 	var Set can_build_static_defense_var 1 13
 	var Set can_build_production_var 1 13
-	var Set can_worker_var 1 13 # add?
+	var Add can_worker_var 1 13
 	return
 	
 	:expansion_toggle
@@ -2273,7 +2257,6 @@ script_id TMCx
 	w_bldstart 1 command_center
 	var Set try_expand_var 0 13
 	w_bld 1 command_center
-	multi gas_requests
 	multi count_expansion
 	var Ex|Jump skip_building_var 1 idle 13
 	placeholder_count Local AtL|Jump 2 Group_Buildings idle 13
@@ -2281,6 +2264,7 @@ script_id TMCx
 	:expansion_normal
 	multi request_watchdog
 	call main_wait_450
+	resarea 255 AtL 255 Ore 1 production_cycle
 	multi production_cycle
 	call main_wait_600
 	multi request_bunker
@@ -2358,14 +2342,14 @@ script_id TMCx
 	:rich_boy_atlas
 	wait 12
 	bring 13 AtL 1 atlas Loc.63 blank
-	res 13 AtM Gas 399 rich_boy_atlas
+	res 13 AtM Gas 499 rich_boy_atlas
 	p_need 1 atlas
 	stop
 	
 	:rich_boy_fountainhead
 	wait 12
 	bring 13 AtL 1 fountainhead Loc.63 blank
-	call wait_for_Atlas
+	call wait_for_atlas
 	res 13 AtM Gas 399 rich_boy_fountainhead
 	p_need 1 fountainhead
 	stop
@@ -2373,15 +2357,15 @@ script_id TMCx
 	:rich_boy_daedala
 	wait 12
 	bring 13 AtL 1 daedala Loc.63 blank
-	call wait_for_Atlas
+	call wait_for_atlas
-	res 13 AtM Gas 999 rich_boy_daedala
+	res 13 AtM Gas 1199 rich_boy_daedala
 	p_need 1 daedala
 	stop
 	
 	:rich_boy_atelier
 	wait 12
 	bring 13 AtL 1 atelier Loc.63 blank
-	call wait_for_Daedala
+	call wait_for_daedala
 	res 13 AtM Gas 999 rich_boy_atelier
 	p_need 1 atelier
 	stop
@@ -2645,7 +2629,7 @@ script_id TMCx
 	goto build_general_fin
 	
 	:build_general_2FulcMech_Addon
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 1 fulcrum
 	bld 1 scrapyard 120
 	w_bld 2 fulcrum
@@ -2698,7 +2682,7 @@ script_id TMCx
 	:build_general_EarlyRiser_Addon
 	w_bld 1 barracks
 	bld 1 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 1 fulcrum
 	bld 1 machine_shop 120
 	stop
@@ -2747,10 +2731,10 @@ script_id TMCx
 	:build_general_TheCube_Addon
 	w_bld 1 barracks
 	bld 1 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 1 fulcrum
 	bld 1 machine_shop 120
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 1 starport 121
 	w_bld 1 starport
 	bld 1 munitions_bay 120
@@ -2808,7 +2792,7 @@ script_id TMCx
 	bld 1 scrapyard 120
 	w_bld 2 fulcrum
 	bld 2 scrapyard 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 2 barracks
 	bld 1 covert_ops 120
 	call main_wait_150
@@ -2875,13 +2859,13 @@ script_id TMCx
 	bld 1 scrapyard 120
 	w_bld 2 fulcrum
 	bld 2 scrapyard 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	bld 1 quarry 120
 	w_bld 3 fulcrum
 	bld 1 machine_shop 120
 	w_bld 4 fulcrum
 	bld 2 machine_shop 120
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 2 starport 121
 	w_bld 1 starport
 	bld 1 munitions_bay 120
@@ -2897,14 +2881,14 @@ script_id TMCx
 	bld 4 munitions_bay 120
 	w_bld 5 starport
 	bld 5 munitions_bay 120
-	call wait_for_Daedala
+	call wait_for_daedala
 	w_bld 6 starport
 	bld 1 commandment 120
 	w_bld 7 starport
 	bld 2 commandment 120
 	w_bld 8 starport
 	bld 3 commandment 120
-	call wait_for_Atelier
+	call wait_for_atelier
 	bld 2 nanite_assembly 121
 	stop
 	
@@ -2956,14 +2940,14 @@ script_id TMCx
 	bld 1 medbay 120
 	w_bld 1 fulcrum
 	bld 1 scrapyard 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 2 fulcrum
 	bld 1 machine_shop 120
 	w_bld 3 fulcrum
 	bld 2 machine_shop 120
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 2 starport 121
-	call wait_for_Daedala
+	call wait_for_daedala
 	w_bld 2 starport
 	bld 2 commandment 120
 	w_bld 1 commandment
@@ -2979,17 +2963,17 @@ script_id TMCx
 	:build_general_fin2
 	placeholder_count Local AtL|Jump 2 Group_Buildings blank 13
 	call main_wait_450
-	call wStarpad2
+	call add_starpad_simple2
 	call main_wait_300
 	multi need_atlas
 	call main_wait_300
-	call wBarracks
+	call add_barracks_simple
 	call main_wait_150
 	bld 1 covert_ops 120
 	call main_wait_600
 	multi need_fountainhead
 	call main_wait_900
-	call wStarport
+	call add_starport_simple
 	call main_wait_1200
 	call main_wait_600
 	multi need_daedala
@@ -3074,7 +3058,7 @@ script_id TMCx
 	queue 1 vulture fulcrum 255 Local Loc.63 100
 	call main_wait_150
 	w_bldstart 2 fulcrum
-	var Add can_expand_var 1 13
+	multi expansion_toggle
 	call main_wait_900
 	bld 3 fulcrum 121
 	call main_wait_150
@@ -3099,7 +3083,7 @@ script_id TMCx
 	goto build_armor_fin
 	
 	:build_armor_PhalanxTiming_Addon
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 1 fulcrum
 	bld 1 machine_shop 120
 	w_bld 2 fulcrum
@@ -3168,7 +3152,6 @@ script_id TMCx
 	call main_wait_600
 	queue 1 goliath fulcrum 255 Global Loc.63 100
 	call main_wait_750
-	var Set build_gas_var 1 13
 	wait 24
 	queue 1 goliath fulcrum 255 Global Loc.63 100
 	call main_wait_300
@@ -3214,14 +3197,14 @@ script_id TMCx
 	:build_armor_FE5Fulc_Addon
 	w_bld 1 fulcrum
 	bld 1 scrapyard 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 2 fulcrum
 	bld 1 machine_shop 120
 	w_bld 3 fulcrum
 	bld 2 machine_shop 120
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 1 starport 121
-	call wait_for_Daedala
+	call wait_for_daedala
 	w_bld 1 starport
 	bld 1 commandment 120
 	stop
@@ -3253,7 +3236,7 @@ script_id TMCx
 	call main_wait_300
 	var Add can_worker_var 1 13
 	call main_wait_600
-	var Add can_expand_var 1 13
+	multi expansion_toggle
 	bld 3 fulcrum 121
 	call main_wait_150
 	bld 1 barracks 121
@@ -3289,7 +3272,7 @@ script_id TMCx
 	call main_wait_450
 	var Add can_worker_var 1 13
 	call main_wait_1200
-	var Add can_expand_var 1 13
+	multi expansion_toggle
 	call main_wait_600
 	var Set build_gas_var 1 13
 	call main_wait_300
@@ -3301,7 +3284,7 @@ script_id TMCx
 	w_bld 1 fulcrum
 	bld 1 scrapyard 120
 	call main_wait_300
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 2 fulcrum
 	bld 1 machine_shop 120
 	stop
@@ -3319,6 +3302,7 @@ script_id TMCx
 	var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_seraph 13
 	var Ex|Call pref_addon_starport 0 buildpref_orbital_commandment 13
 	call main_wait_900
+	print expansion_toggle
 	multi expansion_toggle
 	call main_wait_300
 	wait 600
@@ -3343,14 +3327,14 @@ script_id TMCx
 	w_bld 2 fulcrum
 	w_bldstart 3 fulcrum
 	var set can_attack_var 1 13
-	call wait_for_Atlas
+	call wait_for_atlas
 	call main_wait_450
 	bld 4 fulcrum 121
 	call main_wait_450
 	multi need_daedala
-	call wait_for_Daedala
+	call wait_for_daedala
 	multi need_atelier
-	call wait_for_Atelier
+	call wait_for_atelier
 	call main_wait_150
 	bld 1 iron_foundry 122
 	call main_wait_150
@@ -3401,7 +3385,6 @@ script_id TMCx
 	call main_wait_300
 	bld 1 starpad 121
 	call main_wait_300
-	var Set build_gas_var 1 13
 	call main_wait_600
 	multi need_atlas
 	call main_wait_450
@@ -3415,7 +3398,7 @@ script_id TMCx
 	:build_armor_DavidAndGoliath_Addon
 	w_bld 2 fulcrum
 	bld 1 scrapyard 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 2 fulcrum
 	bld 1 machine_shop 120
 	call main_wait_150
@@ -3440,7 +3423,7 @@ script_id TMCx
 	call main_wait_2400
 	multi need_daedala
 	call main_wait_900
-	call wStarport
+	call add_starport_simple
 	call main_wait_3600
 	multi need_atelier
 	stop
@@ -3544,7 +3527,7 @@ script_id TMCx
 	bld 1 medbay 120
 	w_bld 2 barracks
 	bld 2 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 3 barracks
 	bld 1 covert_ops 120
 	w_bld 4 barracks
@@ -3612,7 +3595,7 @@ script_id TMCx
 	bld 1 medbay 120
 	w_bld 2 barracks
 	bld 2 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	multi need_fountainhead
 	stop
 	
@@ -3655,7 +3638,7 @@ script_id TMCx
 	:build_raider_FastNuke_Addon
 	w_bld 1 barracks
 	bld 1 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 2 barracks
 	bld 1 covert_ops 120
 	w_bldstart 1 covert_ops
@@ -3714,7 +3697,7 @@ script_id TMCx
 	bld 1 medbay 120
 	w_bld 2 barracks
 	bld 2 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	w_bld 3 barracks
 	bld 1 covert_ops 120
 	w_bld 4 barracks
@@ -3833,9 +3816,9 @@ script_id TMCx
 	:build_raider_HolyAckmeds_Addon
 	w_bld 1 barracks
 	bld 1 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
 	multi need_fountainhead
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 1 starport 121
 	w_bld 1 starport
 	bld 1 munitions_bay 120
@@ -3851,7 +3834,7 @@ script_id TMCx
 	bld 1 medbay 120
 	call main_wait_300
 	multi need_atlas
-	call wait_for_Atlas
+	call wait_for_atlas
 	bld 1 covert_ops 120
 	call main_wait_1800
 	multi need_fountainhead
@@ -3955,9 +3938,9 @@ script_id TMCx
 	goto build_orbital_fin
 	
 	:build_orbital_2PortWraith_Addon
-	call wait_for_Atlas
+	call wait_for_atlas
 	multi need_fountainhead
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 1 starport 121
 	w_bld 1 starport
 	bld 1 munitions_bay 120
@@ -3965,7 +3948,7 @@ script_id TMCx
 	w_bld 2 starport
 	bld 2 munitions_bay 120
 	bld 3 starport 121
-	call wait_for_Daedala
+	call wait_for_daedala
 	w_bld 3 starport
 	bld 1 commandment 120
 	stop
@@ -3998,9 +3981,9 @@ script_id TMCx
 	call expansion_loop_normal
 	call main_wait_1200
 	multi need_daedala
-	call wait_for_Daedala
+	call wait_for_daedala
 	multi need_atelier
-	call wait_for_Atelier
+	call wait_for_atelier
 	bld 2 nanite_assembly 122
 	call main_wait_450
 	bld 3 nanite_assembly 122
@@ -4137,11 +4120,11 @@ script_id TMCx
 	goto build_orbital_fin
 	
 	:build_orbital_Hotdrop_Addon
-	call wait_for_Atlas
+	call wait_for_atlas
 	bld 1 covert_ops 120
 	w_bld 1 covert_ops
 	bld 1 missile_silo 120
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 1 starport 121
 	w_bld 1 starport
 	bld 1 munitions_bay 120
@@ -4196,7 +4179,7 @@ script_id TMCx
 	multi need_atlas
 	call main_wait_900
 	multi expansion_toggle
-	call wait_for_Atlas
+	call wait_for_atlas
     call main_wait_750
 	multi need_fountainhead
     call main_wait_750
@@ -4206,8 +4189,8 @@ script_id TMCx
 	:build_orbital_SuddenStarport_Addon
 	w_bld 2 barracks
 	bld 1 medbay 120
-	call wait_for_Atlas
+	call wait_for_atlas
-	call wait_for_Fountainhead
+	call wait_for_fountainhead
 	bld 1 starport 121
 	w_bldstart 1 starport
 	bld 4 starport 121
@@ -4289,86 +4272,86 @@ script_id TMCx
 	stop
 	
 	:build_order_expansion
-	bring 13 AtL_W 1 barracks|captaincy|fulcrum|iron_foundry|starport|nanite_assembly|scrapyard Loc.63 blank
+	bring 13 AtL_W 1 barracks|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly Loc.63 blank
 	var Ex|Jump pref_armor 1 build_armor_fin2 13
 	var Ex|Jump pref_raider 1 build_raider_fin2 13
 	var Ex|Jump pref_orbital 1 build_orbital_fin2 13
 	goto build_general_fin2
 	
-	:wBarracks
+	:add_barracks_simple
 	wait 12
-	notowns command_center wBarracks
+	notowns command_center add_barracks_simple
-	add_bld 255 barracks 1 99 95
+	add_bld 255 barracks 1 99 97
 	return
 	
-	:wBarracks2
+	:add_barracks_simple2
 	p_need 1 barracks
 	return
 	
-	:wCaptaincy
+	:add_captaincy_simple
 	wait 12
-	notowns atlas wCaptaincy
+	notowns atlas add_captaincy_simple
-	add_bld 255 captaincy 1 99 97
+	add_bld 255 captaincy 1 99 98
 	return
 	
-	:wCaptaincy2
+	:add_captaincy_simple2
 	p_need 1 captaincy
 	return
 	
-	:wFulcrum
+	:add_fulcrum_simple
 	wait 12
-	notowns command_center wFulcrum
+	notowns command_center add_fulcrum_simple
-	add_bld 255 fulcrum 1 99 95
+	add_bld 255 fulcrum 1 99 97
 	return
 	
-	:wFulcrum2
+	:add_fulcrum_simple2
 	p_need 1 fulcrum
 	return
 	
-	:wIronFoundry
+	:add_iron_foundry_simple
 	wait 12
-	notowns daedala wIronFoundry
+	notowns daedala add_iron_foundry_simple
 	add_bld 255 iron_foundry 1 99 98
 	return
 	
-	:wIronFoundry2
+	:add_iron_foundry_simple2
 	p_need 1 iron_foundry
 	return
 	
-	:wStarpad
+	:add_starpad_simple
 	wait 12
-	notowns command_center wStarpad
+	notowns command_center add_starpad_simple
-	add_bld 255 starpad 1 99 95
+	add_bld 255 starpad 1 99 97
 	return
 	
-	:wStarpad2
+	:add_starpad_simple2
 	p_need 1 starpad
 	return
 	
-	:wStarport
+	:add_starport_simple
 	wait 12
-	notowns command_center wStarport
+	notowns command_center add_starport_simple
-	notowns atlas wStarport
+	notowns atlas add_starport_simple
-	add_bld 255 starport 1 99 95
+	add_bld 255 starport 1 99 97
 	return
 	
-	:wStarport2
+	:add_starport_simple2
 	p_need 1 starport
 	return
 	
-	:wNaniteAssembly
+	:add_nanite_assembly_simple
 	wait 12
-	notowns daedala wNaniteAssembly
+	notowns daedala add_nanite_assembly_simple
 	add_bld 255 nanite_assembly 1 99 98
 	return
 	
-	:wNaniteAssembly2
+	:add_nanite_assembly_simple2
 	p_need 1 nanite_assembly
 	return
 	
-	:wAtlas
+	:add_atlas_simple
 	wait 12
-	notowns command_center wAtlas
+	notowns command_center add_atlas_simple
 	multi need_atlas
 	return
 	
@@ -4382,9 +4365,9 @@ script_id TMCx
 	p_need 1 atlas
 	stop
 	
-	:wait_for_Atlas
+	:wait_for_atlas
 	wait 12
-	notowns atlas wait_for_Atlas
+	notowns atlas wait_for_atlas
 	return
 	
 	:need_fountainhead
@@ -4398,14 +4381,14 @@ script_id TMCx
 	p_need 1 fountainhead
 	stop
 	
-	:wait_for_Fountainhead
+	:wait_for_fountainhead
 	wait 12
-	notowns fountainhead wait_for_Fountainhead
+	notowns fountainhead wait_for_fountainhead
 	return
 	
-	:wDaedala
+	:add_daedala_simple
 	wait 12
-	notowns daedala wDaedala
+	notowns daedala add_daedala_simple
 	multi need_daedala
 	return
 	
@@ -4420,14 +4403,14 @@ script_id TMCx
 	p_need 1 daedala
 	stop
 	
-	:wait_for_Daedala
+	:wait_for_daedala
 	wait 12
-	notowns daedala wait_for_Daedala
+	notowns daedala wait_for_daedala
 	return
 	
-	:wAtelier
+	:add_atelier_simple
 	wait 12
-	notowns atelier wAtelier
+	notowns atelier add_atelier_simple
 	multi need_atelier
 	return
 	
@@ -4442,9 +4425,9 @@ script_id TMCx
 	p_need 1 atelier
 	stop
 	
-	:wait_for_Atelier
+	:wait_for_atelier
 	wait 12
-	notowns atelier wait_for_Atelier
+	notowns atelier wait_for_atelier
 	return
 	
 	:request_bunker
@@ -5061,18 +5044,18 @@ script_id TMCx
 	var Ex|Wait can_attack_var 1 13
 	var Ex|Jump pref_armor 1 attack_handling_slow 13
 	var Ex|Jump pref_raider 1 attack_handling_fast 13
-	rand_j 128 attack_handling_fast
+	rand_j 160 attack_handling_fast
 	
 	:attack_handling_slow
-	wait 180
+	wait 240
 	call attack_generic
 	wait 360
 	goto tLoopA
 	
 	:attack_handling_fast
-	wait 240
+	wait 180
 	call attack_generic
-	wait 360
+	wait 240
 	
 	:tLoopA
 	var AtL|Jump mining_count_var 6 tLoopC 13
@@ -5107,11 +5090,14 @@ script_id TMCx
 	:attack_generic_check
 	var add attack_cycle_var 1 13
 	wait 300
-	call add_attack_wave
 	var AtL|jump attack_cycle_var 2 attack_cycle_prep 13
-	bring 13 AtM 9 maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|silvertongue|sevenstep|silvertongue|emperor|jester|vulture|cyclops|goliath|blackjack|matador|phalanx|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|wraith|gorgon|wyvern|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos Loc.63 attack_generic_check
+	bring 13 AtM 9 maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|silvertongue|sevenstep|silvertongue|emperor|jester|vulture|cyclops|goliath|blackjack|matador|phalanx|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|wraith|gorgon|wyvern|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos Loc.63 attack_generic_add
 	goto attack_cycle_prep
 	
+	:attack_generic_add
+	call add_attack_wave
+	goto attack_generic_check
+	
 	:attack_cycle_prep
 	bring 13 AtL 60 maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|silvertongue|sevenstep|silvertongue|emperor|jester|vulture|cyclops|goliath|blackjack|matador|phalanx|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|wraith|gorgon|wyvern|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos Loc.63 attack_with_everything
 	bring 13 AtL 45 maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|silvertongue|sevenstep|silvertongue|emperor|jester|vulture|cyclops|goliath|blackjack|matador|phalanx|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|wraith|gorgon|wyvern|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos Loc.63 attack_expansion

CMBW-editor/ai/cm_zerg.asc3

@@ -1944,7 +1944,7 @@ script_id ZMCx
 	call main_wait_750
 	call request_larvosk
 	call main_wait_600
-	multi production_cycle
+	resarea 255 AtL 255 Ore 1 production_cycle
 	var Ex|Wait build_done_var 1 13
 	call main_wait_300
 	multi build_order_expansion

master changelog.md

@@ -5,6 +5,7 @@ Since December 2022, this changelog shows only past changes.
 See patchnotes.md for info on the most recent patch!
 
 # Table of Contents
+- [19 March 2023](19-march-2023)
 - [11 March 2023](#11-march-2023)
 - [4 March 2023](#4-march-2023)
 - [25 February 2023](#25-feburary-2023)
@@ -62,6 +63,80 @@ See patchnotes.md for info on the most recent patch!
 - [13 August 2020](#13-august-2020)
 - [12 August 2020](#12-august-2020)
 
+# 19 March 2023
+
+## Designer's Notes
+Reminder: Get CMBW's updater [here](https://mega.nz/folder/r5QXXL6I#eXy7ptVhsa_wJd-AHuPyEg)! Setup instructions are [here](https://www.fraudsclub.com/cosmonarchy-bw/sites/game-setup/)!
+
+Note that the editor mpq has recently had its name changed. Adjust your SCMDraft profiles accordingly.
+
+Aside from that: We are targeting improvements to early-game pacing, as well as bringing the strength of later-tier options in line with their costs.
+
+## AI
+- The maxiumum number of production structures AI can build per base has been reduced
+- AI should no longer stack Cagrant Colonies as often, improving base layouts
+
+## UI
+- You can now set player slots to Computers in UMS multiplayer lobbies (c. DarkenedFantasies)
+- You can now switch to forces with Computer players in them (c. DarkenedFantasies)
+
+## Bugfixes
+- Crashes related to null sprites have been safeguarded against (c. Veeq7)
+- Fixed a missing memset that may have contributed to some portion of insta-drops in multiplayer (c. Veeq7)
+- Fixed Sundog not being able to attack
+- Queueing structure mutation orders without sufficient resources no longer queues the order (c. Veeq7)
+- Multi-target weapon ranges are now more consistent with single-target weapon ranges (c. Veeq7)
+- Zethrokor and Vorvrokor movement is now consistent per frame
+- Dying refineries now always clear unit statuses correctly (c. Veeq7)
+- Badlands: A rogue low-ground ramp tile for Basilica has been corrected
+- Hierophant reclamation animation no longer throws useful iscript errors
+- Custom trigger objectives no longer show for all human players (c. Veeq7)
+
+## Audiovisuals
+- New sprites:
+	- Vagrant
+- Improved sprites:
+	- Legionnaire (animations)
+- New wireframes: (c. jun3hong)
+	- Skortrith Colony, Spirtith Colony
+
+## Terran
+- [Harakan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan):
+	- Armor now 3, from 2
+	- Now moves ~9% faster
+- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian):
+	- Mineral and time costs now 75/22, from 100/20
+- [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath):
+	- HP now 180, from 160
+- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
+	- Armor now 3, from 2
+- [Centaur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/centaur)
+	- Turn rate now 16, from 12
+
+## Protoss
+- [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot):
+	- Now moves ~12% faster
+- [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire):
+	- HP now 60, from 50
+- [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth):
+	- Now moves ~8% faster
+- [Vagrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/vagrant):
+	- Collision size now larger to match new sprite
+	- Weapon damage now 10, from 6
+	- Weapon cooldown now 0.83, from 0.63
+- [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect):
+	- Now moves ~17% faster
+- [Empyrean](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/empyrean):
+	- Turn rate now 16, from 20
+- [Crucible](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/crucible):
+	- Now a power generator
+
+## Zerg
+- [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk):
+	- Gas cost now 250, from 350
+	- HP now 400, from 350
+	- Weapon range now 11, from 8
+
 # 11 March 2023
 
 ## Designer's Notes

mpq/arr/flingy.txt

@@ -467,7 +467,7 @@ Police WAT Trooper
 Spirtith Colony
 Skortrith Colony
 Empress Plasma
-Extended Flingy #261
+Engram
 Extended Flingy #262
 Extended Flingy #263
 Extended Flingy #264

mpq/arr/images.txt

@@ -135,9 +135,9 @@ Arbiter Warp Flash
 Archon Energy
 Archon Being
 Archon Swirl
-Probe
+Scribe
-Probe Shadow
+Scribe Shadow
-Probe Warp Flash
+Scribe Warp Flash
 Scout (deprecated)
 Scout Shadow (deprecated)
 Panoptus Engines
@@ -1712,8 +1712,8 @@ Protoss Unit Rubble (Small)
 Zerg Unit Rubble (Medium)
 Zerg Unit Rubble (Small)
 Zerg Unit Rubble (Tiny)
-Extended Image #712
+Engram
-Extended Image #713
+Engram Shadow
 Extended Image #714
 Extended Image #715
 Extended Image #716

mpq/arr/sprites.txt

@@ -849,7 +849,7 @@ Protoss Unit Rubble (Small)
 Zerg Unit Rubble (Medium)
 Zerg Unit Rubble (Small)
 Zerg Unit Rubble (Tiny)
-Extended Sprite #1
+Engram
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -292,7 +292,7 @@ Terran Pythean
 Zerg Ogroszaleth
 Zerg Spirtith Colony
 Zerg Skortrith Colony
-Terran Horseman
+Protoss Engram
 Terran Iron Council
 Terran Amphitheater
 Terran Thespian

mpq/arr/weapons.txt

@@ -78,7 +78,7 @@ Plasma Torpedo (Exemplar)
 Phase Disruptor Cannon (Didact)
 Neutron Cannon (Magister)
 Pulse Cannon (Steward)
-Prismatic Cannon (Photon Cannon)
+Prismatic Cannon (Warden)
 Swarming Spores (Rililisk)
 Plasma Shell (Accantor) (deprecated)
 Stasis Field (Didact ability)
@@ -195,7 +195,7 @@ Recycled Blaster (Servitor)
 Antimatter Missile (Positron)
 Sparring Saber (Sycophant)
 Kissing Emoji (Smoochie Boy)
-Extended Weapon #68
+Khaydarin Plasma Laser (Engram)
 Extended Weapon #69
 Extended Weapon #70
 Extended Weapon #71

mpq/scripts/iscript.txt

@@ -820,8 +820,8 @@ DrolethUnused1:
 
 DrolethGndAttkInit:
 	setvertpos        	0 
-	playsnd           	64	# Bullet\SpoogHit.wav
+	playsnd           	64 # Bullet\SpoogHit.wav
-	sproluselo        	332 0	# Needle Spines (thingy\spooge.grp)
+	sproluselo        	332 0 # Needle Spines (thingy\spooge.grp)
 	wait              	1 
 	attackwith        	1 
 	gotorepeatattk
@@ -830,16 +830,31 @@ DrolethGndAttkInit:
 DrolethWalking:
 	setvertpos        	0 
 DrolethLocal00:
-	playfram          	0x00
-	wait				2
 	playfram          	0x11
-	wait				2
+	move				4
+	wait				1
+	move				4
+	wait				1
 	playfram          	0x22
-	wait				2
+	move				4
+	wait				1
+	move				4
+	wait				1
 	playfram          	0x33
-	wait				2
+	move				4
+	wait				1
+	move				4
+	wait				1
 	playfram          	0x44
-	wait				2
+	move				4
+	wait				1
+	move				4
+	wait				1
+	playfram          	0x00
+	move				4
+	wait				1
+	move				4
+	wait				1
 	goto              	DrolethLocal00
 
 DrolethSpecialState2:
@@ -6734,7 +6749,12 @@ MasonWalking:
 	playfram          	0x00
 	imgol             	249 0 0	# Mason Glow (thingy\tscGlow.grp)
 	setvertpos        	0
-	goto              	InfestedTerranLocal00 
+	goto              	MasonWalkingLoop
+
+MasonWalkingLoop:
+	move				4
+	wait				1
+	goto				MasonWalkingLoop
 
 MasonAlmostBuilt:
 	setvertpos        	0
@@ -11309,7 +11329,7 @@ ScribeGndAttkInit:
 
 ScribeWalking:
 	setvertpos        	0
-	goto              	InfestedTerranLocal00
+	goto              	MasonWalkingLoop
 
 ScribeAlmostBuilt:
 	useweapon         	63 # Particle Beam (Harvest) (Particle Beam)

patchnotes.md

@@ -1,73 +1,76 @@
-# 19 March 2023
+# 29 March 2023
 
 ## Designer's Notes
-Reminder: Get CMBW's updater [here](https://mega.nz/folder/r5QXXL6I#eXy7ptVhsa_wJd-AHuPyEg)! Setup instructions are [here](https://www.fraudsclub.com/cosmonarchy-bw/sites/game-setup/)!
+March Madness is in full swing! We need YOUR help to test it. Please report crashes, desyncs, and other issues if they appear!
 
-Note that the editor mpq has recently had its name changed. Adjust your SCMDraft profiles accordingly.
+Core gameplay changes **saturate** this update, with economic changes, worker durability increases, and some passive and active ability modifications. Check 'em out!
 
-Aside from that: We are targeting improvements to early-game pacing, as well as bringing the strength of later-tier options in line with their costs.
+## Limits (c. DarkenedFantasies and Veeq7)
+- Unit limit now 4095, from 1700
+- Sprite limit now 8875, from 2500
+- Order limit now 4080, from 2000
+- Image limit now 16385, from 5000
+- Thingy limit now 2048, from 500
+- Fog of war sprite limit now 2048, from 500
+
+## Resources
+- Harvest time now 4.8 seconds, from 3.125 seconds
+- Workers no longer accelerate or decelerate
+	- These changes are meant to reinstate diminishing returns on adding additional workers per patch, adding more value to the initial worker on any given node when compared to the second worker
+	- This also makes expansions more valuable, reduces the negative impact of distant resource nodes, slows down the early economic pacing, and makes workers more responsive - its impact is significant and will need to be evaluated!
+- 4-yield mineral nodes no longer provide collision
 
 ## AI
-- The maxiumum number of production structures AI can build per base has been reduced
+- Gas-only expansions will no longer request production
-- AI should no longer stack Cagrant Colonies as often, improving base layouts
-
-## UI
-- You can now set player slots to Computers in UMS multiplayer lobbies (c. DarkenedFantasies)
-- You can now switch to forces with Computer players in them (c. DarkenedFantasies)
 
 ## Bugfixes
-- Crashes related to null sprites have been safeguarded against (c. Veeq7)
+- Phantom-selections of structures and Vultures no longer crash (c. DarkenedFantasies)
-- Fixed a missing memset that may have contributed to some portion of insta-drops in multiplayer (c. Veeq7)
+- Irradiated units which transform into another unit no longer spawn a new Irradiate field (c. Veeq7)
-- Fixed Sundog not being able to attack
+- Watchdogs and Sentinels no longer fail to change target on right-click (c. DarkenedFantasies)
-- Queueing structure mutation orders without sufficient resources no longer queues the order (c. Veeq7)
+- Tyranny, Worship, and Anodyne Annex now recursively apply to all of a transport's cargo (c. Veeq7)
-- Multi-target weapon ranges are now more consistent with single-target weapon ranges (c. Veeq7)
+- Misc abilities and channels now correctly proc decloak (c. Veeq7)
-- Zethrokor and Vorvrokor movement is now consistent per frame
+- Vagrant icon has been corrected
-- Dying refineries now always clear unit statuses correctly (c. Veeq7)
-- Badlands: A rogue low-ground ramp tile for Basilica has been corrected
-- Hierophant reclamation animation no longer throws useful iscript errors
-- Custom trigger objectives no longer show for all human players (c. Veeq7)
 
 ## Audiovisuals
-- New sprites:
+- New sprite:
-	- Vagrant
+	- Scribe (c. Solstice)
-- Improved sprites:
+
-	- Legionnaire (animations)
+## UI
-- New wireframes: (c. jun3hong)
+- **Protoss structure command cards have been reshuffled... again!**
-	- Skortrith Colony, Spirtith Colony
+- Transport and replay/witness mode UI has been updated (c. Veeq7)
+- Player APM is now logged in replay and witness mode (c. Veeq7)
+- Longer player names in the unit stats panel are now supported (c. Veeq7)
+- Maps with "ping all start locations" set now ping all possible player spawns instead of only the spawns that are occupied (c. Veeq7)
+- Witnesses now have their start locations centered around the first human player, or first AI player if no humans are present (c. Veeq7)
+- Open slots in multiplayer lobbies no longer convert to computer players (c. Veeq7)
 
 ## Terran
-- [Harakan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan):
+- [Mason](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/mason):
-	- Armor now 3, from 2
+	- HP now 75, from 60
-	- Now moves ~9% faster
+	- Weapon cooldown now 0.833, from 0.625
-- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian):
+- [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury):
-	- Mineral and time costs now 75/22, from 100/20
+	- Time cost now 45, from 40
-- [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath):
+	- Armor now 3, from 4
-	- HP now 180, from 160
+	- Sight range now 9, from 8
-- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
+	- **Now requires nothing, from Atlas**
-	- Armor now 3, from 2
+- [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon):
-- [Centaur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/centaur)
+	- Weapon cooldown now 10 seconds, from 7
-	- Turn rate now 16, from 12
 
 ## Protoss
-- [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot):
+- [Scribe](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/scribe):
-	- Now moves ~12% faster
+	- HP now 45, from 30
-- [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire):
+	- Weapon cooldown now 1.083, from 0.916
-	- HP now 60, from 50
 - [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth):
-	- Now moves ~8% faster
+	- Eternal Service now always heals shields for 100% of damage dealt, instead of scaling
-- [Vagrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/vagrant):
+- [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact):
-	- Collision size now larger to match new sprite
+	- Recall:
-	- Weapon damage now 10, from 6
+		- Channel time now 2.25 seconds, from 5
-	- Weapon cooldown now 0.83, from 0.63
+		- Now establishes a warp rift at the target location, draining 5 energy per second while active
-- [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect):
+		- Cannot receive orders (other than cancel channel) while warp rift is open
-	- Now moves ~17% faster
-- [Empyrean](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/empyrean):
-	- Turn rate now 16, from 20
-- [Crucible](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/crucible):
-	- Now a power generator
 
 ## Zerg
-- [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk):
+- [Droleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/droleth):
-	- Gas cost now 250, from 350
+	- HP now 60, from 45
-	- HP now 400, from 350
+	- Weapon cooldown now 1.083, from 0.916
-	- Weapon range now 11, from 8
+- [Ultrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ultrokor):
+	- Saber Siphon now heals HP for 100% of damage dealt, from 50%