23 March 2024 - Acropolis #1, Gauntlet A

CMBW-editor/ai/cm_protoss.asc3

@@ -305,7 +305,7 @@ script_id PMCx
 	:prefUZealot
 	var Set pref_zealot 1 13
 	var Set pref_dracadin 0 13
-	var Set pref_ecclesiast 1 13
+	var Set pref_ecclesiast 0 13
 	var Set pref_gateway_units 1 13
 	var Ex|Jump debug_ai_messages_var 0 blank_return 13
 	print pref_zealot
@@ -313,8 +313,8 @@ script_id PMCx
 	
 	:prefUDracadin
 	var Set pref_zealot 0 13
-	var Set pref_dracadin 0 13
+	var Set pref_dracadin 1 13
-	var Set pref_ecclesiast 1 13
+	var Set pref_ecclesiast 0 13
 	var Set pref_gateway_units 1 13
 	var Ex|Jump debug_ai_messages_var 0 blank_return 13
 	print pref_dracadin
@@ -557,7 +557,6 @@ script_id PMCx
 	:prefUAccantor
 	var Set pref_accantor 1 13
 	var Set pref_architect 0 13
-	var Set pref_demiurge 0 13
 	var Set pref_ardentauthority_secondary_units 1 13
 	var Ex|Jump debug_ai_messages_var 0 blank_return 13
 	print pref_accantor
@@ -1830,7 +1829,7 @@ script_id PMCx
 	wait 24
 	multi build_order
 	call main_wait_1500
-	bld 1 pylon 100
+	bld 1 pylon 103
 	w_bld 1 pylon
 	var Ex|Jump skip_building_var 1 idle 13
 	wait 300
@@ -2021,6 +2020,7 @@ script_id PMCx
 	return
 	
 	:expansion_request_reset
+	var Ex|Jump build_done_var 0 blank_return 13
 	var Set can_queue_early_military_var 1 13
 	var Set can_attack_var 1 13
 	var Set can_build_static_defense_var 1 13
@@ -2077,7 +2077,7 @@ script_id PMCx
 	var Set try_expand_var 0 13
 	w_bld 1 nexus
 	multi count_expansion
-	bld 1 pylon 98
+	bld 1 pylon 103
 	var Ex|Jump skip_building_var 1 idle 13
 	placeholder_count Local AtL|Jump 2 Group_Buildings idle 13
 	
@@ -2086,15 +2086,15 @@ script_id PMCx
 	w_bld 1 pylon
 	multi request_static_defense
 	call main_wait_1200
-	resarea 255 AtL 255 Ore 1 production_cycle
+	resarea 255 AtL_M 255 Ore 1 production_cycle
 	call main_wait_1800
 	var Ex|Wait build_done_var 1 13
 	call main_wait_1200
-	multi request_embassy
-	call main_wait_600
-	multi request_crucible
-	call main_wait_600
 	multi build_order_expansion
+	call main_wait_2400
+	multi request_crucible
+	call main_wait_2400
+	multi request_embassy
 	goto idle
 	
 	:count_expansion
@@ -2361,7 +2361,7 @@ script_id PMCx
 	dth 13 Ex 1 dark_swarm_unit build_general_LunaticLegion
 	dth 13 Ex 2 dark_swarm_unit build_general_StridentStriders
 	dth 13 Ex 3 dark_swarm_unit build_general_Worship
-	dth 13 Ex 4 dark_swarm_unit build_general_RoboFE
+	dth 13 Ex 4 dark_swarm_unit build_general_RoboticsFE
 	dth 13 Ex 5 dark_swarm_unit build_general_TheSwordsmiths
 	dth 13 Ex 6 dark_swarm_unit build_general_Matriarchy
 	
@@ -2379,7 +2379,7 @@ script_id PMCx
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_stargate 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -2427,7 +2427,7 @@ script_id PMCx
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_grandlibrary 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -2461,7 +2461,7 @@ script_id PMCx
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_lattice 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -2490,11 +2490,11 @@ script_id PMCx
 	call main_wait_300
 	goto build_general_fin
 	
-	:build_general_RoboFE
+	:build_general_RoboticsFE
-	var Ex|Jump debug_ai_messages_var 0 build_general_RoboFE_Main 13
+	var Ex|Jump debug_ai_messages_var 0 build_general_RoboticsFE_Main 13
 	print Protoss<32>General<32>greed<32>1:<32>Robo<32>FE
 	
-	:build_general_RoboFE_Main
+	:build_general_RoboticsFE_Main
 	var Ex|Call pref_gateway_units 0 buildpref_gateway_zealot 13
 	var Ex|Call pref_gateway_secondary_units 0 buildpref_gateway_secondary_hierophant 13
 	var Ex|Call pref_lattice_units 0 buildpref_lattice_vassal 13
@@ -2503,7 +2503,7 @@ script_id PMCx
 	call main_wait_750
 	var Add can_expand_var 1 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 lattice 98
@@ -2537,27 +2537,29 @@ script_id PMCx
 	var Ex|Call buildpref_stargate_secondary_units 0 buildpref_stargate_secondary_gladius 13
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
-	call main_wait_600
+	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	w_bld 1 pylon
 	bld 1 gateway 99
 	call main_wait_300
 	bld 1 lattice 99
+	w_bld 1 gateway
+	w_bld 1 lattice
+	multi build_general_TheSwordsmiths_Queue
 	call main_wait_600
+	var Set can_attack_var 1 13
+	call main_wait_900
 	multi expansion_toggle
 	call main_wait_300
 	bld 2 pylon 99
-	call main_wait_600
+	call main_wait_900
-	var Set can_attack_var 1 13
-	call main_wait_600
 	var Set build_gas_var 1 13
-	call main_wait_150
 	bld 1 ardent_authority 101
-	call main_wait_300
+	call main_wait_1200
 	bld 1 stargate 100
-	call main_wait_600
-	var Set can_build_static_defense_var 1 13
 	call main_wait_300
+	var Set can_build_static_defense_var 1 13
+	call main_wait_600
 	bld 2 stargate 100
 	call main_wait_900
 	bld 2 ardent_authority 101
@@ -2566,6 +2568,30 @@ script_id PMCx
 	call main_wait_300
 	goto build_general_fin
 	
+	:build_general_TheSwordsmiths_Queue
+	multi build_general_TheSwordsmiths_Queue2
+	w_bld 1 gateway
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 ecclesiast gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 ecclesiast gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 dracadin gateway 255 Local Loc.63 125
+	
+	:build_general_TheSwordsmiths_Queue2
+	w_bld 1 lattice
+	queue 1 vassal lattice 255 Local Loc.63 125
+	wait 336
+	queue 1 vassal lattice 255 Local Loc.63 125
+	wait 336
+	queue 1 golem lattice 255 Local Loc.63 125
+	wait 672
+	queue 1 golem lattice 255 Local Loc.63 125
+	stop
+	
 	:build_general_Matriarchy
 	var Ex|Jump debug_ai_messages_var 0 build_general_Matriarchy_Main 13
 	print Protoss<32>General<32>timing<32>3:<32>Matriarchy
@@ -2582,7 +2608,7 @@ script_id PMCx
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_syntheticsynod 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_argosy 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	w_bld 1 pylon
 	bld 1 gateway 99
 	call main_wait_300
@@ -2678,7 +2704,7 @@ script_id PMCx
 	:build_order_ranger_select
 	dth 13 Ex 1 dark_swarm_unit build_ranger_2GateStrider
 	dth 13 Ex 2 dark_swarm_unit build_ranger_EmissarySquared
-	dth 13 Ex 3 dark_swarm_unit build_ranger_1GateRobo
+	dth 13 Ex 3 dark_swarm_unit build_ranger_1GateAuthority
 	dth 13 Ex 4 dark_swarm_unit build_ranger_LatticeExpo
 	dth 13 Ex 5 dark_swarm_unit build_ranger_SimulantSwarm
 	dth 13 Ex 6 dark_swarm_unit build_ranger_TheRegistry
@@ -2696,7 +2722,7 @@ script_id PMCx
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_argosy 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -2741,7 +2767,7 @@ script_id PMCx
 	call main_wait_900
 	multi expansion_toggle
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	w_bld 1 pylon
 	bld 1 gateway 98
 	call main_wait_300
@@ -2771,11 +2797,11 @@ script_id PMCx
 	multi production_cycle
 	goto build_ranger_fin
 	
-	:build_ranger_1GateRobo
+	:build_ranger_1GateAuthority
-	var Ex|Jump debug_ai_messages_var 0 build_ranger_1GateRobo_Main 13
+	var Ex|Jump debug_ai_messages_var 0 build_ranger_1GateAuthority_Main 13
 	print Protoss<32>Ranger<32>rush<32>1:<32>1Gate<32>Robo
 	
-	:build_ranger_1GateRobo_Main
+	:build_ranger_1GateAuthority_Main
 	var Ex|Call pref_gateway_secondary_units 0 buildpref_gateway_ecclesiast 13
 	var Ex|Call pref_lattice_units 0 buildpref_lattice_manifold 13
 	var Ex|Call pref_lattice_secondary_units 0 buildpref_lattice_secondary_idol 13
@@ -2783,7 +2809,7 @@ script_id PMCx
 	var Ex|Call pref_roguegallery_units 0 buildpref_roguegallery_barghest 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -2840,7 +2866,7 @@ script_id PMCx
 	var Ex|Call pref_roguegallery_units 0 buildpref_roguegallery_barghest 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_lattice 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	call main_wait_600
 	bld 2 pylon 99
@@ -2882,7 +2908,7 @@ script_id PMCx
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
 	call main_wait_600
-	bld 1 pylon 97
+	bld 1 pylon 103
 	call main_wait_900
 	w_bld 1 pylon
 	bld 1 lattice 98
@@ -2928,7 +2954,7 @@ script_id PMCx
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_roguegallery 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	w_bld 1 pylon
 	bld 1 lattice 98
@@ -3040,7 +3066,7 @@ script_id PMCx
 	var Ex|Call pref_ardentauthority_secondary_units 0 buildpref_ardentauthority_secondary_accantor 13
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -3087,7 +3113,7 @@ script_id PMCx
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_ardentauthority 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -3126,7 +3152,7 @@ script_id PMCx
 	var Ex|Call pref_grandlibrary_assault 0 build_pref_ancestralarchives_archon 13
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -3178,16 +3204,16 @@ script_id PMCx
 	var Ex|Call pref_grandlibrary_assault 0 build_pref_ancestralarchives_archon 13
 	var Ex|Call pref_ardentauthority_secondary_units 0 buildpref_ardentauthority_secondary_accantor 13
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_gateway 13
-	call main_wait_600
+	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
-	call main_wait_600
 	w_bld 1 pylon
 	bld 1 gateway 98
+	multi build_templar_Initiates_Queue
 	call main_wait_600
-	bld 2 pylon 99
-	call main_wait_300
 	bld 2 gateway 98
 	call main_wait_300
+	bld 2 pylon 99
+	w_bld 2 gateway
 	var Sub can_worker_var 1 13
 	do_morph 2 zealot
 	call main_wait_150
@@ -3195,17 +3221,33 @@ script_id PMCx
 	call main_wait_150
 	bld 3 gateway 98
 	call main_wait_600
-	var Add can_worker_var 1 13
-	call main_wait_900
 	var set can_attack_var 1 13
-	call main_wait_300
+	call main_wait_450
+	var Add can_worker_var 1 13
+	call main_wait_450
+	var Add can_expand_var 1 13
+	call main_wait_450
 	bld 4 gateway 98
 	call main_wait_600
-	var Add can_expand_var 1 13
-	call main_wait_300
 	multi production_cycle
 	goto build_templar_fin
 	
+	:build_templar_Initiates_Queue
+	w_bld 1 gateway
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 zealot gateway 255 Local Loc.63 125
+	w_bld 2 gateway
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	stop
+	
 	:build_templar_Martyrdom
 	var Ex|Jump debug_ai_messages_var 0 build_templar_Martyrdom_Main 13
 	print Protoss<32>Templar<32>greed<32>1:<32>Martyrdom
