diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index 41d2792..8e448e5 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/CMBW-editor/ai/cm_protoss.asc3 b/CMBW-editor/ai/cm_protoss.asc3 index 9dfc05e..69fcce7 100644 --- a/CMBW-editor/ai/cm_protoss.asc3 +++ b/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_ecclesiast 1 13 + var Set pref_dracadin 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 - var Ex|Jump debug_ai_messages_var 0 build_general_RoboFE_Main 13 + :build_general_RoboticsFE + 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 - bld 1 pylon 99 + call main_wait_300 + 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 - var Set can_attack_var 1 13 - call main_wait_600 + call main_wait_900 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 - var Ex|Jump debug_ai_messages_var 0 build_ranger_1GateRobo_Main 13 + :build_ranger_1GateAuthority + 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 - bld 1 pylon 99 - call main_wait_600 + call main_wait_300 + bld 1 pylon 103 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 - call main_wait_300 + bld 1 pylon 103 w_bld 1 pylon bld 1 gateway 98 - wait 24 call main_wait_600 - wait 24 bld 1 stargate 98 - wait 24 - queue 1 zealot gateway 255 Local Loc.63 100 - wait 24 - bld 1 warden 94 + multi build_skylord_Exalted_Queue + bld 1 warden 96 call main_wait_300 bld 2 gateway 98 call main_wait_600 - bld 2 stargate 98 - call main_wait_150 - bld 2 warden 94 - call main_wait_300 - 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 + bld 2 warden 96 + call main_wait_900 + var Add can_attack_var 1 13 + call main_wait_600 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 - wait 24 - bld 3 argosy 99 - call main_wait_600 - bld 4 argosy 100 - call main_wait_150 - bld 11 warden 94 - wait 24 + bld 2 argosy 101 + call main_wait_1500 + bld 1 monument_of_sin 101 + call main_wait_1200 + multi production_cycle 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 - wait 600 + add_bld 255 pylon 1 30 103 + 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 - add_bld 255 pylon 1 30 99 - wait 720 - goto request_pylon + w_bld 3 pylon + local 255 AtM 3 pylon request_pylon_check_4 + w_bld 4 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 diff --git a/CMBW-editor/ai/cm_terran.asc3 b/CMBW-editor/ai/cm_terran.asc3 index 96d8f74..fa6faf1 100644 --- a/CMBW-editor/ai/cm_terran.asc3 +++ b/CMBW-editor/ai/cm_terran.asc3 @@ -574,34 +574,33 @@ script_id TMCx return :prefUPaladin - var Set prefPaladin 1 13 - var Set prefCuirass 0 13 - var Set prefPazuzu 0 13 + var Set pref_paladin 1 13 + var Set pref_cuirass 0 13 + var Set pref_pazuzu 0 13 var Set pref_armor_iron 1 13 dth 13 Ex 0 start_location blank_return - print prefPaladin + print pref_paladin return :prefUCuirass - var Set prefPaladin 0 13 - var Set prefCuirass 1 13 - var Set prefPazuzu 0 13 + var Set pref_paladin 0 13 + var Set pref_cuirass 1 13 + var Set pref_pazuzu 0 13 var Set pref_armor_iron 1 13 dth 13 Ex 0 start_location blank_return - print prefCuirass + print pref_cuirass return :prefUPazuzu - var Set prefPaladin 0 13 - var Set prefCuirass 0 13 - var Set prefPazuzu 1 13 + var Set pref_paladin 0 13 + var Set pref_cuirass 0 13 + var Set pref_pazuzu 1 13 var Set pref_armor_iron 1 13 dth 13 Ex 0 start_location blank_return - print prefPazuzu + print pref_pazuzu return :prefUClaymore - var Set prefPazuzu 0 13 var Set prefClaymore 1 13 var Set prefPenumbra 0 13 var Set pref_armor_future 1 13 @@ -610,7 +609,6 @@ script_id TMCx return :prefUPenumbra - var Set prefPazuzu 0 13 var Set prefClaymore 0 13 var Set prefPenumbra 1 13 var Set pref_armor_future 1 13 @@ -680,7 +678,7 @@ script_id TMCx :prefUSalamander var Set prefSalamander 1 13 var Set prefSundog 0 13 - var Set pref_orbital_munitions 1 13 + var Set pref_orbital_rotary 1 13 dth 13 Ex 0 start_location blank_return print prefSalamander return @@ -688,7 +686,7 @@ script_id TMCx :prefUSundog var Set prefSalamander 0 13 var Set prefSundog 1 13 - var Set pref_orbital_munitions 1 13 + var Set pref_orbital_rotary 1 13 dth 13 Ex 0 start_location blank_return print prefSundog return @@ -696,7 +694,7 @@ script_id TMCx :prefUAzazel var Set prefAzazel 1 13 var Set prefSeraph 0 13 - var Set pref_orbital_control 1 13 + var Set pref_orbital_commandment 1 13 dth 13 Ex 0 start_location blank_return print prefAzazel return @@ -704,7 +702,7 @@ script_id TMCx :prefUSeraph var Set prefAzazel 0 13 var Set prefSeraph 1 13 - var Set pref_orbital_control 1 13 + var Set pref_orbital_commandment 1 13 dth 13 Ex 0 start_location blank_return print prefSeraph return @@ -739,7 +737,7 @@ script_id TMCx :prefUHippogriff var Set prefHippogriff 1 13 var Set prefPhobos 0 13 - var Set pref_orbital_particleaccelerator 1 13 + var Set pref_orbital_hadron 1 13 dth 13 Ex 0 start_location blank_return print prefHippogriff return @@ -747,7 +745,7 @@ script_id TMCx :prefUPhobos var Set prefHippogriff 0 13 var Set prefPhobos 1 13 - var Set pref_orbital_particleaccelerator 1 13 + var Set pref_orbital_hadron 1 13 dth 13 Ex 0 start_location blank_return print prefPhobos return @@ -914,11 +912,11 @@ script_id TMCx var Set prefApostle 1 13 return - :buildpref_raider_covertops_eidolon + :buildpref_raider_covenant_eidolon var Set prefEidolon 1 13 return - :buildpref_raider_covertops_savant + :buildpref_raider_covenant_savant var Set prefSavant 1 13 return @@ -958,24 +956,24 @@ script_id TMCx var Set prefMatador 1 13 return - :buildpref_armor_machineshop_phalanx + :buildpref_armor_palladium_phalanx var Set prefPhalanx 1 13 return - :buildpref_armor_machineshop_madrigal + :buildpref_armor_palladium_madrigal var Set prefMadrigal 1 13 return :buildpref_armor_ironfoundry_paladin - var Set prefPaladin 1 13 + var Set pref_paladin 1 13 return :buildpref_armor_ironfoundry_cuirass - var Set prefCuirass 1 13 + var Set pref_cuirass 1 13 return :buildpref_armor_ironfoundry_pazuzu - var Set prefPazuzu 1 13 + var Set pref_pazuzu 1 13 return :buildpref_armor_futurestation_claymore @@ -1010,11 +1008,11 @@ script_id TMCx var Set prefValkyrie 1 13 return - :buildpref_orbital_munitionsbay_salamander + :buildpref_orbital_rotary_salamander var Set prefSalamander 1 13 return - :buildpref_orbital_munitionsbay_sundog + :buildpref_orbital_rotary_sundog var Set prefSundog 1 13 return @@ -1038,11 +1036,11 @@ script_id TMCx var Set prefMagnetar 1 13 return - :buildpref_orbital_particleaccelerator_phobos + :buildpref_orbital_hadron_phobos var Set prefPhobos 1 13 return - :buildpref_orbital_particleaccelerator_oberon + :buildpref_orbital_hadron_oberon var Set prefOberon 1 13 return @@ -1058,7 +1056,7 @@ script_id TMCx var Set pref_vestry 1 13 return - :buildpref_raider_covertops + :buildpref_raider_covenant var Set pref_covenant 1 13 return @@ -1078,7 +1076,7 @@ script_id TMCx var Set pref_iron_foundry 1 13 return - :buildpref_armor_machineshop + :buildpref_armor_palladium var Set pref_palladium 1 13 return @@ -1102,7 +1100,7 @@ script_id TMCx var Set pref_nanite_assembly 1 13 return - :buildpref_orbital_munitionsbay + :buildpref_orbital_rotary var Set pref_rotary 1 13 return @@ -1110,7 +1108,7 @@ script_id TMCx var Set pref_commandment 1 13 return - :buildpref_orbital_particleaccelerator + :buildpref_orbital_hadron var Set pref_hadron 1 13 return @@ -1417,7 +1415,7 @@ script_id TMCx call def_armor_biotic call def_armor_iron call def_armor_mantle - call def_armor_machineshop + call def_armor_palladium call def_armor_scrapyard call def_armor_fulcrum return @@ -1428,13 +1426,13 @@ script_id TMCx call def_raider_tinkerer call def_raider_captaincy call def_raider_stockade - call def_raider_covertops + call def_raider_covenant return :defense_wave_orbital call def_orbital_particle call def_orbital_nanite - call def_orbital_munitionsbay + call def_orbital_rotary call def_orbital_starport call def_orbital_starpad return @@ -1448,7 +1446,7 @@ script_id TMCx call def_harakan return - :def_raider_covertops + :def_raider_covenant var AtL|Call prefEidolon 1 def_eidolon 13 var AtL|Call prefSavant 1 def_savant 13 call def_eidolon @@ -1502,7 +1500,7 @@ script_id TMCx call def_matador return - :def_armor_machineshop + :def_armor_palladium var AtL|Call prefPhalanx 1 def_phalanx 13 var AtL|Call prefMadrigal 1 def_madrigal 13 call def_phalanx @@ -1519,9 +1517,9 @@ script_id TMCx return :def_armor_iron - var AtL|Call prefPaladin 1 def_paladin 13 - var AtL|Call prefCuirass 1 def_cuirass 13 - var AtL|Call prefPazuzu 1 def_pazuzu 13 + var AtL|Call pref_paladin 1 def_paladin 13 + var AtL|Call pref_cuirass 1 def_cuirass 13 + var AtL|Call pref_pazuzu 1 def_pazuzu 13 call def_paladin call def_cuirass call def_pazuzu @@ -1556,7 +1554,7 @@ script_id TMCx call def_valkyrie return - :def_orbital_munitionsbay + :def_orbital_rotary var AtL|Call prefSalamander 1 def_salamander 13 var AtL|Call prefSundog 1 def_sundog 13 call def_salamander @@ -2019,6 +2017,7 @@ script_id TMCx :worker_request_advanced notowns quarry blank_return + notowns atlas blank_return local 255 AtL 10 talos blank_return queue 1 talos quarry 255 Local Loc.63 100 wait 150 @@ -2035,8 +2034,10 @@ script_id TMCx c_queues train mason|talos 13 res 13 AtL_C Any 100 worker_request_advanced local 255 AtL 28 mason|talos main_worker_loop + notowns ministry main_worker_loop_quarry queue 1 mason ministry 255 Local Loc.63 200 wait 150 + :main_worker_loop_quarry local 255 Ex 0 quarry main_worker_loop queue 1 mason quarry 255 Local Loc.63 200 goto main_worker_loop @@ -2197,6 +2198,7 @@ script_id TMCx 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_build_static_defense_var 1 13 var Set can_build_production_var 1 13 @@ -2264,14 +2266,19 @@ script_id TMCx goto expansion_main :expansion_body_quarry - wait 12 - notowns atlas expansion_body_quarry + call wait_build_towncenter bld 1 quarry 179 stop + :expansion_worker_treasury_special + call wait_build_towncenter + maynard 4 + stop + :expansion_body_treasury bld 1 treasury 180 multi expansion_body_quarry + multi expansion_worker_treasury_special :expansion_main multi expansion_worker_start @@ -2285,8 +2292,7 @@ script_id TMCx :expansion_normal multi request_watchdog call main_wait_450 - resarea 255 AtL 255 Ore 1 production_cycle - multi production_cycle + resarea 255 AtL_M 255 Ore 1 production_cycle call main_wait_600 multi request_anchor var Ex|Wait build_done_var 1 13 @@ -2325,13 +2331,12 @@ script_id TMCx :expansion_worker_start wait 24 - local 255 Ex 0 ministry expansion_worker_start + local 255 Ex 0 ministry|treasury expansion_worker_start bld 1 mason 98 - w_bldstart 1 ministry + call wait_buildstart_towncenter bld 2 mason 98 - w_bld 1 ministry + call wait_build_towncenter bld 4 mason 98 -# maynard 4 multi worker_track :expansion_worker_loop @@ -2342,8 +2347,10 @@ script_id TMCx c_queues train mason|talos 13 res 13 AtL_C Any 100 worker_request_advanced local 255 AtL 28 mason|talos expansion_worker_loop + notowns ministry expansion_worker_loop_quarry queue 1 mason ministry 255 Local Loc.63 200 wait 150 + :expansion_worker_loop_quarry local 255 Ex 0 quarry expansion_worker_loop queue 1 mason quarry 255 Local Loc.63 200 goto expansion_worker_loop @@ -2577,28 +2584,28 @@ script_id TMCx goto build_order_gen_select :build_order_gen_select - dth 13 Ex 1 dark_swarm_unit build_general_2FulcMech + dth 13 Ex 1 dark_swarm_unit build_general_2FulcrumMech dth 13 Ex 2 dark_swarm_unit build_general_EarlyRiser dth 13 Ex 3 dark_swarm_unit build_general_TheCube dth 13 Ex 4 dark_swarm_unit build_general_DoublingUp dth 13 Ex 5 dark_swarm_unit build_general_MechIntoAir dth 13 Ex 6 dark_swarm_unit build_general_Observant - :build_general_2FulcMech - dth 13 Ex 0 start_location build_general_2FulcMech_Main + :build_general_2FulcrumMech + dth 13 Ex 0 start_location build_general_2FulcrumMech_Main print Terran<32>General<32>timing<32>1:<32>2Fulc<32>Mech - :build_general_2FulcMech_Main + :build_general_2FulcrumMech_Main var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_heracles 13 var Ex|Call pref_raider_vestry 0 buildpref_raider_vestry_shaman 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 var Ex|Call pref_armor_iron 0 buildpref_armor_ironfoundry_pazuzu 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_salamander 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_azazel 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_salamander 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_azazel 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_addon_stockade 0 buildpref_raider_vestry 13 var Ex|Call pref_armor_production 0 buildpref_armor_fulcrum 13 - var Ex|Call pref_addon_fulcrum 0 buildpref_armor_machineshop 13 + var Ex|Call pref_addon_fulcrum 0 buildpref_armor_palladium 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_naniteassembly 13 var Ex|Call pref_addon_starport 0 buildpref_orbital_commandment 13 call main_wait_300 @@ -2619,7 +2626,7 @@ script_id TMCx call main_wait_600 multi need_atlas call main_wait_600 - multi build_general_2FulcMech_Addon + multi build_general_2FulcrumMech_Addon call main_wait_900 var Set can_attack_var 1 13 call main_wait_900 @@ -2627,8 +2634,7 @@ script_id TMCx multi production_cycle goto build_general_fin - :build_general_2FulcMech_Addon - call wait_for_atlas + :build_general_2FulcrumMech_Addon w_bld 1 fulcrum bld 1 scrapyard 120 w_bld 2 fulcrum @@ -2649,8 +2655,8 @@ script_id TMCx var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_madcap 13 var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_cyclops 13 var Ex|Call pref_orbital_starport 0 buildpref_orbital_starport_gorgon 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_sundog 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_seraph 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_sundog 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_seraph 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_addon_stockade 0 buildpref_raider_vestry 13 var Ex|Call pref_addon_fulcrum 0 buildpref_armor_scrapyard 13 @@ -2681,7 +2687,6 @@ script_id TMCx :build_general_EarlyRiser_Addon w_bld 1 stockade bld 1 vestry 120 - call wait_for_atlas w_bld 1 fulcrum bld 1 palladium 120 stop @@ -2694,12 +2699,12 @@ script_id TMCx var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_maverick 13 var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_apostle 13 var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_vulture 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_salamander 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_azazel 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_salamander 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_azazel 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_armor_production 0 buildpref_armor_ironfoundry 13 - var Ex|Call pref_addon_fulcrum 0 buildpref_armor_machineshop 13 + var Ex|Call pref_addon_fulcrum 0 buildpref_armor_palladium 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_naniteassembly 13 call main_wait_600 bld 1 fulcrum 121 @@ -2728,9 +2733,9 @@ script_id TMCx :build_general_TheCube_Addon w_bld 1 stockade bld 1 vestry 120 - call wait_for_atlas w_bld 1 fulcrum bld 1 palladium 120 + call wait_for_atlas wait 24 bld 1 starport 121 w_bld 1 starport @@ -2789,7 +2794,6 @@ script_id TMCx bld 1 scrapyard 120 w_bld 2 fulcrum bld 2 scrapyard 120 - call wait_for_atlas w_bld 2 stockade bld 1 covenant 120 call main_wait_150 @@ -2804,11 +2808,11 @@ script_id TMCx :build_general_MechIntoAir_Main var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_matador 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 - var Ex|Call pref_addon_fulcrum 0 buildpref_armor_machineshop 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_salamander 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_seraph 13 - var Ex|Call pref_addon_starport 0 buildpref_orbital_munitionsbay 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 + var Ex|Call pref_addon_fulcrum 0 buildpref_armor_palladium 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_salamander 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_seraph 13 + var Ex|Call pref_addon_starport 0 buildpref_orbital_rotary 13 var Ex|Call pref_orbital_nanite 0 buildpref_orbital_naniteassembly_minotaur 13 call main_wait_600 call main_wait_300 @@ -2853,13 +2857,13 @@ script_id TMCx bld 1 scrapyard 120 w_bld 2 fulcrum bld 2 scrapyard 120 - call wait_for_atlas bld 1 quarry 120 w_bld 3 fulcrum bld 1 palladium 120 w_bld 4 fulcrum bld 2 palladium 120 wait 24 + call wait_for_atlas bld 2 starport 121 w_bld 1 starport bld 1 rotary 120 @@ -2891,7 +2895,7 @@ script_id TMCx :build_general_Observant_Main var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_cyprian 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_seraph 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_seraph 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 var Ex|Call pref_addon_starport 0 buildpref_orbital_commandment 13 call main_wait_600 @@ -2931,14 +2935,13 @@ script_id TMCx bld 1 vestry 120 w_bld 1 fulcrum bld 1 scrapyard 120 - call wait_for_atlas w_bld 2 fulcrum bld 1 palladium 120 w_bld 3 fulcrum bld 2 palladium 120 wait 24 + call wait_for_atlas bld 2 starport 121 - call wait_for_daedala w_bld 2 starport bld 2 commandment 120 w_bld 1 commandment @@ -2954,16 +2957,16 @@ script_id TMCx :build_general_fin2 placeholder_count Local AtL|Jump 2 Group_Buildings blank 13 call main_wait_450 - call add_starpad_simple2 + p_need 1 starpad call main_wait_300 multi need_atlas call main_wait_300 - call add_stockade_simple + p_need 1 stockade call main_wait_150 - bld 1 covenant 120 + p_need 1 covenant call main_wait_600 call main_wait_900 - call add_starport_simple + p_need 1 starport call main_wait_1200 call main_wait_600 multi need_daedala @@ -3015,80 +3018,93 @@ script_id TMCx goto build_order_armor_select :build_order_armor_select - dth 13 Ex 1 dark_swarm_unit build_armor_PhalanxTiming + dth 13 Ex 1 dark_swarm_unit build_armor_TankPush dth 13 Ex 2 dark_swarm_unit build_armor_FE5Fulc dth 13 Ex 3 dark_swarm_unit build_armor_2FulcVulture dth 13 Ex 4 dark_swarm_unit build_armor_WalkerPower dth 13 Ex 5 dark_swarm_unit build_armor_IronCrusade dth 13 Ex 6 dark_swarm_unit build_armor_DavidAndGoliath - :build_armor_PhalanxTiming - dth 13 Ex 0 start_location build_armor_PhalanxTiming_Main - print Terran<32>Armor<32>timing<32>1:<32>Phalanx<32>Timing + :build_armor_TankPush + dth 13 Ex 0 start_location build_armor_TankPush_Main + print Terran<32>Armor<32>timing<32>1:<32>Tank<32>Push - :build_armor_PhalanxTiming_Main + :build_armor_TankPush_Main var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_cyprian 13 var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_madcap 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_cyclops 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 - var Ex|Call pref_addon_fulcrum 0 buildpref_armor_machineshop 13 + var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_matador 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 + var Ex|Call pref_addon_fulcrum 0 buildpref_armor_palladium 13 var Ex|Call pref_orbital_starport 0 buildpref_orbital_starport_gorgon 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_naniteassembly 13 call main_wait_600 call main_wait_600 bld 1 fulcrum 121 call main_wait_150 - bld 2 fulcrum 121 + multi build_armor_TankPush_Queue w_bld 1 fulcrum - queue 1 vulture fulcrum 255 Local Loc.63 100 - wait 24 - queue 1 vulture fulcrum 255 Local Loc.63 100 call main_wait_150 + bld 1 scrapyard 121 + multi build_armor_TankPush_Addon + w_bldstart 1 scrapyard + bld 2 fulcrum 121 w_bldstart 2 fulcrum multi expansion_toggle call main_wait_900 bld 3 fulcrum 121 - call main_wait_150 - queue 1 cyclops fulcrum 255 Local Loc.63 100 - wait 24 - queue 1 cyclops fulcrum 255 Local Loc.63 100 - call main_wait_450 + call main_wait_600 bld 4 fulcrum 121 call main_wait_600 + var Set can_attack_var 1 13 var Set build_gas_var 1 13 call main_wait_600 multi need_atlas - multi build_armor_PhalanxTiming_Addon call main_wait_600 var Set can_build_static_defense_var 1 13 call main_wait_900 - var Set can_attack_var 1 13 wait 24 bld 1 stockade 121 call main_wait_600 multi production_cycle goto build_armor_fin - :build_armor_PhalanxTiming_Addon - call wait_for_atlas + :build_armor_TankPush_Queue + w_bld 1 fulcrum + queue 1 vulture fulcrum 255 Local Loc.63 125 + wait 480 + queue 1 vulture fulcrum 255 Local Loc.63 125 + w_bld 1 scrapyard + queue 1 matador fulcrum 255 Local Loc.63 125 + wait 432 + queue 1 matador fulcrum 255 Local Loc.63 125 + wait 432 + queue 1 matador fulcrum 255 Local Loc.63 125 + w_bld 2 fulcrum + queue 1 cyclops fulcrum 255 Local Loc.63 125 + wait 24 + queue 1 cyclops fulcrum 255 Local Loc.63 125 + w_bld 1 palladium + queue 1 phalanx fulcrum 255 Local Loc.63 125 + w_bld 2 palladium + queue 1 madrigal fulcrum 255 Local Loc.63 125 + w_bld 3 palladium + queue 1 phalanx fulcrum 255 Local Loc.63 125 + wait 720 + queue 1 madrigal fulcrum 255 Local Loc.63 125 + stop + + :build_armor_TankPush_Addon + wait 432 w_bld 1 fulcrum bld 1 palladium 120 w_bld 2 fulcrum bld 2 palladium 120 - w_bld 1 palladium - queue 1 phalanx fulcrum 255 Local Loc.63 100 - w_bld 2 palladium - queue 1 madrigal fulcrum 255 Local Loc.63 100 w_bld 3 fulcrum bld 3 palladium 120 w_bld 1 stockade - call main_wait_450 bld 1 vestry 120 - w_bld 2 palladium - queue 2 phalanx fulcrum 255 Local Loc.63 100 - call main_wait_150 - queue 2 madrigal fulcrum 255 Local Loc.63 100 stop :build_armor_FE5Fulc @@ -3098,7 +3114,7 @@ script_id TMCx :build_armor_FE5Fulc_Main var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_vulture 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_blackjack 13 var Ex|Call pref_armor_iron 0 buildpref_armor_futurestation_penumbra 13 var Ex|Call pref_armor_production 0 buildpref_armor_fulcrum 13 @@ -3183,14 +3199,13 @@ script_id TMCx :build_armor_FE5Fulc_Addon w_bld 1 fulcrum bld 1 scrapyard 120 - call wait_for_atlas w_bld 2 fulcrum bld 1 palladium 120 w_bld 3 fulcrum bld 2 palladium 120 wait 24 + call wait_for_atlas bld 1 starport 121 - call wait_for_daedala w_bld 1 starport bld 1 commandment 120 stop @@ -3202,10 +3217,10 @@ script_id TMCx :build_armor_2FulcVulture_Main var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_vulture 13 var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_matador 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_madrigal 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_madrigal 13 var Ex|Call pref_armor_iron 0 buildpref_armor_ironfoundry_pazuzu 13 - var Ex|Call pref_addon_fulcrum 0 buildpref_armor_machineshop 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_azazel 13 + var Ex|Call pref_addon_fulcrum 0 buildpref_armor_palladium 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_azazel 13 call main_wait_750 bld 1 fulcrum 121 call main_wait_300 @@ -3231,7 +3246,7 @@ script_id TMCx :build_armor_WalkerPower_Main var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_goliath 13 var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_blackjack 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 var Ex|Call pref_armor_iron 0 buildpref_armor_ironfoundry_paladin 13 var Ex|Call pref_armor_future 0 buildpref_armor_futurestation_penumbra 13 call main_wait_300 @@ -3265,7 +3280,6 @@ script_id TMCx w_bld 1 fulcrum bld 1 scrapyard 120 call main_wait_300 - call wait_for_atlas w_bld 2 fulcrum bld 1 palladium 120 stop @@ -3275,12 +3289,12 @@ script_id TMCx print Terran<32>Armor<32>greed<32>1:<32>Iron<32>Crusade :build_armor_IronCrusade_Main - var Ex|Call pref_raider_covert 0 buildpref_raider_covertops_eidolon 13 - var Ex|Call pref_addon_stockade 0 buildpref_raider_covertops 13 + var Ex|Call pref_raider_covert 0 buildpref_raider_covenant_eidolon 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_covenant 13 var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 var Ex|Call pref_armor_production 0 buildpref_armor_ironfoundry 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_seraph 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_seraph 13 var Ex|Call pref_addon_starport 0 buildpref_orbital_commandment 13 call main_wait_900 multi expansion_toggle @@ -3333,7 +3347,7 @@ script_id TMCx var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_goliath 13 var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_matador 13 - var Ex|Call pref_armor_machine 0 buildpref_armor_machineshop_phalanx 13 + var Ex|Call pref_armor_machine 0 buildpref_armor_palladium_phalanx 13 var Ex|Call pref_armor_production 0 buildpref_armor_fulcrum 13 call main_wait_600 bld 1 fulcrum 121 @@ -3378,7 +3392,6 @@ script_id TMCx :build_armor_DavidAndGoliath_Addon w_bld 2 fulcrum bld 1 scrapyard 120 - call wait_for_atlas w_bld 2 fulcrum bld 1 palladium 120 call main_wait_150 @@ -3401,7 +3414,7 @@ script_id TMCx call main_wait_3600 multi need_daedala call main_wait_900 - call add_starport_simple + p_need 1 starport stop :build_order_raider @@ -3451,8 +3464,8 @@ script_id TMCx :build_order_raider_select dth 13 Ex 1 dark_swarm_unit build_raider_8Rax - dth 13 Ex 2 dark_swarm_unit build_raider_3RaxBiotic - dth 13 Ex 3 dark_swarm_unit build_raider_FastNuke + dth 13 Ex 2 dark_swarm_unit build_raider_3RaxBio + dth 13 Ex 3 dark_swarm_unit build_raider_FastAnvil dth 13 Ex 4 dark_swarm_unit build_raider_4RaxPressure dth 13 Ex 5 dark_swarm_unit build_raider_Uprising dth 13 Ex 6 dark_swarm_unit build_raider_HolyAckmeds @@ -3484,7 +3497,7 @@ script_id TMCx call main_wait_300 w_bldstart 6 stockade var Set build_gas_var 1 13 - call main_wait_600 + call main_wait_1800 multi expansion_toggle call main_wait_900 bld 8 stockade 121 @@ -3503,21 +3516,20 @@ script_id TMCx bld 1 vestry 120 w_bld 2 stockade bld 2 vestry 120 - call wait_for_atlas w_bld 3 stockade bld 1 covenant 120 w_bld 4 stockade bld 2 covenant 120 stop - :build_raider_3RaxBiotic - dth 13 Ex 0 start_location build_raider_3RaxBiotic_Main + :build_raider_3RaxBio + dth 13 Ex 0 start_location build_raider_3RaxBio_Main print Terran<32>Raider<32>timing<32>2:<32>3Rax<32>Biotic - :build_raider_3RaxBiotic_Main + :build_raider_3RaxBio_Main var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_maverick 13 var Ex|Call pref_raider_vestry 0 buildpref_raider_vestry_cleric 13 - var Ex|Call pref_raider_covert 0 buildpref_raider_covertops_eidolon 13 + var Ex|Call pref_raider_covert 0 buildpref_raider_covenant_eidolon 13 var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_heracles 13 var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 call main_wait_600 @@ -3537,7 +3549,7 @@ script_id TMCx queue 1 maverick stockade 255 Local Loc.63 100 wait 24 call main_wait_300 - multi build_raider_3RaxBiotic_Addon + multi build_raider_3RaxBio_Addon call main_wait_450 var Sub can_worker_var 1 13 bld 3 stockade 121 @@ -3566,23 +3578,23 @@ script_id TMCx call main_wait_300 goto build_raider_fin - :build_raider_3RaxBiotic_Addon + :build_raider_3RaxBio_Addon w_bld 1 stockade bld 1 vestry 120 w_bld 2 stockade bld 2 vestry 120 stop - :build_raider_FastNuke - dth 13 Ex 0 start_location build_raider_FastNuke_Main + :build_raider_FastAnvil + dth 13 Ex 0 start_location build_raider_FastAnvil_Main print Terran<32>Raider<32>greed<32>1:<32>Fast<32>Nuke - :build_raider_FastNuke_Main + :build_raider_FastAnvil_Main var Ex|Call pref_infrastructure_addon 0 buildpref_commandcenter_missilesilo 13 var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_cyprian 13 - var Ex|Call pref_raider_covert 0 buildpref_raider_covertops_eidolon 13 + var Ex|Call pref_raider_covert 0 buildpref_raider_covenant_eidolon 13 var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_madcap 13 - var Ex|Call pref_addon_stockade 0 buildpref_raider_covertops 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_covenant 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 call main_wait_600 bld 1 stockade 121 @@ -3598,7 +3610,7 @@ script_id TMCx call main_wait_600 multi need_atlas call main_wait_600 - multi build_raider_FastNuke_Addon + multi build_raider_FastAnvil_Addon call main_wait_300 bld 4 stockade 121 call main_wait_900 @@ -3607,10 +3619,9 @@ script_id TMCx multi production_cycle goto build_raider_fin - :build_raider_FastNuke_Addon + :build_raider_FastAnvil_Addon w_bld 1 stockade bld 1 vestry 120 - call wait_for_atlas w_bld 2 stockade bld 1 covenant 120 w_bldstart 1 covenant @@ -3628,11 +3639,11 @@ script_id TMCx :build_raider_4RaxPressure_Main var Ex|Call pref_raider_vestry 0 buildpref_raider_vestry_shaman 13 - var Ex|Call pref_raider_covert 0 buildpref_raider_covertops_savant 13 + var Ex|Call pref_raider_covert 0 buildpref_raider_covenant_savant 13 var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_heracles 13 var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_sundog 13 - var Ex|Call pref_addon_starport 0 buildpref_orbital_munitionsbay 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_sundog 13 + var Ex|Call pref_addon_starport 0 buildpref_orbital_rotary 13 call main_wait_900 bld 1 stockade 121 call main_wait_900 @@ -3669,7 +3680,6 @@ script_id TMCx bld 1 vestry 120 w_bld 2 stockade bld 2 vestry 120 - call wait_for_atlas w_bld 3 stockade bld 1 covenant 120 w_bld 4 stockade @@ -3688,34 +3698,15 @@ script_id TMCx bld 1 stockade 121 call main_wait_450 bld 2 stockade 121 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 + multi build_raider_Uprising_Queue call main_wait_450 bld 3 stockade 121 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - call main_wait_300 - call main_wait_150 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - call main_wait_300 + call main_wait_750 multi build_raider_Uprising_Addon call main_wait_300 bld 4 stockade 121 wait 24 - queue 2 shaman stockade 255 Local Loc.63 100 - wait 24 - queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_450 - queue 2 shaman stockade 255 Local Loc.63 100 - wait 24 - queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_300 w_bld 4 stockade w_bld 2 vestry @@ -3728,15 +3719,70 @@ script_id TMCx call main_wait_600 var Add can_worker_var 1 13 call main_wait_600 - queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_450 - queue 2 cyprian stockade 255 Local Loc.63 100 - wait 24 - queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_300 multi production_cycle goto build_raider_fin + :build_raider_Uprising_Queue + multi build_raider_Uprising_Queue2 + w_bld 1 stockade + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + w_bld 3 stockade + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + stop + + :build_raider_Uprising_Queue2 + w_bld 2 stockade + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + w_bld 3 stockade + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + queue 1 cyprian stockade 255 Local Loc.63 125 + wait 528 + w_bld 1 vestry + queue 1 shaman stockade 255 Local Loc.63 125 + wait 720 + queue 1 cleric stockade 255 Local Loc.63 125 + wait 360 + queue 1 cleric stockade 255 Local Loc.63 125 + stop + :build_raider_Uprising_Addon w_bld 1 stockade bld 1 vestry 120 @@ -3750,7 +3796,7 @@ script_id TMCx :build_raider_HolyAckmeds_Main var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_harakan 13 - var Ex|Call pref_addon_stockade 0 buildpref_raider_covertops 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_covenant 13 var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_900 @@ -3804,7 +3850,6 @@ script_id TMCx bld 1 vestry 120 call main_wait_300 multi need_atlas - call wait_for_atlas bld 1 covenant 120 call main_wait_3600 multi need_daedala @@ -3856,54 +3901,51 @@ script_id TMCx goto build_order_orbital_select :build_order_orbital_select - dth 13 Ex 1 dark_swarm_unit build_orbital_2PortWraith + dth 13 Ex 1 dark_swarm_unit build_orbital_RapidStarpads dth 13 Ex 2 dark_swarm_unit build_orbital_TheDon dth 13 Ex 3 dark_swarm_unit build_orbital_WraithBio dth 13 Ex 4 dark_swarm_unit build_orbital_Hotdrop dth 13 Ex 5 dark_swarm_unit build_orbital_SuddenStarport dth 13 Ex 6 dark_swarm_unit build_orbital_AcesHigh - :build_orbital_2PortWraith - dth 13 Ex 0 start_location build_orbital_2PortWraith_Main - print Terran<32>Orbital<32>rush<32>1:<32>2Port<32>Wraith + :build_orbital_RapidStarpads + dth 13 Ex 0 start_location build_orbital_RapidStarpads_Main + print Terran<32>Orbital<32>rush<32>1:<32>Rapid<32>Starpads - :build_orbital_2PortWraith_Main - var Ex|Call pref_orbital_starport 0 buildpref_orbital_starpad_wraith 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_salamander 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_azazel 13 - var Ex|Call pref_addon_starport 0 buildpref_orbital_munitionsbay 13 + :build_orbital_RapidStarpads_Main + var Ex|Call pref_orbital_starpad 0 buildpref_orbital_starpad_wraith 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_salamander 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_azazel 13 + var Ex|Call pref_addon_starport 0 buildpref_orbital_rotary 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 - call main_wait_600 - call main_wait_1200 - bld 1 starpad 121 - call main_wait_600 - bld 2 starpad 121 call main_wait_300 + bld 1 starpad 121 + call main_wait_1500 + bld 2 starpad 121 + call main_wait_1200 do_morph 1 wraith call main_wait_300 var Set build_gas_var 1 13 - call main_wait_300 - bld 1 stockade 121 - call main_wait_300 var Set can_attack_var 1 13 - call main_wait_1200 + call main_wait_1800 multi expansion_toggle var Sub can_worker_var 1 13 call main_wait_600 var Add can_worker_var 1 13 w_bld 2 starpad - call main_wait_300 + bld 2 stockade 121 + call main_wait_450 bld 3 starpad 121 call main_wait_1200 var Add can_expand_var 1 13 call main_wait_1200 multi need_atlas - multi build_orbital_2PortWraith_Addon + multi build_orbital_RapidStarpads_Addon call main_wait_900 multi production_cycle goto build_orbital_fin - :build_orbital_2PortWraith_Addon + :build_orbital_RapidStarpads_Addon call wait_for_atlas bld 1 starport 121 w_bld 1 starport @@ -3912,7 +3954,6 @@ script_id TMCx w_bld 2 starport bld 2 rotary 120 bld 3 starport 121 - call wait_for_daedala w_bld 3 starport bld 1 commandment 120 stop @@ -3923,8 +3964,8 @@ script_id TMCx :build_orbital_TheDon_Main var Ex|Call pref_orbital_starport 0 buildpref_orbital_starport_gorgon 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_salamander 13 - var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_azazel 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_salamander 13 + var Ex|Call pref_orbital_commandment 0 buildpref_orbital_commandment_azazel 13 var Ex|Call pref_orbital_nanite 0 buildpref_orbital_naniteassembly_minotaur 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_naniteassembly 13 call main_wait_1500 @@ -3966,23 +4007,14 @@ script_id TMCx var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_madcap 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 var Ex|Call pref_orbital_starport 0 buildpref_orbital_starpad_wraith 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_sundog 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_sundog 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_300 call main_wait_150 bld 1 stockade 121 - call main_wait_750 + call main_wait_600 bld 1 starpad 121 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - call main_wait_300 - queue 1 maverick stockade 255 Local Loc.63 100 - call main_wait_300 - queue 1 maverick stockade 255 Local Loc.63 100 - wait 24 - queue 1 wraith starpad 255 Local Loc.63 100 - call main_wait_300 - queue 1 wraith starpad 255 Local Loc.63 100 + multi build_orbital_WraithBio_Queue call main_wait_150 var Sub can_worker_var 1 13 multi expansion_toggle @@ -3994,32 +4026,42 @@ script_id TMCx bld 2 starpad 121 call main_wait_150 bld 2 stockade 121 - call main_wait_300 - queue 1 maverick stockade 255 Local Loc.63 100 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 - call main_wait_150 - queue 1 wraith starpad 255 Local Loc.63 100 - wait 24 - queue 1 wraith starpad 255 Local Loc.63 100 - call main_wait_300 + call main_wait_600 bld 3 stockade 121 - wait 24 - queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_150 - w_bld 2 starpad - var Add can_expand_var 1 13 + var Add can_attack_var 1 13 call main_wait_900 w_bldstart 3 stockade bld 1 vestry 120 call main_wait_300 var Set build_gas_var 1 13 + var Add can_expand_var 1 13 call main_wait_600 multi need_atlas wait 24 multi production_cycle goto build_orbital_fin + :build_orbital_WraithBio_Queue + w_bld 1 stockade + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 maverick stockade 255 Local Loc.63 125 + w_bld 1 starpad + queue 1 wraith starpad 255 Local Loc.63 125 + wait 672 + queue 1 wraith starpad 255 Local Loc.63 125 + w_bld 2 stockade + queue 2 maverick stockade 255 Local Loc.63 125 + wait 336 + queue 1 wraith starpad 255 Local Loc.63 125 + queue 2 maverick stockade 255 Local Loc.63 125 + wait 672 + queue 1 wraith starpad 255 Local Loc.63 125 + stop + :build_orbital_Hotdrop dth 13 Ex 0 start_location build_orbital_Hotdrop_Main print Terran<32>Orbital<32>timing<32>2:<32>Hotdrop @@ -4080,11 +4122,11 @@ script_id TMCx goto build_orbital_fin :build_orbital_Hotdrop_Addon - call wait_for_atlas bld 1 covenant 120 w_bld 1 covenant bld 1 anvil 120 wait 24 + call wait_for_atlas bld 1 starport 121 w_bld 1 starport bld 1 rotary 120 @@ -4110,8 +4152,8 @@ script_id TMCx var Ex|Call pref_raider_vestry 0 buildpref_raider_vestry_cleric 13 var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 var Ex|Call pref_orbital_starport 0 buildpref_orbital_starport_gorgon 13 - var Ex|Call pref_orbital_munitions 0 buildpref_orbital_munitionsbay_sundog 13 - var Ex|Call pref_addon_starport 0 buildpref_orbital_munitionsbay 13 + var Ex|Call pref_orbital_rotary 0 buildpref_orbital_rotary_sundog 13 + var Ex|Call pref_addon_starport 0 buildpref_orbital_rotary 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_300 call main_wait_300 @@ -4171,7 +4213,7 @@ script_id TMCx var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_blackjack 13 var Ex|Call pref_armor_production 0 buildpref_armor_fulcrum 13 var Ex|Call pref_orbital_starpad 0 buildpref_orbital_starpad_wraith 13 - var Ex|Call pref_addon_starport 0 buildpref_orbital_munitionsbay 13 + var Ex|Call pref_addon_starport 0 buildpref_orbital_rotary 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_300 call main_wait_300 @@ -4225,89 +4267,13 @@ script_id TMCx stop :build_order_expansion - bring 13 AtL_W 1 stockade|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly Loc.63 blank + wait 24 + notowns ministry build_order_expansion 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 - :add_stockade_simple - wait 12 - notowns ministry add_stockade_simple - add_bld 255 stockade 1 99 97 - return - - :add_stockade_simple2 - p_need 1 stockade - return - - :add_captaincy_simple - wait 12 - notowns atlas add_captaincy_simple - add_bld 255 captaincy 1 99 98 - return - - :add_captaincy_simple2 - p_need 1 captaincy - return - - :add_fulcrum_simple - wait 12 - notowns ministry add_fulcrum_simple - add_bld 255 fulcrum 1 99 97 - return - - :add_fulcrum_simple2 - p_need 1 fulcrum - return - - :add_iron_foundry_simple - wait 12 - notowns daedala add_iron_foundry_simple - add_bld 255 iron_foundry 1 99 98 - return - - :add_iron_foundry_simple2 - p_need 1 iron_foundry - return - - :add_starpad_simple - wait 12 - notowns ministry add_starpad_simple - add_bld 255 starpad 1 99 97 - return - - :add_starpad_simple2 - p_need 1 starpad - return - - :add_starport_simple - wait 12 - notowns ministry add_starport_simple - notowns atlas add_starport_simple - add_bld 255 starport 1 99 97 - return - - :add_starport_simple2 - p_need 1 starport - return - - :add_nanite_assembly_simple - wait 12 - notowns daedala add_nanite_assembly_simple - add_bld 255 nanite_assembly 1 99 98 - return - - :add_nanite_assembly_simple2 - p_need 1 nanite_assembly - return - - :add_atlas_simple - wait 12 - notowns ministry add_atlas_simple - multi need_atlas - return - :need_atlas wait 24 bring 13 AtM 4 Group_Factories Loc.63 need_atlas @@ -4323,12 +4289,6 @@ script_id TMCx notowns atlas wait_for_atlas return - :add_daedala_simple - wait 12 - notowns daedala add_daedala_simple - multi need_daedala - return - :need_daedala wait 24 notowns atlas need_daedala @@ -4571,6 +4531,7 @@ script_id TMCx var AtL|Jump production_cycle_var 1 blank_return 13 var AtL|Call pref_starport 1 production_cycle_starport_check 13 var AtL|Jump production_cycle_var 1 blank_return 13 + call production_cycle_stockade_check var AtL|Jump production_cycle_var 1 blank_return 13 call production_cycle_fulcrum_check @@ -4592,6 +4553,7 @@ script_id TMCx var AtL|Jump production_cycle_var 1 blank_return 13 var AtL|Call pref_captaincy 1 production_cycle_captaincy_check 13 var AtL|Jump production_cycle_var 1 blank_return 13 + call production_cycle_nanite_assembly_check var AtL|Jump production_cycle_var 1 blank_return 13 call production_cycle_iron_foundry_check @@ -4607,6 +4569,7 @@ script_id TMCx var AtL|Jump production_cycle_var 1 blank_return 13 var AtL|Call pref_iron_foundry 1 production_cycle_iron_foundry_check 13 var AtL|Jump production_cycle_var 1 blank_return 13 + call production_cycle_fulcrum_check var AtL|Jump production_cycle_var 1 blank_return 13 call production_cycle_mantle_check @@ -4620,6 +4583,7 @@ script_id TMCx var AtL|Jump production_cycle_var 1 blank_return 13 var AtL|Call pref_captaincy 1 production_cycle_captaincy_check 13 var AtL|Jump production_cycle_var 1 blank_return 13 + call production_cycle_stockade_check var AtL|Jump production_cycle_var 1 blank_return 13 call production_cycle_captaincy_check @@ -4635,6 +4599,7 @@ script_id TMCx var AtL|Jump production_cycle_var 1 blank_return 13 var AtL|Call pref_nanite_assembly 1 production_cycle_nanite_assembly_check 13 var AtL|Jump production_cycle_var 1 blank_return 13 + call production_cycle_starpad_check var AtL|Jump production_cycle_var 1 blank_return 13 call production_cycle_starport_check @@ -4671,14 +4636,13 @@ script_id TMCx :production_cycle_covenant notowns stockade blank_return - notowns atlas blank_return local 255 AtL 8 covenant blank_return add_bld 255 covenant 1 3 96 call main_wait_300 return :production_cycle_captaincy_check - bring 13 AtM 14 captaincy Loc.63 production_cycle_captaincy + bring 13 AtM 7 captaincy Loc.63 production_cycle_captaincy notowns daedala production_cycle_captaincy bring 13 AtL 5 apothecary Loc.63 production_cycle_captaincy return @@ -4703,7 +4667,6 @@ script_id TMCx :production_cycle_guildhall notowns captaincy blank_return - notowns daedala blank_return local 255 AtL 8 guildhall blank_return add_bld 255 guildhall 1 3 97 call main_wait_300 @@ -4723,7 +4686,6 @@ script_id TMCx :production_cycle_fulcrum_check bring 13 AtM 1 fulcrum Loc.63 production_cycle_fulcrum var AtM|Jump mining_count_var 2 production_cycle_fulcrum 13 - notowns atlas production_cycle_fulcrum bring 13 AtM 4 palladium Loc.63 production_cycle_fulcrum return @@ -4749,7 +4711,6 @@ script_id TMCx :production_cycle_palladium notowns fulcrum blank_return - notowns atlas blank_return local 255 AtL 8 palladium blank_return add_bld 255 palladium 1 3 96 call main_wait_300 @@ -4841,7 +4802,6 @@ script_id TMCx :production_cycle_commandment notowns starport blank_return - notowns daedala blank_return local 255 AtL 8 commandment blank_return add_bld 255 commandment 1 3 97 call main_wait_300 @@ -4878,7 +4838,9 @@ script_id TMCx :add_return wait 24 - return + res 13 AtL Any 1200 blank_return + res 13 AtL Any 800 add_return_wait_480 + goto add_return_wait_960 :add_return_wait_480 wait 30 @@ -5041,7 +5003,7 @@ script_id TMCx call atk_armor_ironfoundry call atk_armor_bioticbase call atk_armor_mantle - call atk_armor_machineshop + call atk_armor_palladium call atk_armor_fulcrum call atk_armor_scrapyard return @@ -5052,14 +5014,14 @@ script_id TMCx call atk_raider_captaincy call atk_raider_tinkererstower call atk_raider_vestry + call atk_raider_covenant call atk_raider_stockade - call atk_raider_covertops return :atk_wave_orbital - call atk_orbital_particleaccelerator + call atk_orbital_hadron call atk_orbital_naniteassembly - call atk_orbital_munitionsbay + call atk_orbital_rotary call atk_orbital_commandment call atk_orbital_starport call atk_orbital_starpad @@ -5081,7 +5043,7 @@ script_id TMCx call atk_shaman return - :atk_raider_covertops + :atk_raider_covenant var AtL|Call prefEidolon 1 atk_eidolon2 13 var AtL|Call prefSavant 1 atk_savant2 13 call atk_eidolon @@ -5136,7 +5098,7 @@ script_id TMCx call atk_matador return - :atk_armor_machineshop + :atk_armor_palladium var AtL|Call prefPhalanx 1 atk_phalanx2 13 var AtL|Call prefMadrigal 1 atk_madrigal2 13 call atk_phalanx @@ -5153,9 +5115,9 @@ script_id TMCx return :atk_armor_ironfoundry - var AtL|Call prefPaladin 1 atk_paladin2 13 - var AtL|Call prefCuirass 1 atk_cuirass2 13 - var AtL|Call prefPazuzu 1 atk_pazuzu2 13 + var AtL|Call pref_paladin 1 atk_paladin2 13 + var AtL|Call pref_cuirass 1 atk_cuirass2 13 + var AtL|Call pref_pazuzu 1 atk_pazuzu2 13 call atk_paladin call atk_cuirass call atk_pazuzu @@ -5189,7 +5151,7 @@ script_id TMCx call atk_valkyrie return - :atk_orbital_munitionsbay + :atk_orbital_rotary var AtL|Call prefSalamander 1 atk_salamander2 13 var AtL|Call prefSundog 1 atk_sundog2 13 call atk_salamander @@ -5212,7 +5174,7 @@ script_id TMCx call atk_magnetar return - :atk_orbital_particleaccelerator + :atk_orbital_hadron var AtL|Call prefHippogriff 1 atk_hippogriff2 13 var AtL|Call prefPhobos 1 atk_phobos2 13 call atk_hippogriff @@ -5227,6 +5189,7 @@ script_id TMCx :atk_maverick2 notowns stockade blank_return atk_rel maverick stockade 3 + wait 80 return :atk_harakan @@ -5237,6 +5200,7 @@ script_id TMCx :atk_harakan2 notowns stockade blank_return atk_rel harakan stockade 1.5 + wait 80 return :atk_cyprian @@ -5247,6 +5211,7 @@ script_id TMCx :atk_cyprian2 notowns stockade blank_return atk_rel cyprian stockade 1.75 + wait 80 return :atk_cleric @@ -5259,6 +5224,7 @@ script_id TMCx notowns vestry blank_return notowns stockade blank_return atk_rel cleric vestry 2 + wait 80 return :atk_shaman @@ -5271,6 +5237,7 @@ script_id TMCx notowns vestry blank_return notowns stockade blank_return atk_rel shaman vestry 1 + wait 80 return :atk_eidolon @@ -5283,6 +5250,7 @@ script_id TMCx notowns covenant blank_return notowns stockade blank_return atk_rel eidolon covenant 1.5 + wait 80 return :atk_savant @@ -5295,6 +5263,7 @@ script_id TMCx notowns covenant blank_return notowns stockade blank_return atk_rel savant covenant 1.25 + wait 80 return :atk_madcap @@ -5305,6 +5274,7 @@ script_id TMCx :atk_madcap2 notowns captaincy blank_return atk_rel madcap captaincy 3.5 + wait 80 return :atk_heracles @@ -5315,6 +5285,7 @@ script_id TMCx :atk_heracles2 notowns captaincy blank_return atk_rel heracles captaincy 2.25 + wait 80 return :atk_apostle @@ -5325,6 +5296,7 @@ script_id TMCx :atk_apostle2 notowns captaincy blank_return atk_rel apostle captaincy 1.25 + wait 80 return :atk_siren @@ -5337,6 +5309,7 @@ script_id TMCx notowns tinkerers_tower blank_return notowns captaincy blank_return atk_rel siren tinkerers_tower 2 + wait 80 return :atk_striga @@ -5349,6 +5322,7 @@ script_id TMCx notowns tinkerers_tower blank_return notowns captaincy blank_return atk_rel striga tinkerers_tower 2 + wait 80 return :atk_olympian @@ -5361,6 +5335,7 @@ script_id TMCx notowns guildhall blank_return notowns captaincy blank_return atk_rel olympian guildhall 2.25 + wait 80 return :atk_autocrat @@ -5373,6 +5348,7 @@ script_id TMCx notowns guildhall blank_return notowns captaincy blank_return atk_rel autocrat guildhall 1 + wait 80 return :atk_dilettante @@ -5383,6 +5359,7 @@ script_id TMCx :atk_dilettante2 notowns apothecary blank_return atk_rel dilettante apothecary 2.25 + wait 80 return :atk_sevenstep @@ -5393,6 +5370,7 @@ script_id TMCx :atk_sevenstep2 notowns apothecary blank_return atk_rel sevenstep apothecary 2.25 + wait 80 return :atk_silvertongue @@ -5403,6 +5381,7 @@ script_id TMCx :atk_silvertongue2 notowns apothecary blank_return atk_rel silvertongue apothecary 2.25 + wait 80 return :atk_vulture @@ -5413,6 +5392,7 @@ script_id TMCx :atk_vulture2 notowns fulcrum blank_return atk_rel vulture fulcrum 2 + wait 80 return :atk_cyclops @@ -5423,6 +5403,7 @@ script_id TMCx :atk_cyclops2 notowns fulcrum blank_return atk_rel cyclops fulcrum 2 + wait 80 return :atk_goliath @@ -5433,6 +5414,7 @@ script_id TMCx :atk_goliath2 notowns fulcrum blank_return atk_rel goliath fulcrum 3 + wait 80 return :atk_blackjack @@ -5445,6 +5427,7 @@ script_id TMCx notowns scrapyard blank_return notowns fulcrum blank_return atk_rel blackjack scrapyard 2 + wait 80 return :atk_matador @@ -5457,6 +5440,7 @@ script_id TMCx notowns scrapyard blank_return notowns fulcrum blank_return atk_rel matador scrapyard 2 + wait 80 return :atk_phalanx @@ -5469,6 +5453,7 @@ script_id TMCx notowns palladium blank_return notowns fulcrum blank_return atk_rel phalanx palladium 2 + wait 80 return :atk_madrigal @@ -5481,6 +5466,7 @@ script_id TMCx notowns palladium blank_return notowns fulcrum blank_return atk_rel madrigal palladium 2 + wait 80 return :atk_ramesses @@ -5491,6 +5477,7 @@ script_id TMCx :atk_ramesses2 notowns mantle blank_return atk_rel ramesses mantle 2 + wait 80 return :atk_durendal @@ -5501,6 +5488,7 @@ script_id TMCx :atk_durendal2 notowns mantle blank_return atk_rel durendal mantle 2 + wait 80 return :atk_cataphract @@ -5511,6 +5499,7 @@ script_id TMCx :atk_cataphract2 notowns mantle blank_return atk_rel cataphract mantle 2 + wait 80 return :atk_paladin @@ -5521,6 +5510,7 @@ script_id TMCx :atk_paladin2 notowns iron_foundry blank_return atk_rel paladin iron_foundry 1.25 + wait 80 return :atk_cuirass @@ -5531,6 +5521,7 @@ script_id TMCx :atk_cuirass2 notowns iron_foundry blank_return atk_rel cuirass iron_foundry 2 + wait 80 return :atk_pazuzu @@ -5541,6 +5532,7 @@ script_id TMCx :atk_pazuzu2 notowns iron_foundry blank_return atk_rel pazuzu iron_foundry 2 + wait 80 return :atk_claymore @@ -5553,6 +5545,7 @@ script_id TMCx notowns future_station blank_return notowns iron_foundry blank_return atk_rel claymore future_station 2 + wait 80 return :atk_penumbra @@ -5565,6 +5558,7 @@ script_id TMCx notowns future_station blank_return notowns iron_foundry blank_return atk_rel penumbra future_station 1 + wait 80 return :atk_aion @@ -5577,6 +5571,7 @@ script_id TMCx notowns biotic_bastion blank_return notowns iron_foundry blank_return atk_rel aion biotic_bastion 2 + wait 80 return :atk_anticthon @@ -5589,6 +5584,7 @@ script_id TMCx notowns biotic_bastion blank_return notowns iron_foundry blank_return atk_rel anticthon biotic_bastion 2 + wait 80 return :atk_wraith @@ -5599,6 +5595,7 @@ script_id TMCx :atk_wraith2 notowns starpad blank_return atk_rel wraith starpad 2 + wait 80 return :atk_gorgon @@ -5609,6 +5606,7 @@ script_id TMCx :atk_gorgon2 notowns starport blank_return atk_rel gorgon starport 1.5 + wait 80 return :atk_wyvern @@ -5619,6 +5617,7 @@ script_id TMCx :atk_wyvern2 notowns starport blank_return atk_rel wyvern starport 1.5 + wait 80 return :atk_valkyrie @@ -5628,6 +5627,7 @@ script_id TMCx :atk_valkyrie2 notowns starport blank_return atk_rel valkyrie starport 1 + wait 80 return :atk_salamander @@ -5640,6 +5640,7 @@ script_id TMCx notowns rotary blank_return notowns starport blank_return atk_rel salamander rotary 1.5 + wait 80 return :atk_sundog @@ -5652,6 +5653,7 @@ script_id TMCx notowns rotary blank_return notowns starport blank_return atk_rel sundog rotary 1.5 + wait 80 return :atk_seraph @@ -5663,6 +5665,7 @@ script_id TMCx notowns commandment blank_return notowns starport blank_return atk_rel seraph commandment 0.75 + wait 80 return :atk_azazel @@ -5674,6 +5677,7 @@ script_id TMCx notowns commandment blank_return notowns starport blank_return atk_rel azazel commandment 1 + wait 80 return :atk_centaur @@ -5684,6 +5688,7 @@ script_id TMCx :atk_centaur2 notowns nanite_assembly blank_return atk_rel centaur nanite_assembly 1.5 + wait 80 return :atk_minotaur @@ -5694,6 +5699,7 @@ script_id TMCx :atk_minotaur2 notowns nanite_assembly blank_return atk_rel minotaur nanite_assembly 1.25 + wait 80 return :atk_magnetar @@ -5704,6 +5710,7 @@ script_id TMCx :atk_magnetar2 notowns nanite_assembly blank_return atk_rel magnetar nanite_assembly 1.25 + wait 80 return :atk_hippogriff @@ -5716,6 +5723,7 @@ script_id TMCx notowns hadron blank_return notowns nanite_assembly blank_return atk_rel hippogriff hadron 1 + wait 80 return :atk_phobos @@ -5728,6 +5736,7 @@ script_id TMCx notowns hadron blank_return notowns nanite_assembly blank_return atk_rel phobos hadron 1 + wait 80 return :early_military @@ -5933,6 +5942,8 @@ script_id TMCx :faction_hecaton replace_unit maverick hotshot + replace_unit trojan qilin + replace_unit apostle auriel return :faction_futurist diff --git a/CMBW-editor/ai/cm_zerg.asc3 b/CMBW-editor/ai/cm_zerg.asc3 index 517b84d..5f476cd 100644 --- a/CMBW-editor/ai/cm_zerg.asc3 +++ b/CMBW-editor/ai/cm_zerg.asc3 @@ -183,10 +183,8 @@ script_id ZMCx dth 13 Ex_C 1 zobriolisk prefUZobriolisk dth 13 Ex_C 1 zarcavrokor prefUZarcavrokor dth 13 Ex_C 1 tetcaerokor prefUTetcaerokor -# dth 13 Ex_C 1 selkerilisk prefUSelkerilisk - dth 13 Ex_C 1 akistrokor prefUAkistrokor dth 13 Ex_C 1 isthrathaleth prefUIsthrathaleth -# dth 13 Ex_C 1 elthrazalisk prefUElthrazalisk + dth 13 Ex_C 1 akistrokor prefUAkistrokor # production dth 13 Ex_C 1 ovileth prefBOvileth dth 13 Ex_C 1 iroleth prefBIroleth @@ -406,7 +404,7 @@ script_id ZMCx var Set prefHydralisk 1 13 var Set prefIzirokor 0 13 var Set prefSkithrokor 0 13 - var Set pref_hydrok 1 13 + var Set pref_hydrith 1 13 dth 13 Ex 0 start_location blank_return print prefHydralisk return @@ -415,7 +413,7 @@ script_id ZMCx var Set prefHydralisk 0 13 var Set prefIzirokor 1 13 var Set prefSkithrokor 0 13 - var Set pref_hydrok 1 13 + var Set pref_hydrith 1 13 dth 13 Ex 0 start_location blank_return print prefIzirokor return @@ -424,7 +422,7 @@ script_id ZMCx var Set prefHydralisk 0 13 var Set prefIzirokor 0 13 var Set prefSkithrokor 1 13 - var Set pref_hydrok 1 13 + var Set pref_hydrith 1 13 dth 13 Ex 0 start_location blank_return print prefSkithrokor return @@ -598,39 +596,31 @@ script_id ZMCx :prefUTetcaerokor var Set prefTetcaerokor 1 13 - var Set prefSelkerilisk 0 13 + var Set prefIsthrathaleth 0 13 var Set prefAkistrokor 0 13 var Set pref_almakis 1 13 dth 13 Ex 0 start_location blank_return print prefTetcaerokor return - :prefUSelkerilisk + :prefUIsthrathaleth var Set prefTetcaerokor 0 13 - var Set prefSelkerilisk 1 13 + var Set prefIsthrathaleth 1 13 var Set prefAkistrokor 0 13 var Set pref_almakis 1 13 dth 13 Ex 0 start_location blank_return - print prefSelkerilisk + print prefIsthrathaleth return :prefUAkistrokor var Set prefTetcaerokor 0 13 - var Set prefSelkerilisk 0 13 + var Set prefIsthrathaleth 0 13 var Set prefAkistrokor 1 13 var Set pref_almakis 1 13 dth 13 Ex 0 start_location blank_return print prefAkistrokor return - :prefUIsthrathaleth - var Set prefIsthrathaleth 1 13 - var Set prefElthrazalisk 0 13 - var Set pref_elthisth 1 13 - dth 13 Ex 0 start_location blank_return - print prefIsthrathaleth - return - :prefUElthrazalisk var Set prefIsthrathaleth 0 13 var Set prefElthrazalisk 1 13 @@ -774,15 +764,15 @@ script_id ZMCx var Set prefVithrilisk 1 13 return - :buildpref_izkag_kagralisk + :buildpref_alkag_kagralisk var Set prefKagralisk 1 13 return - :buildpref_izkag_evigrilisk + :buildpref_alkag_evigrilisk var Set prefEvigrilisk 1 13 return - :buildpref_izkag_almaksalisk + :buildpref_alkag_almaksalisk var Set prefAlmaksalisk 1 13 return @@ -838,22 +828,14 @@ script_id ZMCx var Set prefTetcaerokor 1 13 return - :buildpref_almakis_selkerilisk - var Set prefSelkerilisk 1 13 + :buildpref_almakis_isthrathaleth + var Set prefIsthrathaleth 1 13 return :buildpref_almakis_akistrokor var Set prefAkistrokor 1 13 return - :buildpref_elthisth_isthrathaleth - var Set prefIsthrathaleth 1 13 - return - - :buildpref_elthisth_elthrazalisk - var Set prefElthrazalisk 1 13 - return - :buildpref_transport_ovileth var Set prefOvileth 1 13 return @@ -1116,7 +1098,6 @@ script_id ZMCx call def_zorkiz call def_axtoth call def_quazeth - call def_elthisth call def_almakis call def_geszkath_mutation call def_kalkiir @@ -1140,7 +1121,6 @@ script_id ZMCx call def_hydrith call def_ultrav call def_geszkath - call def_elthisth return :defense_handling_sunblot @@ -1153,7 +1133,6 @@ script_id ZMCx call def_geszkath_mutation call def_zorkiz call def_alkag - call def_elthisth call def_kalkiir call def_almakis call def_geszkath @@ -1278,20 +1257,14 @@ script_id ZMCx call def_akistrokor return - :def_elthisth - # No isthrathaleth defense requests as they are weaponless -# var AtL|Call prefElthrazalisk 1 defElthrazalisk 13 -# call defElthrazalisk - return - :def_zethrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return defb_gg 1 zethrokor defu_gg 1 zethrokor return :def_quazilisk - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return defb_gg 1 quazilisk defb_ag 1 quazilisk defu_gg 1 quazilisk @@ -1299,7 +1272,7 @@ script_id ZMCx return :def_nathrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 vornath_pond|kalkiir_lake Loc.63 blank_return defb_gg 1 nathrokor defb_ga 1 nathrokor defb_ag 1 nathrokor @@ -1311,13 +1284,13 @@ script_id ZMCx return :def_vorvrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 vornath_pond|kalkiir_lake Loc.63 blank_return defb_gg 1 vorvrokor defu_gg 1 vorvrokor return :def_liiralisk - notowns kalkiir_pond blank_return + notowns kalkiir_lake blank_return defb_gg 1 liiralisk defb_ag 1 liiralisk defu_gg 1 liiralisk @@ -1325,7 +1298,7 @@ script_id ZMCx return :def_kalkalisk - notowns kalkiir_pond blank_return + notowns kalkiir_lake blank_return defb_gg 1 kalkalisk defb_ga 1 kalkalisk defb_ag 1 kalkalisk @@ -1415,7 +1388,7 @@ script_id ZMCx return :def_izirokor - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return defb_gg 1 hydralisk defb_ag 1 hydralisk defu_gg 1 hydralisk @@ -1423,7 +1396,7 @@ script_id ZMCx return :defIzirokor - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return defb_gg 1 izirokor # don't build close-range attackers to deal with air threats, but use them if you have them defu_gg 1 izirokor @@ -1431,7 +1404,7 @@ script_id ZMCx return :def_skithrokor - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 skibact_scab|tethvith_swamp Loc.63 blank_return defb_gg 1 skithrokor defb_ga 1 skithrokor defb_ag 1 skithrokor @@ -1443,7 +1416,7 @@ script_id ZMCx return :def_bactalisk - notowns bactith_swamp blank_return + bring 13 Ex 0 skibact_scab|tethvith_swamp Loc.63 blank_return defb_gg 1 bactalisk defb_ag 1 bactalisk defu_gg 1 bactalisk @@ -1451,13 +1424,13 @@ script_id ZMCx return :def_tethzorokor - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return defb_gg 1 tethzorokor defu_gg 1 tethzorokor return :def_vithrilisk - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return defb_ag 1 vithrilisk defu_ag 1 vithrilisk defu_aa 1 vithrilisk @@ -1637,22 +1610,23 @@ script_id ZMCx wait 24 multi build_order var Ex|Jump skip_building_var 1 idle 13 - call main_wait_1200 - call main_wait_150 - bring 13 AtL_W 1 quazeth_pool|kalkiir_pond|hydrith_den|bactith_swamp|zorkiz_shroud|ultrav_cavern Loc.63 blank - multi add_larvosk_generic + call main_wait_1500 + var Ex|Wait can_build_static_defense_var 1 13 multi request_surkith - call main_wait_300 + call main_wait_750 wait 60 multi request_spraith call main_wait_1200 + bring 13 AtL_W 1 irol_iris Loc.63 blank multi add_larvosk_generic - bring 13 AtL_W 1 othstol_oviform Loc.63 blank - add_bld 255 cagrant_cesiant 1 20 98 + call main_wait_750 + multi add_larvosk_generic + call main_wait_2400 + add_bld 255 cagrant_cesiant 1 9 98 add_bld 255 nydus_cesiant 1 3 98 call main_wait_3600 call main_wait_3600 - add_bld 255 cagrant_cesiant 1 20 98 + add_bld 255 cagrant_cesiant 1 9 98 add_bld 255 nydus_cesiant 1 3 98 goto idle @@ -1888,6 +1862,7 @@ script_id ZMCx 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 @@ -1964,17 +1939,17 @@ script_id ZMCx call main_wait_750 multi add_larvosk_generic call main_wait_600 - resarea 255 AtL 255 Ore 1 production_cycle + resarea 255 AtL_M 255 Ore 1 production_cycle var Ex|Wait build_done_var 1 13 call main_wait_300 multi build_order_expansion call main_wait_300 call main_wait_300 bring 13 AtL_W 1 othstol_oviform Loc.63 blank - add_bld 255 cagrant_cesiant 1 20 98 + add_bld 255 cagrant_cesiant 1 9 98 add_bld 255 nydus_cesiant 1 3 98 wait 7200 - add_bld 255 cagrant_cesiant 1 20 98 + add_bld 255 cagrant_cesiant 1 9 98 add_bld 255 nydus_cesiant 1 3 98 goto idle @@ -2041,7 +2016,6 @@ script_id ZMCx goto expansion_worker_standard_loop :add_larvosk_generic - call wait_for_IrolIris add_bld 255 larvosk_cesiant 1 30 95 stop @@ -2053,11 +2027,12 @@ script_id ZMCx # tier one var Ex|Call pref_swarm 1 tech_to_quazeth 13 var Ex|Call prefQuazilisk 1 tech_to_quazeth 13 - var Ex|Call prefNathrokor 1 tech_to_quazeth 13 - var Ex|Call prefVorvrokor 1 tech_to_quazeth 13 - var Ex|Call prefHydralisk 1 tech_to_hydrok 13 - var Ex|Call prefIzirokor 1 tech_to_hydrok 13 - var Ex|Call prefSkithrokor 1 tech_to_hydrok 13 + var Ex|Call prefNathrokor 1 tech_to_nathrok 13 + var Ex|Call prefVorvrokor 1 tech_to_nathrok 13 + var Ex|Call prefHydralisk 1 tech_to_hydrith 13 + var Ex|Call prefIzirokor 1 tech_to_hydrith 13 + var Ex|Call prefSkithrokor 1 tech_to_skithrok 13 + var Ex|Call prefBactalisk 1 tech_to_skithrok 13 var Ex|Call prefZoryusthaleth 1 tech_to_zorkiz 13 var Ex|Call prefLakizilisk 1 tech_to_zorkiz 13 var Ex|Call prefGorgrokor 1 tech_to_zorkiz 13 @@ -2068,7 +2043,6 @@ script_id ZMCx var Ex|Call prefLiiralisk 1 tech_to_kalkiir 13 var Ex|Call prefKalkalisk 1 tech_to_kalkiir 13 var Ex|Call pref_assault 1 tech_to_bactith 13 - var Ex|Call prefBactalisk 1 tech_to_bactith 13 var Ex|Call prefTethzorokor 1 tech_to_bactith 13 var Ex|Call prefVithrilisk 1 tech_to_bactith 13 var Ex|Call build_type_is_greed_var 0 tech_handling_branch 13 # TODO: Replace with a more robust (and user-configurable) set of checks @@ -2099,7 +2073,7 @@ script_id ZMCx var Ex|Call pref_assault 1 tech_to_geszkath 13 var Ex|Call prefGeszithalor 1 tech_to_geszkath 13 var Ex|Call prefKeskathalor 1 tech_to_geszkath 13 - var Ex|Call prefIsthrathaleth 1 tech_to_elthisth 13 + var Ex|Call prefIsthrathaleth 1 tech_to_almakis 13 var Ex|Call prefElthrazalisk 1 tech_to_elthisth 13 stop @@ -2175,20 +2149,28 @@ script_id ZMCx return :tech_to_quazeth - bring 13 AtL 1 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 AtL 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return call tech_check p_need 1 quazeth_pool bring 13 AtL_W 1 quazeth_pool Loc.63 blank call tech_wait return - :tech_to_kalkiir - bring 13 AtL 1 kalkiir_pond Loc.63 blank_return + :tech_to_nathrok + bring 13 AtL 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return call tech_check - bring 13 Ex_C 0 quazeth_pool Loc.63 tech_to_quazeth + p_need 1 vornath_pond + bring 13 AtL_W 1 vornath_pond Loc.63 blank + call tech_wait + return + + :tech_to_kalkiir + bring 13 AtL 1 kalkiir_lake Loc.63 blank_return + call tech_check + bring 13 Ex_C 0 quazeth_pool|vornath_pond Loc.63 tech_to_quazeth bring 13 Ex_C 0 irol_iris|othstol_oviform Loc.63 tech_to_irol - p_need 1 kalkiir_pond - bring 13 AtL_W 1 kalkiir_pond Loc.63 blank + p_need 1 kalkiir_lake + bring 13 AtL_W 1 kalkiir_lake Loc.63 blank call tech_wait return @@ -2220,21 +2202,29 @@ script_id ZMCx call tech_wait return - :tech_to_hydrok - bring 13 AtL 1 hydrith_den|bactith_swamp Loc.63 blank_return + :tech_to_hydrith + bring 13 AtL 1 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return call tech_check p_need 1 hydrith_den bring 13 AtL_W 1 hydrith_den Loc.63 blank call tech_wait return - :tech_to_bactith - bring 13 AtL 1 bactith_swamp Loc.63 blank_return + :tech_to_skithrok + bring 13 AtL 1 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return call tech_check - bring 13 Ex_C 0 hydrith_den Loc.63 tech_to_hydrok + p_need 1 skibact_scab + bring 13 AtL_W 1 skibact_scab Loc.63 blank + call tech_wait + return + + :tech_to_bactith + bring 13 AtL 1 tethvith_swamp Loc.63 blank_return + call tech_check + bring 13 Ex_C 0 hydrith_den Loc.63 tech_to_hydrith bring 13 Ex_C 0 irol_iris|othstol_oviform Loc.63 tech_to_irol - p_need 1 bactith_swamp - bring 13 AtL_W 1 bactith_swamp Loc.63 blank + p_need 1 tethvith_swamp + bring 13 AtL_W 1 tethvith_swamp Loc.63 blank call tech_wait return @@ -2531,7 +2521,7 @@ script_id ZMCx :build_general_SleepingGiant_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 @@ -2553,15 +2543,17 @@ script_id ZMCx bring 13 AtL_W 15 droleth Loc.63 blank call main_wait_300 var Set build_gas_var 1 13 - call main_wait_300 + p_need 1 vornath_pond + bld 2 hachirosk 104 + call main_wait_600 multi need_irol call main_wait_300 var Set can_attack_var 1 13 call main_wait_150 call wait_for_IrolIris - bld 1 caphrolosk 98 + bld 1 caphrolosk 104 call main_wait_750 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_750 p_need 1 zorkiz_shroud call main_wait_600 @@ -2577,7 +2569,7 @@ script_id ZMCx :build_general_SleepingGiant_Morph call wait_for_IrolIris call wait_for_QuazethPool - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake p_need 1 matravil_nest call main_wait_900 p_need 1 mutath_spire @@ -2592,9 +2584,9 @@ script_id ZMCx :build_general_ShriekingSwarm_Main var Ex|Call pref_quazeth 0 buildpref_kalkiir_vorvrokor 13 var Ex|Call pref_zorkiz 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call prefControlOrphan 0 buildpref_zorkiz_lakizilisk 13 - var Ex|Call pref_matravil 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_matravil 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 @@ -2609,12 +2601,13 @@ script_id ZMCx call main_wait_900 var Set can_attack_var 1 13 call main_wait_300 + bld 2 hachirosk 104 var Set can_build_static_defense_var 1 13 call main_wait_300 var Set build_gas_var 1 13 call main_wait_300 - var Set build_gas_var 1 13 - call main_wait_300 + p_need 1 vornath_pond + call main_wait_900 multi need_irol multi build_general_ShriekingSwarm_Morph var Sub can_worker_var 1 13 @@ -2624,18 +2617,18 @@ script_id ZMCx call main_wait_900 p_need 1 zorkiz_shroud call main_wait_450 - bld 1 caphrolosk 98 + bld 1 caphrolosk 104 call main_wait_600 multi production_cycle call main_wait_150 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_300 goto build_general_fin :build_general_ShriekingSwarm_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake stop :build_general_Subjugation @@ -2645,8 +2638,8 @@ script_id ZMCx :build_general_Subjugation_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_keskathalor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 - var Ex|Call pref_matravil 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_matravil 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_muthrok 0 buildpref_bactith_vithrilisk 13 var Ex|Call pref_almakis 0 buildpref_matravil_matraleth 13 @@ -2662,7 +2655,7 @@ script_id ZMCx p_need 1 hydrith_den call main_wait_300 var Add can_worker_var 1 13 - multi add_larvosk_generic + bld 2 hachirosk 104 call main_wait_300 bring 13 AtL_W 1 larva Loc.63 blank queue 1 hydralisk larva 255 Global Loc.63 88 @@ -2674,6 +2667,7 @@ script_id ZMCx queue 1 hydralisk larva 255 Global Loc.63 88 wait 24 var Set build_supply 1 13 + p_need 1 skibact_scab call main_wait_900 var Set can_build_static_defense_var 1 13 call main_wait_150 @@ -2700,7 +2694,8 @@ script_id ZMCx call main_wait_600 multi build_general_Subjugation_Morph call main_wait_300 - bld 1 caphrolosk 98 + bld 1 caphrolosk 104 + bld 3 hachirosk 104 call main_wait_1050 p_need 1 zorkiz_shroud goto build_general_fin @@ -2708,7 +2703,7 @@ script_id ZMCx :build_general_Subjugation_Morph w_bld 1 hydrith_den call wait_for_IrolIris - p_need 1 bactith_swamp + p_need 1 tethvith_swamp p_need 1 matravil_nest stop @@ -2737,25 +2732,26 @@ script_id ZMCx call main_wait_150 var Add can_worker_var 1 13 var Set build_supply 1 13 - call main_wait_450 + call main_wait_900 p_need 1 zorkiz_shroud call main_wait_300 + bld 2 hachirosk 104 var Set can_build_static_defense_var 1 13 call main_wait_300 var Sub can_worker_var 1 13 var Set can_attack_var 1 13 - call main_wait_900 - var Add can_worker_var 1 13 call main_wait_1200 + var Add can_worker_var 1 13 + call main_wait_600 call expansion_loop_normal - call main_wait_300 + call main_wait_1200 var Set build_gas_var 1 13 - call main_wait_300 + call main_wait_600 multi need_irol call main_wait_300 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_300 - bld 3 hachirosk 98 + bld 4 hachirosk 104 call main_wait_300 multi build_general_BeforeTheStorm_Morph call main_wait_150 @@ -2769,7 +2765,7 @@ script_id ZMCx :build_general_BeforeTheStorm_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake stop :build_general_TimeAfterTime @@ -2778,7 +2774,7 @@ script_id ZMCx :build_general_TimeAfterTime_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_skithrokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_skithrokor 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_lakizilisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_liiralisk 13 var Ex|Call pref_muthrok 0 buildpref_mutath_cikralisk 13 @@ -2812,10 +2808,12 @@ script_id ZMCx multi expansion_loop_toggle call main_wait_600 var Add can_worker_var 1 13 - call main_wait_150 - var Set build_gas_var 1 13 call main_wait_450 + p_need 1 skibact_scab + var Set build_gas_var 1 13 + call main_wait_600 p_need 1 zorkiz_shroud + bld 2 hachirosk 104 call main_wait_1200 multi need_irol call main_wait_300 @@ -2831,7 +2829,7 @@ script_id ZMCx :build_general_TimeAfterTime_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake stop :build_general_ConstrainedCoil @@ -2864,9 +2862,10 @@ script_id ZMCx var Set can_build_static_defense_var 1 13 call main_wait_900 p_need 1 hydrith_den - call main_wait_300 + call main_wait_450 var Set build_gas_var 1 13 - call main_wait_600 + p_need 1 vornath_pond + call main_wait_450 multi expansion_loop_toggle call main_wait_900 multi need_irol @@ -2876,6 +2875,7 @@ script_id ZMCx var Sub can_worker_var 1 13 call expansion_loop_normal call main_wait_600 + bld 2 hachirosk 104 var Add can_worker_var 1 13 multi production_cycle goto build_general_fin @@ -2886,7 +2886,7 @@ script_id ZMCx :build_general_fin2 placeholder_count Local AtL|Jump 2 Group_Buildings blank 13 - call wHydrok + call wHydrith call main_wait_450 call wQuazeth call wLiivral @@ -2903,7 +2903,7 @@ script_id ZMCx call main_wait_300 call wGathtelosk call main_wait_300 - call wUltrok + call wUltrav call main_wait_300 call wElthisth call main_wait_600 @@ -2917,65 +2917,66 @@ script_id ZMCx :build_order_assault dth 13 AtL 1 dark_swarm_unit build_order_assault_select - var Ex|Jump build_type_is_timing_var 1 build_order_assaultTypeTiming 13 - var Ex|Jump build_type_is_rush_var 1 build_order_assaultTypeRush 13 - var Ex|Jump build_type_is_greed_var 1 build_order_assaultTypeGreed 13 + var Ex|Jump build_type_is_timing_var 1 build_order_assault_type_Timing 13 + var Ex|Jump build_type_is_rush_var 1 build_order_assault_type_Rush 13 + var Ex|Jump build_type_is_greed_var 1 build_order_assault_type_Greed 13 - :build_order_assaultTypeTiming + :build_order_assault_type_Timing # 3 timings - rand_j 85 build_order_assaultTypeTiming_1 - rand_j 128 build_order_assaultTypeTiming_2 - goto build_order_assaultTypeTiming_3 + rand_j 85 build_order_assault_type_Timing_1 + rand_j 128 build_order_assault_type_Timing_2 + goto build_order_assault_type_Timing_3 - :build_order_assaultTypeTiming_1 + :build_order_assault_type_Timing_1 dth 13 Set 1 dark_swarm_unit blank goto build_order_assault_select - :build_order_assaultTypeTiming_2 + :build_order_assault_type_Timing_2 dth 13 Set 5 dark_swarm_unit blank goto build_order_assault_select - :build_order_assaultTypeTiming_3 + :build_order_assault_type_Timing_3 dth 13 Set 6 dark_swarm_unit blank goto build_order_assault_select - :build_order_assaultTypeRush + :build_order_assault_type_Rush # 2 rushes - rand_j 128 build_order_assaultTypeRush_1 - goto build_order_assaultTypeRush_2 + rand_j 128 build_order_assault_type_Rush_1 + goto build_order_assault_type_Rush_2 - :build_order_assaultTypeRush_1 + :build_order_assault_type_Rush_1 dth 13 Set 2 dark_swarm_unit blank goto build_order_assault_select - :build_order_assaultTypeRush_2 + :build_order_assault_type_Rush_2 dth 13 Set 3 dark_swarm_unit blank goto build_order_assault_select - :build_order_assaultTypeGreed + :build_order_assault_type_Greed # 1 greed - goto build_order_assaultTypeGreed_1 + goto build_order_assault_type_Greed_1 - :build_order_assaultTypeGreed_1 + :build_order_assault_type_Greed_1 dth 13 Set 4 dark_swarm_unit blank goto build_order_assault_select :build_order_assault_select - dth 13 Ex 1 dark_swarm_unit buildAssault3HatchHydrok - dth 13 Ex 2 dark_swarm_unit buildAssault2HatchZorkiz - dth 13 Ex 3 dark_swarm_unit buildAssault2HatchHydrokQuazeth - dth 13 Ex 4 dark_swarm_unit build_assault_2BaseGeszkath + dth 13 Ex 1 dark_swarm_unit build_assault_3BaseHydrith + dth 13 Ex 2 dark_swarm_unit build_assault_2BaseZorkiz + dth 13 Ex 3 dark_swarm_unit build_assault_2BaseHydrithQuazeth + dth 13 Ex 4 dark_swarm_unit build_assault_2BaseAlkag dth 13 Ex 5 dark_swarm_unit build_assault_Potency + dth 13 Ex 6 dark_swarm_unit build_assault_EarthenTides - :buildAssault3HatchHydrok - dth 13 Ex 0 start_location buildAssault3Hatchhydrith_Main - print Zerg<32>Assault<32>timing<32>1:<32>3Hatch<32>Hydrok + :build_assault_3BaseHydrith + dth 13 Ex 0 start_location build_assault_3BaseHydrith_Main + print Zerg<32>Assault<32>timing<32>1:<32>3<32>Base<32>Hydrith - :buildAssault3Hatchhydrith_Main + :build_assault_3BaseHydrith_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_kagralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_kagralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 @@ -2983,12 +2984,9 @@ script_id ZMCx var Ex|Call pref_matravil 0 buildpref_matravil_matraleth 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_larvoskcesiant 13 - call main_wait_1050 - var Sub can_worker_var 1 13 - multi expansion_loop_toggle call main_wait_600 - var Add can_worker_var 1 13 - call main_wait_900 + call build_order_component_expand + call main_wait_150 p_need 1 hydrith_den call main_wait_600 var Set can_build_static_defense_var 1 13 @@ -3008,9 +3006,12 @@ script_id ZMCx call expansion_loop_normal call main_wait_600 var Add can_worker_var 1 13 - call main_wait_600 + bld 2 hachirosk 104 + call main_wait_450 p_need 1 quazeth_pool call main_wait_600 + p_need 1 skibact_scab + call main_wait_600 var Set build_gas_var 1 13 call main_wait_300 multi need_irol @@ -3019,24 +3020,24 @@ script_id ZMCx call main_wait_600 call expansion_loop_normal call main_wait_300 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_600 p_need 1 zorkiz_shroud call main_wait_600 multi need_othstol call main_wait_600 - bld 3 hachirosk 98 + bld 4 hachirosk 104 call main_wait_600 goto build_assault_fin - :buildAssault2HatchZorkiz - dth 13 Ex 0 start_location buildAssault2HatchZorkiz_Main - print Zerg<32>Assault<32>rush<32>1:<32>2Hatch<32>Zorkiz + :build_assault_2BaseZorkiz + dth 13 Ex 0 start_location build_assault_2BaseZorkiz_Main + print Zerg<32>Assault<32>rush<32>1:<32>2<32>Base<32>Zorkiz - :buildAssault2HatchZorkiz_Main + :build_assault_2BaseZorkiz_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_nathrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_izkag 0 buildpref_hydrith_izirokor 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 @@ -3044,9 +3045,9 @@ script_id ZMCx var Ex|Call pref_matravil 0 buildpref_matravil_matraleth 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_larvoskcesiant 13 - call main_wait_1050 - multi expansion_loop_toggle - call main_wait_1050 + call main_wait_600 + call build_order_component_expand + call main_wait_150 p_need 1 hydrith_den call main_wait_900 do_morph 4 hydralisk @@ -3059,6 +3060,7 @@ script_id ZMCx wait 75 call main_wait_150 var Set build_gas_var 1 13 + bld 2 hachirosk 104 call main_wait_300 multi need_irol call main_wait_450 @@ -3066,7 +3068,7 @@ script_id ZMCx call main_wait_300 p_need 1 zorkiz_shroud call main_wait_300 - p_need 1 bactith_swamp + p_need 1 tethvith_swamp bld 1 caphrolosk 104 call main_wait_300 call expansion_loop_normal @@ -3075,30 +3077,25 @@ script_id ZMCx call main_wait_150 goto build_assault_fin - :buildAssault2HatchHydrokQuazeth - dth 13 Ex 0 start_location buildAssault2HatchHydrokQuazeth_Main - print Zerg<32>Assault<32>rush<32>2:<32>2Hatch<32>Hydrok<32>Quazeth + :build_assault_2BaseHydrithQuazeth + dth 13 Ex 0 start_location build_assault_2BaseHydrithQuazeth_Main + print Zerg<32>Assault<32>rush<32>2:<32>2<32>Base<32>Hydrith<32>Quazeth - :buildAssault2HatchHydrokQuazeth_Main + :build_assault_2BaseHydrithQuazeth_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_kagralisk 13 - var Ex|Call pref_matravil 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_kagralisk 13 + var Ex|Call pref_matravil 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_vithrath 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 var Ex|Call pref_matravil 0 buildpref_matravil_matraleth 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_hachirosk 13 - call main_wait_1050 - var Sub can_worker_var 1 13 - multi expansion_loop_toggle - call main_wait_300 - queue 1 droleth larva 255 Local Loc.63 200 - call main_wait_600 - var Add can_worker_var 1 13 call main_wait_600 + call build_order_component_expand + call main_wait_150 p_need 1 hydrith_den call main_wait_750 var Sub can_worker_var 1 13 @@ -3114,31 +3111,30 @@ script_id ZMCx call main_wait_300 multi need_irol call main_wait_300 + multi build_assault_2BaseHydrithQuazeth_Morph + call main_wait_300 multi production_cycle var Add can_worker_var 1 13 goto build_assault_fin - :buildAssault2HatchHydrokQuazeth_Morph + :build_assault_2BaseHydrithQuazeth_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake stop - :build_assault_2BaseGeszkath - dth 13 Ex 0 start_location build_assault_2BaseGeszkath_Main - print Zerg<32>Assault<32>greed<32>1:<32>2Base<32>Geszkath + :build_assault_2BaseAlkag + dth 13 Ex 0 start_location build_assault_2BaseAlkag_Main + print Zerg<32>Assault<32>greed<32>1:<32>2<32>Base<32>Alkag - :build_assault_2BaseGeszkath_Main + :build_assault_2BaseAlkag_Main var Ex|Call pref_bactith 0 buildpref_hydrith_skithrokor 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_mutation_alkajelisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 - call main_wait_750 - call main_wait_600 - bld 1 cagrant_cesiant 101 - multi build_assault_2BaseGeszkath_Morph call main_wait_600 + multi build_assault_2BaseAlkag_Morph p_need 1 hydrith_den - call main_wait_300 + call main_wait_750 multi expansion_loop_toggle call main_wait_750 do_morph 2 hydralisk @@ -3151,21 +3147,17 @@ script_id ZMCx var Set can_build_static_defense_var 1 13 call main_wait_300 var Set build_supply 1 13 - call main_wait_600 - call main_wait_600 - bld 2 hachirosk 98 + call main_wait_1200 + bld 2 hachirosk 104 call main_wait_900 call expansion_loop_normal call main_wait_600 multi production_cycle goto build_assault_fin - :build_assault_2BaseGeszkath_Morph - w_bld 1 cagrant_cesiant + :build_assault_2BaseAlkag_Morph call wait_for_IrolIris - bld 1 larvosk_cesiant 105 - w_bldstart 2 hachirosk - p_need 1 bactith_swamp + p_need 1 tethvith_swamp call main_wait_300 p_need 1 alkag_iteth multi need_othstol @@ -3177,50 +3169,43 @@ script_id ZMCx :build_assault_Potency_Main var Ex|Call pref_zorkiz 0 buildpref_zorkiz_zoryusthaleth 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_kagralisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_kagralisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 var Ex|Call pref_matravil 0 buildpref_matravil_matraleth 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_larvoskcesiant 13 - call main_wait_1050 - var Sub can_worker_var 1 13 - call main_wait_150 - multi expansion_loop_toggle call main_wait_600 - var Add can_worker_var 1 13 - call main_wait_450 + call build_order_component_expand + call main_wait_150 p_need 1 hydrith_den call main_wait_1200 - var Set can_build_static_defense_var 1 13 - call main_wait_600 p_need 1 quazeth_pool call main_wait_600 var Set build_gas_var 1 13 call main_wait_600 var Set can_attack_var 1 13 - call main_wait_900 + call main_wait_450 p_need 1 zorkiz_shroud - var Sub can_worker_var 1 13 - call expansion_loop_normal - call main_wait_600 - var Add can_worker_var 1 13 - call main_wait_300 - var Set build_gas_var 1 13 + bld 2 hachirosk 104 + call main_wait_450 + var Set can_build_static_defense_var 1 13 + call main_wait_150 + call build_order_component_expand call main_wait_300 multi need_irol - call main_wait_900 + call main_wait_1500 multi production_cycle call main_wait_600 call expansion_loop_normal call main_wait_300 - bld 2 hachirosk 98 + bld 3 hachirosk 104 multi build_assault_Potency_Morph call main_wait_600 - bld 3 hachirosk 98 + bld 4 hachirosk 104 call main_wait_3600 multi need_othstol call main_wait_600 @@ -3229,7 +3214,7 @@ script_id ZMCx :build_assault_Potency_Morph call wait_for_IrolIris call main_wait_300 - p_need 1 bactith_swamp + p_need 1 tethvith_swamp call main_wait_750 p_need 1 alkag_iteth stop @@ -3239,10 +3224,10 @@ script_id ZMCx print Zerg<32>Assault<32>timing<32>3:<32>Earthen<32>Tides :build_assault_EarthenTides_Main - var Ex|Call pref_hydrok 0 buildpref_hydrith_izirokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_izirokor 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_lakizilisk 13 var Ex|Call pref_muthrok 0 buildpref_mutath_protathalor 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_keskathalor 13 var Ex|Call pref_matravil 0 buildpref_matravil_konvilisk 13 @@ -3259,18 +3244,21 @@ script_id ZMCx var Add can_worker_var 1 13 call main_wait_150 var Set build_gas_var 1 13 + bld 2 hachirosk 104 call main_wait_900 p_need 1 zorkiz_shroud call main_wait_1200 var Set can_build_static_defense_var 1 13 - call main_wait_1200 + call main_wait_900 + p_need 1 skibact_scab + call main_wait_900 p_need 1 quazeth_pool call main_wait_600 var Add can_expand_var 1 13 call main_wait_600 multi need_irol call main_wait_900 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_600 multi build_assault_EarthenTides_Morph call main_wait_1200 @@ -3281,7 +3269,7 @@ script_id ZMCx :build_assault_EarthenTides_Morph call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake p_need 1 mutath_spire call main_wait_900 p_need 1 matravil_nest @@ -3301,7 +3289,7 @@ script_id ZMCx call main_wait_300 call wHachirosk call main_wait_150 - call wHydrok + call wHydrith call wBactith call main_wait_150 call main_wait_300 @@ -3318,7 +3306,7 @@ script_id ZMCx call main_wait_300 call wElthisth call main_wait_300 - call wUltrok + call wUltrav call main_wait_900 call wVithrath call main_wait_1200 @@ -3372,7 +3360,7 @@ script_id ZMCx :build_order_swarm_select dth 13 Ex 1 dark_swarm_unit build_swarm_3BaseFlood - dth 13 Ex 2 dark_swarm_unit build_swarm_3BaseUltrok + dth 13 Ex 2 dark_swarm_unit build_swarm_3BaseUltrav dth 13 Ex 3 dark_swarm_unit build_swarm_InstantQuazeth dth 13 Ex 4 dark_swarm_unit build_swarm_3BaseOthstol dth 13 Ex 5 dark_swarm_unit build_swarm_GatesOfHell @@ -3380,12 +3368,12 @@ script_id ZMCx :build_swarm_3BaseFlood dth 13 Ex 0 start_location build_swarm_3BaseFlood_Main - print Zerg<32>Swarm<32>timing<32>1:<32>3Hatch<32>Flood + print Zerg<32>Swarm<32>timing<32>1:<32>3<32>Base<32>Flood :build_swarm_3BaseFlood_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 @@ -3412,6 +3400,7 @@ script_id ZMCx call main_wait_600 var Add can_worker_var 1 13 call main_wait_300 + bld 2 hachirosk 104 var Set can_build_static_defense_var 1 13 call main_wait_300 multi build_swarm_3BaseFlood_Morph @@ -3430,11 +3419,9 @@ script_id ZMCx wait 24 queue 1 zethrokor larva 255 Global Loc.63 88 call main_wait_300 - bld 1 caphrolosk 98 + bld 1 caphrolosk 104 wait 24 call main_wait_450 - bld 2 hachirosk 98 - call main_wait_150 var Set can_attack_var 1 13 call main_wait_150 bring 13 AtL_W 1 larva Loc.63 blank @@ -3445,12 +3432,11 @@ script_id ZMCx wait 24 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 - call main_wait_300 - call main_wait_300 + call main_wait_600 var Sub can_worker_var 1 13 call expansion_loop_normal call main_wait_600 - bld 3 hachirosk 98 + bld 3 hachirosk 104 call main_wait_600 multi production_cycle var Add can_worker_var 1 13 @@ -3458,8 +3444,9 @@ script_id ZMCx :build_swarm_3BaseFlood_Morph w_bld 1 quazeth_pool + p_need 1 vornath_pond call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake w_bldstart 3 hachirosk call main_wait_300 p_need 1 mutath_spire @@ -3468,14 +3455,14 @@ script_id ZMCx p_need 1 tosvrol_haunt stop - :build_swarm_3BaseUltrok - dth 13 Ex 0 start_location build_swarm_3Baseultrav_Main - print Zerg<32>Swarm<32>timing<32>2:<32>3Hatch<32>Ultrok + :build_swarm_3BaseUltrav + dth 13 Ex 0 start_location build_swarm_3BaseUltrav_Main + print Zerg<32>Swarm<32>timing<32>2:<32>3Hach<32>Ultrok - :build_swarm_3Baseultrav_Main + :build_swarm_3BaseUltrav_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 @@ -3485,13 +3472,11 @@ script_id ZMCx var Ex|Call pref_production 0 buildpref_production_hachirosk 13 call main_wait_1050 var Sub can_worker_var 1 13 - wait 24 multi expansion_loop_toggle call main_wait_600 var Add can_worker_var 1 13 call main_wait_600 p_need 1 quazeth_pool - wait 24 call main_wait_1500 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 @@ -3502,16 +3487,17 @@ script_id ZMCx bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 call main_wait_300 + bld 2 hachirosk 104 var Set build_gas_var 1 13 - call main_wait_300 - multi need_irol - call main_wait_450 - wait 24 - var Set can_build_static_defense_var 1 13 + p_need 1 vornath_pond + call main_wait_1200 var Set can_attack_var 1 13 call main_wait_900 - bld 1 caphrolosk 98 - wait 24 + multi need_irol + call main_wait_450 + var Set can_build_static_defense_var 1 13 + call main_wait_900 + bld 1 caphrolosk 104 call main_wait_300 var Sub can_worker_var 1 13 call expansion_loop_normal @@ -3520,7 +3506,7 @@ script_id ZMCx call main_wait_300 var Set build_supply 1 13 call main_wait_600 - multi build_swarm_3Baseultrav_Morph + multi build_swarm_3BaseUltrav_Morph call main_wait_450 wait 24 bring 13 AtL_W 1 larva Loc.63 blank @@ -3533,8 +3519,7 @@ script_id ZMCx queue 1 zethrokor larva 255 Global Loc.63 88 call main_wait_150 p_need 1 zorkiz_shroud - call main_wait_600 - call main_wait_300 + call main_wait_900 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 wait 24 @@ -3553,8 +3538,7 @@ script_id ZMCx bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 call main_wait_1500 - call main_wait_300 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_900 p_need 1 hydrith_den call main_wait_600 @@ -3562,10 +3546,10 @@ script_id ZMCx call main_wait_600 goto build_swarm_fin - :build_swarm_3Baseultrav_Morph + :build_swarm_3BaseUltrav_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake w_bld 1 zorkiz_shroud w_bldstart 2 hachirosk call main_wait_900 @@ -3577,7 +3561,7 @@ script_id ZMCx bld 1 gathtelosk 99 w_bld 1 hydrith_den call wait_for_IrolIris - p_need 1 bactith_swamp + p_need 1 tethvith_swamp stop :build_swarm_InstantQuazeth @@ -3587,7 +3571,7 @@ script_id ZMCx :build_swarm_InstantQuazeth_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 @@ -3595,26 +3579,38 @@ script_id ZMCx var Ex|Call pref_matravil 0 buildpref_matravil_matraleth 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_hachirosk 13 - var Set can_worker_var 0 13 - call main_wait_600 + var Set can_queue_early_military_var 0 13 + call main_wait_300 p_need 1 quazeth_pool - call main_wait_1200 - do_morph 2 zethrokor - wait 75 - do_morph 2 zethrokor - wait 75 + call main_wait_150 + var Set can_worker_var 0 13 + w_bld 1 quazeth_pool + bring 13 AtL_W 1 larva Loc.63 blank var Set can_attack_var 1 13 + do_morph 2 zethrokor + wait 12 + bring 13 AtL_W 1 larva Loc.63 blank + do_morph 2 zethrokor + wait 12 + bring 13 AtL_W 1 larva Loc.63 blank + do_morph 2 zethrokor + wait 12 + bring 13 AtL_W 1 larva Loc.63 blank + do_morph 2 zethrokor + wait 12 call main_wait_1500 + bld 2 hachirosk 104 + call main_wait_150 var Add can_worker_var 1 13 - call main_wait_300 - var Set build_supply 1 13 - call main_wait_300 - var Add can_expand_var 1 13 + call main_wait_1500 + call build_order_component_expand + call main_wait_600 + p_need 1 vornath_pond call main_wait_600 var Set can_build_static_defense_var 1 13 - call main_wait_300 + call main_wait_1200 multi need_irol - call main_wait_300 + call main_wait_600 multi build_swarm_InstantQuazeth_Morph multi production_cycle goto build_swarm_fin @@ -3622,17 +3618,17 @@ script_id ZMCx :build_swarm_InstantQuazeth_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake stop :build_swarm_3BaseOthstol dth 13 Ex 0 start_location build_swarm_3BaseOthstol_Main - print Zerg<32>Swarm<32>timing<32>3:<32>3Hatch<32>Othstol + print Zerg<32>Swarm<32>timing<32>3:<32>3Hach<32>Othstol :build_swarm_3BaseOthstol_Main var Ex|Call pref_quazeth 0 buildpref_hydrith_izirokor 13 var Ex|Call pref_geszkath 0 buildpref_ultrav_ultrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 @@ -3642,13 +3638,11 @@ script_id ZMCx var Ex|Call pref_production 0 buildpref_production_hachirosk 13 call main_wait_1050 var Sub can_worker_var 1 13 - wait 24 multi expansion_loop_toggle call main_wait_600 var Add can_worker_var 1 13 call main_wait_600 p_need 1 quazeth_pool - wait 24 call main_wait_1500 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 @@ -3658,17 +3652,18 @@ script_id ZMCx wait 24 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 - wait 24 call main_wait_300 + bld 2 hachirosk 104 + call main_wait_600 var Set build_gas_var 1 13 + p_need 1 vornath_pond call main_wait_300 multi need_irol call main_wait_450 - wait 24 var Set can_build_static_defense_var 1 13 var Set can_attack_var 1 13 call main_wait_1500 - bld 1 caphrolosk 98 + bld 1 caphrolosk 104 call main_wait_450 var Sub can_worker_var 1 13 call expansion_loop_normal @@ -3676,9 +3671,7 @@ script_id ZMCx var Add can_worker_var 1 13 call main_wait_1200 multi build_swarm_3BaseOthstol_Morph - wait 24 p_need 1 zorkiz_shroud - wait 24 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 wait 24 @@ -3687,12 +3680,10 @@ script_id ZMCx wait 24 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 - wait 24 call main_wait_900 p_need 1 hydrith_den call main_wait_300 - wait 24 - bld 2 hachirosk 98 + bld 3 hachirosk 104 bring 13 AtL_W 1 larva Loc.63 blank queue 1 zethrokor larva 255 Global Loc.63 88 wait 24 @@ -3708,7 +3699,7 @@ script_id ZMCx :build_swarm_3BaseOthstol_Morph w_bld 1 quazeth_pool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake p_need 1 matravil_nest call wait_for_OthstolOviform bld 1 gathtelosk 99 @@ -3719,7 +3710,7 @@ script_id ZMCx w_bldstart 2 hachirosk w_bld 1 hydrith_den call wait_for_IrolIris - p_need 1 bactith_swamp + p_need 1 tethvith_swamp stop :build_swarm_GatesOfHell @@ -3729,7 +3720,7 @@ script_id ZMCx :build_swarm_GatesOfHell_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_keskathalor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 @@ -3752,14 +3743,16 @@ script_id ZMCx p_need 1 zorkiz_shroud call main_wait_600 var Set can_attack_var 1 13 - call main_wait_450 + call main_wait_900 var Add can_expand_var 1 13 call main_wait_450 p_need 1 hydrith_den call main_wait_450 multi build_swarm_GatesOfHell_Morph + p_need 1 vornath_pond call main_wait_600 var Set build_gas_var 1 13 + bld 2 hachirosk 104 call main_wait_300 multi need_irol call main_wait_750 @@ -3769,9 +3762,9 @@ script_id ZMCx :build_swarm_GatesOfHell_Morph call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake call main_wait_600 - p_need 1 bactith_swamp + p_need 1 tethvith_swamp call main_wait_2400 multi need_othstol stop @@ -3782,7 +3775,7 @@ script_id ZMCx :build_swarm_PrimitivePressure_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_zoryusthaleth 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_liiralisk 13 var Ex|Call pref_muthrok 0 buildpref_mutath_protathalor 13 @@ -3803,10 +3796,13 @@ script_id ZMCx call main_wait_900 var Set can_attack_var 1 13 call main_wait_750 + bld 2 hachirosk 104 var Set build_gas_var 1 13 call main_wait_300 var Set can_build_static_defense_var 1 13 - call main_wait_1500 + call main_wait_300 + p_need 1 vornath_pond + call main_wait_1200 multi expansion_loop_toggle call main_wait_900 p_need 1 zorkiz_shroud @@ -3820,10 +3816,10 @@ script_id ZMCx :build_swarm_PrimitivePressure_Morph call wait_for_IrolIris call wait_for_QuazethPool - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake call main_wait_600 - call wait_for_HydrokDen - p_need 1 bactith_swamp + call wait_for_HydrithDen + p_need 1 tethvith_swamp stop :build_swarm_fin @@ -3838,7 +3834,7 @@ script_id ZMCx call main_wait_1200 call wMatravil call main_wait_300 - call wHydrok + call wHydrith call wBactith call main_wait_600 call wZorkiz @@ -3851,7 +3847,7 @@ script_id ZMCx call main_wait_600 call wElthisth wait 24 - call wUltrok + call wUltrav call main_wait_600 call wGeszkath stop @@ -3916,10 +3912,10 @@ script_id ZMCx :build_sunblot_BigAndLittle_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_nathrokor 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_skithrokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_skithrokor 13 var Ex|Call pref_matravil 0 buildpref_matravil_vilgorokor 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_vithrath 0 buildpref_vithrath_sovroleth 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 @@ -3935,8 +3931,11 @@ script_id ZMCx p_need 1 quazeth_pool call main_wait_300 var Add can_worker_var 1 13 + bld 2 hachirosk 104 call main_wait_900 var Sub can_worker_var 1 13 + p_need 1 vornath_pond + call main_wait_900 bring 13 AtL_W 1 larva Loc.63 blank queue 1 nathrokor larva 255 Global Loc.63 88 wait 24 @@ -3969,7 +3968,7 @@ script_id ZMCx bring 13 AtL_W 1 larva Loc.63 blank queue 1 droleth larva 255 Local Loc.63 200 call main_wait_300 - bld 1 caphrolosk 98 + bld 1 caphrolosk 104 call main_wait_1200 call main_wait_450 bring 13 AtL_W 1 larva Loc.63 blank @@ -3991,7 +3990,7 @@ script_id ZMCx queue 1 mutalisk larva 255 Global Loc.63 88 wait 24 call main_wait_150 - bld 2 hachirosk 98 + bld 3 hachirosk 104 call main_wait_300 queue 1 mutalisk larva 255 Global Loc.63 88 wait 24 @@ -4006,7 +4005,7 @@ script_id ZMCx wait 24 call wait_for_IrolIris call wait_for_QuazethPool - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake call main_wait_300 p_need 1 mutath_spire call wait_for_OthstolOviform @@ -4022,13 +4021,13 @@ script_id ZMCx :build_sunblot_TheTriad_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_nathrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_skithrokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_skithrokor 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 var Ex|Call pref_liivral 0 buildpref_kalkiir_kalkalisk 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 - var Ex|Call pref_elthisth 0 buildpref_elthisth_isthrathaleth 13 + var Ex|Call pref_elthisth 0 buildpref_almakis_isthrathaleth 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_larvoskcesiant 13 call main_wait_600 @@ -4042,18 +4041,20 @@ script_id ZMCx call main_wait_1200 var Set can_build_static_defense_var 1 13 call main_wait_450 + bld 2 hachirosk 104 var Sub can_worker_var 1 13 - call main_wait_150 + call main_wait_600 multi expansion_loop_toggle call main_wait_300 var Add can_worker_var 1 13 call main_wait_150 var Set build_gas_var 1 13 - call main_wait_300 + p_need 1 vornath_pond + call main_wait_600 p_need 1 hydrith_den - call main_wait_1200 - p_need 1 zorkiz_shroud call main_wait_900 + p_need 1 zorkiz_shroud + call main_wait_450 var Set can_attack_var 1 13 call main_wait_900 multi production_cycle @@ -4071,34 +4072,36 @@ script_id ZMCx :build_sunblot_SkitteringDuo_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_nathrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_skithrokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_skithrokor 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_hachirosk 13 call main_wait_600 - var Sub can_worker_var 1 13 + call build_order_component_expand call main_wait_150 - multi expansion_loop_toggle - call main_wait_450 - var Add can_worker_var 1 13 - call main_wait_900 p_need 1 hydrith_den - call main_wait_900 - var Sub can_worker_var 1 13 + call main_wait_1500 p_need 1 quazeth_pool - call main_wait_900 + call main_wait_1200 + var Sub can_worker_var 1 13 var Set can_attack_var 1 13 - call main_wait_450 + call main_wait_1200 var Add can_worker_var 1 13 - call main_wait_300 + call main_wait_600 + bld 2 hachirosk 104 + call main_wait_600 + p_need 1 vornath_pond + call main_wait_600 + p_need 1 skibact_scab var Set build_gas_var 1 13 - call main_wait_300 + call main_wait_1200 call expansion_loop_normal call main_wait_900 multi production_cycle + call main_wait_1200 goto build_sunblot_fin :build_sunblot_EarlyBirds @@ -4107,10 +4110,10 @@ script_id ZMCx :build_sunblot_EarlyBirds_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_skithrokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_skithrokor 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_hachirosk 13 @@ -4130,13 +4133,16 @@ script_id ZMCx p_need 1 quazeth_pool call main_wait_900 var Set build_gas_var 1 13 - call main_wait_900 + call main_wait_450 + p_need 1 vornath_pond + call main_wait_600 multi need_irol multi build_sunblot_EarlyBirds_Morph call main_wait_600 var Ex|Call pref_quazeth 0 buildpref_quazeth_nathrokor 13 call main_wait_1500 var Set can_attack_var 1 13 + bld 2 hachirosk 104 call main_wait_600 multi production_cycle call main_wait_900 @@ -4146,7 +4152,7 @@ script_id ZMCx :build_sunblot_EarlyBirds_Morph call wait_for_QuazethPool call wait_for_IrolIris - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake p_need 1 mutath_spire call main_wait_900 p_need 1 alkag_iteth @@ -4158,10 +4164,10 @@ script_id ZMCx :build_sunblot_FlyingFeint_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_hachirosk 13 @@ -4177,26 +4183,29 @@ script_id ZMCx var Set can_build_static_defense_var 1 13 call main_wait_900 var Set build_gas_var 1 13 + bld 2 hachirosk 104 call main_wait_900 multi need_irol multi build_sunblot_FlyingFeint_Morph call main_wait_600 var Ex|Call pref_quazeth 0 buildpref_quazeth_nathrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_skithrokor 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_skithrokor 13 + p_need 1 vornath_pond call main_wait_1200 p_need 1 hydrith_den call main_wait_300 multi production_cycle call main_wait_900 + p_need 1 skibact_scab goto build_sunblot_fin :build_sunblot_FlyingFeint_Morph call wait_for_IrolIris call wait_for_QuazethPool - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake call main_wait_600 - call wait_for_HydrokDen - p_need 1 bactith_swamp + call wait_for_HydrithDen + p_need 1 tethvith_swamp call main_wait_450 p_need 1 mutath_spire stop @@ -4207,10 +4216,10 @@ script_id ZMCx :build_sunblot_DescendingHorizon_Main var Ex|Call pref_quazeth 0 buildpref_quazeth_zethrokor 13 - var Ex|Call pref_hydrok 0 buildpref_hydrith_hydralisk 13 + var Ex|Call pref_hydrith 0 buildpref_hydrith_hydralisk 13 var Ex|Call pref_zorkiz 0 buildpref_zorkiz_gorgrokor 13 var Ex|Call pref_muthrok 0 buildpref_mutath_mutalisk 13 - var Ex|Call pref_izkag 0 buildpref_izkag_almaksalisk 13 + var Ex|Call pref_izkag 0 buildpref_alkag_almaksalisk 13 var Ex|Call pref_geszkath 0 buildpref_geszkath_geszithalor 13 var Ex|Call pref_transport 0 buildpref_transport_ovileth 13 var Ex|Call pref_production 0 buildpref_production_hachirosk 13 @@ -4227,7 +4236,10 @@ script_id ZMCx call main_wait_900 multi expansion_loop_toggle call main_wait_900 + bld 2 hachirosk 104 + call main_wait_450 var Set build_gas_var 1 13 + p_need 1 vornath_pond call main_wait_600 p_need 1 hydrith_den call main_wait_600 @@ -4248,11 +4260,11 @@ script_id ZMCx :build_sunblot_DescendingHorizon_Morph call wait_for_IrolIris - call wait_for_HydrokDen - p_need 1 bactith_swamp + call wait_for_HydrithDen + p_need 1 tethvith_swamp call main_wait_600 call wait_for_QuazethPool - p_need 1 kalkiir_pond + p_need 1 kalkiir_lake call main_wait_600 p_need 1 mutath_spire call wait_for_OthstolOviform @@ -4272,7 +4284,7 @@ script_id ZMCx call wQuazeth call wMuthrok call main_wait_300 - call wHydrok + call wHydrith call wBactith call main_wait_300 call wVithrath @@ -4290,7 +4302,7 @@ script_id ZMCx call main_wait_450 call wZorkiz call main_wait_900 - call wUltrok + call wUltrav call main_wait_600 call wElthisth stop @@ -4300,12 +4312,21 @@ script_id ZMCx goto build_order_general :build_order_expansion - bring 13 AtL_W 1 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 blank + wait 24 + bring 13 AtL 1 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 build_order_expansion var Ex|Jump pref_assault 1 build_assault_fin2 13 var Ex|Jump pref_swarm 1 build_swarm_fin2 13 var Ex|Jump pref_sunblot 1 build_sunblot_fin2 13 goto build_general_fin2 + :build_order_component_expand + var Sub can_worker_var 1 13 + call main_wait_150 + multi expansion_loop_toggle + call main_wait_300 + var Add can_worker_var 1 13 + return + :wIrol wait 12 bring 13 AtL 1 irol_iris|othstol_oviform Loc.63 wIrol @@ -4316,7 +4337,7 @@ script_id ZMCx wait 24 bring 13 AtL 1 irol_iris|othstol_oviform Loc.63 blank bring 13 AtM 3 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_irol - bring 13 Ex 0 quazeth_pool|kalkiir_pond|hydrith_den|bactith_swamp|mutath_spire|tosvrol_haunt|zorkiz_shroud|ultrav_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto Loc.63 need_irol + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake|hydrith_den|skibact_scab|tethvith_swamp|mutath_spire|tosvrol_haunt|zorkiz_shroud|ultrav_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto Loc.63 need_irol var AtL|Jump under_attack_var 1 need_irol 13 call main_wait_450 @@ -4342,7 +4363,7 @@ script_id ZMCx bring 13 AtL 1 othstol_oviform Loc.63 blank bring 13 Ex 0 irol_iris Loc.63 need_othstol bring 13 AtM 5 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_othstol - bring 13 Ex 2 quazeth_pool|kalkiir_pond|hydrith_den|bactith_swamp|mutath_spire|tosvrol_haunt|zorkiz_shroud|ultrav_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto Loc.63 need_othstol + bring 13 Ex 2 quazeth_pool|vornath_pond|kalkiir_lake|hydrith_den|skibact_scab|tethvith_swamp|mutath_spire|tosvrol_haunt|zorkiz_shroud|ultrav_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto Loc.63 need_othstol bring 13 AtM 3 excisant Loc.63 need_othstol var AtL|Jump under_attack_var 1 need_othstol 13 call main_wait_450 @@ -4359,14 +4380,14 @@ script_id ZMCx :wait_for_QuazethPool wait 12 - bring 13 AtL 1 kalkiir_pond Loc.63 blank_return + bring 13 AtL 1 kalkiir_lake Loc.63 blank_return notowns quazeth_pool wait_for_QuazethPool return - :wait_for_HydrokDen + :wait_for_HydrithDen wait 12 - bring 13 AtL 1 bactith_swamp Loc.63 blank_return - notowns hydrith_den wait_for_HydrokDen + bring 13 AtL 1 tethvith_swamp Loc.63 blank_return + notowns hydrith_den wait_for_HydrithDen return :wait_for_ZorkizShroud @@ -4405,7 +4426,7 @@ script_id ZMCx :wQuazeth wait 12 - bring 13 AtL 1 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 AtL 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return p_need 1 quazeth_pool return @@ -4413,13 +4434,13 @@ script_id ZMCx wait 12 notowns quazeth_pool wLiivral bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 wLiivral - bring 13 AtL 1 kalkiir_pond Loc.63 blank_return - p_need 1 kalkiir_pond + bring 13 AtL 1 kalkiir_lake Loc.63 blank_return + p_need 1 kalkiir_lake return - :wHydrok + :wHydrith wait 12 - bring 13 AtL 1 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 AtL 1 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return p_need 1 hydrith_den return @@ -4427,8 +4448,8 @@ script_id ZMCx wait 12 notowns hydrith_den wBactith bring 13 Ex 0 irol_iris|othstol_oviform Loc.63 wBactith - bring 13 AtL 1 bactith_swamp Loc.63 blank_return - p_need 1 bactith_swamp + bring 13 AtL 1 tethvith_swamp Loc.63 blank_return + p_need 1 tethvith_swamp return :wMuthrok @@ -4474,10 +4495,10 @@ script_id ZMCx p_need 1 zorkiz_shroud return - :wUltrok + :wUltrav wait 12 - notowns zorkiz_shroud wUltrok - bring 13 Ex 0 othstol_oviform Loc.63 wUltrok + notowns zorkiz_shroud wUltrav + bring 13 Ex 0 othstol_oviform Loc.63 wUltrav bring 13 AtL 1 ultrav_cavern Loc.63 blank_return p_need 1 ultrav_cavern return @@ -4657,7 +4678,6 @@ script_id ZMCx wait 12 var AtL|Jump prod_cycle_var 1 blank_return 13 bring 13 Ex 0 droleth|gosvileth Loc.63 blank_return - bring 13 AtL 1 cagrant_cesiant Loc.63 blank_return local 255 AtL 30 larvosk_cesiant blank_return add_bld 255 larvosk_cesiant 1 5 100 call add_return_wait_960 @@ -4813,42 +4833,6 @@ script_id ZMCx wait 120 goto zLoopA - :attack_generic_worker_check - bring 13 AtL 12 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 blank_return - call attack_conditions_zerg - var Set can_worker_all_var 0 13 - return - - :attack_conditions_zerg - var Ex|Jump has_tier_1_tech_node_var 1 blank_return 13 - multi attack_conditions_zerg_quazeth - multi attack_conditions_zerg_hydrith - multi attack_conditions_zerg_zorkiz - var Ex|Wait has_tier_1_tech_node_var 1 13 - return - - :attack_conditions_zerg_quazeth - wait 12 - bring 13 AtL 1 kalkiir_pond Loc.63 attack_conditions_zerg_success - notowns quazeth_pool attack_conditions_zerg_quazeth - goto attack_conditions_zerg_success - - :attack_conditions_zerg_hydrith - wait 12 - bring 13 AtL 1 bactith_swamp Loc.63 attack_conditions_zerg_success - notowns hydrith_den attack_conditions_zerg_hydrith - goto attack_conditions_zerg_success - - :attack_conditions_zerg_zorkiz - wait 12 - bring 13 AtL 1 ultrav_cavern Loc.63 attack_conditions_zerg_success - notowns zorkiz_shroud attack_conditions_zerg_zorkiz - goto attack_conditions_zerg_success - - :attack_conditions_zerg_success - var Set has_tier_1_tech_node_var 1 13 - stop - :attack_cycle_start var Ex|Wait can_attack_var 1 13 time AtM 5760 Frames attack_cycle_cont @@ -4859,14 +4843,20 @@ script_id ZMCx atk_c :attack_generic - call attack_generic_worker_check call add_attack_wave + time AtM 5760 Frames attack_cycle_early atk_prep atk_do wait 500 bring 13 AtL 60 zethrokor|vorvrokor|quazilisk|liiralisk|hydralisk|bactalisk|skithrokor|gorgrokor|kagralisk|izirokor|evigrilisk|mutalisk|vithrilisk|nathrokor|kalkalisk|zoryusthaleth|ultrokor|lakizilisk|matraleth|akistrokor|konvilisk|almaksalisk|keskathalor|alkajelisk|geszithalor|isthrathaleth|sovroleth|cohort|charlatan|axitrilisk|tarasque|empress|anticthon Loc.63 attack_expansion_check goto attack_cycle_fin + :attack_cycle_early + atk_prep + wait 240 + atk_now + goto attack_cycle_fin + :attack_expansion_check set_attacks 1 target_expansion @@ -4878,16 +4868,55 @@ script_id ZMCx var Set can_worker_all_var 1 13 return + :attack_worker_check + bring 13 AtL 6 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 blank_return + var Set can_worker_all_var 0 13 + return + :attack_conditions + call attack_worker_check + call attack_conditions_zerg + + :attack_conditions_body wait 24 - bring 13 Ex 0 quazeth_pool|kalkiir_pond|hydrith_den|bactith_swamp|mutath_spire|tosvrol_haunt|zorkiz_shroud|ultrav_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto Loc.63 attack_conditions time AtM 5760 Frames blank_return - bring 13 AtM 10 droleth Loc.63 attack_conditions - bring 13 AtM 1 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 attack_conditions + bring 13 AtM 10 droleth Loc.63 attack_conditions_body + bring 13 AtM 1 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 attack_conditions_body res 13 AtL Any 500 blank_return var Ex|WF(360) under_attack_var 0 13 return + :attack_conditions_zerg + time AtL 11520 Frames blank_return + var Ex|Jump has_tier_1_tech_node_var 1 blank_return 13 + multi attack_conditions_zerg_quazeth + multi attack_conditions_zerg_hydrith + multi attack_conditions_zerg_zorkiz + var Ex|Wait has_tier_1_tech_node_var 1 13 + return + + :attack_conditions_zerg_quazeth + wait 12 + bring 13 AtL 1 kalkiir_lake|vornath_pond Loc.63 attack_conditions_zerg_success + notowns quazeth_pool attack_conditions_zerg_quazeth + goto attack_conditions_zerg_success + + :attack_conditions_zerg_hydrith + wait 12 + bring 13 AtL 1 tethvith_swamp|skibact_scab Loc.63 attack_conditions_zerg_success + notowns hydrith_den attack_conditions_zerg_hydrith + goto attack_conditions_zerg_success + + :attack_conditions_zerg_zorkiz + wait 12 + bring 13 AtL 1 ultrav_cavern Loc.63 attack_conditions_zerg_success + notowns zorkiz_shroud attack_conditions_zerg_zorkiz + goto attack_conditions_zerg_success + + :attack_conditions_zerg_success + var Set has_tier_1_tech_node_var 1 13 + stop + :add_attack_wave call attack_conditions var Ex|Jump pref_assault 1 add_attack_wave_assault 13 @@ -4900,15 +4929,15 @@ script_id ZMCx goto add_attack_wave_sunblot :add_attack_wave_assault + rand_j 51 add_attack_wave_air_only call atk_hydrith_ranged - call atk_izkag_ranged + call atk_alkag_ranged call atk_hydrith_air call atk_zorkiz_ranged call atk_axtoth_melee call atk_geszkath_siege call atk_zorkiz_melee call atk_quazeth_melee - call atk_elthisth_siege call atk_matravil_ranged call atk_geszkath_air call atk_axtoth_ranged @@ -4919,6 +4948,7 @@ script_id ZMCx return :add_attack_wave_swarm + rand_j 51 add_attack_wave_air_only call atk_axtoth_ranged call atk_axtoth_melee call atk_quazeth_ranged @@ -4926,7 +4956,7 @@ script_id ZMCx call atk_quazeth_ranged call atk_zorkiz_melee call atk_quazeth_air - call atk_izkag_ranged + call atk_alkag_ranged call atk_hydrith_air call atk_matravil_ranged call atk_mutath_air @@ -4935,21 +4965,22 @@ script_id ZMCx call atk_hydrith_ranged call atk_zorkiz_ranged call atk_geszkath_siege - call atk_elthisth_siege return :add_attack_wave_sunblot + rand_j 128 add_attack_wave_air_only call atk_mutath_air call atk_quazeth_air call atk_quazeth_melee call atk_hydrith_air + call atk_zorkiz_air + call atk_alkag_air call atk_matravil_special call atk_geszkath_air call atk_zorkiz_melee - call atk_elthisth_siege call atk_quazeth_ranged call atk_axtoth_melee - call atk_izkag_ranged + call atk_alkag_ranged call atk_matravil_ranged call atk_geszkath_siege call atk_hydrith_ranged @@ -4957,6 +4988,20 @@ script_id ZMCx call atk_axtoth_ranged return + :add_attack_wave_air_only + bring 13 Ex 0 vornath_pond|kalkiir_lake|skibact_scab|tethvith_swamp|zorkiz_shroud|ultrav_cavern|mutath_spire|tosvrol_haunt|alkag_iteth|geszkath_grotto|almakis_antre Loc.63 add_attack_wave + var Set air_attack_var 1 13 + call atk_mutath_air + call atk_quazeth_air + call atk_hydrith_air + call atk_zorkiz_air + call atk_alkag_air + call atk_matravil_ranged + call atk_matravil_special + call atk_geszkath_air + var Set air_attack_var 0 13 + return + :atk_quazeth_melee var AtL|Call prefZethrokor 1 atk_zethrokor2 13 var AtL|Call prefVorvrokor 1 atk_vorvrokor2 13 @@ -5006,21 +5051,21 @@ script_id ZMCx call atk_vithrilisk return - :atk_izkag_ranged + :atk_alkag_ranged var AtL|Call prefKagralisk 1 atk_kagralisk2 13 # var AtL|Call prefCherbrathalor 1 atk_cherbrathalor2 13 call atk_kagralisk # call atk_cherbrathalor return - :atk_izkag_siege + :atk_alkag_siege var AtL|Call prefEvigrilisk 1 atk_evigrilisk2 13 - var AtL|Call prefOkrimnilisk 1 atk_okrimnilisk2 13 +# var AtL|Call prefOkrimnilisk 1 atk_okrimnilisk2 13 call atk_evigrilisk - call atk_okrimnilisk +# call atk_okrimnilisk return - :atk_izkag_air + :atk_alkag_air var AtL|Call prefAlmaksalisk 1 atk_almaksalisk2 13 # var AtL|Call prefAlgoztalisk 1 atk_algoztalisk2 13 call atk_almaksalisk @@ -5030,8 +5075,10 @@ script_id ZMCx :atk_mutath_air var AtL|Call prefMutalisk 1 atk_mutalisk2 13 var AtL|Call prefTosgrilisk 1 atk_tosgrilisk2 13 + var AtL|Call prefSovroleth 1 atk_sovroleth2 13 call atk_mutalisk call atk_tosgrilisk + call atk_sovroleth return :atk_quazeth_air @@ -5062,25 +5109,22 @@ script_id ZMCx call atk_zarcavrokor return - :atk_elthisth_siege - var AtL|Call prefIsthrathaleth 1 atk_isthrathaleth2 13 - var AtL|Call prefSovroleth 1 atk_sovroleth2 13 - call atk_isthrathaleth - call atk_sovroleth - return - :atk_matravil_special + var AtL|Call prefVilgorokor 1 atk_vilgorokor2 13 + var AtL|Call prefIsthrathaleth 1 atk_isthrathaleth2 13 var AtL|Call prefMatraleth 1 atk_matraleth2 13 var AtL|Call prefAkistrokor 1 atk_akistrokor2 13 + call atk_vilgorokor + call atk_isthrathaleth call atk_matraleth call atk_akistrokor return :atk_matravil_ranged - var AtL|Call prefAlmaksalisk 1 atk_almaksalisk2 13 + var AtL|Call prefTetcaerokor 1 atk_tetcaerokor2 13 var AtL|Call prefKonvilisk 1 atk_konvilisk2 13 call atk_konvilisk - call atk_almaksalisk + call atk_tetcaerokor return :atk_geszkath_siege @@ -5098,55 +5142,60 @@ script_id ZMCx return :atk_zethrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return queue_rel zethrokor larva 0.55 larva 255 Global 63 100 atk_rel zethrokor zethrokor 0.8 :atk_zethrokor2 - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return atk_rel zethrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.55 + wait 24 return :atk_quazilisk - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return queue_rel quazilisk larva 0.4 larva 255 Global 63 100 atk_rel quazilisk quazilisk 0.8 :atk_quazilisk2 - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank_return atk_rel quazilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 + wait 24 return :atk_nathrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 vornath_pond|kalkiir_lake Loc.63 blank_return queue_rel nathrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.66 larva 255 Global 63 100 atk_rel nathrokor nathrokor 0.8 :atk_nathrokor2 - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 vornath_pond|kalkiir_lake Loc.63 blank_return atk_rel nathrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.25 + wait 24 return :atk_vorvrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 vornath_pond|kalkiir_lake Loc.63 blank_return queue_rel zethrokor larva 0.4 larva 255 Global 63 100 queue_rel vorvrokor zethrokor 0.4 larva 255 Global 63 100 atk_rel vorvrokor vorvrokor 0.8 :atk_vorvrokor2 - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 vornath_pond|kalkiir_lake Loc.63 blank_return atk_rel vorvrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 + wait 24 return :atk_liiralisk - bring 13 Ex 0 kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 kalkiir_lake Loc.63 blank_return queue_rel quazilisk larva 0.4 larva 255 Global 63 100 queue_rel liiralisk quazilisk 0.4 larva 255 Global 63 101 atk_rel liiralisk liiralisk 0.8 :atk_liiralisk2 - bring 13 Ex 0 kalkiir_pond Loc.63 blank_return + bring 13 Ex 0 kalkiir_lake Loc.63 blank_return atk_rel liiralisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 + wait 24 return :atk_kalkalisk @@ -5158,6 +5207,7 @@ script_id ZMCx :atk_kalkalisk2 notowns tosvrol_haunt blank_return atk_rel kalkalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_cikralisk @@ -5168,6 +5218,7 @@ script_id ZMCx :atk_cikralisk2 bring 13 Ex 0 mutath_spire|tosvrol_haunt Loc.63 blank_return atk_rel cikralisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_protathalor @@ -5178,6 +5229,7 @@ script_id ZMCx :atk_protathalor2 bring 13 Ex 0 mutath_spire|tosvrol_haunt Loc.63 blank_return atk_rel protathalor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.25 + wait 24 return :atk_mutalisk @@ -5188,6 +5240,7 @@ script_id ZMCx :atk_mutalisk2 bring 13 Ex 0 mutath_spire|tosvrol_haunt Loc.63 blank_return atk_rel mutalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_ghitorokor @@ -5199,6 +5252,7 @@ script_id ZMCx :atk_ghitorokor2 notowns tosvrol_haunt blank_return atk_rel ghitorokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_sovroleth @@ -5210,6 +5264,7 @@ script_id ZMCx :atk_sovroleth2 notowns tosvrol_haunt blank_return atk_rel sovroleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_tosgrilisk @@ -5221,6 +5276,7 @@ script_id ZMCx :atk_tosgrilisk2 notowns tosvrol_haunt blank_return atk_rel tosgrilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_axitrilisk @@ -5231,6 +5287,7 @@ script_id ZMCx :atk_axitrilisk2 bring 13 Ex 0 axtoth_axis|begrozith_barrow Loc.63 blank_return atk_rel axitrilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 2 + wait 24 return :atk_mortothrokor @@ -5241,6 +5298,7 @@ script_id ZMCx :atk_mortothrokor2 bring 13 Ex 0 axtoth_axis|begrozith_barrow Loc.63 blank_return atk_rel mortothrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_begrothilisk @@ -5252,6 +5310,7 @@ script_id ZMCx :atk_begrothilisk2 notowns begrozith_barrow blank_return atk_rel begrothilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_oztukrokor @@ -5263,68 +5322,75 @@ script_id ZMCx :atk_oztukrokor2 notowns begrozith_barrow blank_return atk_rel oztukrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_hydralisk - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return queue_rel hydralisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.68 larva 255 Global 63 100 atk_rel hydralisk hydralisk 0.8 :atk_hydralisk2 - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return atk_rel hydralisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.25 + wait 24 return :atk_izirokor - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return queue_rel izirokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 larva 255 Global 63 100 atk_rel izirokor izirokor 0.8 :atk_izirokor2 - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank_return atk_rel izirokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_skithrokor - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 skibact_scab|tethvith_swamp Loc.63 blank_return queue_rel skithrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.55 larva 255 Global 63 100 atk_rel skithrokor skithrokor 0.8 :atk_skithrokor2 - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank_return + bring 13 Ex 0 skibact_scab|tethvith_swamp Loc.63 blank_return atk_rel skithrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.1 + wait 24 return :atk_bactalisk - notowns bactith_swamp blank_return + bring 13 Ex 0 skibact_scab|tethvith_swamp Loc.63 blank_return queue_rel hydralisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 larva 255 Global 63 100 queue_rel bactalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 hydralisk 255 Global 63 101 atk_rel bactalisk bactalisk 0.8 :atk_bactalisk2 - notowns bactith_swamp blank_return + bring 13 Ex 0 skibact_scab|tethvith_swamp Loc.63 blank_return atk_rel bactalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_tethzorokor - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return queue_rel izirokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 larva 255 Global 63 100 queue_rel tethzorokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 izirokor 255 Global 63 101 atk_rel tethzorokor tethzorokor 0.8 :atk_tethzorokor2 - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return atk_rel tethzorokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_vithrilisk - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return queue_rel skithrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.2 larva 255 Global 63 101 atk_rel vithrilisk vithrilisk 0.8 :atk_vithrilisk2 - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return atk_rel vithrilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 + wait 24 return :atk_kagralisk @@ -5335,6 +5401,7 @@ script_id ZMCx :atk_kagralisk2 bring 13 Ex 0 alkag_iteth|chokralgant_chazsal Loc.63 blank_return atk_rel kagralisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.25 + wait 24 return :atk_evigrilisk @@ -5345,6 +5412,7 @@ script_id ZMCx :atk_evigrilisk2 bring 13 Ex 0 alkag_iteth|chokralgant_chazsal Loc.63 blank_return atk_rel evigrilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_almaksalisk @@ -5355,6 +5423,7 @@ script_id ZMCx :atk_almaksalisk2 bring 13 Ex 0 alkag_iteth|chokralgant_chazsal Loc.63 blank_return atk_rel almaksalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_cherbrathalor @@ -5366,6 +5435,7 @@ script_id ZMCx :atk_cherbrathalor2 notowns chokralgant_chazsal blank_return atk_rel cherbrathalor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_okrimnilisk @@ -5377,6 +5447,7 @@ script_id ZMCx :atk_okrimnilisk2 notowns chokralgant_chazsal blank_return atk_rel okrimnilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_algoztalisk @@ -5388,6 +5459,7 @@ script_id ZMCx :atk_algoztalisk2 notowns chokralgant_chazsal blank_return atk_rel algoztalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_keskathalor @@ -5398,6 +5470,7 @@ script_id ZMCx :atk_keskathalor2 bring 13 Ex 0 geszkath_grotto Loc.63 blank_return atk_rel keskathalor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_geszithalor @@ -5408,6 +5481,7 @@ script_id ZMCx :atk_geszithalor2 bring 13 Ex 0 geszkath_grotto Loc.63 blank_return atk_rel geszithalor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_kethrostalor @@ -5419,6 +5493,7 @@ script_id ZMCx :atk_kethrostalor2 notowns geszkath_grotto blank_return atk_rel kethrostalor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_alkajelisk @@ -5430,6 +5505,7 @@ script_id ZMCx :atk_alkajelisk2 notowns geszkath_grotto blank_return atk_rel alkajelisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_zoryusthaleth @@ -5440,6 +5516,7 @@ script_id ZMCx bring 13 Ex 0 zorkiz_shroud|ultrav_cavern Loc.63 blank_return atk_rel zoryusthaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.75 atk_rel zoryusthaleth zoryusthaleth 0.8 + wait 24 return :atk_lakizilisk @@ -5450,6 +5527,7 @@ script_id ZMCx :atk_lakizilisk2 bring 13 Ex 0 zorkiz_shroud|ultrav_cavern Loc.63 blank_return atk_rel lakizilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_gorgrokor @@ -5458,18 +5536,22 @@ script_id ZMCx atk_rel gorgrokor gorgrokor 0.8 :atk_gorgrokor2 - notowns bactith_swamp blank_return + notowns tethvith_swamp blank_return atk_rel gorgrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_konvilisk + var Ex|Jump air_attack_var 1 blank_return 13 bring 13 Ex 0 matravil_nest|almakis_antre Loc.63 blank_return queue_rel konvilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.75 larva 255 Global 63 101 atk_rel konvilisk konvilisk 0.8 :atk_konvilisk2 + var Ex|Jump air_attack_var 1 blank_return 13 bring 13 Ex 0 matravil_nest|almakis_antre Loc.63 blank_return atk_rel konvilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_vilgorokor @@ -5480,6 +5562,7 @@ script_id ZMCx :atk_vilgorokor2 bring 13 Ex 0 matravil_nest|almakis_antre Loc.63 blank_return atk_rel vilgorokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1.5 + wait 24 return :atk_matraleth @@ -5490,6 +5573,7 @@ script_id ZMCx :atk_matraleth2 bring 13 Ex 0 matravil_nest|almakis_antre Loc.63 blank_return atk_rel matraleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 + wait 24 return :atk_ultrokor @@ -5501,6 +5585,7 @@ script_id ZMCx :atk_ultrokor2 bring 13 Ex 0 ultrav_cavern Loc.63 blank_return atk_rel ultrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_zobriolisk @@ -5512,6 +5597,7 @@ script_id ZMCx :atk_zobriolisk2 bring 13 Ex 0 ultrav_cavern Loc.63 blank_return atk_rel zobriolisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_zarcavrokor @@ -5523,6 +5609,7 @@ script_id ZMCx :atk_zarcavrokor2 bring 13 Ex 0 ultrav_cavern Loc.63 blank_return atk_rel zarcavrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :atk_tetcaerokor @@ -5534,17 +5621,18 @@ script_id ZMCx :atk_tetcaerokor2 notowns almakis_antre blank_return atk_rel tetcaerokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return - :atkSelkerilisk + :atk_isthrathaleth notowns almakis_antre blank_return queue_rel vilgorokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 larva 255 Global 63 100 - queue_rel selkerilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 vilgorokor 255 Global 63 102 - atk_rel selkerilisk selkerilisk 0.8 + queue_rel isthrathaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 vilgorokor 255 Global 63 100 - :atkSelkerilisk2 + :atk_isthrathaleth2 notowns almakis_antre blank_return - atk_rel selkerilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + atk_rel isthrathaleth isthrathaleth 1 + wait 24 return :atk_akistrokor @@ -5556,48 +5644,7 @@ script_id ZMCx :atk_akistrokor2 notowns almakis_antre blank_return atk_rel akistrokor larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 - return - - :atk_isthrathaleth - bring 13 Ex 0 elthisth_mound|rakzogth_roost Loc.63 blank_return - queue_rel isthrathaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.2 larva 255 Global 63 103 - atk_rel isthrathaleth isthrathaleth 0.8 - - :atk_isthrathaleth2 - notowns elthisth_mound blank_return - atk_rel isthrathaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.33 - return - - :atk_elthrazalisk - bring 13 Ex 0 elthisth_mound|rakzogth_roost Loc.63 blank_return - queue_rel elthrazalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.2 larva 255 Global 63 103 - atk_rel elthrazalisk elthrazalisk 0.8 - - :atk_elthrazalisk2 - notowns elthisth_mound blank_return - atk_rel elthrazalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.33 - return - - :atk_ogroszaleth - notowns almakis_antre blank_return - queue_rel isthrathaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 larva 255 Global 63 100 - queue_rel ogroszaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.4 isthrathaleth 255 Global 63 104 - atk_rel ogroszaleth ogroszaleth 0.8 - - :atk_ogroszaleth2 - notowns almakis_antre blank_return - atk_rel ogroszaleth larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 - return - - :atk_rakzilisk - notowns almakis_antre blank_return - queue_rel elthrazalisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 larva 255 Global 63 100 - queue_rel rakzilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 0.5 elthrazalisk 255 Global 63 104 - atk_rel rakzilisk rakzilisk 0.8 - - :atk_rakzilisk2 - notowns almakis_antre blank_return - atk_rel rakzilisk larvosk_cesiant|hachirosk|caphrolosk|gathtelosk 1 + wait 24 return :early_military @@ -5609,9 +5656,9 @@ script_id ZMCx :early_military_general time AtL 7200 Frames blank var Ex|Wait can_queue_early_military_var 1 13 - bring 13 AtL_M 1 quazeth_pool|kalkiir_pond Loc.63 early_zethrokor - bring 13 AtL_M 1 kalkiir_pond Loc.63 early_vorvrokor - bring 13 AtL_M 1 hydrith_den|bactith_swamp Loc.63 early_hydralisk + bring 13 AtL_M 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 early_zethrokor + bring 13 AtL_M 1 kalkiir_lake Loc.63 early_vorvrokor + bring 13 AtL_M 1 hydrith_den|skibact_scab|tethvith_swamp Loc.63 early_hydralisk bring 13 AtL_M 1 zorkiz_shroud|ultrav_cavern Loc.63 early_lakizilisk bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_mutalisk bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_nathrokor @@ -5622,12 +5669,12 @@ script_id ZMCx :early_military_assault time AtL 7200 Frames blank var Ex|Wait can_queue_early_military_var 1 13 - bring 13 AtL_M 1 hydrith_den|bactith_swamp Loc.63 early_hydralisk - bring 13 AtL_M 1 quazeth_pool|kalkiir_pond Loc.63 early_zethrokor - bring 13 AtL_M 1 bactith_swamp Loc.63 early_bactalisk + bring 13 AtL_M 1 hydrith_den|skibact_scab|tethvith_swamp Loc.63 early_hydralisk + bring 13 AtL_M 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 early_zethrokor + bring 13 AtL_M 1 tethvith_swamp Loc.63 early_bactalisk bring 13 AtL_M 1 zorkiz_shroud|ultrav_cavern Loc.63 early_lakizilisk bring 13 AtL_M 1 zorkiz_shroud|ultrav_cavern Loc.63 early_zoryusthaleth - bring 13 AtL_M 1 kalkiir_pond Loc.63 early_vorvrokor + bring 13 AtL_M 1 kalkiir_lake Loc.63 early_vorvrokor bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_nathrokor bring 13 AtL_M 1 almakis_antre Loc.63 early_almaksalisk wait 480 @@ -5637,14 +5684,14 @@ script_id ZMCx :early_military_swarm time AtL 7200 Frames blank var Ex|Wait can_queue_early_military_var 1 13 - bring 13 AtL_M 1 quazeth_pool|kalkiir_pond Loc.63 early_zethrokor - bring 13 AtL_M 1 kalkiir_pond Loc.63 early_vorvrokor + bring 13 AtL_M 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 early_zethrokor + bring 13 AtL_M 1 kalkiir_lake Loc.63 early_vorvrokor bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_nathrokor bring 13 AtL_M 1 ultrav_cavern Loc.63 early_ultrokor - bring 13 AtL_M 1 hydrith_den|bactith_swamp Loc.63 early_hydralisk + bring 13 AtL_M 1 hydrith_den|skibact_scab|tethvith_swamp Loc.63 early_hydralisk bring 13 AtL_M 1 zorkiz_shroud|ultrav_cavern Loc.63 early_lakizilisk bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_mutalisk - bring 13 AtL_M 1 quazeth_pool|kalkiir_pond Loc.63 early_quazilisk + bring 13 AtL_M 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 early_quazilisk bring 13 AtL_M 1 zorkiz_shroud|ultrav_cavern Loc.63 early_zoryusthaleth wait 480 c_queues train zethrokor|vorvrokor|nathrokor|ultrokor|hydralisk|lakizilisk|mutalisk|quazilisk|zoryusthaleth 13 @@ -5654,16 +5701,16 @@ script_id ZMCx time AtL 7200 Frames blank var Ex|Wait can_queue_early_military_var 1 13 bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_mutalisk - bring 13 AtL_M 1 quazeth_pool|kalkiir_pond Loc.63 early_zethrokor + bring 13 AtL_M 1 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 early_zethrokor bring 13 AtL_M 1 mutath_spire|tosvrol_haunt Loc.63 early_nathrokor bring 13 AtL_M 1 almakis_antre Loc.63 early_almaksalisk - bring 13 AtL_M 1 kalkiir_pond Loc.63 early_vorvrokor + bring 13 AtL_M 1 kalkiir_lake Loc.63 early_vorvrokor wait 480 c_queues train mutalisk|zethrokor|nathrokor|almaksalisk|vorvrokor 13 goto early_military_sunblot :early_zethrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank bring 13 AtL 24 zethrokor Loc.63 blank bring 13 AtM_C 2 larva Loc.63 wait_for_larva res 13 AtM Ore 49 blank @@ -5671,7 +5718,7 @@ script_id ZMCx stop :early_vorvrokor - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank bring 13 AtL 12 vorvrokor Loc.63 blank bring 13 AtM_C 2 larva Loc.63 wait_for_larva res 13 AtM Ore 74 blank @@ -5688,7 +5735,7 @@ script_id ZMCx stop :early_hydralisk - bring 13 Ex 0 hydrith_den|bactith_swamp Loc.63 blank + bring 13 Ex 0 hydrith_den|skibact_scab|tethvith_swamp Loc.63 blank bring 13 AtL 10 hydralisk Loc.63 blank bring 13 AtM_C 2 larva Loc.63 wait_for_larva res 13 AtM Ore 74 blank @@ -5697,7 +5744,7 @@ script_id ZMCx stop :early_bactalisk - notowns bactith_swamp blank + notowns tethvith_swamp blank bring 13 AtL 6 bactalisk Loc.63 blank bring 13 AtM_C 2 larva Loc.63 wait_for_larva res 13 AtM Ore 124 blank @@ -5707,7 +5754,7 @@ script_id ZMCx stop :early_quazilisk - bring 13 Ex 0 quazeth_pool|kalkiir_pond Loc.63 blank + bring 13 Ex 0 quazeth_pool|vornath_pond|kalkiir_lake Loc.63 blank bring 13 AtL 12 quazilisk Loc.63 blank bring 13 AtM_C 2 larva Loc.63 wait_for_larva res 13 AtM Ore 124 blank @@ -5789,7 +5836,7 @@ script_id ZMCx :anti_grief_air_assault add_bld 255 spraith_cesiant 2 50 140 - call tech_to_hydrok + call tech_to_hydrith train 6 hydralisk stop @@ -5807,7 +5854,7 @@ script_id ZMCx :anti_grief_air_general add_bld 255 spraith_cesiant 3 50 140 - call tech_to_hydrok + call tech_to_hydrith train 4 skithrokor stop @@ -5865,5 +5912,7 @@ script_id ZMCx return :faction_zorthos + replace_unit nathrokor nathrelisk +# replace_unit izirokor iziralisk return \ No newline at end of file diff --git a/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh b/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh index 227663b..852e3d0 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh differ diff --git a/CMBW-editor/grafting/Buttons.txt b/CMBW-editor/grafting/Buttons.txt index d287335..4635b4d 100644 --- a/CMBW-editor/grafting/Buttons.txt +++ b/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) - 6, 193, 4, 33, 193, 193, 387, 389 # Zoryus Shroud, Can Create Unit\Building ([193] Zoryus Shroud), Create Building - Zerg ([193] Zoryus Shroud) + 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 # 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) - 5, 170, 4, 33, 170, 170, 1386, 1103 # Izkag Iteth, Can Create Unit\Building ([170] Izkag Iteth), Create Building - Zerg ([170] Izkag Iteth) + 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 # 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) - 8, 267, 23, 57, 34, 0, 381, 0 # Ensnaring Brood, Spell Researched ([34] Passive), Cancel (0) + 7, 377, 23, 24, 35, 35, 1443, 1443 # Blissful Embrace, Spell Researched ([35] Blissful Embrace), Use Technology ([35] Blissful Embrace) + 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) - 7, 36, 23, 57, 34, 0, 328, 328 # Autophagy, Spell Researched ([34] Passive), Cancel (0) + 6, 46, 4, 38, 46, 46, 583, 744 # Isthrathaleth, Can Create Unit\Building ([46] Isthrathaleth), Unit Morph ([46] Isthrathaleth) + 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) -# 5, 52, 4, 38, 52, 52, 517, 518 # Okrimnilisk, Can Create Unit\Building ([52] Evigrilisk), Unit Morph ([52] Evigrilisk) -# 6, 29, 4, 38, 29, 29, 367, 366 # Algoztalisk, Can Create Unit\Building ([29] Almaksalisk), Unit Morph ([29] Almaksalisk) -# 7, 96, 4, 38, 96, 96, 1346, 1347 # Keskathalor, Can Create Unit\Building ([96] Keskathalor), Unit Morph ([96] Keskathalor) + 4, 470, 4, 38, 320, 320, 1806, 1805 # Cherbrathalor, Can Create Unit\Building ([320] Cherbrathalor), Unit Morph ([320] Cherbrathalor) + 5, 471, 4, 38, 321, 321, 623, 496 # Okrimnilisk, Can Create Unit\Building ([321] Okrimnilisk), Unit Morph ([321] Okrimnilisk) + 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 # 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) @@ -2415,6 +2417,45 @@ #6, 322, 47, 59, 0, 391, 645, 0 # Faction 3, Select Faction 3 (0), Change Displayed Buttons ([391] Select Faction 3) #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 - 38, 65535, 2, 1 # Button Set: [38] Hydrok Den +Unit 135: # [135] Zerg Hydrith 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 - 34, 65535, 2, 1 # Button Set: [34] Mutal Spire +Unit 141: # [141] Zerg Mutath 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 - -1, 65535, 2, 1 # Stat Preset: Building +Unit 170: # [170] Alkag Iteth + 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 diff --git a/CMBW-editor/grafting/Orders.txt b/CMBW-editor/grafting/Orders.txt index b835137..0551afc 100644 --- a/CMBW-editor/grafting/Orders.txt +++ b/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== \ No newline at end of file diff --git a/CMBW-editor/grafting/Tech.txt b/CMBW-editor/grafting/Tech.txt index f67f5de..9ff3cf8 100644 --- a/CMBW-editor/grafting/Tech.txt +++ b/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 - 0xFF01 # Or - 0xFF02 # Current unit is... - 123 # [123] Sovroleth + 45 # [45] Matraleth 0xFFFF # ==End of List== 36: # [36] Tempo Change - Madrigal diff --git a/CMBW-editor/grafting/Units.txt b/CMBW-editor/grafting/Units.txt index 997f854..1d821f6 100644 --- a/CMBW-editor/grafting/Units.txt +++ b/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 - 136 # Has Unit: [136] Elthisth Mound + 269 # [269] Vilgorokor 0xFF01 # Or - 0xFF03 # Must have... - 303 # [303] Rakzogth Roost + 0xFF02 # Current unit is... + 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 @@ -1523,38 +1465,32 @@ 0xFFFF # ==End of List== 218: # [218] Akistrokor - 0xFF02 # Current unit is... - 45 # [45] Matraleth - 0xFF01 # Or - 0xFF02 # Current unit is... - 353 # [353] Ocsal Larva - 139 # Has Unit: [139] Almakis Antre - 0xFFFF # ==End of List== + 0xFF02 # Current unit is... + 45 # [45] Matraleth + 0xFF01 # Or + 0xFF02 # Current unit is... + 353 # [353] Ocsal Larva + 139 # Has Unit: [139] Almakis Antre + 0xFFFF # ==End of List== 219: # [219] Geszkath Grotto 0xFF02 # Current unit is... - 41 # [41] Droleth + 41 # [41] Droleth 0xFF01 # Or 0xFF02 # Current unit is... - 47 # [47] Gosvileth + 47 # [47] Gosvileth 0xFF11 # Is not burrowed - 152 # Has Unit: [152] Othstol Oviform + 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 + 64 # [64] Scribe 0xFFFF # ==End of List== 221: # [221] Vespene Ridge 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 222: # [222] Iroleth @@ -1571,35 +1507,26 @@ 223: # [223] Monument of Sin 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 224: # [224] Irol Iris 0xFF02 # Current unit is... - 41 # [41] Droleth + 41 # [41] Droleth 0xFF01 # Or 0xFF02 # Current unit is... - 47 # [47] Gosvileth + 47 # [47] Gosvileth 0xFF11 # Is not burrowed 0xFFFF # ==End of List== 225: # [225] Sanctum of Sorrow 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 226: # [226] Grand Library 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 227: # [227] Sibraelosk @@ -1610,27 +1537,24 @@ 252: # [252] Matrix 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 253: # [253] Sundog 0xFF02 # Current unit is... - 114 # [114] Starport + 114 # [114] Starport 0xFF08 # Is not constructing add-on 0xFF05 # Is not lifted off 0xFF04 # Must have add-on - 121 # Has Unit: [121] Rotary + 121 # Has Unit: [121] Rotary 0xFFFF # ==End of List== 254: # [254] Starpad 0xFF02 # Current unit is... - 7 # [7] Mason + 7 # [7] Mason 0xFF01 # Or 0xFF02 # Current unit is... - 20 # [20] Talos + 20 # [20] Talos 0xFF0B # Is not constructing 0xFFFF # ==End of List== @@ -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 @@ -1948,10 +1866,7 @@ 294: # [294] Engram 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 295: # [295] Iron Council @@ -1997,18 +1912,12 @@ 304: # [304] Sequestered Icon 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 0xFFFF # ==End of List== 305: # [305] Unitary Union 0xFF02 # Current unit is... - 64 # [64] Scribe - 0xFF01 # Or - 0xFF02 # Current unit is... - 182 # [182] Artisan + 64 # [64] Scribe 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 @@ -2173,13 +2088,17 @@ 352: # [352] Accantor 0xFF02 # Current unit is... - 220 # [220] Ardent Authority + 220 # [220] Ardent Authority 0xFFFF # ==End of List== 354: # [354] Ocsal Cesiant - 0xFF02 # Current unit is... - 216 # [216] Larvosk Cesiant - 152 # Has Unit: [152] Othstol Oviform + 0xFF02 # Current unit is... + 216 # [216] Larvosk Cesiant + 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... diff --git a/CMBW-editor/unitdef.txt b/CMBW-editor/unitdef.txt index 4970c6d..84ae972 100644 --- a/CMBW-editor/unitdef.txt +++ b/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 muthrok_spire = 141 -building quazrok_pool = 142 +building ultrav_cavern = 140 +building mutath_spire = 141 +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 izkag_iteth = 170 +building tethvith_swamp = 153 +building alkag_iteth = 170 building irulent_ivoa = 181 building zorkiz_shroud = 193 -building vithrath_haunt = 197 -building liivral_pond = 204 +building tosvrol_haunt = 197 +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 diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Axiom v1.1.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Axiom 1.1.scx similarity index 90% rename from CMBW-maps/melee/1v1/Class 1 - Empire/(2)Axiom v1.1.scx rename to CMBW-maps/melee/1v1/Class 1 - Empire/(2)Axiom 1.1.scx index af485f7..54beabb 100644 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Axiom v1.1.scx and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Axiom 1.1.scx differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)Derelict v1.1.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Derelict 1.2.scx similarity index 90% rename from CMBW-maps/melee/1v1/_March Invitational B/(2)Derelict v1.1.scx rename to CMBW-maps/melee/1v1/Class 1 - Empire/(2)Derelict 1.2.scx index b616086..630798f 100644 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)Derelict v1.1.scx and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Derelict 1.2.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Derelict v1.1.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Derelict v1.1.scx deleted file mode 100644 index b616086..0000000 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Derelict v1.1.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Fata Morgana 1.1.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Fata Morgana 1.1.scx deleted file mode 100644 index f62cb47..0000000 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Fata Morgana 1.1.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Fata Morgana 1.2.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Fata Morgana 1.2.scx new file mode 100644 index 0000000..9947df6 Binary files /dev/null and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Fata Morgana 1.2.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Germination 1.0.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Germination 1.0.scx new file mode 100644 index 0000000..a63572c Binary files /dev/null and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Germination 1.0.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Impetus 2.0.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Impetus 2.0.scx index 1d7ce71..5e73440 100644 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Impetus 2.0.scx and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Impetus 2.0.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Sideshow 1.2.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Sideshow 1.2.scx index 080752a..43fdbb3 100644 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Sideshow 1.2.scx and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Sideshow 1.2.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)The Purgatory 1.0.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)The Purgatory 1.0.scx index c031e75..9f1e78b 100644 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)The Purgatory 1.0.scx and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)The Purgatory 1.0.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Titan Forge 1.1.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Titan Forge 1.1.scx deleted file mode 100644 index c9170d0..0000000 Binary files a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Titan Forge 1.1.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Titan Forge 1.2.scx b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Titan Forge 1.2.scx new file mode 100644 index 0000000..e9730fd Binary files /dev/null and b/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Titan Forge 1.2.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/Changelog - Empire-class.md b/CMBW-maps/melee/1v1/Class 1 - Empire/Changelog - Empire-class.md index d0f7220..2c16b35 100644 --- a/CMBW-maps/melee/1v1/Class 1 - Empire/Changelog - Empire-class.md +++ b/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 diff --git a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Dyadic Shore.scx b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Dyadic Shore.scx new file mode 100644 index 0000000..e6633b8 Binary files /dev/null and b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Dyadic Shore.scx differ diff --git a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Germination.scx b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Germination.scx deleted file mode 100644 index ef18e80..0000000 Binary files a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Germination.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Pantheon.scx b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Pantheon.scx deleted file mode 100644 index 46c81e1..0000000 Binary files a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Pantheon.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Underbarrel.scx b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Underbarrel.scx new file mode 100644 index 0000000..18c428b Binary files /dev/null and b/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Underbarrel.scx differ diff --git a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Cocytus.scx b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Cocytus.scx similarity index 100% rename from CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Cocytus.scx rename to CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Cocytus.scx diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(2)Infinite Velocity 2.0.scx b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Infinite Velocity 2.0.scx similarity index 100% rename from CMBW-maps/melee/1v1/Class 1 - Empire/(2)Infinite Velocity 2.0.scx rename to CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Infinite Velocity 2.0.scx diff --git a/CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Omnivore.scx b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Omnivore.scx similarity index 100% rename from CMBW-maps/melee/1v1/Class 2 - Uprising/(2)Omnivore.scx rename to CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Omnivore.scx diff --git a/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Pantheon.scx b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Pantheon.scx new file mode 100644 index 0000000..ced9ed1 Binary files /dev/null and b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(2)Pantheon.scx differ diff --git a/CMBW-maps/melee/1v1/Class 1 - Empire/(4)Highwater 1.2.1.scx b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(4)Highwater 1.2.scx similarity index 100% rename from CMBW-maps/melee/1v1/Class 1 - Empire/(4)Highwater 1.2.1.scx rename to CMBW-maps/melee/1v1/Class 3 - Bloodbath/(4)Highwater 1.2.scx diff --git a/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(4)Nitro Valley.scx index 5b06e94..fc615df 100644 Binary files a/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/Class 3 - Bloodbath/(4)Nitro Valley.scx differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)Axiom v1.1.scx b/CMBW-maps/melee/1v1/_March Invitational B/(2)Axiom v1.1.scx deleted file mode 100644 index af485f7..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)Axiom v1.1.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)Impetus 2.0.scx b/CMBW-maps/melee/1v1/_March Invitational B/(2)Impetus 2.0.scx deleted file mode 100644 index 1d7ce71..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)Impetus 2.0.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)Infinite Velocity 2.0.scx b/CMBW-maps/melee/1v1/_March Invitational B/(2)Infinite Velocity 2.0.scx deleted file mode 100644 index 845f832..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)Infinite Velocity 2.0.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)Sideshow 1.2.scx b/CMBW-maps/melee/1v1/_March Invitational B/(2)Sideshow 1.2.scx deleted file mode 100644 index 080752a..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)Sideshow 1.2.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)The Purgatory 1.0.scx b/CMBW-maps/melee/1v1/_March Invitational B/(2)The Purgatory 1.0.scx deleted file mode 100644 index c031e75..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)The Purgatory 1.0.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(2)Titan Forge 1.1.scx b/CMBW-maps/melee/1v1/_March Invitational B/(2)Titan Forge 1.1.scx deleted file mode 100644 index c9170d0..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(2)Titan Forge 1.1.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/_March Invitational B/(4)Highwater 1.2.1.scx b/CMBW-maps/melee/1v1/_March Invitational B/(4)Highwater 1.2.1.scx deleted file mode 100644 index 9a68562..0000000 Binary files a/CMBW-maps/melee/1v1/_March Invitational B/(4)Highwater 1.2.1.scx and /dev/null differ diff --git a/CMBW-maps/scenario/One vs All/(5)Omnikin.scx b/CMBW-maps/scenario/One vs All/(5)Omnikin.scx index aa0aa2a..42b5f77 100644 Binary files a/CMBW-maps/scenario/One vs All/(5)Omnikin.scx and b/CMBW-maps/scenario/One vs All/(5)Omnikin.scx differ diff --git a/master changelog.md b/master changelog.md index 9d5ac8f..a20c5e2 100644 --- a/master changelog.md +++ b/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 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index bc5a9c3..90f5154 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index ae80055..3eb8334 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index bf335bf..33b8059 100644 --- a/mpq/arr/images.txt +++ b/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 -Extended Image #826 -Extended Image #827 -Extended Image #828 -Extended Image #829 +Kalkalisk Birth (Egg) +Tethzorokor Birth +Vilgorokor Birth +Protathalor Birth +Cikralisk Birth Extended Image #830 Extended Image #831 Extended Image #832 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 3fc50cc..efd7ec7 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index a20bd1f..5d0c65c 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2999,35 +2999,35 @@ Algoztalisk Weaponfire 03 Cherbrathalor Weaponfire 01 Cherbrathalor Weaponfire 02 Cherbrathalor Weaponfire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Empress Ready 01 +Empress Ready 02 +Empress Ready 03 +Empress Selected 01 +Empress Selected 02 +Empress Selected 03 +Empress Selected 04 +Empress Order Passive 01 +Empress Order Passive 02 +Empress Order Passive 03 +Empress Order Passive 04 +Empress Order Aggressive 01 +Empress Order Aggressive 02 +Empress Order Aggressive 03 +Empress Order Aggressive 04 +Empress Under Attack 01 +Empress Under Attack 02 +Empress Under Attack 03 +Empress Under Attack 04 +Madcap Passive Charge 01 +Madcap Passive Charge 02 +Madcap Passive Charge 03 +Addon Construction 01 +Addon Construction 02 +Addon Construction 03 +Addon Construction 04 +Cikralisk Weaponfire 01 +Cikralisk Weaponfire 02 +Cikralisk Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 971b25c..834fe37 100644 --- a/mpq/arr/sounds.txt +++ b/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\t\_building\cancel-terran-01.wav +cm\p\_building\_cancel-protoss-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 @@ -2998,4 +2998,33 @@ cm\z\algoztalisk\wf-02.wav cm\z\algoztalisk\wf-03.wav cm\z\cherbrathalor\wf-01.wav cm\z\cherbrathalor\wf-02.wav -cm\z\cherbrathalor\wf-03.wav \ No newline at end of file +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 \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 342b08e..56d43a8 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 473a08d..f6d2073 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 0886bb5..095b7b0 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 65f786d..5062828 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 8b05cba..4d9e38e 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index e0b555b..fdab280 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 0a60ba7..c15e94d 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -20970,7 +20970,7 @@ VithriliskBirthLocal00: goto VithriliskBirthLocal00 VithriliskBirthDeath: - wait 1 + wait 1 end VithriliskBirthSpecialState1: @@ -30772,9 +30772,11 @@ KalkaliskGndAttkToIdle: playfram 0x40 wait 2 playfram 0x60 - wait 2 + 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 - wait 1 - playfram 0xA0 + playfram 0x160 nobrkcodeend gotorepeatattk goto KalkaliskGndAttkToIdle @@ -30814,9 +30814,11 @@ KalkaliskWalking: playfram 0x40 wait 1 playfram 0x60 - wait 1 + wait 1 playfram 0x80 wait 1 + playfram 0xA0 + wait 1 playfram 0x00 wait 1 goto KalkaliskWalking @@ -39420,22 +39422,8 @@ AxitriliskInit: imgul 1414 0 -5 # Axitrilisk Shadow (cm\zerg\axitrilisk-shadow.grp) AxitriliskWalkingToIdle: playfram 0x00 - wait 62 - randcondjmp 64 AxitriliskLocal00 + wait 125 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: playsnd 1536 # Skithrokor death 01 @@ -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 -CikraliskLocal42: - playfram 0x00 - wait 1 - goto CikraliskLocal00 - -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 + goto CikraliskGndAttkToIdle +CikraliskGndAttkToIdle: + playfram 0x00 + wait 1 + goto CikraliskGndAttkToIdle 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 @@ -46429,36 +46353,6 @@ CikraliskGndAttkInit: gotorepeatattk 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 @@ -46487,10 +46381,6 @@ CikraliskWalking: move 5 wait 1 goto CikraliskWalking - -CikraliskWalkingToIdle: - playfram 0x00 - goto CikraliskLocal00 CikraliskSpecialState2: playfram 0x1A0 @@ -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 -UnBurrow ZoryusthalethUnBurrow +Burrow CherbrathalorBurrow +UnBurrow CherbrathalorUnBurrow .headerend # ----------------------------------------------------------------------------- # @@ -52179,6 +52069,55 @@ CherbrathalorWalking: move 3 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: @@ -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 -UnBurrow ZoryusthalethUnBurrow +Burrow OkrimniliskBurrow +UnBurrow OkrimniliskUnBurrow .headerend # ----------------------------------------------------------------------------- # @@ -52304,5 +52243,128 @@ OkrimniliskGndAttkInit: gotorepeatattk ignorerest goto OkrimniliskGndAttkToIdle + +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 -## Next free IsId: 774 \ No newline at end of file +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 \ No newline at end of file diff --git a/mpq/sound/cm/p/_building/cancel-protoss-01.wav b/mpq/sound/cm/p/_building/_cancel-protoss-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/cancel-protoss-01.wav rename to mpq/sound/cm/p/_building/_cancel-protoss-01.wav diff --git a/mpq/sound/cm/p/empress/agg-01.wav b/mpq/sound/cm/p/empress/agg-01.wav new file mode 100644 index 0000000..8525865 Binary files /dev/null and b/mpq/sound/cm/p/empress/agg-01.wav differ diff --git a/mpq/sound/cm/p/empress/agg-02.wav b/mpq/sound/cm/p/empress/agg-02.wav new file mode 100644 index 0000000..f7fc1cc Binary files /dev/null and b/mpq/sound/cm/p/empress/agg-02.wav differ diff --git a/mpq/sound/cm/p/empress/agg-03.wav b/mpq/sound/cm/p/empress/agg-03.wav new file mode 100644 index 0000000..e076f26 Binary files /dev/null and b/mpq/sound/cm/p/empress/agg-03.wav differ diff --git a/mpq/sound/cm/p/empress/agg-04.wav b/mpq/sound/cm/p/empress/agg-04.wav new file mode 100644 index 0000000..3a9db3c Binary files /dev/null and b/mpq/sound/cm/p/empress/agg-04.wav differ diff --git a/mpq/sound/cm/p/empress/hlp-01.wav b/mpq/sound/cm/p/empress/hlp-01.wav new file mode 100644 index 0000000..1307f2f Binary files /dev/null and b/mpq/sound/cm/p/empress/hlp-01.wav differ diff --git a/mpq/sound/cm/p/empress/hlp-02.wav b/mpq/sound/cm/p/empress/hlp-02.wav new file mode 100644 index 0000000..3e28d9d Binary files /dev/null and b/mpq/sound/cm/p/empress/hlp-02.wav differ diff --git a/mpq/sound/cm/p/empress/hlp-03.wav b/mpq/sound/cm/p/empress/hlp-03.wav new file mode 100644 index 0000000..6edde1f Binary files /dev/null and b/mpq/sound/cm/p/empress/hlp-03.wav differ diff --git a/mpq/sound/cm/p/empress/hlp-04.wav b/mpq/sound/cm/p/empress/hlp-04.wav new file mode 100644 index 0000000..5defc3d Binary files /dev/null and b/mpq/sound/cm/p/empress/hlp-04.wav differ diff --git a/mpq/sound/cm/p/empress/rdy-01.wav b/mpq/sound/cm/p/empress/rdy-01.wav new file mode 100644 index 0000000..2e256c7 Binary files /dev/null and b/mpq/sound/cm/p/empress/rdy-01.wav differ diff --git a/mpq/sound/cm/p/empress/rdy-02.wav b/mpq/sound/cm/p/empress/rdy-02.wav new file mode 100644 index 0000000..d93b161 Binary files /dev/null and b/mpq/sound/cm/p/empress/rdy-02.wav differ diff --git a/mpq/sound/cm/p/empress/rdy-03.wav b/mpq/sound/cm/p/empress/rdy-03.wav new file mode 100644 index 0000000..17cddcb Binary files /dev/null and b/mpq/sound/cm/p/empress/rdy-03.wav differ diff --git a/mpq/sound/cm/p/empress/wht-01.wav b/mpq/sound/cm/p/empress/wht-01.wav new file mode 100644 index 0000000..ef1ee78 Binary files /dev/null and b/mpq/sound/cm/p/empress/wht-01.wav differ diff --git a/mpq/sound/cm/p/empress/wht-02.wav b/mpq/sound/cm/p/empress/wht-02.wav new file mode 100644 index 0000000..e4d2655 Binary files /dev/null and b/mpq/sound/cm/p/empress/wht-02.wav differ diff --git a/mpq/sound/cm/p/empress/wht-03.wav b/mpq/sound/cm/p/empress/wht-03.wav new file mode 100644 index 0000000..8be8fef Binary files /dev/null and b/mpq/sound/cm/p/empress/wht-03.wav differ diff --git a/mpq/sound/cm/p/empress/wht-04.wav b/mpq/sound/cm/p/empress/wht-04.wav new file mode 100644 index 0000000..2cf8ab6 Binary files /dev/null and b/mpq/sound/cm/p/empress/wht-04.wav differ diff --git a/mpq/sound/cm/p/empress/yes-01.wav b/mpq/sound/cm/p/empress/yes-01.wav new file mode 100644 index 0000000..313219b Binary files /dev/null and b/mpq/sound/cm/p/empress/yes-01.wav differ diff --git a/mpq/sound/cm/p/empress/yes-02.wav b/mpq/sound/cm/p/empress/yes-02.wav new file mode 100644 index 0000000..d936e80 Binary files /dev/null and b/mpq/sound/cm/p/empress/yes-02.wav differ diff --git a/mpq/sound/cm/p/empress/yes-03.wav b/mpq/sound/cm/p/empress/yes-03.wav new file mode 100644 index 0000000..816f0e5 Binary files /dev/null and b/mpq/sound/cm/p/empress/yes-03.wav differ diff --git a/mpq/sound/cm/p/empress/yes-04.wav b/mpq/sound/cm/p/empress/yes-04.wav new file mode 100644 index 0000000..844d5ef Binary files /dev/null and b/mpq/sound/cm/p/empress/yes-04.wav differ diff --git a/mpq/sound/cm/t/_building/cancel-terran-01.wav b/mpq/sound/cm/t/_building/_cancel-terran-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/cancel-terran-01.wav rename to mpq/sound/cm/t/_building/_cancel-terran-01.wav diff --git a/mpq/sound/cm/t/_building/_construct-01.wav b/mpq/sound/cm/t/_building/_construct-01.wav new file mode 100644 index 0000000..93ba67a Binary files /dev/null and b/mpq/sound/cm/t/_building/_construct-01.wav differ diff --git a/mpq/sound/cm/t/_building/_construct-02.wav b/mpq/sound/cm/t/_building/_construct-02.wav new file mode 100644 index 0000000..1fb3e67 Binary files /dev/null and b/mpq/sound/cm/t/_building/_construct-02.wav differ diff --git a/mpq/sound/cm/t/_building/_construct-03.wav b/mpq/sound/cm/t/_building/_construct-03.wav new file mode 100644 index 0000000..f2cba19 Binary files /dev/null and b/mpq/sound/cm/t/_building/_construct-03.wav differ diff --git a/mpq/sound/cm/t/_building/_construct-04.wav b/mpq/sound/cm/t/_building/_construct-04.wav new file mode 100644 index 0000000..b566817 Binary files /dev/null and b/mpq/sound/cm/t/_building/_construct-04.wav differ diff --git a/mpq/sound/cm/t/madcap/pas-01.wav b/mpq/sound/cm/t/madcap/pas-01.wav new file mode 100644 index 0000000..1c4b906 Binary files /dev/null and b/mpq/sound/cm/t/madcap/pas-01.wav differ diff --git a/mpq/sound/cm/t/madcap/pas-02.wav b/mpq/sound/cm/t/madcap/pas-02.wav new file mode 100644 index 0000000..803bcea Binary files /dev/null and b/mpq/sound/cm/t/madcap/pas-02.wav differ diff --git a/mpq/sound/cm/t/madcap/pas-03.wav b/mpq/sound/cm/t/madcap/pas-03.wav new file mode 100644 index 0000000..0805439 Binary files /dev/null and b/mpq/sound/cm/t/madcap/pas-03.wav differ diff --git a/mpq/sound/cm/z/cikralisk/wf-01.wav b/mpq/sound/cm/z/cikralisk/wf-01.wav new file mode 100644 index 0000000..3321312 Binary files /dev/null and b/mpq/sound/cm/z/cikralisk/wf-01.wav differ diff --git a/mpq/sound/cm/z/cikralisk/wf-02.wav b/mpq/sound/cm/z/cikralisk/wf-02.wav new file mode 100644 index 0000000..a4c0984 Binary files /dev/null and b/mpq/sound/cm/z/cikralisk/wf-02.wav differ diff --git a/mpq/sound/cm/z/cikralisk/wf-03.wav b/mpq/sound/cm/z/cikralisk/wf-03.wav new file mode 100644 index 0000000..dff7379 Binary files /dev/null and b/mpq/sound/cm/z/cikralisk/wf-03.wav differ diff --git a/mpq/tileset/Desert.cv5 b/mpq/tileset/Desert.cv5 index 1627872..28c284f 100644 Binary files a/mpq/tileset/Desert.cv5 and b/mpq/tileset/Desert.cv5 differ diff --git a/mpq/unit/cm/zerg/cherbrathalor.grp b/mpq/unit/cm/zerg/cherbrathalor.grp index 848afc4..97c411e 100644 Binary files a/mpq/unit/cm/zerg/cherbrathalor.grp and b/mpq/unit/cm/zerg/cherbrathalor.grp differ diff --git a/mpq/unit/cm/zerg/cikralisk-birth.grp b/mpq/unit/cm/zerg/cikralisk-birth.grp new file mode 100644 index 0000000..0c73621 Binary files /dev/null and b/mpq/unit/cm/zerg/cikralisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/evigrilisk-birth.grp b/mpq/unit/cm/zerg/evigrilisk-birth.grp index b7f385a..81a73b1 100644 Binary files a/mpq/unit/cm/zerg/evigrilisk-birth.grp and b/mpq/unit/cm/zerg/evigrilisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/gorgrokor-birth.grp b/mpq/unit/cm/zerg/gorgrokor-birth.grp new file mode 100644 index 0000000..7e21f4c Binary files /dev/null and b/mpq/unit/cm/zerg/gorgrokor-birth.grp differ diff --git a/mpq/unit/cm/zerg/kalkalisk-attack.lol b/mpq/unit/cm/zerg/kalkalisk-attack.lol index 42ca760..df3eeb6 100644 Binary files a/mpq/unit/cm/zerg/kalkalisk-attack.lol and b/mpq/unit/cm/zerg/kalkalisk-attack.lol differ diff --git a/mpq/unit/cm/zerg/kalkalisk-birth-flying.grp b/mpq/unit/cm/zerg/kalkalisk-birth-flying.grp new file mode 100644 index 0000000..937efec Binary files /dev/null and b/mpq/unit/cm/zerg/kalkalisk-birth-flying.grp differ diff --git a/mpq/unit/cm/zerg/kalkalisk-birth.grp b/mpq/unit/cm/zerg/kalkalisk-birth.grp new file mode 100644 index 0000000..6ce0312 Binary files /dev/null and b/mpq/unit/cm/zerg/kalkalisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/kalkalisk-mutate.grp b/mpq/unit/cm/zerg/kalkalisk-mutate.grp new file mode 100644 index 0000000..69dcc59 Binary files /dev/null and b/mpq/unit/cm/zerg/kalkalisk-mutate.grp differ diff --git a/mpq/unit/cm/zerg/kalkalisk.grp b/mpq/unit/cm/zerg/kalkalisk.grp index 5740c2a..67a6f98 100644 Binary files a/mpq/unit/cm/zerg/kalkalisk.grp and b/mpq/unit/cm/zerg/kalkalisk.grp differ diff --git a/mpq/unit/cm/zerg/okrimnilisk.grp b/mpq/unit/cm/zerg/okrimnilisk.grp index 0059e37..49133c0 100644 Binary files a/mpq/unit/cm/zerg/okrimnilisk.grp and b/mpq/unit/cm/zerg/okrimnilisk.grp differ diff --git a/mpq/unit/cm/zerg/protathalor-birth.grp b/mpq/unit/cm/zerg/protathalor-birth.grp new file mode 100644 index 0000000..0338c5b Binary files /dev/null and b/mpq/unit/cm/zerg/protathalor-birth.grp differ diff --git a/mpq/unit/cm/zerg/tethzorokor-birth.grp b/mpq/unit/cm/zerg/tethzorokor-birth.grp new file mode 100644 index 0000000..025946d Binary files /dev/null and b/mpq/unit/cm/zerg/tethzorokor-birth.grp differ diff --git a/mpq/unit/cm/zerg/vilgorokor-birth.grp b/mpq/unit/cm/zerg/vilgorokor-birth.grp new file mode 100644 index 0000000..a59c5ee Binary files /dev/null and b/mpq/unit/cm/zerg/vilgorokor-birth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index e6f7a1c..f3303d4 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index 3b4f7de..4c93a51 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/jubush01.grp b/mpq/unit/thingy/tileset/jungle/jubush01.grp new file mode 100644 index 0000000..2f73d4d Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/jubush01.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/jubush03.grp b/mpq/unit/thingy/tileset/jungle/jubush03.grp new file mode 100644 index 0000000..2060947 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/jubush03.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/jubush05.grp b/mpq/unit/thingy/tileset/jungle/jubush05.grp new file mode 100644 index 0000000..c420256 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/jubush05.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index b9bb66d..a6bb699 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 833ae5f..63589f4 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index 5c2b67e..427af51 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,89 +1,84 @@ -# 16 March 2024 +# 23 March 2024 -This patch includes bug and stability fixes, audiovisual improvements, some mild balance changes, and the implementation of Chokral (evolved Alkag) strains. +This patch includes bugfixes, audiovisual improvements, and mild balance adjustments. + +Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud Launcher 2.zip) for easier setup and maintenance! + +We are still hunting for desyncs! Please submit your critical logs to cm-issues on [our Discord server](https://discord.com/invite/s5SKBmY). ## 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 + - CPU throttling is now disabled, as it offers no benefit to modern CPUs (c. Veeq7) - **Config:** - - Added the following custom advisors: - - ISN (c. IskatuMesk) -- **Custom triggers:** - - New actions: - - blissful_embrace (c. Veeq7) + - Changed default map path to better suit the new default installation environment -## 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 +## Game modes: +- **Omnipresence:** + - Now limited to two races, from three, based on player selection + - Terran adds Protoss, Protoss adds Zerg, Zerg adds Terran + - Can be overridden in scenarios using new crig action `set_omnipresence_state` +- **The Turning:** + - Fixed order limit being reached by zombies ## 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) + - Prospectively fixed a rare nullsprite crash (r. The Shambler) - 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 + - Analogue Empathy Core now properly takes into account actual damage dealt (e.g. splash, Clarion Phase Link) when reflecting projectiles + - Removed detector flag from Axtoth Axis (r. TheBeaver99) +- Audiovisual: + - Savants now correctly play their weaponfire SFX when attacking while garrisoned + - Losing a structure with an addon still attached no longer plays the "abandon addon" advisor event (r. TheBeaver99) + - Fixed advisor events not playing for structure warp completion if your race was not Protoss, and addon completion if your race was not Terran (r. TheBeaver99) + - Corrected Vagrant Shade portrait (r. TheBeaver99) ## 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) +- Revised graphics for: + - Kalkalisk (c. Solstice; cocoon birth animation not yet implemented) +- Added unit responses for: + - Empress (c. [M](https://twitter.com/TheUnluckyM) & Chumbeque) +- Added birth animations for: + - Protathalor, Tethzorokor, Gorgrokor, Vilgorokor +- Added SFX for: + - Terran addon self-construction + - Madcaps reaching full stacks of Cabeirus Feeders + - Cikralisk weaponfire - Updated icons for: - - Ecclesiast, Charlatan, Potentate, and Monument of Sin + - Terran supreme construction; All Protoss constructions (c. TheBeaver99) ## 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 +- [Eidolon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/eidolon): + - Time cost now 25, from 30 + - Weapon range now 9, from 8 +- [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle): + - Time cost now 30, from 35 +- [Siren](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/siren): + - Time cost now 25, from 30 +- [Striga](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/striga): + - Time cost now 25, from 30 +- [Madrigal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madrigal): + - Imperioso Missiles: + - Weapon range now 8, from 7 ## 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 +- [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot): + - Transport space cost now 3, from 2 +- [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth): + - Transport space cost now 3, from 2 +- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald): + - Transport space cost now 3, from 4 +- [Mind Tyrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/mind-tyrant): + - Transport space cost now 6, from 4 +- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol): + - Transport space cost now 3, from 2 +- [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron): + - Transport space cost now 3, from 4 +- [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect): + - Transport space cost now 8, from 6 +- [Demiurge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/demiurge): + - Transport space cost now 10, from 6 ## 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 \ No newline at end of file +- [Hachirosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hachirosk), [Caphrolosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/caphrolosk), and [Gathtelosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gathtelosk): + - Collision size normalized with other town centers + - *This is primarily to avoid poor resource returns that only impact some races, but also allows Zerg to potentially create walls where they couldn't previously.* \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index bc5a428..8280125 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