diff --git a/CMBW-editor/ai/cm_protoss_atown.asc3 b/CMBW-editor/ai/cm_protoss_atown.asc3 index 8dc460c..e4fe2f0 100644 --- a/CMBW-editor/ai/cm_protoss_atown.asc3 +++ b/CMBW-editor/ai/cm_protoss_atown.asc3 @@ -449,12 +449,6 @@ script_id PARx # p_need 1 sanctum_of_sorrow return - :need_waywardlure - wait 12 - bring 13 AtL 1 wayward_lure Loc.63 blank_return - p_need 1 wayward_lure - return - :need_monumentofsin wait 12 bring 13 AtL 1 monument_of_sin Loc.63 blank_return diff --git a/CMBW-editor/ai/cm_terran_atown.asc3 b/CMBW-editor/ai/cm_terran_atown.asc3 index a683907..58c0588 100644 --- a/CMBW-editor/ai/cm_terran_atown.asc3 +++ b/CMBW-editor/ai/cm_terran_atown.asc3 @@ -6,7 +6,7 @@ script_id TARx wait 1 set_free_id local 255 AtL 1 treasury expansion_body_treasury_atown - bld 1 command_center 180 + bld 1 ministry 180 goto select_build_type_atown :expansion_body_treasury_atown @@ -83,12 +83,12 @@ script_id TARx :outpost_handling multi atown_worker_start - local 255 AtL_W 1 command_center|treasury blank + local 255 AtL_W 1 ministry|treasury blank multi atown_build_order var Ex|Jump skip_building_var 1 idle 13 - bring 13 AtL_W 1 barracks|captaincy Loc.63 blank + bring 13 AtL_W 1 stockade|captaincy Loc.63 blank call main_wait_atown_150 - multi request_bunker_atown + multi request_anchor_atown call main_wait_atown_150 multi request_watchdog_atown call main_wait_atown_600 @@ -100,13 +100,13 @@ script_id TARx bld 1 starpad 121 call main_wait_atown_600 bring 13 AtL_W 1 daedala Loc.63 blank - multi request_ion_cannon_atown + multi request_diadem_atown goto idle :expansion_main_atown multi atown_worker_start - w_bldstart 1 command_center - w_bld 1 command_center + w_bldstart 1 ministry + w_bld 1 ministry # multi count_expansion_atown placeholder_count Local AtL|Jump 1 Group_Buildings expansion_normal_atown 13 var Ex|Jump skip_building_var 1 idle 13 @@ -116,7 +116,7 @@ script_id TARx call main_wait_atown_450 multi production_cycle_atown call main_wait_atown_600 - multi request_bunker_atown + multi request_anchor_atown var Ex|Wait build_done_var_atown 1 13 call main_wait_atown_450 multi atown_build_order_atown @@ -129,11 +129,11 @@ script_id TARx call main_wait_atown_450 bring 13 AtL_W 1 daedala Loc.63 blank call main_wait_atown_900 - multi request_ion_cannon_atown + multi request_diadem_atown goto idle :atown_build_order_atown - bring 13 AtL_W 1 barracks|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly Loc.63 blank + bring 13 AtL_W 1 stockade|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly Loc.63 blank var Ex|Jump pref_armor 1 build_armor_atown_fin_atown 13 var Ex|Jump pref_raider 1 build_raider_atown_fin_atown 13 var Ex|Jump pref_orbital 1 build_orbital_atown_fin_atown 13 @@ -146,9 +146,9 @@ script_id TARx call main_wait_atown_300 multi atown_need_atlas call main_wait_atown_300 - call add_barracks_atown_simple + call add_stockade_atown_simple call main_wait_atown_150 - bld 1 covert_ops 120 + bld 1 covenant 120 call main_wait_atown_600 call add_starport_atown_simple call main_wait_atown_1200 @@ -169,9 +169,9 @@ script_id TARx :build_raider_atown_fin_atown placeholder_count Local AtL|Jump 2 Group_Buildings blank 13 call main_wait_atown_300 - bld 1 medbay 120 + bld 1 vestry 120 call main_wait_atown_300 - bld 1 covert_ops 120 + bld 1 covenant 120 call main_wait_atown_1200 call main_wait_atown_600 multi atown_need_atlas @@ -285,9 +285,9 @@ script_id TARx :count_expansion_atown wait 12 - local 255 Ex 0 command_center count_expansion_atown + local 255 Ex 0 ministry count_expansion_atown var add town_count_var 1 13 - local 255 Ex_W 0 command_center blank + local 255 Ex_W 0 ministry blank var subtract town_count_var 1 13 goto count_expansion_atown @@ -306,9 +306,9 @@ script_id TARx :atown_worker_start wait 24 - local 255 Ex 0 command_center|quarry atown_worker_start + local 255 Ex 0 ministry|quarry atown_worker_start bld 1 mason 98 - local 255 AtL_W 1 command_center|treasury blank + local 255 AtL_W 1 ministry|treasury blank bld 4 mason 98 multi worker_track_atown @@ -321,7 +321,7 @@ script_id TARx # c_queues train mason|talos 13 res 13 AtL_C Any 100 worker_request_advanced_atown local 255 AtL 28 mason|talos atown_worker_loop - queue 1 mason command_center 255 Local Loc.63 200 + queue 1 mason ministry 255 Local Loc.63 200 wait 150 local 255 Ex 0 quarry atown_worker_loop queue 1 mason quarry 255 Local Loc.63 200 @@ -335,14 +335,14 @@ script_id TARx var Sub mining_count_var 1 13 goto worker_track_atown - :add_barracks_atown_simple + :add_stockade_atown_simple wait 12 - notowns command_center add_barracks_atown_simple - add_bld 255 barracks 1 99 97 + notowns ministry add_stockade_atown_simple + add_bld 255 stockade 1 99 97 return - :add_barracks_atown_simple2 - p_need 1 barracks + :add_stockade_atown_simple2 + p_need 1 stockade return :add_captaincy_atown_simple @@ -357,7 +357,7 @@ script_id TARx :add_fulcrum_atown_simple wait 12 - notowns command_center add_fulcrum_atown_simple + notowns ministry add_fulcrum_atown_simple add_bld 255 fulcrum 1 99 97 return @@ -377,7 +377,7 @@ script_id TARx :add_starpad_atown_simple wait 12 - notowns command_center add_starpad_atown_simple + notowns ministry add_starpad_atown_simple add_bld 255 starpad 1 99 97 return @@ -387,7 +387,7 @@ script_id TARx :add_starport_atown_simple wait 12 - notowns command_center add_starport_atown_simple + notowns ministry add_starport_atown_simple notowns atlas add_starport_atown_simple add_bld 255 starport 1 99 97 return @@ -408,7 +408,7 @@ script_id TARx :add_atlas_atown_simple wait 12 - notowns command_center add_atlas_atown_simple + notowns ministry add_atlas_atown_simple multi atown_need_atlas return @@ -487,28 +487,28 @@ script_id TARx notowns atelier atown_wait_for_atelier return - :request_bunker_atown + :request_anchor_atown var Ex|Wait can_build_static_defense_var_atown 1 13 wait 12 - bring 13 Ex 0 barracks|captaincy|apothecary|fulcrum|mantle|iron_foundry Loc.63 request_bunker_atown - call request_bunker_atown_check + bring 13 Ex 0 stockade|captaincy|apothecary|fulcrum|mantle|iron_foundry Loc.63 request_anchor_atown + call request_anchor_atown_check wait 60 call main_wait_atown_900 - goto request_bunker_atown + goto request_anchor_atown - :request_bunker_atown_check - local 255 AtL 4 bunker blank_return - var Ex|Jump under_attack_var 1 request_bunker_atown_check2 13 - add_bld 255 bunker 1 2 95 - goto request_bunker_atown_guards_tier3 + :request_anchor_atown_check + local 255 AtL 4 anchor blank_return + var Ex|Jump under_attack_var 1 request_anchor_atown_check2 13 + add_bld 255 anchor 1 2 95 + goto request_anchor_atown_guards_tier3 - :request_bunker_atown_check2 - add_bld 255 bunker 1 3 95 - var AtL|Jump mining_count_var 3 request_bunker_atown_guards_tier3 13 - var AtL|Jump mining_count_var 2 request_bunker_atown_guards_tier2 13 - goto request_bunker_atown_guards_tier1 + :request_anchor_atown_check2 + add_bld 255 anchor 1 3 95 + var AtL|Jump mining_count_var 3 request_anchor_atown_guards_tier3 13 + var AtL|Jump mining_count_var 2 request_anchor_atown_guards_tier2 13 + goto request_anchor_atown_guards_tier1 - :request_bunker_atown_guards_tier1 + :request_anchor_atown_guards_tier1 p_guard maverick 0 p_guard maverick 0 p_guard maverick 1 @@ -516,15 +516,15 @@ script_id TARx p_guard cyprian 1 goto add_return_atown__wait_960 - :request_bunker_atown_guards_tier2 - notowns captaincy request_bunker_atown_guards_tier1 + :request_anchor_atown_guards_tier2 + notowns captaincy request_anchor_atown_guards_tier1 p_guard madcap 0 p_guard madcap 0 p_guard heracles 1 goto add_return_atown__wait_960 - :request_bunker_atown_guards_tier3 - notowns guildhall request_bunker_atown_guards_tier2 + :request_anchor_atown_guards_tier3 + notowns guildhall request_anchor_atown_guards_tier2 p_guard olympian 0 p_guard olympian 0 p_guard autocrat 1 @@ -533,7 +533,7 @@ script_id TARx :request_watchdog_atown var Ex|Wait can_build_static_defense_var_atown 1 13 wait 12 - notowns command_center request_watchdog_atown + notowns ministry request_watchdog_atown call request_watchdog_atown_check call main_wait_atown_600 goto request_watchdog_atown @@ -557,7 +557,7 @@ script_id TARx :request_sentinel_atown var Ex|Wait can_build_static_defense_var_atown 1 13 wait 12 - notowns command_center request_sentinel_atown + notowns ministry request_sentinel_atown notowns atlas request_sentinel_atown call request_sentinel_atown_check call main_wait_atown_600 @@ -579,24 +579,24 @@ script_id TARx add_bld 255 sentinel 1 10 98 goto add_return_atown__wait_480 - :request_ion_cannon_atown + :request_diadem_atown var Ex|Wait can_build_static_defense_var_atown 1 13 wait 12 - notowns command_center request_ion_cannon_atown - notowns daedala request_ion_cannon_atown - call request_ion_cannon_atown_check + notowns ministry request_diadem_atown + notowns daedala request_diadem_atown + call request_diadem_atown_check wait 60 call main_wait_atown_900 - goto request_ion_cannon_atown + goto request_diadem_atown - :request_ion_cannon_atown_check - local 255 AtL 1 ion_cannon request_ion_cannon_atown_check2 - add_bld 255 ion_cannon 1 1 98 + :request_diadem_atown_check + local 255 AtL 1 diadem request_diadem_atown_check2 + add_bld 255 diadem 1 1 98 goto add_return_atown__wait_960 - :request_ion_cannon_atown_check2 + :request_diadem_atown_check2 var Ex|Jump under_attack_var 0 add_return_atown__wait_960 13 - add_bld 255 ion_cannon 1 2 98 + add_bld 255 diadem 1 2 98 goto add_return_atown__wait_960 :request_infrastructure_atown @@ -605,15 +605,15 @@ script_id TARx var Ex|Wait can_build_production_var_atown 1 13 :request_infrastructure_atown_parthenon - notowns daedala request_infrastructure_atown_silo + notowns daedala request_infrastructure_atown_anvil call add_parthenon_check_atown - :request_infrastructure_atown_silo + :request_infrastructure_atown_anvil notowns daedala request_infrastructure_atown_quarry var Ex|Jump infrastructure_cycle_var_atown 1 request_infrastructure_atown_loop 13 - var Ex|Call pref_missile_silo 1 add_nuclear_silo 13 + var Ex|Call pref_anvil 1 add_anvil 13 var Ex|Jump infrastructure_cycle_var_atown 1 request_infrastructure_atown_loop 13 - call add_nuclear_silo_check_atown + call add_anvil_check_atown :request_infrastructure_atown_quarry var Ex|Jump infrastructure_cycle_var_atown 1 request_infrastructure_atown_loop 13 @@ -635,14 +635,14 @@ script_id TARx call main_wait_atown_900 goto add_return_atown - :add_nuclear_silo_check_atown - local 255 AtL 1 missile_silo blank_return + :add_anvil_check_atown + local 255 AtL 1 anvil blank_return - :add_nuclear_silo - local 255 AtL 2 missile_silo|quarry blank_return - add_bld 255 missile_silo 1 1 98 + :add_anvil + local 255 AtL 2 anvil|quarry blank_return + add_bld 255 anvil 1 1 98 var Set infrastructure_cycle_var_atown 1 13 - w_bldstart 1 missile_silo + w_bldstart 1 anvil wait 240 call main_wait_atown_900 goto add_return_atown @@ -651,7 +651,7 @@ script_id TARx local 255 AtL 1 quarry blank_return :add_quarry_atown - local 255 AtL 2 missile_silo|quarry blank_return + local 255 AtL 2 anvil|quarry blank_return add_bld 255 quarry 1 1 98 var Set infrastructure_cycle_var_atown 1 13 w_bldstart 1 quarry @@ -665,7 +665,7 @@ script_id TARx :production_cycle_atown_conditions wait 24 var Ex|Jump mining_count_var 0 production_cycle_atown_conditions 13 - local 255 Ex 0 command_center|quarry production_cycle_atown_conditions + local 255 Ex 0 ministry|quarry production_cycle_atown_conditions local 255 AtM 4 mason|talos production_cycle_atown_conditions bring 13 Ex 0 atlas|daedala Loc.63 production_cycle_atown_conditions bring 13 AtL 31 Group_Factories Loc.63 production_cycle_atown_conditions_6 @@ -707,8 +707,8 @@ script_id TARx goto production_cycle_atown_conditions :production_cycle_atown_wait - bring 13 AtM 3 barracks|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly Loc.63 blank_return - local 255 AtM 1 barracks|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly blank_return + bring 13 AtM 3 stockade|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly Loc.63 blank_return + local 255 AtM 1 stockade|captaincy|apothecary|fulcrum|mantle|iron_foundry|starpad|starport|nanite_assembly blank_return var AtL|Jump mining_count_var 3 blank_return 13 var Ex|Jump mining_count_var 2 production_cycle_atown_wait2 13 call main_wait_atown_750 @@ -743,9 +743,9 @@ script_id TARx return :production_cycle_atown_check_raider - var AtL|Call pref_barracks 1 production_cycle_atown_barracks 13 + var AtL|Call pref_stockade 1 production_cycle_atown_stockade 13 var AtL|Call pref_captaincy 1 production_cycle_atown_captaincy 13 - call production_cycle_atown_barracks + call production_cycle_atown_stockade call production_cycle_atown_captaincy call production_cycle_atown_apothecary return @@ -758,38 +758,38 @@ script_id TARx call production_cycle_atown_nanite_assembly return - :production_cycle_atown_barracks + :production_cycle_atown_stockade wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 - notowns command_center blank_return + notowns ministry blank_return bring 13 Ex 0 mason|talos Loc.63 blank_return - add_bld 255 barracks 1 20 97 + add_bld 255 stockade 1 20 97 wait 150 call main_wait_atown_750 - :production_cycle_atown_barracks_addon - var AtL|Jump pref_medbay 1 production_cycle_atown_medbay 13 - var AtL|Jump pref_covert_ops 1 production_cycle_atown_covert_ops 13 - local 255 Ex 0 medbay production_cycle_atown_medbay - call production_cycle_atown_covert_ops - call production_cycle_atown_medbay + :production_cycle_atown_stockade_addon + var AtL|Jump pref_vestry 1 production_cycle_atown_vestry 13 + var AtL|Jump pref_covenant 1 production_cycle_atown_covenant 13 + local 255 Ex 0 vestry production_cycle_atown_vestry + call production_cycle_atown_covenant + call production_cycle_atown_vestry goto production_cycle_atown_success - :production_cycle_atown_medbay + :production_cycle_atown_vestry wait 12 var AtL|Jump production_cycle_atown_addon_var 1 blank_return 13 - notowns barracks blank_return - add_bld 255 medbay 1 20 96 + notowns stockade blank_return + add_bld 255 vestry 1 20 96 var Add production_cycle_atown_addon_var 1 13 call main_wait_atown_300 return - :production_cycle_atown_covert_ops + :production_cycle_atown_covenant wait 12 var AtL|Jump production_cycle_atown_addon_var 1 blank_return 13 - notowns barracks blank_return + notowns stockade blank_return notowns atlas blank_return - add_bld 255 covert_ops 1 20 96 + add_bld 255 covenant 1 20 96 var Add production_cycle_atown_addon_var 1 13 call main_wait_atown_300 return @@ -840,16 +840,16 @@ script_id TARx :production_cycle_atown_fulcrum wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 - notowns command_center blank_return + notowns ministry blank_return bring 13 Ex 0 mason|talos Loc.63 blank_return add_bld 255 fulcrum 1 20 97 wait 180 call main_wait_atown_900 :production_cycle_atown_fulcrum_addon - var AtL|Jump pref_machine_shop 1 production_cycle_atown_machine_shop 13 + var AtL|Jump pref_palladium 1 production_cycle_atown_palladium 13 var AtL|Jump pref_scrapyard 1 production_cycle_atown_scrapyard 13 - call production_cycle_atown_machine_shop + call production_cycle_atown_palladium call production_cycle_atown_scrapyard goto production_cycle_atown_success @@ -862,12 +862,12 @@ script_id TARx call main_wait_atown_300 return - :production_cycle_atown_machine_shop + :production_cycle_atown_palladium wait 12 var AtL|Jump production_cycle_atown_addon_var 1 blank_return 13 notowns fulcrum blank_return notowns atlas blank_return - add_bld 255 machine_shop 1 20 96 + add_bld 255 palladium 1 20 96 var Add production_cycle_atown_addon_var 1 13 call main_wait_atown_300 return @@ -875,7 +875,7 @@ script_id TARx :production_cycle_atown_mantle wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 - notowns command_center blank_return + notowns ministry blank_return bring 13 Ex 0 mason|talos Loc.63 blank_return add_bld 255 mantle 1 10 97 wait 180 @@ -892,7 +892,7 @@ script_id TARx :production_cycle_atown_iron_foundry_addon call production_cycle_atown_future_station - call production_cycle_atown_biotic_base + call production_cycle_atown_biotic_bastion goto production_cycle_atown_success :production_cycle_atown_future_station @@ -904,11 +904,11 @@ script_id TARx call main_wait_atown_300 return - :production_cycle_atown_biotic_base + :production_cycle_atown_biotic_bastion wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 notowns iron_foundry blank_return - add_bld 255 biotic_base 1 20 97 + add_bld 255 biotic_bastion 1 20 97 var Add production_cycle_atown_var 1 13 call main_wait_atown_300 return @@ -916,7 +916,7 @@ script_id TARx :production_cycle_atown_starpad wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 - notowns command_center blank_return + notowns ministry blank_return bring 13 Ex 0 mason|talos Loc.63 blank_return add_bld 255 starpad 1 10 97 wait 180 @@ -933,28 +933,28 @@ script_id TARx call main_wait_atown_900 :production_cycle_atown_starport_addon - var AtL|Jump pref_munitions_bay 1 production_cycle_atown_munitions_bay 13 - var AtL|Jump pref_control_tower 1 production_cycle_atown_control_tower 13 - call production_cycle_atown_munitions_bay - call production_cycle_atown_control_tower + var AtL|Jump pref_rotary 1 production_cycle_atown_rotary 13 + var AtL|Jump pref_commandment 1 production_cycle_atown_commandment 13 + call production_cycle_atown_rotary + call production_cycle_atown_commandment goto production_cycle_atown_success - :production_cycle_atown_munitions_bay + :production_cycle_atown_rotary wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 notowns starport blank_return notowns atlas blank_return - add_bld 255 munitions_bay 1 20 97 + add_bld 255 rotary 1 20 97 var Add production_cycle_atown_var 1 13 call main_wait_atown_300 return - :production_cycle_atown_control_tower + :production_cycle_atown_commandment wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 notowns starport blank_return notowns daedala blank_return - add_bld 255 control_tower 1 20 97 + add_bld 255 commandment 1 20 97 var Add production_cycle_atown_var 1 13 call main_wait_atown_300 return @@ -968,14 +968,14 @@ script_id TARx call main_wait_atown_1200 :production_cycle_atown_nanite_assembly_addon - call production_cycle_atown_particle_accelerator + call production_cycle_atown_hadron goto production_cycle_atown_success - :production_cycle_atown_particle_accelerator + :production_cycle_atown_hadron wait 12 var AtL|Jump production_cycle_atown_var 1 blank_return 13 notowns nanite_assembly blank_return - add_bld 255 particle_accelerator 1 20 98 + add_bld 255 hadron 1 20 98 var Add production_cycle_atown_var 1 13 call main_wait_atown_300 return @@ -1202,13 +1202,13 @@ script_id TARx :build_general_atown_2FulcMech_Main var Ex|Call pref_raider_captaincy 0 buildpref_raider_captaincy_heracles 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_shaman 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_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_raider_production 0 buildpref_raider_captaincy 13 - var Ex|Call pref_addon_barracks 0 buildpref_raider_medbay 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_orbital_production 0 buildpref_orbital_naniteassembly 13 @@ -1248,9 +1248,9 @@ script_id TARx w_bld 2 fulcrum bld 2 scrapyard 120 w_bld 3 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 w_bld 4 fulcrum - bld 2 machine_shop 120 + bld 2 palladium 120 stop :build_general_atown_EarlyRiser @@ -1258,21 +1258,21 @@ script_id TARx print Terran<32>General<32>greed<32>1:<32>Early<32>Riser :build_general_atown_EarlyRiser_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_cleric 13 + 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_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_raider_production 0 buildpref_raider_captaincy 13 - var Ex|Call pref_addon_barracks 0 buildpref_raider_medbay 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_vestry 13 var Ex|Call pref_addon_fulcrum 0 buildpref_armor_scrapyard 13 call main_wait_atown_900 call main_wait_atown_300 var Add can_expand_var_atown 1 13 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 call main_wait_atown_600 bld 1 fulcrum 121 @@ -1281,7 +1281,7 @@ script_id TARx call main_wait_atown_300 bld 1 starpad 121 call main_wait_atown_300 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_600 var Set build_gas_var_atown 1 13 call main_wait_atown_150 @@ -1293,11 +1293,11 @@ script_id TARx goto build_general_atown_fin :build_general_atown_EarlyRiser_Addon - w_bld 1 barracks - bld 1 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 call atown_wait_for_atlas w_bld 1 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 stop :build_general_atown_TheCube @@ -1305,7 +1305,7 @@ script_id TARx print Terran<32>General<32>rush<32>1:<32>The<32>Cube :build_general_atown_TheCube_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 + 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 @@ -1318,7 +1318,7 @@ script_id TARx call main_wait_atown_600 bld 1 fulcrum 121 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 bld 1 starpad 121 call main_wait_atown_600 @@ -1342,16 +1342,16 @@ script_id TARx goto build_general_atown_fin :build_general_atown_TheCube_Addon - w_bld 1 barracks - bld 1 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 call atown_wait_for_atlas w_bld 1 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 call atown_wait_for_fountainhead bld 1 starport 121 w_bld 1 starport - bld 1 munitions_bay 120 - w_bldstart 1 munitions_bay + bld 1 rotary 120 + w_bldstart 1 rotary stop :build_general_atown_DoublingUp @@ -1359,9 +1359,9 @@ script_id TARx print Terran<32>General<32>rush<32>2:<32>Doubling<32>Up :build_general_atown_DoublingUp_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_shaman 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_maverick 13 + var Ex|Call pref_raider_vestry 0 buildpref_raider_vestry_shaman 13 + var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 var Ex|Call pref_armor_fulcrum 0 buildpref_armor_fulcrum_cyclops 13 var Ex|Call pref_armor_machine 0 buildpref_armor_fulcrum_goliath 13 var Ex|Call pref_armor_scrapyard 0 buildpref_armor_scrapyard_blackjack 13 @@ -1369,10 +1369,10 @@ script_id TARx var Ex|Call pref_armor_production 0 buildpref_armor_ironfoundry 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_naniteassembly 13 call main_wait_atown_900 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_150 var Sub can_worker_var_atown 1 13 - bld 2 barracks 121 + bld 2 stockade 121 wait 24 var Set can_attack_var_atown 1 13 call main_wait_atown_1200 @@ -1399,18 +1399,18 @@ script_id TARx goto build_general_atown_fin :build_general_atown_DoublingUp_Addon - w_bld 1 barracks - bld 1 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 w_bld 1 fulcrum bld 1 scrapyard 120 w_bld 2 fulcrum bld 2 scrapyard 120 call atown_wait_for_atlas - w_bld 2 barracks - bld 1 covert_ops 120 + w_bld 2 stockade + bld 1 covenant 120 call main_wait_atown_150 w_bld 3 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 stop :build_general_atown_MechIntoAir @@ -1428,7 +1428,7 @@ script_id TARx var Ex|Call pref_orbital_nanite 0 buildpref_orbital_naniteassembly_minotaur 13 call main_wait_atown_600 call main_wait_atown_300 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 bld 1 fulcrum 121 call main_wait_atown_750 @@ -1475,25 +1475,25 @@ script_id TARx call atown_wait_for_atlas bld 1 quarry 120 w_bld 3 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 w_bld 4 fulcrum - bld 2 machine_shop 120 + bld 2 palladium 120 call atown_wait_for_fountainhead bld 2 starport 121 w_bld 1 starport - bld 1 munitions_bay 120 + bld 1 rotary 120 w_bld 2 starport - bld 2 munitions_bay 120 + bld 2 rotary 120 w_bld 5 fulcrum - bld 3 machine_shop 120 + bld 3 palladium 120 w_bld 6 fulcrum - bld 4 machine_shop 120 + bld 4 palladium 120 w_bld 3 starport - bld 3 munitions_bay 120 + bld 3 rotary 120 w_bld 4 starport - bld 4 munitions_bay 120 + bld 4 rotary 120 w_bld 5 starport - bld 5 munitions_bay 120 + bld 5 rotary 120 call atown_wait_for_daedala w_bld 6 starport bld 1 commandment 120 @@ -1510,12 +1510,12 @@ script_id TARx print Terran<32>General<32>timing<32>3:<32>Observant :build_general_atown_Observant_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_cyprian 13 + 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_production 0 buildpref_orbital_starport 13 var Ex|Call pref_addon_starport 0 buildpref_orbital_commandment 13 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 call main_wait_atown_150 wait 24 @@ -1549,15 +1549,15 @@ script_id TARx multi production_cycle_atown :build_general_atown_Observant_Addon - w_bld 1 barracks - bld 1 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 w_bld 1 fulcrum bld 1 scrapyard 120 call atown_wait_for_atlas w_bld 2 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 w_bld 3 fulcrum - bld 2 machine_shop 120 + bld 2 palladium 120 call atown_wait_for_fountainhead bld 2 starport 121 call atown_wait_for_daedala @@ -1580,9 +1580,9 @@ script_id TARx call main_wait_atown_300 multi atown_need_atlas call main_wait_atown_300 - call add_barracks_atown_simple + call add_stockade_atown_simple call main_wait_atown_150 - bld 1 covert_ops 120 + bld 1 covenant 120 call main_wait_atown_600 multi atown_need_fountainhead call main_wait_atown_900 @@ -1651,7 +1651,7 @@ script_id TARx print Terran<32>Armor<32>timing<32>1:<32>Phalanx<32>Timing :build_armor_atown_PhalanxTiming_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_cyprian 13 + 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 @@ -1689,7 +1689,7 @@ script_id TARx call main_wait_atown_900 var Set can_attack_var_atown 1 13 wait 24 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_600 multi production_cycle_atown goto build_armor_atown_fin @@ -1697,19 +1697,19 @@ script_id TARx :build_armor_atown_PhalanxTiming_Addon call atown_wait_for_atlas w_bld 1 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 w_bld 2 fulcrum - bld 2 machine_shop 120 - w_bld 1 machine_shop + bld 2 palladium 120 + w_bld 1 palladium queue 1 phalanx fulcrum 255 Local Loc.63 100 - w_bld 2 machine_shop + w_bld 2 palladium queue 1 madrigal fulcrum 255 Local Loc.63 100 w_bld 3 fulcrum - bld 3 machine_shop 120 - w_bld 1 barracks + bld 3 palladium 120 + w_bld 1 stockade call main_wait_atown_450 - bld 1 medbay 120 - w_bld 2 machine_shop + bld 1 vestry 120 + w_bld 2 palladium queue 2 phalanx fulcrum 255 Local Loc.63 100 call main_wait_atown_150 queue 2 madrigal fulcrum 255 Local Loc.63 100 @@ -1727,17 +1727,17 @@ script_id TARx var Ex|Call pref_armor_iron 0 buildpref_armor_futurestation_penumbra 13 var Ex|Call pref_armor_production 0 buildpref_armor_fulcrum 13 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 call main_wait_atown_600 wait 24 - queue 1 maverick barracks 255 Global Loc.63 100 + queue 1 maverick stockade 255 Global Loc.63 100 call main_wait_atown_300 - queue 1 maverick barracks 255 Global Loc.63 100 + queue 1 maverick stockade 255 Global Loc.63 100 wait 24 bld 1 fulcrum 121 call main_wait_atown_300 - queue 1 maverick barracks 255 Global Loc.63 100 + queue 1 maverick stockade 255 Global Loc.63 100 call main_wait_atown_300 wait 24 queue 1 vulture fulcrum 255 Global Loc.63 100 @@ -1749,7 +1749,7 @@ script_id TARx call main_wait_atown_600 var Add can_worker_var_atown 1 13 call main_wait_atown_600 - queue 1 maverick barracks 255 Global Loc.63 100 + queue 1 maverick stockade 255 Global Loc.63 100 wait 24 bld 3 fulcrum 121 call main_wait_atown_150 @@ -1812,9 +1812,9 @@ script_id TARx bld 1 scrapyard 120 call atown_wait_for_atlas w_bld 2 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 w_bld 3 fulcrum - bld 2 machine_shop 120 + bld 2 palladium 120 call atown_wait_for_fountainhead bld 1 starport 121 call atown_wait_for_daedala @@ -1852,7 +1852,7 @@ script_id TARx var Add can_expand_var_atown 1 13 bld 3 fulcrum 121 call main_wait_atown_150 - bld 1 barracks 121 + bld 1 stockade 121 multi production_cycle_atown goto build_armor_atown_fin @@ -1880,7 +1880,7 @@ script_id TARx w_bld 1 fulcrum w_bldstart 2 fulcrum call main_wait_atown_300 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_450 var Add can_worker_var_atown 1 13 call main_wait_atown_1200 @@ -1896,7 +1896,7 @@ script_id TARx call main_wait_atown_300 call atown_wait_for_atlas w_bld 2 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 stop :build_armor_atown_IronCrusade @@ -1905,8 +1905,8 @@ script_id TARx :build_armor_atown_IronCrusade_Main var Ex|Call pref_raider_covert 0 buildpref_raider_covertops_eidolon 13 - var Ex|Call pref_addon_barracks 0 buildpref_raider_covertops 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_covertops 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_production 0 buildpref_armor_ironfoundry 13 var Ex|Call pref_orbital_control 0 buildpref_orbital_commandment_seraph 13 @@ -1960,8 +1960,8 @@ script_id TARx print Terran<32>Armor<32>timing<32>3:<32>David<32>and<32>Goliath :build_armor_atown_DavidAndGoliath_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_maverick 13 + 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 @@ -1969,19 +1969,19 @@ script_id TARx call main_wait_atown_600 bld 1 fulcrum 121 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_600 #mutli expansion_toggle call main_wait_atown_900 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_300 bld 2 fulcrum 121 w_bldstart 2 fulcrum multi build_armor_atown_DavidAndGoliath_Addon call main_wait_atown_450 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_600 - bld 4 barracks 121 + bld 4 stockade 121 call main_wait_atown_600 bld 3 fulcrum 121 call main_wait_atown_150 @@ -2010,13 +2010,13 @@ script_id TARx bld 1 scrapyard 120 call atown_wait_for_atlas w_bld 2 fulcrum - bld 1 machine_shop 120 + bld 1 palladium 120 call main_wait_atown_150 w_bld 3 fulcrum - bld 2 machine_shop 120 + bld 2 palladium 120 call main_wait_atown_300 w_bld 5 fulcrum - bld 3 machine_shop 120 + bld 3 palladium 120 call main_wait_atown_300 stop @@ -2095,32 +2095,32 @@ script_id TARx print Terran<32>Raider<32>timing<32>1:<32>8Rax :build_raider_atown_8Rax_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_cleric 13 + 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_captaincy 0 buildpref_raider_captaincy_madcap 13 - var Ex|Call pref_addon_barracks 0 buildpref_raider_medbay 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_vestry 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 call main_wait_atown_300 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_300 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_300 - bld 4 barracks 121 + bld 4 stockade 121 call main_wait_atown_300 - bld 5 barracks 121 + bld 5 stockade 121 call main_wait_atown_300 - bld 6 barracks 121 + bld 6 stockade 121 call main_wait_atown_300 var Set can_attack_var_atown 1 13 call main_wait_atown_300 - w_bldstart 6 barracks + w_bldstart 6 stockade var Set build_gas_var_atown 1 13 call main_wait_atown_600 #mutli expansion_toggle call main_wait_atown_900 - bld 8 barracks 121 + bld 8 stockade 121 call main_wait_atown_600 var Set can_build_static_defense_var_atown 1 13 call main_wait_atown_600 @@ -2132,15 +2132,15 @@ script_id TARx goto build_raider_atown_fin :build_raider_atown_8Rax_Addon - w_bld 1 barracks - bld 1 medbay 120 - w_bld 2 barracks - bld 2 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 + w_bld 2 stockade + bld 2 vestry 120 call atown_wait_for_atlas - w_bld 3 barracks - bld 1 covert_ops 120 - w_bld 4 barracks - bld 2 covert_ops 120 + w_bld 3 stockade + bld 1 covenant 120 + w_bld 4 stockade + bld 2 covenant 120 stop :build_raider_atown_3RaxBiotic @@ -2148,44 +2148,44 @@ script_id TARx print Terran<32>Raider<32>timing<32>2:<32>3Rax<32>Biotic :build_raider_atown_3RaxBiotic_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_cleric 13 + 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_captaincy 0 buildpref_raider_captaincy_heracles 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_600 call main_wait_atown_300 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 call main_wait_atown_300 multi build_raider_atown_3RaxBiotic_Addon call main_wait_atown_450 var Sub can_worker_var_atown 1 13 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_150 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 2 maverick barracks 255 Local Loc.63 100 + queue 2 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 mason command_center 255 Local Loc.63 200 + queue 1 mason ministry 255 Local Loc.63 200 wait 24 - w_bldstart 3 barracks + w_bldstart 3 stockade var Add can_expand_var_atown 1 13 wait 300 var Add can_worker_var_atown 1 13 @@ -2200,10 +2200,10 @@ script_id TARx goto build_raider_atown_fin :build_raider_atown_3RaxBiotic_Addon - w_bld 1 barracks - bld 1 medbay 120 - w_bld 2 barracks - bld 2 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 + w_bld 2 stockade + bld 2 vestry 120 call atown_wait_for_atlas multi atown_need_fountainhead stop @@ -2214,30 +2214,30 @@ script_id TARx :build_raider_atown_FastNuke_Main var Ex|Call pref_infrastructure_addon 0 buildpref_commandcenter_missilesilo 13 - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_cyprian 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_captaincy 0 buildpref_raider_captaincy_madcap 13 - var Ex|Call pref_addon_barracks 0 buildpref_raider_covertops 13 + var Ex|Call pref_addon_stockade 0 buildpref_raider_covertops 13 var Ex|Call pref_raider_production 0 buildpref_raider_captaincy 13 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_900 bld 1 reservoir 97 call main_wait_atown_600 var Add can_expand_var_atown 1 13 call main_wait_atown_600 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_600 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_600 - w_bldstart 3 barracks + w_bldstart 3 stockade var Set build_gas_var_atown 1 13 call main_wait_atown_600 multi atown_need_atlas call main_wait_atown_600 multi build_raider_atown_FastNuke_Addon call main_wait_atown_300 - bld 4 barracks 121 + bld 4 stockade 121 call main_wait_atown_900 var Set can_attack_var_atown 1 13 wait 24 @@ -2245,18 +2245,18 @@ script_id TARx goto build_raider_atown_fin :build_raider_atown_FastNuke_Addon - w_bld 1 barracks - bld 1 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 call atown_wait_for_atlas - w_bld 2 barracks - bld 1 covert_ops 120 - w_bldstart 1 covert_ops - bld 1 missile_silo 120 - w_bld 3 barracks - w_bldstart 1 missile_silo - bld 2 covert_ops 120 - w_bld 4 barracks - bld 3 covert_ops 120 + w_bld 2 stockade + bld 1 covenant 120 + w_bldstart 1 covenant + bld 1 anvil 120 + w_bld 3 stockade + w_bldstart 1 anvil + bld 2 covenant 120 + w_bld 4 stockade + bld 3 covenant 120 stop :build_raider_atown_4RaxPressure @@ -2264,20 +2264,20 @@ script_id TARx print Terran<32>Raider<32>rush<32>1:<32>4Rax<32>Pressure :build_raider_atown_4RaxPressure_Main - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_shaman 13 + 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_captaincy 0 buildpref_raider_captaincy_heracles 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 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 call main_wait_atown_900 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_900 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_600 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_450 - bld 4 barracks 121 + bld 4 stockade 121 call main_wait_atown_300 call main_wait_atown_300 call main_wait_atown_300 @@ -2291,7 +2291,7 @@ script_id TARx call main_wait_atown_150 multi build_raider_atown_4RaxPressure_Addon call main_wait_atown_150 - w_bld 4 barracks + w_bld 4 stockade var Set build_gas_var_atown 1 13 call main_wait_atown_600 multi atown_need_atlas @@ -2302,15 +2302,15 @@ script_id TARx goto build_raider_atown_fin :build_raider_atown_4RaxPressure_Addon - w_bld 1 barracks - bld 1 medbay 120 - w_bld 2 barracks - bld 2 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 + w_bld 2 stockade + bld 2 vestry 120 call atown_wait_for_atlas - w_bld 3 barracks - bld 1 covert_ops 120 - w_bld 4 barracks - bld 2 covert_ops 120 + w_bld 3 stockade + bld 1 covenant 120 + w_bld 4 stockade + bld 2 covenant 120 stop :build_raider_atown_Uprising @@ -2318,44 +2318,44 @@ script_id TARx print Terran<32>Raider<32>timing<32>3:<32>Uprising :build_raider_atown_Uprising_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_cyprian 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_cleric 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_cyprian 13 + var Ex|Call pref_raider_vestry 0 buildpref_raider_vestry_cleric 13 + var Ex|Call pref_raider_production 0 buildpref_raider_stockade 13 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_450 - bld 2 barracks 121 + bld 2 stockade 121 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_450 - bld 3 barracks 121 + bld 3 stockade 121 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 call main_wait_atown_150 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 multi build_raider_atown_Uprising_Addon call main_wait_atown_300 - bld 4 barracks 121 + bld 4 stockade 121 wait 24 - queue 2 shaman barracks 255 Local Loc.63 100 + queue 2 shaman stockade 255 Local Loc.63 100 wait 24 - queue 2 cyprian barracks 255 Local Loc.63 100 + queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_atown_450 - queue 2 shaman barracks 255 Local Loc.63 100 + queue 2 shaman stockade 255 Local Loc.63 100 wait 24 - queue 2 cyprian barracks 255 Local Loc.63 100 + queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_atown_300 - w_bld 4 barracks - w_bld 2 medbay + w_bld 4 stockade + w_bld 2 vestry var Set build_gas_var_atown 1 13 call main_wait_atown_600 multi atown_need_atlas @@ -2365,20 +2365,20 @@ script_id TARx call main_wait_atown_600 var Add can_worker_var_atown 1 13 call main_wait_atown_600 - queue 2 cyprian barracks 255 Local Loc.63 100 + queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_atown_450 - queue 2 cyprian barracks 255 Local Loc.63 100 + queue 2 cyprian stockade 255 Local Loc.63 100 wait 24 - queue 2 cyprian barracks 255 Local Loc.63 100 + queue 2 cyprian stockade 255 Local Loc.63 100 call main_wait_atown_300 multi production_cycle_atown goto build_raider_atown_fin :build_raider_atown_Uprising_Addon - w_bld 1 barracks - bld 1 medbay 120 - w_bld 4 barracks - bld 2 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 + w_bld 4 stockade + bld 2 vestry 120 stop :build_raider_atown_HolyAckmeds @@ -2386,33 +2386,33 @@ script_id TARx print Terran<32>Raider<32>rush<32>2:<32>Holy<32>Ackmeds! :build_raider_atown_HolyAckmeds_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_harakan 13 - var Ex|Call pref_addon_barracks 0 buildpref_raider_covertops 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + 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_raider_production 0 buildpref_raider_stockade 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_atown_900 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 call main_wait_atown_600 do_morph 1 maverick call main_wait_atown_600 - bld 2 barracks 121 + bld 2 stockade 121 wait 24 do_morph 1 harakan call main_wait_atown_600 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_300 call main_wait_atown_300 var Sub can_worker_var_atown 1 13 call main_wait_atown_300 var Set can_attack_var_atown 1 13 call main_wait_atown_600 - bld 4 barracks 121 + bld 4 stockade 121 call main_wait_atown_300 var Add can_worker_var_atown 1 13 var Add can_expand_var_atown 1 13 call main_wait_atown_900 - w_bldstart 4 barracks + w_bldstart 4 stockade var Set build_gas_var_atown 1 13 call main_wait_atown_600 multi atown_need_atlas @@ -2423,14 +2423,14 @@ script_id TARx goto build_raider_atown_fin :build_raider_atown_HolyAckmeds_Addon - w_bld 1 barracks - bld 1 medbay 120 + w_bld 1 stockade + bld 1 vestry 120 call atown_wait_for_atlas multi atown_need_fountainhead call atown_wait_for_fountainhead bld 1 starport 121 w_bld 1 starport - bld 1 munitions_bay 120 + bld 1 rotary 120 stop :build_raider_atown_fin @@ -2440,11 +2440,11 @@ script_id TARx :build_raider_atown_fin2 placeholder_count Local AtL|Jump 2 Group_Buildings blank 13 call main_wait_atown_300 - bld 1 medbay 120 + bld 1 vestry 120 call main_wait_atown_300 multi atown_need_atlas call atown_wait_for_atlas - bld 1 covert_ops 120 + bld 1 covenant 120 call main_wait_atown_1800 multi atown_need_fountainhead call main_wait_atown_3600 @@ -2525,7 +2525,7 @@ script_id TARx call main_wait_atown_300 var Set build_gas_var_atown 1 13 call main_wait_atown_300 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 var Set can_attack_var_atown 1 13 call main_wait_atown_1200 @@ -2551,10 +2551,10 @@ script_id TARx call atown_wait_for_fountainhead bld 1 starport 121 w_bld 1 starport - bld 1 munitions_bay 120 + bld 1 rotary 120 bld 2 starport 121 w_bld 2 starport - bld 2 munitions_bay 120 + bld 2 rotary 120 bld 3 starport 121 call atown_wait_for_daedala w_bld 3 starport @@ -2575,11 +2575,11 @@ script_id TARx #mutli expansion_toggle call main_wait_atown_300 call main_wait_atown_600 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_600 var Set build_gas_var_atown 1 13 call main_wait_atown_900 - w_bld 1 barracks + w_bld 1 stockade var Set build_gas_var_atown 1 13 call main_wait_atown_600 p_need 1 atlas @@ -2608,7 +2608,7 @@ script_id TARx print Terran<32>Orbital<32>timing<32>1:<32>Wraith<32>Bio :build_orbital_atown_WraithBio_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 + var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_maverick 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_orbital_starport 0 buildpref_orbital_starpad_wraith 13 @@ -2616,15 +2616,15 @@ script_id TARx var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_atown_300 call main_wait_atown_150 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_750 bld 1 starpad 121 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 queue 1 wraith starpad 255 Local Loc.63 100 call main_wait_atown_300 @@ -2639,25 +2639,25 @@ script_id TARx wait 24 bld 2 starpad 121 call main_wait_atown_150 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_300 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_150 queue 1 wraith starpad 255 Local Loc.63 100 wait 24 queue 1 wraith starpad 255 Local Loc.63 100 call main_wait_atown_300 - bld 3 barracks 121 + bld 3 stockade 121 wait 24 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_150 w_bld 2 starpad var Add can_expand_var_atown 1 13 call main_wait_atown_900 - w_bldstart 3 barracks - bld 1 medbay 120 + w_bldstart 3 stockade + bld 1 vestry 120 call main_wait_atown_300 var Set build_gas_var_atown 1 13 call main_wait_atown_600 @@ -2671,19 +2671,19 @@ script_id TARx print Terran<32>Orbital<32>timing<32>2:<32>Hotdrop :build_orbital_atown_Hotdrop_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_harakan 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_cleric 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + var Ex|Call pref_raider_stockade 0 buildpref_raider_stockade_harakan 13 + 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_addon_starport 0 buildpref_orbital_commandment 13 var Ex|Call pref_orbital_production 0 buildpref_orbital_starport 13 call main_wait_atown_300 call main_wait_atown_300 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 call main_wait_atown_600 bld 1 starpad 121 call main_wait_atown_150 - queue 1 maverick barracks 255 Local Loc.63 100 + queue 1 maverick stockade 255 Local Loc.63 100 call main_wait_atown_600 bld 2 starpad 121 call main_wait_atown_600 @@ -2693,15 +2693,15 @@ script_id TARx call main_wait_atown_300 queue 1 trojan starpad 255 Local Loc.63 100 call main_wait_atown_150 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_450 bld 3 starpad 121 call main_wait_atown_300 queue 1 trojan starpad 255 Local Loc.63 100 call main_wait_atown_150 - queue 2 maverick barracks 255 Local Loc.63 100 + queue 2 maverick stockade 255 Local Loc.63 100 call main_wait_atown_300 - queue 2 maverick barracks 255 Local Loc.63 100 + queue 2 maverick stockade 255 Local Loc.63 100 wait 24 var Set can_attack_var_atown 1 13 call main_wait_atown_300 @@ -2713,7 +2713,7 @@ script_id TARx var Set can_build_static_defense_var_atown 1 13 call main_wait_atown_300 w_bld 3 starpad - w_bldstart 2 barracks + w_bldstart 2 stockade var Set build_gas_var_atown 1 13 call main_wait_atown_600 multi atown_need_atlas @@ -2729,16 +2729,16 @@ script_id TARx :build_orbital_atown_Hotdrop_Addon call atown_wait_for_atlas - bld 1 covert_ops 120 - w_bld 1 covert_ops - bld 1 missile_silo 120 + bld 1 covenant 120 + w_bld 1 covenant + bld 1 anvil 120 call atown_wait_for_fountainhead bld 1 starport 121 w_bld 1 starport - bld 1 munitions_bay 120 + bld 1 rotary 120 bld 2 starport 121 w_bld 2 starport - bld 2 munitions_bay 120 + bld 2 rotary 120 call main_wait_atown_300 queue 2 wyvern starport 255 Local Loc.63 100 call main_wait_atown_300 @@ -2754,16 +2754,16 @@ script_id TARx print Terran<32>Orbital<32>timing<32>3:<32>Sudden<32>Starport :build_orbital_atown_SuddenStarport_Main - var Ex|Call pref_raider_barracks 0 buildpref_raider_barracks_maverick 13 - var Ex|Call pref_raider_medbay 0 buildpref_raider_medbay_cleric 13 - var Ex|Call pref_raider_production 0 buildpref_raider_barracks 13 + 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_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_production 0 buildpref_orbital_starport 13 call main_wait_atown_300 call main_wait_atown_300 - bld 1 barracks 121 + bld 1 stockade 121 call main_wait_atown_300 call main_wait_atown_600 var Sub can_worker_var_atown 1 13 @@ -2771,9 +2771,9 @@ script_id TARx call main_wait_atown_600 var Add can_worker_var_atown 1 13 call main_wait_atown_300 - bld 2 barracks 121 + bld 2 stockade 121 call main_wait_atown_450 - bld 3 barracks 121 + bld 3 stockade 121 call main_wait_atown_300 var Set can_attack_var_atown 1 13 call main_wait_atown_300 @@ -2781,7 +2781,7 @@ script_id TARx call main_wait_atown_450 var Set can_build_static_defense_var_atown 1 13 call main_wait_atown_450 - w_bldstart 3 barracks + w_bldstart 3 stockade multi build_orbital_atown_SuddenStarport_Addon call main_wait_atown_300 multi atown_need_atlas @@ -2795,21 +2795,21 @@ script_id TARx goto build_orbital_atown_fin :build_orbital_atown_SuddenStarport_Addon - w_bld 2 barracks - bld 1 medbay 120 + w_bld 2 stockade + bld 1 vestry 120 call atown_wait_for_atlas call atown_wait_for_fountainhead bld 1 starport 121 w_bldstart 1 starport bld 4 starport 121 w_bld 1 starport - bld 1 munitions_bay 120 + bld 1 rotary 120 w_bld 2 starport - bld 2 munitions_bay 120 + bld 2 rotary 120 w_bld 3 starport - bld 3 munitions_bay 120 + bld 3 rotary 120 w_bld 4 starport - bld 4 munitions_bay 120 + bld 4 rotary 120 call main_wait_atown_300 stop diff --git a/CMBW-editor/ai/cm_zerg.asc3 b/CMBW-editor/ai/cm_zerg.asc3 index 97bb04b..a43334f 100644 --- a/CMBW-editor/ai/cm_zerg.asc3 +++ b/CMBW-editor/ai/cm_zerg.asc3 @@ -1668,7 +1668,6 @@ script_id ZMCx return :main_wait_450 - wait 24 call main_wait_300 call main_wait_150 return @@ -1681,7 +1680,6 @@ script_id ZMCx return :main_wait_750 - wait 24 call main_wait_600 call main_wait_150 return @@ -1694,32 +1692,32 @@ script_id ZMCx wait 900 return + :main_wait_1050 + call main_wait_900 + call main_wait_150 + return + :main_wait_1200 - wait 24 call main_wait_900 call main_wait_300 return :main_wait_1500 - wait 24 call main_wait_1200 call main_wait_300 return :main_wait_1800 - wait 24 call main_wait_900 call main_wait_900 return :main_wait_2400 - wait 24 call main_wait_1200 call main_wait_1200 return :main_wait_3600 - wait 24 call main_wait_1200 call main_wait_1200 return @@ -2537,7 +2535,7 @@ 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_750 + call main_wait_1050 var Sub can_worker_var 1 13 multi expansion_loop_toggle call main_wait_600 @@ -2560,15 +2558,13 @@ script_id ZMCx bld 1 caphrolosk 98 call main_wait_750 bld 2 hachirosk 98 - call main_wait_150 - call main_wait_600 + call main_wait_750 p_need 1 zorkiz_shroud call main_wait_600 multi build_general_SleepingGiant_Morph call main_wait_600 multi need_othstol - call main_wait_600 - call main_wait_600 + call main_wait_1200 bld 1 gathtelosk 99 call main_wait_300 multi production_cycle @@ -2601,7 +2597,7 @@ script_id ZMCx var Ex|Call pref_almakis 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_750 + call main_wait_1050 var Sub can_worker_var 1 13 multi expansion_loop_toggle call main_wait_600 @@ -2653,11 +2649,10 @@ script_id ZMCx var Ex|Call pref_almakis 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_600 + call main_wait_1050 var Sub can_worker_var 1 13 - call main_wait_150 multi expansion_loop_toggle - call main_wait_600 + call main_wait_750 bring 13 AtL_W 1 larva Loc.63 blank queue 1 droleth larva 255 Local Loc.63 200 call main_wait_150 @@ -2703,8 +2698,7 @@ script_id ZMCx multi build_general_Subjugation_Morph call main_wait_300 bld 1 caphrolosk 98 - call main_wait_750 - call main_wait_300 + call main_wait_1050 p_need 1 zorkiz_shroud goto build_general_fin @@ -2729,7 +2723,7 @@ script_id ZMCx var Ex|Call pref_almakis 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_600 + call main_wait_1050 var Sub can_worker_var 1 13 multi expansion_loop_toggle call main_wait_600 @@ -2790,7 +2784,7 @@ script_id ZMCx 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_larvoskcesiant 13 - call main_wait_600 + call main_wait_1050 var Sub can_worker_var 1 13 multi expansion_loop_toggle call main_wait_600 @@ -2851,7 +2845,7 @@ script_id ZMCx var Ex|Call pref_almakis 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_600 + call main_wait_1050 var Sub can_worker_var 1 13 multi expansion_loop_toggle call main_wait_600 @@ -2988,14 +2982,12 @@ 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_750 + call main_wait_1050 var Sub can_worker_var 1 13 - var Add can_expand_var 1 13 + multi expansion_loop_toggle call main_wait_600 var Add can_worker_var 1 13 - call main_wait_150 - var Sub can_expand_var 1 13 - call main_wait_750 + call main_wait_900 p_need 1 hydrok_den call main_wait_600 var Set can_build_static_defense_var 1 13 @@ -3052,10 +3044,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_600 + call main_wait_1050 multi expansion_loop_toggle - call main_wait_450 - call main_wait_600 + call main_wait_1050 p_need 1 hydrok_den call main_wait_900 do_morph 4 hydralisk @@ -3100,7 +3091,7 @@ 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 - call main_wait_600 + call main_wait_1050 var Sub can_worker_var 1 13 multi expansion_loop_toggle call main_wait_300 @@ -3195,7 +3186,7 @@ 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_600 + call main_wait_1050 var Sub can_worker_var 1 13 call main_wait_150 multi expansion_loop_toggle @@ -3262,7 +3253,7 @@ script_id ZMCx call main_wait_600 var Sub can_worker_var 1 13 var Set can_attack_var 1 13 - call main_wait_750 + call main_wait_1050 multi expansion_loop_toggle call main_wait_600 var Add can_worker_var 1 13 @@ -3494,7 +3485,7 @@ 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 - call main_wait_450 + call main_wait_1050 var Sub can_worker_var 1 13 wait 24 multi expansion_loop_toggle @@ -3652,7 +3643,7 @@ 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 - call main_wait_600 + call main_wait_1050 var Sub can_worker_var 1 13 wait 24 multi expansion_loop_toggle @@ -3749,11 +3740,10 @@ 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_600 + call main_wait_1050 var Sub can_worker_var 1 13 - call main_wait_600 multi expansion_loop_toggle - call main_wait_600 + call main_wait_900 call expansion_loop_normal call main_wait_900 var Set can_build_static_defense_var 1 13 @@ -3804,12 +3794,11 @@ script_id ZMCx var Ex|Call pref_geszkath 0 buildpref_geszkath_keskathalor 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 + call main_wait_1050 var Sub can_worker_var 1 13 - call main_wait_600 multi expansion_loop_toggle - call main_wait_600 - var Add can_worker_all_var 1 13 + call main_wait_900 + var Add can_worker_var 1 13 call main_wait_300 p_need 1 quazrok_pool call main_wait_450 diff --git a/CMBW-editor/ai/cm_zerg_atown.asc3 b/CMBW-editor/ai/cm_zerg_atown.asc3 index fca351f..0da94fd 100644 --- a/CMBW-editor/ai/cm_zerg_atown.asc3 +++ b/CMBW-editor/ai/cm_zerg_atown.asc3 @@ -37,7 +37,7 @@ script_id ZARx goto idle :build_order_expansion - bring 13 AtL_W 1 hachirosk|caphrolosk|gathtelosk|larvosk_colony Loc.63 blank + bring 13 AtL_W 1 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 blank var Ex|Jump pref_assault 1 build_assault_fin2 13 var Ex|Jump pref_swarm 1 build_swarm_fin2 13 var Ex|Jump pref_sunblot 1 build_sunblot_fin2 13 @@ -212,8 +212,8 @@ script_id ZARx wait 12 local 255 Ex 0 larva expansion_worker_standard_loop var AtL|WF(240) can_worker_all_var 1 13 - bring 13 AtL 4 hachirosk|caphrolosk|gathtelosk|larvosk_colony Loc.63 expansion_worker_standard_loop_maximum - bring 13 AtL 3 hachirosk|caphrolosk|gathtelosk|larvosk_colony Loc.63 expansion_worker_standard_loop_medium + bring 13 AtL 4 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 expansion_worker_standard_loop_maximum + bring 13 AtL 3 hachirosk|caphrolosk|gathtelosk|larvosk_cesiant Loc.63 expansion_worker_standard_loop_medium wait 120 local 255 AtL 12 droleth|gosvileth expansion_worker_standard_loop call worker_conditions @@ -280,7 +280,7 @@ script_id ZARx :need_irol wait 24 bring 13 AtL 1 irol_iris|irulent_ivoa|othstol_oviform|orboth_omlia Loc.63 blank - bring 13 AtM 3 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_irol + bring 13 AtM 3 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_irol bring 13 Ex 0 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_irol bring 13 AtM 1 excisant Loc.63 need_irol call main_wait_450 @@ -300,7 +300,7 @@ script_id ZARx wait 24 bring 13 AtL 1 irulent_ivoa|othstol_oviform|orboth_omlia Loc.63 blank notowns irol_iris need_irulent - bring 13 AtM 4 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_irulent + bring 13 AtM 4 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_irulent bring 13 Ex 1 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_irulent bring 13 AtM 2 excisant Loc.63 need_irulent call main_wait_450 @@ -325,7 +325,7 @@ script_id ZARx wait 24 bring 13 AtL 1 othstol_oviform|orboth_omlia Loc.63 blank bring 13 Ex 0 irol_iris|irulent_ivoa Loc.63 need_othstol - bring 13 AtM 5 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_othstol + bring 13 AtM 5 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_othstol bring 13 Ex 2 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_othstol bring 13 AtM 4 excisant Loc.63 need_othstol call main_wait_450 @@ -344,7 +344,7 @@ script_id ZARx wait 24 bring 13 AtL 1 orboth_omlia Loc.63 blank notowns othstol_oviform need_orboth - bring 13 AtM 7 larvosk_colony|hachirosk|caphrolosk|gathtelosk Loc.63 need_orboth + bring 13 AtM 7 larvosk_cesiant|hachirosk|caphrolosk|gathtelosk Loc.63 need_orboth bring 13 Ex 4 quazrok_pool|liivral_pond|hydrok_den|gorgral_swamp|muthrok_spire|vithrath_haunt|zorkiz_shroud|ultrok_cavern|matravil_nest|almakis_antre|elthisth_mound|geszkath_grotto|alkaj_chasm Loc.63 need_orboth bring 13 AtM 4 excisant Loc.63 need_orboth call main_wait_450 @@ -387,7 +387,7 @@ script_id ZARx var AtL|wait town_count_var 1 13 wait 12 bring 13 Ex 0 droleth|gosvileth Loc.63 request_larvosk - add_bld 255 larvosk_colony 1 10 109 + add_bld 255 larvosk_cesiant 1 10 109 return :wHachirosk @@ -510,7 +510,7 @@ script_id ZARx wait 90 call main_wait_150 var Ex|Wait can_build_static_defense_var 1 13 - add_bld 255 surkith_colony 1 5 106 + add_bld 255 surkith_cesiant 1 5 106 wait 450 :request_surkith_loop @@ -518,26 +518,26 @@ script_id ZARx wait 12 local 255 Ex 0 hachirosk|caphrolosk|gathtelosk request_surkith_loop bring 13 Ex 0 droleth|gosvileth Loc.63 request_surkith_loop - bring 13 AtL 1 cagrant_colony Loc.63 request_surkith_loop + bring 13 AtL 1 cagrant_cesiant Loc.63 request_surkith_loop res 13 AtL_C Ore 125 request_surkith_check wait 90 call main_wait_150 goto request_surkith_loop :request_surkith_check - local 255 AtL 5 surkith_colony request_surkith_check_2 - add_bld 255 surkith_colony 1 5 106 + local 255 AtL 5 surkith_cesiant request_surkith_check_2 + add_bld 255 surkith_cesiant 1 5 106 var Ex|Jump under_attack_by_ground_var 1 add_return_wait_960 13 goto add_return_wait_1440 :request_surkith_check_2 var Ex|Jump under_attack_by_ground_var 1 request_surkith_check_3 13 var AtM|Jump mining_count_var 2 add_return_wait_960 13 - add_bld 255 surkith_colony 1 7 106 + add_bld 255 surkith_cesiant 1 7 106 goto add_return_wait_960 :request_surkith_check_3 - add_bld 255 surkith_colony 1 10 106 + add_bld 255 surkith_cesiant 1 10 106 goto add_return_wait_960 :request_spraith @@ -545,7 +545,7 @@ script_id ZARx wait 90 call main_wait_150 var Ex|Wait can_build_static_defense_var 1 13 - add_bld 255 spraith_colony 1 5 106 + add_bld 255 spraith_cesiant 1 5 106 wait 450 :request_spraith_loop @@ -553,26 +553,26 @@ script_id ZARx wait 12 local 255 Ex 0 hachirosk|caphrolosk|gathtelosk request_spraith_loop bring 13 Ex 0 droleth|gosvileth Loc.63 request_spraith_loop - bring 13 AtL 1 cagrant_colony Loc.63 request_spraith_loop + bring 13 AtL 1 cagrant_cesiant Loc.63 request_spraith_loop res 13 AtL_C Ore 125 request_spraith_check wait 60 call main_wait_300 goto request_spraith_loop :request_spraith_check - local 255 AtL 3 spraith_colony request_spraith_check_2 - add_bld 255 spraith_colony 1 10 106 + local 255 AtL 3 spraith_cesiant request_spraith_check_2 + add_bld 255 spraith_cesiant 1 10 106 var Ex|Jump under_attack_by_air_var 1 add_return_wait_960 13 goto add_return_wait_1440 :request_spraith_check_2 var Ex|Jump under_attack_by_air_var 1 request_spraith_check_3 13 var AtM|Jump mining_count_var 2 add_return_wait_960 13 - add_bld 255 spraith_colony 1 7 106 + add_bld 255 spraith_cesiant 1 7 106 goto add_return_wait_960 :request_spraith_check_3 - add_bld 255 spraith_colony 1 10 106 + add_bld 255 spraith_cesiant 1 10 106 goto add_return_wait_960 :production_cycle @@ -637,26 +637,26 @@ script_id ZARx return :production_cycle_check - var Ex|Call prefLarvoskColony 1 production_larvosk_colony 13 + var Ex|Call prefLarvoskcesiant 1 production_larvosk_cesiant 13 var Ex|Call prefHachirosk 1 production_hachirosk 13 var Ex|Call prefCaphrolosk 1 production_caphrolosk 13 var Ex|Call prefGathtelosk 1 production_gathtelosk 13 var AtL|Call mining_count_var 5 production_gathtelosk 13 var AtL|Call mining_count_var 3 production_caphrolosk 13 res 13 AtL_C Any 500 production_hachirosk - call production_larvosk_colony + call production_larvosk_cesiant call production_hachirosk call production_caphrolosk call production_gathtelosk return - :production_larvosk_colony + :production_larvosk_cesiant wait 12 var AtL|Jump prod_cycle_var 1 blank_return 13 bring 13 Ex 0 droleth|gosvileth Loc.63 blank_return - bring 13 AtL 1 cagrant_colony Loc.63 blank_return - local 255 AtL 30 larvosk_colony blank_return - add_bld 255 larvosk_colony 1 30 100 + bring 13 AtL 1 cagrant_cesiant Loc.63 blank_return + local 255 AtL 30 larvosk_cesiant blank_return + add_bld 255 larvosk_cesiant 1 30 100 call add_return_wait_960 goto production_cycle_success diff --git a/master changelog.md b/master changelog.md index 761f71c..c7ccb17 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 +- [22 July 2023](#22-july-2023) - [15 July 2023](#15-july-2023) - [8 July 2023](#8-july-2023) - [2 July 2023](#2-july-2023) @@ -70,6 +71,50 @@ See patchnotes.md for info on the most recent patch! - [13 August 2020](#13-august-2020) - [12 August 2020](#12-august-2020) +# 22 July 2023 + +## Designer's Notes + +A very minor update lies ahead of [Ascension #3](https://www.youtube.com/playlist?list=PLACFHAM2MlxOewD4AQfLqpBXzcyQA_kwR), bringing improved visuals for some Terran units, adjusted mineral cost for the Anchor, cleaner implementation of Apollyoid Adhesive, and some bugfixes. + +## Latest content + +- [Pr0totype 15 - Warp Field Stabilized](https://youtu.be/6I8qGYDUo-A) +- Castovers: + - [Btyb88 vs Alekxhandr](https://youtu.be/DIxu_oTdqbQ) by Pr0nogo + +## Gameplay +- Apollyoid Adhesive now divides the number of attacks hit by 2 in order to get the final stacks, to avoid most instances of the effect stacking multiple times from a single attack (r. fagguto) + - Caveat: this means you need to hit with at least two parts of a single attack in order to get one stack! + +## Audiovisuals +- Main menu background has been slightly updated +- Improved sprites for: + - Cyprian (lighting and proportions, c. Solstice) + - Cyclops, Blackjack, Madrigal (lighting, c. Solstice) + - Madcap, Cataphract (lighting and animations, c. Solstice) + +## Bugfixes +- **Hotfix 28 July 2023:** + - Cancelling Zerg Eggs after the Larva-producing structure has been destroyed no longer crashes the game (r. Mystery Meat) + - Lakizilisks will no longer become unresponsive when receiving an unburrow order while already unburrowed (r. exosus & fagguto) +- **Hotfix 23 July 2023:** + - The Diadem's damage overlay has been disabled again to prevent freezing (r. HelltRYKS) + - Zarcavrokors no longer have their main weapon put on cooldown when launching Bones of Reflection + - Sycophants now correctly display "unable to attack target" when ordered to attack air units (r. IskatuMesk) + - Zarcavrokor weaponfire SFX has been corrected +- Stability: + - Fixed another nullsprite crash (r. The Shambler/Alexhandr) +- Audiovisuals: + - Sublime Shepherd now shows an aura radius, and its icon now renders like a passive +- Editor: + - Improved categorization of Terran structures + - Fixed incorrect or outdated names and collision sizes of Terran structures and addons + +## Terran +- [Anchor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anchor): + - Mineral cost now 150, from 100 + # 15 July 2023 ## Designer's Notes diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index ebd6051..b52928f 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index b6695e9..0aa1a1f 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 c4973ce..904eb08 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 285da07..9990c95 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1749,8 +1749,8 @@ Philoc Engines Engram Warp Flash Radial Explosion (Orange) Radial Explosion (Green) -Extended Image #749 -Extended Image #750 +Quazilisk Mutate +Quazilisk Attack Overlay Extended Image #751 Extended Image #752 Extended Image #753 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a4a8096..8558ed2 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 68aa998..4b74819 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -874,7 +874,7 @@ Madrigal Turret (Imperioso) Madrigal (Furia Mode) Madrigal Turret (Furia) Philoc -Extended Sprite #1 +Quazilisk Attack Overlay Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index de03e30..19b36df 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 6a3b4bf..1addfc9 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index f404016..6f59628 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -214,7 +214,7 @@ Zerg Alkaj Chasm Terran Atelier Start Location Terran Treasury -Zerg Larvosk Colony +Zerg Larvosk Cesiant Zerg Konvilisk Zerg Akistrokor Zerg Geszkath Grotto diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 8556f43..162d4cb 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/font/font_wire.fnt b/mpq/font/font_wire.fnt new file mode 100644 index 0000000..00dac72 Binary files /dev/null and b/mpq/font/font_wire.fnt differ diff --git a/mpq/game/tfontgam.pcx b/mpq/game/tfontgam.pcx index 9aebe44..1d081f0 100644 Binary files a/mpq/game/tfontgam.pcx and b/mpq/game/tfontgam.pcx differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index eda0f9b..6e062f7 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 4c6d07c..3f6e955 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 1be8b83..7e6e09c 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -1143,10 +1143,10 @@ Death [NONE] # ----------------------------------------------------------------------------- # GeszithalorDeathInit: - playfram 0x00 # Frame set 0 - wait 2 + playfram 0x00 + wait 2 imgol 58 0 0 # Zerg Air Death Explosion (Large) (thingy\zAirDthL.grp) - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -2667,7 +2667,7 @@ ZergBuildingExplosionInit: IsId 36 Type 13 Init ZergBirthInit -Death ZergBirthDeath +Death EggDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -6924,6 +6924,8 @@ Phalanx_Tank_BaseDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small + wait 1 end Phalanx_Tank_BaseWalking: @@ -20464,20 +20466,7 @@ ZergEggAllMutationsSpecialState2: goto ZergEggAllMutationsLocal01 ZergEggAllMutationsGndAttkToIdle: - playfram 48 - wait 2 - playfram 49 - wait 2 - playfram 50 - wait 2 - playfram 51 - wait 2 - playfram 52 - wait 2 - playfram 53 - wait 2 - playfram 54 - waitrand 1 3 + wait 1 goto ZergEggAllMutationsLocal00 ZergEggAllMutationsAirAttkToIdle: @@ -34228,8 +34217,8 @@ Death QuaziliskDeath GndAttkInit QuaziliskGndAttkInit AirAttkInit QuaziliskGndAttkInit Unused1 QuaziliskUnused1 -GndAttkRpt QuaziliskGndAttkInit -AirAttkRpt QuaziliskGndAttkInit +GndAttkRpt QuaziliskGndAttkRpt +AirAttkRpt QuaziliskGndAttkRpt CastSpell [NONE] GndAttkToIdle QuaziliskGndAttkToIdle AirAttkToIdle QuaziliskGndAttkToIdle @@ -34357,12 +34346,25 @@ QuaziliskLocal06: goto QuaziliskGndAttkToIdle QuaziliskDeath: - playsndbtwn 1707 1708 # Quazilisk death 01, 02 - imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) - wait 5 - lowsprul 814 0 0 # Quazilisk Remains - wait 1 - end + playsndbtwn 1707 1708 # Quazilisk death 01, 02 + setfldirect 0 + playfram 357 + wait 2 + playfram 358 + wait 2 + playfram 359 + wait 2 + playfram 360 + wait 2 + playfram 361 + wait 2 + playfram 362 + wait 2 + playfram 363 + wait 2 + lowsprul 814 0 0 # Quazilisk Remains + wait 1 + end QuaziliskUnused1: wait 1 @@ -34379,47 +34381,52 @@ QuaziliskUnused1: goto QuaziliskGndAttkToIdle QuaziliskGndAttkInit: - playfram 0x00 # Frame set 0 - wait 1 - nobrkcodestart - playfram 0x110 - playsndbtwn 1329 1331 # Quazilisk attack 01, 02, 03 - attack - wait 1 - playfram 0x00 - wait 1 - playfram 0x110 - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk - goto QuaziliskGndAttkToIdle + playfram 0x110 +QuaziliskGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x121 + playsndbtwn 1329 1331 # Quazilisk attack 01, 02, 03 + imgol 1752 0 0 # Quazilisk Attack Overlay + attack + wait 1 + playfram 0x132 + wait 1 + playfram 0x143 + wait 1 + playfram 0x132 + wait 1 + playfram 0x121 + wait 1 + playfram 0x110 + nobrkcodeend + gotorepeatattk + goto QuaziliskGndAttkToIdle QuaziliskWalking: move 5 - wait 1 + wait 1 playfram 0x11 move 5 - wait 1 + wait 1 playfram 0x22 move 5 - wait 1 + wait 1 playfram 0x33 move 5 - wait 1 + wait 1 playfram 0x44 move 5 - wait 1 + wait 1 playfram 0x55 move 5 - wait 1 + wait 1 playfram 0x66 move 5 - wait 1 + wait 1 playfram 0x77 move 5 - wait 1 + wait 1 playfram 0x88 goto QuaziliskWalking @@ -34444,7 +34451,7 @@ QuaziliskBurrow: playfram 0xee wait 1 playfram 0xff - sigorder 4 + sigorder 4 goto QuaziliskLocal07 QuaziliskUnBurrow: @@ -34452,16 +34459,16 @@ QuaziliskUnBurrow: waitrand 1 4 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) playfram 0xee - wait 1 + wait 1 playfram 0xdd - wait 1 + wait 1 playfram 0xbb - wait 1 + wait 1 playfram 0xaa - wait 1 + wait 1 playfram 0x99 - wait 1 - sigorder 4 + wait 1 + sigorder 4 goto QuaziliskGndAttkToIdle # ----------------------------------------------------------------------------- # @@ -51739,5 +51746,100 @@ TerranHeavyMissileExplosionInit: TerranHeavyMissileExplosionDeath: wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1751 Quazilisk Mutate (cm\zerg\quazilisk-mutate.grp) +.headerstart +IsId 754 +Type 13 +Init ZergMutateInit +Death EggDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 ZergMutateUnused +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 ZergMutateSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +ZergMutateInit: + playfram 0x00 + goto InfestedTerranLocal00 + +ZergMutateDeath: + wait 1 + end + +ZergMutateUnused: + wait 1 + nobrkcodestart + playfram 6 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0 + wait 2 + sigorder 4 + wait 2 + nobrkcodeend + goto InfestedTerranLocal00 + +ZergMutateSpecialState1: + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + waitrand 1 3 + sigorder 8 + goto InfestedTerranLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1752 Quazilisk Attack Overlay (cm\zerg\quazilisk-attack.grp) +.headerstart +IsId 755 +Type 1 +Init QuaziliskAttackOverlayInit +Death ScourgeExplosionDeath +.headerend +# ----------------------------------------------------------------------------- # + +QuaziliskAttackOverlayInit: + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + end -# Next free isid: 754 \ No newline at end of file +# Next free isid: 756 \ No newline at end of file diff --git a/mpq/templates/Competitive Mode(1).got b/mpq/templates/Competitive Mode(1).got new file mode 100644 index 0000000..a308959 Binary files /dev/null and b/mpq/templates/Competitive Mode(1).got differ diff --git a/mpq/templates/Scenario Mode(1).got b/mpq/templates/Scenario Mode(1).got new file mode 100644 index 0000000..d34b325 Binary files /dev/null and b/mpq/templates/Scenario Mode(1).got differ diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst new file mode 100644 index 0000000..00639b9 --- /dev/null +++ b/mpq/templates/templates.lst @@ -0,0 +1,2 @@ +"Competitive Mode(1).got" +"Scenario Mode(1).got" \ No newline at end of file diff --git a/mpq/unit/cm/faction/aspirant-shad.grp b/mpq/unit/cm/faction/aspirant-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/aspirant-shad.grp rename to mpq/unit/cm/faction/aspirant-shadow.grp diff --git a/mpq/unit/cm/faction/cohort-shad.grp b/mpq/unit/cm/faction/cohort-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/cohort-shad.grp rename to mpq/unit/cm/faction/cohort-shadow.grp diff --git a/mpq/unit/cm/faction/tarasque-shad.grp b/mpq/unit/cm/faction/tarasque-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/tarasque-shad.grp rename to mpq/unit/cm/faction/tarasque-shadow.grp diff --git a/mpq/unit/cm/protoss/argosy-shad.grp b/mpq/unit/cm/protoss/argosy-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/argosy-shad.grp rename to mpq/unit/cm/protoss/argosy-shadow.grp diff --git a/mpq/unit/cm/protoss/astralomen-shad.grp b/mpq/unit/cm/protoss/astralomen-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/astralomen-shad.grp rename to mpq/unit/cm/protoss/astralomen-shadow.grp diff --git a/mpq/unit/cm/protoss/aurora-engine.grp b/mpq/unit/cm/protoss/aurora-engine.grp index b96d771..d58f1e0 100644 Binary files a/mpq/unit/cm/protoss/aurora-engine.grp and b/mpq/unit/cm/protoss/aurora-engine.grp differ diff --git a/mpq/unit/cm/protoss/aurora.grp b/mpq/unit/cm/protoss/aurora.grp index 3b7301f..27c8b75 100644 Binary files a/mpq/unit/cm/protoss/aurora.grp and b/mpq/unit/cm/protoss/aurora.grp differ diff --git a/mpq/unit/cm/protoss/automatonregister-shad.grp b/mpq/unit/cm/protoss/automatonregister-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/automatonregister-shad.grp rename to mpq/unit/cm/protoss/automatonregister-shadow.grp diff --git a/mpq/unit/cm/protoss/charlatan-shad.grp b/mpq/unit/cm/protoss/charlatan-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/charlatan-shad.grp rename to mpq/unit/cm/protoss/charlatan-shadow.grp diff --git a/mpq/unit/cm/protoss/crucible-shad.grp b/mpq/unit/cm/protoss/crucible-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/crucible-shad.grp rename to mpq/unit/cm/protoss/crucible-shadow.grp diff --git a/mpq/unit/cm/protoss/demiurge-shad.grp b/mpq/unit/cm/protoss/demiurge-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/demiurge-shad.grp rename to mpq/unit/cm/protoss/demiurge-shadow.grp diff --git a/mpq/unit/cm/protoss/golem-shad.grp b/mpq/unit/cm/protoss/golem-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/golem-shad.grp rename to mpq/unit/cm/protoss/golem-shadow.grp diff --git a/mpq/unit/cm/protoss/grandlibrary-shad.grp b/mpq/unit/cm/protoss/grandlibrary-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/grandlibrary-shad.grp rename to mpq/unit/cm/protoss/grandlibrary-shadow.grp diff --git a/mpq/unit/cm/protoss/hierophant-shad.grp b/mpq/unit/cm/protoss/hierophant-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/hierophant-shad.grp rename to mpq/unit/cm/protoss/hierophant-shadow.grp diff --git a/mpq/unit/cm/protoss/idol-shad.grp b/mpq/unit/cm/protoss/idol-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/idol-shad.grp rename to mpq/unit/cm/protoss/idol-shadow.grp diff --git a/mpq/unit/cm/protoss/legionnaire-shad.grp b/mpq/unit/cm/protoss/legionnaire-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/legionnaire-shad.grp rename to mpq/unit/cm/protoss/legionnaire-shadow.grp diff --git a/mpq/unit/cm/protoss/manifold-shad.grp b/mpq/unit/cm/protoss/manifold-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/manifold-shad.grp rename to mpq/unit/cm/protoss/manifold-shadow.grp diff --git a/mpq/unit/cm/protoss/monumentofsin-shad.grp b/mpq/unit/cm/protoss/monumentofsin-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/monumentofsin-shad.grp rename to mpq/unit/cm/protoss/monumentofsin-shadow.grp diff --git a/mpq/unit/cm/protoss/panoptus.grp b/mpq/unit/cm/protoss/panoptus.grp index 60707d7..a1d0be4 100644 Binary files a/mpq/unit/cm/protoss/panoptus.grp and b/mpq/unit/cm/protoss/panoptus.grp differ diff --git a/mpq/unit/cm/protoss/pariah-shad.grp b/mpq/unit/cm/protoss/pariah-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/pariah-shad.grp rename to mpq/unit/cm/protoss/pariah-shadow.grp diff --git a/mpq/unit/cm/protoss/pennant-shad.grp b/mpq/unit/cm/protoss/pennant-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/pennant-shad.grp rename to mpq/unit/cm/protoss/pennant-shadow.grp diff --git a/mpq/unit/cm/protoss/prostrationstage-shad.grp b/mpq/unit/cm/protoss/prostrationstage-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/prostrationstage-shad.grp rename to mpq/unit/cm/protoss/prostrationstage-shadow.grp diff --git a/mpq/unit/cm/protoss/roguegallery-shad.grp b/mpq/unit/cm/protoss/roguegallery-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/roguegallery-shad.grp rename to mpq/unit/cm/protoss/roguegallery-shadow.grp diff --git a/mpq/unit/cm/protoss/sanctumofsorrow-shad.grp b/mpq/unit/cm/protoss/sanctumofsorrow-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/sanctumofsorrow-shad.grp rename to mpq/unit/cm/protoss/sanctumofsorrow-shadow.grp diff --git a/mpq/unit/cm/protoss/simulacrum-shad.grp b/mpq/unit/cm/protoss/simulacrum-shadow.grp similarity index 100% rename from mpq/unit/cm/protoss/simulacrum-shad.grp rename to mpq/unit/cm/protoss/simulacrum-shadow.grp diff --git a/mpq/unit/cm/terran/anticthon-shad.grp b/mpq/unit/cm/terran/anticthon-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/anticthon-shad.grp rename to mpq/unit/cm/terran/anticthon-shadow.grp diff --git a/mpq/unit/cm/terran/autocrat-shad.grp b/mpq/unit/cm/terran/autocrat-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/autocrat-shad.grp rename to mpq/unit/cm/terran/autocrat-shadow.grp diff --git a/mpq/unit/cm/terran/bioticbase-damage.lof b/mpq/unit/cm/terran/biotic-bastion-damage.lof similarity index 100% rename from mpq/unit/cm/terran/bioticbase-damage.lof rename to mpq/unit/cm/terran/biotic-bastion-damage.lof diff --git a/mpq/unit/cm/terran/bioticbase-shad.grp b/mpq/unit/cm/terran/biotic-bastion-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/bioticbase-shad.grp rename to mpq/unit/cm/terran/biotic-bastion-shadow.grp diff --git a/mpq/unit/cm/terran/bioticbase.grp b/mpq/unit/cm/terran/biotic-bastion.grp similarity index 100% rename from mpq/unit/cm/terran/bioticbase.grp rename to mpq/unit/cm/terran/biotic-bastion.grp diff --git a/mpq/unit/cm/terran/captaincy-shad.grp b/mpq/unit/cm/terran/captaincy-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/captaincy-shad.grp rename to mpq/unit/cm/terran/captaincy-shadow.grp diff --git a/mpq/unit/cm/terran/cohort-shad.grp b/mpq/unit/cm/terran/cohort-shad.grp deleted file mode 100644 index 25b8665..0000000 Binary files a/mpq/unit/cm/terran/cohort-shad.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/cohort.grp b/mpq/unit/cm/terran/cohort.grp deleted file mode 100644 index cc6150a..0000000 Binary files a/mpq/unit/cm/terran/cohort.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/cuirass-shad.grp b/mpq/unit/cm/terran/cuirass-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/cuirass-shad.grp rename to mpq/unit/cm/terran/cuirass-shadow.grp diff --git a/mpq/unit/cm/terran/ioncannon-attack.grp b/mpq/unit/cm/terran/diadem-attack.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attack.grp rename to mpq/unit/cm/terran/diadem-attack.grp diff --git a/mpq/unit/cm/terran/ioncannon-attack.lol b/mpq/unit/cm/terran/diadem-attack.lol similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attack.lol rename to mpq/unit/cm/terran/diadem-attack.lol diff --git a/mpq/unit/cm/terran/ioncannon-attackA1.grp b/mpq/unit/cm/terran/diadem-attackA1.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attackA1.grp rename to mpq/unit/cm/terran/diadem-attackA1.grp diff --git a/mpq/unit/cm/terran/ioncannon-attackA2.grp b/mpq/unit/cm/terran/diadem-attackA2.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attackA2.grp rename to mpq/unit/cm/terran/diadem-attackA2.grp diff --git a/mpq/unit/cm/terran/ioncannon-attackA3.grp b/mpq/unit/cm/terran/diadem-attackA3.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attackA3.grp rename to mpq/unit/cm/terran/diadem-attackA3.grp diff --git a/mpq/unit/cm/terran/ioncannon-attackA4.grp b/mpq/unit/cm/terran/diadem-attackA4.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attackA4.grp rename to mpq/unit/cm/terran/diadem-attackA4.grp diff --git a/mpq/unit/cm/terran/ioncannon-attackB.grp b/mpq/unit/cm/terran/diadem-attackB.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-attackB.grp rename to mpq/unit/cm/terran/diadem-attackB.grp diff --git a/mpq/unit/cm/terran/ioncannon-base.grp b/mpq/unit/cm/terran/diadem-base.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-base.grp rename to mpq/unit/cm/terran/diadem-base.grp diff --git a/mpq/unit/cm/terran/ion-cannon-beacon.grp b/mpq/unit/cm/terran/diadem-beacon.grp similarity index 100% rename from mpq/unit/cm/terran/ion-cannon-beacon.grp rename to mpq/unit/cm/terran/diadem-beacon.grp diff --git a/mpq/unit/cm/terran/ioncannon-damage.lof b/mpq/unit/cm/terran/diadem-damage.lof similarity index 100% rename from mpq/unit/cm/terran/ioncannon-damage.lof rename to mpq/unit/cm/terran/diadem-damage.lof diff --git a/mpq/unit/cm/terran/ioncannon-dustoff.lod b/mpq/unit/cm/terran/diadem-dustoff.lod similarity index 100% rename from mpq/unit/cm/terran/ioncannon-dustoff.lod rename to mpq/unit/cm/terran/diadem-dustoff.lod diff --git a/mpq/unit/cm/terran/ioncannon-duston.lou b/mpq/unit/cm/terran/diadem-duston.lou similarity index 100% rename from mpq/unit/cm/terran/ioncannon-duston.lou rename to mpq/unit/cm/terran/diadem-duston.lou diff --git a/mpq/unit/cm/effect/ioncannon-ionfield.grp b/mpq/unit/cm/terran/diadem-ion-field.grp similarity index 100% rename from mpq/unit/cm/effect/ioncannon-ionfield.grp rename to mpq/unit/cm/terran/diadem-ion-field.grp diff --git a/mpq/unit/cm/terran/ioncannon-mouseresponse.grp b/mpq/unit/cm/terran/diadem-mouseresponse.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-mouseresponse.grp rename to mpq/unit/cm/terran/diadem-mouseresponse.grp diff --git a/mpq/unit/cm/terran/ioncannon-overlay.grp b/mpq/unit/cm/terran/diadem-overlay.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-overlay.grp rename to mpq/unit/cm/terran/diadem-overlay.grp diff --git a/mpq/unit/cm/terran/ioncannon-overlay.lol b/mpq/unit/cm/terran/diadem-overlay.lol similarity index 100% rename from mpq/unit/cm/terran/ioncannon-overlay.lol rename to mpq/unit/cm/terran/diadem-overlay.lol diff --git a/mpq/unit/cm/effect/ioncannon-projectile.grp b/mpq/unit/cm/terran/diadem-projectile.grp similarity index 100% rename from mpq/unit/cm/effect/ioncannon-projectile.grp rename to mpq/unit/cm/terran/diadem-projectile.grp diff --git a/mpq/unit/cm/terran/ioncannon-shad.grp b/mpq/unit/cm/terran/diadem-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-shad.grp rename to mpq/unit/cm/terran/diadem-shadow.grp diff --git a/mpq/unit/cm/terran/ioncannon-turret.grp b/mpq/unit/cm/terran/diadem-turret.grp similarity index 100% rename from mpq/unit/cm/terran/ioncannon-turret.grp rename to mpq/unit/cm/terran/diadem-turret.grp diff --git a/mpq/unit/cm/terran/guildhall-shad.grp b/mpq/unit/cm/terran/guildhall-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/guildhall-shad.grp rename to mpq/unit/cm/terran/guildhall-shadow.grp diff --git a/mpq/unit/cm/terran/particle-accelerator-damage.lof b/mpq/unit/cm/terran/hadron-damage.lof similarity index 100% rename from mpq/unit/cm/terran/particle-accelerator-damage.lof rename to mpq/unit/cm/terran/hadron-damage.lof diff --git a/mpq/unit/cm/terran/particle-accelerator-shadow.grp b/mpq/unit/cm/terran/hadron-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/particle-accelerator-shadow.grp rename to mpq/unit/cm/terran/hadron-shadow.grp diff --git a/mpq/unit/cm/terran/particle-accelerator.grp b/mpq/unit/cm/terran/hadron.grp similarity index 100% rename from mpq/unit/cm/terran/particle-accelerator.grp rename to mpq/unit/cm/terran/hadron.grp diff --git a/mpq/unit/cm/terran/heracles-shad.grp b/mpq/unit/cm/terran/heracles-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/heracles-shad.grp rename to mpq/unit/cm/terran/heracles-shadow.grp diff --git a/mpq/unit/cm/terran/ironfoundry-shad.grp b/mpq/unit/cm/terran/ironfoundry-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/ironfoundry-shad.grp rename to mpq/unit/cm/terran/ironfoundry-shadow.grp diff --git a/mpq/unit/cm/terran/madcap-shad.grp b/mpq/unit/cm/terran/madcap-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/madcap-shad.grp rename to mpq/unit/cm/terran/madcap-shadow.grp diff --git a/mpq/unit/cm/terran/naniteassembly-shad.grp b/mpq/unit/cm/terran/naniteassembly-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/naniteassembly-shad.grp rename to mpq/unit/cm/terran/naniteassembly-shadow.grp diff --git a/mpq/unit/cm/terran/olympian-shad.grp b/mpq/unit/cm/terran/olympian-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/olympian-shad.grp rename to mpq/unit/cm/terran/olympian-shadow.grp diff --git a/mpq/unit/cm/terran/paladin-shad.grp b/mpq/unit/cm/terran/paladin-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/paladin-shad.grp rename to mpq/unit/cm/terran/paladin-shadow.grp diff --git a/mpq/unit/cm/terran/penumbra-shad.grp b/mpq/unit/cm/terran/penumbra-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/penumbra-shad.grp rename to mpq/unit/cm/terran/penumbra-shadow.grp diff --git a/mpq/unit/cm/terran/quarry-shad.grp b/mpq/unit/cm/terran/quarry-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/quarry-shad.grp rename to mpq/unit/cm/terran/quarry-shadow.grp diff --git a/mpq/unit/cm/terran/munitionsbay-damage.lof b/mpq/unit/cm/terran/rotary-damage.lof similarity index 100% rename from mpq/unit/cm/terran/munitionsbay-damage.lof rename to mpq/unit/cm/terran/rotary-damage.lof diff --git a/mpq/unit/cm/terran/munitionsbay-shad.grp b/mpq/unit/cm/terran/rotary-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/munitionsbay-shad.grp rename to mpq/unit/cm/terran/rotary-shadow.grp diff --git a/mpq/unit/cm/terran/munitionsbay.grp b/mpq/unit/cm/terran/rotary.grp similarity index 100% rename from mpq/unit/cm/terran/munitionsbay.grp rename to mpq/unit/cm/terran/rotary.grp diff --git a/mpq/unit/cm/terran/savant-shad.grp b/mpq/unit/cm/terran/savant-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/savant-shad.grp rename to mpq/unit/cm/terran/savant-shadow.grp diff --git a/mpq/unit/cm/terran/scrapyard-shad.grp b/mpq/unit/cm/terran/scrapyard-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/scrapyard-shad.grp rename to mpq/unit/cm/terran/scrapyard-shadow.grp diff --git a/mpq/unit/cm/terran/siren-shad.grp b/mpq/unit/cm/terran/siren-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/siren-shad.grp rename to mpq/unit/cm/terran/siren-shadow.grp diff --git a/mpq/unit/cm/terran/striga-shad.grp b/mpq/unit/cm/terran/striga-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/striga-shad.grp rename to mpq/unit/cm/terran/striga-shadow.grp diff --git a/mpq/unit/cm/terran/tinkererstower-shad.grp b/mpq/unit/cm/terran/tinkererstower-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/tinkererstower-shad.grp rename to mpq/unit/cm/terran/tinkererstower-shadow.grp diff --git a/mpq/unit/cm/terran/treasury-shad.grp b/mpq/unit/cm/terran/treasury-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/treasury-shad.grp rename to mpq/unit/cm/terran/treasury-shadow.grp diff --git a/mpq/unit/cm/terran/medbay-connector.grp b/mpq/unit/cm/terran/vestry-connector.grp similarity index 100% rename from mpq/unit/cm/terran/medbay-connector.grp rename to mpq/unit/cm/terran/vestry-connector.grp diff --git a/mpq/unit/cm/terran/medbay-damage.lof b/mpq/unit/cm/terran/vestry-damage.lof similarity index 100% rename from mpq/unit/cm/terran/medbay-damage.lof rename to mpq/unit/cm/terran/vestry-damage.lof diff --git a/mpq/unit/cm/terran/medbay-shad.grp b/mpq/unit/cm/terran/vestry-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/medbay-shad.grp rename to mpq/unit/cm/terran/vestry-shadow.grp diff --git a/mpq/unit/cm/terran/medbay.grp b/mpq/unit/cm/terran/vestry.grp similarity index 100% rename from mpq/unit/cm/terran/medbay.grp rename to mpq/unit/cm/terran/vestry.grp diff --git a/mpq/unit/cm/zerg/bactalisk-shad.grp b/mpq/unit/cm/zerg/bactalisk-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/bactalisk-shad.grp rename to mpq/unit/cm/zerg/bactalisk-shadow.grp diff --git a/mpq/unit/cm/zerg/gorgral-swamp-shad.grp b/mpq/unit/cm/zerg/gorgral-swamp-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/gorgral-swamp-shad.grp rename to mpq/unit/cm/zerg/gorgral-swamp-shadow.grp diff --git a/mpq/unit/cm/zerg/infestedtemplar-shad.grp b/mpq/unit/cm/zerg/infestedtemplar-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/infestedtemplar-shad.grp rename to mpq/unit/cm/zerg/infestedtemplar-shadow.grp diff --git a/mpq/unit/cm/zerg/izirokor-shad.grp b/mpq/unit/cm/zerg/izirokor-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/izirokor-shad.grp rename to mpq/unit/cm/zerg/izirokor-shadow.grp diff --git a/mpq/unit/cm/zerg/keskathalor-shad.grp b/mpq/unit/cm/zerg/keskathalor-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/keskathalor-shad.grp rename to mpq/unit/cm/zerg/keskathalor-shadow.grp diff --git a/mpq/unit/cm/zerg/konvilisk-shad.grp b/mpq/unit/cm/zerg/konvilisk-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/konvilisk-shad.grp rename to mpq/unit/cm/zerg/konvilisk-shadow.grp diff --git a/mpq/unit/cm/zerg/larvalcolony-shad.grp b/mpq/unit/cm/zerg/larvalcolony-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/larvalcolony-shad.grp rename to mpq/unit/cm/zerg/larvalcolony-shadow.grp diff --git a/mpq/unit/cm/zerg/quazilisk-attack.grp b/mpq/unit/cm/zerg/quazilisk-attack.grp new file mode 100644 index 0000000..91c7767 Binary files /dev/null and b/mpq/unit/cm/zerg/quazilisk-attack.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-birth.grp b/mpq/unit/cm/zerg/quazilisk-birth.grp index 1683908..469b82e 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-birth.grp and b/mpq/unit/cm/zerg/quazilisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-mutate.grp b/mpq/unit/cm/zerg/quazilisk-mutate.grp new file mode 100644 index 0000000..144fbb7 Binary files /dev/null and b/mpq/unit/cm/zerg/quazilisk-mutate.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-remains.grp b/mpq/unit/cm/zerg/quazilisk-remains.grp index 9b05adb..e6b672e 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-remains.grp and b/mpq/unit/cm/zerg/quazilisk-remains.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-shad.grp b/mpq/unit/cm/zerg/quazilisk-shad.grp deleted file mode 100644 index f6c8d97..0000000 Binary files a/mpq/unit/cm/zerg/quazilisk-shad.grp and /dev/null differ diff --git a/mpq/unit/cm/zerg/quazilisk-shadow.grp b/mpq/unit/cm/zerg/quazilisk-shadow.grp new file mode 100644 index 0000000..4d801ee Binary files /dev/null and b/mpq/unit/cm/zerg/quazilisk-shadow.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk.grp b/mpq/unit/cm/zerg/quazilisk.grp index 04a329b..2be0fd9 100644 Binary files a/mpq/unit/cm/zerg/quazilisk.grp and b/mpq/unit/cm/zerg/quazilisk.grp differ diff --git a/mpq/unit/cm/zerg/sire-shad.grp b/mpq/unit/cm/zerg/sire-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/sire-shad.grp rename to mpq/unit/cm/zerg/sire-shadow.grp diff --git a/mpq/unit/cm/zerg/zoryusthaleth-shad.grp b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/zoryusthaleth-shad.grp rename to mpq/unit/cm/zerg/zoryusthaleth-shadow.grp diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index ec7da4d..dea1113 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 aea3a5c..44823bf 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index e04f946..8c42d32 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 d102a51..c16194b 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 e8a36b6..1164962 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,43 +1,128 @@ -# 22 July 2023 +# 31 July 2023 ## Designer's Notes -A very minor update lies ahead of [Ascension #3](https://www.youtube.com/playlist?list=PLACFHAM2MlxOewD4AQfLqpBXzcyQA_kwR), bringing improved visuals for some Terran units, adjusted mineral cost for the Anchor, cleaner implementation of Apollyoid Adhesive, and some bugfixes. +The selection extender is now live! Praise be upon DarkenedFantasies. + +A menagerie of bugfixes and balance changes are also present, alongside the deployment of a lovely new Quazilisk sprite, courtesy of Solstice! ## Latest content +- [Pr0totype 016](https://youtu.be/zmM0Kos0SHo) +- [Ascension #3](https://www.youtube.com/playlist?list=PLACFHAM2MlxOewD4AQfLqpBXzcyQA_kwR) +- [Five new castovers](https://www.youtube.com/playlist?list=PLACFHAM2MlxPpMqYiRo1XyklxcrWWUhnl) -- [Pr0totype 15 - Warp Field Stabilized](https://youtu.be/6I8qGYDUo-A) -- Castovers: - - [Btyb88 vs Alekxhandr](https://youtu.be/DIxu_oTdqbQ) by Pr0nogo +## On the radar... +- The infamous Hippogriff max-range bug has been known of for some time, but we are committing to fixing it before next week's release version. +- Clarion-Analogue interactions are currently bugged. We will be revising the internal handling of the Clarion behavior to fix other issues. +- Morningstar explosions are no longer projecting damage as widely as they ought to. This (and other splash interactions) will be investigated and resolved before the next release. +- Transport UI is not good, but we might have a way to improve it now that the extended selection UI is a thing... -## Gameplay -- Apollyoid Adhesive now divides the number of attacks hit by 2 in order to get the final stacks, to avoid most instances of the effect stacking multiple times from a single attack (r. fagguto) - - Caveat: this means you need to hit with at least two parts of a single attack in order to get one stack! - -## Audiovisuals -- Main menu background has been slightly updated -- Improved sprites for: - - Cyprian (lighting and proportions, c. Solstice) - - Cyclops, Blackjack, Madrigal (lighting, c. Solstice) - - Madcap, Cataphract (lighting and animations, c. Solstice) +## User Interface +- Selection: (c. DarkenedFantasies) + - Selection is now capped at 252, from 12 + - When selecting more than 12 units, selections are collapsed, showing the quantity of units by type - at which point: + - Left-click selects all units of that type + - Shift-click deselects one unit of that type + - Ctrl-shift-click deselects all units of that type +- Game modes: (c. Veeq7) + - Added "Competitive Mode" to once again display "kills" on combatants + - Renamed "Use Map Settings" to "Scenario Mode" + - Restricted multiplayer game mode selection to only that which is currently-supported + - Modes that had limited (and buggy) utility can be reimplemented more completely; please message us for specific requests! ## Bugfixes -- **Hotfix 28 July 2023:** - - Cancelling Zerg Eggs after the Larva-producing structure has been destroyed no longer crashes the game (r. Mystery Meat) - - Lakizilisks will no longer become unresponsive when receiving an unburrow order while already unburrowed (r. exosus & fagguto) -- **Hotfix 23 July 2023:** - - The Diadem's damage overlay has been disabled again to prevent freezing (r. HelltRYKS) - - Zarcavrokors no longer have their main weapon put on cooldown when launching Bones of Reflection - - Sycophants now correctly display "unable to attack target" when ordered to attack air units (r. IskatuMesk) - - Zarcavrokor weaponfire SFX has been corrected - Stability: - - Fixed another nullsprite crash (r. The Shambler/Alexhandr) -- Audiovisuals: - - Sublime Shepherd now shows an aura radius, and its icon now renders like a passive -- Editor: - - Improved categorization of Terran structures - - Fixed incorrect or outdated names and collision sizes of Terran structures and addons + - Cancelling Zerg Eggs after the Larva-producing structure has been destroyed no longer crashes the game (r. Mystery Meat) + - The Diadem's damage overlay has been disabled again to prevent freezing (r. HelltRYKS) + - A very rare Anchor-related crash has been fixed (c. DarkenedFantasies) + - A movement-related nullsprite crash has been fixed (c. DarkenedFantasies) + - An ai-related nullsprite crash has been fixed (r. beriso) +- Gameplay: + - It is no longer possible for units to retaliate against attackers that are out of range via hold position or other methods (c. DarkenedFantasies) + - Combatants on hold position no longer "freeze up" when attacked by out-of-range targets (c. DarkenedFantasies) + - Ascend status (from e.g. Protoss Vassal) now correctly clears for flingy units (e.g. Panoptuses) + - Edge cases with workers returning to inefficient town centers have been addressed (c. Veeq7) + - Units suffering from a Crisis of Faith have the debuff cleared when not within 8 range of a Demiurge allied to the original attacker + - Lakizilisks will no longer become unresponsive when receiving an unburrow order while already unburrowed (r. exosus & fagguto) + - Zarcavrokors no longer have their main weapon put on cooldown when launching Bones of Reflection + - Towers no longer require manual retargeting once unloaded from a transport (c. DF) + - While garrisoned, Harakans now attack far more consistently (r. Mystery Meat, c. Veeq7) + - While garrisoned, Olympians can no longer occasionally attack with Titant's Fist (r. Mystery Meat) +- AI: + - Reduced the resource bias for expansion selection to prevent unwanted edge cases on some maps +- Audiovisual: + - Player color randomization is now more robust, selecting colors with better contrast and being more foolproof even at high player counts (c. Veeq7) + - Fixed an issue preventing Magister Stellar Enforcement overlays from being created on any unit that didn't have a turret + - The attack overlay for Anchors is no longer created facing the wrong direction when turreted combatants (i.e. Goliath) attack + - While garrisoned in Cinder Mode, Matadors now create the flamethrower overlay (still WIP) (r. Mystery Meat) + - Dying eggs hatching into units now play the egg's death animation (c. DarkenedFantasies) + - Tooltip display for weapon range is no longer inconsistent based on height level (c. Veeq7) + - Aquifers no longer display "unpowered" when out of range of Pylons + - Order line colorization for turreted units is now more consistent + - Fixed the Empress's training string not displaying costs (r. The Shambler) + - Fixed a typo in Empress - Anodyne Annex passive description (r. The Shambler) + +## Audiovisuals +- The delay between "ally under attack" notifications has been increased by 50% +- New sprite for: + - Quazilisk (c. Solstice) +- Improved sprites for: + - Aurora, Panoptus (c. Solstice) +- New wireframes for: + - Pythean, Wyvern (c. jun3hong) ## Terran -- [Anchor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anchor): - - Mineral cost now 150, from 100 \ No newline at end of file +- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian): + - Projectile speed reduced by 25% +- [Anticthon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anticthon): + - Gas cost now 350, from 400 +- [Quarry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/quarry): + - HP now 400, from 500 + - Mineral cost now 125, from 100 +- [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury): + - Mineral cost now 250, from 200 +- [Sentinel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sentinel): + - Projectile speed reduced by 25% + +## Protoss +- [Engram](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/engram): + - HP now 220, from 200 + - Armor now 3, from 4 + - Transport space cost now 12, from 8 +- [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): + - Shields now 50, from 60 + - Armor penetration now 0, from 1 +- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald): + - Weapon cooldown now 0.92, from 1 +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - Transport space cost now 8, from 10 + - Skybond Ray weapon damage now 8, from 10 +- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol): + - Shields now 45, from 65 +- [Accantor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/accantor): + - HP now 140, from 160 + - Shields now 70, from 80 +- [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron): + - Mineral cost now 150, from 175 + - HP now 100, from 120 + - Shields now 50, from 40 + - Armor now 3, from 2 +- [Analogue](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/analogue): + - Gas cost now 200, from 150 + - No longer a detector + +## Zerg +- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk): + - Mineral cost now 75, from 100 + - HP now 90, from 100 + - Weapon damage now 8, from 9 +- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): + - HP now 120, from 140 + - Armor now 2, from 1 + - Armor penetration now 0, from 1 +- [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor): + - Armor now 1, from 2 +- [Rilirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rilirokor): + - Now only collides with structures and other Rilirokors +- [Larvosk Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/larvosk-cesiant): + - Mineral cost now 100, from 75 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 2847fc9..458e970 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