@@ -3220,7 +3262,7 @@ script_id PMCx
 	call main_wait_600
 	multi expansion_toggle
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
@@ -3263,7 +3305,7 @@ script_id PMCx
 	var Ex|Call pref_ancestralarchives_units 0 build_pref_ancestralarchives_patriarch 13
 	var Ex|Call pref_templar_production 0 buildpref_templar_production_grandlibrary 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	w_bld 1 pylon
 	bld 1 gateway 98
 	call main_wait_600
@@ -3389,7 +3431,7 @@ script_id PMCx
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_lattice 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_argosy 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_300
 	var Sub can_worker_var 1 13
 	multi expansion_toggle
@@ -3443,7 +3485,7 @@ script_id PMCx
 	call main_wait_150
 	var Set build_gas_var 1 13
 	call main_wait_450
-	bld 1 pylon 99
+	bld 1 pylon 103
 	w_bld 1 pylon
 	bld 1 gateway 98
 	call main_wait_150
@@ -3483,7 +3525,7 @@ script_id PMCx
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_lattice 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_stargate 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	call main_wait_600
 	w_bld 1 pylon
@@ -3518,78 +3560,66 @@ script_id PMCx
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_lattice 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_stargate 13
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
-	call main_wait_300
 	w_bld 1 pylon
 	bld 1 gateway 98
-	wait 24
 	call main_wait_600
-	wait 24
 	bld 1 stargate 98
-	wait 24
+	multi build_skylord_Exalted_Queue
-	queue 1 zealot gateway 255 Local Loc.63 100
+    bld 1 warden 96
-	wait 24
-    bld 1 warden 94
 	call main_wait_300
 	bld 2 gateway 98
 	call main_wait_600
-	bld 2 stargate 98
+	bld 2 warden 96
-	call main_wait_150
+	call main_wait_900
-	bld 2 warden 94
+	var Add can_attack_var 1 13
-	call main_wait_300
+	call main_wait_600
-	bld 3 stargate 98
-	call main_wait_300
-	queue 2 dracadin gateway 255 Local Loc.63 100
-	wait 24
-	bld 4 warden 94
-	call main_wait_300
-	bld 1 argosy 101
-	wait 24
-	queue 1 panoptus stargate 255 Local Loc.63 100
-	call main_wait_150
 	var Sub can_worker_var 1 13
 	multi expansion_toggle
 	call main_wait_600
 	var Add can_worker_var 1 13
-	wait 24
+	call main_wait_900
+	bld 3 gateway 98
+	call main_wait_1500
+	bld 3 stargate 98
+	call main_wait_900
+	bld 1 argosy 101
 	w_bldstart 1 argosy
 	call main_wait_450
 	var Set can_build_static_defense_var 1 13
-	call main_wait_150
-	bld 2 argosy 99
-	call main_wait_150
-	bld 3 gateway 98
-	call main_wait_150
-	bld 6 warden 94
-	call main_wait_300
-	multi production_cycle
-	call main_wait_150
-	queue 1 didact argosy 255 Local Loc.63 100
-	call main_wait_150
-	bld 7 warden 94
-	call main_wait_150
-	bld 4 stargate 98
-	call main_wait_150
-	bld 8 warden 94
-	call main_wait_300
-	bld 9 warden 94
-	call main_wait_300
-	bld 1 monument_of_sin 101
-	wait 24
-	bld 10 warden 94
-	call main_wait_300
-	bld 5 stargate 98
 	call main_wait_900
-	queue 1 star_sovereign monument_of_sin 255 Local Loc.63 100
+	bld 2 argosy 101
-	wait 24
+	call main_wait_1500
-	bld 3 argosy 99
+	bld 1 monument_of_sin 101
-	call main_wait_600
+	call main_wait_1200
-	bld 4 argosy 100
+	multi production_cycle
-	call main_wait_150
-	bld 11 warden 94
-	wait 24
 	goto build_skylord_fin
 	
+	:build_skylord_Exalted_Queue
+	w_bld 1 gateway
+	queue 1 zealot gateway 255 Local Loc.63 125
+	wait 600
+	queue 1 dracadin gateway 255 Local Loc.63 125
+	wait 720
+	queue 1 dracadin gateway 255 Local Loc.63 125
+	wait 720
+	w_bld 1 stargate
+	multi build_skylord_Exalted_Queue2
+	stop
+	
+	:build_skylord_Exalted_Queue2
+	w_bld 1 stargate
+	queue 1 panoptus stargate 255 Local Loc.63 125
+	wait 840
+	queue 1 panoptus stargate 255 Local Loc.63 125
+	wait 840
+	queue 1 panoptus stargate 255 Local Loc.63 125
+	w_bld 1 argosy
+	queue 1 didact argosy 255 Local Loc.63 125
+	w_bld 1 monument_of_sin
+	queue 1 star_sovereign monument_of_sin 255 Local Loc.63 100
+	stop
+	
 	:build_skylord_SorrowFleet
 	var Ex|Jump debug_ai_messages_var 0 build_skylord_SorrowFleet_Main 13
 	print Protoss<32>Skylord<32>greed<32>2:<32>Sorrow<32>Fleet
@@ -3603,7 +3633,7 @@ script_id PMCx
 	var Ex|Call pref_ranger_production 0 buildpref_ranger_production_lattice 13
 	var Ex|Call pref_skylord_production 0 buildpref_skylord_production_stargate 13
 	call main_wait_600
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	bld 2 pylon 99
 	call main_wait_300
@@ -3644,7 +3674,7 @@ script_id PMCx
 	call main_wait_750
 	multi expansion_toggle
 	call main_wait_300
-	bld 1 pylon 99
+	bld 1 pylon 103
 	call main_wait_600
 	bld 1 gateway 98
 	call main_wait_300
@@ -3718,7 +3748,9 @@ script_id PMCx
 	goto build_order_gen
 	
 	:build_order_expansion
-	bring 13 AtL_W 1 gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|synthetic_synod|stargate|argosy|monument_of_sin Loc.63 blank
+	wait 24
+	notowns nexus build_order_expansion
+	notowns pylon build_order_expansion
 	var Ex|Jump pref_ranger 1 build_ranger_fin2 13
 	var Ex|Jump pref_templar 1 build_templar_fin2 13
 	var Ex|Jump pref_skylord 1 build_skylord_fin2 13
@@ -3828,15 +3860,66 @@ script_id PMCx
 	
 	:request_pylon
 	local 255 AtL 3 pylon request_pylon_loop
-	add_bld 255 pylon 1 30 99
+	add_bld 255 pylon 1 30 103
-	wait 600
+	wait 1200
 	goto request_pylon
 	
 	:request_pylon_loop
-	unit_check 13 13 63 Greater|Wait 0 3 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|auxiliary_oasis|synthetic_synod|stargate|argosy|monument_of_sin pylon
+	w_bld 3 pylon
-	add_bld 255 pylon 1 30 99
+	local 255 AtM 3 pylon request_pylon_check_4
-	wait 720
+	w_bld 4 pylon
-	goto request_pylon
+	local 255 AtM 4 pylon request_pylon_check_5
+	w_bld 5 pylon
+	local 255 AtM 5 pylon request_pylon_check_6
+	w_bld 6 pylon
+	local 255 AtM 6 pylon request_pylon_check_7
+	w_bld 7 pylon
+	local 255 AtM 7 pylon request_pylon_check_8
+	w_bld 8 pylon
+	local 255 AtM 8 pylon request_pylon_check_9
+	w_bld 9 pylon
+	local 255 AtM 9 pylon request_pylon_check_10
+	stop
+	
+	:request_pylon_check_10
+	local 255 AtL 14 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_check_9
+	local 255 AtL 12 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_check_8
+	local 255 AtL 10 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_check_7
+	local 255 AtL 8 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_check_6
+	local 255 AtL 6 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_check_5
+	local 255 AtL 4 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_check_4
+	local 255 AtL 2 embassy|crucible|gateway|grand_library|rogue_gallery|prostration_stage|ancestral_archives|lattice|ardent_authority|unitary_union|synthetic_synod|stargate|argosy|monument_of_sin request_pylon_final
+	wait 1200
+	goto request_pylon_loop
+	
+	:request_pylon_final
+	add_bld 255 pylon 1 30 103
+	wait 1200
+	goto request_pylon_loop
 	
 	:request_static_defense
 	var Ex|Wait can_build_static_defense_var 1 13
@@ -4466,6 +4549,7 @@ script_id PMCx
 	:attack_wave_clarion2
 	notowns synthetic_synod blank_return
 	atk_rel clarion synthetic_synod 1
+	wait 80
 	return
 	
 	:attack_wave_simulacrum
@@ -4477,6 +4561,7 @@ script_id PMCx
 	:attack_wave_simulacrum2
 	notowns lattice blank_return
 	atk_rel simulacrum lattice 3
+	wait 80
 	return
 	
 	:attack_wave_manifold
@@ -4487,6 +4572,7 @@ script_id PMCx
 	:attack_wave_manifold2
 	notowns lattice blank_return
 	atk_rel manifold lattice 2
+	wait 80
 	return
 	
 	:attack_wave_vassal
@@ -4498,6 +4584,7 @@ script_id PMCx
 	notowns lattice blank_return
 	queue_rel vassal lattice 1 lattice 255 Global 63 100
 	atk_rel vassal lattice 3
+	wait 80
 	return
 	
 	:attack_wave_idol
@@ -4508,6 +4595,7 @@ script_id PMCx
 	:attack_wave_idol2
 	notowns lattice blank_return
 	atk_rel idol lattice 1.5
+	wait 80
 	return
 	
 	:attack_wave_golem
@@ -4518,6 +4606,7 @@ script_id PMCx
 	:attack_wave_golem2
 	notowns lattice blank_return
 	atk_rel golem lattice 1
+	wait 80
 	return
 	
 	:attack_wave_servitor
@@ -4529,6 +4618,7 @@ script_id PMCx
 	:attack_wave_servitor2
 	notowns ardent_authority blank_return
 	atk_rel servitor ardent_authority 3
+	wait 80
 	return
 	
 	:attack_wave_positron
@@ -4539,6 +4629,7 @@ script_id PMCx
 	:attack_wave_positron2
 	notowns ardent_authority blank_return
 	atk_rel positron ardent_authority 2
+	wait 80
 	return
 	
 	:attack_wave_analogue
@@ -4549,6 +4640,7 @@ script_id PMCx
 	:attack_wave_analogue2
 	notowns ardent_authority blank_return
 	atk_rel analogue ardent_authority 1.2
+	wait 80
 	return
 	
 	:attack_wave_accantor
@@ -4559,6 +4651,7 @@ script_id PMCx
 	:attack_wave_accantor2
 	notowns ardent_authority blank_return
 	atk_rel accantor ardent_authority 1
+	wait 80
 	return
 	
 	:attack_wave_architect
@@ -4569,6 +4662,7 @@ script_id PMCx
 	:attack_wave_architect2
 	notowns ardent_authority blank_return
 	atk_rel architect ardent_authority 1
+	wait 80
 	return
 	
 	:attack_wave_demiurge
@@ -4580,6 +4674,7 @@ script_id PMCx
 	notowns synthetic_synod blank_return
 	atk_add 1 demiurge
 	atk_rel demiurge synthetic_synod 0.5
+	wait 80
 	return
 	
 	:attack_wave_empress
@@ -4590,6 +4685,7 @@ script_id PMCx
 	:attack_wave_empress2
 	notowns synthetic_synod blank_return
 	atk_rel empress synthetic_synod 1.2
+	wait 80
 	return
 	
 	:attack_wave_zealot
@@ -4600,6 +4696,7 @@ script_id PMCx
 	:attack_wave_zealot2
 	notowns gateway blank_return
 	atk_rel zealot gateway 2.5
