diff --git a/maps/mp/zm_buried_grief_street.gsc b/maps/mp/zm_buried_grief_street.gsc index 90664dd8..6c7416e4 100644 --- a/maps/mp/zm_buried_grief_street.gsc +++ b/maps/mp/zm_buried_grief_street.gsc @@ -109,8 +109,8 @@ builddynamicwallbuys() builddynamicwallbuy( "church", "svu_zm" ); builddynamicwallbuy( "mansion", "an94_zm" ); - scripts/zm/main/_zm_reimagined::wallbuy_increase_trigger_radius(); - scripts/zm/main/_zm_reimagined::wallbuy_decrease_upgraded_ammo_cost(); + scripts/zm/_zm_reimagined::wallbuy_increase_trigger_radius(); + scripts/zm/_zm_reimagined::wallbuy_decrease_upgraded_ammo_cost(); } builddynamicwallbuy( location, weaponname ) @@ -159,7 +159,7 @@ builddynamicwallbuy( location, weaponname ) model hide(); chalk_fx = weaponname + "_fx"; - thread scripts/zm/main/_zm_reimagined::playchalkfx( chalk_fx, origin, wallbuy.angles ); + thread scripts/zm/_zm_reimagined::playchalkfx( chalk_fx, origin, wallbuy.angles ); } maps/mp/zombies/_zm_weapons::add_dynamic_wallbuy( weaponname, wallbuy.targetname, 1 ); @@ -404,7 +404,7 @@ move_quickrevive_machine() use_trigger thread maps/mp/zombies/_zm_perks::electric_perks_dialog(); powered_on = maps/mp/zombies/_zm_perks::get_perk_machine_start_state( use_trigger.script_noteworthy ); - maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/main/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); + maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); } move_speedcola_machine() @@ -495,7 +495,7 @@ move_speedcola_machine() use_trigger thread maps/mp/zombies/_zm_perks::electric_perks_dialog(); powered_on = maps/mp/zombies/_zm_perks::get_perk_machine_start_state( use_trigger.script_noteworthy ); - maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/main/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); + maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); } move_staminup_machine() @@ -590,5 +590,5 @@ move_staminup_machine() use_trigger thread maps/mp/zombies/_zm_perks::electric_perks_dialog(); powered_on = maps/mp/zombies/_zm_perks::get_perk_machine_start_state( use_trigger.script_noteworthy ); - maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/main/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); + maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); } \ No newline at end of file diff --git a/scripts/zm/main/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc similarity index 99% rename from scripts/zm/main/_zm_reimagined.gsc rename to scripts/zm/_zm_reimagined.gsc index 89678151..3d27bffe 100644 --- a/scripts/zm/main/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -4840,7 +4840,7 @@ town_move_quickrevive_machine() use_trigger thread maps/mp/zombies/_zm_perks::electric_perks_dialog(); powered_on = maps/mp/zombies/_zm_perks::get_perk_machine_start_state( use_trigger.script_noteworthy ); - maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/main/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); + maps/mp/zombies/_zm_power::add_powered_item( maps/mp/zombies/_zm_power::perk_power_on, scripts/zm/_zm_reimagined::perk_power_off, maps/mp/zombies/_zm_power::perk_range, maps/mp/zombies/_zm_power::cost_low_if_local, 0, powered_on, use_trigger ); } town_move_staminup_machine() diff --git a/scripts/zm/mod.gsc b/scripts/zm/mod.gsc deleted file mode 100644 index 6a99d49a..00000000 --- a/scripts/zm/mod.gsc +++ /dev/null @@ -1,14 +0,0 @@ -#include scripts/zm/main/_zm_reimagined; -#include scripts/zm/main/_zm_reimagined_zgrief; - -main() -{ - scripts/zm/main/_zm_reimagined::main(); - scripts/zm/main/_zm_reimagined_zgrief::main(); -} - -init() -{ - scripts/zm/main/_zm_reimagined::init(); - scripts/zm/main/_zm_reimagined_zgrief::init(); -} \ No newline at end of file diff --git a/scripts/zm/replaced/_zm_game_module.gsc b/scripts/zm/replaced/_zm_game_module.gsc index 3c3ee14a..0f2f9db4 100644 --- a/scripts/zm/replaced/_zm_game_module.gsc +++ b/scripts/zm/replaced/_zm_game_module.gsc @@ -191,11 +191,11 @@ round_end(winner, force_win) { if(player.team == team) { - player thread scripts/zm/main/_zm_reimagined_zgrief::show_grief_hud_msg( "You won the round" ); + player thread scripts/zm/zgrief/zgrief_reimagined::show_grief_hud_msg( "You won the round" ); } else { - player thread scripts/zm/main/_zm_reimagined_zgrief::show_grief_hud_msg( "You lost the round" ); + player thread scripts/zm/zgrief/zgrief_reimagined::show_grief_hud_msg( "You lost the round" ); } } } @@ -203,7 +203,7 @@ round_end(winner, force_win) { foreach(player in players) { - player thread scripts/zm/main/_zm_reimagined_zgrief::show_grief_hud_msg( &"ZOMBIE_GRIEF_RESET" ); + player thread scripts/zm/zgrief/zgrief_reimagined::show_grief_hud_msg( &"ZOMBIE_GRIEF_RESET" ); } } @@ -239,7 +239,7 @@ zombie_goto_round(target_round) level thread player_respawn_award(); - level thread scripts/zm/main/_zm_reimagined_zgrief::round_start_wait(5); + level thread scripts/zm/zgrief/zgrief_reimagined::round_start_wait(5); } player_respawn_award() diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc similarity index 100% rename from scripts/zm/main/_zm_reimagined_zgrief.gsc rename to scripts/zm/zgrief/zgrief_reimagined.gsc