From 599909368d96f771476e9be75afd23102f80f598 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Mon, 1 Jan 2024 15:13:58 -0800 Subject: [PATCH] Reformat code using new version of astyle --- scripts/zm/_zm_reimagined.gsc | 82 +++++++------- scripts/zm/replaced/_zm.csc | 34 +++--- scripts/zm/replaced/_zm.gsc | 92 ++++++++-------- scripts/zm/replaced/_zm_afterlife.gsc | 46 ++++---- scripts/zm/replaced/_zm_ai_avogadro.gsc | 36 +++--- scripts/zm/replaced/_zm_ai_brutus.gsc | 2 +- scripts/zm/replaced/_zm_chugabud.gsc | 4 +- .../replaced/_zm_game_module_meat_utility.gsc | 12 +- scripts/zm/replaced/_zm_melee_weapon.gsc | 52 ++++----- scripts/zm/replaced/_zm_perk_divetonuke.gsc | 12 +- scripts/zm/replaced/_zm_spawner.gsc | 72 ++++++------ scripts/zm/replaced/_zm_utility.gsc | 20 ++-- .../zm/replaced/_zm_weap_ballistic_knife.gsc | 30 ++--- .../zm/replaced/_zm_weap_cymbal_monkey.gsc | 8 +- .../zm/replaced/_zm_weap_one_inch_punch.gsc | 40 +++---- scripts/zm/replaced/_zm_weapons.gsc | 2 +- scripts/zm/replaced/zgrief.gsc | 10 +- scripts/zm/replaced/zm_buried_buildables.gsc | 104 +++++++++--------- scripts/zm/replaced/zm_buried_sq_ts.gsc | 8 +- scripts/zm/replaced/zm_prison_spoon.gsc | 78 ++++++------- scripts/zm/replaced/zm_tomb_main_quest.gsc | 12 +- .../zm/replaced/zm_transit_ai_screecher.gsc | 18 +-- scripts/zm/replaced/zmeat.gsc | 6 +- 23 files changed, 390 insertions(+), 390 deletions(-) diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 49e8b256..3ed6865b 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -1609,63 +1609,63 @@ weapon_changes() { if (level.script == "zm_transit" || level.script == "zm_nuked" || level.script == "zm_highrise" || level.script == "zm_buried" || level.script == "zm_tomb") { - include_weapon( "held_knife_zm", 0 ); - register_melee_weapon_for_level( "held_knife_zm" ); + include_weapon("held_knife_zm", 0); + register_melee_weapon_for_level("held_knife_zm"); } if (level.script == "zm_transit" || level.script == "zm_nuked" || level.script == "zm_highrise" || level.script == "zm_buried") { - include_weapon( "held_bowie_knife_zm", 0 ); - register_melee_weapon_for_level( "held_bowie_knife_zm" ); + include_weapon("held_bowie_knife_zm", 0); + register_melee_weapon_for_level("held_bowie_knife_zm"); - include_weapon( "held_tazer_knuckles_zm", 0 ); - register_melee_weapon_for_level( "held_tazer_knuckles_zm" ); + include_weapon("held_tazer_knuckles_zm", 0); + register_melee_weapon_for_level("held_tazer_knuckles_zm"); level.laststandpistol = "fnp45_zm"; level.default_laststandpistol = "fnp45_zm"; level.default_solo_laststandpistol = "fnp45_upgraded_zm"; level.start_weapon = "fnp45_zm"; - include_weapon( "fnp45_zm", 0 ); - include_weapon( "fnp45_upgraded_zm", 0 ); - add_limited_weapon( "fnp45_zm", 0 ); - add_zombie_weapon( "fnp45_zm", "fnp45_upgraded_zm", &"WEAPON_FNP45", 50, "wpck_pistol", "", undefined, 1 ); + include_weapon("fnp45_zm", 0); + include_weapon("fnp45_upgraded_zm", 0); + add_limited_weapon("fnp45_zm", 0); + add_zombie_weapon("fnp45_zm", "fnp45_upgraded_zm", &"WEAPON_FNP45", 50, "wpck_pistol", "", undefined, 1); } if (level.script == "zm_prison") { - include_weapon( "held_knife_zm_alcatraz", 0 ); - register_melee_weapon_for_level( "held_knife_zm_alcatraz" ); + include_weapon("held_knife_zm_alcatraz", 0); + register_melee_weapon_for_level("held_knife_zm_alcatraz"); - include_weapon( "held_spoon_zm_alcatraz", 0 ); - register_melee_weapon_for_level( "held_spoon_zm_alcatraz" ); + include_weapon("held_spoon_zm_alcatraz", 0); + register_melee_weapon_for_level("held_spoon_zm_alcatraz"); - include_weapon( "held_spork_zm_alcatraz", 0 ); - register_melee_weapon_for_level( "held_spork_zm_alcatraz" ); + include_weapon("held_spork_zm_alcatraz", 0); + register_melee_weapon_for_level("held_spork_zm_alcatraz"); - maps\mp\zombies\_zm_weapons::register_zombie_weapon_callback( "willy_pete_zm", ::player_give_willy_pete ); + maps\mp\zombies\_zm_weapons::register_zombie_weapon_callback("willy_pete_zm", ::player_give_willy_pete); register_tactical_grenade_for_level("willy_pete_zm"); level.zombie_weapons["willy_pete_zm"].is_in_box = 1; } if (level.script == "zm_tomb") { - include_weapon( "held_one_inch_punch_zm", 0 ); - register_melee_weapon_for_level( "held_one_inch_punch_zm" ); + include_weapon("held_one_inch_punch_zm", 0); + register_melee_weapon_for_level("held_one_inch_punch_zm"); - include_weapon( "held_one_inch_punch_upgraded_zm", 0 ); - register_melee_weapon_for_level( "held_one_inch_punch_upgraded_zm" ); + include_weapon("held_one_inch_punch_upgraded_zm", 0); + register_melee_weapon_for_level("held_one_inch_punch_upgraded_zm"); - include_weapon( "held_one_inch_punch_air_zm", 0 ); - register_melee_weapon_for_level( "held_one_inch_punch_air_zm" ); + include_weapon("held_one_inch_punch_air_zm", 0); + register_melee_weapon_for_level("held_one_inch_punch_air_zm"); - include_weapon( "held_one_inch_punch_fire_zm", 0 ); - register_melee_weapon_for_level( "held_one_inch_punch_fire_zm" ); + include_weapon("held_one_inch_punch_fire_zm", 0); + register_melee_weapon_for_level("held_one_inch_punch_fire_zm"); - include_weapon( "held_one_inch_punch_ice_zm", 0 ); - register_melee_weapon_for_level( "held_one_inch_punch_ice_zm" ); + include_weapon("held_one_inch_punch_ice_zm", 0); + register_melee_weapon_for_level("held_one_inch_punch_ice_zm"); - include_weapon( "held_one_inch_punch_lightning_zm", 0 ); - register_melee_weapon_for_level( "held_one_inch_punch_lightning_zm" ); + include_weapon("held_one_inch_punch_lightning_zm", 0); + register_melee_weapon_for_level("held_one_inch_punch_lightning_zm"); } if (isdefined(level.zombie_weapons["saritch_zm"])) @@ -1676,16 +1676,16 @@ weapon_changes() } else { - include_weapon( "saritch_zm", 0 ); - include_weapon( "saritch_upgraded_zm", 0 ); - add_zombie_weapon( "saritch_zm", "saritch_upgraded_zm", &"ZOMBIE_WEAPON_SARITCH", 500, "wpck_smr", "", undefined, 1 ); + include_weapon("saritch_zm", 0); + include_weapon("saritch_upgraded_zm", 0); + add_zombie_weapon("saritch_zm", "saritch_upgraded_zm", &"ZOMBIE_WEAPON_SARITCH", 500, "wpck_smr", "", undefined, 1); } if (!isdefined(level.zombie_weapons["ballista_zm"])) { - include_weapon( "ballista_zm", 0 ); - include_weapon( "ballista_upgraded_zm", 0 ); - add_zombie_weapon( "ballista_zm", "ballista_upgraded_zm", &"ZMWEAPON_BALLISTA_WALLBUY", 500, "wpck_snipe", "", undefined, 1 ); + include_weapon("ballista_zm", 0); + include_weapon("ballista_upgraded_zm", 0); + add_zombie_weapon("ballista_zm", "ballista_upgraded_zm", &"ZMWEAPON_BALLISTA_WALLBUY", 500, "wpck_snipe", "", undefined, 1); } if (isdefined(level.zombie_weapons["python_zm"])) @@ -1705,16 +1705,16 @@ weapon_changes() if (!isdefined(level.zombie_weapons["hk416_zm"])) { - include_weapon( "hk416_zm" ); - include_weapon( "hk416_upgraded_zm", 0 ); - add_zombie_weapon( "hk416_zm", "hk416_upgraded_zm", &"ZOMBIE_WEAPON_HK416", 100, "", "", undefined ); + include_weapon("hk416_zm"); + include_weapon("hk416_upgraded_zm", 0); + add_zombie_weapon("hk416_zm", "hk416_upgraded_zm", &"ZOMBIE_WEAPON_HK416", 100, "", "", undefined); } if (!isdefined(level.zombie_weapons["scar_zm"])) { - include_weapon( "scar_zm" ); - include_weapon( "scar_upgraded_zm", 0 ); - add_zombie_weapon( "scar_zm", "scar_upgraded_zm", &"ZOMBIE_WEAPON_SCAR", 50, "wpck_rifle", "", undefined, 1 ); + include_weapon("scar_zm"); + include_weapon("scar_upgraded_zm", 0); + add_zombie_weapon("scar_zm", "scar_upgraded_zm", &"ZOMBIE_WEAPON_SCAR", 50, "wpck_rifle", "", undefined, 1); } } diff --git a/scripts/zm/replaced/_zm.csc b/scripts/zm/replaced/_zm.csc index 1c580ce1..b6e259c3 100644 --- a/scripts/zm/replaced/_zm.csc +++ b/scripts/zm/replaced/_zm.csc @@ -4,28 +4,28 @@ init_wallbuy_fx() { - if ( !is_false( level._uses_default_wallbuy_fx ) ) + if (!is_false(level._uses_default_wallbuy_fx)) { - level._effect["870mcs_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_870mcs" ); - level._effect["ak74u_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_ak74u" ); - level._effect["beretta93r_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_berreta93r" ); - level._effect["bowie_knife_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_bowie" ); - level._effect["claymore_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_claymore" ); - level._effect["saritch_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_m14" ); - level._effect["m16_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_m16" ); - level._effect["mp5k_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_mp5k" ); - level._effect["ballista_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_olympia" ); + level._effect["870mcs_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_870mcs"); + level._effect["ak74u_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_ak74u"); + level._effect["beretta93r_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_berreta93r"); + level._effect["bowie_knife_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_bowie"); + level._effect["claymore_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_claymore"); + level._effect["saritch_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_m14"); + level._effect["m16_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_m16"); + level._effect["mp5k_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_mp5k"); + level._effect["ballista_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_olympia"); } - if ( !is_false( level._uses_sticky_grenades ) ) + if (!is_false(level._uses_sticky_grenades)) { - if ( !is_true( level.disable_fx_zmb_wall_buy_semtex ) ) - level._effect["sticky_grenade_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_semtex" ); + if (!is_true(level.disable_fx_zmb_wall_buy_semtex)) + level._effect["sticky_grenade_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_semtex"); } - if ( !is_false( level._uses_taser_knuckles ) ) - level._effect["tazer_knuckles_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_taseknuck" ); + if (!is_false(level._uses_taser_knuckles)) + level._effect["tazer_knuckles_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_taseknuck"); - if ( isdefined( level.buildable_wallbuy_weapons ) ) - level._effect["dynamic_wallbuy_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_question" ); + if (isdefined(level.buildable_wallbuy_weapons)) + level._effect["dynamic_wallbuy_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_question"); } \ No newline at end of file diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index 282bd021..8cfe2303 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -7,68 +7,68 @@ init_fx() { level.createfx_callback_thread = ::delete_in_createfx; - level._effect["wood_chunk_destory"] = loadfx( "impacts/fx_large_woodhit" ); - level._effect["fx_zombie_bar_break"] = loadfx( "maps/zombie/fx_zombie_bar_break" ); - level._effect["fx_zombie_bar_break_lite"] = loadfx( "maps/zombie/fx_zombie_bar_break_lite" ); + level._effect["wood_chunk_destory"] = loadfx("impacts/fx_large_woodhit"); + level._effect["fx_zombie_bar_break"] = loadfx("maps/zombie/fx_zombie_bar_break"); + level._effect["fx_zombie_bar_break_lite"] = loadfx("maps/zombie/fx_zombie_bar_break_lite"); - if ( !( isdefined( level.fx_exclude_edge_fog ) && level.fx_exclude_edge_fog ) ) - level._effect["edge_fog"] = loadfx( "maps/zombie/fx_fog_zombie_amb" ); + if (!(isdefined(level.fx_exclude_edge_fog) && level.fx_exclude_edge_fog)) + level._effect["edge_fog"] = loadfx("maps/zombie/fx_fog_zombie_amb"); - level._effect["chest_light"] = loadfx( "maps/zombie/fx_zmb_tranzit_marker_glow" ); + level._effect["chest_light"] = loadfx("maps/zombie/fx_zmb_tranzit_marker_glow"); - if ( !( isdefined( level.fx_exclude_default_eye_glow ) && level.fx_exclude_default_eye_glow ) ) - level._effect["eye_glow"] = loadfx( "misc/fx_zombie_eye_single" ); + if (!(isdefined(level.fx_exclude_default_eye_glow) && level.fx_exclude_default_eye_glow)) + level._effect["eye_glow"] = loadfx("misc/fx_zombie_eye_single"); - level._effect["headshot"] = loadfx( "impacts/fx_flesh_hit" ); - level._effect["headshot_nochunks"] = loadfx( "misc/fx_zombie_bloodsplat" ); - level._effect["bloodspurt"] = loadfx( "misc/fx_zombie_bloodspurt" ); + level._effect["headshot"] = loadfx("impacts/fx_flesh_hit"); + level._effect["headshot_nochunks"] = loadfx("misc/fx_zombie_bloodsplat"); + level._effect["bloodspurt"] = loadfx("misc/fx_zombie_bloodspurt"); - if ( !( isdefined( level.fx_exclude_tesla_head_light ) && level.fx_exclude_tesla_head_light ) ) - level._effect["tesla_head_light"] = loadfx( "maps/zombie/fx_zombie_tesla_neck_spurt" ); + if (!(isdefined(level.fx_exclude_tesla_head_light) && level.fx_exclude_tesla_head_light)) + level._effect["tesla_head_light"] = loadfx("maps/zombie/fx_zombie_tesla_neck_spurt"); - level._effect["zombie_guts_explosion"] = loadfx( "maps/zombie/fx_zmb_tranzit_torso_explo" ); - level._effect["rise_burst_water"] = loadfx( "maps/zombie/fx_mp_zombie_hand_dirt_burst" ); - level._effect["rise_billow_water"] = loadfx( "maps/zombie/fx_mp_zombie_body_dirt_billowing" ); - level._effect["rise_dust_water"] = loadfx( "maps/zombie/fx_mp_zombie_body_dust_falling" ); - level._effect["rise_burst"] = loadfx( "maps/zombie/fx_mp_zombie_hand_dirt_burst" ); - level._effect["rise_billow"] = loadfx( "maps/zombie/fx_mp_zombie_body_dirt_billowing" ); - level._effect["rise_dust"] = loadfx( "maps/zombie/fx_mp_zombie_body_dust_falling" ); - level._effect["fall_burst"] = loadfx( "maps/zombie/fx_mp_zombie_hand_dirt_burst" ); - level._effect["fall_billow"] = loadfx( "maps/zombie/fx_mp_zombie_body_dirt_billowing" ); - level._effect["fall_dust"] = loadfx( "maps/zombie/fx_mp_zombie_body_dust_falling" ); - level._effect["character_fire_death_sm"] = loadfx( "env/fire/fx_fire_zombie_md" ); - level._effect["character_fire_death_torso"] = loadfx( "env/fire/fx_fire_zombie_torso" ); + level._effect["zombie_guts_explosion"] = loadfx("maps/zombie/fx_zmb_tranzit_torso_explo"); + level._effect["rise_burst_water"] = loadfx("maps/zombie/fx_mp_zombie_hand_dirt_burst"); + level._effect["rise_billow_water"] = loadfx("maps/zombie/fx_mp_zombie_body_dirt_billowing"); + level._effect["rise_dust_water"] = loadfx("maps/zombie/fx_mp_zombie_body_dust_falling"); + level._effect["rise_burst"] = loadfx("maps/zombie/fx_mp_zombie_hand_dirt_burst"); + level._effect["rise_billow"] = loadfx("maps/zombie/fx_mp_zombie_body_dirt_billowing"); + level._effect["rise_dust"] = loadfx("maps/zombie/fx_mp_zombie_body_dust_falling"); + level._effect["fall_burst"] = loadfx("maps/zombie/fx_mp_zombie_hand_dirt_burst"); + level._effect["fall_billow"] = loadfx("maps/zombie/fx_mp_zombie_body_dirt_billowing"); + level._effect["fall_dust"] = loadfx("maps/zombie/fx_mp_zombie_body_dust_falling"); + level._effect["character_fire_death_sm"] = loadfx("env/fire/fx_fire_zombie_md"); + level._effect["character_fire_death_torso"] = loadfx("env/fire/fx_fire_zombie_torso"); - if ( !( isdefined( level.fx_exclude_default_explosion ) && level.fx_exclude_default_explosion ) ) - level._effect["def_explosion"] = loadfx( "explosions/fx_default_explosion" ); + if (!(isdefined(level.fx_exclude_default_explosion) && level.fx_exclude_default_explosion)) + level._effect["def_explosion"] = loadfx("explosions/fx_default_explosion"); - if ( !( isdefined( level._uses_default_wallbuy_fx ) && !level._uses_default_wallbuy_fx ) ) + if (!(isdefined(level._uses_default_wallbuy_fx) && !level._uses_default_wallbuy_fx)) { - level._effect["870mcs_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_870mcs" ); - level._effect["ak74u_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_ak74u" ); - level._effect["beretta93r_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_berreta93r" ); - level._effect["bowie_knife_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_bowie" ); - level._effect["claymore_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_claymore" ); - level._effect["saritch_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_m14" ); - level._effect["m16_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_m16" ); - level._effect["mp5k_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_mp5k" ); - level._effect["ballista_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_olympia" ); + level._effect["870mcs_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_870mcs"); + level._effect["ak74u_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_ak74u"); + level._effect["beretta93r_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_berreta93r"); + level._effect["bowie_knife_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_bowie"); + level._effect["claymore_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_claymore"); + level._effect["saritch_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_m14"); + level._effect["m16_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_m16"); + level._effect["mp5k_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_mp5k"); + level._effect["ballista_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_olympia"); } - if ( !( isdefined( level._uses_sticky_grenades ) && !level._uses_sticky_grenades ) ) + if (!(isdefined(level._uses_sticky_grenades) && !level._uses_sticky_grenades)) { - if ( !( isdefined( level.disable_fx_zmb_wall_buy_semtex ) && level.disable_fx_zmb_wall_buy_semtex ) ) - level._effect["sticky_grenade_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_semtex" ); + if (!(isdefined(level.disable_fx_zmb_wall_buy_semtex) && level.disable_fx_zmb_wall_buy_semtex)) + level._effect["sticky_grenade_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_semtex"); } - if ( !( isdefined( level._uses_taser_knuckles ) && !level._uses_taser_knuckles ) ) - level._effect["tazer_knuckles_zm_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_taseknuck" ); + if (!(isdefined(level._uses_taser_knuckles) && !level._uses_taser_knuckles)) + level._effect["tazer_knuckles_zm_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_taseknuck"); - if ( isdefined( level.buildable_wallbuy_weapons ) ) - level._effect["dynamic_wallbuy_fx"] = loadfx( "maps/zombie/fx_zmb_wall_buy_question" ); + if (isdefined(level.buildable_wallbuy_weapons)) + level._effect["dynamic_wallbuy_fx"] = loadfx("maps/zombie/fx_zmb_wall_buy_question"); - if ( !( isdefined( level.disable_fx_upgrade_aquired ) && level.disable_fx_upgrade_aquired ) ) - level._effect["upgrade_aquired"] = loadfx( "maps/zombie/fx_zmb_tanzit_upgrade" ); + if (!(isdefined(level.disable_fx_upgrade_aquired) && level.disable_fx_upgrade_aquired)) + level._effect["upgrade_aquired"] = loadfx("maps/zombie/fx_zmb_tanzit_upgrade"); } round_start() diff --git a/scripts/zm/replaced/_zm_afterlife.gsc b/scripts/zm/replaced/_zm_afterlife.gsc index 3e8942a8..6d9f7dd0 100644 --- a/scripts/zm/replaced/_zm_afterlife.gsc +++ b/scripts/zm/replaced/_zm_afterlife.gsc @@ -623,62 +623,62 @@ afterlife_save_loadout() self.loadout.score = self.score; self.loadout.current_weapon = 0; - foreach ( index, weapon in primaries ) + foreach (index, weapon in primaries) { self.loadout.weapons[index] = weapon; - self.loadout.stockcount[index] = self getweaponammostock( weapon ); - self.loadout.clipcount[index] = self getweaponammoclip( weapon ); + self.loadout.stockcount[index] = self getweaponammostock(weapon); + self.loadout.clipcount[index] = self getweaponammoclip(weapon); - if ( weaponisdualwield( weapon ) ) + if (weaponisdualwield(weapon)) { - weapon_dw = weapondualwieldweaponname( weapon ); - self.loadout.clipcount2[index] = self getweaponammoclip( weapon_dw ); + weapon_dw = weapondualwieldweaponname(weapon); + self.loadout.clipcount2[index] = self getweaponammoclip(weapon_dw); } - weapon_alt = weaponaltweaponname( weapon ); + weapon_alt = weaponaltweaponname(weapon); - if ( weapon_alt != "none" ) + if (weapon_alt != "none") { - self.loadout.stockcountalt[index] = self getweaponammostock( weapon_alt ); - self.loadout.clipcountalt[index] = self getweaponammoclip( weapon_alt ); + self.loadout.stockcountalt[index] = self getweaponammostock(weapon_alt); + self.loadout.clipcountalt[index] = self getweaponammoclip(weapon_alt); } - if ( weapon == currentweapon ) + if (weapon == currentweapon) self.loadout.current_weapon = index; } self.loadout.equipment = self get_player_equipment(); - if ( isdefined( self.loadout.equipment ) ) - self equipment_take( self.loadout.equipment ); + if (isdefined(self.loadout.equipment)) + self equipment_take(self.loadout.equipment); - if ( self hasweapon( "claymore_zm" ) ) + if (self hasweapon("claymore_zm")) { self.loadout.hasclaymore = 1; - self.loadout.claymoreclip = self getweaponammoclip( "claymore_zm" ); + self.loadout.claymoreclip = self getweaponammoclip("claymore_zm"); } - if ( self hasweapon( "bouncing_tomahawk_zm" ) || self hasweapon( "upgraded_tomahawk_zm" ) ) + if (self hasweapon("bouncing_tomahawk_zm") || self hasweapon("upgraded_tomahawk_zm")) { self.loadout.hastomahawk = 1; - self setclientfieldtoplayer( "tomahawk_in_use", 0 ); + self setclientfieldtoplayer("tomahawk_in_use", 0); } - else if ( self hasweapon( "willy_pete_zm" ) ) + else if (self hasweapon("willy_pete_zm")) { self.loadout.hassmoke = 1; - self.loadout.smokeclip = self getweaponammoclip( "willy_pete_zm" ); + self.loadout.smokeclip = self getweaponammoclip("willy_pete_zm"); } - self.loadout.perks = afterlife_save_perks( self ); + self.loadout.perks = afterlife_save_perks(self); lethal_grenade = self get_player_lethal_grenade(); - if ( self hasweapon( lethal_grenade ) ) - self.loadout.grenade = self getweaponammoclip( lethal_grenade ); + if (self hasweapon(lethal_grenade)) + self.loadout.grenade = self getweaponammoclip(lethal_grenade); else self.loadout.grenade = 0; self.loadout.lethal_grenade = lethal_grenade; - self set_player_lethal_grenade( undefined ); + self set_player_lethal_grenade(undefined); } afterlife_give_loadout() diff --git a/scripts/zm/replaced/_zm_ai_avogadro.gsc b/scripts/zm/replaced/_zm_ai_avogadro.gsc index dba0d1bc..ccb5f59a 100644 --- a/scripts/zm/replaced/_zm_ai_avogadro.gsc +++ b/scripts/zm/replaced/_zm_ai_avogadro.gsc @@ -195,38 +195,38 @@ cloud_update_fx() } } -avogadro_damage_func( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime, boneindex ) +avogadro_damage_func(einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime, boneindex) { - if ( self.state == "exiting" || self.state == "phasing" ) + if (self.state == "exiting" || self.state == "phasing") { return false; } - if ( smeansofdeath == "MOD_MELEE" ) + if (smeansofdeath == "MOD_MELEE") { - if ( isplayer( einflictor ) ) + if (isplayer(einflictor)) { - if ( self.shield ) + if (self.shield) { einflictor.avogadro_melee_time = gettime(); - maps\mp\_visionset_mgr::vsmgr_activate( "overlay", "zm_ai_avogadro_electrified", einflictor, 0.25, 1 ); - einflictor shellshock( "electrocution", 0.25 ); - einflictor notify( "avogadro_damage_taken" ); + maps\mp\_visionset_mgr::vsmgr_activate("overlay", "zm_ai_avogadro_electrified", einflictor, 0.25, 1); + einflictor shellshock("electrocution", 0.25); + einflictor notify("avogadro_damage_taken"); } - if ( sweapon == "riotshield_zm" ) + if (sweapon == "riotshield_zm") { shield_damage = level.zombie_vars["riotshield_fling_damage_shield"]; - einflictor maps\mp\zombies\_zm_weap_riotshield::player_damage_shield( shield_damage, 0 ); + einflictor maps\mp\zombies\_zm_weap_riotshield::player_damage_shield(shield_damage, 0); } } - if ( !self.shield ) + if (!self.shield) { self.shield = 1; - self notify( "melee_pain" ); + self notify("melee_pain"); - if ( issubstr( sweapon, "tazer_knuckles_zm" ) ) + if (issubstr(sweapon, "tazer_knuckles_zm")) { self.hit_by_melee += 2; } @@ -235,18 +235,18 @@ avogadro_damage_func( einflictor, eattacker, idamage, idflags, smeansofdeath, sw self.hit_by_melee++; } - self thread avogadro_pain( einflictor ); + self thread avogadro_pain(einflictor); - if ( isplayer( einflictor ) ) + if (isplayer(einflictor)) { - einflictor thread do_player_general_vox( "general", "avogadro_wound", 30, 35 ); - level notify( "avogadro_stabbed", self ); + einflictor thread do_player_general_vox("general", "avogadro_wound", 30, 35); + level notify("avogadro_stabbed", self); } } } else { - self update_damage_absorbed( idamage ); + self update_damage_absorbed(idamage); } return false; diff --git a/scripts/zm/replaced/_zm_ai_brutus.gsc b/scripts/zm/replaced/_zm_ai_brutus.gsc index 75f28033..dbde3731 100644 --- a/scripts/zm/replaced/_zm_ai_brutus.gsc +++ b/scripts/zm/replaced/_zm_ai_brutus.gsc @@ -415,7 +415,7 @@ get_brutus_spawn_pos_val(brutus_pos) score += n_score_addition; } - if ( !level.brutus_in_grief ) + if (!level.brutus_in_grief) { interaction_types = getarraykeys(level.interaction_types); interact_array = level.interaction_types; diff --git a/scripts/zm/replaced/_zm_chugabud.gsc b/scripts/zm/replaced/_zm_chugabud.gsc index 0af46146..ce5f07d1 100644 --- a/scripts/zm/replaced/_zm_chugabud.gsc +++ b/scripts/zm/replaced/_zm_chugabud.gsc @@ -282,8 +282,8 @@ chugabud_give_loadout() chugabud_restore_melee_weapon() { - self giveweapon( self.loadout.melee_weapon ); - self set_player_melee_weapon( self.loadout.melee_weapon ); + self giveweapon(self.loadout.melee_weapon); + self set_player_melee_weapon(self.loadout.melee_weapon); self giveweapon("held_" + self.loadout.melee_weapon); self setactionslot(2, "weapon", "held_" + self.loadout.melee_weapon); } diff --git a/scripts/zm/replaced/_zm_game_module_meat_utility.gsc b/scripts/zm/replaced/_zm_game_module_meat_utility.gsc index 5559c5cd..42314a7f 100644 --- a/scripts/zm/replaced/_zm_game_module_meat_utility.gsc +++ b/scripts/zm/replaced/_zm_game_module_meat_utility.gsc @@ -21,12 +21,12 @@ init_item_meat(gametype) set_gamemode_var_once("item_meat_model", "t6_wpn_zmb_meat_world"); } - level._effect["meat_impact"] = loadfx( "maps/zombie/fx_zmb_meat_impact" ); - level._effect["spawn_cloud"] = loadfx( "maps/zombie/fx_zmb_race_zombie_spawn_cloud" ); - level._effect["meat_stink_camera"] = loadfx( "maps/zombie/fx_zmb_meat_stink_camera" ); - level._effect["meat_stink_torso"] = loadfx( "maps/zombie/fx_zmb_meat_stink_torso" ); - include_powerup( "meat_stink" ); - maps\mp\zombies\_zm_powerups::add_zombie_powerup( "meat_stink", get_gamemode_var("item_meat_model"), &"ZOMBIE_POWERUP_MAX_AMMO", ::func_should_drop_meat, 1, 0, 0 ); + level._effect["meat_impact"] = loadfx("maps/zombie/fx_zmb_meat_impact"); + level._effect["spawn_cloud"] = loadfx("maps/zombie/fx_zmb_race_zombie_spawn_cloud"); + level._effect["meat_stink_camera"] = loadfx("maps/zombie/fx_zmb_meat_stink_camera"); + level._effect["meat_stink_torso"] = loadfx("maps/zombie/fx_zmb_meat_stink_torso"); + include_powerup("meat_stink"); + maps\mp\zombies\_zm_powerups::add_zombie_powerup("meat_stink", get_gamemode_var("item_meat_model"), &"ZOMBIE_POWERUP_MAX_AMMO", ::func_should_drop_meat, 1, 0, 0); precacheitem(get_gamemode_var("item_meat_name")); set_gamemode_var_once("start_item_meat_name", get_gamemode_var("item_meat_name")); diff --git a/scripts/zm/replaced/_zm_melee_weapon.gsc b/scripts/zm/replaced/_zm_melee_weapon.gsc index bf0fc19c..0d2991c8 100644 --- a/scripts/zm/replaced/_zm_melee_weapon.gsc +++ b/scripts/zm/replaced/_zm_melee_weapon.gsc @@ -4,68 +4,68 @@ #include maps\mp\zombies\_zm_utility; #include maps\mp\zombies\_zm_weapons; -init( weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn ) +init(weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn) { - precacheitem( weapon_name ); - precacheitem( flourish_weapon_name ); - precacheitem( "held_" + weapon_name ); - add_melee_weapon( weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn ); - melee_weapon_triggers = getentarray( wallbuy_targetname, "targetname" ); + precacheitem(weapon_name); + precacheitem(flourish_weapon_name); + precacheitem("held_" + weapon_name); + add_melee_weapon(weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn); + melee_weapon_triggers = getentarray(wallbuy_targetname, "targetname"); - for ( i = 0; i < melee_weapon_triggers.size; i++ ) + for (i = 0; i < melee_weapon_triggers.size; i++) { - knife_model = getent( melee_weapon_triggers[i].target, "targetname" ); + knife_model = getent(melee_weapon_triggers[i].target, "targetname"); - if ( isdefined( knife_model ) ) + if (isdefined(knife_model)) knife_model hide(); - melee_weapon_triggers[i] thread melee_weapon_think( weapon_name, cost, flourish_fn, vo_dialog_id, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name ); + melee_weapon_triggers[i] thread melee_weapon_think(weapon_name, cost, flourish_fn, vo_dialog_id, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name); - if ( !( isdefined( level.monolingustic_prompt_format ) && level.monolingustic_prompt_format ) ) + if (!(isdefined(level.monolingustic_prompt_format) && level.monolingustic_prompt_format)) { - melee_weapon_triggers[i] sethintstring( hint_string, cost ); + melee_weapon_triggers[i] sethintstring(hint_string, cost); cursor_hint = "HINT_WEAPON"; cursor_hint_weapon = weapon_name; - melee_weapon_triggers[i] setcursorhint( cursor_hint, cursor_hint_weapon ); + melee_weapon_triggers[i] setcursorhint(cursor_hint, cursor_hint_weapon); } else { - weapon_display = get_weapon_display_name( weapon_name ); + weapon_display = get_weapon_display_name(weapon_name); hint_string = &"ZOMBIE_WEAPONCOSTONLY"; - melee_weapon_triggers[i] sethintstring( hint_string, weapon_display, cost ); + melee_weapon_triggers[i] sethintstring(hint_string, weapon_display, cost); cursor_hint = "HINT_WEAPON"; cursor_hint_weapon = weapon_name; - melee_weapon_triggers[i] setcursorhint( cursor_hint, cursor_hint_weapon ); + melee_weapon_triggers[i] setcursorhint(cursor_hint, cursor_hint_weapon); } melee_weapon_triggers[i] usetriggerrequirelookat(); } - melee_weapon_structs = getstructarray( wallbuy_targetname, "targetname" ); + melee_weapon_structs = getstructarray(wallbuy_targetname, "targetname"); - for ( i = 0; i < melee_weapon_structs.size; i++ ) - prepare_stub( melee_weapon_structs[i].trigger_stub, weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn ); + for (i = 0; i < melee_weapon_structs.size; i++) + prepare_stub(melee_weapon_structs[i].trigger_stub, weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn); - register_melee_weapon_for_level( weapon_name ); + register_melee_weapon_for_level(weapon_name); - if ( !isdefined( level.ballistic_weapon_name ) ) + if (!isdefined(level.ballistic_weapon_name)) level.ballistic_weapon_name = []; level.ballistic_weapon_name[weapon_name] = ballistic_weapon_name; - if ( !isdefined( level.ballistic_upgraded_weapon_name ) ) + if (!isdefined(level.ballistic_upgraded_weapon_name)) level.ballistic_upgraded_weapon_name = []; level.ballistic_upgraded_weapon_name[weapon_name] = ballistic_upgraded_weapon_name; } -prepare_stub( stub, weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn ) +prepare_stub(stub, weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn) { - if ( isdefined( stub ) ) + if (isdefined(stub)) { - if ( !( isdefined( level.monolingustic_prompt_format ) && level.monolingustic_prompt_format ) ) + if (!(isdefined(level.monolingustic_prompt_format) && level.monolingustic_prompt_format)) { stub.hint_string = hint_string; @@ -74,7 +74,7 @@ prepare_stub( stub, weapon_name, flourish_weapon_name, ballistic_weapon_name, ba } else { - stub.hint_parm1 = get_weapon_display_name( weapon_name ); + stub.hint_parm1 = get_weapon_display_name(weapon_name); stub.hint_parm2 = cost; stub.hint_string = &"ZOMBIE_WEAPONCOSTONLY"; diff --git a/scripts/zm/replaced/_zm_perk_divetonuke.gsc b/scripts/zm/replaced/_zm_perk_divetonuke.gsc index 0a970624..036542dc 100644 --- a/scripts/zm/replaced/_zm_perk_divetonuke.gsc +++ b/scripts/zm/replaced/_zm_perk_divetonuke.gsc @@ -6,17 +6,17 @@ #include maps\mp\zombies\_zm_perks; #include maps\mp\_visionset_mgr; -divetonuke_explode( attacker, origin ) +divetonuke_explode(attacker, origin) { radius = level.zombie_vars["zombie_perk_divetonuke_radius"]; min_damage = level.zombie_vars["zombie_perk_divetonuke_min_damage"]; max_damage = level.zombie_vars["zombie_perk_divetonuke_max_damage"]; - radiusdamage( origin, radius, max_damage, min_damage, attacker, "MOD_GRENADE_SPLASH", "zombie_perk_bottle_nuke" ); + radiusdamage(origin, radius, max_damage, min_damage, attacker, "MOD_GRENADE_SPLASH", "zombie_perk_bottle_nuke"); - playfx( level._effect["divetonuke_groundhit"], origin ); - attacker playsound( "zmb_phdflop_explo" ); - maps\mp\_visionset_mgr::vsmgr_activate( "visionset", "zm_perk_divetonuke", attacker ); + playfx(level._effect["divetonuke_groundhit"], origin); + attacker playsound("zmb_phdflop_explo"); + maps\mp\_visionset_mgr::vsmgr_activate("visionset", "zm_perk_divetonuke", attacker); wait 1; - maps\mp\_visionset_mgr::vsmgr_deactivate( "visionset", "zm_perk_divetonuke", attacker ); + maps\mp\_visionset_mgr::vsmgr_deactivate("visionset", "zm_perk_divetonuke", attacker); } \ No newline at end of file diff --git a/scripts/zm/replaced/_zm_spawner.gsc b/scripts/zm/replaced/_zm_spawner.gsc index f70a993c..4660c25f 100644 --- a/scripts/zm/replaced/_zm_spawner.gsc +++ b/scripts/zm/replaced/_zm_spawner.gsc @@ -308,21 +308,21 @@ zombie_gib_on_damage() } } -zombie_should_gib( amount, attacker, type ) +zombie_should_gib(amount, attacker, type) { - if ( !is_mature() ) + if (!is_mature()) return false; - if ( !isdefined( type ) ) + if (!isdefined(type)) return false; - if ( isdefined( self.is_on_fire ) && self.is_on_fire ) + if (isdefined(self.is_on_fire) && self.is_on_fire) return false; - if ( isdefined( self.no_gib ) && self.no_gib == 1 ) + if (isdefined(self.no_gib) && self.no_gib == 1) return false; - switch ( type ) + switch (type) { case "MOD_UNKNOWN": case "MOD_TRIGGER_HURT": @@ -337,38 +337,38 @@ zombie_should_gib( amount, attacker, type ) return false; } - if ( type == "MOD_PISTOL_BULLET" || type == "MOD_RIFLE_BULLET" ) + if (type == "MOD_PISTOL_BULLET" || type == "MOD_RIFLE_BULLET") { - if ( !isdefined( attacker ) || !isplayer( attacker ) ) + if (!isdefined(attacker) || !isplayer(attacker)) return false; weapon = attacker getcurrentweapon(); - if ( weapon == "none" || weapon == level.start_weapon ) + if (weapon == "none" || weapon == level.start_weapon) return false; - if ( weaponisgasweapon( self.weapon ) ) + if (weaponisgasweapon(self.weapon)) return false; } - else if ( type == "MOD_PROJECTILE" ) + else if (type == "MOD_PROJECTILE") { - if ( isdefined( attacker ) && isplayer( attacker ) ) + if (isdefined(attacker) && isplayer(attacker)) { weapon = attacker getcurrentweapon(); - if ( weapon == "slipgun_zm" || weapon == "slipgun_upgraded_zm" ) + if (weapon == "slipgun_zm" || weapon == "slipgun_upgraded_zm") return false; } } prev_health = amount + self.health; - if ( prev_health <= 0 ) + if (prev_health <= 0) prev_health = 1; damage_percent = amount / prev_health * 100; - if ( damage_percent < 25 ) + if (damage_percent < 25) return false; return true; @@ -489,60 +489,60 @@ zombie_death_animscript() team = undefined; recalc_zombie_array(); - if ( isdefined( self._race_team ) ) + if (isdefined(self._race_team)) team = self._race_team; self reset_attack_spot(); - if ( self check_zombie_death_animscript_callbacks() ) + if (self check_zombie_death_animscript_callbacks()) return false; - if ( isdefined( level.zombie_death_animscript_override ) ) - self [[ level.zombie_death_animscript_override ]](); + if (isdefined(level.zombie_death_animscript_override)) + self [[level.zombie_death_animscript_override]](); - if ( self.has_legs && isdefined( self.a.gib_ref ) && self.a.gib_ref == "no_legs" ) + if (self.has_legs && isdefined(self.a.gib_ref) && self.a.gib_ref == "no_legs") self.deathanim = "zm_death"; self.grenadeammo = 0; - if ( isdefined( self.nuked ) ) + if (isdefined(self.nuked)) { - if ( zombie_can_drop_powerups( self ) ) + if (zombie_can_drop_powerups(self)) { - if ( isdefined( self.in_the_ground ) && self.in_the_ground == 1 ) + if (isdefined(self.in_the_ground) && self.in_the_ground == 1) { - trace = bullettrace( self.origin + vectorscale( ( 0, 0, 1 ), 100.0 ), self.origin + vectorscale( ( 0, 0, -1 ), 100.0 ), 0, undefined ); + trace = bullettrace(self.origin + vectorscale((0, 0, 1), 100.0), self.origin + vectorscale((0, 0, -1), 100.0), 0, undefined); origin = trace["position"]; - level thread zombie_delay_powerup_drop( origin ); + level thread zombie_delay_powerup_drop(origin); } else { - trace = groundtrace( self.origin + vectorscale( ( 0, 0, 1 ), 5.0 ), self.origin + vectorscale( ( 0, 0, -1 ), 300.0 ), 0, undefined ); + trace = groundtrace(self.origin + vectorscale((0, 0, 1), 5.0), self.origin + vectorscale((0, 0, -1), 300.0), 0, undefined); origin = trace["position"]; - level thread zombie_delay_powerup_drop( self.origin ); + level thread zombie_delay_powerup_drop(self.origin); } } } else - level zombie_death_points( self.origin, self.damagemod, self.damagelocation, self.attacker, self, team ); + level zombie_death_points(self.origin, self.damagemod, self.damagelocation, self.attacker, self, team); - if ( isdefined( self.attacker ) && isai( self.attacker ) ) - self.attacker notify( "killed", self ); + if (isdefined(self.attacker) && isai(self.attacker)) + self.attacker notify("killed", self); - if ( "rottweil72_upgraded_zm" == self.damageweapon && "MOD_RIFLE_BULLET" == self.damagemod ) + if ("rottweil72_upgraded_zm" == self.damageweapon && "MOD_RIFLE_BULLET" == self.damagemod) self thread dragons_breath_flame_death_fx(); - if ( issubstr( self.damageweapon, "tazer_knuckles_zm" ) && "MOD_MELEE" == self.damagemod ) + if (issubstr(self.damageweapon, "tazer_knuckles_zm") && "MOD_MELEE" == self.damagemod) { self.is_on_fire = 0; - self notify( "stop_flame_damage" ); + self notify("stop_flame_damage"); } - if ( self.damagemod == "MOD_BURNED" ) + if (self.damagemod == "MOD_BURNED") self thread maps\mp\animscripts\zm_death::flame_death_fx(); - if ( self.damagemod == "MOD_GRENADE" || self.damagemod == "MOD_GRENADE_SPLASH" ) - level notify( "zombie_grenade_death", self.origin ); + if (self.damagemod == "MOD_GRENADE" || self.damagemod == "MOD_GRENADE_SPLASH") + level notify("zombie_grenade_death", self.origin); return false; } diff --git a/scripts/zm/replaced/_zm_utility.gsc b/scripts/zm/replaced/_zm_utility.gsc index 71b5d377..4cd2ff44 100644 --- a/scripts/zm/replaced/_zm_utility.gsc +++ b/scripts/zm/replaced/_zm_utility.gsc @@ -19,24 +19,24 @@ init_player_offhand_weapons() init_player_equipment(); } -give_start_weapon( switch_to_weapon ) +give_start_weapon(switch_to_weapon) { - if ( !self hasweapon( level.zombie_melee_weapon_player_init ) ) + if (!self hasweapon(level.zombie_melee_weapon_player_init)) { - self giveweapon( level.zombie_melee_weapon_player_init ); + self giveweapon(level.zombie_melee_weapon_player_init); } - if ( !self hasweapon( "held_" + level.zombie_melee_weapon_player_init ) ) + if (!self hasweapon("held_" + level.zombie_melee_weapon_player_init)) { - self giveweapon( "held_" + level.zombie_melee_weapon_player_init ); - self setactionslot( 2, "weapon", "held_" + level.zombie_melee_weapon_player_init ); + self giveweapon("held_" + level.zombie_melee_weapon_player_init); + self setactionslot(2, "weapon", "held_" + level.zombie_melee_weapon_player_init); } - self giveweapon( level.start_weapon ); - self givestartammo( level.start_weapon ); + self giveweapon(level.start_weapon); + self givestartammo(level.start_weapon); - if ( isdefined( switch_to_weapon ) && switch_to_weapon ) - self switchtoweapon( level.start_weapon ); + if (isdefined(switch_to_weapon) && switch_to_weapon) + self switchtoweapon(level.start_weapon); } is_headshot(sweapon, shitloc, smeansofdeath) diff --git a/scripts/zm/replaced/_zm_weap_ballistic_knife.gsc b/scripts/zm/replaced/_zm_weap_ballistic_knife.gsc index 334957d2..67ca0d40 100644 --- a/scripts/zm/replaced/_zm_weap_ballistic_knife.gsc +++ b/scripts/zm/replaced/_zm_weap_ballistic_knife.gsc @@ -5,13 +5,13 @@ init() { - if ( !isdefined( level.ballistic_knife_autorecover ) ) + if (!isdefined(level.ballistic_knife_autorecover)) level.ballistic_knife_autorecover = 1; - if ( isdefined( level._uses_retrievable_ballisitic_knives ) && level._uses_retrievable_ballisitic_knives == 1 ) + if (isdefined(level._uses_retrievable_ballisitic_knives) && level._uses_retrievable_ballisitic_knives == 1) { - precachemodel( "t6_wpn_ballistic_knife_projectile" ); - precachemodel( "t6_wpn_ballistic_knife_blade_retrieve" ); + precachemodel("t6_wpn_ballistic_knife_projectile"); + precachemodel("t6_wpn_ballistic_knife_blade_retrieve"); } } @@ -143,7 +143,7 @@ watch_use_trigger(trigger, model, callback, weapon, playersoundonuse, npcsoundon } } -pick_up( weapon, model, trigger ) +pick_up(weapon, model, trigger) { if (!self hasweapon(weapon)) { @@ -159,26 +159,26 @@ pick_up( weapon, model, trigger ) current_weapon = self getcurrentweapon(); - if ( current_weapon != weapon ) + if (current_weapon != weapon) { - clip_ammo = self getweaponammoclip( weapon ); + clip_ammo = self getweaponammoclip(weapon); - if ( !clip_ammo ) - self setweaponammoclip( weapon, 1 ); + if (!clip_ammo) + self setweaponammoclip(weapon, 1); else { - new_ammo_stock = self getweaponammostock( weapon ) + 1; - self setweaponammostock( weapon, new_ammo_stock ); + new_ammo_stock = self getweaponammostock(weapon) + 1; + self setweaponammostock(weapon, new_ammo_stock); } } else { - new_ammo_stock = self getweaponammostock( weapon ) + 1; - self setweaponammostock( weapon, new_ammo_stock ); + new_ammo_stock = self getweaponammostock(weapon) + 1; + self setweaponammostock(weapon, new_ammo_stock); } - self maps\mp\zombies\_zm_stats::increment_client_stat( "ballistic_knives_pickedup" ); - self maps\mp\zombies\_zm_stats::increment_player_stat( "ballistic_knives_pickedup" ); + self maps\mp\zombies\_zm_stats::increment_client_stat("ballistic_knives_pickedup"); + self maps\mp\zombies\_zm_stats::increment_player_stat("ballistic_knives_pickedup"); model destroy_ent(); trigger destroy_ent(); } \ No newline at end of file diff --git a/scripts/zm/replaced/_zm_weap_cymbal_monkey.gsc b/scripts/zm/replaced/_zm_weap_cymbal_monkey.gsc index 779e03bf..0b41362c 100644 --- a/scripts/zm/replaced/_zm_weap_cymbal_monkey.gsc +++ b/scripts/zm/replaced/_zm_weap_cymbal_monkey.gsc @@ -9,15 +9,15 @@ init() { - if ( !cymbal_monkey_exists() ) + if (!cymbal_monkey_exists()) return; level.cymbal_monkey_model = "t6_wpn_zmb_monkey_bomb_world"; - level._effect["monkey_glow"] = loadfx( "maps/zombie/fx_zombie_monkey_light" ); - level._effect["grenade_samantha_steal"] = loadfx( "maps/zombie/fx_zmb_blackhole_trap_end" ); + level._effect["monkey_glow"] = loadfx("maps/zombie/fx_zombie_monkey_light"); + level._effect["grenade_samantha_steal"] = loadfx("maps/zombie/fx_zmb_blackhole_trap_end"); level.cymbal_monkeys = []; - scriptmodelsuseanimtree( #animtree ); + scriptmodelsuseanimtree(#animtree); } player_handle_cymbal_monkey() diff --git a/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc b/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc index 7d26044f..19b8e9c3 100644 --- a/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc +++ b/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc @@ -13,18 +13,18 @@ one_inch_punch_melee_attack() { - self endon( "disconnect" ); - self endon( "stop_one_inch_punch_attack" ); + self endon("disconnect"); + self endon("stop_one_inch_punch_attack"); - if ( !( isdefined( self.one_inch_punch_flag_has_been_init ) && self.one_inch_punch_flag_has_been_init ) ) - self ent_flag_init( "melee_punch_cooldown" ); + if (!(isdefined(self.one_inch_punch_flag_has_been_init) && self.one_inch_punch_flag_has_been_init)) + self ent_flag_init("melee_punch_cooldown"); self.one_inch_punch_flag_has_been_init = 1; punch_weapon = "one_inch_punch_zm"; flourish_weapon = "zombie_one_inch_punch_flourish"; - if ( isdefined( self.b_punch_upgraded ) && self.b_punch_upgraded ) + if (isdefined(self.b_punch_upgraded) && self.b_punch_upgraded) { punch_weapon = "one_inch_punch_" + self.str_punch_element + "_zm"; flourish_weapon = "zombie_one_inch_punch_upgrade_flourish"; @@ -32,17 +32,17 @@ one_inch_punch_melee_attack() current_melee_weapon = self get_player_melee_weapon(); str_weapon = self getcurrentweapon(); - self disable_player_move_states( 1 ); - self giveweapon( flourish_weapon ); - self switchtoweapon( flourish_weapon ); + self disable_player_move_states(1); + self giveweapon(flourish_weapon); + self switchtoweapon(flourish_weapon); - result = self waittill_any_return( "player_downed", "weapon_change" ); + result = self waittill_any_return("player_downed", "weapon_change"); - self takeweapon( current_melee_weapon ); - self takeweapon( "held_" + current_melee_weapon ); - self giveweapon( punch_weapon ); - self set_player_melee_weapon( punch_weapon ); - self giveweapon( "held_" + punch_weapon ); + self takeweapon(current_melee_weapon); + self takeweapon("held_" + current_melee_weapon); + self giveweapon(punch_weapon); + self set_player_melee_weapon(punch_weapon); + self giveweapon("held_" + punch_weapon); if (!self hasweapon("equip_dieseldrone_zm")) { @@ -51,24 +51,24 @@ one_inch_punch_melee_attack() if (result != "player_downed") { - self waittill_any( "player_downed", "weapon_change_complete" ); + self waittill_any("player_downed", "weapon_change_complete"); } if (is_melee_weapon(str_weapon)) { - self switchtoweapon( "held_" + punch_weapon ); + self switchtoweapon("held_" + punch_weapon); } else { - self switchtoweapon( str_weapon ); + self switchtoweapon(str_weapon); } - self takeweapon( flourish_weapon ); + self takeweapon(flourish_weapon); self enable_player_move_states(); - if ( !isdefined( self.b_punch_upgraded ) || !self.b_punch_upgraded ) + if (!isdefined(self.b_punch_upgraded) || !self.b_punch_upgraded) { - self thread maps\mp\zombies\_zm_audio::create_and_play_dialog( "perk", "one_inch" ); + self thread maps\mp\zombies\_zm_audio::create_and_play_dialog("perk", "one_inch"); } self thread monitor_melee_swipe(); diff --git a/scripts/zm/replaced/_zm_weapons.gsc b/scripts/zm/replaced/_zm_weapons.gsc index 8f42ec52..d009589c 100644 --- a/scripts/zm/replaced/_zm_weapons.gsc +++ b/scripts/zm/replaced/_zm_weapons.gsc @@ -869,5 +869,5 @@ createballisticknifewatcher_zm(name, weapon) give_fallback_weapon() { - self switchtoweapon( "held_" + self get_player_melee_weapon() ); + self switchtoweapon("held_" + self get_player_melee_weapon()); } \ No newline at end of file diff --git a/scripts/zm/replaced/zgrief.gsc b/scripts/zm/replaced/zgrief.gsc index cab42b57..ab860f46 100644 --- a/scripts/zm/replaced/zgrief.gsc +++ b/scripts/zm/replaced/zgrief.gsc @@ -15,11 +15,11 @@ postinit_func() level.powerup_drop_count = 0; level.is_zombie_level = 1; - setmatchtalkflag( "DeadChatWithDead", 1 ); - setmatchtalkflag( "DeadChatWithTeam", 1 ); - setmatchtalkflag( "DeadHearTeamLiving", 1 ); - setmatchtalkflag( "DeadHearAllLiving", 1 ); - setmatchtalkflag( "EveryoneHearsEveryone", 1 ); + setmatchtalkflag("DeadChatWithDead", 1); + setmatchtalkflag("DeadChatWithTeam", 1); + setmatchtalkflag("DeadHearTeamLiving", 1); + setmatchtalkflag("DeadHearAllLiving", 1); + setmatchtalkflag("EveryoneHearsEveryone", 1); } game_mode_spawn_player_logic() diff --git a/scripts/zm/replaced/zm_buried_buildables.gsc b/scripts/zm/replaced/zm_buried_buildables.gsc index e95680f4..91ffbd93 100644 --- a/scripts/zm/replaced/zm_buried_buildables.gsc +++ b/scripts/zm/replaced/zm_buried_buildables.gsc @@ -14,19 +14,19 @@ #include maps\mp\zombies\_zm_weap_claymore; #include maps\mp\zombies\_zm_unitrigger; -init_buildables( buildablesenabledlist ) +init_buildables(buildablesenabledlist) { - registerclientfield( "scriptmover", "buildable_glint_fx", 12000, 1, "int" ); - precacheitem( "chalk_draw_zm" ); - precacheitem( "no_hands_zm" ); - level._effect["wallbuy_replace"] = loadfx( "maps/zombie_buried/fx_buried_booze_candy_spawn" ); - level._effect["wallbuy_drawing"] = loadfx( "maps/zombie/fx_zmb_wall_dyn_chalk_drawing" ); + registerclientfield("scriptmover", "buildable_glint_fx", 12000, 1, "int"); + precacheitem("chalk_draw_zm"); + precacheitem("no_hands_zm"); + level._effect["wallbuy_replace"] = loadfx("maps/zombie_buried/fx_buried_booze_candy_spawn"); + level._effect["wallbuy_drawing"] = loadfx("maps/zombie/fx_zmb_wall_dyn_chalk_drawing"); level.str_buildables_build = &"ZOMBIE_BUILD_SQ_COMMON"; level.str_buildables_building = &"ZOMBIE_BUILDING_SQ_COMMON"; level.str_buildables_grab_part = &"ZOMBIE_BUILD_PIECE_GRAB"; level.str_buildables_swap_part = &"ZOMBIE_BUILD_PIECE_SWITCH"; level.safe_place_for_buildable_piece = ::safe_place_for_buildable_piece; - level.buildable_slot_count = max( 1, 2 ) + 1; + level.buildable_slot_count = max(1, 2) + 1; level.buildable_clientfields = []; level.buildable_clientfields[0] = "buildable"; level.buildable_clientfields[1] = "buildable" + "_pu"; @@ -34,79 +34,79 @@ init_buildables( buildablesenabledlist ) level.buildable_piece_counts[0] = 15; level.buildable_piece_counts[1] = 4; - if ( -1 ) + if (-1) { level.buildable_clientfields[2] = "buildable" + "_sq"; level.buildable_piece_counts[2] = 13; } - if ( isinarray( buildablesenabledlist, "sq_common" ) ) - add_zombie_buildable( "sq_common", level.str_buildables_build, level.str_buildables_building ); + if (isinarray(buildablesenabledlist, "sq_common")) + add_zombie_buildable("sq_common", level.str_buildables_build, level.str_buildables_building); - if ( isinarray( buildablesenabledlist, "buried_sq_tpo_switch" ) ) - add_zombie_buildable( "buried_sq_tpo_switch", level.str_buildables_build, level.str_buildables_building ); + if (isinarray(buildablesenabledlist, "buried_sq_tpo_switch")) + add_zombie_buildable("buried_sq_tpo_switch", level.str_buildables_build, level.str_buildables_building); - if ( isinarray( buildablesenabledlist, "buried_sq_ghost_lamp" ) ) - add_zombie_buildable( "buried_sq_ghost_lamp", level.str_buildables_build, level.str_buildables_building ); + if (isinarray(buildablesenabledlist, "buried_sq_ghost_lamp")) + add_zombie_buildable("buried_sq_ghost_lamp", level.str_buildables_build, level.str_buildables_building); - if ( isinarray( buildablesenabledlist, "buried_sq_bt_m_tower" ) ) - add_zombie_buildable( "buried_sq_bt_m_tower", &"ZM_BURIED_BUILD_MTOWER", level.str_buildables_building ); + if (isinarray(buildablesenabledlist, "buried_sq_bt_m_tower")) + add_zombie_buildable("buried_sq_bt_m_tower", &"ZM_BURIED_BUILD_MTOWER", level.str_buildables_building); - if ( isinarray( buildablesenabledlist, "buried_sq_bt_r_tower" ) ) - add_zombie_buildable( "buried_sq_bt_r_tower", &"ZM_BURIED_BUILD_RTOWER", level.str_buildables_building ); + if (isinarray(buildablesenabledlist, "buried_sq_bt_r_tower")) + add_zombie_buildable("buried_sq_bt_r_tower", &"ZM_BURIED_BUILD_RTOWER", level.str_buildables_building); - if ( isinarray( buildablesenabledlist, "buried_sq_oillamp" ) ) - add_zombie_buildable( "buried_sq_oillamp", level.str_buildables_build, level.str_buildables_building, &"NULL_EMPTY" ); + if (isinarray(buildablesenabledlist, "buried_sq_oillamp")) + add_zombie_buildable("buried_sq_oillamp", level.str_buildables_build, level.str_buildables_building, &"NULL_EMPTY"); - if ( isinarray( buildablesenabledlist, "turbine" ) ) + if (isinarray(buildablesenabledlist, "turbine")) { - add_zombie_buildable( "turbine", &"ZOMBIE_BUILD_TURBINE", level.str_buildables_building, &"ZOMBIE_BOUGHT_TURBINE" ); - add_zombie_buildable_vox_category( "turbine", "trb" ); + add_zombie_buildable("turbine", &"ZOMBIE_BUILD_TURBINE", level.str_buildables_building, &"ZOMBIE_BOUGHT_TURBINE"); + add_zombie_buildable_vox_category("turbine", "trb"); } - if ( isinarray( buildablesenabledlist, "springpad_zm" ) ) + if (isinarray(buildablesenabledlist, "springpad_zm")) { - add_zombie_buildable( "springpad_zm", &"ZM_BURIED_BUILD_SPRINGPAD", level.str_buildables_building, &"ZM_BURIED_BOUGHT_SPRINGPAD" ); - add_zombie_buildable_vox_category( "springpad_zm", "stm" ); + add_zombie_buildable("springpad_zm", &"ZM_BURIED_BUILD_SPRINGPAD", level.str_buildables_building, &"ZM_BURIED_BOUGHT_SPRINGPAD"); + add_zombie_buildable_vox_category("springpad_zm", "stm"); } - if ( isinarray( buildablesenabledlist, "subwoofer_zm" ) ) + if (isinarray(buildablesenabledlist, "subwoofer_zm")) { - add_zombie_buildable( "subwoofer_zm", &"ZM_BURIED_BUILD_SUBWOOFER", level.str_buildables_building, &"ZM_BURIED_BOUGHT_SUBWOOFER" ); - add_zombie_buildable_vox_category( "subwoofer_zm", "sw" ); + add_zombie_buildable("subwoofer_zm", &"ZM_BURIED_BUILD_SUBWOOFER", level.str_buildables_building, &"ZM_BURIED_BOUGHT_SUBWOOFER"); + add_zombie_buildable_vox_category("subwoofer_zm", "sw"); } - if ( isinarray( buildablesenabledlist, "headchopper_zm" ) ) + if (isinarray(buildablesenabledlist, "headchopper_zm")) { - add_zombie_buildable( "headchopper_zm", &"ZM_BURIED_BUILD_HEADCHOPPER", level.str_buildables_building, &"ZM_BURIED_BOUGHT_HEADCHOPPER" ); - add_zombie_buildable_vox_category( "headchopper_zm", "hc" ); + add_zombie_buildable("headchopper_zm", &"ZM_BURIED_BUILD_HEADCHOPPER", level.str_buildables_building, &"ZM_BURIED_BOUGHT_HEADCHOPPER"); + add_zombie_buildable_vox_category("headchopper_zm", "hc"); } - if ( isinarray( buildablesenabledlist, "booze" ) ) + if (isinarray(buildablesenabledlist, "booze")) { - add_zombie_buildable( "booze", &"ZM_BURIED_LEAVE_BOOZE", level.str_buildables_building, &"NULL_EMPTY" ); - add_zombie_buildable_piece_vox_category( "booze", "booze" ); + add_zombie_buildable("booze", &"ZM_BURIED_LEAVE_BOOZE", level.str_buildables_building, &"NULL_EMPTY"); + add_zombie_buildable_piece_vox_category("booze", "booze"); } - if ( isinarray( buildablesenabledlist, "candy" ) ) + if (isinarray(buildablesenabledlist, "candy")) { - add_zombie_buildable( "candy", &"ZM_BURIED_LEAVE_CANDY", level.str_buildables_building, &"NULL_EMPTY" ); - add_zombie_buildable_piece_vox_category( "candy", "candy" ); + add_zombie_buildable("candy", &"ZM_BURIED_LEAVE_CANDY", level.str_buildables_building, &"NULL_EMPTY"); + add_zombie_buildable_piece_vox_category("candy", "candy"); } - if ( isinarray( buildablesenabledlist, "chalk" ) ) + if (isinarray(buildablesenabledlist, "chalk")) { - add_zombie_buildable( "chalk", &"NULL_EMPTY", level.str_buildables_building, &"NULL_EMPTY" ); - add_zombie_buildable_piece_vox_category( "chalk", "gunshop_chalk", 300 ); + add_zombie_buildable("chalk", &"NULL_EMPTY", level.str_buildables_building, &"NULL_EMPTY"); + add_zombie_buildable_piece_vox_category("chalk", "gunshop_chalk", 300); } - if ( isinarray( buildablesenabledlist, "sloth" ) ) - add_zombie_buildable( "sloth", &"ZM_BURIED_BOOZE_GV", level.str_buildables_building, &"NULL_EMPTY" ); + if (isinarray(buildablesenabledlist, "sloth")) + add_zombie_buildable("sloth", &"ZM_BURIED_BOOZE_GV", level.str_buildables_building, &"NULL_EMPTY"); - if ( isinarray( buildablesenabledlist, "keys_zm" ) ) + if (isinarray(buildablesenabledlist, "keys_zm")) { - add_zombie_buildable( "keys_zm", &"ZM_BURIED_KEYS_BL", level.str_buildables_building, &"NULL_EMPTY" ); - add_zombie_buildable_piece_vox_category( "keys_zm", "key" ); + add_zombie_buildable("keys_zm", &"ZM_BURIED_KEYS_BL", level.str_buildables_building, &"NULL_EMPTY"); + add_zombie_buildable_piece_vox_category("keys_zm", "key"); } level thread chalk_host_migration(); @@ -114,20 +114,20 @@ init_buildables( buildablesenabledlist ) subwooferbuildable() { - stub = maps\mp\zombies\_zm_buildables::buildable_trigger_think( "subwoofer_zm_buildable_trigger", "subwoofer_zm", "equip_subwoofer_zm", &"ZM_BURIED_GRAB_SUBWOOFER", 1, 1 ); - maps\mp\zombies\_zm_buildables_pooled::add_buildable_to_pool( stub, "buried" ); + stub = maps\mp\zombies\_zm_buildables::buildable_trigger_think("subwoofer_zm_buildable_trigger", "subwoofer_zm", "equip_subwoofer_zm", &"ZM_BURIED_GRAB_SUBWOOFER", 1, 1); + maps\mp\zombies\_zm_buildables_pooled::add_buildable_to_pool(stub, "buried"); } springpadbuildable() { - stub = maps\mp\zombies\_zm_buildables::buildable_trigger_think( "springpad_zm_buildable_trigger", "springpad_zm", "equip_springpad_zm", &"ZM_BURIED_GRAB_SPRINGPAD", 1, 1 ); - maps\mp\zombies\_zm_buildables_pooled::add_buildable_to_pool( stub, "buried" ); + stub = maps\mp\zombies\_zm_buildables::buildable_trigger_think("springpad_zm_buildable_trigger", "springpad_zm", "equip_springpad_zm", &"ZM_BURIED_GRAB_SPRINGPAD", 1, 1); + maps\mp\zombies\_zm_buildables_pooled::add_buildable_to_pool(stub, "buried"); } headchopperbuildable() { - stub = maps\mp\zombies\_zm_buildables::buildable_trigger_think( "headchopper_buildable_trigger", "headchopper_zm", "equip_headchopper_zm", &"ZM_BURIED_GRAB_HEADCHOPPER", 1, 1 ); - maps\mp\zombies\_zm_buildables_pooled::add_buildable_to_pool( stub, "buried" ); + stub = maps\mp\zombies\_zm_buildables::buildable_trigger_think("headchopper_buildable_trigger", "headchopper_zm", "equip_headchopper_zm", &"ZM_BURIED_GRAB_HEADCHOPPER", 1, 1); + maps\mp\zombies\_zm_buildables_pooled::add_buildable_to_pool(stub, "buried"); } watch_cell_open_close(door) diff --git a/scripts/zm/replaced/zm_buried_sq_ts.gsc b/scripts/zm/replaced/zm_buried_sq_ts.gsc index e67da424..99c2dc05 100644 --- a/scripts/zm/replaced/zm_buried_sq_ts.gsc +++ b/scripts/zm/replaced/zm_buried_sq_ts.gsc @@ -43,17 +43,17 @@ ts_sign_check_all_activated(e_attacker, m_last_touched) } } -ts_is_bowie_knife( str_weapon ) +ts_is_bowie_knife(str_weapon) { - if ( str_weapon == "knife_ballistic_bowie_zm" || str_weapon == "knife_ballistic_bowie_upgraded_zm" || issubstr( str_weapon, "bowie_knife_zm" ) ) + if (str_weapon == "knife_ballistic_bowie_zm" || str_weapon == "knife_ballistic_bowie_upgraded_zm" || issubstr(str_weapon, "bowie_knife_zm")) return true; return false; } -ts_is_galvaknuckles( str_weapon ) +ts_is_galvaknuckles(str_weapon) { - if ( issubstr( str_weapon, "tazer_knuckles_zm" ) ) + if (issubstr(str_weapon, "tazer_knuckles_zm")) return true; return false; diff --git a/scripts/zm/replaced/zm_prison_spoon.gsc b/scripts/zm/replaced/zm_prison_spoon.gsc index 12e4b001..59f60df3 100644 --- a/scripts/zm/replaced/zm_prison_spoon.gsc +++ b/scripts/zm/replaced/zm_prison_spoon.gsc @@ -9,96 +9,96 @@ #include maps\mp\zombies\_zm_stats; #include maps\mp\zombies\_zm_audio; -give_player_spoon_upon_receipt( m_tomahawk, m_player_spoon ) +give_player_spoon_upon_receipt(m_tomahawk, m_player_spoon) { - while ( isdefined( m_tomahawk ) ) + while (isdefined(m_tomahawk)) wait 0.05; m_player_spoon delete(); - if ( !self hasweapon( "spoon_zm_alcatraz" ) && !self hasweapon( "spork_zm_alcatraz" ) && !( isdefined( self.spoon_in_tub ) && self.spoon_in_tub ) ) + if (!self hasweapon("spoon_zm_alcatraz") && !self hasweapon("spork_zm_alcatraz") && !(isdefined(self.spoon_in_tub) && self.spoon_in_tub)) { current_weapon = self getcurrentweapon(); - self giveweapon( "spoon_zm_alcatraz" ); - self set_player_melee_weapon( "spoon_zm_alcatraz" ); - self giveweapon( "held_spoon_zm_alcatraz" ); - self setactionslot( 2, "weapon", "held_spoon_zm_alcatraz" ); + self giveweapon("spoon_zm_alcatraz"); + self set_player_melee_weapon("spoon_zm_alcatraz"); + self giveweapon("held_spoon_zm_alcatraz"); + self setactionslot(2, "weapon", "held_spoon_zm_alcatraz"); if (is_melee_weapon(current_weapon)) { - self switchtoweapon( "held_spoon_zm_alcatraz" ); + self switchtoweapon("held_spoon_zm_alcatraz"); } - level thread maps\mp\zombies\_zm_audio::sndmusicstingerevent( "spoon", self ); + level thread maps\mp\zombies\_zm_audio::sndmusicstingerevent("spoon", self); weapons = self getweaponslist(); - for ( i = 0; i < weapons.size; i++ ) + for (i = 0; i < weapons.size; i++) { - if ( issubstr( weapons[i], "knife" ) ) - self takeweapon( weapons[i] ); + if (issubstr(weapons[i], "knife")) + self takeweapon(weapons[i]); } } weapons = self getweaponslist(); wait 1.0; - self thread do_player_general_vox( "quest", "pick_up_easter_egg" ); + self thread do_player_general_vox("quest", "pick_up_easter_egg"); } dip_the_spoon() { - self endon( "disconnect" ); - wait_for_bucket_activated( self ); + self endon("disconnect"); + wait_for_bucket_activated(self); current_weapon = self getcurrentweapon(); - self takeweapon( "spoon_zm_alcatraz" ); - self takeweapon( "held_spoon_zm_alcatraz" ); - self giveweapon( "knife_zm_alcatraz" ); - self set_player_melee_weapon( "knife_zm_alcatraz" ); - self giveweapon( "held_knife_zm_alcatraz" ); - self setactionslot( 2, "weapon", "held_knife_zm_alcatraz" ); + self takeweapon("spoon_zm_alcatraz"); + self takeweapon("held_spoon_zm_alcatraz"); + self giveweapon("knife_zm_alcatraz"); + self set_player_melee_weapon("knife_zm_alcatraz"); + self giveweapon("held_knife_zm_alcatraz"); + self setactionslot(2, "weapon", "held_knife_zm_alcatraz"); if (is_melee_weapon(current_weapon)) { - self switchtoweapon( "held_knife_zm_alcatraz" ); + self switchtoweapon("held_knife_zm_alcatraz"); } self.spoon_in_tub = 1; - self setclientfieldtoplayer( "spoon_visual_state", 1 ); + self setclientfieldtoplayer("spoon_visual_state", 1); wait 5; level.b_spoon_in_tub = 1; - flag_wait( "charged_spoon" ); + flag_wait("charged_spoon"); wait 1.0; - level.t_bathtub playsound( "zmb_easteregg_laugh" ); + level.t_bathtub playsound("zmb_easteregg_laugh"); self thread thrust_the_spork(); } thrust_the_spork() { - self endon( "disconnect" ); - wait_for_bucket_activated( self ); - self setclientfieldtoplayer( "spoon_visual_state", 2 ); + self endon("disconnect"); + wait_for_bucket_activated(self); + self setclientfieldtoplayer("spoon_visual_state", 2); wait 5; - wait_for_bucket_activated( self ); + wait_for_bucket_activated(self); current_weapon = self getcurrentweapon(); - self takeweapon( "knife_zm_alcatraz" ); - self takeweapon( "held_knife_zm_alcatraz" ); - self giveweapon( "spork_zm_alcatraz" ); - self set_player_melee_weapon( "spork_zm_alcatraz" ); - self giveweapon( "held_spork_zm_alcatraz" ); - self setactionslot( 2, "weapon", "held_spork_zm_alcatraz" ); + self takeweapon("knife_zm_alcatraz"); + self takeweapon("held_knife_zm_alcatraz"); + self giveweapon("spork_zm_alcatraz"); + self set_player_melee_weapon("spork_zm_alcatraz"); + self giveweapon("held_spork_zm_alcatraz"); + self setactionslot(2, "weapon", "held_spork_zm_alcatraz"); if (is_melee_weapon(current_weapon)) { - self switchtoweapon( "held_spork_zm_alcatraz" ); + self switchtoweapon("held_spork_zm_alcatraz"); } - level thread maps\mp\zombies\_zm_audio::sndmusicstingerevent( "spork", self ); + level thread maps\mp\zombies\_zm_audio::sndmusicstingerevent("spork", self); self.spoon_in_tub = undefined; - self setclientfieldtoplayer( "spoon_visual_state", 3 ); + self setclientfieldtoplayer("spoon_visual_state", 3); wait 1.0; - self thread do_player_general_vox( "quest", "pick_up_easter_egg" ); + self thread do_player_general_vox("quest", "pick_up_easter_egg"); } \ No newline at end of file diff --git a/scripts/zm/replaced/zm_tomb_main_quest.gsc b/scripts/zm/replaced/zm_tomb_main_quest.gsc index 69f7b99f..1a4f5f8c 100644 --- a/scripts/zm/replaced/zm_tomb_main_quest.gsc +++ b/scripts/zm/replaced/zm_tomb_main_quest.gsc @@ -668,19 +668,19 @@ run_gramophone_door(str_vinyl_record) watch_staff_ammo_reload() { - self endon( "disconnect" ); + self endon("disconnect"); - while ( true ) + while (true) { - self waittill( "zmb_max_ammo" ); + self waittill("zmb_max_ammo"); a_weapons = self getweaponslist(); - foreach ( weapon in a_weapons ) + foreach (weapon in a_weapons) { - if ( issubstr( weapon, "staff_revive" ) ) + if (issubstr(weapon, "staff_revive")) { - self setweaponammoclip( weapon, weaponclipsize( weapon ) ); + self setweaponammoclip(weapon, weaponclipsize(weapon)); } } } diff --git a/scripts/zm/replaced/zm_transit_ai_screecher.gsc b/scripts/zm/replaced/zm_transit_ai_screecher.gsc index 67413a5e..673c4003 100644 --- a/scripts/zm/replaced/zm_transit_ai_screecher.gsc +++ b/scripts/zm/replaced/zm_transit_ai_screecher.gsc @@ -18,8 +18,8 @@ init() level.screecher_init_done = ::screecher_init_done; level.portals = []; - lights = getstructarray( "screecher_escape", "targetname" ); - lights = array_randomize( lights ); + lights = getstructarray("screecher_escape", "targetname"); + lights = array_randomize(lights); for (i = 0; i < lights.size; i++) { @@ -91,15 +91,15 @@ portal_use(player) playsoundatposition("zmb_screecher_portal_end", self.hole.origin); } -teleport_player( player ) +teleport_player(player) { - if ( isdefined( self.dest_light ) ) + if (isdefined(self.dest_light)) { - playsoundatposition( "zmb_screecher_portal_arrive", self.dest_light.origin ); + playsoundatposition("zmb_screecher_portal_arrive", self.dest_light.origin); player maps\mp\zombies\_zm_gump::player_teleport_blackscreen_on(); - player setorigin( self.dest_light.origin ); - player notify( "used_screecher_hole" ); - player maps\mp\zombies\_zm_stats::increment_client_stat( "screecher_teleporters_used", 0 ); - player maps\mp\zombies\_zm_stats::increment_player_stat( "screecher_teleporters_used" ); + player setorigin(self.dest_light.origin); + player notify("used_screecher_hole"); + player maps\mp\zombies\_zm_stats::increment_client_stat("screecher_teleporters_used", 0); + player maps\mp\zombies\_zm_stats::increment_player_stat("screecher_teleporters_used"); } } \ No newline at end of file diff --git a/scripts/zm/replaced/zmeat.gsc b/scripts/zm/replaced/zmeat.gsc index 52651f40..3817a38a 100644 --- a/scripts/zm/replaced/zmeat.gsc +++ b/scripts/zm/replaced/zmeat.gsc @@ -6,16 +6,16 @@ create_item_meat_watcher() { - watcher = self maps\mp\gametypes_zm\_weaponobjects::createuseweaponobjectwatcher( "item_meat", get_gamemode_var( "item_meat_name" ), self.team ); + watcher = self maps\mp\gametypes_zm\_weaponobjects::createuseweaponobjectwatcher("item_meat", get_gamemode_var("item_meat_name"), self.team); watcher.pickup = ::item_meat_on_pickup; watcher.onspawn = ::item_meat_spawned; watcher.onspawnretrievetriggers = ::play_item_meat_on_spawn_retrieve_trigger; watcher.headicon = 0; } -play_item_meat_on_spawn_retrieve_trigger( watcher, player ) +play_item_meat_on_spawn_retrieve_trigger(watcher, player) { - self item_meat_on_spawn_retrieve_trigger( watcher, player, get_gamemode_var( "item_meat_name" ) ); + self item_meat_on_spawn_retrieve_trigger(watcher, player, get_gamemode_var("item_meat_name")); } item_meat_on_spawn_retrieve_trigger(watcher, player, weaponname)