+	wait 80
 	return
 	
 	:attack_wave_dracadin
@@ -4610,6 +4707,7 @@ script_id PMCx
 	:attack_wave_dracadin2
 	notowns gateway blank_return
 	atk_rel dracadin gateway 2
+	wait 80
 	return
 	
 	:attack_wave_ecclesiast
@@ -4620,6 +4718,7 @@ script_id PMCx
 	:attack_wave_ecclesiast2
 	notowns gateway blank_return
 	atk_rel ecclesiast gateway 1.5
+	wait 80
 	return
 	
 	:attack_wave_legionnaire
@@ -4630,6 +4729,7 @@ script_id PMCx
 	:attack_wave_legionnaire2
 	notowns gateway blank_return
 	atk_rel legionnaire gateway 3
+	wait 80
 	return
 	
 	:attack_wave_hierophant
@@ -4640,6 +4740,7 @@ script_id PMCx
 	:attack_wave_hierophant2
 	notowns gateway blank_return
 	atk_rel hierophant gateway 1
+	wait 80
 	return
 	
 	:attack_wave_amaranth
@@ -4650,6 +4751,7 @@ script_id PMCx
 	:attack_wave_amaranth2
 	notowns grand_library blank_return
 	atk_rel amaranth grand_library 3
+	wait 80
 	return
 	
 	:attack_wave_atreus
@@ -4660,6 +4762,7 @@ script_id PMCx
 	:attack_wave_atreus2
 	notowns grand_library blank_return
 	atk_rel atreus grand_library 2
+	wait 80
 	return
 	
 	:attack_wave_herald
@@ -4670,6 +4773,7 @@ script_id PMCx
 	:attack_wave_herald2
 	notowns grand_library blank_return
 	atk_rel herald grand_library 1.25
+	wait 80
 	return
 	
 	:attack_wave_cantavis
@@ -4680,6 +4784,7 @@ script_id PMCx
 	:attack_wave_cantavis2
 	notowns grand_library blank_return
 	atk_rel cantavis grand_library 1.25
+	wait 80
 	return
 	
 	:attack_wave_vagrant
@@ -4690,6 +4795,7 @@ script_id PMCx
 	:attack_wave_vagrant2
 	notowns rogue_gallery blank_return
 	atk_rel vagrant rogue_gallery 1.2
+	wait 80
 	return
 	
 	:attack_wave_cabalist
@@ -4700,6 +4806,7 @@ script_id PMCx
 	:attack_wave_cabalist2
 	notowns rogue_gallery blank_return
 	atk_rel cabalist rogue_gallery 1.2
+	wait 80
 	return
 	
 	:attack_wave_charlatan
@@ -4710,6 +4817,7 @@ script_id PMCx
 	:attack_wave_charlatan2
 	notowns rogue_gallery blank_return
 	atk_rel charlatan rogue_gallery 1.15
+	wait 80
 	return
 	
 	:attack_wave_barghest
@@ -4720,6 +4828,7 @@ script_id PMCx
 	:attack_wave_barghest2
 	notowns rogue_gallery blank_return
 	atk_rel barghest rogue_gallery 2
+	wait 80
 	return
 	
 	:attack_wave_pariah
@@ -4730,6 +4839,7 @@ script_id PMCx
 	:attack_wave_pariah2
 	notowns prostration_stage blank_return
 	atk_rel pariah prostration_stage 1.5
+	wait 80
 	return
 	
 	:attack_wave_potentate
@@ -4740,6 +4850,7 @@ script_id PMCx
 	:attack_wave_potentate2
 	notowns prostration_stage blank_return
 	atk_rel potentate prostration_stage 2
+	wait 80
 	return
 	
 	:attack_wave_sycophant
@@ -4750,6 +4861,7 @@ script_id PMCx
 	:attack_wave_sycophant2
 	notowns prostration_stage blank_return
 	atk_rel sycophant prostration_stage 3
+	wait 80
 	return
 	
 	:attack_wave_mindtyrant
@@ -4760,6 +4872,7 @@ script_id PMCx
 	notowns prostration_stage blank_return
 	atk_add 1 mind_tyrant
 	atk_rel mind_tyrant prostration_stage 1
+	wait 80
 	return
 	
 	:attack_wave_archon
@@ -4770,6 +4883,7 @@ script_id PMCx
 	:attack_wave_archon2
 	notowns ancestral_archives blank_return
 	atk_rel archon ancestral_archives 1.5
+	wait 80
 	return
 	
 	:attack_wave_optecton
@@ -4780,6 +4894,7 @@ script_id PMCx
 	:attack_wave_optecton2
 	notowns ancestral_archives blank_return
 	atk_rel optecton ancestral_archives 1.5
+	wait 80
 	return
 	
 	:attack_wave_patriarch
@@ -4790,6 +4905,7 @@ script_id PMCx
 	:attack_wave_patriarch2
 	notowns ancestral_archives blank_return
 	atk_rel patriarch ancestral_archives 1.5
+	wait 80
 	return
 	
 	:attack_wave_aurora
@@ -4800,6 +4916,7 @@ script_id PMCx
 	:attack_wave_aurora2
 	notowns stargate blank_return
 	atk_rel aurora stargate 2.25
+	wait 80
 	return
 	
 	:attack_wave_panoptus
@@ -4810,6 +4927,7 @@ script_id PMCx
 	:attack_wave_panoptus2
 	notowns stargate blank_return
 	atk_rel panoptus stargate 1.35
+	wait 80
 	return
 	
 	:attack_wave_lanifect
@@ -4821,6 +4939,7 @@ script_id PMCx
 	notowns stargate blank_return
 	atk_add 1 lanifect
 	atk_rel lanifect stargate 0.75
+	wait 80
 	return
 	
 	:attack_wave_exemplar
@@ -4831,6 +4950,7 @@ script_id PMCx
 	:attack_wave_exemplar2
 	notowns stargate blank_return
 	atk_rel exemplar stargate 1.2
+	wait 80
 	return
 	
 	:attack_wave_gladius
@@ -4841,6 +4961,7 @@ script_id PMCx
 	:attack_wave_gladius2
 	notowns stargate blank_return
 	atk_rel gladius stargate 1.2
+	wait 80
 	return
 	
 	:attack_wave_magister
@@ -4851,6 +4972,7 @@ script_id PMCx
 	:attack_wave_magister2
 	notowns argosy blank_return
 	atk_rel magister argosy 1.5
+	wait 80
 	return
 	
 	:attack_wave_epigraph
@@ -4861,6 +4983,7 @@ script_id PMCx
 	:attack_wave_epigraph2
 	notowns argosy blank_return
 	atk_rel epigraph argosy 1.25
+	wait 80
 	return
 	
 	:attack_wave_didact
@@ -4872,6 +4995,7 @@ script_id PMCx
 	notowns argosy blank_return
 	atk_add 1 didact
 	atk_rel didact argosy 0.5
+	wait 80
 	return
 	
 	:attack_wave_empyrean
@@ -4882,6 +5006,7 @@ script_id PMCx
 	:attack_wave_empyrean2
 	notowns argosy blank_return
 	atk_rel empyrean argosy 1.25
+	wait 80
 	return
 	
 	:attack_wave_solarion
@@ -4892,6 +5017,7 @@ script_id PMCx
 	:attack_wave_solarion2
 	notowns argosy blank_return
 	atk_rel solarion argosy 1
+	wait 80
 	return
 	
 	:attack_wave_starsovereign
@@ -4902,6 +5028,7 @@ script_id PMCx
 	:attack_wave_starsovereign2
 	notowns monument_of_sin blank_return
 	atk_rel star_sovereign monument_of_sin 1
+	wait 80
 	return
 	
 	:attack_wave_anthelion
@@ -4912,6 +5039,7 @@ script_id PMCx
 	notowns monument_of_sin blank_return
 	atk_add 1 anthelion
 	atk_rel anthelion monument_of_sin 0.4
+	wait 80
 	return
 	
 	:early_military
@@ -5141,6 +5269,8 @@ script_id PMCx
 	return
 	
 	:faction_order
+	replace_unit legionnaire adherent
+#	replace_unit aurora extatus
 	return
 	
 	:faction_khalendric

CMBW-editor/grafting/Buttons.txt

@@ -61,18 +61,17 @@
  1, 131, 4, 33, 131, 131, 613, 0 # Hachirosk, Can Create Unit\Building ([131] Hachirosk), Create Building - Zerg ([131] Hachirosk)
  2, 143, 4, 33, 143, 143, 614, 0 # Cagrant Cesiant, Can Create Unit\Building ([143] Cagrant Cesiant), Create Building - Zerg ([143] Cagrant Cesiant)
  4, 142, 4, 33, 142, 142, 616, 0 # Quazeth Pool, Can Create Unit\Building ([142] Quazeth Pool), Create Building - Zerg ([142] Quazeth Pool)
- 5, 135, 4, 33, 135, 135, 618, 0 # Hydrok Den, Can Create Unit\Building ([135] Hydrok Den), Create Building - Zerg ([135] Hydrok Den)
+ 5, 135, 4, 33, 135, 135, 618, 0 # Hydrith Den, Can Create Unit\Building ([135] Hydrith Den), Create Building - Zerg ([135] Hydrith Den)
- 6, 193, 4, 33, 193, 193, 387, 389 # Zoryus Shroud, Can Create Unit\Building ([193] Zoryus Shroud), Create Building - Zerg ([193] Zoryus Shroud)
+ 6, 193, 4, 33, 193, 193, 387, 389 # Zorkiz Shroud, Can Create Unit\Building ([193] Zorkiz Shroud), Create Building - Zerg ([193] Zorkiz Shroud)
  7, 224, 4, 33, 224, 224, 1366, 1365 # Irol Iris, Can Create Unit\Building ([224] Irol Iris), Create Building - Zerg ([224] Irol Iris)
 
 20: # Advanced Zerg Buildings
  3, 149, 4, 33, 149, 149, 615, 1467 # Excisant, Can Create Unit\Building ([149] Excisant), Create Building - Zerg ([149] Excisant)
- 4, 141, 4, 33, 141, 141, 620, 1098 # Muthrok Spire, Can Create Unit\Building ([141] Muthrok Spire), Create Building - Zerg ([141] Muthrok Spire)
+ 4, 141, 4, 33, 141, 141, 620, 1098 # Mutath Spire, Can Create Unit\Building ([141] Mutath Spire), Create Building - Zerg ([141] Mutath Spire)
- 5, 170, 4, 33, 170, 170, 1386, 1103 # Izkag Iteth, Can Create Unit\Building ([170] Izkag Iteth), Create Building - Zerg ([170] Izkag Iteth)
+ 5, 170, 4, 33, 170, 170, 1386, 1103 # Alkag Iteth, Can Create Unit\Building ([170] Alkag Iteth), Create Building - Zerg ([170] Alkag Iteth)
  6, 138, 4, 33, 138, 138, 621, 752 # Matravil Nest, Can Create Unit\Building ([138] Matravil Nest), Create Building - Zerg ([138] Matravil Nest)
  7, 130, 4, 33, 130, 130, 447, 429 # Axtoth Axis, Can Create Unit\Building ([130] Axtoth Axis), Create Building - Zerg ([130] Axtoth Axis)
  8, 219, 4, 33, 219, 219, 1399, 1398 # Geszkath Grotto, Can Create Unit\Building ([219] Geszkath Grotto), Create Building - Zerg ([219] Geszkath Grotto)
- 9, 136, 4, 33, 136, 136, 623, 755 # Sovthrath Mound, Can Create Unit\Building ([136] Sovthrath Mound), Create Building - Zerg ([136] Sovthrath Mound)
 #9, 236, 3, 59, 0, 228, 688, 0 # Cancel, Always (0), Change Displayed Buttons ([228] Blank)
 
 21: Basic Burrower
