diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index 4bb6ff89..bbf70d29 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -1079,35 +1079,35 @@ can_track_ammo( weap ) switch ( weap ) { - case "zombie_tazer_flourish": - case "zombie_sickle_flourish": - case "zombie_knuckle_crack": - case "zombie_fists_zm": - case "zombie_builder_zm": - case "zombie_bowie_flourish": - case "time_bomb_zm": - case "time_bomb_detonator_zm": - case "tazer_knuckles_zm": - case "tazer_knuckles_upgraded_zm": - case "slowgun_zm": - case "slowgun_upgraded_zm": - case "screecher_arms_zm": - case "riotshield_zm": - case "none": - case "no_hands_zm": - case "lower_equip_gasmask_zm": - case "humangun_zm": - case "humangun_upgraded_zm": - case "equip_gasmask_zm": - case "equip_dieseldrone_zm": - case "death_throe_zm": - case "chalk_draw_zm": - case "alcatraz_shield_zm": - case "tomb_shield_zm": - return false; - default: - if ( is_melee_weapon( weap ) || is_zombie_perk_bottle( weap ) || is_placeable_mine( weap ) || is_equipment( weap ) || issubstr( weap, "knife_ballistic_" ) || getsubstr( weap, 0, 3 ) == "gl_" || weaponfuellife( weap ) > 0 || weap == level.revive_tool ) + case "zombie_tazer_flourish": + case "zombie_sickle_flourish": + case "zombie_knuckle_crack": + case "zombie_fists_zm": + case "zombie_builder_zm": + case "zombie_bowie_flourish": + case "time_bomb_zm": + case "time_bomb_detonator_zm": + case "tazer_knuckles_zm": + case "tazer_knuckles_upgraded_zm": + case "slowgun_zm": + case "slowgun_upgraded_zm": + case "screecher_arms_zm": + case "riotshield_zm": + case "none": + case "no_hands_zm": + case "lower_equip_gasmask_zm": + case "humangun_zm": + case "humangun_upgraded_zm": + case "equip_gasmask_zm": + case "equip_dieseldrone_zm": + case "death_throe_zm": + case "chalk_draw_zm": + case "alcatraz_shield_zm": + case "tomb_shield_zm": return false; + default: + if ( is_melee_weapon( weap ) || is_zombie_perk_bottle( weap ) || is_placeable_mine( weap ) || is_equipment( weap ) || issubstr( weap, "knife_ballistic_" ) || getsubstr( weap, 0, 3 ) == "gl_" || weaponfuellife( weap ) > 0 || weap == level.revive_tool ) + return false; } return true; diff --git a/scripts/zm/replaced/_zm_gametype.gsc b/scripts/zm/replaced/_zm_gametype.gsc index ebe8aa97..f189fbb5 100644 --- a/scripts/zm/replaced/_zm_gametype.gsc +++ b/scripts/zm/replaced/_zm_gametype.gsc @@ -357,18 +357,18 @@ menu_onmenuresponse() { switch ( response ) { - case "allies": - self [[ level.allies ]](); - break; - case "axis": - self [[ level.teammenu ]]( response ); - break; - case "autoassign": - self [[ level.autoassign ]]( 1 ); - break; - case "spectator": - self [[ level.spectator ]](); - break; + case "allies": + self [[ level.allies ]](); + break; + case "axis": + self [[ level.teammenu ]]( response ); + break; + case "autoassign": + self [[ level.autoassign ]]( 1 ); + break; + case "spectator": + self [[ level.spectator ]](); + break; } continue; diff --git a/scripts/zm/replaced/_zm_perks.gsc b/scripts/zm/replaced/_zm_perks.gsc index 09f730c5..ee1dde50 100644 --- a/scripts/zm/replaced/_zm_perks.gsc +++ b/scripts/zm/replaced/_zm_perks.gsc @@ -150,38 +150,38 @@ vending_trigger_think() switch ( perk ) { - case "specialty_armorvest_upgrade": - case "specialty_armorvest": - cost = 2500; - break; - case "specialty_quickrevive_upgrade": - case "specialty_quickrevive": - if ( solo ) - cost = 500; - else - cost = 1500; + case "specialty_armorvest_upgrade": + case "specialty_armorvest": + cost = 2500; + break; + case "specialty_quickrevive_upgrade": + case "specialty_quickrevive": + if ( solo ) + cost = 500; + else + cost = 1500; - break; - case "specialty_fastreload_upgrade": - case "specialty_fastreload": - cost = 3000; - break; - case "specialty_rof_upgrade": - case "specialty_rof": - cost = 2000; - break; - case "specialty_longersprint_upgrade": - case "specialty_longersprint": - cost = 2000; - break; - case "specialty_deadshot_upgrade": - case "specialty_deadshot": - cost = 1500; - break; - case "specialty_additionalprimaryweapon_upgrade": - case "specialty_additionalprimaryweapon": - cost = 4000; - break; + break; + case "specialty_fastreload_upgrade": + case "specialty_fastreload": + cost = 3000; + break; + case "specialty_rof_upgrade": + case "specialty_rof": + cost = 2000; + break; + case "specialty_longersprint_upgrade": + case "specialty_longersprint": + cost = 2000; + break; + case "specialty_deadshot_upgrade": + case "specialty_deadshot": + cost = 1500; + break; + case "specialty_additionalprimaryweapon_upgrade": + case "specialty_additionalprimaryweapon": + cost = 4000; + break; } if ( isdefined( level._custom_perks[perk] ) && isdefined( level._custom_perks[perk].cost ) ) @@ -211,48 +211,48 @@ vending_trigger_think() switch ( perk ) { - case "specialty_armorvest_upgrade": - case "specialty_armorvest": - self sethintstring( &"ZOMBIE_PERK_JUGGERNAUT", cost ); - break; - case "specialty_quickrevive_upgrade": - case "specialty_quickrevive": - if ( solo ) - self sethintstring( &"ZOMBIE_PERK_QUICKREVIVE_SOLO", cost ); - else - self sethintstring( &"ZOMBIE_PERK_QUICKREVIVE", cost ); + case "specialty_armorvest_upgrade": + case "specialty_armorvest": + self sethintstring( &"ZOMBIE_PERK_JUGGERNAUT", cost ); + break; + case "specialty_quickrevive_upgrade": + case "specialty_quickrevive": + if ( solo ) + self sethintstring( &"ZOMBIE_PERK_QUICKREVIVE_SOLO", cost ); + else + self sethintstring( &"ZOMBIE_PERK_QUICKREVIVE", cost ); - break; - case "specialty_fastreload_upgrade": - case "specialty_fastreload": - self sethintstring( &"ZOMBIE_PERK_FASTRELOAD", cost ); - break; - case "specialty_rof_upgrade": - case "specialty_rof": - self sethintstring( &"ZOMBIE_PERK_DOUBLETAP", cost ); - break; - case "specialty_longersprint_upgrade": - case "specialty_longersprint": - self sethintstring( &"ZOMBIE_PERK_MARATHON", cost ); - break; - case "specialty_deadshot_upgrade": - case "specialty_deadshot": - self sethintstring( &"ZOMBIE_PERK_DEADSHOT", cost ); - break; - case "specialty_additionalprimaryweapon_upgrade": - case "specialty_additionalprimaryweapon": - self sethintstring( &"ZOMBIE_PERK_ADDITIONALPRIMARYWEAPON", cost ); - break; - case "specialty_scavenger_upgrade": - case "specialty_scavenger": - self sethintstring( &"ZOMBIE_PERK_TOMBSTONE", cost ); - break; - case "specialty_finalstand_upgrade": - case "specialty_finalstand": - self sethintstring( &"ZOMBIE_PERK_CHUGABUD", cost ); - break; - default: - self sethintstring( perk + " Cost: " + level.zombie_vars["zombie_perk_cost"] ); + break; + case "specialty_fastreload_upgrade": + case "specialty_fastreload": + self sethintstring( &"ZOMBIE_PERK_FASTRELOAD", cost ); + break; + case "specialty_rof_upgrade": + case "specialty_rof": + self sethintstring( &"ZOMBIE_PERK_DOUBLETAP", cost ); + break; + case "specialty_longersprint_upgrade": + case "specialty_longersprint": + self sethintstring( &"ZOMBIE_PERK_MARATHON", cost ); + break; + case "specialty_deadshot_upgrade": + case "specialty_deadshot": + self sethintstring( &"ZOMBIE_PERK_DEADSHOT", cost ); + break; + case "specialty_additionalprimaryweapon_upgrade": + case "specialty_additionalprimaryweapon": + self sethintstring( &"ZOMBIE_PERK_ADDITIONALPRIMARYWEAPON", cost ); + break; + case "specialty_scavenger_upgrade": + case "specialty_scavenger": + self sethintstring( &"ZOMBIE_PERK_TOMBSTONE", cost ); + break; + case "specialty_finalstand_upgrade": + case "specialty_finalstand": + self sethintstring( &"ZOMBIE_PERK_CHUGABUD", cost ); + break; + default: + self sethintstring( perk + " Cost: " + level.zombie_vars["zombie_perk_cost"] ); } if ( isdefined( level._custom_perks[perk] ) && isdefined( level._custom_perks[perk].hint_string ) ) @@ -389,48 +389,48 @@ perk_give_bottle_end( gun, perk ) switch ( perk ) { - case "specialty_rof_upgrade": - case "specialty_rof": - weapon = level.machine_assets["doubletap"].weapon; - break; - case "specialty_longersprint_upgrade": - case "specialty_longersprint": - weapon = level.machine_assets["marathon"].weapon; - break; - case "specialty_flakjacket_upgrade": - case "specialty_flakjacket": - weapon = level.machine_assets["divetonuke"].weapon; - break; - case "specialty_armorvest_upgrade": - case "specialty_armorvest": - weapon = level.machine_assets["juggernog"].weapon; - self.jugg_used = 1; - break; - case "specialty_quickrevive_upgrade": - case "specialty_quickrevive": - weapon = level.machine_assets["revive"].weapon; - break; - case "specialty_fastreload_upgrade": - case "specialty_fastreload": - weapon = level.machine_assets["speedcola"].weapon; - self.speed_used = 1; - break; - case "specialty_deadshot_upgrade": - case "specialty_deadshot": - weapon = level.machine_assets["deadshot"].weapon; - break; - case "specialty_additionalprimaryweapon_upgrade": - case "specialty_additionalprimaryweapon": - weapon = level.machine_assets["additionalprimaryweapon"].weapon; - break; - case "specialty_scavenger_upgrade": - case "specialty_scavenger": - weapon = level.machine_assets["tombstone"].weapon; - break; - case "specialty_finalstand_upgrade": - case "specialty_finalstand": - weapon = level.machine_assets["whoswho"].weapon; - break; + case "specialty_rof_upgrade": + case "specialty_rof": + weapon = level.machine_assets["doubletap"].weapon; + break; + case "specialty_longersprint_upgrade": + case "specialty_longersprint": + weapon = level.machine_assets["marathon"].weapon; + break; + case "specialty_flakjacket_upgrade": + case "specialty_flakjacket": + weapon = level.machine_assets["divetonuke"].weapon; + break; + case "specialty_armorvest_upgrade": + case "specialty_armorvest": + weapon = level.machine_assets["juggernog"].weapon; + self.jugg_used = 1; + break; + case "specialty_quickrevive_upgrade": + case "specialty_quickrevive": + weapon = level.machine_assets["revive"].weapon; + break; + case "specialty_fastreload_upgrade": + case "specialty_fastreload": + weapon = level.machine_assets["speedcola"].weapon; + self.speed_used = 1; + break; + case "specialty_deadshot_upgrade": + case "specialty_deadshot": + weapon = level.machine_assets["deadshot"].weapon; + break; + case "specialty_additionalprimaryweapon_upgrade": + case "specialty_additionalprimaryweapon": + weapon = level.machine_assets["additionalprimaryweapon"].weapon; + break; + case "specialty_scavenger_upgrade": + case "specialty_scavenger": + weapon = level.machine_assets["tombstone"].weapon; + break; + case "specialty_finalstand_upgrade": + case "specialty_finalstand": + weapon = level.machine_assets["whoswho"].weapon; + break; } if ( isdefined( level._custom_perks[perk] ) && isdefined( level._custom_perks[perk].perk_bottle ) ) @@ -800,27 +800,27 @@ perk_think( perk ) switch( perk ) { - case "specialty_armorvest": - self setmaxhealth( self.premaxhealth ); - break; - case "specialty_additionalprimaryweapon": - if ( result == perk_str ) - { - self maps\mp\zombies\_zm::take_additionalprimaryweapon(); - } - break; - case "specialty_deadshot": - if ( !is_true( level.disable_deadshot_clientfield ) ) - { - self setclientfieldtoplayer( "deadshot_perk", 0 ); - } - break; - case "specialty_deadshot_upgrade": - if ( !is_true( level.disable_deadshot_clientfield ) ) - { - self setclientfieldtoplayer( "deadshot_perk", 0 ); - } - break; + case "specialty_armorvest": + self setmaxhealth( self.premaxhealth ); + break; + case "specialty_additionalprimaryweapon": + if ( result == perk_str ) + { + self maps\mp\zombies\_zm::take_additionalprimaryweapon(); + } + break; + case "specialty_deadshot": + if ( !is_true( level.disable_deadshot_clientfield ) ) + { + self setclientfieldtoplayer( "deadshot_perk", 0 ); + } + break; + case "specialty_deadshot_upgrade": + if ( !is_true( level.disable_deadshot_clientfield ) ) + { + self setclientfieldtoplayer( "deadshot_perk", 0 ); + } + break; } if ( isDefined( level._custom_perks[ perk ] ) && isDefined( level._custom_perks[ perk ].player_thread_take ) ) { @@ -923,38 +923,38 @@ set_perk_clientfield( perk, state ) { switch ( perk ) { - case "specialty_additionalprimaryweapon": - self setclientfieldtoplayer( "perk_additional_primary_weapon", state ); - break; - case "specialty_deadshot": - self setclientfieldtoplayer( "perk_dead_shot", state ); - break; - case "specialty_flakjacket": - self setclientfieldtoplayer( "perk_dive_to_nuke", state ); - break; - case "specialty_rof": - self setclientfieldtoplayer( "perk_double_tap", state ); - break; - case "specialty_armorvest": - self setclientfieldtoplayer( "perk_juggernaut", state ); - break; - case "specialty_movefaster": - self setclientfieldtoplayer( "perk_marathon", state ); - break; - case "specialty_quickrevive": - self setclientfieldtoplayer( "perk_quick_revive", state ); - break; - case "specialty_fastreload": - self setclientfieldtoplayer( "perk_sleight_of_hand", state ); - break; - case "specialty_scavenger": - self setclientfieldtoplayer( "perk_tombstone", state ); - break; - case "specialty_finalstand": - self setclientfieldtoplayer( "perk_chugabud", state ); - break; - default: - break; + case "specialty_additionalprimaryweapon": + self setclientfieldtoplayer( "perk_additional_primary_weapon", state ); + break; + case "specialty_deadshot": + self setclientfieldtoplayer( "perk_dead_shot", state ); + break; + case "specialty_flakjacket": + self setclientfieldtoplayer( "perk_dive_to_nuke", state ); + break; + case "specialty_rof": + self setclientfieldtoplayer( "perk_double_tap", state ); + break; + case "specialty_armorvest": + self setclientfieldtoplayer( "perk_juggernaut", state ); + break; + case "specialty_movefaster": + self setclientfieldtoplayer( "perk_marathon", state ); + break; + case "specialty_quickrevive": + self setclientfieldtoplayer( "perk_quick_revive", state ); + break; + case "specialty_fastreload": + self setclientfieldtoplayer( "perk_sleight_of_hand", state ); + break; + case "specialty_scavenger": + self setclientfieldtoplayer( "perk_tombstone", state ); + break; + case "specialty_finalstand": + self setclientfieldtoplayer( "perk_chugabud", state ); + break; + default: + break; } if ( isdefined( level._custom_perks[perk] ) && isdefined( level._custom_perks[perk].clientfield_set ) ) diff --git a/scripts/zm/replaced/_zm_powerups.gsc b/scripts/zm/replaced/_zm_powerups.gsc index c91f51c6..e548cc63 100644 --- a/scripts/zm/replaced/_zm_powerups.gsc +++ b/scripts/zm/replaced/_zm_powerups.gsc @@ -153,74 +153,74 @@ powerup_grab( powerup_team ) { switch ( self.powerup_name ) { - case "nuke": - level thread nuke_powerup( self, players[i].team ); - players[i] thread powerup_vo( "nuke" ); - zombies = getaiarray( level.zombie_team ); - players[i].zombie_nuked = arraysort( zombies, self.origin ); - players[i] notify( "nuke_triggered" ); - break; - case "full_ammo": - level thread full_ammo_powerup( self, players[i] ); - players[i] thread powerup_vo( "full_ammo" ); - break; - case "double_points": - level thread double_points_powerup( self, players[i] ); - players[i] thread powerup_vo( "double_points" ); - break; - case "insta_kill": - level thread insta_kill_powerup( self, players[i] ); - players[i] thread powerup_vo( "insta_kill" ); - break; - case "carpenter": - if ( is_classic() ) - players[i] thread maps\mp\zombies\_zm_pers_upgrades::persistent_carpenter_ability_check(); + case "nuke": + level thread nuke_powerup( self, players[i].team ); + players[i] thread powerup_vo( "nuke" ); + zombies = getaiarray( level.zombie_team ); + players[i].zombie_nuked = arraysort( zombies, self.origin ); + players[i] notify( "nuke_triggered" ); + break; + case "full_ammo": + level thread full_ammo_powerup( self, players[i] ); + players[i] thread powerup_vo( "full_ammo" ); + break; + case "double_points": + level thread double_points_powerup( self, players[i] ); + players[i] thread powerup_vo( "double_points" ); + break; + case "insta_kill": + level thread insta_kill_powerup( self, players[i] ); + players[i] thread powerup_vo( "insta_kill" ); + break; + case "carpenter": + if ( is_classic() ) + players[i] thread maps\mp\zombies\_zm_pers_upgrades::persistent_carpenter_ability_check(); - if ( isdefined( level.use_new_carpenter_func ) ) - level thread [[ level.use_new_carpenter_func ]]( self.origin ); - else - level thread start_carpenter( self.origin ); + if ( isdefined( level.use_new_carpenter_func ) ) + level thread [[ level.use_new_carpenter_func ]]( self.origin ); + else + level thread start_carpenter( self.origin ); - players[i] thread powerup_vo( "carpenter" ); - break; - case "fire_sale": - level thread start_fire_sale( self ); - players[i] thread powerup_vo( "firesale" ); - break; - case "bonfire_sale": - level thread start_bonfire_sale( self ); - players[i] thread powerup_vo( "firesale" ); - break; - case "minigun": - level thread minigun_weapon_powerup( players[i] ); - players[i] thread powerup_vo( "minigun" ); - break; - case "free_perk": - level thread free_perk_powerup( self ); - break; - case "tesla": - level thread tesla_weapon_powerup( players[i] ); - players[i] thread powerup_vo( "tesla" ); - break; - case "random_weapon": - if ( !level random_weapon_powerup( self, players[i] ) ) - continue; - break; - case "bonus_points_player": - level thread bonus_points_player_powerup( self, players[i] ); - players[i] thread powerup_vo( "bonus_points_solo" ); - break; - case "bonus_points_team": - level thread bonus_points_team_powerup( self ); - players[i] thread powerup_vo( "bonus_points_team" ); - break; - case "teller_withdrawl": - level thread teller_withdrawl( self, players[i] ); - break; - default: - if ( isdefined( level._zombiemode_powerup_grab ) ) - level thread [[ level._zombiemode_powerup_grab ]]( self, players[i] ); - break; + players[i] thread powerup_vo( "carpenter" ); + break; + case "fire_sale": + level thread start_fire_sale( self ); + players[i] thread powerup_vo( "firesale" ); + break; + case "bonfire_sale": + level thread start_bonfire_sale( self ); + players[i] thread powerup_vo( "firesale" ); + break; + case "minigun": + level thread minigun_weapon_powerup( players[i] ); + players[i] thread powerup_vo( "minigun" ); + break; + case "free_perk": + level thread free_perk_powerup( self ); + break; + case "tesla": + level thread tesla_weapon_powerup( players[i] ); + players[i] thread powerup_vo( "tesla" ); + break; + case "random_weapon": + if ( !level random_weapon_powerup( self, players[i] ) ) + continue; + break; + case "bonus_points_player": + level thread bonus_points_player_powerup( self, players[i] ); + players[i] thread powerup_vo( "bonus_points_solo" ); + break; + case "bonus_points_team": + level thread bonus_points_team_powerup( self ); + players[i] thread powerup_vo( "bonus_points_team" ); + break; + case "teller_withdrawl": + level thread teller_withdrawl( self, players[i] ); + break; + default: + if ( isdefined( level._zombiemode_powerup_grab ) ) + level thread [[ level._zombiemode_powerup_grab ]]( self, players[i] ); + break; } } diff --git a/scripts/zm/replaced/_zm_score.gsc b/scripts/zm/replaced/_zm_score.gsc index 39fca3f7..0e3e86bb 100644 --- a/scripts/zm/replaced/_zm_score.gsc +++ b/scripts/zm/replaced/_zm_score.gsc @@ -54,15 +54,15 @@ player_add_points_kill_bonus( mod, hit_location ) { switch ( hit_location ) { - case "helmet": - case "head": - case "neck": - self score_cf_increment_info( "death_head" ); - score = level.zombie_vars["zombie_score_bonus_head"]; - break; - default: - self score_cf_increment_info( "death_normal" ); - break; + case "helmet": + case "head": + case "neck": + self score_cf_increment_info( "death_head" ); + score = level.zombie_vars["zombie_score_bonus_head"]; + break; + default: + self score_cf_increment_info( "death_normal" ); + break; } } diff --git a/scripts/zm/replaced/_zm_spawner.gsc b/scripts/zm/replaced/_zm_spawner.gsc index b778054f..d0faf29b 100644 --- a/scripts/zm/replaced/_zm_spawner.gsc +++ b/scripts/zm/replaced/_zm_spawner.gsc @@ -196,64 +196,64 @@ zombie_gib_on_damage() switch ( self.damagelocation ) { - case "torso_upper": - case "torso_lower": - refs[refs.size] = "guts"; - refs[refs.size] = "right_arm"; - break; - case "right_hand": - case "right_arm_upper": - case "right_arm_lower": - refs[refs.size] = "right_arm"; - break; - case "left_hand": - case "left_arm_upper": - case "left_arm_lower": - refs[refs.size] = "left_arm"; - break; - case "right_leg_upper": - case "right_leg_lower": - case "right_foot": - if ( self.health <= 0 ) - { - refs[refs.size] = "right_leg"; - refs[refs.size] = "right_leg"; - refs[refs.size] = "right_leg"; - refs[refs.size] = "no_legs"; - } - - break; - case "left_leg_upper": - case "left_leg_lower": - case "left_foot": - if ( self.health <= 0 ) - { - refs[refs.size] = "left_leg"; - refs[refs.size] = "left_leg"; - refs[refs.size] = "left_leg"; - refs[refs.size] = "no_legs"; - } - - break; - default: - if ( self.damagelocation == "none" ) - { - if ( type == "MOD_GRENADE" || type == "MOD_GRENADE_SPLASH" || type == "MOD_PROJECTILE" || type == "MOD_PROJECTILE_SPLASH" ) - { - refs = self derive_damage_refs( point ); - break; - } - } - else - { + case "torso_upper": + case "torso_lower": refs[refs.size] = "guts"; refs[refs.size] = "right_arm"; - refs[refs.size] = "left_arm"; - refs[refs.size] = "right_leg"; - refs[refs.size] = "left_leg"; - refs[refs.size] = "no_legs"; break; - } + case "right_hand": + case "right_arm_upper": + case "right_arm_lower": + refs[refs.size] = "right_arm"; + break; + case "left_hand": + case "left_arm_upper": + case "left_arm_lower": + refs[refs.size] = "left_arm"; + break; + case "right_leg_upper": + case "right_leg_lower": + case "right_foot": + if ( self.health <= 0 ) + { + refs[refs.size] = "right_leg"; + refs[refs.size] = "right_leg"; + refs[refs.size] = "right_leg"; + refs[refs.size] = "no_legs"; + } + + break; + case "left_leg_upper": + case "left_leg_lower": + case "left_foot": + if ( self.health <= 0 ) + { + refs[refs.size] = "left_leg"; + refs[refs.size] = "left_leg"; + refs[refs.size] = "left_leg"; + refs[refs.size] = "no_legs"; + } + + break; + default: + if ( self.damagelocation == "none" ) + { + if ( type == "MOD_GRENADE" || type == "MOD_GRENADE_SPLASH" || type == "MOD_PROJECTILE" || type == "MOD_PROJECTILE_SPLASH" ) + { + refs = self derive_damage_refs( point ); + break; + } + } + else + { + refs[refs.size] = "guts"; + refs[refs.size] = "right_arm"; + refs[refs.size] = "left_arm"; + refs[refs.size] = "right_leg"; + refs[refs.size] = "left_leg"; + refs[refs.size] = "no_legs"; + break; + } } if ( isdefined( level.custom_derive_damage_refs ) ) diff --git a/scripts/zm/replaced/_zm_weap_staff_fire.gsc b/scripts/zm/replaced/_zm_weap_staff_fire.gsc index 6367e249..dba8ffd1 100644 --- a/scripts/zm/replaced/_zm_weap_staff_fire.gsc +++ b/scripts/zm/replaced/_zm_weap_staff_fire.gsc @@ -55,15 +55,15 @@ get_impact_damage( damageweapon ) { switch ( damageweapon ) { - case "staff_fire_zm": - return 2050; - case "staff_fire_upgraded_zm": - case "staff_fire_upgraded2_zm": - case "staff_fire_upgraded3_zm": - return 3300; - case "one_inch_punch_fire_zm": - return 0; - default: - return 0; + case "staff_fire_zm": + return 2050; + case "staff_fire_upgraded_zm": + case "staff_fire_upgraded2_zm": + case "staff_fire_upgraded3_zm": + return 3300; + case "one_inch_punch_fire_zm": + return 0; + default: + return 0; } } \ No newline at end of file diff --git a/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc b/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc index c7a60aad..a1a1a266 100644 --- a/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc +++ b/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc @@ -62,22 +62,22 @@ give_team_characters() } switch( self.characterindex ) { - case 0: - case 2: - self setmodel( "c_zom_player_grief_inmate_fb" ); - self.voice = "american"; - self.skeleton = "base"; - self setviewmodel( "c_zom_oleary_shortsleeve_viewhands" ); - self.characterindex = 0; - break; - case 1: - case 3: - self setmodel( "c_zom_player_grief_guard_fb" ); - self.voice = "american"; - self.skeleton = "base"; - self setviewmodel( "c_zom_grief_guard_viewhands" ); - self.characterindex = 1; - break; + case 0: + case 2: + self setmodel( "c_zom_player_grief_inmate_fb" ); + self.voice = "american"; + self.skeleton = "base"; + self setviewmodel( "c_zom_oleary_shortsleeve_viewhands" ); + self.characterindex = 0; + break; + case 1: + case 3: + self setmodel( "c_zom_player_grief_guard_fb" ); + self.voice = "american"; + self.skeleton = "base"; + self setviewmodel( "c_zom_grief_guard_viewhands" ); + self.characterindex = 1; + break; } self setmovespeedscale( 1 ); self setsprintduration( 4 ); diff --git a/scripts/zm/replaced/zm_highrise_sq_pts.gsc b/scripts/zm/replaced/zm_highrise_sq_pts.gsc index a9a5257c..466827ac 100644 --- a/scripts/zm/replaced/zm_highrise_sq_pts.gsc +++ b/scripts/zm/replaced/zm_highrise_sq_pts.gsc @@ -318,22 +318,22 @@ pts_springpad_fling( str_spot_name ) switch ( str_spot_name ) { - case "lion_pair_1": - str_anim1 = "dc"; - str_anim2 = "cd"; - break; - case "lion_pair_2": - str_anim1 = "ab"; - str_anim2 = "ba"; - break; - case "lion_pair_3": - str_anim1 = "cd"; - str_anim2 = "dc"; - break; - case "lion_pair_4": - str_anim1 = "ba"; - str_anim2 = "ab"; - break; + case "lion_pair_1": + str_anim1 = "dc"; + str_anim2 = "cd"; + break; + case "lion_pair_2": + str_anim1 = "ab"; + str_anim2 = "ba"; + break; + case "lion_pair_3": + str_anim1 = "cd"; + str_anim2 = "dc"; + break; + case "lion_pair_4": + str_anim1 = "ba"; + str_anim2 = "ab"; + break; } m_anim = spawn( "script_model", ( 2090, 675, 3542 ) ); diff --git a/scripts/zm/replaced/zm_tomb.gsc b/scripts/zm/replaced/zm_tomb.gsc index 15ce1b97..043f6c92 100644 --- a/scripts/zm/replaced/zm_tomb.gsc +++ b/scripts/zm/replaced/zm_tomb.gsc @@ -63,15 +63,15 @@ sndmeleewpn_isstaff( weapon ) { switch ( weapon ) { - case "staff_water_melee_zm": - case "staff_melee_zm": - case "staff_lightning_melee_zm": - case "staff_fire_melee_zm": - case "staff_air_melee_zm": - isstaff = 1; - break; - default: - isstaff = 0; + case "staff_water_melee_zm": + case "staff_melee_zm": + case "staff_lightning_melee_zm": + case "staff_fire_melee_zm": + case "staff_air_melee_zm": + isstaff = 1; + break; + default: + isstaff = 0; } return isstaff; @@ -84,45 +84,45 @@ tomb_can_track_ammo_custom( weap ) switch ( weap ) { - case "zombie_tazer_flourish": - case "zombie_sickle_flourish": - case "zombie_one_inch_punch_upgrade_flourish": - case "zombie_one_inch_punch_flourish": - case "zombie_knuckle_crack": - case "zombie_fists_zm": - case "zombie_builder_zm": - case "zombie_bowie_flourish": - case "time_bomb_zm": - case "time_bomb_detonator_zm": - case "tazer_knuckles_zm": - case "tazer_knuckles_upgraded_zm": - case "staff_revive_zm": - case "slowgun_zm": - case "slowgun_upgraded_zm": - case "screecher_arms_zm": - case "riotshield_zm": - case "one_inch_punch_zm": - case "one_inch_punch_upgraded_zm": - case "one_inch_punch_lightning_zm": - case "one_inch_punch_ice_zm": - case "one_inch_punch_fire_zm": - case "one_inch_punch_air_zm": - case "none": - case "no_hands_zm": - case "lower_equip_gasmask_zm": - case "humangun_zm": - case "humangun_upgraded_zm": - case "falling_hands_tomb_zm": - case "equip_gasmask_zm": - case "equip_dieseldrone_zm": - case "death_throe_zm": - case "chalk_draw_zm": - case "alcatraz_shield_zm": - case "tomb_shield_zm": - return false; - default: - if ( is_melee_weapon( weap ) || is_zombie_perk_bottle( weap ) || is_placeable_mine( weap ) || is_equipment( weap ) || issubstr( weap, "knife_ballistic_" ) || getsubstr( weap, 0, 3 ) == "gl_" || weaponfuellife( weap ) > 0 || weap == level.revive_tool ) + case "zombie_tazer_flourish": + case "zombie_sickle_flourish": + case "zombie_one_inch_punch_upgrade_flourish": + case "zombie_one_inch_punch_flourish": + case "zombie_knuckle_crack": + case "zombie_fists_zm": + case "zombie_builder_zm": + case "zombie_bowie_flourish": + case "time_bomb_zm": + case "time_bomb_detonator_zm": + case "tazer_knuckles_zm": + case "tazer_knuckles_upgraded_zm": + case "staff_revive_zm": + case "slowgun_zm": + case "slowgun_upgraded_zm": + case "screecher_arms_zm": + case "riotshield_zm": + case "one_inch_punch_zm": + case "one_inch_punch_upgraded_zm": + case "one_inch_punch_lightning_zm": + case "one_inch_punch_ice_zm": + case "one_inch_punch_fire_zm": + case "one_inch_punch_air_zm": + case "none": + case "no_hands_zm": + case "lower_equip_gasmask_zm": + case "humangun_zm": + case "humangun_upgraded_zm": + case "falling_hands_tomb_zm": + case "equip_gasmask_zm": + case "equip_dieseldrone_zm": + case "death_throe_zm": + case "chalk_draw_zm": + case "alcatraz_shield_zm": + case "tomb_shield_zm": return false; + default: + if ( is_melee_weapon( weap ) || is_zombie_perk_bottle( weap ) || is_placeable_mine( weap ) || is_equipment( weap ) || issubstr( weap, "knife_ballistic_" ) || getsubstr( weap, 0, 3 ) == "gl_" || weaponfuellife( weap ) > 0 || weap == level.revive_tool ) + return false; } return true; diff --git a/scripts/zm/replaced/zm_tomb_craftables.gsc b/scripts/zm/replaced/zm_tomb_craftables.gsc index fadf6f1d..0d47d67f 100644 --- a/scripts/zm/replaced/zm_tomb_craftables.gsc +++ b/scripts/zm/replaced/zm_tomb_craftables.gsc @@ -328,15 +328,15 @@ quadrotor_set_available() switch ( str_zone ) { - case "zone_nml_9": - setclientfield( "cooldown_steam", 1 ); - break; - case "zone_bunker_5a": - setclientfield( "cooldown_steam", 2 ); - break; - case "zone_village_1": - setclientfield( "cooldown_steam", 3 ); - break; + case "zone_nml_9": + setclientfield( "cooldown_steam", 1 ); + break; + case "zone_bunker_5a": + setclientfield( "cooldown_steam", 2 ); + break; + case "zone_village_1": + setclientfield( "cooldown_steam", 3 ); + break; } vox_line = "vox_maxi_drone_cool_down_3"; diff --git a/scripts/zm/replaced/zm_tomb_ee_main_step_2.gsc b/scripts/zm/replaced/zm_tomb_ee_main_step_2.gsc index 5b9c5505..e050c00c 100644 --- a/scripts/zm/replaced/zm_tomb_ee_main_step_2.gsc +++ b/scripts/zm/replaced/zm_tomb_ee_main_step_2.gsc @@ -37,18 +37,18 @@ create_robot_head_trigger( unitrigger_stub ) switch ( unitrigger_stub.script_noteworthy ) { - case "fire": - m_sign showpart( "j_fire" ); - break; - case "water": - m_sign showpart( "j_ice" ); - break; - case "lightning": - m_sign showpart( "j_lightning" ); - break; - case "air": - m_sign showpart( "j_wind" ); - break; + case "fire": + m_sign showpart( "j_fire" ); + break; + case "water": + m_sign showpart( "j_ice" ); + break; + case "lightning": + m_sign showpart( "j_lightning" ); + break; + case "air": + m_sign showpart( "j_wind" ); + break; } m_sign maps\mp\zombies\_zm_powerup_zombie_blood::make_zombie_blood_entity(); diff --git a/scripts/zm/replaced/zm_transit_bus.gsc b/scripts/zm/replaced/zm_transit_bus.gsc index 57efe825..606983f6 100644 --- a/scripts/zm/replaced/zm_transit_bus.gsc +++ b/scripts/zm/replaced/zm_transit_bus.gsc @@ -152,58 +152,58 @@ busschedulethink() switch ( zonename ) { - case "zone_station_ext": - zonestocheck[zonestocheck.size] = "zone_trans_1"; - zonestocheck[zonestocheck.size] = "zone_pri"; - zonestocheck[zonestocheck.size] = "zone_pri2"; - zonestocheck[zonestocheck.size] = "zone_amb_bridge"; - zonestocheck[zonestocheck.size] = "zone_trans_2b"; - break; - case "zone_gas": - zonestocheck[zonestocheck.size] = "zone_trans_2"; - zonestocheck[zonestocheck.size] = "zone_amb_tunnel"; - zonestocheck[zonestocheck.size] = "zone_gar"; - zonestocheck[zonestocheck.size] = "zone_trans_diner"; - zonestocheck[zonestocheck.size] = "zone_trans_diner2"; - zonestocheck[zonestocheck.size] = "zone_diner_roof"; - zonestocheck[zonestocheck.size] = "zone_din"; - zonestocheck[zonestocheck.size] = "zone_roadside_west"; - zonestocheck[zonestocheck.size] = "zone_roadside_east"; - zonestocheck[zonestocheck.size] = "zone_trans_3"; - break; - case "zone_far": - zonestocheck[zonestocheck.size] = "zone_amb_forest"; - zonestocheck[zonestocheck.size] = "zone_far_ext"; - zonestocheck[zonestocheck.size] = "zone_farm_house"; - zonestocheck[zonestocheck.size] = "zone_brn"; - zonestocheck[zonestocheck.size] = "zone_trans_5"; - zonestocheck[zonestocheck.size] = "zone_trans_6"; - break; - case "zone_pow": - zonestocheck[zonestocheck.size] = "zone_trans_6"; - zonestocheck[zonestocheck.size] = "zone_amb_cornfield"; - zonestocheck[zonestocheck.size] = "zone_trans_7"; - zonestocheck[zonestocheck.size] = "zone_pow_ext1"; - zonestocheck[zonestocheck.size] = "zone_prr"; - zonestocheck[zonestocheck.size] = "zone_pcr"; - zonestocheck[zonestocheck.size] = "zone_pow_warehouse"; - break; - case "zone_town_north": - zonestocheck[zonestocheck.size] = "zone_trans_8"; - zonestocheck[zonestocheck.size] = "zone_amb_power2town"; - zonestocheck[zonestocheck.size] = "zone_tbu"; - zonestocheck[zonestocheck.size] = "zone_town_church"; - zonestocheck[zonestocheck.size] = "zone_bar"; - zonestocheck[zonestocheck.size] = "zone_town_east"; - zonestocheck[zonestocheck.size] = "zone_tow"; - zonestocheck[zonestocheck.size] = "zone_ban"; - zonestocheck[zonestocheck.size] = "zone_ban_vault"; - zonestocheck[zonestocheck.size] = "zone_town_west"; - zonestocheck[zonestocheck.size] = "zone_town_west2"; - zonestocheck[zonestocheck.size] = "zone_town_barber"; - zonestocheck[zonestocheck.size] = "zone_town_south"; - zonestocheck[zonestocheck.size] = "zone_trans_9"; - break; + case "zone_station_ext": + zonestocheck[zonestocheck.size] = "zone_trans_1"; + zonestocheck[zonestocheck.size] = "zone_pri"; + zonestocheck[zonestocheck.size] = "zone_pri2"; + zonestocheck[zonestocheck.size] = "zone_amb_bridge"; + zonestocheck[zonestocheck.size] = "zone_trans_2b"; + break; + case "zone_gas": + zonestocheck[zonestocheck.size] = "zone_trans_2"; + zonestocheck[zonestocheck.size] = "zone_amb_tunnel"; + zonestocheck[zonestocheck.size] = "zone_gar"; + zonestocheck[zonestocheck.size] = "zone_trans_diner"; + zonestocheck[zonestocheck.size] = "zone_trans_diner2"; + zonestocheck[zonestocheck.size] = "zone_diner_roof"; + zonestocheck[zonestocheck.size] = "zone_din"; + zonestocheck[zonestocheck.size] = "zone_roadside_west"; + zonestocheck[zonestocheck.size] = "zone_roadside_east"; + zonestocheck[zonestocheck.size] = "zone_trans_3"; + break; + case "zone_far": + zonestocheck[zonestocheck.size] = "zone_amb_forest"; + zonestocheck[zonestocheck.size] = "zone_far_ext"; + zonestocheck[zonestocheck.size] = "zone_farm_house"; + zonestocheck[zonestocheck.size] = "zone_brn"; + zonestocheck[zonestocheck.size] = "zone_trans_5"; + zonestocheck[zonestocheck.size] = "zone_trans_6"; + break; + case "zone_pow": + zonestocheck[zonestocheck.size] = "zone_trans_6"; + zonestocheck[zonestocheck.size] = "zone_amb_cornfield"; + zonestocheck[zonestocheck.size] = "zone_trans_7"; + zonestocheck[zonestocheck.size] = "zone_pow_ext1"; + zonestocheck[zonestocheck.size] = "zone_prr"; + zonestocheck[zonestocheck.size] = "zone_pcr"; + zonestocheck[zonestocheck.size] = "zone_pow_warehouse"; + break; + case "zone_town_north": + zonestocheck[zonestocheck.size] = "zone_trans_8"; + zonestocheck[zonestocheck.size] = "zone_amb_power2town"; + zonestocheck[zonestocheck.size] = "zone_tbu"; + zonestocheck[zonestocheck.size] = "zone_town_church"; + zonestocheck[zonestocheck.size] = "zone_bar"; + zonestocheck[zonestocheck.size] = "zone_town_east"; + zonestocheck[zonestocheck.size] = "zone_tow"; + zonestocheck[zonestocheck.size] = "zone_ban"; + zonestocheck[zonestocheck.size] = "zone_ban_vault"; + zonestocheck[zonestocheck.size] = "zone_town_west"; + zonestocheck[zonestocheck.size] = "zone_town_west2"; + zonestocheck[zonestocheck.size] = "zone_town_barber"; + zonestocheck[zonestocheck.size] = "zone_town_south"; + zonestocheck[zonestocheck.size] = "zone_trans_9"; + break; } foreach ( zone in zonestocheck ) diff --git a/scripts/zm/zm_buried/zm_buried_reimagined.gsc b/scripts/zm/zm_buried/zm_buried_reimagined.gsc index a4bbdef9..d728ee38 100644 --- a/scripts/zm/zm_buried/zm_buried_reimagined.gsc +++ b/scripts/zm/zm_buried/zm_buried_reimagined.gsc @@ -224,25 +224,25 @@ sloth_barricades_buyable() switch(debris_trig.script_location) { - case "juggernaut_alley": - case "stables_alley": - debris_trig.zombie_cost = 750; - break; + case "juggernaut_alley": + case "stables_alley": + debris_trig.zombie_cost = 750; + break; - case "jail": - case "gunstore": - case "mansion": - debris_trig.zombie_cost = 1000; - break; + case "jail": + case "gunstore": + case "mansion": + debris_trig.zombie_cost = 1000; + break; - case "candystore_alley": - case "church": - debris_trig.zombie_cost = 1250; - break; + case "candystore_alley": + case "church": + debris_trig.zombie_cost = 1250; + break; - default: - debris_trig.zombie_cost = 1000; - break; + default: + debris_trig.zombie_cost = 1000; + break; } debris_trig thread sloth_barricade_think();