INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 15:17:57 -05:00
Code Issues Releases Wiki Activity

Pad space between keyword and paren

Browse Source
This commit is contained in:
Jbleezy
2023-12-16 18:31:54 -08:00
parent 4202d3bbd8
commit c87c2da9a0
35 changed files with 480 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
scripts/zm/_zm_reimagined.gsc
View File

@ -166,7 +166,7 @@ initial_print()
on_player_connect()
{
while(true)
while (true)
{
level waittill("connecting", player);
@ -188,7 +188,7 @@ on_player_spawned()
self.initial_spawn = true;
for(;;)
for (;;)
{
self waittill( "spawned_player" );
@ -235,7 +235,7 @@ on_player_spectate()
level endon("end_game");
self endon( "disconnect" );
while(1)
while (1)
{
self waittill( "spawned_spectator" );
@ -248,11 +248,11 @@ on_player_downed()
level endon( "game_ended" );
self endon( "disconnect" );
while(1)
while (1)
{
self waittill( "entering_last_stand" );
if(is_gametype_active("zcleansed"))
if (is_gametype_active("zcleansed"))
{
continue;
}
@ -267,7 +267,7 @@ on_player_revived()
level endon("end_game");
self endon( "disconnect" );
while(1)
while (1)
{
self waittill( "player_revived", reviver );
@ -287,7 +287,7 @@ on_player_fake_revive()
level endon("end_game");
self endon( "disconnect" );
while(1)
while (1)
{
self waittill( "fake_revive" );
@ -468,7 +468,7 @@ set_client_dvars()
set_perks()
{
if(!(getDvar("g_gametype") == "zgrief" && getDvarIntDefault("ui_gametype_pro", 0)))
if (!(getDvar("g_gametype") == "zgrief" && getDvarIntDefault("ui_gametype_pro", 0)))
{
self setperk( "specialty_unlimitedsprint" );
}
@ -668,7 +668,7 @@ shield_bar_hud()
offset_x = 0;
health_str = "" + self.health;
for(i = 0; i < health_str.size; i++)
for (i = 0; i < health_str.size; i++)
{
if (health_str[i] == "1")
{
@ -813,7 +813,7 @@ timer_hud()
round_timer_hud()
{
if(isDefined(level.scr_zm_ui_gametype_obj) && level.scr_zm_ui_gametype_obj != "zsnr")
if (isDefined(level.scr_zm_ui_gametype_obj) && level.scr_zm_ui_gametype_obj != "zsnr")
{
return;
}
@ -938,14 +938,14 @@ set_time_frozen(time, endon_notify)
self endon( "death" );
if(time != 0)
if (time != 0)
{
time -= 0.5; // need to set it below the number or it shows the next number
}
while (1)
{
if(time == 0)
if (time == 0)
{
self setTimerUp(time);
}
@ -1021,7 +1021,7 @@ zone_hud()
vars["zone"] = self get_current_zone();
vars["zone_name"] = get_zone_display_name(vars["zone"]);
if(vars["prev_zone_name"] != vars["zone_name"])
if (vars["prev_zone_name"] != vars["zone_name"])
{
vars["prev_zone_name"] = vars["zone_name"];
@ -2052,18 +2052,18 @@ bleedout_bar_hud()
{
self waittill("entering_last_stand");
if(is_gametype_active("zcleansed"))
if (is_gametype_active("zcleansed"))
{
continue;
}
// don't show for last player downed
if(!self maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (!self maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
continue;
}
if(flag("solo_game"))
if (flag("solo_game"))
{
continue;
}
@ -2104,11 +2104,11 @@ bleedout_bar_hud_updatebar(hud)
hud updatebar(1);
for(i = 0; i < vars["num_intervals"]; i++)
for (i = 0; i < vars["num_intervals"]; i++)
{
vars["time"] = vars["bleedout_time"];
if(vars["time"] > vars["interval_time"])
if (vars["time"] > vars["interval_time"])
{
vars["time"] = vars["interval_time"];
}
@ -2117,7 +2117,7 @@ bleedout_bar_hud_updatebar(hud)
barwidth = int((hud.width * vars["frac"]) + 0.5);
if(barwidth < 1)
if (barwidth < 1)
{
barwidth = 1;
}
@ -2266,7 +2266,7 @@ last_stand_restore_pistol_ammo(only_store_info = false)
{
weapon = weapon_inventory[ i ];
if(weapon != self.laststandpistol)
if (weapon != self.laststandpistol)
{
i++;
continue;
@ -2295,7 +2295,7 @@ last_stand_restore_pistol_ammo(only_store_info = false)
last_clip = self getweaponammoclip( weapon );
last_left_clip = 0;
if( "none" != dual_wield_name )
if ( "none" != dual_wield_name )
{
last_left_clip = self getweaponammoclip( dual_wield_name );
}
@ -2317,7 +2317,7 @@ last_stand_restore_pistol_ammo(only_store_info = false)
used_amt -= self.stored_weapon_info[ weapon ].stock_amt;
self.stored_weapon_info[ weapon ].stock_amt = 0;
if( "none" != dual_wield_name )
if ( "none" != dual_wield_name )
{
if (used_amt >= self.stored_weapon_info[ weapon ].left_clip_amt)
{
@ -2398,7 +2398,7 @@ set_weapon_ammo_clip_left( weapon, amount )
setscoreboardcolumns_gametype()
{
if(getDvar("g_gametype") == "zgrief")
if (getDvar("g_gametype") == "zgrief")
{
if (level.scr_zm_ui_gametype_obj == "zcontainment" || level.scr_zm_ui_gametype_obj == "zmeat")
{
@ -2457,11 +2457,11 @@ veryhurt_blood_fx()
{
self endon( "disconnect" );
while(1)
while (1)
{
health_ratio = self.health / self.maxhealth;
if(health_ratio <= 0.2)
if (health_ratio <= 0.2)
{
playFXOnTag(level._effect["zombie_guts_explosion"], self, "J_SpineLower");
@ -2478,7 +2478,7 @@ ignoreme_after_revived()
{
self endon("disconnect");
while(1)
while (1)
{
self waittill("player_revived", reviver);
@ -2497,7 +2497,7 @@ player_revive_protection()
self.revive_protection = 1;
for(i = 0; i < 20; i++)
for (i = 0; i < 20; i++)
{
self.ignoreme = 1;
wait 0.05;
@ -2544,11 +2544,11 @@ fall_velocity_check()
if (!vars["was_on_ground"])
{
// fall damage does not register when player's max health is less than 100 and has PHD Flopper
if(self.maxhealth < 100 && self hasPerk("specialty_flakjacket"))
if (self.maxhealth < 100 && self hasPerk("specialty_flakjacket"))
{
if(is_true(self.divetoprone) && self.fall_velocity <= -300)
if (is_true(self.divetoprone) && self.fall_velocity <= -300)
{
if(isDefined(level.zombiemode_divetonuke_perk_func))
if (isDefined(level.zombiemode_divetonuke_perk_func))
{
[[level.zombiemode_divetonuke_perk_func]](self, self.origin);
}
@ -2569,7 +2569,7 @@ melee_weapon_switch_watcher()
vars = [];
vars["prev_wep"] = undefined;
while(1)
while (1)
{
if (is_true(self.use_staff_melee))
{
@ -2580,14 +2580,14 @@ melee_weapon_switch_watcher()
vars["melee_wep"] = self get_player_melee_weapon();
vars["curr_wep"] = self getCurrentWeapon();
if(vars["curr_wep"] != "none" && !is_offhand_weapon(vars["curr_wep"]))
if (vars["curr_wep"] != "none" && !is_offhand_weapon(vars["curr_wep"]))
{
vars["prev_wep"] = vars["curr_wep"];
}
if(self actionSlotTwoButtonPressed() && !self hasWeapon("time_bomb_zm") && !self hasWeapon("time_bomb_detonator_zm") && !self hasWeapon("equip_dieseldrone_zm") && !self hasWeapon("item_meat_zm"))
if (self actionSlotTwoButtonPressed() && !self hasWeapon("time_bomb_zm") && !self hasWeapon("time_bomb_detonator_zm") && !self hasWeapon("equip_dieseldrone_zm") && !self hasWeapon("item_meat_zm"))
{
if(vars["curr_wep"] != vars["melee_wep"])
if (vars["curr_wep"] != vars["melee_wep"])
{
self switchToWeapon(vars["melee_wep"]);
}
@ -2606,7 +2606,7 @@ disable_bank_teller()
level notify( "stop_bank_teller" );
bank_teller_dmg_trig = getent( "bank_teller_tazer_trig", "targetname" );
if(IsDefined(bank_teller_dmg_trig))
if (IsDefined(bank_teller_dmg_trig))
{
bank_teller_transfer_trig = getent( bank_teller_dmg_trig.target, "targetname" );
bank_teller_dmg_trig delete();
@ -2621,11 +2621,11 @@ disable_carpenter()
wallbuy_location_changes()
{
if(!is_classic())
if (!is_classic())
{
if(level.scr_zm_map_start_location == "farm")
if (level.scr_zm_map_start_location == "farm")
{
if(level.scr_zm_ui_gametype == "zstandard")
if (level.scr_zm_ui_gametype == "zstandard")
{
level thread remove_wallbuy("tazer_knuckles_zm");
}
@ -2636,9 +2636,9 @@ wallbuy_location_changes()
add_wallbuy("claymore_zm");
}
if(level.scr_zm_map_start_location == "street")
if (level.scr_zm_map_start_location == "street")
{
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
add_wallbuy("beretta93r_zm");
add_wallbuy("m16_zm");
@ -2655,9 +2655,9 @@ remove_wallbuy( name )
wait 0.05;
for(i = 0; i < level._unitriggers.trigger_stubs.size; i++)
for (i = 0; i < level._unitriggers.trigger_stubs.size; i++)
{
if(IsDefined(level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade) && level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade == name)
if (IsDefined(level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade) && level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade == name)
{
maps\mp\zombies\_zm_unitrigger::unregister_unitrigger( level._unitriggers.trigger_stubs[i] );
}
@ -2674,11 +2674,11 @@ add_wallbuy( name, script_noteworthy )
spawnable_weapon_spawns = arraycombine( spawnable_weapon_spawns, getstructarray( "buildable_wallbuy", "targetname" ), 1, 0 );
spawnable_weapon_spawns = arraycombine( spawnable_weapon_spawns, getstructarray( "claymore_purchase", "targetname" ), 1, 0 );
for(i = 0; i < spawnable_weapon_spawns.size; i++)
for (i = 0; i < spawnable_weapon_spawns.size; i++)
{
if(IsDefined(spawnable_weapon_spawns[i].zombie_weapon_upgrade) && spawnable_weapon_spawns[i].zombie_weapon_upgrade == name)
if (IsDefined(spawnable_weapon_spawns[i].zombie_weapon_upgrade) && spawnable_weapon_spawns[i].zombie_weapon_upgrade == name)
{
if(isDefined(script_noteworthy) && isDefined(spawnable_weapon_spawns[i].script_noteworthy) && !isSubStr(spawnable_weapon_spawns[i].script_noteworthy, script_noteworthy))
if (isDefined(script_noteworthy) && isDefined(spawnable_weapon_spawns[i].script_noteworthy) && !isSubStr(spawnable_weapon_spawns[i].script_noteworthy, script_noteworthy))
{
continue;
}
@ -2689,7 +2689,7 @@ add_wallbuy( name, script_noteworthy )
}
}
if(!IsDefined(struct))
if (!IsDefined(struct))
{
return;
}
@ -2733,7 +2733,7 @@ grenade_fire_watcher()
level endon("end_game");
self endon("disconnect");
while(1)
while (1)
{
self waittill("grenade_fire", grenade, weapname);
@ -2756,7 +2756,7 @@ temp_disable_offhand_weapons()
self disableOffhandWeapons();
while(self isThrowingGrenade())
while (self isThrowingGrenade())
{
wait 0.05;
}
@ -2789,11 +2789,11 @@ weapon_inspect_watcher()
vars = [];
while(1)
while (1)
{
wait 0.05;
if(self isSwitchingWeapons())
if (self isSwitchingWeapons())
{
continue;
}
@ -2802,21 +2802,21 @@ weapon_inspect_watcher()
vars["is_primary"] = 0;
foreach(wep in self getWeaponsListPrimaries())
foreach (wep in self getWeaponsListPrimaries())
{
if(wep == vars["curr_wep"])
if (wep == vars["curr_wep"])
{
vars["is_primary"] = 1;
break;
}
}
if(!vars["is_primary"])
if (!vars["is_primary"])
{
continue;
}
if(self actionSlotThreeButtonPressed() && self getWeaponAmmoClip(vars["curr_wep"]) != 0)
if (self actionSlotThreeButtonPressed() && self getWeaponAmmoClip(vars["curr_wep"]) != 0)
{
self initialWeaponRaise(vars["curr_wep"]);
}
@ -2828,9 +2828,9 @@ buildbuildables()
// need a wait or else some buildables dont build
wait 1;
if(is_classic())
if (is_classic())
{
if(level.scr_zm_map_start_location == "transit")
if (level.scr_zm_map_start_location == "transit")
{
level.buildables_available = array("turbine", "riotshield_zm", "turret", "electric_trap", "jetgun_zm");
@ -2846,7 +2846,7 @@ buildbuildables()
// power switch is not showing up from forced build
show_powerswitch();
}
else if(level.scr_zm_map_start_location == "rooftop")
else if (level.scr_zm_map_start_location == "rooftop")
{
level.buildables_available = array("springpad_zm", "slipgun_zm");
@ -2854,7 +2854,7 @@ buildbuildables()
buildbuildable( "springpad_zm" );
buildbuildable( "sq_common", 1 );
}
else if(level.scr_zm_map_start_location == "processing")
else if (level.scr_zm_map_start_location == "processing")
{
flag_wait( "initial_blackscreen_passed" ); // wait for buildables to randomize
wait 1;
@ -2876,7 +2876,7 @@ buildbuildables()
}
else
{
if(level.scr_zm_map_start_location == "street")
if (level.scr_zm_map_start_location == "street")
{
flag_wait( "initial_blackscreen_passed" ); // wait for buildables to be built
wait 1;
@ -3023,7 +3023,7 @@ updatebuildables()
{
foreach (stub in level._unitriggers.trigger_stubs)
{
if(IsDefined(stub.equipname))
if (IsDefined(stub.equipname))
{
stub.cost = stub get_equipment_cost();
stub.trigger_func = scripts\zm\replaced\_zm_buildables_pooled::pooled_buildable_place_think;
@ -3038,7 +3038,7 @@ removebuildable( buildable, poolname )
{
foreach (stub in level.buildablepools[poolname].stubs)
{
if(IsDefined(stub.equipname) && stub.equipname == buildable)
if (IsDefined(stub.equipname) && stub.equipname == buildable)
{
stub.model hide();
maps\mp\zombies\_zm_unitrigger::unregister_unitrigger( stub );
@ -3125,14 +3125,14 @@ buildcraftables()
// need a wait or else some buildables dont build
wait 1;
if(is_classic())
if (is_classic())
{
if(level.scr_zm_map_start_location == "prison")
if (level.scr_zm_map_start_location == "prison")
{
buildcraftable( "alcatraz_shield_zm" );
buildcraftable( "packasplat" );
}
else if(level.scr_zm_map_start_location == "tomb")
else if (level.scr_zm_map_start_location == "tomb")
{
buildcraftable( "tomb_shield_zm" );
buildcraftable( "equip_dieseldrone_zm" );
@ -3263,11 +3263,11 @@ remove_buildable_pieces( buildable_name )
{
foreach (buildable in level.zombie_include_buildables)
{
if(IsDefined(buildable.name) && buildable.name == buildable_name)
if (IsDefined(buildable.name) && buildable.name == buildable_name)
{
pieces = buildable.buildablepieces;
for(i = 0; i < pieces.size; i++)
for (i = 0; i < pieces.size; i++)
{
pieces[i] maps\mp\zombies\_zm_buildables::piece_unspawn();
}
@ -3281,7 +3281,7 @@ jetgun_remove_forced_weapon_switch()
{
foreach (buildable in level.zombie_include_buildables)
{
if(IsDefined(buildable.name) && buildable.name == "jetgun_zm")
if (IsDefined(buildable.name) && buildable.name == "jetgun_zm")
{
buildable.onbuyweapon = undefined;
return;
@ -3327,24 +3327,24 @@ weapon_locker_give_ammo_after_rounds()
{
self endon("disconnect");
while(1)
while (1)
{
level waittill("end_of_round");
if(isDefined(self.stored_weapon_data))
if (isDefined(self.stored_weapon_data))
{
if(self.stored_weapon_data["name"] != "none")
if (self.stored_weapon_data["name"] != "none")
{
self.stored_weapon_data["clip"] = weaponClipSize(self.stored_weapon_data["name"]);
self.stored_weapon_data["stock"] = weaponMaxAmmo(self.stored_weapon_data["name"]);
}
if(self.stored_weapon_data["dw_name"] != "none")
if (self.stored_weapon_data["dw_name"] != "none")
{
self.stored_weapon_data["lh_clip"] = weaponClipSize(self.stored_weapon_data["dw_name"]);
}
if(self.stored_weapon_data["alt_name"] != "none")
if (self.stored_weapon_data["alt_name"] != "none")
{
self.stored_weapon_data["alt_clip"] = weaponClipSize(self.stored_weapon_data["alt_name"]);
self.stored_weapon_data["alt_stock"] = weaponMaxAmmo(self.stored_weapon_data["alt_name"]);
@ -3528,7 +3528,7 @@ tombstone_save()
self.tombstone_perks = tombstone_save_perks(self);
// can't switch to alt weapon
if(is_alt_weapon(self.tombstone_savedweapon_currentweapon))
if (is_alt_weapon(self.tombstone_savedweapon_currentweapon))
{
self.tombstone_savedweapon_currentweapon = maps\mp\zombies\_zm_weapons::get_nonalternate_weapon(self.tombstone_savedweapon_currentweapon);
}
@ -3654,7 +3654,7 @@ tombstone_give()
primary_weapons = self getWeaponsListPrimaries();
foreach(weapon in primary_weapons)
foreach (weapon in primary_weapons)
{
self takeWeapon(weapon);
}
@ -3779,7 +3779,7 @@ tombstone_give()
current_wep = self getCurrentWeapon();
if(!isSubStr(current_wep, "perk_bottle") && !isSubStr(current_wep, "knuckle_crack") && !isSubStr(current_wep, "flourish") && !isSubStr(current_wep, "item_meat"))
if (!isSubStr(current_wep, "perk_bottle") && !isSubStr(current_wep, "knuckle_crack") && !isSubStr(current_wep, "flourish") && !isSubStr(current_wep, "item_meat"))
{
switched = 0;
primaries = self getweaponslistprimaries();
@ -3793,7 +3793,7 @@ tombstone_give()
}
}
if(!switched)
if (!switched)
{
if ( primaries.size > 0 )
{
@ -3824,7 +3824,7 @@ additionalprimaryweapon_indicator()
{
self endon("disconnect");
if(!is_true(level.zombiemode_using_additionalprimaryweapon_perk))
if (!is_true(level.zombiemode_using_additionalprimaryweapon_perk))
{
return;
}
@ -3924,22 +3924,22 @@ additionalprimaryweapon_stowed_weapon_refill()
{
vars["string"] = self waittill_any_return("weapon_change", "weapon_change_complete", "specialty_additionalprimaryweapon_stop", "spawned_player");
if(self hasPerk("specialty_additionalprimaryweapon"))
if (self hasPerk("specialty_additionalprimaryweapon"))
{
vars["curr_wep"] = self getCurrentWeapon();
if(vars["curr_wep"] == "none")
if (vars["curr_wep"] == "none")
{
continue;
}
primaries = self getWeaponsListPrimaries();
foreach(primary in primaries)
foreach (primary in primaries)
{
if(primary != maps\mp\zombies\_zm_weapons::get_nonalternate_weapon(vars["curr_wep"]))
if (primary != maps\mp\zombies\_zm_weapons::get_nonalternate_weapon(vars["curr_wep"]))
{
if(vars["string"] != "weapon_change")
if (vars["string"] != "weapon_change")
{
self thread refill_after_time(primary);
}
@ -3964,22 +3964,22 @@ refill_after_time(primary)
vars["reload_time"] = weaponReloadTime(primary);
vars["reload_amount"] = undefined;
if(primary == "m32_zm" || primary == "python_zm" || maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "judge_zm" || maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "870mcs_zm" || maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "ksg_zm")
if (primary == "m32_zm" || primary == "python_zm" || maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "judge_zm" || maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "870mcs_zm" || maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "ksg_zm")
{
vars["reload_amount"] = 1;
if(maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "ksg_zm" && maps\mp\zombies\_zm_weapons::is_weapon_upgraded(primary))
if (maps\mp\zombies\_zm_weapons::get_base_weapon_name(primary, 1) == "ksg_zm" && maps\mp\zombies\_zm_weapons::is_weapon_upgraded(primary))
{
vars["reload_amount"] = 2;
}
}
if(!isDefined(vars["reload_amount"]) && vars["reload_time"] < 1)
if (!isDefined(vars["reload_amount"]) && vars["reload_time"] < 1)
{
vars["reload_time"] = 1;
}
if(self hasPerk("specialty_fastreload"))
if (self hasPerk("specialty_fastreload"))
{
vars["reload_time"] *= getDvarFloat("perk_weapReloadMultiplier");
}
@ -3990,12 +3990,12 @@ refill_after_time(primary)
vars["ammo_stock"] = self getWeaponAmmoStock(primary);
vars["missing_clip"] = weaponClipSize(primary) - vars["ammo_clip"];
if(vars["missing_clip"] > vars["ammo_stock"])
if (vars["missing_clip"] > vars["ammo_stock"])
{
vars["missing_clip"] = vars["ammo_stock"];
}
if(isDefined(vars["reload_amount"]) && vars["missing_clip"] > vars["reload_amount"])
if (isDefined(vars["reload_amount"]) && vars["missing_clip"] > vars["reload_amount"])
{
vars["missing_clip"] = vars["reload_amount"];
}
@ -4005,13 +4005,13 @@ refill_after_time(primary)
vars["dw_primary"] = weaponDualWieldWeaponName(primary);
if(vars["dw_primary"] != "none")
if (vars["dw_primary"] != "none")
{
vars["ammo_clip"] = self getWeaponAmmoClip(vars["dw_primary"]);
vars["ammo_stock"] = self getWeaponAmmoStock(vars["dw_primary"]);
vars["missing_clip"] = weaponClipSize(vars["dw_primary"]) - vars["ammo_clip"];
if(vars["missing_clip"] > vars["ammo_stock"])
if (vars["missing_clip"] > vars["ammo_stock"])
{
vars["missing_clip"] = vars["ammo_stock"];
}
@ -4022,13 +4022,13 @@ refill_after_time(primary)
vars["alt_primary"] = weaponAltWeaponName(primary);
if(vars["alt_primary"] != "none")
if (vars["alt_primary"] != "none")
{
vars["ammo_clip"] = self getWeaponAmmoClip(vars["alt_primary"]);
vars["ammo_stock"] = self getWeaponAmmoStock(vars["alt_primary"]);
vars["missing_clip"] = weaponClipSize(vars["alt_primary"]) - vars["ammo_clip"];
if(vars["missing_clip"] > vars["ammo_stock"])
if (vars["missing_clip"] > vars["ammo_stock"])
{
vars["missing_clip"] = vars["ammo_stock"];
}
@ -4037,7 +4037,7 @@ refill_after_time(primary)
self setWeaponAmmoStock(vars["alt_primary"], vars["ammo_stock"] - vars["missing_clip"]);
}
if(isDefined(vars["reload_amount"]) && self getWeaponAmmoStock(primary) > 0 && self getWeaponAmmoClip(primary) < weaponClipSize(primary))
if (isDefined(vars["reload_amount"]) && self getWeaponAmmoStock(primary) > 0 && self getWeaponAmmoClip(primary) < weaponClipSize(primary))
{
self refill_after_time(primary);
}
@ -4064,15 +4064,15 @@ show_powerswitch()
zone_changes()
{
if(level.script == "zm_transit")
if (level.script == "zm_transit")
{
if(level.scr_zm_map_start_location == "farm")
if (level.scr_zm_map_start_location == "farm")
{
// Barn to Farm
flag_set("OnFarm_enter");
}
}
else if(level.script == "zm_highrise")
else if (level.script == "zm_highrise")
{
// Green Highrise to Lower Blue Highrise
level.zones[ "zone_green_level3b" ].adjacent_zones[ "zone_blue_level1c" ] structdelete();
@ -4110,7 +4110,7 @@ remove_status_icons_on_intermission()
players = get_players();
foreach(player in players)
foreach (player in players)
{
player.statusicon = "";
}
@ -4122,12 +4122,12 @@ destroy_on_end_game()
level waittill("end_game");
if(isDefined(self.bar))
if (isDefined(self.bar))
{
self.bar destroy();
}
if(isDefined(self.barframe))
if (isDefined(self.barframe))
{
self.barframe destroy();
}
@ -4141,12 +4141,12 @@ destroy_on_intermission()
level waittill("intermission");
if(isDefined(self.bar))
if (isDefined(self.bar))
{
self.bar destroy();
}
if(isDefined(self.barframe))
if (isDefined(self.barframe))
{
self.barframe destroy();
}

4
scripts/zm/locs/zm_prison_loc_docks.gsc
View File

@ -115,12 +115,12 @@ main()
set_box_weapons()
{
if(isDefined(level.zombie_weapons["thompson_zm"]))
if (isDefined(level.zombie_weapons["thompson_zm"]))
{
level.zombie_weapons["thompson_zm"].is_in_box = 0;
}
if(isDefined(level.zombie_weapons["beretta93r_zm"]))
if (isDefined(level.zombie_weapons["beretta93r_zm"]))
{
level.zombie_weapons["beretta93r_zm"].is_in_box = 1;
}

2
scripts/zm/locs/zm_transit_loc_cornfield.gsc
View File

@ -39,7 +39,7 @@ struct_init()
respawn_array = getstructarray(zone_respawnpoints[zone].target, "targetname");
foreach(respawn in respawn_array)
foreach (respawn in respawn_array)
{
scripts\zm\replaced\utility::register_map_spawn( respawn.origin + (100, 0, 0), respawn.angles, zone, respawn.script_int );
}

24
scripts/zm/locs/zm_transit_loc_diner.gsc
View File

@ -17,9 +17,9 @@ struct_init()
ind = 0;
respawnpoints = maps\mp\gametypes_zm\_zm_gametype::get_player_spawns_for_gametype();
for(i = 0; i < respawnpoints.size; i++)
for (i = 0; i < respawnpoints.size; i++)
{
if(respawnpoints[i].script_noteworthy == "zone_gas")
if (respawnpoints[i].script_noteworthy == "zone_gas")
{
ind = i;
break;
@ -31,9 +31,9 @@ struct_init()
respawn_array = getstructarray(respawnpoints[ind].target, "targetname");
foreach(respawn in respawn_array)
foreach (respawn in respawn_array)
{
if(respawn.script_int == 2)
if (respawn.script_int == 2)
{
respawn.angles += (0, 180, 0);
}
@ -75,52 +75,52 @@ struct_init()
{
object.script_gameobjectname = "zstandard zgrief zcleansed zturned";
if(object.origin == (-6460.7, -7115, 6.8))
if (object.origin == (-6460.7, -7115, 6.8))
{
object setModel("veh_t6_civ_microbus_dead");
object.origin += anglesToUp(object.angles) * -65;
object.origin += anglesToForward(object.angles) * 125;
}
else if(object.origin == (-6550.5, -6901.7, 6.8))
else if (object.origin == (-6550.5, -6901.7, 6.8))
{
object setModel("veh_t6_civ_smallwagon_dead");
object.origin += anglesToUp(object.angles) * -60;
object.origin += anglesToForward(object.angles) * 150;
}
else if(object.origin == (-6251.1, -6449.4, 20.8))
else if (object.origin == (-6251.1, -6449.4, 20.8))
{
object setModel("veh_t6_civ_60s_coupe_dead");
object.origin += anglesToUp(object.angles) * -60;
object.origin += anglesToForward(object.angles) * 125;
object.origin += anglesToRight(object.angles) * 25;
}
else if(object.origin == (-5822.9, -6434.6, 20.8))
else if (object.origin == (-5822.9, -6434.6, 20.8))
{
object setModel("p6_zm_rocks_medium_05");
object.origin += anglesToUp(object.angles) * -80;
object.origin += anglesToForward(object.angles) * 50;
object.origin += anglesToRight(object.angles) * 100;
}
else if(object.origin == (-5589.5, -6310.3, 24.8))
else if (object.origin == (-5589.5, -6310.3, 24.8))
{
object setModel("p6_zm_rocks_medium_05");
object.origin += anglesToUp(object.angles) * -80;
object.origin += anglesToForward(object.angles) * 50;
object.origin += anglesToRight(object.angles) * 125;
}
else if(object.origin == (-4813, -6665.3, 0.8))
else if (object.origin == (-4813, -6665.3, 0.8))
{
object setModel("veh_t6_civ_60s_coupe_dead");
object.origin += anglesToUp(object.angles) * -65;
object.origin += anglesToForward(object.angles) * 100;
}
else if(object.origin == (-3978.4, -6484.9, 0.8))
else if (object.origin == (-3978.4, -6484.9, 0.8))
{
object setModel("veh_t6_civ_smallwagon_dead");
object.origin += anglesToUp(object.angles) * -60;
object.origin += anglesToForward(object.angles) * 125;
}
else if(object.origin == (-3902.4, -6884.9, 0.8))
else if (object.origin == (-3902.4, -6884.9, 0.8))
{
object setModel("veh_t6_civ_microbus_dead");
object.origin += anglesToUp(object.angles) * -65;

6
scripts/zm/locs/zm_transit_loc_power.gsc
View File

@ -20,9 +20,9 @@ struct_init()
ind = 0;
respawnpoints = maps\mp\gametypes_zm\_zm_gametype::get_player_spawns_for_gametype();
for(i = 0; i < respawnpoints.size; i++)
for (i = 0; i < respawnpoints.size; i++)
{
if(respawnpoints[i].script_noteworthy == "zone_prr")
if (respawnpoints[i].script_noteworthy == "zone_prr")
{
ind = i;
break;
@ -46,7 +46,7 @@ struct_init()
respawn_array = getstructarray(respawnpoints[ind].target, "targetname");
foreach(respawn in respawn_array)
foreach (respawn in respawn_array)
{
angles = respawn.angles;

68
scripts/zm/replaced/_zm.gsc
View File

@ -490,7 +490,7 @@ ai_calculate_health( round_number )
while ( i <= round_number )
{
if( level.zombie_health > max_health )
if ( level.zombie_health > max_health )
{
level.zombie_health = max_health;
return;
@ -986,7 +986,7 @@ countdown_hud_timer(time)
{
self endon("death");
while(time > 0)
while (time > 0)
{
self setvalue(time);
self thread maps\mp\gametypes_zm\_hud::fontpulse(level);
@ -1424,43 +1424,43 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon,
attacker thread maps\mp\gametypes_zm\_weapons::checkhit( weapon );
if(maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "saritch_zm")
if (maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "saritch_zm")
{
final_damage *= 2;
}
if(weapon == "ray_gun_zm" && meansofdeath == "MOD_PROJECTILE")
if (weapon == "ray_gun_zm" && meansofdeath == "MOD_PROJECTILE")
{
final_damage = 1500;
}
if(weapon == "ray_gun_upgraded_zm" && meansofdeath == "MOD_PROJECTILE")
if (weapon == "ray_gun_upgraded_zm" && meansofdeath == "MOD_PROJECTILE")
{
final_damage = 2000;
}
if(weapon == "blundergat_zm" || weapon == "blundergat_upgraded_zm")
if (weapon == "blundergat_zm" || weapon == "blundergat_upgraded_zm")
{
if(!is_true(self.is_brutus))
if (!is_true(self.is_brutus))
{
damage_scalar = final_damage / 1000;
min_damage = int(damage_scalar * level.zombie_health) + 1;
if(final_damage < min_damage)
if (final_damage < min_damage)
{
final_damage = min_damage;
}
}
}
if(weapon == "blundersplat_explosive_dart_zm")
if (weapon == "blundersplat_explosive_dart_zm")
{
if(!is_true(self.is_brutus))
if (!is_true(self.is_brutus))
{
damage_scalar = final_damage / 3000;
min_damage = int(damage_scalar * level.zombie_health) + 1;
if(final_damage < min_damage)
if (final_damage < min_damage)
{
final_damage = min_damage;
}
@ -1475,21 +1475,21 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon,
}
}
if(attacker HasPerk("specialty_rof"))
if (attacker HasPerk("specialty_rof"))
{
if(meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET")
if (meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET")
{
final_damage *= 1.5;
}
}
if(attacker HasPerk("specialty_deadshot"))
if (attacker HasPerk("specialty_deadshot"))
{
if(is_headshot(weapon, shitloc, meansofdeath))
if (is_headshot(weapon, shitloc, meansofdeath))
{
if(meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET")
if (meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET")
{
if(!isSubStr(weaponClass(weapon), "spread") || maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "ksg_zm")
if (!isSubStr(weaponClass(weapon), "spread") || maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "ksg_zm")
{
final_damage *= 2;
}
@ -1502,7 +1502,7 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon,
final_damage *= 2;
}
if(is_true(level.zombie_vars[attacker.team]["zombie_half_damage"]) && !is_true(self.marked_for_death))
if (is_true(level.zombie_vars[attacker.team]["zombie_half_damage"]) && !is_true(self.marked_for_death))
{
final_damage /= 2;
}
@ -1689,20 +1689,20 @@ getfreespawnpoint( spawnpoints, player )
num = 0;
players = get_players(self.team);
for(num = 0; num < 4; num++)
for (num = 0; num < 4; num++)
{
valid_num = true;
foreach(player in players)
foreach (player in players)
{
if(player != self && isdefined(player.playernum) && player.playernum == num)
if (player != self && isdefined(player.playernum) && player.playernum == num)
{
valid_num = false;
break;
}
}
if(valid_num)
if (valid_num)
{
break;
}
@ -2036,7 +2036,7 @@ player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath,
}
// fix turrets damaging players
if(sweapon == "zombie_bullet_crouch_zm" && smeansofdeath == "MOD_RIFLE_BULLET")
if (sweapon == "zombie_bullet_crouch_zm" && smeansofdeath == "MOD_RIFLE_BULLET")
{
return 0;
}
@ -2178,7 +2178,7 @@ player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath,
{
if ( (!is_true( self.laststand ) && !self maps\mp\zombies\_zm_laststand::player_is_in_laststand()) || !isDefined( self.last_player_attacker ) )
{
if(isDefined( eattacker ) && isplayer( eattacker ) && eattacker.team != self.team)
if (isDefined( eattacker ) && isplayer( eattacker ) && eattacker.team != self.team)
{
if ( isDefined( eattacker.maxhealth ) && is_true( eattacker.is_zombie ) )
{
@ -2296,31 +2296,31 @@ is_solo_death( players )
{
if ( players.size == 1 && flag( "solo_game" ) )
{
if(self.solo_lives_given >= 3)
if (self.solo_lives_given >= 3)
{
return 1;
}
if(isDefined(self.e_chugabud_corpse))
if (isDefined(self.e_chugabud_corpse))
{
return 0;
}
active_perks = 0;
if(isDefined(self.perks_active))
if (isDefined(self.perks_active))
{
active_perks = self.perks_active.size;
}
disabled_perks = 0;
if(isDefined(self.disabled_perks))
if (isDefined(self.disabled_perks))
{
disabled_perks = self.disabled_perks.size;
}
if(active_perks <= disabled_perks)
if (active_perks <= disabled_perks)
{
return 1;
}
@ -2371,19 +2371,19 @@ player_laststand( einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, s
{
active_perks = 0;
if(isDefined(self.perks_active))
if (isDefined(self.perks_active))
{
active_perks = self.perks_active.size;
}
disabled_perks = 0;
if(isDefined(self.disabled_perks))
if (isDefined(self.disabled_perks))
{
disabled_perks = self.disabled_perks.size;
}
if(active_perks > disabled_perks || isDefined(self.e_chugabud_corpse))
if (active_perks > disabled_perks || isDefined(self.e_chugabud_corpse))
{
self thread maps\mp\zombies\_zm::wait_and_revive();
}
@ -2594,7 +2594,7 @@ player_revive_monitor()
{
self maps\mp\zombies\_zm_audio::create_and_play_dialog( "general", "revive_up" );
if(reviver != self)
if (reviver != self)
{
points = self.score_lost_when_downed;
reviver maps\mp\zombies\_zm_score::player_add_points( "reviver", points );
@ -2879,7 +2879,7 @@ end_game()
if ( !isDefined( level._supress_survived_screen ) )
{
for(i = 0; i < players.size; i++)
for (i = 0; i < players.size; i++)
{
survived[ i ] destroy();
game_over[ i ] destroy();

2
scripts/zm/replaced/_zm_ai_brutus.gsc
View File

@ -693,7 +693,7 @@ brutus_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon
brutus_health_increases()
{
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
return;
}

2
scripts/zm/replaced/_zm_ai_dogs.gsc
View File

@ -48,7 +48,7 @@ dog_round_tracker()
dog_round_start();
level.round_spawn_func = ::dog_round_spawning;
if( !isdefined( level.prev_dog_round_amount ) )
if ( !isdefined( level.prev_dog_round_amount ) )
{
level.prev_dog_round_amount = randomintrange( 4, 6 );
level.next_dog_round = level.round_number + level.prev_dog_round_amount;

2
scripts/zm/replaced/_zm_ai_leaper.gsc
View File

@ -42,7 +42,7 @@ leaper_round_tracker()
level.round_spawn_func = ::leaper_round_spawning;
level.round_wait_func = ::leaper_round_wait;
if( !isdefined( level.prev_leaper_round_amount ) )
if ( !isdefined( level.prev_leaper_round_amount ) )
{
level.prev_leaper_round_amount = randomintrange( 4, 6 );
level.next_leaper_round = level.round_number + level.prev_leaper_round_amount;

10
scripts/zm/replaced/_zm_banking.gsc
View File

@ -28,13 +28,13 @@ gain_interest_after_rounds()
{
self endon("disconnect");
while(1)
while (1)
{
level waittill("end_of_round");
self.account_value *= 1.1;
if(self.account_value > level.bank_account_max)
if (self.account_value > level.bank_account_max)
{
self.account_value = level.bank_account_max;
}
@ -83,13 +83,13 @@ trigger_deposit_think()
account_value = level.bank_account_increment;
score = level.bank_deposit_ddl_increment_amount;
if(score > player.score)
if (score > player.score)
{
account_value = player.score / level.bank_deposit_ddl_increment_amount;
score = player.score;
}
if((player.account_value + account_value) > level.bank_account_max)
if ((player.account_value + account_value) > level.bank_account_max)
{
account_value = level.bank_account_max - player.account_value;
score = round_up_to_ten(int(account_value * level.bank_deposit_ddl_increment_amount));
@ -137,7 +137,7 @@ trigger_withdraw_think()
score = level.bank_deposit_ddl_increment_amount;
account_value = level.bank_account_increment;
if(account_value > player.account_value)
if (account_value > player.account_value)
{
account_value = player.account_value;
score = round_up_to_ten(int(account_value * level.bank_deposit_ddl_increment_amount));

2
scripts/zm/replaced/_zm_equip_subwoofer.gsc
View File

@ -10,7 +10,7 @@ startsubwooferdecay( weapon )
self endon( "equip_subwoofer_zm_taken" );
// hack to decrease max subwoofer time
if( self.subwoofer_health > 30 )
if ( self.subwoofer_health > 30 )
{
self.subwoofer_health = 30;
}

26
scripts/zm/replaced/_zm_game_module.gsc
View File

@ -7,7 +7,7 @@ wait_for_team_death_and_round_end()
level endon( "game_module_ended" );
level endon( "end_game" );
if(level.scr_zm_ui_gametype_obj != "zsnr")
if (level.scr_zm_ui_gametype_obj != "zsnr")
{
return;
}
@ -54,7 +54,7 @@ wait_for_team_death_and_round_end()
{
if ( !checking_for_round_tie )
{
if(cia_alive == 0 && cdc_alive == 0)
if (cia_alive == 0 && cdc_alive == 0)
{
level notify( "stop_round_end_check" );
level thread check_for_round_end();
@ -76,7 +76,7 @@ wait_for_team_death_and_round_end()
if ( !checking_for_round_tie )
{
if(cia_alive == 0 && cdc_alive == 0)
if (cia_alive == 0 && cdc_alive == 0)
{
level notify( "stop_round_end_check" );
level thread check_for_round_end();
@ -115,7 +115,7 @@ check_for_round_end(winner)
level endon( "stop_round_end_check" );
level endon( "end_game" );
if(isDefined(winner))
if (isDefined(winner))
{
wait 5;
}
@ -133,9 +133,9 @@ round_end(winner)
team = undefined;
if(isDefined(winner))
if (isDefined(winner))
{
if(winner == "A")
if (winner == "A")
{
team = "axis";
}
@ -152,12 +152,12 @@ round_end(winner)
players = get_players();
foreach(player in players)
foreach (player in players)
{
// don't spawn tombstone powerup on next down
player.hasperkspecialtytombstone = undefined;
if(is_player_valid(player))
if (is_player_valid(player))
{
// don't give perk
player notify("perk_abort_drinking");
@ -165,9 +165,9 @@ round_end(winner)
player [[level._game_module_player_laststand_callback]]();
}
if(player maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (player maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
if(isDefined(level.zombie_last_stand_ammo_return))
if (isDefined(level.zombie_last_stand_ammo_return))
{
player [[level.zombie_last_stand_ammo_return]](1);
}
@ -284,14 +284,14 @@ player_respawn_award()
maps\mp\zombies\_zm::award_grenades_for_survivors();
players = get_players();
foreach(player in players)
foreach (player in players)
{
if(player.score < level.player_starting_points)
if (player.score < level.player_starting_points)
{
player maps\mp\zombies\_zm_score::add_to_player_score(level.player_starting_points - player.score);
}
if(isDefined(player get_player_placeable_mine()))
if (isDefined(player get_player_placeable_mine()))
{
player giveweapon(player get_player_placeable_mine());
player set_player_placeable_mine(player get_player_placeable_mine());

10
scripts/zm/replaced/_zm_gametype.gsc
View File

@ -213,7 +213,7 @@ hide_gump_loading_for_hotjoiners()
self.is_hotjoining = 0;
self.is_hotjoin = 1;
if(isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
if (isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
{
wait 0.05;
@ -437,20 +437,20 @@ do_team_change()
other_team = getotherteam(self.pers["team"]);
players = get_players(other_team);
for(num = 0; num < 4; num++)
for (num = 0; num < 4; num++)
{
valid_num = true;
foreach(player in players)
foreach (player in players)
{
if(isdefined(player.playernum) && player.playernum == num)
if (isdefined(player.playernum) && player.playernum == num)
{
valid_num = false;
break;
}
}
if(valid_num)
if (valid_num)
{
break;
}

34
scripts/zm/replaced/_zm_perks.gsc
View File

@ -846,7 +846,7 @@ perk_think( perk )
self unsetperk( perk );
self.num_perks--;
switch( perk )
switch ( perk )
{
case "specialty_armorvest":
self setmaxhealth( self.premaxhealth );
@ -1033,7 +1033,7 @@ set_perk_clientfield( perk, state )
initialize_custom_perk_arrays()
{
if(!isDefined(level._custom_perks))
if (!isDefined(level._custom_perks))
{
level._custom_perks = [];
}
@ -1083,7 +1083,7 @@ initialize_custom_perk_arrays()
struct.scr_zm_map_start_location = "processing";
move_perk_machine("zm_buried", "street", "specialty_fastreload", struct);
if(getDvar("g_gametype") == "zgrief" && getDvarIntDefault("ui_gametype_pro", 0))
if (getDvar("g_gametype") == "zgrief" && getDvarIntDefault("ui_gametype_pro", 0))
{
remove_pap_machine();
}
@ -1095,9 +1095,9 @@ remove_pap_machine()
structs = getStructArray("zm_perk_machine", "targetname");
foreach(struct in structs)
foreach (struct in structs)
{
if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_weapupgrade")
if (isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_weapupgrade")
{
struct.script_string = "";
}
@ -1106,7 +1106,7 @@ remove_pap_machine()
move_perk_machine(map, location, perk, move_struct)
{
if(!(level.script == map && level.scr_zm_map_start_location == location))
if (!(level.script == map && level.scr_zm_map_start_location == location))
{
return;
}
@ -1114,11 +1114,11 @@ move_perk_machine(map, location, perk, move_struct)
perk_struct = undefined;
structs = getStructArray("zm_perk_machine", "targetname");
foreach(struct in structs)
foreach (struct in structs)
{
if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == perk)
if (isDefined(struct.script_noteworthy) && struct.script_noteworthy == perk)
{
if(isDefined(struct.script_string) && isSubStr(struct.script_string, "perks_" + location))
if (isDefined(struct.script_string) && isSubStr(struct.script_string, "perks_" + location))
{
perk_struct = struct;
break;
@ -1126,22 +1126,22 @@ move_perk_machine(map, location, perk, move_struct)
}
}
if(!isDefined(perk_struct))
if (!isDefined(perk_struct))
{
return;
}
if(isDefined(move_struct.script_string))
if (isDefined(move_struct.script_string))
{
gametypes = strTok(move_struct.script_string, " ");
foreach(gametype in gametypes)
foreach (gametype in gametypes)
{
perk_struct.script_string += " " + gametype + "_perks_" + location;
}
}
if(isDefined(move_struct.origin))
if (isDefined(move_struct.origin))
{
perk_struct.origin = move_struct.origin;
perk_struct.angles = move_struct.angles;
@ -1149,16 +1149,16 @@ move_perk_machine(map, location, perk, move_struct)
return;
}
foreach(struct in structs)
foreach (struct in structs)
{
if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == move_struct.script_noteworthy)
if (isDefined(struct.script_noteworthy) && struct.script_noteworthy == move_struct.script_noteworthy)
{
if(isDefined(struct.script_string) && isSubStr(struct.script_string, move_struct.scr_zm_ui_gametype + "_perks_" + move_struct.scr_zm_map_start_location))
if (isDefined(struct.script_string) && isSubStr(struct.script_string, move_struct.scr_zm_ui_gametype + "_perks_" + move_struct.scr_zm_map_start_location))
{
perk_struct.origin = struct.origin;
perk_struct.angles = struct.angles;
if(isDefined(move_struct.origin_offset))
if (isDefined(move_struct.origin_offset))
{
perk_struct.origin += move_struct.origin_offset;
}

32
scripts/zm/replaced/_zm_powerups.gsc
View File

@ -315,7 +315,7 @@ full_ammo_powerup( drop_item, player )
{
clip_only = 0;
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
clip_only = 1;
drop_item.hint = &"Clip Ammo!";
@ -369,7 +369,7 @@ full_ammo_powerup( drop_item, player )
if ( players[ i ] hasweapon( primary_weapons[ x ] ) )
{
if(clip_only)
if (clip_only)
{
if (weaponMaxAmmo(primary_weapons[x]) == 0)
{
@ -379,12 +379,12 @@ full_ammo_powerup( drop_item, player )
new_ammo = players[i] getWeaponAmmoStock(primary_weapons[x]) + weaponClipSize(primary_weapons[x]);
if(weaponDualWieldWeaponName(primary_weapons[x]) != "none")
if (weaponDualWieldWeaponName(primary_weapons[x]) != "none")
{
new_ammo += weaponClipSize(weaponDualWieldWeaponName(primary_weapons[x]));
}
if(new_ammo > weaponMaxAmmo(primary_weapons[x]))
if (new_ammo > weaponMaxAmmo(primary_weapons[x]))
{
new_ammo = weaponMaxAmmo(primary_weapons[x]);
}
@ -407,7 +407,7 @@ full_ammo_powerup( drop_item, player )
level thread full_ammo_on_hud( drop_item, player.team );
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
level thread empty_clip_powerup( drop_item, player );
}
@ -450,7 +450,7 @@ empty_clip_powerup( drop_item, player )
i = 0;
players = get_players(team);
while(i < players.size)
while (i < players.size)
{
if ( players[ i ] maps\mp\zombies\_zm_laststand::player_is_in_laststand() )
{
@ -460,12 +460,12 @@ empty_clip_powerup( drop_item, player )
primaries = players[i] getweaponslistprimaries();
foreach(weapon in primaries)
foreach (weapon in primaries)
{
dual_wield_weapon = weaponDualWieldWeaponName(weapon);
alt_weapon = weaponAltWeaponName(weapon);
if(dual_wield_weapon != "none")
if (dual_wield_weapon != "none")
{
players[i] scripts\zm\_zm_reimagined::set_weapon_ammo_clip_left(weapon, 0);
}
@ -572,17 +572,17 @@ nuke_powerup( drop_item, player_team )
players[ i ] maps\mp\zombies\_zm_score::player_add_points( "nuke_powerup", 400 );
}
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
players = get_players(getOtherTeam(player_team));
for(i = 0; i < players.size; i++)
for (i = 0; i < players.size; i++)
{
if(is_player_valid(players[i]))
if (is_player_valid(players[i]))
{
score = 400 * maps\mp\zombies\_zm_score::get_points_multiplier(player);
if(players[i].score < score)
if (players[i].score < score)
{
players[i] maps\mp\zombies\_zm_score::minus_to_player_score(players[i].score);
}
@ -593,7 +593,7 @@ nuke_powerup( drop_item, player_team )
radiusDamage(players[i].origin + (0, 0, 5), 10, 75, 75);
}
else if(players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
else if (players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
if (isDefined(level.player_suicide_func))
{
@ -602,7 +602,7 @@ nuke_powerup( drop_item, player_team )
}
}
if(level.scr_zm_ui_gametype_obj == "zrace")
if (level.scr_zm_ui_gametype_obj == "zrace")
{
if (isDefined(level.increment_score_func))
{
@ -629,7 +629,7 @@ insta_kill_powerup( drop_item, player )
time = 30;
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
time = 15;
level thread half_damage_powerup( drop_item, player );
@ -715,7 +715,7 @@ double_points_powerup( drop_item, player )
time = 30;
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
time = 15;
level thread half_points_powerup( drop_item, player );

12
scripts/zm/replaced/_zm_spawner.gsc
View File

@ -65,14 +65,14 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team )
{
damage = level.round_number * 100;
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
damage = 2000;
}
max_damage = 9000;
if(damage > max_damage)
if (damage > max_damage)
{
damage = max_damage;
}
@ -94,14 +94,14 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team )
{
damage = level.round_number * 25;
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
damage = 500;
}
max_damage = 1500;
if(damage > max_damage)
if (damage > max_damage)
{
damage = max_damage;
}
@ -121,14 +121,14 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team )
{
damage = level.round_number * 50;
if(level.scr_zm_ui_gametype == "zgrief")
if (level.scr_zm_ui_gametype == "zgrief")
{
damage = 1000;
}
max_damage = 3000;
if(damage > max_damage)
if (damage > max_damage)
{
damage = max_damage;
}

6
scripts/zm/replaced/_zm_weap_ballistic_knife.gsc
View File

@ -14,7 +14,7 @@ on_spawn( watcher, player )
self waittill( "stationary", endpos, normal, angles, attacker, prey, bone );
if( is_upgraded && isDefined( prey ) && isplayer( prey ) && prey.team == player.team && prey maps\mp\zombies\_zm_laststand::player_is_in_laststand() )
if ( is_upgraded && isDefined( prey ) && isplayer( prey ) && prey.team == player.team && prey maps\mp\zombies\_zm_laststand::player_is_in_laststand() )
{
return;
}
@ -55,7 +55,7 @@ on_spawn( watcher, player )
watcher.objectarray[ watcher.objectarray.size ] = retrievable_model;
retrievable_model thread drop_knives_to_ground( player );
if( isfriendly )
if ( isfriendly )
{
player notify( "ballistic_knife_stationary", retrievable_model, normal );
}
@ -104,7 +104,7 @@ watch_use_trigger( trigger, model, callback, weapon, playersoundonuse, npcsoundo
if ( !autorecover && !is_true( trigger.force_pickup ) )
{
if( player.throwinggrenade || player meleebuttonpressed() )
if ( player.throwinggrenade || player meleebuttonpressed() )
{
continue;
}

10
scripts/zm/replaced/_zm_weap_emp_bomb.gsc
View File

@ -145,11 +145,11 @@ emp_players(origin, radius, owner)
rsquared = radius * radius;
players = get_players();
foreach(player in players)
foreach (player in players)
{
if(distancesquared(origin, player.origin) < rsquared)
if (distancesquared(origin, player.origin) < rsquared)
{
if(is_player_valid(player) || player maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (is_player_valid(player) || player maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
time = 30;
player shellshock( "frag_grenade_mp", 2 );
@ -169,7 +169,7 @@ player_emp_fx(time)
wait_time = 2.5;
for(i = 0; i < time; i += wait_time)
for (i = 0; i < time; i += wait_time)
{
playfxontag( level._effect[ "elec_torso" ], self, "J_SpineLower" );
@ -197,7 +197,7 @@ player_perk_pause_all_perks_acquired(time)
self endon("player_perk_pause_and_unpause_all_perks");
self endon("disconnect");
while(1)
while (1)
{
self waittill("perk_acquired");

2
scripts/zm/replaced/_zm_weap_jetgun.gsc
View File

@ -82,7 +82,7 @@ sound_ent_cleanup()
is_jetgun_firing()
{
if(!self attackButtonPressed())
if (!self attackButtonPressed())
{
return 0;
}

6
scripts/zm/replaced/_zm_weapons.gsc
View File

@ -158,7 +158,7 @@ init_spawnable_weapon_upgrade()
}
else
{
if( is_lethal_grenade( unitrigger_stub.zombie_weapon_upgrade ) )
if ( is_lethal_grenade( unitrigger_stub.zombie_weapon_upgrade ) )
unitrigger_stub.prompt_and_visibility_func = ::lethal_grenade_update_prompt;
else
unitrigger_stub.prompt_and_visibility_func = ::wall_weapon_update_prompt;
@ -258,7 +258,7 @@ add_dynamic_wallbuy( weapon, wallbuy, pristine )
}
else
{
if( is_lethal_grenade( unitrigger_stub.zombie_weapon_upgrade ) )
if ( is_lethal_grenade( unitrigger_stub.zombie_weapon_upgrade ) )
unitrigger_stub.prompt_and_visibility_func = ::lethal_grenade_update_prompt;
else
unitrigger_stub.prompt_and_visibility_func = ::wall_weapon_update_prompt;
@ -566,7 +566,7 @@ weapon_spawn_think()
is_grenade = 0;
if(weapontype( self.zombie_weapon_upgrade ) == "grenade")
if (weapontype( self.zombie_weapon_upgrade ) == "grenade")
{
is_grenade = 1;
}

16
scripts/zm/replaced/utility.gsc
View File

@ -268,15 +268,15 @@ wallbuy( weapon_name, target, targetname, origin, angles, play_chalk_fx = 1 )
{
melee_weapon = undefined;
foreach(melee_weapon in level._melee_weapons)
foreach (melee_weapon in level._melee_weapons)
{
if(melee_weapon.weapon_name == weapon_name)
if (melee_weapon.weapon_name == weapon_name)
{
break;
}
}
if(isDefined(melee_weapon))
if (isDefined(melee_weapon))
{
unitrigger_stub.cost = melee_weapon.cost;
unitrigger_stub.hint_string = melee_weapon.hint_string;
@ -287,7 +287,7 @@ wallbuy( weapon_name, target, targetname, origin, angles, play_chalk_fx = 1 )
unitrigger_stub.vo_dialog_id = melee_weapon.vo_dialog_id;
unitrigger_stub.flourish_fn = melee_weapon.flourish_fn;
if(is_true(level.disable_melee_wallbuy_icons))
if (is_true(level.disable_melee_wallbuy_icons))
{
unitrigger_stub.cursor_hint = "HINT_NOICON";
unitrigger_stub.cursor_hint_weapon = undefined;
@ -299,7 +299,7 @@ wallbuy( weapon_name, target, targetname, origin, angles, play_chalk_fx = 1 )
}
}
if(weapon_name == "tazer_knuckles_zm")
if (weapon_name == "tazer_knuckles_zm")
{
unitrigger_stub.origin += (anglesToForward(angles) * -7) + (anglesToRight(angles) * -2);
}
@ -318,7 +318,7 @@ wallbuy( weapon_name, target, targetname, origin, angles, play_chalk_fx = 1 )
}
else
{
if( is_lethal_grenade( unitrigger_stub.zombie_weapon_upgrade ) )
if ( is_lethal_grenade( unitrigger_stub.zombie_weapon_upgrade ) )
unitrigger_stub.prompt_and_visibility_func = scripts\zm\replaced\_zm_weapons::lethal_grenade_update_prompt;
else
unitrigger_stub.prompt_and_visibility_func = ::wall_weapon_update_prompt;
@ -326,7 +326,7 @@ wallbuy( weapon_name, target, targetname, origin, angles, play_chalk_fx = 1 )
maps\mp\zombies\_zm_unitrigger::register_static_unitrigger( unitrigger_stub, scripts\zm\replaced\_zm_weapons::weapon_spawn_think );
}
if(weaponType(weapon_name) == "grenade")
if (weaponType(weapon_name) == "grenade")
{
unitrigger_stub thread wallbuy_grenade_model_fix();
}
@ -355,7 +355,7 @@ wallbuy_grenade_model_fix()
{
model = getent(self.target, "targetname");
if(!isDefined(model))
if (!isDefined(model))
{
return;
}

4
scripts/zm/replaced/zgrief.gsc
View File

@ -4,7 +4,7 @@
game_mode_spawn_player_logic()
{
if(isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
if (isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
{
return 0;
}
@ -420,7 +420,7 @@ meat_stink_player( who )
level notify( "new_meat_stink_player" );
level endon( "new_meat_stink_player" );
if(level.scr_zm_ui_gametype_obj == "zmeat")
if (level.scr_zm_ui_gametype_obj == "zmeat")
{
level thread meat_stink(who);
return;

2
scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc
View File

@ -63,7 +63,7 @@ give_team_characters()
}
}
switch( self.characterindex )
switch ( self.characterindex )
{
case 0:
case 2:

8
scripts/zm/replaced/zm_buried_grief_street.gsc
View File

@ -148,12 +148,12 @@ builddynamicwallbuy( location, weaponname )
origin = wallbuy.origin;
// center wallbuy chalk and model, and adjust wallbuy trigger
if(weaponname == "pdw57_zm")
if (weaponname == "pdw57_zm")
{
origin += anglesToForward(wallbuy.angles) * 12;
wallbuy.origin += anglesToForward(wallbuy.angles) * 3;
}
else if(weaponname == "svu_zm")
else if (weaponname == "svu_zm")
{
origin += anglesToForward(wallbuy.angles) * 24;
wallbuy.origin += anglesToForward(wallbuy.angles) * 15;
@ -279,9 +279,9 @@ disable_tunnels()
invalid_zones = array("zone_start", "zone_tunnels_center", "zone_tunnels_north", "zone_tunnels_south");
spawn_points = maps\mp\gametypes_zm\_zm_gametype::get_player_spawns_for_gametype();
foreach(spawn_point in spawn_points)
foreach (spawn_point in spawn_points)
{
if(isinarray(invalid_zones, spawn_point.script_noteworthy))
if (isinarray(invalid_zones, spawn_point.script_noteworthy))
{
spawn_point.locked = 1;
}

2
scripts/zm/replaced/zm_tomb_craftables.gsc
View File

@ -224,7 +224,7 @@ quadrotor_control_thread()
self playsound( "veh_qrdrone_takeoff" );
if(self hasweapon(prev_wep) && prev_wep != "equip_dieseldrone_zm")
if (self hasweapon(prev_wep) && prev_wep != "equip_dieseldrone_zm")
{
self switchtoweapon( prev_wep );
}

4
scripts/zm/replaced/zm_transit_bus.gsc
View File

@ -554,9 +554,9 @@ bus_buyable_weapon_unitrigger_setup(trig)
while (!isDefined(unitrigger))
{
for(i = 0; i < level._unitriggers.trigger_stubs.size; i++)
for (i = 0; i < level._unitriggers.trigger_stubs.size; i++)
{
if(IsDefined(level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade) && level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade == "beretta93r_zm")
if (IsDefined(level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade) && level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade == "beretta93r_zm")
{
unitrigger = level._unitriggers.trigger_stubs[i];
break;

2
scripts/zm/replaced/zm_transit_grief_station.gsc
View File

@ -103,7 +103,7 @@ open_electric_doors_on_door_opened()
foreach ( door in zombie_doors )
{
if(door.target == "busstop_doors")
if (door.target == "busstop_doors")
{
break;
}

4
scripts/zm/replaced/zm_transit_sq.gsc
View File

@ -126,7 +126,7 @@ maxis_sidequest_c()
level endon( "power_on" );
level.sq_progress["maxis"]["C_screecher_dark"] = 0;
for(i = 0; i < 8; i++)
for (i = 0; i < 8; i++)
{
level.sq_progress["maxis"]["C_screecher_" + i] = undefined;
}
@ -154,7 +154,7 @@ maxis_sidequest_c()
zone_used = 0;
for(i = 0; i < 8; i++)
for (i = 0; i < 8; i++)
{
if ( isdefined( level.sq_progress["maxis"]["C_screecher_" + i] ) && zone == level.sq_progress["maxis"]["C_screecher_" + i] )
{

2
scripts/zm/replaced/zm_transit_standard_station.gsc
View File

@ -113,7 +113,7 @@ open_electric_doors_on_door_opened()
foreach ( door in zombie_doors )
{
if(door.target == "busstop_doors")
if (door.target == "busstop_doors")
{
break;
}

402
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

File diff suppressed because it is too large Load Diff

4
scripts/zm/zm_buried/zm_buried_reimagined.gsc
View File

@ -61,7 +61,7 @@ init()
level.zombie_init_done = ::zombie_init_done;
level.special_weapon_magicbox_check = ::buried_special_weapon_magicbox_check;
if(is_gametype_active("zgrief"))
if (is_gametype_active("zgrief"))
{
level.check_for_valid_spawn_near_team_callback = undefined;
}
@ -228,7 +228,7 @@ sloth_barricades_buyable()
debris_trig.script_flag = trig.script_flag;
debris_trig.script_location = trig.script_location;
switch(debris_trig.script_location)
switch (debris_trig.script_location)
{
case "juggernaut_alley":
case "stables_alley":

2
scripts/zm/zm_highrise/zm_highrise_reimagined.gsc
View File

@ -194,7 +194,7 @@ slipgun_change_ammo()
{
foreach (buildable in level.zombie_include_buildables)
{
if(IsDefined(buildable.name) && buildable.name == "slipgun_zm")
if (IsDefined(buildable.name) && buildable.name == "slipgun_zm")
{
buildable.onbuyweapon = ::onbuyweapon_slipgun;
return;

12
scripts/zm/zm_prison/zm_prison_reimagined.gsc
View File

@ -223,23 +223,23 @@ player_respawn_override()
{
respawn_points = getstructarray( "player_respawn_point", "targetname" );
foreach(respawn_point in respawn_points)
foreach (respawn_point in respawn_points)
{
if(respawn_point.script_noteworthy == "zone_cafeteria")
if (respawn_point.script_noteworthy == "zone_cafeteria")
{
respawn_array = getstructarray( respawn_point.target, "targetname" );
remove_respawn_array = [];
foreach(respawn in respawn_array)
foreach (respawn in respawn_array)
{
if(respawn.origin == (2536, 9704, 1360))
if (respawn.origin == (2536, 9704, 1360))
{
// respawn is in acid trap
remove_respawn_array[remove_respawn_array.size] = respawn;
}
}
foreach(respawn in remove_respawn_array)
foreach (respawn in remove_respawn_array)
{
arrayremovevalue(respawn_array, respawn);
}
@ -255,7 +255,7 @@ updatecraftables()
foreach (stub in level._unitriggers.trigger_stubs)
{
if(IsDefined(stub.equipname) && (stub.equipname == "open_table" || stub.equipname == "alcatraz_shield_zm" || stub.equipname == "packasplat"))
if (IsDefined(stub.equipname) && (stub.equipname == "open_table" || stub.equipname == "alcatraz_shield_zm" || stub.equipname == "packasplat"))
{
stub.cost = stub scripts\zm\_zm_reimagined::get_equipment_cost();
stub.trigger_func = ::craftable_place_think;

4
scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
View File

@ -171,7 +171,7 @@ door_price_increase_for_solo()
zombie_blood_dig_changes()
{
if( !is_classic() )
if ( !is_classic() )
{
return;
}
@ -239,7 +239,7 @@ updatecraftables()
foreach (stub in level._unitriggers.trigger_stubs)
{
if(IsDefined(stub.equipname) && (stub.equipname == "open_table" || stub.equipname == "tomb_shield_zm" || stub.equipname == "equip_dieseldrone_zm"))
if (IsDefined(stub.equipname) && (stub.equipname == "open_table" || stub.equipname == "tomb_shield_zm" || stub.equipname == "equip_dieseldrone_zm"))
{
stub.cost = stub scripts\zm\_zm_reimagined::get_equipment_cost();
stub.trigger_func = ::craftable_place_think;

30
scripts/zm/zm_transit/zm_transit_reimagined.gsc
View File

@ -135,7 +135,7 @@ can_revive( player_down )
electric_door_changes()
{
if( is_classic() )
if ( is_classic() )
{
return;
}
@ -183,7 +183,7 @@ electric_door_changes()
power_local_electric_doors_globally()
{
if( !is_classic() )
if ( !is_classic() )
{
return;
}
@ -599,13 +599,13 @@ power_station_vision_change()
flag_wait( "start_zombie_round_logic" );
while(1)
while (1)
{
players = get_players();
foreach(player in players)
foreach (player in players)
{
if(!isDefined(player.power_station_vision_set))
if (!isDefined(player.power_station_vision_set))
{
player.power_station_vision_set = 0;
player.r_exposureValue = level.default_r_exposureValue;
@ -613,9 +613,9 @@ power_station_vision_change()
player setClientDvar("r_exposureValue", level.default_r_exposureValue);
}
if(!player.power_station_vision_set)
if (!player.power_station_vision_set)
{
if(player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_prr") || player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_pcr"))
if (player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_prr") || player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_pcr"))
{
player.power_station_vision_set = 1;
player thread change_dvar_over_time("r_exposureValue", level.changed_r_exposureValue, time, 1);
@ -623,7 +623,7 @@ power_station_vision_change()
}
else
{
if(!(player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_prr") || player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_pcr")))
if (!(player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_prr") || player maps\mp\zombies\_zm_zonemgr::entity_in_zone("zone_pcr")))
{
player.power_station_vision_set = 0;
player thread change_dvar_over_time("r_exposureValue", level.default_r_exposureValue, time, 0);
@ -645,13 +645,13 @@ change_dvar_over_time(dvar, val, time, increment)
i = 0;
while(i < intervals)
while (i < intervals)
{
if(increment)
if (increment)
{
self.r_exposureValue += rate;
if(self.r_exposureValue > val)
if (self.r_exposureValue > val)
{
self.r_exposureValue = val;
}
@ -660,7 +660,7 @@ change_dvar_over_time(dvar, val, time, increment)
{
self.r_exposureValue -= rate;
if(self.r_exposureValue < val)
if (self.r_exposureValue < val)
{
self.r_exposureValue = val;
}
@ -668,7 +668,7 @@ change_dvar_over_time(dvar, val, time, increment)
self setClientDvar(dvar, self.r_exposureValue);
if(self.r_exposureValue == val)
if (self.r_exposureValue == val)
{
return;
}
@ -780,7 +780,7 @@ manage_zones( initial_zone )
while ( getDvarInt( "noclip" ) == 0 || getDvarInt( "notarget" ) != 0 )
{
for( z = 0; z < zkeys.size; z++ )
for ( z = 0; z < zkeys.size; z++ )
{
level.newzones[ zkeys[ z ] ].is_active = 0;
level.newzones[ zkeys[ z ] ].is_occupied = 0;
@ -796,7 +796,7 @@ manage_zones( initial_zone )
zone = level.zones[ zkeys[ z ] ];
newzone = level.newzones[ zkeys[ z ] ];
if( !zone.is_enabled )
if ( !zone.is_enabled )
{
z++;
continue;