@@ -121,15 +120,16 @@
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
  6, 218, 4, 38, 218, 218, 1368, 1431 # Akistrokor, Can Create Unit\Building ([218] Akistrokor), Unit Morph ([218] Akistrokor)
- 7, 271, 23, 24, 18, 18, 377, 0 # Parasite, Spell Researched ([18] Parasite - Matraleth), Use Technology ([18] Parasite - Matraleth)
+ 7, 377, 23, 24, 35, 35, 1443, 1443 # Blissful Embrace, Spell Researched ([35] Blissful Embrace), Use Technology ([35] Blissful Embrace)
- 8, 267, 23, 57, 34, 0, 381, 0 # Ensnaring Brood, Spell Researched ([34] Passive), Cancel (0)
+ 8, 271, 23, 24, 18, 18, 377, 0 # Parasite, Spell Researched ([18] Parasite - Matraleth), Use Technology ([18] Parasite - Matraleth)
+ 9, 267, 23, 57, 34, 0, 381, 0 # Ensnaring Brood, Spell Researched ([34] Passive), Cancel (0)
 
 26: # Isthrathaleth
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
  2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
- 7, 270, 23, 24, 14, 14, 376, 385 # Dark Swarm, Spell Researched ([14] Dark Swarm - Isthrathaleth), Use Technology ([14] Dark Swarm - Isthrathaleth)
+ 7, 270, 23, 24, 14, 14, 376, 385 # Carapace Swarm, Spell Researched ([14] Carapace Swarm - Isthrathaleth), Use Technology ([14] Carapace Swarm - Isthrathaleth)
  8, 265, 23, 24, 15, 15, 380, 387 # Plague, Spell Researched ([15] Plague - Isthrathaleth), Use Technology ([15] Plague - Isthrathaleth)
  9, 259, 38, 41, 11, 11, 372, 382 # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
  9, 260, 39, 42, 11, 0, 373, 0 # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
@@ -186,7 +186,7 @@
 37: # Cagrant Cesiant
  1, 146, 4, 35, 146, 146, 628, 758 # Surkith Cesiant, Can Create Unit\Building ([146] Surkith Cesiant), Building Morph ([146] Surkith Cesiant)
  2, 144, 4, 35, 144, 144, 627, 757 # Spraith Cesiant, Can Create Unit\Building ([144] Spraith Cesiant), Building Morph ([144] Spraith Cesiant)
- 4, 216, 4, 35, 216, 216, 534, 585 # Larvosk Cesiant, Can Create Unit\Building ([216] Larvosk Cesiant), Building Morph ([216] Larvosk Cesiant)
+ 4, 216, 4, 35, 216, 216, 534, 0 # Larvosk Cesiant, Can Create Unit\Building ([216] Larvosk Cesiant), Building Morph ([216] Larvosk Cesiant)
  5, 134, 4, 35, 134, 134, 619, 748 # Nydus Cesiant, Can Create Unit\Building ([134] Nydus Cesiant), Create Building - Zerg ([134] Nydus Cesiant)
 
 38: # Hydrith Den
@@ -206,7 +206,7 @@
 42: # Geszkath Grotto
 #7, 212, 4, 35, 212, 212, 1397, 1396 # Alkaj Chasm, Can Create Unit\Building ([212] Alkaj Chasm), Building Morph ([212] Alkaj Chasm)
 
-44: # Scribe, Artisan
+44: # Scribe
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
  2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
  3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
@@ -338,7 +338,7 @@
 
 64: # Synthetic Synod
  1, 86, 4, 3, 86, 86, 853, 723 # Demiurge, Can Create Unit\Building ([86] Demiurge), Create Unit ([86] Demiurge)
- 2, 183, 4, 3, 183, 183, 452, 453 # Empress, Can Create Unit\Building ([183] Empress), Create Unit ([183] Empress)
+ 2, 183, 4, 3, 183, 183, 452, 0 # Empress, Can Create Unit\Building ([183] Empress), Create Unit ([183] Empress)
  3, 81, 4, 3, 81, 81, 522, 526 # Clarion, Can Create Unit\Building ([81] Clarion), Create Unit ([81] Clarion)
  6, 286, 13, 1, 0, 0, 672, 0 # Set Rally Point, Rally Point (0), Rally Point (0)
  9, 236, 10, 4, 0, 254, 693, 0 # Cancel, Cancel Last (0), Cancel Last (254)
@@ -836,7 +836,7 @@
 134: # Rogue Gallery
  1, 172, 4, 3, 172, 172, 562, 0 # Vagrant, Can Create Unit\Building ([172] Vagrant), Create Unit ([172] Vagrant)
  2, 61, 4, 3, 61, 61, 1293, 1296 # Cabalist, Can Create Unit\Building ([61] Cabalist), Create Unit ([61] Cabalist)
- 3, 79, 4, 3, 90, 90, 512, 512 # Charlatan, Can Create Unit\Building ([90] Charlatan), Create Unit ([90] Charlatan)
+ 3, 90, 4, 3, 90, 90, 512, 512 # Charlatan, Can Create Unit\Building ([90] Charlatan), Create Unit ([90] Charlatan)
  4, 104, 4, 3, 104, 104, 1282, 0 # Barghest, Can Create Unit\Building ([104] Barghest), Create Unit ([104] Barghest)
  6, 286, 13, 1, 0, 0, 672, 0 # Set Rally Point, Rally Point (0), Rally Point (0)
  9, 236, 10, 4, 0, 254, 693, 0 # Cancel, Cancel Last (0), Cancel Last (254)
@@ -1180,7 +1180,7 @@
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
  7, 395, 23, 57, 34, 0, 717, 717 # Steady Shroud, Spell Researched ([34] Passive), Cancel (0)
- 8, 319, 23, 57, 34, 0, 540, 540 # Multi-Attack III, Spell Researched ([34] Passive), Cancel (0)
+ 8, 319, 23, 57, 34, 0, 585, 585 # Repentant Chorus, Spell Researched ([34] Passive), Cancel (0)
 
 181: # Magister
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
@@ -1341,7 +1341,7 @@
  3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
-#6, 472, 4, 38, 322, 322, 1801, 1800 # Algoztalisk, Can Create Unit\Building ([322] Algoztalisk), Unit Morph ([322] Algoztalisk)
+ 6, 472, 4, 38, 322, 322, 1800, 1801 # Algoztalisk, Can Create Unit\Building ([322] Algoztalisk), Unit Morph ([322] Algoztalisk)
 
 202: # Zoryusthaleth
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
@@ -1442,7 +1442,7 @@
  3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
- 7, 377, 23, 24, 35, 35, 1443, 1443 # Lurker Burrow, Spell Researched ([35] Blissful Embrace - Akistrokor), Use Technology ([35] Blissful Embrace - Akistrokor)
+ 7, 350, 23, 57, 34, 0, 1483, 1483 # Devouring Instinct, Spell Researched ([34] Passive), Cancel (0)
  8, 267, 23, 57, 34, 0, 1059, 1059 # Captivating Claws, Spell Researched ([34] Passive), Cancel (0)
  9, 236, 23, 24, 26, 26, 1444, 1444 # Cancel, Spell Researched ([26] Cancel New Ability), Use Technology ([26] Cancel New Ability)
 
@@ -1588,7 +1588,6 @@
  4, 217, 4, 38, 217, 217, 1356, 1409 # Konvilisk, Can Create Unit\Building ([217] Konvilisk), Unit Morph ([217] Konvilisk)
  5, 419, 4, 38, 269, 269, 751, 750 # Vilgorokor, Can Create Unit\Building ([269] Vilgorokor), Unit Morph ([269] Vilgorokor)
  6, 45, 4, 38, 45, 45, 582, 743 # Matraleth, Can Create Unit\Building ([45] Matraleth), Unit Morph ([45] Matraleth)
- 7, 46, 4, 38, 46, 46, 583, 744 # Isthrathaleth, Can Create Unit\Building ([46] Isthrathaleth), Unit Morph ([46] Isthrathaleth)
 
 228: # Liiralisk
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
@@ -1719,7 +1718,7 @@
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
  7, 256, 23, 57, 34, 0, 1138, 1138 # Stonewall Protocol, Spell Researched ([34] Passive), Cancel (0)
 
-243: # [243] Watchdog
+243: # Watchdog
  1, 228, 35, 9, 0, 0, 664, 0 # Move, Building Can Move And Has Lifted Off (0), Move (0)
  2, 229, 9, 10, 0, 0, 665, 0 # Stop, Attacking Building (0), Stop (0)
  2, 229, 35, 10, 0, 0, 665, 0 # Stop, Building Can Move And Has Lifted Off (0), Stop (0)
@@ -1733,7 +1732,7 @@
  3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
-#6, 417, 4, 38, 321, 321, 612, 638 # Okrimnilisk, Can Create Unit\Building ([321] Okrimnilisk), Unit Morph ([321] Okrimnilisk)
+ 5, 471, 4, 38, 321, 321, 623, 496 # Okrimnilisk, Can Create Unit\Building ([321] Okrimnilisk), Unit Morph ([321] Okrimnilisk)
  7, 341, 23, 57, 34, 0, 515, 515 # Lashing Limbs, Spell Researched ([34] Passive), Cancel (0)
  9, 259, 38, 41, 11, 11, 372, 382 # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
  9, 260, 39, 42, 11, 0, 373, 0 # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
@@ -1923,8 +1922,9 @@
  3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
-#6, 427, 4, 38, 277, 277, 577, 740 # Selkerilisk, Can Create Unit\Building ([277] Selkerilisk), Unit Morph ([277] Selkerilisk)
+ 6, 46, 4, 38, 46, 46, 583, 744 # Isthrathaleth, Can Create Unit\Building ([46] Isthrathaleth), Unit Morph ([46] Isthrathaleth)
- 7, 36, 23, 57, 34, 0, 328, 328 # Autophagy, Spell Researched ([34] Passive), Cancel (0)
+ 7, 270, 23, 57, 34, 0, 427, 427 # Reconstitution, Spell Researched ([34] Passive), Cancel (0)
+ 8, 36, 23, 57, 34, 0, 328, 328 # Autophagy, Spell Researched ([34] Passive), Cancel (0)
  9, 260, 39, 42, 11, 0, 373, 0 # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
  9, 259, 38, 41, 11, 11, 372, 382 # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
 
@@ -1976,28 +1976,29 @@
  1, 129, 4, 38, 129, 129, 1063, 1057 # Bactalisk, Can Create Unit\Building ([129] Bactalisk), Unit Morph ([129] Bactalisk)
  2, 417, 4, 38, 267, 267, 612, 638 # Tethzorokor, Can Create Unit\Building ([267] Tethzorokor), Unit Morph ([267] Tethzorokor)
  3, 62, 4, 38, 62, 62, 1288, 1297 # Vithrilisk, Can Create Unit\Building ([62] Vithrilisk), Unit Morph ([62] Vithrilisk)
-# 4, 126, 4, 38, 126, 126, 1362, 1374 # Cherbrathalor, Can Create Unit\Building ([126] Kagralisk), Unit Morph ([126] Kagralisk)
+ 4, 470, 4, 38, 320, 320, 1806, 1805 # Cherbrathalor, Can Create Unit\Building ([320] Cherbrathalor), Unit Morph ([320] Cherbrathalor)
-# 5, 52, 4, 38, 52, 52, 517, 518 # Okrimnilisk, Can Create Unit\Building ([52] Evigrilisk), Unit Morph ([52] Evigrilisk)
+ 5, 471, 4, 38, 321, 321, 623, 496 # Okrimnilisk, Can Create Unit\Building ([321] Okrimnilisk), Unit Morph ([321] Okrimnilisk)
-# 6, 29, 4, 38, 29, 29, 367, 366 # Algoztalisk, Can Create Unit\Building ([29] Almaksalisk), Unit Morph ([29] Almaksalisk)
+ 6, 472, 4, 38, 322, 322, 1800, 1801 # Algoztalisk, Can Create Unit\Building ([322] Algoztalisk), Unit Morph ([322] Algoztalisk)
-# 7, 96, 4, 38, 96, 96, 1346, 1347 # Keskathalor, Can Create Unit\Building ([96] Keskathalor), Unit Morph ([96] Keskathalor)
+#7, 96, 4, 38, 96, 96, 1346, 1347 # Kethrostalor, Can Create Unit\Building ([96] Kethrostalor), Unit Morph ([96] Kethrostalor)
  8, 48, 4, 38, 48, 48, 1348, 1349 # Alkajelisk, Can Create Unit\Building ([48] Alkajelisk), Unit Morph ([48] Alkajelisk)
 
 273: # Ocsal Larva - Control
  1, 39, 4, 38, 39, 39, 577, 740 # Ultralisk, Can Create Unit\Building ([39] Ultrokor), Unit Morph ([39] Ultrokor)
-# 2, 423, 4, 38, 273, 273, 1061, 1064 # Zobriolisk, Can Create Unit\Building ([273] Zobriolisk), Unit Morph ([273] Zobriolisk)
+#2, 423, 4, 38, 273, 273, 1061, 1064 # Zobriolisk, Can Create Unit\Building ([273] Zobriolisk), Unit Morph ([273] Zobriolisk)
  3, 408, 4, 38, 258, 258, 1549, 1550 # Zarcavrokor, Can Create Unit\Building ([258] Zarcavrokor), Unit Morph ([258] Zarcavrokor)
  4, 424, 4, 38, 274, 274, 1551, 1553 # Tetcaerokor, Can Create Unit\Building ([274] Tetcaerokor), Unit Morph ([274] Tetcaerokor)
-# 5, 427, 4, 38, 277, 277, 577, 740 # Selkerilisk, Can Create Unit\Building ([277] Selkerilisk), Unit Morph ([277] Selkerilisk)
+ 5, 46, 4, 38, 46, 46, 583, 744 # Isthrathaleth, Can Create Unit\Building ([46] Isthrathaleth), Unit Morph ([46] Isthrathaleth)
  6, 218, 4, 38, 218, 218, 1368, 1431 # Data Disc, Can Create Unit\Building ([218] Akistrokor), Unit Morph ([218] Akistrokor)
-# 7, 46, 4, 38, 46, 46, 583, 744 # Isthrathaleth, Can Create Unit\Building ([46] Isthrathaleth), Unit Morph ([46] Isthrathaleth)
 
-274: # Tosgrilisk
+274: # Basic Burrower + Crushing Tide
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
  2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
  3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
  4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
  5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
- 7, 344, 23, 57, 34, 0, 564, 564 # Crushing Tide, Spell Researched ([34] Passive), Cancel (0)
+ 7, 344, 23, 57, 34, 0, 503, 503 # Crushing Tide, Spell Researched ([34] Passive), Cancel (0)
+ 9, 259, 38, 41, 11, 11, 372, 382 # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
+ 9, 260, 39, 42, 11, 0, 373, 0 # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
 
 275: # Ardent Authority
  1, 456, 4, 3, 306, 306, 1369, 0 # Servitor, Can Create Unit\Building ([306] Servitor), Create Unit ([306] Servitor)
@@ -2192,7 +2193,8 @@
  7, 360, 23, 57, 34, 0, 545, 545 # Empathy Core, Spell Researched ([34] Passive), Cancel (0)
  
 302: # Lobotomy Mine
- 7, 243, 23, 57, 34, 0, 476, 476 # Dazing Detonation, Spell Researched ([34] Passive), Cancel (0)
+ 7, 314, 23, 24, 2, 2, 498, 498 # Lobotomize, Spell Researched ([2] Controlled Demolition - Terran Structure), Use Technology ([2] Controlled Demolition - Terran Structure)
+ 9, 243, 23, 57, 34, 0, 476, 476 # Dazing Detonation, Spell Researched ([34] Passive), Cancel (0)
 
 303: # Axitrilisk (Weaponless)
  1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
@@ -2416,6 +2418,45 @@
 #7, 383, 47, 59, 0, 392, 646, 0 # Faction 4, Select Faction 4 (0), Change Displayed Buttons ([392] Select Faction 4)
  8, 542, 47, 59, 0, 393, 652, 0 # Faction 5, Select Faction 5 (0), Change Displayed Buttons ([393] Select Faction 5)
  
+336: # Artisan
+ 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
+ 2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
+ 3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
+ 4, 231, 18, 39, 0, 0, 675, 0 # Gather, Unit Is Carrying Nothing (Gather - Probe) (0), Gather (0)
+ 4, 233, 19, 40, 0, 0, 676, 0 # Return Resources, Unit Is Carrying Something(Return Cargo - Probe) (0), Return Cargo (0)
+ 7, 322, 23, 57, 34, 0, 463, 463 # Radiant Rifts, Spell Researched ([34] Passive), Cancel (0)
+
+337: # Alkag Iteth
+ 7, 480, 4, 35, 330, 330, 446, 1795 # Chokral Chazsal, Can Create Unit\Building ([330] Chokral Chazsal), Building Morph ([330] Chokral Chazsal)
+
+338: # Algoztalisk
+ 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
+ 2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
+ 3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
+ 4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
+ 5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
+ 7, 379, 23, 57, 34, 0, 453, 453 # Escape Velocity, Spell Researched ([34] Passive), Cancel (0)
+
+339: # Kagralisk
+ 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
+ 2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
+ 3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
+ 4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
+ 5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
+ 6, 470, 4, 38, 320, 320, 1806, 1805 # Cherbrathalor, Can Create Unit\Building ([320] Cherbrathalor), Unit Morph ([320] Cherbrathalor)
+ 9, 259, 38, 41, 11, 11, 372, 382 # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
+ 9, 260, 39, 42, 11, 0, 373, 0 # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
+
+340: # Okrimnilisk
+ 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0)
+ 2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0)
+ 3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0)
+ 4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0)
+ 5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0)
+ 7, 262, 23, 57, 34, 0, 341, 341 # Endless Limbs, Spell Researched ([34] Passive), Cancel (0)
+ 9, 259, 38, 41, 11, 11, 372, 382 # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
+ 9, 260, 39, 42, 11, 0, 373, 0 # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
+
 #### Buttonsets END ####
 #### Unit Settings START ####
 
@@ -2879,7 +2920,7 @@ Unit 125: # [125] Anchor
           # Stat Preset: Transport
 
 Unit 126: # [126] Kagralisk
- 21, 65535, 1, 0 # Button Set: [21] Basic Burrower
+ 339, 65535, 1, 0 # Button Set: [339] Kagralisk
           # Stat Preset: Normal Unit
 
 Unit 127: # [127] Diadem
@@ -2909,8 +2950,8 @@ Unit 133: # [133] Zerg Gathtelosk
  32, 65535, 2, 1 # Button Set: [32] Gathtelosk
           # Stat Preset: Building
 
-Unit 135: # [135] Zerg Hydrok Den
+Unit 135: # [135] Zerg Hydrith Den
- 38, 65535, 2, 1 # Button Set: [38] Hydrok Den
+ 38, 65535, 2, 1 # Button Set: [38] Hydrith Den
           # Stat Preset: Building
 
 Unit 136: # [136] Zerg Sovthrath Mound
@@ -2930,8 +2971,8 @@ Unit 139: # [139] Zerg Almakis Antre
 Unit 140: # [140] Zerg Ultrok Cavern
  -1, 65535, 2, 1 # Stat Preset: Building
 
-Unit 141: # [141] Zerg Muthrok Spire
+Unit 141: # [141] Zerg Mutath Spire
- 34, 65535, 2, 1 # Button Set: [34] Mutal Spire
+ 34, 65535, 2, 1 # Button Set: [34] Mutath Spire
           # Stat Preset: Building
 
 Unit 142: # [142] Zerg Quazeth Pool
@@ -3029,8 +3070,9 @@ Unit 169: # [169] Fleet Beacon
  62, 65535, 2, 1 # Button Set: [62] Fleet Beacon
           # Stat Preset: Building
 
-Unit 170: # [170] Izkag Iteth
+Unit 170: # [170] Alkag Iteth
- -1, 65535, 2, 1 # Stat Preset: Building
+ 337, 65535, 2, 1 # Button Set: [337] Alkag Iteth
+          # Stat Preset: Building
 
 Unit 171: # [171] Synthetic Synod
  64, 65535, 2, 1 # Button Set: [64] Synthetic Synod
@@ -3065,7 +3107,7 @@ Unit 181: # [181] Irulent Ivoa
           # Stat Preset: Building
 
 Unit 182: # [182] Artisan
- 44, 65535, 1, 0 # Button Set: [44] Scribe, Artisan
+ 336, 65535, 1, 0 # Button Set: [336] Artisan
           # Stat Preset: Normal Unit
 
 Unit 183: # [183] Empress
@@ -3104,7 +3146,7 @@ Unit 192: # [192] Future Station
  235, 65535, 2, 1 # Button Set: [235] Reservoir, addons
           # Stat Preset: Building
 
-Unit 193: # [193] Zoryus Shroud
+Unit 193: # [193] Zorkiz Shroud
  203, 65535, 2, 1 # Button Set: [203] Zorkiz Shroud
           # Stat Preset: Building
 
@@ -3493,6 +3535,18 @@ Unit 319: # [319] Zerg Mortothrokor
  287, 65535, 1, 0 # Button Set: Mortothrokor
           # Stat Preset: Normal Unit
 
+Unit 320: # [320] Zerg Cherbrathalor
+ 274, 65535, 1, 0 # Button Set: Basic Burrower + Crushing Tide
+          # Stat Preset: Normal Unit
+
+Unit 321: # [322] Zerg Okrimnilisk
+ 340, 65535, 1, 0 # Button Set: Okrimnilisk
+          # Stat Preset: Normal Unit
+
+Unit 322: # [322] Zerg Algoztalisk
+ 338, 65535, 1, 0 # Button Set: Algoztalisk
+          # Stat Preset: Normal Unit
+
 Unit 328: # [238] Terran Philoc
  12, 65535, 1, 0 # Button Set: [12] Basic Commands
           # Stat Preset: Normal Unit

CMBW-editor/grafting/Orders.txt

@@ -856,12 +856,17 @@
   34                # [34] Cleric
   0xFFFF            # ==End of List==
 
+180:                # [180] Cast Through the Looking Glass
+  0xFF02            # Current unit is...
+  287               # [287] Hypnagogue
+  0xFFFF            # ==End of List==
+
 182:                # [182] Cast Mind Control
   0xFF02            # Current unit is...
   63                # [63] Mind Tyrant
   0xFFFF            # ==End of List==
 
-189:                # [182] Cast Through the Looking Glass
+189:                # [189] Cast Through the Looking Glass
   0xFF02            # Current unit is...
   287               # [287] Hypnagogue
   0xFFFF            # ==End of List==

CMBW-editor/grafting/Tech.txt

@@ -207,6 +207,12 @@
   319               # [319] Mortothrokor
   0xFF01            # Or
   0xFF02            # Current unit is...
+  319               # [320] Cherbrathalor
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  319               # [321] Okrimnilisk
+  0xFF01            # Or
+  0xFF02            # Current unit is...
   377               # [377] Axitrilisk (Weaponless)
   0xFFFF            # ==End of List==
 
@@ -367,12 +373,9 @@
   34                # [34] Cleric
   0xFFFF            # ==End of List==
 
-35:                 # [35] Blissful Embrace - Akistrokor
+35:                 # [35] Blissful Embrace - Zerg
   0xFF02            # Current unit is...
-  218               # [218] Akistrokor
+  45                # [45] Matraleth
-  0xFF01            # Or
-  0xFF02            # Current unit is...
-  123               # [123] Sovroleth
   0xFFFF            # ==End of List==
 
 36:                 # [36] Tempo Change - Madrigal

CMBW-editor/grafting/Units.txt

@@ -194,10 +194,10 @@
 29:         # [29] Almaksalisk
  0xFF02      # Current unit is...
  35          # [35] Larva
- 170         # Has Unit: [170] Izkag Iteth
+ 170         # Has Unit: [170] Alkag Iteth
  0xFF01      # Or
  0xFF03      # Must have...
- 330         # [330] Chokralgant Chazsal
+ 330         # [330] Chokral Chazsal
  0xFFFF      # ==End of List==
 
 32:         # [32] Harakan
@@ -285,11 +285,11 @@
 
 46:         # [46] Isthrathaleth
  0xFF02      # Current unit is...
- 35        	 # [35] Larva
+ 269         # [269] Vilgorokor
- 136         # Has Unit: [136] Elthisth Mound
  0xFF01      # Or
- 0xFF03      # Must have...
+ 0xFF02      # Current unit is...
- 303         # [303] Rakzogth Roost
+ 353         # [353] Ocsal Larva
+ 139         # Has Unit: [139] Almakis Antre
  0xFFFF      # ==End of List==
 
 47:         # [47] Gosvileth
@@ -342,10 +342,10 @@
 52:         # [52] Evigrilisk
  0xFF02      # Current unit is...
  35          # [35] Larva
- 170         # Has Unit: [170] Izkag Iteth
+ 170         # Has Unit: [170] Alkag Iteth
  0xFF01      # Or
  0xFF03      # Must have...
- 330         # [330] Chokralgant Chazsal
+ 330         # [330] Chokral Chazsal
  0xFFFF      # ==End of List==
 
 53:         # [53] Penumbra
@@ -824,10 +824,10 @@
 126:        # [126] Kagralisk
  0xFF02      # Current unit is...
  35          # [35] Larva
- 170         # Has Unit: [170] Izkag Iteth
+ 170         # Has Unit: [170] Alkag Iteth
  0xFF01      # Or
  0xFF03      # Must have...
- 330         # [330] Chokralgant Chazsal
+ 330         # [330] Chokral Chazsal
  0xFFFF      # ==End of List==
 
 127:        # [127] Diadem
@@ -1084,73 +1084,46 @@
 154:        # [154] Nexus
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 155:        # [155] Lattice
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 156:        # [156] Pylon
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 157:        # [157] Assimilator
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 158:        # [158] Automaton Register
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 159:        # [159] Prostration Stage
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 160:        # [160] Gateway
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 161:        # [161] Rogue Gallery
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 162:        # [162] Warden
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 163:        # [163] Fountainhead
@@ -1163,52 +1136,34 @@
 164:        # [164] Cenotaph
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 165:        # [165] Ancestral Archives
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 166:        # [166] Embassy
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 167:        # [167] Stargate
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 168:        # [168] Argosy
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 169:        # [169] Fleet Beacon
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
-170:        # [170] Izkag Iteth
+170:        # [170] Alkag Iteth
  0xFF02      # Current unit is...
  41          # [41] Droleth
  0xFF01      # Or
@@ -1224,9 +1179,6 @@
 171:        # [171] Synthetic Synod
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 172:        # [172] Vagrant
@@ -1285,7 +1237,7 @@
 
 182:        # [182] Artisan
  0xFF02      # Current unit is...
- 278         # [278] Strident Stratum
+ 166         # [166] Embassy
  0xFFFF      # ==End of List==
 
 183:        # [183] Empress
@@ -1296,9 +1248,6 @@
 184:        # [184] Astral Omen
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 185:        # [185] Skithrokor
@@ -1426,9 +1375,6 @@
 201:        # [201] Crucible
  0xFF02      # Current unit is...
  64        # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 203:        # [203] Nanite Assembly
@@ -1507,10 +1453,6 @@
 216:        # [216] Larvosk Cesiant
  0xFF02     # Current unit is...
  143        # [143] Cagrant Cesiant
- 224        # Has Unit: [224] Irol Iris
- 0xFF01     # Or
- 0xFF03     # Must have...
- 152        # [152] Othstol Oviform
  0xFFFF     # ==End of List==
 
 217:        # [217] Konvilisk
@@ -1541,20 +1483,14 @@
  152         # Has Unit: [152] Othstol Oviform
  0xFFFF      # ==End of List==
 
-220:        # [220] Robotics Authority
+220:        # [220] Ardent Authority
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 221:        # [221] Vespene Ridge
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 222:        # [222] Iroleth
@@ -1572,9 +1508,6 @@
 223:        # [223] Monument of Sin
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 224:        # [224] Irol Iris
@@ -1589,17 +1522,11 @@
 225:        # [225] Sanctum of Sorrow
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 226:        # [226] Grand Library
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 227:        # [227] Sibraelosk
@@ -1611,9 +1538,6 @@
 252:        # [252] Matrix
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 253:        # [253] Sundog
@@ -1731,17 +1655,11 @@
 278:        # [278] Strident Stratum
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 279:        # [279] Auxiliary Oasis
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 267:        # [267] Tethzorokor
@@ -1949,9 +1867,6 @@
 294:        # [294] Engram
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 295:        # [295] Iron Council
@@ -1998,17 +1913,11 @@
 304:        # [304] Sequestered Icon
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 305:        # [305] Unitary Union
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182        # [182] Artisan
  0xFFFF      # ==End of List==
 
 306:        # [306] Servitor
@@ -2089,19 +1998,28 @@
 320:        # [320] Cherbrathalor
  0xFF02      # Current unit is...
  126         # [126] Kagralisk
- 330         # Has Unit: [330] Chokralgant Chazsal
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 353         # [353] Ocsal Larva
+ 330         # Has Unit: [330] Chokral Chazsal
  0xFFFF      # ==End of List==
 
 321:        # [321] Okrimnilisk
  0xFF02      # Current unit is...
  52          # [52] Evigrilisk
- 330         # Has Unit: [330] Chokralgant Chazsal
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 353         # [353] Ocsal Larva
+ 330         # Has Unit: [330] Chokral Chazsal
  0xFFFF      # ==End of List==
 
 322:        # [322] Algoztalisk
  0xFF02      # Current unit is...
  29          # [29] Almaksalisk
- 330         # Has Unit: [330] Chokralgant Chazsal
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 353         # [353] Ocsal Larva
+ 330         # Has Unit: [330] Chokral Chazsal
  0xFFFF      # ==End of List==
 
 323:        # [323] Elthrazalisk
@@ -2140,9 +2058,9 @@
  0xFF07      # Is not training or morphing
  0xFFFF      # ==End of List==
 
-330:        # [330] Chokralgant Chazsal
+330:        # [330] Chokral Chazsal
  0xFF02      # Current unit is...
- 170         # [170] Izkag Iteth
+ 170         # [170] Alkag Iteth
  0xFF07      # Is not training or morphing
  152         # Has Unit: [152] Othstol Oviform
  0xFFFF      # ==End of List==
@@ -2160,9 +2078,6 @@
 349:        # [349] Hall of Heretics
  0xFF02      # Current unit is...
  64          # [64] Scribe
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 182         # [182] Artisan
  0xFFFF      # ==End of List==
 
 350:        # [350] Nephrilosk
@@ -2179,7 +2094,11 @@
 354:		# [354] Ocsal Cesiant
  0xFF02      # Current unit is...
  216         # [216] Larvosk Cesiant
- 152        # Has Unit: [152] Othstol Oviform
+ 224         # Has Unit: [224] Irol Iris
+ 0xFF01      # Or
+ 0xFF03      # Must have...
+ 152         # [152] Othstol Oviform
+ 0xFFFF      # ==End of List==
 
 360:        # [360] Vassal
  0xFF02      # Current unit is...

CMBW-editor/unitdef.txt

@@ -17,12 +17,37 @@ building right_upper_door = 206
 
 # Special
 building special_control_node = 192
+building crashed_minotaur = 335
+building psi_disruptor = 336
+building power_generator = 337
+building overmind = 338
+building overmind_shell = 339
+building mature_chrysalis = 340
+building cerebrate = 341
+building overmind_cocoon = 342
+building khaydarin_formation = 343
+building protoss_temple = 344
+building xelnaga_temple = 345
+building warp_gate = 346
+building stasis_cell = 347
 
-# Factional NGS units
+# Terran factional units
 military cohort = 50
 military luminary = 150
 military aspirant = 194
 military tarasque = 210
+military philoc = 328
+military hotshot = 395
+military qilin = 398
+military auriel = 399
+
+# Protoss factional units
+military adherent = 400
+military extatus = 401
+
+# Zerg factional units
+military nathrelisk = 402
+military iziralisk = 403
 
 # Terran military units
 military maverick = 0
@@ -318,12 +343,12 @@ building hachirosk = 131
 building caphrolosk = 132
 building gathtelosk = 133
 building nydus_cesiant = 134
-building hydrok_den = 135
+building hydrith_den = 135
 building elthisth_mound = 136
 building matravil_nest = 138
-building ultrok_cavern = 140
+building ultrav_cavern = 140
-building muthrok_spire = 141
+building mutath_spire = 141
-building quazrok_pool = 142
+building quazeth_pool = 142
 building cagrant_cesiant = 143
 building spraith_cesiant = 144
 building surkith_cesiant = 146
@@ -332,27 +357,30 @@ building excisant = 149
 # Zerg NGS buildings
 building gosvileth = 47
 #
-building orboth_omlia = 130
+building axtoth_axis = 130
 building almakis_antre = 139
 building othstol_oviform = 152
-building gorgral_swamp = 153
+building tethvith_swamp = 153
-building izkag_iteth = 170
+building alkag_iteth = 170
 building irulent_ivoa = 181
 building zorkiz_shroud = 193
-building vithrath_haunt = 197
+building tosvrol_haunt = 197
-building liivral_pond = 204
+building kalkiir_lake = 204
 building alkaj_chasm = 212
 building larvosk_cesiant = 216
 building geszkath_grotto = 219
 building irol_iris = 224
 building sibraelosk = 227
 building spirtith_cesiant = 292
+building skortrith_cesiant = 293
 building rakzogth_roost = 303
-building axtoth_axis = 328
 building begrozith_barrow = 329
-building chokralgant_chazsal = 330
+building chokral_chazsal = 330
 building nephrilosk = 350
 building ocsal_cesiant = 354
+building ezigrisant = 364
+building vornath_pond = 396
+building skibact_scab = 397
 
 # Misc units
 military goliath_turret = 4

CMBW-maps/melee/1v1/Class 1 - Empire/Changelog - Empire-class.md

@@ -9,12 +9,30 @@ This document logs changes to Empire-class maps. The current map pool is always
 - (2)Axiom 1.1 by Btyb
 - (2)Derelict 1.2 by Btyb
 - (2)Fata Morgana 1.1 by Veeq7
+- (2)Germination 1.0 by Btyb
 - (2)Impetus 2.0 by Veeq7
-- (2)Infinite Velocity 2.0 by TheBeaver99
 - (2)Sideshow 1.2 by Pr0nogo
 - (2)The Purgatory 1.0 by Veeq7
 - (2)Titan Forge 1.1 by The Shambler
-- (4)Highwater 1.2 by Pr0nogo
+
+## (2)Titan Forge 1.2 -- 21 March 2024
+- Expanded map eastwards by 16 tiles
+- Corrected various asymmetries and resarea assignments
+- Tided resource layouts throughout the map to improve harvesting
+- Merged ramps into center-left low ground
+- Significantly opened up pathability of central pathway
+- Added more ramps into central bases, and slightly improved pathability
+- Added 8 Mineral Fields to central bases, and removed 1 Geyser (now 2 total)
+- Added unit-only highrise for defending central attacks into 2 / 4 o'clock bases
+
+## (2)Fata Morgana 1.2 -- 21 March 2024
+- Expanded map southwards by 16 tiles
+- Added more pathability to center, facing 3 / 9 o'clock ramps
+- Expanded all north-facing central ramps by 2 tiles
+- Fused south-facing central ramps
+- Added cover to help split armies in southern pathway
+- Moved 6 o'clock base to new south border
+- Shifted 5 and 7 o'clock bases closer to compound
 
 ## (2)Impetus 2.0 -- 11 March 2024
 - Significantly reworked main & natural layout

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
+- [16 March 2024](#16-march-2024]
 - [2 March 2024][#2-march-2024]
 - [30 December 2023][#30-december-2023]
 - [3 December 2023](#3-december-2023)
@@ -81,6 +82,96 @@ See patchnotes.md for info on the most recent patch!
 - [13 August 2020](#13-august-2020)
 - [12 August 2020](#12-august-2020)
 
+# 16 March 2024
+
+This patch includes bug and stability fixes, audiovisual improvements, some mild balance changes, and the implementation of Chokral (evolved Alkag) strains.
+
+## General
+- **Internals:**
+	- Unloading a unit now gives it a 4-frame order cooldown (c. Veeq7)
+	- Tyranny code has been revised (c. Veeq7)
+- **Game modes:**
+	- Debug has been reinstated for desync testing
+- **Config:**
+	- Added the following custom advisors:
+		- ISN (c. IskatuMesk)
+- **Custom triggers:**
+	- New actions:
+		- blissful_embrace (c. Veeq7)
+
+## UI
+- CTRL+Q is no longer used to open the 'Quit' menu (ALT+Q can still be used for this)
+- Aggressive unit responses are now used when issuing attack move orders
+- Players starting or completing tech tier structures will emit a minimap ping for spectators
+- Players taking damage will emit a minimap ping for spectators
+
+## Bugfixes
+- Stability:
+	- Resolved numerous selection-related issues likely contributing to desyncs (c. Veeq7 & DF)
+	- Resolved a rare crash when issuing minimap orders (r. Hamster)
+	- Correctly clear player globals (witness mode, faction selection, etc), resolving desyncs on game start (r. The Shambler, c. Veeq7)
+- Gameplay:
+	- Fixed workers not always wandering when high worker counts were on individual nodes (c. Veeq7)
+	- Konvilisks and Tetcaerokors can no longer incubate allied targets (r. Hamster)
+	- Fixed incorrect percentage increases from Crucibles (r. Londier)
+	- It is no longer possible to queue a unit from a Terran structure during its liftoff delay (r. Newt)
+	- Control groups and certain keyboard inputs are no longer disfunctional during lobby countdown or after clicking "continue playing" (r. GreenEggs'NSpam & DeadInfested)
+	- Seraphs can now be trained from Starports which border the top of the map (r. faktheking)
+	- Cloned Simulacra now inherit the original unit's control groups (c. Veeq7)
+	- An out-of-scope feature involving dominated units restoring energy to their master has been removed (c. Veeq7)
+	- Cancelling an Excisant now properly reinstates worker HP from the morph time
+	- Khaydarin Crystal Formation is no longer invincible by default
+- Audiovisuals:
+	- Fixed wrong return graphic when Akistrokors attack Analogues (r. Veeq7)
+	- Fixed flipped coordinates in right-click minimap markers
+	- Fixed wrong sound file for Terran worker errors when advisors were default (r. The Shambler)
+	- Corrected Crucible Khaydarin Charge tooltip (r. Aqo)
+	- Reimplemented animation and shadow for Power Generator
+	- Corrected death animations for Power Generator, Overmind Cocoon, Overmind (with Shell), and Khaydarin Crystal Formation
+
+## Audiovisuals
+- Added reads for:
+	- Artisan resource return (channel & proc)
+	- Architect weapon charge
+	- Demiurge Worship
+	- Zoryusthaleth Swarming Omen
+- Added selection responses for:
+	- Skortrith Cesiant, Spirtith Cesiant, Ezigrisant, Vornath Pond, Skibact Scab (c. jun3hong)
+- Updated wireframes for:
+	- Vornath Pond, Skibact Scab (c. jun3hong)
+- Updated icons for:
+	- Ecclesiast, Charlatan, Potentate, and Monument of Sin
+
+## Terran
+- Reclamation:
+	- Decay rate now 3 per second, from 5 per second
+- [Harakan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan):
+	- Now moves ~9% faster
+
+## Protoss
+- [Artisan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/artisan):
+	- Now moves ~28.5% slower
+- [Cantavis](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cantavis):
+	- Psionic Storm cast range now 10, from 8
+- [Barghest](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/barghest):
+	- Mineral, gas, and time costs now 100/75/28, from 125/25/25
+	- HP now 50, from 40
+	- Armor now 1, from 0
+
+## Zerg
+- [Axitrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/axitrilisk):
+	- Weapon cooldown now 1, from 0.83
+- [Almaksalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/almaksalisk):
+	- Sight range now 8, from 9
+- **NEW: [Cherbrathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cherbrathalor)**:
+	- Crowd-controlling burst strain; mutated from Kagralisk; requires Chokral Chazsal
+- **NEW: [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk)**:
+	- Indomitable platform strain; mutated from Evigrilisk; requires Chokral Chazsal
+- **NEW: [Algoztalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/algoztalisk)**:
+	- Relentless corvette strain; mutated from Almaksalisk; requires Chokral Chazsal
+- **NEW: [Chokral Chaszal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/chokral-chazsal)**:
+	- Overwhelming assault node; mutated from Alkag Iteth
+
 # 2 March 2024
 
 ## Designer's Notes

mpq/arr/images.txt

@@ -1220,7 +1220,7 @@ Manifold Shadow
 Architect
 Architect Shadow
 Architect Engines
-Kalkalisk Birth
+Kalkalisk Birth (Cocoon)
 Iroleth Birth
 Nathrokor Birth
 Alkajelisk Birth
@@ -1825,11 +1825,11 @@ Swarming Omen Overlay (Small)
 Swarming Omen Overlay (Medium)
 Swarming Omen Overlay (Large)
 Swarming Omen Overlay (XLarge)
-Extended Image #825
+Kalkalisk Birth (Egg)
-Extended Image #826
+Tethzorokor Birth
-Extended Image #827
+Vilgorokor Birth
-Extended Image #828
+Protathalor Birth
-Extended Image #829
+Cikralisk Birth
 Extended Image #830
 Extended Image #831
 Extended Image #832

mpq/arr/sfxdata.txt

@@ -2999,35 +2999,35 @@ Algoztalisk Weaponfire 03
 Cherbrathalor Weaponfire 01
 Cherbrathalor Weaponfire 02
 Cherbrathalor Weaponfire 03
-Extended Sound #1
+Empress Ready 01
-Extended Sound #1
+Empress Ready 02
-Extended Sound #1
+Empress Ready 03
-Extended Sound #1
+Empress Selected 01
-Extended Sound #1
+Empress Selected 02
-Extended Sound #1
+Empress Selected 03
-Extended Sound #1
+Empress Selected 04
-Extended Sound #1
+Empress Order Passive 01
-Extended Sound #1
+Empress Order Passive 02
-Extended Sound #1
+Empress Order Passive 03
-Extended Sound #1
+Empress Order Passive 04
-Extended Sound #1
+Empress Order Aggressive 01
-Extended Sound #1
+Empress Order Aggressive 02
-Extended Sound #1
+Empress Order Aggressive 03
-Extended Sound #1
+Empress Order Aggressive 04
-Extended Sound #1
+Empress Under Attack 01
-Extended Sound #1
+Empress Under Attack 02
-Extended Sound #1
+Empress Under Attack 03
-Extended Sound #1
+Empress Under Attack 04
-Extended Sound #1
+Madcap Passive Charge 01
-Extended Sound #1
+Madcap Passive Charge 02
-Extended Sound #1
+Madcap Passive Charge 03
-Extended Sound #1
+Addon Construction 01
-Extended Sound #1
+Addon Construction 02
-Extended Sound #1
+Addon Construction 03
-Extended Sound #1
+Addon Construction 04
-Extended Sound #1
+Cikralisk Weaponfire 01
-Extended Sound #1
+Cikralisk Weaponfire 02
-Extended Sound #1
+Cikralisk Weaponfire 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -2466,8 +2466,8 @@ cm\f-t\wendigo\yes-01.wav
 cm\f-t\wendigo\yes-02.wav
 cm\f-t\wendigo\yes-03.wav
 cm\f-t\wendigo\yes-04.wav
-cm\p\_building\cancel-protoss-01.wav
+cm\p\_building\_cancel-protoss-01.wav
-cm\t\_building\cancel-terran-01.wav
+cm\t\_building\_cancel-terran-01.wav
 cm\t\apostle\toggle-01.wav
 cm\t\apostle\toggle-02.wav
 cm\t\apostle\toggle-03.wav
@@ -2999,3 +2999,32 @@ cm\z\algoztalisk\wf-03.wav
 cm\z\cherbrathalor\wf-01.wav
 cm\z\cherbrathalor\wf-02.wav
 cm\z\cherbrathalor\wf-03.wav
+cm\p\empress\rdy-01.wav
+cm\p\empress\rdy-02.wav
+cm\p\empress\rdy-03.wav
+cm\p\empress\wht-01.wav
+cm\p\empress\wht-02.wav
+cm\p\empress\wht-03.wav
+cm\p\empress\wht-04.wav
+cm\p\empress\yes-01.wav
+cm\p\empress\yes-02.wav
+cm\p\empress\yes-03.wav
+cm\p\empress\yes-04.wav
+cm\p\empress\agg-01.wav
+cm\p\empress\agg-02.wav
+cm\p\empress\agg-03.wav
+cm\p\empress\agg-04.wav
+cm\p\empress\hlp-01.wav
+cm\p\empress\hlp-02.wav
+cm\p\empress\hlp-03.wav
+cm\p\empress\hlp-04.wav
+cm\t\madcap\pas-01.wav
+cm\t\madcap\pas-02.wav
+cm\t\madcap\pas-03.wav
+cm\t\_building\_construct-01.wav
+cm\t\_building\_construct-02.wav
+cm\t\_building\_construct-03.wav
+cm\t\_building\_construct-04.wav
+cm\z\cikralisk\wf-01.wav
+cm\z\cikralisk\wf-02.wav
+cm\z\cikralisk\wf-03.wav

mpq/scripts/iscript.txt

@@ -30775,6 +30775,8 @@ KalkaliskGndAttkToIdle:
 	wait              	2
 	playfram          	0x80
 	wait				2
+	playfram          	0xA0
+	wait				2
 	playfram			0x00
 	wait				2
 	goto              	KalkaliskGndAttkToIdle
@@ -30788,10 +30790,10 @@ KalkaliskDeath:
 	end
 
 KalkaliskGndAttkInit:
-	playfram			0xA0
+	playfram			0xC0
 	wait				1
 	nobrkcodestart
-	playfram			0xC0
+	playfram			0xE0
 	wait				1
 	playfram			0x100
 	playsndbtwn			1316 1318 # Kalkalisk attack 01, 02, 03
@@ -30799,11 +30801,9 @@ KalkaliskGndAttkInit:
 	wait              	1
 	playfram			0x120
 	wait				1
-	playfram			0x100
+	playfram			0x140
 	wait				1
-	playfram			0xC0
+	playfram			0x160
-	wait				1
-	playfram			0xA0
 	nobrkcodeend
 	gotorepeatattk
 	goto              	KalkaliskGndAttkToIdle
@@ -30817,6 +30817,8 @@ KalkaliskWalking:
 	wait              	1
 	playfram          	0x80
 	wait				1
+	playfram          	0xA0
+	wait				1
 	playfram			0x00
 	wait				1
 	goto              	KalkaliskWalking
@@ -39420,21 +39422,7 @@ AxitriliskInit:
 	imgul             	1414 0 -5 # Axitrilisk Shadow (cm\zerg\axitrilisk-shadow.grp)
 AxitriliskWalkingToIdle:
 	playfram          	0x00
-	wait				62
+	wait				125
-	randcondjmp       	64 AxitriliskLocal00
-	goto				AxitriliskWalkingToIdle
-AxitriliskLocal00:
-	wait				1
-	playfram          	0x20
-	wait              	1
-	playfram          	0x40
-	wait              	1
-	playfram          	0x60
-	wait              	1
-	playfram          	0x40
-	wait              	1
-	playfram          	0x20
-	wait              	1
 	goto				AxitriliskWalkingToIdle
 
 AxitriliskDeath:
@@ -42574,6 +42562,8 @@ AirAttkInit   	[NONE]
 FusionCutterHitDamagelessInit:
 	playfram          	0x00
 	playsndbtwn       	35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav
+	goto				FusionCutterHitDamagelessCont
+FusionCutterHitDamagelessCont:
 	wait              	1
 	playfram          	1
 	wait              	1
@@ -46280,12 +46270,12 @@ AirAttkInit   	CikraliskGndAttkInit
 Unused1       	CikraliskUnused1
 GndAttkRpt    	CikraliskGndAttkInit
 AirAttkRpt    	CikraliskGndAttkInit
-CastSpell     	CikraliskCastSpell
+CastSpell     	[NONE]
 GndAttkToIdle 	CikraliskGndAttkToIdle
 AirAttkToIdle 	CikraliskGndAttkToIdle
 Unused2       	[NONE]
 Walking       	CikraliskWalking
-WalkingToIdle 	CikraliskWalkingToIdle
+WalkingToIdle 	CikraliskGndAttkToIdle
 SpecialState1 	[NONE]
 SpecialState2 	CikraliskSpecialState2
 AlmostBuilt   	[NONE]
@@ -46306,77 +46296,11 @@ Enable        	[NONE]
 
 CikraliskInit:
 	imgul             	1394 0 0 # Cikralisk Shadow (cm\zerg\cikralisk-shadow.grp)
-	goto				CikraliskLocal42
+	goto				CikraliskGndAttkToIdle
-CikraliskLocal42:
+CikraliskGndAttkToIdle:
 	playfram 			0x00
 	wait 				1
-	goto              	CikraliskLocal00
+	goto              	CikraliskGndAttkToIdle
-
-CikraliskLocal00:
-	wait              	62
-	randcondjmp       	25 CikraliskLocal01
-	randcondjmp       	128 CikraliskLocal02
-	goto              	CikraliskLocal00
-
-CikraliskLocal01:
-	playfram          	0x120
-	wait              	1
-	playfram          	0x140
-	wait              	1
-	playfram          	0x160
-	wait              	1
-	playfram          	0x180
-	wait              	12
-	playfram          	0x160
-	wait              	1
-	playfram          	0x140
-	wait              	1
-	playfram          	0x120
-	wait              	1
-	goto              	CikraliskLocal42
-
-CikraliskLocal02:
-	randcondjmp       	128 CikraliskLocal03
-	playfram          	0x20
-	wait              	1
-	turnccwise        	1
-	playfram          	0x40
-	wait              	1
-	turnccwise        	1
-	playfram          	0x60
-	wait              	1
-	turnccwise        	1
-	playfram          	0x40
-	wait              	1
-	turnccwise        	1
-	playfram          	0x20
-	wait              	1
-	turnccwise        	1
-	playfram          	0x00
-	wait              	1
-	turnccwise        	1
-	goto              	CikraliskLocal42
-
-CikraliskLocal03:
-	playfram          	0x20
-	wait              	1
-	turncwise         	1
-	playfram          	0x40
-	wait              	1
-	turncwise         	1
-	playfram          	0x60
-	wait              	1
-	turncwise         	1
-	playfram          	0x40
-	wait              	1
-	turncwise         	1
-	playfram          	0x20
-	wait              	1
-	turncwise         	1
-	playfram          	0x00
-	wait              	1
-	turncwise         	1
-	goto              	CikraliskLocal42
 
 CikraliskDeath:
 	playsnd           	867 # Zerg\Hydra\ZHyDth00.WAV
@@ -46404,7 +46328,7 @@ CikraliskUnused1:
 	wait				2
 	setfldirect       	12
 	nobrkcodeend
-	goto				CikraliskLocal42
+	goto				CikraliskGndAttkToIdle
 
 CikraliskGndAttkInit:
 	playfram          	0x120
@@ -46416,7 +46340,7 @@ CikraliskGndAttkInit:
 	attackwith			1
 	wait              	1
 	playfram          	0x180
-	playsnd           	1894 # Kagralisk weaponfire 01
+	playsndbtwn			3027 3029 # Cikralisk weaponfire 01, 02, 03
 	attackwith			1
 	wait				1
 	nobrkcodeend
@@ -46430,36 +46354,6 @@ CikraliskGndAttkInit:
 	ignorerest
 	goto				CikraliskGndAttkToIdle
 
-CikraliskGndAttkToIdle:
-	playfram 			0x00
-	wait 				1
-	goto              	CikraliskLocal00
-
-CikraliskCastSpell:
-	playfram          	0x120
-	wait              	1
-	nobrkcodestart
-	playfram          	0x140
-	wait              	1
-	playfram          	0x160
-	attackwith			1
-	wait              	1
-	playfram          	0x180
-	playsnd           	1894 # Kagralisk weaponfire 01
-	castspell
-	sigorder			2
-	wait				1
-	nobrkcodeend
-	playfram			0x160
-	wait				1
-	playfram			0x140
-	wait				1
-	playfram			0x120
-	wait				1
-	gotorepeatattk
-	ignorerest
-	goto              	CikraliskGndAttkToIdle
-
 CikraliskWalking:
 	move              	5
 	playfram			0x20
@@ -46488,10 +46382,6 @@ CikraliskWalking:
 	wait              	1
 	goto				CikraliskWalking
 
-CikraliskWalkingToIdle:
-	playfram			0x00
-	goto				CikraliskLocal00
-
 CikraliskSpecialState2:
 	playfram          	0x1A0
 	goto              	ZoryusthalethLocal07
@@ -46528,7 +46418,7 @@ CikraliskUnBurrow:
 	playfram          	0x20
 	wait              	1
 	sigorder          	4
-	goto              	CikraliskWalkingToIdle
+	goto              	CikraliskGndAttkToIdle
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
@@ -50610,7 +50500,7 @@ MortothrokorBurrow:
     playfram   			0x240
     wait       			1
     sigorder   			4
-    goto       			ZoryusthalethLocal07
+    goto       			MortothrokorSpecialState2
 
 MortothrokorUnBurrow:
     wait                1
@@ -52064,7 +51954,7 @@ Unused2       	[NONE]
 Walking       	CherbrathalorWalking
 WalkingToIdle 	CherbrathalorGndAttkToIdle
 SpecialState1 	[NONE]
-SpecialState2 	ZoryusthalethSpecialState2
+SpecialState2 	CherbrathalorSpecialState2
 AlmostBuilt   	[NONE]
 Built         	[NONE]
 Landing       	[NONE]
@@ -52075,8 +51965,8 @@ WarpIn        	[NONE]
 Unused3       	[NONE]
 StarEditInit  	[NONE]
 Disable       	[NONE]
-Burrow        	ZoryusthalethBurrow
+Burrow        	CherbrathalorBurrow
-UnBurrow      	ZoryusthalethUnBurrow
+UnBurrow      	CherbrathalorUnBurrow
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -52180,6 +52070,55 @@ CherbrathalorWalking:
 	playfram			0x00
 	goto              	CherbrathalorWalking
 	
+CherbrathalorBurrow:
+	imgol             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0x20
+	wait              	1
+	playfram          	0x40
+	wait              	1
+	playfram          	0x60
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	playfram          	0xA0
+	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          	0xC0
+	wait              	1
+	playfram          	0xE0
+	wait              	1
+	sigorder          	4
+	goto              	CherbrathalorSpecialState2
+
+CherbrathalorUnBurrow:
+	wait 				1
+	waitrand          	1 2
+	imgul             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0xC0
+	wait              	1
+	playfram          	0xA0
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	playfram          	0x60
+	imgol             	423 12 -15 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 -12 -12 # Burrowing Dust (thingy\bDust.grp)
+	wait              	1
+	playfram          	0x40
+	wait              	1
+	playfram          	0x20
+	wait              	1
+	sigorder          	4
+	goto              	CherbrathalorGndAttkToIdle
+	
+CherbrathalorSpecialState2:
+	playfram			0x280
+	goto				ZoryusthalethLocal07
+
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
 # 1815 Okrimnilisk (cm\zerg\okrimnilisk.grp)
@@ -52200,7 +52139,7 @@ Unused2       	[NONE]
 Walking       	CherbrathalorWalking
 WalkingToIdle 	OkrimniliskGndAttkToIdle
 SpecialState1 	[NONE]
-SpecialState2 	ZoryusthalethSpecialState2
+SpecialState2 	OkrimniliskSpecialState2
 AlmostBuilt   	[NONE]
 Built         	[NONE]
 Landing       	[NONE]
@@ -52211,8 +52150,8 @@ WarpIn        	[NONE]
 Unused3       	[NONE]
 StarEditInit  	[NONE]
 Disable       	[NONE]
-Burrow        	ZoryusthalethBurrow
+Burrow        	OkrimniliskBurrow
-UnBurrow      	ZoryusthalethUnBurrow
+UnBurrow      	OkrimniliskUnBurrow
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -52305,4 +52244,127 @@ OkrimniliskGndAttkInit:
 	ignorerest
 	goto				OkrimniliskGndAttkToIdle
 
-## Next free IsId: 774
+OkrimniliskBurrow:
+	imgol             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0x20
+	wait              	1
+	playfram          	0x40
+	wait              	1
+	playfram          	0x60
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	playfram          	0xA0
+	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          	0xC0
+	wait              	1
+	playfram          	0xE0
+	wait              	1
+	sigorder          	4
+	goto              	OkrimniliskSpecialState2
+
+OkrimniliskUnBurrow:
+	wait 				1
+	waitrand          	1 2
+	imgul             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0xC0
+	wait              	1
+	playfram          	0xA0
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	playfram          	0x60
+	imgol             	423 12 -15 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 -12 -12 # Burrowing Dust (thingy\bDust.grp)
+	wait              	1
+	playfram          	0x40
+	wait              	1
+	playfram          	0x20
+	wait              	1
+	sigorder          	4
+	goto              	OkrimniliskGndAttkToIdle
+	
+OkrimniliskSpecialState2:
+	playfram			0x140
+	goto				ZoryusthalethLocal07
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1222 Kalkalisk Birth (Cocoon) (cm\zerg\kalkalisk-mutate.grp)
+.headerstart
+IsId          	774
+Type          	13
+Init          	KalkaliskBirthTempInit
+Death         	Generic_Wait1End
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	KalkaliskBirthTempSpecialState1
+.headerend
+# ----------------------------------------------------------------------------- #
+
+KalkaliskBirthTempInit:
+	playfram          	5
+	wait              	1
+	waitrand          	10 15
+KalkaliskBirthTempLocal00:
+	playfram          	2
+	wait              	1
+	playfram          	1
+	wait              	1
+	playfram          	0
+	wait              	1
+	goto              	KalkaliskBirthTempLocal00
+
+KalkaliskBirthTempSpecialState1:
+	wait              	1
+	nobrkcodestart
+	playfram          	4
+	wait              	2
+	playfram          	3
+	wait              	2
+	playfram          	4
+	wait              	2
+	playfram          	3
+	wait              	2
+	playfram          	2
+	wait              	2
+	playfram          	1
+	wait              	2
+	playfram          	0
+	wait              	2
+	sigorder          	4
+	nobrkcodeend
+	goto              	InfestedTerranLocal00
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1807 Addon Weld Overlay (bullet\scvspark.grp)
+.headerstart
+IsId          	775
+Type          	2
+Init          	FusionCutterHitDamagelessSilentInit
+Death         	FusionCutterHitDamagelessDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+FusionCutterHitDamagelessSilentInit:
+	playfram          	0x00
+	goto				FusionCutterHitDamagelessCont
+	
+## Next free IsId: 776