INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00
Code Issues Releases Wiki Activity

Unpad brackets

Browse Source
This commit is contained in:
Jbleezy 2023-12-16 21:11:47 -08:00
parent 7ce0cfe9f6
commit b31110f8a6
72 changed files with 873 additions and 873 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
scripts/zm/_zm_reimagined.gsc
View File

@ -2264,7 +2264,7 @@ last_stand_restore_pistol_ammo(only_store_info = false)
while (i < weapon_inventory.size)
{
weapon = weapon_inventory[ i ];
weapon = weapon_inventory[i];
if (weapon != self.laststandpistol)
{
@ -2274,18 +2274,18 @@ last_stand_restore_pistol_ammo(only_store_info = false)
for (j = 0; j < weapon_to_restore.size; j++)
{
check_weapon = weapon_to_restore[ j ];
check_weapon = weapon_to_restore[j];
if (weapon == check_weapon)
{
if (self.stored_weapon_info[ weapon ].given_amt == 0)
if (self.stored_weapon_info[weapon].given_amt == 0)
{
self setweaponammoclip(weapon, self.stored_weapon_info[ weapon ].clip_amt);
self setweaponammoclip(weapon, self.stored_weapon_info[weapon].clip_amt);
if ("none" != dual_wield_name)
self set_weapon_ammo_clip_left(weapon, self.stored_weapon_info[ weapon ].left_clip_amt);
self set_weapon_ammo_clip_left(weapon, self.stored_weapon_info[weapon].left_clip_amt);
self setweaponammostock(weapon, self.stored_weapon_info[ weapon ].stock_amt);
self setweaponammostock(weapon, self.stored_weapon_info[weapon].stock_amt);
break;
}
@ -2303,66 +2303,66 @@ last_stand_restore_pistol_ammo(only_store_info = false)
last_stock = self getweaponammostock(weapon);
last_total = last_clip + last_left_clip + last_stock;
self.stored_weapon_info[ weapon ].used_amt = self.stored_weapon_info[ weapon ].given_amt - last_total;
self.stored_weapon_info[weapon].used_amt = self.stored_weapon_info[weapon].given_amt - last_total;
if (only_store_info)
{
break;
}
used_amt = self.stored_weapon_info[ weapon ].used_amt;
used_amt = self.stored_weapon_info[weapon].used_amt;
if (used_amt >= self.stored_weapon_info[ weapon ].stock_amt)
if (used_amt >= self.stored_weapon_info[weapon].stock_amt)
{
used_amt -= self.stored_weapon_info[ weapon ].stock_amt;
self.stored_weapon_info[ weapon ].stock_amt = 0;
used_amt -= self.stored_weapon_info[weapon].stock_amt;
self.stored_weapon_info[weapon].stock_amt = 0;
if ("none" != dual_wield_name)
{
if (used_amt >= self.stored_weapon_info[ weapon ].left_clip_amt)
if (used_amt >= self.stored_weapon_info[weapon].left_clip_amt)
{
used_amt -= self.stored_weapon_info[ weapon ].left_clip_amt;
self.stored_weapon_info[ weapon ].left_clip_amt = 0;
used_amt -= self.stored_weapon_info[weapon].left_clip_amt;
self.stored_weapon_info[weapon].left_clip_amt = 0;
if (used_amt >= self.stored_weapon_info[ weapon ].clip_amt)
if (used_amt >= self.stored_weapon_info[weapon].clip_amt)
{
used_amt -= self.stored_weapon_info[ weapon ].clip_amt;
self.stored_weapon_info[ weapon ].clip_amt = 0;
used_amt -= self.stored_weapon_info[weapon].clip_amt;
self.stored_weapon_info[weapon].clip_amt = 0;
}
else
{
self.stored_weapon_info[ weapon ].clip_amt -= used_amt;
self.stored_weapon_info[weapon].clip_amt -= used_amt;
}
}
else
{
self.stored_weapon_info[ weapon ].left_clip_amt -= used_amt;
self.stored_weapon_info[weapon].left_clip_amt -= used_amt;
}
}
else
{
if (used_amt >= self.stored_weapon_info[ weapon ].clip_amt)
if (used_amt >= self.stored_weapon_info[weapon].clip_amt)
{
used_amt -= self.stored_weapon_info[ weapon ].clip_amt;
self.stored_weapon_info[ weapon ].clip_amt = 0;
used_amt -= self.stored_weapon_info[weapon].clip_amt;
self.stored_weapon_info[weapon].clip_amt = 0;
}
else
{
self.stored_weapon_info[ weapon ].clip_amt -= used_amt;
self.stored_weapon_info[weapon].clip_amt -= used_amt;
}
}
}
else
{
self.stored_weapon_info[ weapon ].stock_amt -= used_amt;
self.stored_weapon_info[weapon].stock_amt -= used_amt;
}
self setweaponammoclip(weapon, self.stored_weapon_info[ weapon ].clip_amt);
self setweaponammoclip(weapon, self.stored_weapon_info[weapon].clip_amt);
if ("none" != dual_wield_name)
self set_weapon_ammo_clip_left(weapon, self.stored_weapon_info[ weapon ].left_clip_amt);
self set_weapon_ammo_clip_left(weapon, self.stored_weapon_info[weapon].left_clip_amt);
self setweaponammostock(weapon, self.stored_weapon_info[ weapon ].stock_amt);
self setweaponammostock(weapon, self.stored_weapon_info[weapon].stock_amt);
break;
}
@ -3143,7 +3143,7 @@ buildcraftables()
takecraftableparts(buildable)
{
player = get_players()[ 0 ];
player = get_players()[0];
foreach (stub in level.zombie_include_craftables)
{
@ -3166,7 +3166,7 @@ takecraftableparts(buildable)
buildcraftable(buildable)
{
player = get_players()[ 0 ];
player = get_players()[0];
foreach (stub in level.a_uts_craftables)
{
@ -3213,7 +3213,7 @@ player_take_piece(piecespawn)
if (isDefined(piecestub.onpickup))
{
piecespawn [[ piecestub.onpickup ]](self);
piecespawn [[piecestub.onpickup]](self);
}
if (isDefined(piecestub.is_shared) && piecestub.is_shared)
@ -3392,7 +3392,7 @@ tombstone_wobble()
if (isDefined(self))
{
playfxontag(level._effect[ "powerup_on_solo" ], self, "tag_origin");
playfxontag(level._effect["powerup_on_solo"], self, "tag_origin");
self playsound("zmb_tombstone_spawn");
self playloopsound("zmb_tombstone_looper");
}
@ -3420,7 +3420,7 @@ tombstone_emp()
if (distancesquared(origin, self.origin) < (radius * radius))
{
playfx(level._effect[ "powerup_off" ], self.origin);
playfx(level._effect["powerup_off"], self.origin);
self thread tombstone_delete();
}
}
@ -3466,22 +3466,22 @@ tombstone_grab()
while (i < players.size)
{
if (players[ i ].is_zombie)
if (players[i].is_zombie)
{
i++;
continue;
}
else
{
if (isDefined(self.player) && players[ i ] == self.player)
if (isDefined(self.player) && players[i] == self.player)
{
dist = distance(players[ i ].origin, self.origin);
dist = distance(players[i].origin, self.origin);
if (dist < 64)
{
playfx(level._effect[ "powerup_grabbed_solo" ], self.origin);
playfx(level._effect[ "powerup_grabbed_wave_solo" ], self.origin);
players[ i ] tombstone_give();
playfx(level._effect["powerup_grabbed_solo"], self.origin);
playfx(level._effect["powerup_grabbed_wave_solo"], self.origin);
players[i] tombstone_give();
wait 0.1;
playsoundatposition("zmb_tombstone_grab", self.origin);
self stoploopsound();
@ -3489,8 +3489,8 @@ tombstone_grab()
self.icon delete();
self delete();
self notify("tombstone_grabbed");
players[ i ] clientnotify("dc0");
players[ i ] notify("dance_on_my_grave");
players[i] clientnotify("dc0");
players[i] notify("dance_on_my_grave");
}
}
}
@ -3535,9 +3535,9 @@ tombstone_save()
for (i = 0; i < self.tombstone_savedweapon_weapons.size; i++)
{
self.tombstone_savedweapon_weaponsammo_clip[ i ] = self getweaponammoclip(self.tombstone_savedweapon_weapons[ i ]);
self.tombstone_savedweapon_weaponsammo_clip_dualwield[ i ] = self getweaponammoclip(weaponDualWieldWeaponName(self.tombstone_savedweapon_weapons[ i ]));
self.tombstone_savedweapon_weaponsammo_stock[ i ] = self getweaponammostock(self.tombstone_savedweapon_weapons[ i ]);
self.tombstone_savedweapon_weaponsammo_clip[i] = self getweaponammoclip(self.tombstone_savedweapon_weapons[i]);
self.tombstone_savedweapon_weaponsammo_clip_dualwield[i] = self getweaponammoclip(weaponDualWieldWeaponName(self.tombstone_savedweapon_weapons[i]));
self.tombstone_savedweapon_weaponsammo_stock[i] = self getweaponammostock(self.tombstone_savedweapon_weapons[i]);
self.tombstone_savedweapon_weaponsammo_clip_alt[i] = self getweaponammoclip(weaponAltWeaponName(self.tombstone_savedweapon_weapons[i]));
self.tombstone_savedweapon_weaponsammo_stock_alt[i] = self getweaponammostock(weaponAltWeaponName(self.tombstone_savedweapon_weapons[i]));
@ -3609,37 +3609,37 @@ tombstone_save_perks(ent)
if (ent hasperk("specialty_armorvest"))
{
perk_array[ perk_array.size ] = "specialty_armorvest";
perk_array[perk_array.size] = "specialty_armorvest";
}
if (ent hasperk("specialty_deadshot"))
{
perk_array[ perk_array.size ] = "specialty_deadshot";
perk_array[perk_array.size] = "specialty_deadshot";
}
if (ent hasperk("specialty_fastreload"))
{
perk_array[ perk_array.size ] = "specialty_fastreload";
perk_array[perk_array.size] = "specialty_fastreload";
}
if (ent hasperk("specialty_flakjacket"))
{
perk_array[ perk_array.size ] = "specialty_flakjacket";
perk_array[perk_array.size] = "specialty_flakjacket";
}
if (ent hasperk("specialty_movefaster"))
{
perk_array[ perk_array.size ] = "specialty_movefaster";
perk_array[perk_array.size] = "specialty_movefaster";
}
if (ent hasperk("specialty_quickrevive"))
{
perk_array[ perk_array.size ] = "specialty_quickrevive";
perk_array[perk_array.size] = "specialty_quickrevive";
}
if (ent hasperk("specialty_rof"))
{
perk_array[ perk_array.size ] = "specialty_rof";
perk_array[perk_array.size] = "specialty_rof";
}
return perk_array;
@ -3669,13 +3669,13 @@ tombstone_give()
while (i < self.tombstone_savedweapon_weapons.size)
{
if (isdefined(self.tombstone_savedweapon_grenades) && self.tombstone_savedweapon_weapons[ i ] == self.tombstone_savedweapon_grenades || (isdefined(self.tombstone_savedweapon_tactical) && self.tombstone_savedweapon_weapons[ i ] == self.tombstone_savedweapon_tactical))
if (isdefined(self.tombstone_savedweapon_grenades) && self.tombstone_savedweapon_weapons[i] == self.tombstone_savedweapon_grenades || (isdefined(self.tombstone_savedweapon_tactical) && self.tombstone_savedweapon_weapons[i] == self.tombstone_savedweapon_tactical))
{
i++;
continue;
}
if (isweaponprimary(self.tombstone_savedweapon_weapons[ i ]))
if (isweaponprimary(self.tombstone_savedweapon_weapons[i]))
{
if (primary_weapons_returned >= 2)
{
@ -3686,37 +3686,37 @@ tombstone_give()
primary_weapons_returned++;
}
if ("item_meat_zm" == self.tombstone_savedweapon_weapons[ i ])
if ("item_meat_zm" == self.tombstone_savedweapon_weapons[i])
{
i++;
continue;
}
self giveweapon(self.tombstone_savedweapon_weapons[ i ], 0, self maps\mp\zombies\_zm_weapons::get_pack_a_punch_weapon_options(self.tombstone_savedweapon_weapons[ i ]));
self giveweapon(self.tombstone_savedweapon_weapons[i], 0, self maps\mp\zombies\_zm_weapons::get_pack_a_punch_weapon_options(self.tombstone_savedweapon_weapons[i]));
if (isdefined(self.tombstone_savedweapon_weaponsammo_clip[ i ]))
if (isdefined(self.tombstone_savedweapon_weaponsammo_clip[i]))
{
self setweaponammoclip(self.tombstone_savedweapon_weapons[ i ], self.tombstone_savedweapon_weaponsammo_clip[ i ]);
self setweaponammoclip(self.tombstone_savedweapon_weapons[i], self.tombstone_savedweapon_weaponsammo_clip[i]);
}
if (isdefined(self.tombstone_savedweapon_weaponsammo_clip_dualwield[ i ]))
if (isdefined(self.tombstone_savedweapon_weaponsammo_clip_dualwield[i]))
{
self setweaponammoclip(weaponDualWieldWeaponName(self.tombstone_savedweapon_weapons[ i ]), self.tombstone_savedweapon_weaponsammo_clip_dualwield[ i ]);
self setweaponammoclip(weaponDualWieldWeaponName(self.tombstone_savedweapon_weapons[i]), self.tombstone_savedweapon_weaponsammo_clip_dualwield[i]);
}
if (isdefined(self.tombstone_savedweapon_weaponsammo_stock[ i ]))
if (isdefined(self.tombstone_savedweapon_weaponsammo_stock[i]))
{
self setweaponammostock(self.tombstone_savedweapon_weapons[ i ], self.tombstone_savedweapon_weaponsammo_stock[ i ]);
self setweaponammostock(self.tombstone_savedweapon_weapons[i], self.tombstone_savedweapon_weaponsammo_stock[i]);
}
if (isdefined(self.tombstone_savedweapon_weaponsammo_clip_alt[ i ]))
if (isdefined(self.tombstone_savedweapon_weaponsammo_clip_alt[i]))
{
self setweaponammoclip(weaponAltWeaponName(self.tombstone_savedweapon_weapons[ i ]), self.tombstone_savedweapon_weaponsammo_clip_alt[ i ]);
self setweaponammoclip(weaponAltWeaponName(self.tombstone_savedweapon_weapons[i]), self.tombstone_savedweapon_weaponsammo_clip_alt[i]);
}
if (isdefined(self.tombstone_savedweapon_weaponsammo_stock_alt[ i ]))
if (isdefined(self.tombstone_savedweapon_weaponsammo_stock_alt[i]))
{
self setweaponammostock(weaponAltWeaponName(self.tombstone_savedweapon_weapons[ i ]), self.tombstone_savedweapon_weaponsammo_stock_alt[ i ]);
self setweaponammostock(weaponAltWeaponName(self.tombstone_savedweapon_weapons[i]), self.tombstone_savedweapon_weaponsammo_stock_alt[i]);
}
i++;
@ -3773,7 +3773,7 @@ tombstone_give()
{
if (isDefined(self.player_shield_reset_health))
{
self [[ self.player_shield_reset_health ]]();
self [[self.player_shield_reset_health]]();
}
}
@ -3797,7 +3797,7 @@ tombstone_give()
{
if (primaries.size > 0)
{
self switchtoweapon(primaries[ 0 ]);
self switchtoweapon(primaries[0]);
}
}
}
@ -3808,13 +3808,13 @@ tombstone_give()
while (i < self.tombstone_perks.size)
{
if (self hasperk(self.tombstone_perks[ i ]))
if (self hasperk(self.tombstone_perks[i]))
{
i++;
continue;
}
self maps\mp\zombies\_zm_perks::give_perk(self.tombstone_perks[ i ]);
self maps\mp\zombies\_zm_perks::give_perk(self.tombstone_perks[i]);
i++;
}
}
@ -4075,12 +4075,12 @@ zone_changes()
else if (level.script == "zm_highrise")
{
// Green Highrise to Lower Blue Highrise
level.zones[ "zone_green_level3b" ].adjacent_zones[ "zone_blue_level1c" ] structdelete();
level.zones[ "zone_green_level3b" ].adjacent_zones[ "zone_blue_level1c" ] = undefined;
level.zones["zone_green_level3b"].adjacent_zones["zone_blue_level1c"] structdelete();
level.zones["zone_green_level3b"].adjacent_zones["zone_blue_level1c"] = undefined;
// Lower Orange Highrise debris
level.zones[ "zone_orange_level3a" ].adjacent_zones[ "zone_orange_level3b" ].is_connected = 0;
level.zones[ "zone_orange_level3b" ].adjacent_zones[ "zone_orange_level3a" ].is_connected = 0;
level.zones["zone_orange_level3a"].adjacent_zones["zone_orange_level3b"].is_connected = 0;
level.zones["zone_orange_level3b"].adjacent_zones["zone_orange_level3a"].is_connected = 0;
}
}

8
scripts/zm/locs/zm_buried_loc_maze.gsc
View File

@ -19,7 +19,7 @@ struct_init()
og_perk_structs = [];
structs = getstructarray("zm_perk_machine", "targetname");
level.struct_class_names[ "targetname" ][ "zm_perk_machine" ] = [];
level.struct_class_names["targetname"]["zm_perk_machine"] = [];
foreach (struct in structs)
{
@ -132,10 +132,10 @@ struct_init()
}
}
level.struct_class_names[ "script_noteworthy" ][ "initial_spawn" ] = initial_spawns;
level.struct_class_names[ "targetname" ][ "player_respawn_point" ] = player_respawn_points;
level.struct_class_names["script_noteworthy"]["initial_spawn"] = initial_spawns;
level.struct_class_names["targetname"]["player_respawn_point"] = player_respawn_points;
level.struct_class_names[ "targetname" ][ "intermission" ] = [];
level.struct_class_names["targetname"]["intermission"] = [];
intermission_cam = spawnStruct();
intermission_cam.origin = (3694, 569, 253);

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

@ -7,12 +7,12 @@
struct_init()
{
level.struct_class_names[ "targetname" ][ "zm_perk_machine" ] = [];
level.struct_class_names["targetname"]["zm_perk_machine"] = [];
scripts\zm\replaced\utility::register_perk_struct("specialty_armorvest", "zombie_vending_jugg", (473.92, 6638.99, 208), (0, 102, 0));
scripts\zm\replaced\utility::register_perk_struct("specialty_weapupgrade", "p6_zm_al_vending_pap_on", (-1769, 5395, -72), (0, 100, 0));
level.struct_class_names[ "script_noteworthy" ][ "initial_spawn" ] = [];
level.struct_class_names["script_noteworthy"]["initial_spawn"] = [];
player_respawn_points = [];
@ -61,9 +61,9 @@ struct_init()
}
}
level.struct_class_names[ "targetname" ][ "player_respawn_point" ] = player_respawn_points;
level.struct_class_names["targetname"]["player_respawn_point"] = player_respawn_points;
level.struct_class_names[ "targetname" ][ "intermission" ] = [];
level.struct_class_names["targetname"]["intermission"] = [];
intermission_cam = spawnStruct();
intermission_cam.origin = (402, 6197, 142);
@ -175,7 +175,7 @@ disable_zombie_spawn_locations()
{
for (z = 0; z < level.zone_keys.size; z++)
{
zone = level.zones[ level.zone_keys[ z ] ];
zone = level.zones[level.zone_keys[z]];
i = 0;
@ -248,15 +248,15 @@ turn_afterlife_interact_on()
{
if (!isDefined(level.shockbox_anim))
{
level.shockbox_anim[ "on" ] = %fxanim_zom_al_shock_box_on_anim;
level.shockbox_anim[ "off" ] = %fxanim_zom_al_shock_box_off_anim;
level.shockbox_anim["on"] = %fxanim_zom_al_shock_box_on_anim;
level.shockbox_anim["off"] = %fxanim_zom_al_shock_box_off_anim;
}
if (issubstr(self.model, "p6_zm_al_shock_box"))
{
self useanimtree(-1);
self setmodel("p6_zm_al_shock_box_on");
self setanim(level.shockbox_anim[ "on" ]);
self setanim(level.shockbox_anim["on"]);
}
}

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

@ -235,12 +235,12 @@ disable_zombie_spawn_locations()
{
for (z = 0; z < level.zone_keys.size; z++)
{
if (level.zone_keys[ z ] != "zone_amb_cornfield")
if (level.zone_keys[z] != "zone_amb_cornfield")
{
continue;
}
zone = level.zones[ level.zone_keys[ z ] ];
zone = level.zones[level.zone_keys[z]];
i = 0;

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

@ -188,35 +188,35 @@ disable_zombie_spawn_locations()
{
for (z = 0; z < level.zone_keys.size; z++)
{
zone = level.zones[ level.zone_keys[ z ] ];
zone = level.zones[level.zone_keys[z]];
i = 0;
while (i < zone.spawn_locations.size)
{
if (zone.spawn_locations[ i ].targetname == "zone_trans_diner_spawners")
if (zone.spawn_locations[i].targetname == "zone_trans_diner_spawners")
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].targetname == "zone_trans_diner2_spawners")
else if (zone.spawn_locations[i].targetname == "zone_trans_diner2_spawners")
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-3825, -6576, -52.7))
else if (zone.spawn_locations[i].origin == (-3825, -6576, -52.7))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-5130, -6512, -35.4))
else if (zone.spawn_locations[i].origin == (-5130, -6512, -35.4))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-6462, -7159, -64))
else if (zone.spawn_locations[i].origin == (-6462, -7159, -64))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-6531, -6613, -54.4))
else if (zone.spawn_locations[i].origin == (-6531, -6613, -54.4))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
i++;

30
scripts/zm/locs/zm_transit_loc_tunnel.gsc
View File

@ -95,39 +95,39 @@ disable_zombie_spawn_locations()
{
for (z = 0; z < level.zone_keys.size; z++)
{
zone = level.zones[ level.zone_keys[ z ] ];
zone = level.zones[level.zone_keys[z]];
i = 0;
while (i < zone.spawn_locations.size)
{
if (zone.spawn_locations[ i ].origin == (-11447, -3424, 254.2))
if (zone.spawn_locations[i].origin == (-11447, -3424, 254.2))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-11093, 393, 192))
else if (zone.spawn_locations[i].origin == (-11093, 393, 192))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-10944, -3846, 221.14))
else if (zone.spawn_locations[i].origin == (-10944, -3846, 221.14))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-10836, 1195, 209.7))
else if (zone.spawn_locations[i].origin == (-10836, 1195, 209.7))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-11251, -4397, 200.02))
else if (zone.spawn_locations[i].origin == (-11251, -4397, 200.02))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-11334, -5280, 212.7))
else if (zone.spawn_locations[i].origin == (-11334, -5280, 212.7))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
else if (zone.spawn_locations[ i ].origin == (-11347, -3134, 283.9))
else if (zone.spawn_locations[i].origin == (-11347, -3134, 283.9))
{
zone.spawn_locations[ i ].is_enabled = false;
zone.spawn_locations[i].is_enabled = false;
}
i++;

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

@ -7,7 +7,7 @@
round_start()
{
if (isdefined(level.round_prestart_func))
[[ level.round_prestart_func ]]();
[[level.round_prestart_func]]();
else
{
n_delay = 2;
@ -41,7 +41,7 @@ round_start()
if (!isdefined(level.round_think_func))
level.round_think_func = ::round_think;
level thread [[ level.round_think_func ]]();
level thread [[level.round_think_func]]();
}
round_spawning()
@ -83,12 +83,12 @@ round_spawning()
if (!(isdefined(level.kill_counter_hud) && level.zombie_total > 0))
{
level.zombie_total = [[ level.max_zombie_func ]](max);
level.zombie_total = [[level.max_zombie_func]](max);
level notify("zombie_total_set");
}
if (isdefined(level.zombie_total_set_func))
level thread [[ level.zombie_total_set_func ]]();
level thread [[level.zombie_total_set_func]]();
if (level.round_number < 10 || level.speed_change_max > 0)
level thread zombie_speed_up();
@ -304,7 +304,7 @@ round_think(restart = 0)
if (!(isdefined(restart) && restart))
{
if (isdefined(level.initial_round_wait_func))
[[ level.initial_round_wait_func ]]();
[[level.initial_round_wait_func]]();
if (!(isdefined(level.host_ended_game) && level.host_ended_game))
{
@ -346,7 +346,7 @@ round_think(restart = 0)
level.zombie_last_run_time = gettime();
if (isdefined(level.zombie_round_change_custom))
[[ level.zombie_round_change_custom ]]();
[[level.zombie_round_change_custom]]();
else
{
level thread maps\mp\zombies\_zm_audio::change_zombie_music("round_start");
@ -367,7 +367,7 @@ round_think(restart = 0)
while (level.zombie_spawn_locations.size <= 0)
wait 0.1;
level thread [[ level.round_spawn_func ]]();
level thread [[level.round_spawn_func]]();
level notify("start_of_round");
recordzombieroundstart();
players = getplayers();
@ -381,16 +381,16 @@ round_think(restart = 0)
}
if (isdefined(level.round_start_custom_func))
[[ level.round_start_custom_func ]]();
[[level.round_start_custom_func]]();
[[ level.round_wait_func ]]();
[[level.round_wait_func]]();
level.first_round = 0;
level notify("end_of_round");
level thread maps\mp\zombies\_zm_audio::change_zombie_music("round_end");
uploadstats();
if (isdefined(level.round_end_custom_logic))
[[ level.round_end_custom_logic ]]();
[[level.round_end_custom_logic]]();
players = get_players();
@ -456,7 +456,7 @@ spectators_respawn()
{
if (players[i].sessionstate == "spectator" && isdefined(players[i].spectator_respawn))
{
players[i] [[ level.spawnplayer ]]();
players[i][[level.spawnplayer]]();
thread refresh_player_navcard_hud();
new_score = (level.round_number + 1) * 250;
@ -471,7 +471,7 @@ spectators_respawn()
players[i].old_score = players[i].score;
if (isdefined(level.spectator_respawn_custom_score))
players[i] [[ level.spectator_respawn_custom_score ]]();
players[i][[level.spectator_respawn_custom_score]]();
players[i].score = new_score;
}
@ -484,7 +484,7 @@ spectators_respawn()
ai_calculate_health(round_number)
{
level.zombie_health = level.zombie_vars[ "zombie_health_start" ];
level.zombie_health = level.zombie_vars["zombie_health_start"];
max_health = 100000;
i = 2;
@ -499,7 +499,7 @@ ai_calculate_health(round_number)
if (i >= 10)
{
old_health = level.zombie_health;
level.zombie_health = level.zombie_health + int(level.zombie_health * level.zombie_vars[ "zombie_health_increase_multiplier" ]);
level.zombie_health = level.zombie_health + int(level.zombie_health * level.zombie_vars["zombie_health_increase_multiplier"]);
if (level.zombie_health < old_health)
{
@ -511,7 +511,7 @@ ai_calculate_health(round_number)
continue;
}
level.zombie_health = int(level.zombie_health + level.zombie_vars[ "zombie_health_increase" ]);
level.zombie_health = int(level.zombie_health + level.zombie_vars["zombie_health_increase"]);
i++;
}
}
@ -998,39 +998,39 @@ countdown_hud_timer(time)
last_stand_pistol_rank_init()
{
level.pistol_values = [];
level.pistol_values[ level.pistol_values.size ] = "m1911_zm";
level.pistol_values[ level.pistol_values.size ] = "c96_zm";
level.pistol_values[ level.pistol_values.size ] = "cz75_zm";
level.pistol_values[ level.pistol_values.size ] = "cz75dw_zm";
level.pistol_values[ level.pistol_values.size ] = "kard_zm";
level.pistol_values[ level.pistol_values.size ] = "fiveseven_zm";
level.pistol_values[ level.pistol_values.size ] = "beretta93r_zm";
level.pistol_values[ level.pistol_values.size ] = "beretta93r_extclip_zm";
level.pistol_values[ level.pistol_values.size ] = "fivesevendw_zm";
level.pistol_values[ level.pistol_values.size ] = "rnma_zm";
level.pistol_values[ level.pistol_values.size ] = "python_zm";
level.pistol_values[ level.pistol_values.size ] = "judge_zm";
level.pistol_values[ level.pistol_values.size ] = "cz75_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "cz75dw_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "kard_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "fiveseven_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "beretta93r_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "beretta93r_extclip_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "fivesevendw_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "rnma_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "python_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "judge_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "ray_gun_zm";
level.pistol_values[ level.pistol_values.size ] = "ray_gun_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "m1911_zm";
level.pistol_values[level.pistol_values.size] = "c96_zm";
level.pistol_values[level.pistol_values.size] = "cz75_zm";
level.pistol_values[level.pistol_values.size] = "cz75dw_zm";
level.pistol_values[level.pistol_values.size] = "kard_zm";
level.pistol_values[level.pistol_values.size] = "fiveseven_zm";
level.pistol_values[level.pistol_values.size] = "beretta93r_zm";
level.pistol_values[level.pistol_values.size] = "beretta93r_extclip_zm";
level.pistol_values[level.pistol_values.size] = "fivesevendw_zm";
level.pistol_values[level.pistol_values.size] = "rnma_zm";
level.pistol_values[level.pistol_values.size] = "python_zm";
level.pistol_values[level.pistol_values.size] = "judge_zm";
level.pistol_values[level.pistol_values.size] = "cz75_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "cz75dw_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "kard_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "fiveseven_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "beretta93r_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "beretta93r_extclip_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "fivesevendw_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "rnma_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "python_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "judge_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "ray_gun_zm";
level.pistol_values[level.pistol_values.size] = "ray_gun_upgraded_zm";
level.pistol_value_solo_replace_below = level.pistol_values.size - 1;
level.pistol_values[ level.pistol_values.size ] = "m1911_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "c96_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "raygun_mark2_zm";
level.pistol_values[ level.pistol_values.size ] = "raygun_mark2_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "freezegun_zm";
level.pistol_values[ level.pistol_values.size ] = "freezegun_upgraded_zm";
level.pistol_values[ level.pistol_values.size ] = "microwavegundw_zm";
level.pistol_values[ level.pistol_values.size ] = "microwavegundw_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "m1911_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "c96_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "raygun_mark2_zm";
level.pistol_values[level.pistol_values.size] = "raygun_mark2_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "freezegun_zm";
level.pistol_values[level.pistol_values.size] = "freezegun_upgraded_zm";
level.pistol_values[level.pistol_values.size] = "microwavegundw_zm";
level.pistol_values[level.pistol_values.size] = "microwavegundw_upgraded_zm";
}
last_stand_best_pistol()
@ -1276,7 +1276,7 @@ additionalprimaryweapon_canplayerreceiveweapon(player, weapon, pap_triggers)
if (isDefined(level.custom_magic_box_selection_logic))
{
if (!([[ level.custom_magic_box_selection_logic ]](weapon, player, pap_triggers)))
if (!([[level.custom_magic_box_selection_logic]](weapon, player, pap_triggers)))
{
return 0;
}
@ -1284,7 +1284,7 @@ additionalprimaryweapon_canplayerreceiveweapon(player, weapon, pap_triggers)
if (isDefined(player) && isDefined(level.special_weapon_magicbox_check))
{
if (!player [[ level.special_weapon_magicbox_check ]](weapon))
if (!player [[level.special_weapon_magicbox_check]](weapon))
{
return 0;
}
@ -1331,11 +1331,11 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
{
if (is_true(self.non_attack_func_takes_attacker))
{
return self [[ self.non_attacker_func ]](damage, weapon, attacker);
return self [[self.non_attacker_func]](damage, weapon, attacker);
}
else
{
return self [[ self.non_attacker_func ]](damage, weapon);
return self [[self.non_attacker_func]](damage, weapon);
}
}
@ -1406,7 +1406,7 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
if (isDefined(self.actor_damage_func))
{
final_damage = [[ self.actor_damage_func ]](inflictor, attacker, damage, flags, meansofdeath, weapon, vpoint, vdir, shitloc, psoffsettime, boneindex);
final_damage = [[self.actor_damage_func]](inflictor, attacker, damage, flags, meansofdeath, weapon, vpoint, vdir, shitloc, psoffsettime, boneindex);
}
if (attacker.classname == "script_vehicle" && isDefined(attacker.owner))
@ -1550,11 +1550,11 @@ callback_playerdamage(einflictor, eattacker, idamage, idflags, smeansofdeath, sw
if (isDefined(self.overrideplayerdamage))
{
idamage = self [[ self.overrideplayerdamage ]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
idamage = self [[self.overrideplayerdamage]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
}
else if (isDefined(level.overrideplayerdamage))
{
idamage = self [[ level.overrideplayerdamage ]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
idamage = self [[level.overrideplayerdamage]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
}
if (is_true(self.magic_bullet_shield))
@ -1584,7 +1584,7 @@ callback_playerdamage(einflictor, eattacker, idamage, idflags, smeansofdeath, sw
if (isDefined(level.prevent_player_damage))
{
if (self [[ level.prevent_player_damage ]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime))
if (self [[level.prevent_player_damage]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime))
{
return;
}
@ -1609,9 +1609,9 @@ getfreespawnpoint(spawnpoints, player)
spawnpoints = array_randomize(spawnpoints);
if (!isDefined(game[ "spawns_randomized" ]))
if (!isDefined(game["spawns_randomized"]))
{
game[ "spawns_randomized" ] = 1;
game["spawns_randomized"] = 1;
random_chance = randomint(100);
if (random_chance > 50)
@ -1649,14 +1649,14 @@ getfreespawnpoint(spawnpoints, player)
{
if (side_selection == 1)
{
if (player.team != "allies" && isdefined(spawnpoints[ i ].script_int) && spawnpoints[ i ].script_int == 1)
if (player.team != "allies" && isdefined(spawnpoints[i].script_int) && spawnpoints[i].script_int == 1)
{
arrayremovevalue(spawnpoints, spawnpoints[ i ]);
arrayremovevalue(spawnpoints, spawnpoints[i]);
i = 0;
}
else if (player.team == "allies" && isdefined(spawnpoints[ i ].script_int) && spawnpoints[ i ].script_int == 2)
else if (player.team == "allies" && isdefined(spawnpoints[i].script_int) && spawnpoints[i].script_int == 2)
{
arrayremovevalue(spawnpoints, spawnpoints[ i ]);
arrayremovevalue(spawnpoints, spawnpoints[i]);
i = 0;
}
else
@ -1666,14 +1666,14 @@ getfreespawnpoint(spawnpoints, player)
}
else
{
if (player.team == "allies" && isdefined(spawnpoints[ i ].script_int) && spawnpoints[ i ].script_int == 1)
if (player.team == "allies" && isdefined(spawnpoints[i].script_int) && spawnpoints[i].script_int == 1)
{
arrayremovevalue(spawnpoints, spawnpoints[i]);
i = 0;
}
else if (player.team != "allies" && isdefined(spawnpoints[ i ].script_int) && spawnpoints[ i ].script_int == 2)
else if (player.team != "allies" && isdefined(spawnpoints[i].script_int) && spawnpoints[i].script_int == 2)
{
arrayremovevalue(spawnpoints, spawnpoints[ i ]);
arrayremovevalue(spawnpoints, spawnpoints[i]);
i = 0;
}
else
@ -1713,30 +1713,30 @@ getfreespawnpoint(spawnpoints, player)
for (j = 0; j < spawnpoints.size; j++)
{
if (!isdefined(game[ self.team + "_spawnpoints_randomized" ]))
if (!isdefined(game[self.team + "_spawnpoints_randomized"]))
{
game[ self.team + "_spawnpoints_randomized" ] = 1;
game[self.team + "_spawnpoints_randomized"] = 1;
for (m = 0; m < spawnpoints.size; m++)
{
spawnpoints[ m ].en_num = m;
spawnpoints[m].en_num = m;
}
}
if (spawnpoints[ j ].en_num == self.playernum)
if (spawnpoints[j].en_num == self.playernum)
{
return spawnpoints[ j ];
return spawnpoints[j];
}
}
return spawnpoints[ 0 ];
return spawnpoints[0];
}
check_for_valid_spawn_near_team(revivee, return_struct)
{
if (isDefined(level.check_for_valid_spawn_near_team_callback))
{
spawn_location = [[ level.check_for_valid_spawn_near_team_callback ]](revivee, return_struct);
spawn_location = [[level.check_for_valid_spawn_near_team_callback]](revivee, return_struct);
return spawn_location;
}
@ -1754,22 +1754,22 @@ check_for_valid_spawn_near_team(revivee, return_struct)
for (i = 0; i < players.size; i++)
{
if (maps\mp\zombies\_zm_utility::is_player_valid(players[ i ], undefined, 1) && players[ i ] != self)
if (maps\mp\zombies\_zm_utility::is_player_valid(players[i], undefined, 1) && players[i] != self)
{
for (j = 0; j < spawn_points.size; j++)
{
if (isdefined(spawn_points[ j ].script_int))
if (isdefined(spawn_points[j].script_int))
{
ideal_distance = spawn_points[ j ].script_int;
ideal_distance = spawn_points[j].script_int;
}
else
{
ideal_distance = 1000;
}
if (spawn_points[ j ].locked == 0)
if (spawn_points[j].locked == 0)
{
plyr_dist = distancesquared(players[ i ].origin, spawn_points[ j ].origin);
plyr_dist = distancesquared(players[i].origin, spawn_points[j].origin);
if (plyr_dist < ideal_distance * ideal_distance)
{
@ -1814,18 +1814,18 @@ check_for_valid_spawn_near_team(revivee, return_struct)
for (j = 0; j < spawn_points.size; j++)
{
if (isdefined(spawn_points[ j ].script_int))
if (isdefined(spawn_points[j].script_int))
{
ideal_distance = spawn_points[ j ].script_int;
ideal_distance = spawn_points[j].script_int;
}
else
{
ideal_distance = 1000;
}
if (spawn_points[ j ].locked == 0)
if (spawn_points[j].locked == 0)
{
plyr_dist = distancesquared(self.origin, spawn_points[ j ].origin);
plyr_dist = distancesquared(self.origin, spawn_points[j].origin);
if (plyr_dist < ideal_distance * ideal_distance)
{
@ -1866,13 +1866,13 @@ check_for_valid_spawn_near_team(revivee, return_struct)
get_valid_spawn_location(revivee, spawn_points, closest_group, return_struct)
{
spawn_array = getstructarray(spawn_points[ closest_group ].target, "targetname");
spawn_array = getstructarray(spawn_points[closest_group].target, "targetname");
spawn_array = array_randomize(spawn_array);
k = 0;
while (k < spawn_array.size)
{
if (positionwouldtelefrag(spawn_array[ k ].origin))
if (positionwouldtelefrag(spawn_array[k].origin))
{
k++;
continue;
@ -1880,25 +1880,25 @@ get_valid_spawn_location(revivee, spawn_points, closest_group, return_struct)
if (is_true(return_struct))
{
return spawn_array[ k ];
return spawn_array[k];
}
return spawn_array[ k ].origin;
return spawn_array[k].origin;
}
if (is_true(return_struct))
{
return spawn_array[ 0 ];
return spawn_array[0];
}
return spawn_array[ 0 ].origin;
return spawn_array[0].origin;
}
player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime)
{
if (isDefined(level._game_module_player_damage_callback))
{
new_damage = self [[ level._game_module_player_damage_callback ]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
new_damage = self [[level._game_module_player_damage_callback]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
if (isDefined(new_damage))
{
@ -1944,7 +1944,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
{
if (self maps\mp\zombies\_zm::player_shield_facing_attacker(vdir, 0.2) && isDefined(self.player_shield_apply_damage))
{
self [[ self.player_shield_apply_damage ]](100, 0);
self [[self.player_shield_apply_damage]](100, 0);
return 0;
}
}
@ -1952,7 +1952,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
{
if (!self maps\mp\zombies\_zm::player_shield_facing_attacker(vdir, -0.2) && isDefined(self.player_shield_apply_damage))
{
self [[ self.player_shield_apply_damage ]](100, 0);
self [[self.player_shield_apply_damage]](100, 0);
return 0;
}
}
@ -1978,7 +1978,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
if (isDefined(eattacker.custom_damage_func))
{
idamage = eattacker [[ eattacker.custom_damage_func ]](self);
idamage = eattacker [[eattacker.custom_damage_func]](self);
}
else if (isDefined(eattacker.meleedamage))
{
@ -2005,7 +2005,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
if (is_true(level.pers_upgrade_flopper))
{
if (is_true(self.pers_upgrades_awarded[ "flopper" ]))
if (is_true(self.pers_upgrades_awarded["flopper"]))
{
if (smeansofdeath != "MOD_PROJECTILE_SPLASH" && smeansofdeath != "MOD_GRENADE" && smeansofdeath != "MOD_GRENADE_SPLASH")
{
@ -2043,7 +2043,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
if (isDefined(self.player_damage_override))
{
self thread [[ self.player_damage_override ]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
self thread [[self.player_damage_override]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
}
if (smeansofdeath == "MOD_FALLING")
@ -2052,7 +2052,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
{
if (isDefined(level.zombiemode_divetonuke_perk_func))
{
[[ level.zombiemode_divetonuke_perk_func ]](self, self.origin);
[[level.zombiemode_divetonuke_perk_func]](self, self.origin);
}
return 0;
@ -2110,7 +2110,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
if (is_true(level.pers_upgrade_flopper))
{
if (is_true(self.pers_upgrades_awarded[ "flopper" ]))
if (is_true(self.pers_upgrades_awarded["flopper"]))
{
return 0;
}
@ -2133,7 +2133,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
{
if (isDefined(level.custom_kill_damaged_vo))
{
eattacker thread [[ level.custom_kill_damaged_vo ]](self);
eattacker thread [[level.custom_kill_damaged_vo]](self);
}
else
{
@ -2187,7 +2187,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
if (isDefined(level.player_kills_player))
{
self thread [[ level.player_kills_player ]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
self thread [[level.player_kills_player]](einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
}
}
}
@ -2197,7 +2197,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
{
if (isDefined(level.chugabud_laststand_func))
{
self thread [[ level.chugabud_laststand_func ]]();
self thread [[level.chugabud_laststand_func]]();
return 0;
}
}
@ -2207,13 +2207,13 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
for (i = 0; i < players.size; i++)
{
if (players[ i ] == self || players[ i ].is_zombie || players[ i ] maps\mp\zombies\_zm_laststand::player_is_in_laststand() || players[ i ].sessionstate == "spectator")
if (players[i] == self || players[i].is_zombie || players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand() || players[i].sessionstate == "spectator")
{
count++;
}
}
if (count < players.size || isDefined(level._game_module_game_end_check) && ![[ level._game_module_game_end_check ]]())
if (count < players.size || isDefined(level._game_module_game_end_check) && ![[level._game_module_game_end_check]]())
{
if (isDefined(self.solo_lives_given) && self.solo_lives_given < 3 && is_true(level.force_solo_quick_revive) && self hasperk("specialty_quickrevive"))
{
@ -2240,7 +2240,7 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
if (isDefined(level.custom_player_fake_death))
{
self thread [[ level.custom_player_fake_death ]](vdir, smeansofdeath);
self thread [[level.custom_player_fake_death]](vdir, smeansofdeath);
}
else
{
@ -2358,7 +2358,7 @@ player_laststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, sh
self.laststand_perks = scripts\zm\_zm_reimagined::tombstone_save_perks(self);
}
if (isDefined(self.pers_upgrades_awarded[ "perk_lose" ]) && self.pers_upgrades_awarded[ "perk_lose" ])
if (isDefined(self.pers_upgrades_awarded["perk_lose"]) && self.pers_upgrades_awarded["perk_lose"])
{
self maps\mp\zombies\_zm_pers_upgrades_functions::pers_upgrade_perk_lose_save();
}
@ -2397,8 +2397,8 @@ player_laststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, sh
if (is_true(self.hasperkspecialtytombstone))
{
self [[ level.tombstone_laststand_func ]]();
self thread [[ level.tombstone_spawn_func ]]();
self [[level.tombstone_laststand_func]]();
self thread [[level.tombstone_spawn_func]]();
if (!is_true(self._retain_perks))
{
@ -2422,7 +2422,7 @@ player_laststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, sh
}
else
{
if (isDefined(level.custom_player_death_vo_func) && !self [[ level.custom_player_death_vo_func ]]())
if (isDefined(level.custom_player_death_vo_func) && !self [[level.custom_player_death_vo_func]]())
{
self maps\mp\zombies\_zm_audio::create_and_play_dialog("general", "exert_death");
}
@ -2433,12 +2433,12 @@ player_laststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, sh
if (isDefined(level._zombie_minigun_powerup_last_stand_func))
{
self thread [[ level._zombie_minigun_powerup_last_stand_func ]]();
self thread [[level._zombie_minigun_powerup_last_stand_func]]();
}
if (isDefined(level._zombie_tesla_powerup_last_stand_func))
{
self thread [[ level._zombie_tesla_powerup_last_stand_func ]]();
self thread [[level._zombie_tesla_powerup_last_stand_func]]();
}
if (self hasperk("specialty_grenadepulldeath"))
@ -2447,7 +2447,7 @@ player_laststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, sh
if (isDefined(level.custom_laststand_func))
{
self thread [[ level.custom_laststand_func ]]();
self thread [[level.custom_laststand_func]]();
}
}
@ -2468,7 +2468,7 @@ player_laststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, sh
callback_playerlaststand(einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration)
{
self endon("disconnect");
[[ scripts\zm\replaced\_zm_laststand::playerlaststand ]](einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
[[scripts\zm\replaced\_zm_laststand::playerlaststand]](einflictor, eattacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
}
player_spawn_protection()
@ -2516,7 +2516,7 @@ wait_and_revive()
return;
}
if (is_true(self.pers_upgrades_awarded[ "perk_lose" ]))
if (is_true(self.pers_upgrades_awarded["perk_lose"]))
{
self maps\mp\zombies\_zm_pers_upgrades_functions::pers_upgrade_perk_lose_save();
}
@ -2525,7 +2525,7 @@ wait_and_revive()
if (isDefined(level.exit_level_func))
{
self thread [[ level.exit_level_func ]]();
self thread [[level.exit_level_func]]();
}
else if (get_players().size == 1)
{
@ -2566,7 +2566,7 @@ wait_and_revive()
self.waiting_to_revive = 0;
if (is_true(self.pers_upgrades_awarded[ "perk_lose" ]))
if (is_true(self.pers_upgrades_awarded["perk_lose"]))
{
self thread maps\mp\zombies\_zm_pers_upgrades_functions::pers_upgrade_perk_lose_restore();
}
@ -2639,7 +2639,7 @@ player_out_of_playable_area_monitor()
if (!self in_life_brush() && (self in_kill_brush() || !self in_enabled_playable_area()))
{
if (!isdefined(level.player_out_of_playable_area_monitor_callback) || self [[ level.player_out_of_playable_area_monitor_callback ]]())
if (!isdefined(level.player_out_of_playable_area_monitor_callback) || self [[level.player_out_of_playable_area_monitor_callback]]())
{
self maps\mp\zombies\_zm_stats::increment_map_cheat_stat("cheat_out_of_playable");
self maps\mp\zombies\_zm_stats::increment_client_stat("cheat_out_of_playable", 0);
@ -2711,12 +2711,12 @@ player_too_many_weapons_monitor()
if (primary_weapons_to_take.size > weapon_limit)
{
if (!isdefined(level.player_too_many_weapons_monitor_callback) || self [[ level.player_too_many_weapons_monitor_callback ]](primary_weapons_to_take))
if (!isdefined(level.player_too_many_weapons_monitor_callback) || self [[level.player_too_many_weapons_monitor_callback]](primary_weapons_to_take))
{
self maps\mp\zombies\_zm_stats::increment_map_cheat_stat("cheat_too_many_weapons");
self maps\mp\zombies\_zm_stats::increment_client_stat("cheat_too_many_weapons", 0);
self maps\mp\zombies\_zm_stats::increment_client_stat("cheat_total", 0);
self takeweapon(primary_weapons_to_take[ primary_weapons_to_take.size - 1 ]);
self takeweapon(primary_weapons_to_take[primary_weapons_to_take.size - 1]);
}
}
@ -2748,32 +2748,32 @@ end_game()
for (i = 0; i < players.size; i++)
{
setclientsysstate("lsm", "0", players[ i ]);
setclientsysstate("lsm", "0", players[i]);
}
for (i = 0; i < players.size; i++)
{
players[ i ] enableInvulnerability();
players[i] enableInvulnerability();
if (players[ i ] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
players[ i ] recordplayerdeathzombies();
players[ i ] maps\mp\zombies\_zm_stats::increment_player_stat("deaths");
players[ i ] maps\mp\zombies\_zm_stats::increment_client_stat("deaths");
players[ i ] maps\mp\zombies\_zm_pers_upgrades_functions::pers_upgrade_jugg_player_death_stat();
players[i] recordplayerdeathzombies();
players[i] maps\mp\zombies\_zm_stats::increment_player_stat("deaths");
players[i] maps\mp\zombies\_zm_stats::increment_client_stat("deaths");
players[i] maps\mp\zombies\_zm_pers_upgrades_functions::pers_upgrade_jugg_player_death_stat();
}
if (isdefined(players[ i ].revivetexthud))
if (isdefined(players[i].revivetexthud))
{
players[ i ].revivetexthud destroy();
players[i].revivetexthud destroy();
}
}
stopallrumbles();
level.intermission = 1;
level.zombie_vars[ "zombie_powerup_insta_kill_time" ] = 0;
level.zombie_vars[ "zombie_powerup_fire_sale_time" ] = 0;
level.zombie_vars[ "zombie_powerup_point_doubler_time" ] = 0;
level.zombie_vars["zombie_powerup_insta_kill_time"] = 0;
level.zombie_vars["zombie_powerup_fire_sale_time"] = 0;
level.zombie_vars["zombie_powerup_point_doubler_time"] = 0;
wait 0.1;
game_over = [];
survived = [];
@ -2785,37 +2785,37 @@ end_game()
{
if (isDefined(level.custom_game_over_hud_elem))
{
game_over[ i ] = [[ level.custom_game_over_hud_elem ]](players[ i ]);
game_over[i] = [[level.custom_game_over_hud_elem]](players[i]);
}
else
{
game_over[ i ] = newclienthudelem(players[ i ]);
game_over[ i ].alignx = "center";
game_over[ i ].aligny = "middle";
game_over[ i ].horzalign = "center";
game_over[ i ].vertalign = "middle";
game_over[ i ].y -= 130;
game_over[ i ].foreground = 1;
game_over[ i ].fontscale = 3;
game_over[ i ].alpha = 0;
game_over[ i ].color = (1, 1, 1);
game_over[ i ].hidewheninmenu = 1;
game_over[ i ] settext(&"ZOMBIE_GAME_OVER");
game_over[ i ] fadeovertime(1);
game_over[ i ].alpha = 1;
game_over[i] = newclienthudelem(players[i]);
game_over[i].alignx = "center";
game_over[i].aligny = "middle";
game_over[i].horzalign = "center";
game_over[i].vertalign = "middle";
game_over[i].y -= 130;
game_over[i].foreground = 1;
game_over[i].fontscale = 3;
game_over[i].alpha = 0;
game_over[i].color = (1, 1, 1);
game_over[i].hidewheninmenu = 1;
game_over[i] settext(&"ZOMBIE_GAME_OVER");
game_over[i] fadeovertime(1);
game_over[i].alpha = 1;
}
survived[ i ] = newclienthudelem(players[ i ]);
survived[ i ].alignx = "center";
survived[ i ].aligny = "middle";
survived[ i ].horzalign = "center";
survived[ i ].vertalign = "middle";
survived[ i ].y -= 100;
survived[ i ].foreground = 1;
survived[ i ].fontscale = 2;
survived[ i ].alpha = 0;
survived[ i ].color = (1, 1, 1);
survived[ i ].hidewheninmenu = 1;
survived[i] = newclienthudelem(players[i]);
survived[i].alignx = "center";
survived[i].aligny = "middle";
survived[i].horzalign = "center";
survived[i].vertalign = "middle";
survived[i].y -= 100;
survived[i].foreground = 1;
survived[i].fontscale = 2;
survived[i].alpha = 0;
survived[i].color = (1, 1, 1);
survived[i].hidewheninmenu = 1;
if (level.round_number < 2)
{
@ -2826,37 +2826,37 @@ end_game()
nomanslandtime = level.nml_best_time;
player_survival_time = int(nomanslandtime / 1000);
player_survival_time_in_mins = maps\mp\zombies\_zm::to_mins(player_survival_time);
survived[ i ] settext(&"ZOMBIE_SURVIVED_NOMANS", player_survival_time_in_mins);
survived[i] settext(&"ZOMBIE_SURVIVED_NOMANS", player_survival_time_in_mins);
}
else if (level.left_nomans_land == 2)
{
survived[ i ] settext(&"ZOMBIE_SURVIVED_ROUND");
survived[i] settext(&"ZOMBIE_SURVIVED_ROUND");
}
}
else
{
survived[ i ] settext(&"ZOMBIE_SURVIVED_ROUND");
survived[i] settext(&"ZOMBIE_SURVIVED_ROUND");
}
}
else
{
survived[ i ] settext(&"ZOMBIE_SURVIVED_ROUNDS", level.round_number);
survived[i] settext(&"ZOMBIE_SURVIVED_ROUNDS", level.round_number);
}
survived[ i ] fadeovertime(1);
survived[ i ].alpha = 1;
survived[i] fadeovertime(1);
survived[i].alpha = 1;
}
}
if (isDefined(level.custom_end_screen))
{
level [[ level.custom_end_screen ]]();
level [[level.custom_end_screen]]();
}
for (i = 0; i < players.size; i++)
{
players[ i ] setclientammocounterhide(1);
players[ i ] setclientminiscoreboardhide(1);
players[i] setclientammocounterhide(1);
players[i] setclientminiscoreboardhide(1);
}
uploadstats();
@ -2881,26 +2881,26 @@ end_game()
{
for (i = 0; i < players.size; i++)
{
survived[ i ] destroy();
game_over[ i ] destroy();
survived[i] destroy();
game_over[i] destroy();
}
}
for (i = 0; i < players.size; i++)
{
if (isDefined(players[ i ].survived_hud))
if (isDefined(players[i].survived_hud))
{
players[ i ].survived_hud destroy();
players[i].survived_hud destroy();
}
if (isDefined(players[ i ].game_over_hud))
if (isDefined(players[i].game_over_hud))
{
players[ i ].game_over_hud destroy();
players[i].game_over_hud destroy();
}
}
maps\mp\zombies\_zm::intermission();
wait level.zombie_vars[ "zombie_intermission_time" ];
wait level.zombie_vars["zombie_intermission_time"];
level notify("stop_intermission");
array_thread(get_players(), maps\mp\zombies\_zm::player_exit_level);
bbprint("zombie_epilogs", "rounds %d", level.round_number);
@ -2909,7 +2909,7 @@ end_game()
for (i = 0; i < players.size; i++)
{
players[ i ] cameraactivate(0);
players[i] cameraactivate(0);
}
if (is_true(level.map_restart))

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

@ -139,7 +139,7 @@ afterlife_laststand(b_electric_chair = 0)
if (isdefined(level.afterlife_laststand_override))
{
self thread [[ level.afterlife_laststand_override ]](b_electric_chair);
self thread [[level.afterlife_laststand_override]](b_electric_chair);
return;
}
@ -150,7 +150,7 @@ afterlife_laststand(b_electric_chair = 0)
if (self hasperk("specialty_grenadepulldeath"))
b_has_electric_cherry = 1;
self [[ level.afterlife_save_loadout ]]();
self [[level.afterlife_save_loadout]]();
self afterlife_fake_death();
if (isdefined(b_electric_chair) && !b_electric_chair)
@ -271,7 +271,7 @@ afterlife_fake_revive()
if (flag("afterlife_start_over"))
{
spawnpoint = [[ level.afterlife_get_spawnpoint ]]();
spawnpoint = [[level.afterlife_get_spawnpoint]]();
trace_start = spawnpoint.origin;
trace_end = spawnpoint.origin + vectorscale((0, 0, -1), 200.0);
respawn_trace = playerphysicstrace(trace_start, trace_end);
@ -508,7 +508,7 @@ afterlife_player_damage_callback(einflictor, eattacker, idamage, idflags, smeans
if (isdefined(eattacker.is_zombie) && eattacker.is_zombie)
{
if (isdefined(eattacker.custom_damage_func))
idamage = eattacker [[ eattacker.custom_damage_func ]](self);
idamage = eattacker [[eattacker.custom_damage_func]](self);
else if (isdefined(eattacker.meleedamage) && smeansofdeath != "MOD_GRENADE_SPLASH")
idamage = eattacker.meleedamage;
@ -540,7 +540,7 @@ afterlife_player_damage_callback(einflictor, eattacker, idamage, idflags, smeans
{
if (self player_shield_facing_attacker(vdir, 0.2) && isdefined(self.player_shield_apply_damage))
{
self [[ self.player_shield_apply_damage ]](item_dmg, 0);
self [[self.player_shield_apply_damage]](item_dmg, 0);
return 0;
}
}
@ -548,7 +548,7 @@ afterlife_player_damage_callback(einflictor, eattacker, idamage, idflags, smeans
{
if (!self player_shield_facing_attacker(vdir, -0.2) && isdefined(self.player_shield_apply_damage))
{
self [[ self.player_shield_apply_damage ]](item_dmg, 0);
self [[self.player_shield_apply_damage]](item_dmg, 0);
return 0;
}
}

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

@ -417,11 +417,11 @@ get_brutus_spawn_pos_val(brutus_pos)
{
int_type = interaction_types[i];
interaction = interact_array[int_type];
interact_points = [[ interaction.get_func ]](zone_name);
interact_points = [[interaction.get_func]](zone_name);
for (j = 0; j < interact_points.size; j++)
{
if (interact_points[j] [[ interaction.validity_func ]]())
if (interact_points[j][[interaction.validity_func]]())
score += interaction.spawn_bias;
}
}
@ -544,7 +544,7 @@ brutus_spawn(starting_health, has_helmet, helmet_hits, explosive_dmg_taken, zone
self.actor_damage_func = ::brutus_damage_override;
self.non_attacker_func = ::brutus_non_attacker_damage_override;
self thread brutus_lockdown_client_effects(0.5);
playfx(level._effect[ "brutus_spawn" ], self.origin);
playfx(level._effect["brutus_spawn"], self.origin);
playsoundatposition("zmb_ai_brutus_spawn", self.origin);
self animscripted(spawn_pos.origin, spawn_pos.angles, "zm_spawn");
self thread maps\mp\animscripts\zm_shared::donotetracks("spawn_anim");
@ -561,7 +561,7 @@ brutus_spawn(starting_health, has_helmet, helmet_hits, explosive_dmg_taken, zone
brutus_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon, vpoint, vdir, shitloc, poffsettime, boneindex)
{
if (isDefined(attacker) && isalive(attacker) && isplayer(attacker) && level.zombie_vars[ attacker.team ][ "zombie_insta_kill" ] || isDefined(attacker.personal_instakill) && attacker.personal_instakill)
if (isDefined(attacker) && isalive(attacker) && isplayer(attacker) && level.zombie_vars[attacker.team]["zombie_insta_kill"] || isDefined(attacker.personal_instakill) && attacker.personal_instakill)
{
n_brutus_damage_percent = 1;
n_brutus_headshot_modifier = 2;
@ -619,7 +619,7 @@ brutus_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
if (isDefined(attacker) && isplayer(attacker))
{
attacker add_to_player_score(player_points);
attacker.pers[ "score" ] = attacker.score;
attacker.pers["score"] = attacker.score;
level notify("brutus_helmet_removed", attacker);
}
}
@ -636,7 +636,7 @@ brutus_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
{
if (weapon == "alcatraz_shield_zm")
{
shield_damage = level.zombie_vars[ "riotshield_fling_damage_shield" ];
shield_damage = level.zombie_vars["riotshield_fling_damage_shield"];
inflictor maps\mp\zombies\_zm_weap_riotshield_prison::player_damage_shield(shield_damage, 0);
return 0;
}
@ -676,7 +676,7 @@ brutus_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
}
attacker add_to_player_score(player_points);
attacker.pers[ "score" ] = inflictor.score;
attacker.pers["score"] = inflictor.score;
}
return damage * scaler;

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

@ -17,7 +17,7 @@ enable_dog_rounds()
if (!isdefined(level.dog_round_track_override))
level.dog_round_track_override = ::dog_round_tracker;
level thread [[ level.dog_round_track_override ]]();
level thread [[level.dog_round_track_override]]();
}
dog_round_tracker()

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

@ -216,7 +216,7 @@ screecher_detach(player)
if (isdefined(level.screecher_should_burrow))
{
if (self [[ level.screecher_should_burrow ]]())
if (self [[level.screecher_should_burrow]]())
{
return;
}
@ -284,7 +284,7 @@ screecher_cleanup()
self.anchor delete();
if (isdefined(level.screecher_cleanup))
self [[ level.screecher_cleanup ]]();
self [[level.screecher_cleanup]]();
if (level.zombie_screecher_count > 0)
{

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

@ -89,7 +89,7 @@ start_jail_run(do_pain)
if (isdefined(self.bench))
{
if (isdefined(level.weapon_bench_reset))
self.bench [[ level.weapon_bench_reset ]]();
self.bench [[level.weapon_bench_reset]]();
}
}
@ -100,7 +100,7 @@ start_jail_run(do_pain)
if (self.state == "context")
{
if (isdefined(self.context.interrupt))
self [[ self.context.interrupt ]]();
self [[self.context.interrupt]]();
}
self sloth_init_roam_point();

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

@ -63,7 +63,7 @@ create_and_play_dialog(category, type, response, force_variant, override)
if (isdefined(sound_to_play))
{
if (isdefined(level._audio_custom_player_playvox))
self thread [[ level._audio_custom_player_playvox ]](prefix, index, sound_to_play, waittime, category, type, override);
self thread [[level._audio_custom_player_playvox]](prefix, index, sound_to_play, waittime, category, type, override);
else
self thread do_player_or_npc_playvox(prefix, index, sound_to_play, waittime, category, type, override, isresponse);
}

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

@ -9,22 +9,22 @@ playleaderdialogonplayer(dialog, team, waittime)
if (level.allowzmbannouncer)
{
if (!isDefined(game[ "zmbdialog" ][ dialog ]))
if (!isDefined(game["zmbdialog"][dialog]))
{
return;
}
}
if (isDefined(self.zmbdialoggroups[ dialog ]))
if (isDefined(self.zmbdialoggroups[dialog]))
{
group = dialog;
dialog = self.zmbdialoggroups[ group ];
self.zmbdialoggroups[ group ] = undefined;
dialog = self.zmbdialoggroups[group];
self.zmbdialoggroups[group] = undefined;
}
if (level.allowzmbannouncer)
{
alias = game[ "zmbdialog" ][ "prefix" ] + "_" + game[ "zmbdialog" ][ dialog ];
alias = game["zmbdialog"]["prefix"] + "_" + game["zmbdialog"][dialog];
variant = self getleaderdialogvariant(alias);
if (!isDefined(variant))

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

@ -102,7 +102,7 @@ trigger_deposit_think()
if (isDefined(level.custom_bank_deposit_vo))
{
player thread [[ level.custom_bank_deposit_vo ]]();
player thread [[level.custom_bank_deposit_vo]]();
}
if ((player.score <= 0) || (player.account_value >= level.bank_account_max))
@ -150,7 +150,7 @@ trigger_withdraw_think()
if (isDefined(level.custom_bank_withdrawl_vo))
{
player thread [[ level.custom_bank_withdrawl_vo ]]();
player thread [[level.custom_bank_withdrawl_vo]]();
}
else
{

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

@ -20,7 +20,7 @@ door_buy()
if (isdefined(level.custom_door_buy_check))
{
if (!who [[ level.custom_door_buy_check ]](self))
if (!who [[level.custom_door_buy_check]](self))
return false;
}
@ -56,7 +56,7 @@ door_buy()
play_sound_at_pos("no_purchase", self.origin);
if (isdefined(level.custom_generic_deny_vo_func))
who thread [[ level.custom_generic_deny_vo_func ]](1);
who thread [[level.custom_generic_deny_vo_func]](1);
else
who maps\mp\zombies\_zm_audio::create_and_play_dialog("general", "door_deny");
@ -65,7 +65,7 @@ door_buy()
}
if (isdefined(level._door_open_rumble_func))
who thread [[ level._door_open_rumble_func ]]();
who thread [[level._door_open_rumble_func]]();
return true;
}
@ -187,7 +187,7 @@ handle_post_board_repair_rewards(cost, zbarrier)
self maps\mp\zombies\_zm_stats::increment_client_stat("boards");
self maps\mp\zombies\_zm_stats::increment_player_stat("boards");
if (isDefined(self.pers[ "boards" ]) && (self.pers[ "boards" ] % 10) == 0)
if (isDefined(self.pers["boards"]) && (self.pers["boards"] % 10) == 0)
{
self thread do_player_general_vox("general", "reboard", 90);
}

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

@ -45,7 +45,7 @@ buildable_place_think()
if (isDefined(self.stub.oncantuse))
{
self.stub [[ self.stub.oncantuse ]](player);
self.stub [[self.stub.oncantuse]](player);
}
continue;
@ -54,15 +54,15 @@ buildable_place_think()
{
if (isDefined(self.stub.onbeginuse))
{
self.stub [[ self.stub.onbeginuse ]](player);
self.stub [[self.stub.onbeginuse]](player);
}
result = self buildable_use_hold_think(player);
team = player.pers[ "team" ];
team = player.pers["team"];
if (isDefined(self.stub.onenduse))
{
self.stub [[ self.stub.onenduse ]](team, player, result);
self.stub [[self.stub.onenduse]](team, player, result);
}
if (!result)
@ -77,7 +77,7 @@ buildable_place_think()
if (isDefined(self.stub.onuse))
{
self.stub [[ self.stub.onuse ]](player);
self.stub [[self.stub.onuse]](player);
}
prompt = player maps\mp\zombies\_zm_buildables::player_build(self.stub.buildablezone);
@ -89,7 +89,7 @@ buildable_place_think()
if (self.stub.persistent == 4)
{
self [[ self.stub.custom_completion_callback ]](player_built);
self [[self.stub.custom_completion_callback]](player_built);
return;
}
@ -187,14 +187,14 @@ buildable_place_think()
player maps\mp\zombies\_zm_weapons::weapon_give(self.stub.weaponname);
if (isDefined(level.zombie_include_buildables[ self.stub.equipname ].onbuyweapon))
if (isDefined(level.zombie_include_buildables[self.stub.equipname].onbuyweapon))
{
self [[ level.zombie_include_buildables[ self.stub.equipname ].onbuyweapon ]](player);
self [[level.zombie_include_buildables[self.stub.equipname].onbuyweapon]](player);
}
if (isDefined(level.zombie_buildables[ self.stub.equipname ].bought))
if (isDefined(level.zombie_buildables[self.stub.equipname].bought))
{
self.stub.hint_string = level.zombie_buildables[ self.stub.equipname ].bought;
self.stub.hint_string = level.zombie_buildables[self.stub.equipname].bought;
}
else
{
@ -288,9 +288,9 @@ buildable_place_think()
}
}
if (isDefined(level.zombie_include_buildables[ self.stub.equipname ].onbuyweapon))
if (isDefined(level.zombie_include_buildables[self.stub.equipname].onbuyweapon))
{
self [[ level.zombie_include_buildables[ self.stub.equipname ].onbuyweapon ]](player);
self [[level.zombie_include_buildables[self.stub.equipname].onbuyweapon]](player);
}
if (self.stub.weaponname != "keys_zm")
@ -298,9 +298,9 @@ buildable_place_think()
player setactionslot(1, "weapon", self.stub.weaponname);
}
if (isDefined(level.zombie_buildables[ self.stub.equipname ].bought))
if (isDefined(level.zombie_buildables[self.stub.equipname].bought))
{
self.stub.hint_string = level.zombie_buildables[ self.stub.equipname ].bought;
self.stub.hint_string = level.zombie_buildables[self.stub.equipname].bought;
}
else
{
@ -333,7 +333,7 @@ player_can_build(buildable, continuing)
else if (buildable buildable_is_piece_built_or_building(buildable.pieces[0]))
return false;
if (isdefined(buildable.stub) && isdefined(buildable.stub.custom_buildablestub_update_prompt) && isdefined(buildable.stub.playertrigger[0]) && isdefined(buildable.stub.playertrigger[0].stub) && !buildable.stub.playertrigger[0].stub [[ buildable.stub.custom_buildablestub_update_prompt ]](self, 1, buildable.stub.playertrigger[0]))
if (isdefined(buildable.stub) && isdefined(buildable.stub.custom_buildablestub_update_prompt) && isdefined(buildable.stub.playertrigger[0]) && isdefined(buildable.stub.playertrigger[0].stub) && !buildable.stub.playertrigger[0].stub [[buildable.stub.custom_buildablestub_update_prompt]](self, 1, buildable.stub.playertrigger[0]))
return false;
return true;
@ -389,7 +389,7 @@ buildable_use_hold_think_internal(player, bind_stub = self.stub)
player thread player_progress_bar(build_start_time, build_time, bind_stub.building_prompt);
if (isdefined(level.buildable_build_custom_func))
player thread [[ level.buildable_build_custom_func ]](self.stub);
player thread [[level.buildable_build_custom_func]](self.stub);
while (isdefined(self) && player player_continue_building(bind_stub.buildablezone, self.stub) && gettime() - self.build_start_time < self.build_time)
wait 0.05;
@ -509,7 +509,7 @@ player_build(buildable, pieces)
self track_buildables_built(buildable);
if (isdefined(level.buildable_built_custom_func))
self thread [[ level.buildable_built_custom_func ]](buildable);
self thread [[level.buildable_built_custom_func]](buildable);
alias = sndbuildablecompletealias(buildable.buildable_name);
self playsound(alias);

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

@ -92,7 +92,7 @@ pooledbuildablestub_update_prompt(player, trigger)
can_use = 1;
if (isdefined(self.custom_buildablestub_update_prompt) && !self [[ self.custom_buildablestub_update_prompt ]](player))
if (isdefined(self.custom_buildablestub_update_prompt) && !self [[self.custom_buildablestub_update_prompt]](player))
return 0;
self.cursor_hint = "HINT_NOICON";
@ -140,7 +140,7 @@ pooledbuildablestub_update_prompt(player, trigger)
self.hint_string = "Missing buildable hint";
}
else
return trigger [[ self.original_prompt_and_visibility_func ]](player);
return trigger [[self.original_prompt_and_visibility_func]](player);
return 1;
}
@ -429,7 +429,7 @@ pooled_buildable_place_think()
self sethintstring(self.stub.hint_string);
if (isdefined(self.stub.oncantuse))
self.stub [[ self.stub.oncantuse ]](player);
self.stub [[self.stub.oncantuse]](player);
continue;
}
@ -442,12 +442,12 @@ pooled_buildable_place_think()
self sethintstring(self.stub.hint_string);
if (isdefined(bind_to.oncantuse))
bind_to [[ bind_to.oncantuse ]](player);
bind_to [[bind_to.oncantuse]](player);
}
else
{
if (isdefined(bind_to.onbeginuse))
self.stub [[ bind_to.onbeginuse ]](player);
self.stub [[bind_to.onbeginuse]](player);
result = self scripts\zm\replaced\_zm_buildables::buildable_use_hold_think(player, bind_to);
team = player.pers["team"];
@ -462,7 +462,7 @@ pooled_buildable_place_think()
}
if (isdefined(bind_to.onenduse))
self.stub [[ bind_to.onenduse ]](team, player, result);
self.stub [[bind_to.onenduse]](team, player, result);
if (!result)
continue;
@ -473,7 +473,7 @@ pooled_buildable_place_think()
}
if (isdefined(self.stub.onuse))
self.stub [[ self.stub.onuse ]](player);
self.stub [[self.stub.onuse]](player);
prompt = player scripts\zm\replaced\_zm_buildables::player_build(self.stub.buildablezone);
self.stub.hint_string = self.stub.trigger_hintstring;
@ -555,7 +555,7 @@ choose_open_buildable(player)
self.buildables_available_index = 0;
}
while (isDefined(self.playertrigger[ num ]) && !self.built)
while (isDefined(self.playertrigger[num]) && !self.built)
{
if (!player isTouching(self.playertrigger[num]) || !player is_player_looking_at(self.playertrigger[num].origin, 0.76) || !is_player_valid(player) || player isSprinting() || player isThrowingGrenade())
{

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

@ -32,7 +32,7 @@ chugabud_laststand()
{
if (isdefined(level._chugabug_reject_corpse_override_func))
{
reject_corpse = self [[ level._chugabug_reject_corpse_override_func ]](self.origin);
reject_corpse = self [[level._chugabug_reject_corpse_override_func]](self.origin);
if (reject_corpse)
create_corpse = 0;
@ -180,7 +180,7 @@ chugabud_fake_revive()
spawnpoint = chugabud_get_spawnpoint();
if (isdefined(level._chugabud_post_respawn_override_func))
self [[ level._chugabud_post_respawn_override_func ]](spawnpoint.origin);
self [[level._chugabud_post_respawn_override_func]](spawnpoint.origin);
if (isdefined(level.chugabud_force_corpse_position))
{

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

@ -123,7 +123,7 @@ craftable_use_hold_think_internal(player)
player thread player_progress_bar(craft_start_time, craft_time);
if (isdefined(level.craftable_craft_custom_func))
player thread [[ level.craftable_craft_custom_func ]](self.stub);
player thread [[level.craftable_craft_custom_func]](self.stub);
while (isdefined(self) && player player_continue_crafting(self.stub.craftablespawn) && gettime() - self.craft_start_time < self.craft_time)
wait 0.05;

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

@ -286,7 +286,7 @@ headchopperattack(weapon, ent)
ent thread maps\mp\animscripts\zm_run::needsdelayedupdate();
if (isdefined(ent.crawl_anim_override))
ent [[ ent.crawl_anim_override ]]();
ent [[ent.crawl_anim_override]]();
}
if (ent.health <= 10)
@ -374,7 +374,7 @@ equipment_onspawnretrievableweaponobject(watcher, player)
if (isdefined(level.check_force_deploy_origin))
{
if (player [[ level.check_force_deploy_origin ]](self, plant_origin, plant_angles))
if (player [[level.check_force_deploy_origin]](self, plant_origin, plant_angles))
{
plant_origin = player.origin;
plant_angles = player.angles;
@ -383,14 +383,14 @@ equipment_onspawnretrievableweaponobject(watcher, player)
}
else if (isdefined(level.check_force_deploy_z))
{
if (player [[ level.check_force_deploy_z ]](self, plant_origin, plant_angles))
if (player [[level.check_force_deploy_z]](self, plant_origin, plant_angles))
plant_origin = (plant_origin[0], plant_origin[1], player.origin[2] + 10);
}
if (isdefined(iswallmount) && iswallmount)
self ghost();
replacement = player [[ level.zombie_equipment[equipment].place_fn ]](plant_origin, plant_angles);
replacement = player [[level.zombie_equipment[equipment].place_fn]](plant_origin, plant_angles);
if (isdefined(replacement))
{
@ -400,7 +400,7 @@ equipment_onspawnretrievableweaponobject(watcher, player)
player notify("equipment_placed", replacement, self.name);
if (isdefined(level.equipment_planted))
player [[ level.equipment_planted ]](replacement, equipment, self.plant_parent);
player [[level.equipment_planted]](replacement, equipment, self.plant_parent);
player maps\mp\zombies\_zm_buildables::track_buildables_planted(self);
}

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

@ -64,7 +64,7 @@ springpadthink(weapon, electricradius, armed)
self.num_zombies_flung++;
self notify("zombie_flung");
ent thread [[ ent.custom_springpad_fling ]](weapon, self);
ent thread [[ent.custom_springpad_fling]](weapon, self);
continue;
}

18
scripts/zm/replaced/_zm_equipment.gsc
View File

@ -33,7 +33,7 @@ placed_equipment_think(model, equipname, origin, angles, tradius, toffset)
if (isDefined(level.equipment_safe_to_drop))
{
if (!(self [[ level.equipment_safe_to_drop ]](pickupmodel)))
if (!(self [[level.equipment_safe_to_drop]](pickupmodel)))
{
maps\mp\zombies\_zm_equipment::equipment_disappear_fx(pickupmodel.origin, undefined, pickupmodel.angles);
pickupmodel delete();
@ -44,9 +44,9 @@ placed_equipment_think(model, equipname, origin, angles, tradius, toffset)
watchername = getsubstr(equipname, 0, equipname.size - 3);
if (isDefined(level.retrievehints[ watchername ]))
if (isDefined(level.retrievehints[watchername]))
{
hint = level.retrievehints[ watchername ].hint;
hint = level.retrievehints[watchername].hint;
}
else
{
@ -83,12 +83,12 @@ placed_equipment_think(model, equipname, origin, angles, tradius, toffset)
level.dropped_equipment = [];
}
if (isDefined(level.dropped_equipment[ equipname ]) && isDefined(level.dropped_equipment[ equipname ].model))
if (isDefined(level.dropped_equipment[equipname]) && isDefined(level.dropped_equipment[equipname].model))
{
level.dropped_equipment[ equipname ].model maps\mp\zombies\_zm_equipment::dropped_equipment_destroy(1);
level.dropped_equipment[equipname].model maps\mp\zombies\_zm_equipment::dropped_equipment_destroy(1);
}
level.dropped_equipment[ equipname ] = pickupmodel.stub;
level.dropped_equipment[equipname] = pickupmodel.stub;
}
maps\mp\zombies\_zm_equipment::destructible_equipment_list_add(pickupmodel);
@ -113,9 +113,9 @@ item_damage(damage)
if (isdefined(self.isriotshield) && self.isriotshield)
{
if (isdefined(level.riotshield_damage_callback) && isdefined(self.owner))
self.owner [[ level.riotshield_damage_callback ]](damage, 0);
self.owner [[level.riotshield_damage_callback]](damage, 0);
else if (isdefined(level.deployed_riotshield_damage_callback))
self [[ level.deployed_riotshield_damage_callback ]](damage);
self [[level.deployed_riotshield_damage_callback]](damage);
}
else if (isdefined(self.owner))
{
@ -148,7 +148,7 @@ player_damage_equipment(equipment, damage, origin, stub)
thread maps\mp\zombies\_zm_unitrigger::unregister_unitrigger(stub);
if (isdefined(level.placeable_equipment_destroy_fn[equipment]))
self [[ level.placeable_equipment_destroy_fn[equipment] ]]();
self [[level.placeable_equipment_destroy_fn[equipment]]]();
else
equipment_disappear_fx(origin);

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

@ -25,15 +25,15 @@ wait_for_team_death_and_round_end()
while (i < players.size)
{
if (!isDefined(players[ i ]._encounters_team))
if (!isDefined(players[i]._encounters_team))
{
i++;
continue;
}
if (players[ i ]._encounters_team == "A")
if (players[i]._encounters_team == "A")
{
if (is_player_valid(players[ i ]))
if (is_player_valid(players[i]))
{
cia_alive++;
}
@ -42,7 +42,7 @@ wait_for_team_death_and_round_end()
continue;
}
if (is_player_valid(players[ i ]))
if (is_player_valid(players[i]))
{
cdc_alive++;
}
@ -176,7 +176,7 @@ round_end(winner)
level.isresetting_grief = 1;
level notify("end_round_think");
level.zombie_vars[ "spectators_respawn" ] = 1;
level.zombie_vars["spectators_respawn"] = 1;
level notify("keep_griefing");
level notify("restart_round");
@ -218,22 +218,22 @@ round_end(winner)
game_won(winner)
{
level.gamemodulewinningteam = winner;
level.zombie_vars[ "spectators_respawn" ] = 0;
level.zombie_vars["spectators_respawn"] = 0;
players = get_players();
i = 0;
while (i < players.size)
{
players[ i ] freezecontrols(1);
players[i] freezecontrols(1);
if (players[ i ]._encounters_team == winner)
if (players[i]._encounters_team == winner)
{
players[ i ] thread maps\mp\zombies\_zm_audio_announcer::leaderdialogonplayer("grief_won");
players[i] thread maps\mp\zombies\_zm_audio_announcer::leaderdialogonplayer("grief_won");
i++;
continue;
}
players[ i ] thread maps\mp\zombies\_zm_audio_announcer::leaderdialogonplayer("grief_lost");
players[i] thread maps\mp\zombies\_zm_audio_announcer::leaderdialogonplayer("grief_lost");
i++;
}
@ -259,7 +259,7 @@ zombie_goto_round(target_round)
{
for (i = 0; i < zombies.size; i++)
{
zombies[ i ] dodamage(zombies[ i ].health + 666, zombies[ i ].origin);
zombies[i] dodamage(zombies[i].health + 666, zombies[i].origin);
}
}

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

@ -15,13 +15,13 @@ onspawnplayer(predictedspawn)
if (isDefined(level.custom_spawnplayer) && is_true(self.player_initialized))
{
self [[ level.custom_spawnplayer ]]();
self [[level.custom_spawnplayer]]();
return;
}
if (isDefined(level.customspawnlogic))
{
self [[ level.customspawnlogic ]](predictedspawn);
self [[level.customspawnlogic]](predictedspawn);
if (predictedspawn)
{
@ -45,15 +45,15 @@ onspawnplayer(predictedspawn)
{
for (i = 0; i < structs.size; i++)
{
if (isdefined(structs[ i ].script_string))
if (isdefined(structs[i].script_string))
{
tokens = strtok(structs[ i ].script_string, " ");
tokens = strtok(structs[i].script_string, " ");
foreach (token in tokens)
{
if (token == match_string)
{
spawnpoints[ spawnpoints.size ] = structs[ i ];
spawnpoints[spawnpoints.size] = structs[i];
}
}
}
@ -84,7 +84,7 @@ onspawnplayer(predictedspawn)
self freezecontrols(1);
self.spectator_respawn = spawnpoint;
self.score = self maps\mp\gametypes_zm\_globallogic_score::getpersstat("score");
self.pers[ "participation" ] = 0;
self.pers["participation"] = 0;
self.score_total = self.score;
self.old_score = self.score;
@ -101,7 +101,7 @@ onspawnplayer(predictedspawn)
if (isDefined(level.game_mode_spawn_player_logic))
{
spawn_in_spectate = [[ level.game_mode_spawn_player_logic ]]();
spawn_in_spectate = [[level.game_mode_spawn_player_logic]]();
if (spawn_in_spectate)
{
@ -133,7 +133,7 @@ onplayerspawned()
if (isDefined(level.custom_player_fake_death_cleanup))
{
self [[ level.custom_player_fake_death_cleanup ]]();
self [[level.custom_player_fake_death_cleanup]]();
}
self setstance("stand");
@ -162,14 +162,14 @@ onplayerspawned()
if (isDefined(level.givecustomcharacters))
{
self [[ level.givecustomcharacters ]]();
self [[level.givecustomcharacters]]();
}
weapons_restored = 0;
if (isDefined(level.onplayerspawned_restore_previous_weapons))
{
weapons_restored = self [[ level.onplayerspawned_restore_previous_weapons ]]();
weapons_restored = self [[level.onplayerspawned_restore_previous_weapons]]();
}
if (!is_true(weapons_restored))
@ -188,7 +188,7 @@ onplayerspawned()
if (isDefined(level.gamemode_post_spawn_logic))
{
self [[ level.gamemode_post_spawn_logic ]]();
self [[level.gamemode_post_spawn_logic]]();
}
}
}
@ -219,7 +219,7 @@ hide_gump_loading_for_hotjoiners()
if (!flag("initial_blackscreen_passed"))
{
self [[ level.spawnplayer ]]();
self [[level.spawnplayer]]();
}
else
{
@ -236,7 +236,7 @@ hide_gump_loading_for_hotjoiners()
self setclientthirdperson(0);
self resetfov();
self.health = 100;
self thread [[ level.custom_intermission ]]();
self thread [[level.custom_intermission]]();
}
}
@ -379,19 +379,19 @@ menu_onmenuresponse()
switch (response)
{
case "allies":
self [[ level.allies ]]();
self [[level.allies]]();
break;
case "axis":
self [[ level.teammenu ]](response);
self [[level.teammenu]](response);
break;
case "autoassign":
self [[ level.autoassign ]](1);
self [[level.autoassign]](1);
break;
case "spectator":
self [[ level.spectator ]]();
self [[level.spectator]]();
break;
}
@ -409,7 +409,7 @@ menu_onmenuresponse()
}
self.selectedclass = 1;
self [[ level.class ]](response);
self [[level.class]](response);
}
}
}
@ -472,7 +472,7 @@ do_team_change()
if (!flag("initial_blackscreen_passed"))
{
self [[ level.spawnplayer ]]();
self [[level.spawnplayer]]();
}
}
@ -495,7 +495,7 @@ set_team(team)
self.characterindex = 1;
}
self [[ level.givecustomcharacters ]]();
self [[level.givecustomcharacters]]();
if (isDefined(self.head_icon))
{

22
scripts/zm/replaced/_zm_laststand.gsc
View File

@ -332,7 +332,7 @@ revive_give_back_weapons(gun)
if (isDefined(primaryweapons) && primaryweapons.size > 0)
{
self switchtoweapon(primaryweapons[ 0 ]);
self switchtoweapon(primaryweapons[0]);
}
}
}
@ -356,15 +356,15 @@ revive_hud_think()
while (i < players.size)
{
if (!isDefined(players[ i ].revivetrigger) || !isDefined(players[ i ].revivetrigger.createtime))
if (!isDefined(players[i].revivetrigger) || !isDefined(players[i].revivetrigger.createtime))
{
i++;
continue;
}
if (!isDefined(playertorevive) || playertorevive.revivetrigger.createtime > players[ i ].revivetrigger.createtime)
if (!isDefined(playertorevive) || playertorevive.revivetrigger.createtime > players[i].revivetrigger.createtime)
{
playertorevive = players[ i ];
playertorevive = players[i];
}
i++;
@ -376,7 +376,7 @@ revive_hud_think()
while (i < players.size)
{
if (players[ i ] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
i++;
continue;
@ -384,7 +384,7 @@ revive_hud_think()
if (getDvar("g_gametype") == "vs")
{
if (players[ i ].team != playertorevive.team)
if (players[i].team != playertorevive.team)
{
i++;
continue;
@ -393,7 +393,7 @@ revive_hud_think()
if (is_encounter())
{
if (players[ i ].sessionteam != playertorevive.sessionteam)
if (players[i].sessionteam != playertorevive.sessionteam)
{
i++;
continue;
@ -406,7 +406,7 @@ revive_hud_think()
}
}
players[ i ] thread maps\mp\zombies\_zm_laststand::faderevivemessageover(playertorevive, 3);
players[i] thread maps\mp\zombies\_zm_laststand::faderevivemessageover(playertorevive, 3);
i++;
}
@ -479,7 +479,7 @@ playerlaststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shi
self notify("entering_last_stand");
if (isdefined(level._game_module_player_laststand_callback))
self [[ level._game_module_player_laststand_callback ]](einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
self [[level._game_module_player_laststand_callback]](einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
if (self player_is_in_laststand())
return;
@ -490,7 +490,7 @@ playerlaststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shi
self thread player_last_stand_stats(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
if (isdefined(level.playerlaststand_func))
[[ level.playerlaststand_func ]](einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
[[level.playerlaststand_func]](einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration);
self.health = 1;
self.laststand = 1;
@ -518,7 +518,7 @@ playerlaststand(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shi
if (isdefined(level.playersuicideallowed) && level.playersuicideallowed && get_players().size > 1)
{
if (!isdefined(level.canplayersuicide) || self [[ level.canplayersuicide ]]())
if (!isdefined(level.canplayersuicide) || self [[level.canplayersuicide]]())
self thread suicide_trigger_spawn();
}

60
scripts/zm/replaced/_zm_magicbox.gsc
View File

@ -29,19 +29,19 @@ treasure_chest_init(start_chest_name)
while (i < level.chests.size)
{
level.chests[ i ].box_hacks = [];
level.chests[ i ].orig_origin = level.chests[ i ].origin;
level.chests[ i ] maps\mp\zombies\_zm_magicbox::get_chest_pieces();
level.chests[i].box_hacks = [];
level.chests[i].orig_origin = level.chests[i].origin;
level.chests[i] maps\mp\zombies\_zm_magicbox::get_chest_pieces();
if (isDefined(level.chests[ i ].zombie_cost))
if (isDefined(level.chests[i].zombie_cost))
{
level.chests[ i ].old_cost = level.chests[ i ].zombie_cost;
level.chests[i].old_cost = level.chests[i].zombie_cost;
i++;
continue;
}
else
{
level.chests[ i ].old_cost = 950;
level.chests[i].old_cost = 950;
}
i++;
@ -67,7 +67,7 @@ treasure_chest_init(start_chest_name)
else
{
level.chest_index = 0;
level.chests[ 0 ].no_fly_away = 1;
level.chests[0].no_fly_away = 1;
}
init_starting_chest_location(start_chest_name);
@ -127,7 +127,7 @@ init_starting_chest_location(start_chest_name)
if (!isdefined(level.pandora_show_func))
level.pandora_show_func = ::default_pandora_show_func;
level.chests[level.chest_index] thread [[ level.pandora_show_func ]]();
level.chests[level.chest_index] thread [[level.pandora_show_func]]();
}
treasure_chest_think()
@ -237,7 +237,7 @@ treasure_chest_think()
user maps\mp\zombies\_zm_stats::increment_player_stat("use_magicbox");
if (isdefined(level._magic_box_used_vo))
user thread [[ level._magic_box_used_vo ]]();
user thread [[level._magic_box_used_vo]]();
self thread watch_for_emp_close();
@ -247,7 +247,7 @@ treasure_chest_think()
self._box_open = 1;
self._box_opened_by_fire_sale = 0;
if (isdefined(level.zombie_vars["zombie_powerup_fire_sale_on"]) && level.zombie_vars["zombie_powerup_fire_sale_on"] && !isdefined(self.auto_open) && self [[ level._zombiemode_check_firesale_loc_valid_func ]]())
if (isdefined(level.zombie_vars["zombie_powerup_fire_sale_on"]) && level.zombie_vars["zombie_powerup_fire_sale_on"] && !isdefined(self.auto_open) && self [[level._zombiemode_check_firesale_loc_valid_func]]())
self._box_opened_by_fire_sale = 1;
if (isdefined(self.chest_lid))
@ -375,7 +375,7 @@ treasure_chest_think()
else
wait 3.0;
if (isdefined(level.zombie_vars["zombie_powerup_fire_sale_on"]) && level.zombie_vars["zombie_powerup_fire_sale_on"] && self [[ level._zombiemode_check_firesale_loc_valid_func ]]() || self == level.chests[level.chest_index])
if (isdefined(level.zombie_vars["zombie_powerup_fire_sale_on"]) && level.zombie_vars["zombie_powerup_fire_sale_on"] && self [[level._zombiemode_check_firesale_loc_valid_func]]() || self == level.chests[level.chest_index])
thread maps\mp\zombies\_zm_unitrigger::register_static_unitrigger(self.unitrigger_stub, ::magicbox_unitrigger_think);
}
@ -407,7 +407,7 @@ treasure_chest_weapon_spawn(chest, player, respin)
v_float = anglestoup(self.angles) * 40;
if (isdefined(level.custom_magic_box_weapon_wait))
[[ level.custom_magic_box_weapon_wait ]]();
[[level.custom_magic_box_weapon_wait]]();
start_origin = self.origin;
end_origin = self.origin + v_float;
@ -477,7 +477,7 @@ treasure_chest_weapon_spawn(chest, player, respin)
wait 0.1;
if (getdvar("magic_chest_movable") == "1" && !(isdefined(chest._box_opened_by_fire_sale) && chest._box_opened_by_fire_sale) && !(isdefined(level.zombie_vars["zombie_powerup_fire_sale_on"]) && level.zombie_vars["zombie_powerup_fire_sale_on"] && self [[ level._zombiemode_check_firesale_loc_valid_func ]]()))
if (getdvar("magic_chest_movable") == "1" && !(isdefined(chest._box_opened_by_fire_sale) && chest._box_opened_by_fire_sale) && !(isdefined(level.zombie_vars["zombie_powerup_fire_sale_on"]) && level.zombie_vars["zombie_powerup_fire_sale_on"] && self [[level._zombiemode_check_firesale_loc_valid_func]]()))
{
random = randomint(100);
@ -525,7 +525,7 @@ treasure_chest_weapon_spawn(chest, player, respin)
chance_of_joker = -1;
if (isdefined(level._zombiemode_chest_joker_chance_override_func))
chance_of_joker = [[ level._zombiemode_chest_joker_chance_override_func ]](chance_of_joker);
chance_of_joker = [[level._zombiemode_chest_joker_chance_override_func]](chance_of_joker);
if (chance_of_joker > random)
{
@ -577,10 +577,10 @@ treasure_chest_weapon_spawn(chest, player, respin)
self notify("randomization_done");
if (flag("moving_chest_now") && !(level.zombie_vars["zombie_powerup_fire_sale_on"] && self [[ level._zombiemode_check_firesale_loc_valid_func ]]()))
if (flag("moving_chest_now") && !(level.zombie_vars["zombie_powerup_fire_sale_on"] && self [[level._zombiemode_check_firesale_loc_valid_func]]()))
{
if (isdefined(level.chest_joker_custom_movement))
self [[ level.chest_joker_custom_movement ]]();
self [[level.chest_joker_custom_movement]]();
else
{
wait 0.5;
@ -632,20 +632,20 @@ treasure_chest_weapon_spawn(chest, player, respin)
if (!isdefined(respin))
{
if (isdefined(chest.box_hacks["respin"]))
self [[ chest.box_hacks["respin"] ]](chest, player);
self [[chest.box_hacks["respin"]]](chest, player);
}
else if (isdefined(chest.box_hacks["respin_respin"]))
self [[ chest.box_hacks["respin_respin"] ]](chest, player);
self [[chest.box_hacks["respin_respin"]]](chest, player);
if (isdefined(level.custom_magic_box_timer_til_despawn))
self.weapon_model thread [[ level.custom_magic_box_timer_til_despawn ]](self);
self.weapon_model thread [[level.custom_magic_box_timer_til_despawn]](self);
else
self.weapon_model thread timer_til_despawn(v_float);
if (isdefined(self.weapon_model_dw))
{
if (isdefined(level.custom_magic_box_timer_til_despawn))
self.weapon_model_dw thread [[ level.custom_magic_box_timer_til_despawn ]](self);
self.weapon_model_dw thread [[level.custom_magic_box_timer_til_despawn]](self);
else
self.weapon_model_dw thread timer_til_despawn(v_float);
}
@ -671,7 +671,7 @@ treasure_chest_chooseweightedrandomweapon(player, prev_weapon, add_to_acquired =
keys = array_randomize(getarraykeys(level.zombie_weapons));
if (isdefined(level.customrandomweaponweights))
keys = player [[ level.customrandomweaponweights ]](keys);
keys = player [[level.customrandomweaponweights]](keys);
pap_triggers = getentarray("specialty_weapupgrade", "script_noteworthy");
@ -740,14 +740,14 @@ treasure_chest_move(player_vox)
wait 0.1;
if (level.zombie_vars[ "zombie_powerup_fire_sale_on" ] == 1 && self [[ level._zombiemode_check_firesale_loc_valid_func ]]())
if (level.zombie_vars["zombie_powerup_fire_sale_on"] == 1 && self [[level._zombiemode_check_firesale_loc_valid_func]]())
{
current_sale_time = level.zombie_vars[ "zombie_powerup_fire_sale_time" ];
current_sale_time = level.zombie_vars["zombie_powerup_fire_sale_time"];
wait_network_frame();
self thread maps\mp\zombies\_zm_magicbox::fire_sale_fix();
level.zombie_vars[ "zombie_powerup_fire_sale_time" ] = current_sale_time;
level.zombie_vars["zombie_powerup_fire_sale_time"] = current_sale_time;
while (level.zombie_vars[ "zombie_powerup_fire_sale_time" ] > 0)
while (level.zombie_vars["zombie_powerup_fire_sale_time"] > 0)
{
wait 0.1;
}
@ -757,20 +757,20 @@ treasure_chest_move(player_vox)
if (isDefined(level._zombiemode_custom_box_move_logic))
{
[[ level._zombiemode_custom_box_move_logic ]]();
[[level._zombiemode_custom_box_move_logic]]();
}
else
{
default_box_move_logic();
}
if (isDefined(level.chests[ level.chest_index ].box_hacks[ "summon_box" ]))
if (isDefined(level.chests[level.chest_index].box_hacks["summon_box"]))
{
level.chests[ level.chest_index ] [[ level.chests[ level.chest_index ].box_hacks[ "summon_box" ] ]](0);
level.chests[level.chest_index][[level.chests[level.chest_index].box_hacks["summon_box"]]](0);
}
playfx(level._effect[ "poltergeist" ], level.chests[ level.chest_index ].zbarrier.origin);
level.chests[ level.chest_index ] maps\mp\zombies\_zm_magicbox::show_chest();
playfx(level._effect["poltergeist"], level.chests[level.chest_index].zbarrier.origin);
level.chests[level.chest_index] maps\mp\zombies\_zm_magicbox::show_chest();
flag_clear("moving_chest_now");
self.zbarrier.chest_moving = 0;
}

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

@ -26,7 +26,7 @@ change_melee_weapon(weapon_name, current_weapon)
while (i < primaryweapons.size)
{
primary_weapon = primaryweapons[ i ];
primary_weapon = primaryweapons[i];
if (issubstr(primary_weapon, "knife_ballistic_"))
{
@ -57,7 +57,7 @@ change_melee_weapon(weapon_name, current_weapon)
{
if (had_ballistic_upgraded)
{
new_ballistic = level.ballistic_upgraded_weapon_name[ weapon_name ];
new_ballistic = level.ballistic_upgraded_weapon_name[weapon_name];
if (ballistic_was_primary)
{
@ -68,7 +68,7 @@ change_melee_weapon(weapon_name, current_weapon)
}
else
{
new_ballistic = level.ballistic_weapon_name[ weapon_name ];
new_ballistic = level.ballistic_weapon_name[weapon_name];
if (ballistic_was_primary)
{
@ -88,7 +88,7 @@ change_melee_weapon(weapon_name, current_weapon)
give_melee_weapon(vo_dialog_id, flourish_weapon_name, weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, flourish_fn, trigger)
{
if (isdefined(flourish_fn))
self thread [[ flourish_fn ]]();
self thread [[flourish_fn]]();
self thread do_melee_weapon_change(weapon_name);

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

@ -47,7 +47,7 @@ init()
if (!isdefined(level.custom_vending_precaching))
level.custom_vending_precaching = ::default_vending_precaching;
[[ level.custom_vending_precaching ]]();
[[level.custom_vending_precaching]]();
if (!isdefined(level.packapunch_timeout))
level.packapunch_timeout = 15;
@ -92,17 +92,17 @@ init()
for (i = 0; i < a_keys.size; i++)
{
if (isdefined(level._custom_perks[a_keys[i]].perk_machine_thread))
level thread [[ level._custom_perks[a_keys[i]].perk_machine_thread ]]();
level thread [[level._custom_perks[a_keys[i]].perk_machine_thread]]();
}
}
if (isdefined(level._custom_turn_packapunch_on))
level thread [[ level._custom_turn_packapunch_on ]]();
level thread [[level._custom_turn_packapunch_on]]();
else
level thread turn_packapunch_on();
if (isdefined(level.quantum_bomb_register_result_func))
[[ level.quantum_bomb_register_result_func ]]("give_nearest_perk", ::quantum_bomb_give_nearest_perk_result, 10, ::quantum_bomb_give_nearest_perk_validation);
[[level.quantum_bomb_register_result_func]]("give_nearest_perk", ::quantum_bomb_give_nearest_perk_result, 10, ::quantum_bomb_give_nearest_perk_validation);
level thread perk_hostmigration();
}
@ -317,7 +317,7 @@ vending_trigger_think()
if (isdefined(level.custom_perk_validation))
{
valid = self [[ level.custom_perk_validation ]](player);
valid = self [[level.custom_perk_validation]](player);
if (!valid)
continue;
@ -381,7 +381,7 @@ vending_trigger_post_think(player, perk)
player thread maps\mp\zombies\_zm_pers_upgrades_functions::pers_upgrade_perk_lose_bought();
if (isdefined(level.perk_bought_func))
player [[ level.perk_bought_func ]](perk);
player [[level.perk_bought_func]](perk);
player.perk_purchased = undefined;
@ -547,7 +547,7 @@ vending_weapon_upgrade()
self enable_trigger();
if (isdefined(level.machine_assets["packapunch"].power_on_callback))
perk_machine thread [[ level.machine_assets["packapunch"].power_on_callback ]]();
perk_machine thread [[level.machine_assets["packapunch"].power_on_callback]]();
self thread vending_machine_trigger_think();
perk_machine playloopsound("zmb_perks_packa_loop");
@ -570,7 +570,7 @@ vending_weapon_upgrade()
if (isdefined(level.custom_pap_validation))
{
valid = self [[ level.custom_pap_validation ]](player);
valid = self [[level.custom_pap_validation]](player);
if (!valid)
continue;
@ -619,7 +619,7 @@ vending_weapon_upgrade()
self playsound("evt_perk_deny");
if (isdefined(level.custom_pap_deny_vo_func))
player [[ level.custom_pap_deny_vo_func ]]();
player [[level.custom_pap_deny_vo_func]]();
else
player maps\mp\zombies\_zm_audio::create_and_play_dialog("general", "perk_deny", undefined, 0);
@ -789,9 +789,9 @@ give_perk(perk, bought)
self scripts\zm\replaced\_zm::restore_additionalprimaryweapon();
}
if (isDefined(level._custom_perks[ perk ]) && isDefined(level._custom_perks[ perk ].player_thread_give))
if (isDefined(level._custom_perks[perk]) && isDefined(level._custom_perks[perk].player_thread_give))
{
self thread [[ level._custom_perks[ perk ].player_thread_give ]]();
self thread [[level._custom_perks[perk].player_thread_give]]();
}
self set_perk_clientfield(perk, 1);
@ -813,7 +813,7 @@ give_perk(perk, bought)
self.perks_active = [];
}
self.perks_active[ self.perks_active.size ] = perk;
self.perks_active[self.perks_active.size] = perk;
self notify("perk_acquired");
self thread perk_think(perk);
}
@ -837,7 +837,7 @@ perk_think(perk)
{
return;
}
else if (isDefined(self._retain_perks_array) && is_true(self._retain_perks_array[ perk ]))
else if (isDefined(self._retain_perks_array) && is_true(self._retain_perks_array[perk]))
{
return;
}
@ -877,9 +877,9 @@ perk_think(perk)
break;
}
if (isDefined(level._custom_perks[ perk ]) && isDefined(level._custom_perks[ perk ].player_thread_take))
if (isDefined(level._custom_perks[perk]) && isDefined(level._custom_perks[perk].player_thread_take))
{
self thread [[ level._custom_perks[ perk ].player_thread_take ]]();
self thread [[level._custom_perks[perk].player_thread_take]]();
}
self set_perk_clientfield(perk, 0);
@ -887,7 +887,7 @@ perk_think(perk)
if (isDefined(level.perk_lost_func))
{
self [[ level.perk_lost_func ]](perk);
self [[level.perk_lost_func]](perk);
}
if (isDefined(self.perks_active) && isinarray(self.perks_active, perk))
@ -914,7 +914,7 @@ perk_set_max_health_if_jugg(perk, set_premaxhealth, clamp_health_to_max_health)
self.premaxhealth = self.maxhealth;
}
max_total_health = level.zombie_vars[ "zombie_perk_juggernaut_health" ];
max_total_health = level.zombie_vars["zombie_perk_juggernaut_health"];
}
else if (perk == "specialty_armorvest_upgrade")
{
@ -923,7 +923,7 @@ perk_set_max_health_if_jugg(perk, set_premaxhealth, clamp_health_to_max_health)
self.premaxhealth = self.maxhealth;
}
max_total_health = level.zombie_vars[ "zombie_perk_juggernaut_health_upgrade" ];
max_total_health = level.zombie_vars["zombie_perk_juggernaut_health_upgrade"];
}
else if (perk == "jugg_upgrade")
{
@ -934,7 +934,7 @@ perk_set_max_health_if_jugg(perk, set_premaxhealth, clamp_health_to_max_health)
if (self hasperk("specialty_armorvest"))
{
max_total_health = level.zombie_vars[ "zombie_perk_juggernaut_health" ];
max_total_health = level.zombie_vars["zombie_perk_juggernaut_health"];
}
else
{
@ -945,7 +945,7 @@ perk_set_max_health_if_jugg(perk, set_premaxhealth, clamp_health_to_max_health)
{
if (self hasperk("specialty_armorvest"))
{
max_total_health = level.zombie_vars[ "zombie_perk_juggernaut_health" ];
max_total_health = level.zombie_vars["zombie_perk_juggernaut_health"];
}
else
{
@ -1028,7 +1028,7 @@ set_perk_clientfield(perk, state)
}
if (isdefined(level._custom_perks[perk]) && isdefined(level._custom_perks[perk].clientfield_set))
self [[ level._custom_perks[perk].clientfield_set ]](state);
self [[level._custom_perks[perk].clientfield_set]](state);
}
initialize_custom_perk_arrays()
@ -1179,7 +1179,7 @@ turn_movefaster_on()
while (i < machine.size)
{
machine[ i ] setmodel(level.machine_assets[ "marathon" ].off_model);
machine[i] setmodel(level.machine_assets["marathon"].off_model);
i++;
}
@ -1190,27 +1190,27 @@ turn_movefaster_on()
while (i < machine.size)
{
machine[ i ] setmodel(level.machine_assets[ "marathon" ].on_model);
machine[ i ] vibrate(vectorScale((0, -1, 0), 100), 0.3, 0.4, 3);
machine[ i ] playsound("zmb_perks_power_on");
machine[ i ] thread perk_fx("marathon_light");
machine[ i ] thread play_loop_on_machine();
machine[i] setmodel(level.machine_assets["marathon"].on_model);
machine[i] vibrate(vectorScale((0, -1, 0), 100), 0.3, 0.4, 3);
machine[i] playsound("zmb_perks_power_on");
machine[i] thread perk_fx("marathon_light");
machine[i] thread play_loop_on_machine();
i++;
}
level notify("specialty_movefaster_power_on");
array_thread(machine_triggers, ::set_power_on, 1);
if (isDefined(level.machine_assets[ "marathon" ].power_on_callback))
if (isDefined(level.machine_assets["marathon"].power_on_callback))
{
array_thread(machine, level.machine_assets[ "marathon" ].power_on_callback);
array_thread(machine, level.machine_assets["marathon"].power_on_callback);
}
level waittill("marathon_off");
if (isDefined(level.machine_assets[ "marathon" ].power_off_callback))
if (isDefined(level.machine_assets["marathon"].power_off_callback))
{
array_thread(machine, level.machine_assets[ "marathon" ].power_off_callback);
array_thread(machine, level.machine_assets["marathon"].power_off_callback);
}
array_thread(machine, ::turn_perk_off);

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

@ -15,7 +15,7 @@ playerhealthregen()
self.flags_lock = [];
}
if (!isDefined(self.flag[ "player_has_red_flashing_overlay" ]))
if (!isDefined(self.flag["player_has_red_flashing_overlay"]))
{
self player_flag_init("player_has_red_flashing_overlay");
self player_flag_init("player_is_invulnerable");

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

@ -11,14 +11,14 @@ standard_powered_items()
while (i < vending_triggers.size)
{
if (vending_triggers[ i ].script_noteworthy == "specialty_weapupgrade")
if (vending_triggers[i].script_noteworthy == "specialty_weapupgrade")
{
i++;
continue;
}
powered_on = maps\mp\zombies\_zm_perks::get_perk_machine_start_state(vending_triggers[ i ].script_noteworthy);
add_powered_item(::perk_power_on, ::perk_power_off, ::perk_range, ::cost_low_if_local, 0, powered_on, vending_triggers[ i ]);
powered_on = maps\mp\zombies\_zm_perks::get_perk_machine_start_state(vending_triggers[i].script_noteworthy);
add_powered_item(::perk_power_on, ::perk_power_off, ::perk_range, ::cost_low_if_local, 0, powered_on, vending_triggers[i]);
i++;
}

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

@ -141,14 +141,14 @@ powerup_grab(powerup_team)
{
if (isdefined(level._powerup_grab_check))
{
if (!self [[ level._powerup_grab_check ]](players[i]))
if (!self [[level._powerup_grab_check]](players[i]))
continue;
}
self.power_up_grab_player = players[i];
if (isdefined(level.zombie_powerup_grab_func))
level thread [[ level.zombie_powerup_grab_func ]]();
level thread [[level.zombie_powerup_grab_func]]();
else
{
switch (self.powerup_name)
@ -181,7 +181,7 @@ powerup_grab(powerup_team)
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);
level thread [[level.use_new_carpenter_func]](self.origin);
else
level thread start_carpenter(self.origin);
@ -234,7 +234,7 @@ powerup_grab(powerup_team)
default:
if (isdefined(level._zombiemode_powerup_grab))
level thread [[ level._zombiemode_powerup_grab ]](self, players[i]);
level thread [[level._zombiemode_powerup_grab]](self, players[i]);
break;
}
@ -284,12 +284,12 @@ powerup_grab(powerup_team)
{
if (isdefined(level.powerup_intro_vox))
{
level thread [[ level.powerup_intro_vox ]](self);
level thread [[level.powerup_intro_vox]](self);
return;
}
else if (isdefined(level.powerup_vo_available))
{
can_say_vo = [[ level.powerup_vo_available ]]();
can_say_vo = [[level.powerup_vo_available]]();
if (!can_say_vo)
{
@ -325,49 +325,49 @@ full_ammo_powerup(drop_item, player)
if (isdefined(level._get_game_module_players))
{
players = [[ level._get_game_module_players ]](player);
players = [[level._get_game_module_players]](player);
}
i = 0;
while (i < players.size)
{
if (players[ i ] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
i++;
continue;
}
primary_weapons = players[ i ] getweaponslist(1);
primary_weapons = players[i] getweaponslist(1);
players[ i ] notify("zmb_max_ammo");
players[ i ] notify("zmb_lost_knife");
players[ i ] notify("zmb_disable_claymore_prompt");
players[ i ] notify("zmb_disable_spikemore_prompt");
players[i] notify("zmb_max_ammo");
players[i] notify("zmb_lost_knife");
players[i] notify("zmb_disable_claymore_prompt");
players[i] notify("zmb_disable_spikemore_prompt");
x = 0;
while (x < primary_weapons.size)
{
if (level.headshots_only && is_lethal_grenade(primary_weapons[ x ]))
if (level.headshots_only && is_lethal_grenade(primary_weapons[x]))
{
x++;
continue;
}
if (isdefined(level.zombie_include_equipment) && isdefined(level.zombie_include_equipment[ primary_weapons[ x ] ]))
if (isdefined(level.zombie_include_equipment) && isdefined(level.zombie_include_equipment[primary_weapons[x]]))
{
x++;
continue;
}
if (isdefined(level.zombie_weapons_no_max_ammo) && isdefined(level.zombie_weapons_no_max_ammo[ primary_weapons[ x ] ]))
if (isdefined(level.zombie_weapons_no_max_ammo) && isdefined(level.zombie_weapons_no_max_ammo[primary_weapons[x]]))
{
x++;
continue;
}
if (players[ i ] hasweapon(primary_weapons[ x ]))
if (players[i] hasweapon(primary_weapons[x]))
{
if (clip_only)
{
@ -452,7 +452,7 @@ empty_clip_powerup(drop_item, player)
while (i < players.size)
{
if (players[ i ] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
if (players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
i++;
continue;
@ -488,7 +488,7 @@ empty_clip_on_hud(drop_item, team)
{
self endon("disconnect");
hudelem = maps\mp\gametypes_zm\_hud_util::createserverfontstring("objective", 2, team);
hudelem maps\mp\gametypes_zm\_hud_util::setpoint("TOP", undefined, 0, level.zombie_vars[ "zombie_timer_offset" ] - (level.zombie_vars[ "zombie_timer_offset_interval" ] * 2));
hudelem maps\mp\gametypes_zm\_hud_util::setpoint("TOP", undefined, 0, level.zombie_vars["zombie_timer_offset"] - (level.zombie_vars["zombie_timer_offset_interval"] * 2));
hudelem.sort = 0.5;
hudelem.color = (0.21, 0, 0);
hudelem.alpha = 0;
@ -531,7 +531,7 @@ nuke_powerup(drop_item, player_team)
if (isdefined(zombies[i].nuke_damage_func))
{
zombies[i] thread [[ zombies[i].nuke_damage_func ]]();
zombies[i] thread [[zombies[i].nuke_damage_func]]();
continue;
}
@ -569,7 +569,7 @@ nuke_powerup(drop_item, player_team)
for (i = 0; i < players.size; i++)
{
players[ i ] maps\mp\zombies\_zm_score::player_add_points("nuke_powerup", 400);
players[i] maps\mp\zombies\_zm_score::player_add_points("nuke_powerup", 400);
}
if (level.scr_zm_ui_gametype == "zgrief")
@ -616,7 +616,7 @@ insta_kill_powerup(drop_item, player)
{
if (isDefined(level.insta_kill_powerup_override))
{
level thread [[ level.insta_kill_powerup_override ]](drop_item, player);
level thread [[level.insta_kill_powerup_override]](drop_item, player);
return;
}
@ -635,33 +635,33 @@ insta_kill_powerup(drop_item, player)
level thread half_damage_powerup(drop_item, player);
}
if (level.zombie_vars[ team ][ "zombie_powerup_insta_kill_on" ])
if (level.zombie_vars[team]["zombie_powerup_insta_kill_on"])
{
level.zombie_vars[ team ][ "zombie_powerup_insta_kill_time" ] += time;
level.zombie_vars[team]["zombie_powerup_insta_kill_time"] += time;
return;
}
temp_enta = spawn("script_origin", (0, 0, 0));
temp_enta playloopsound("zmb_insta_kill_loop");
level.zombie_vars[ team ][ "zombie_half_damage" ] = 0;
level.zombie_vars[ team ][ "zombie_insta_kill" ] = !is_true(level.zombie_vars[ team ][ "zombie_powerup_half_damage_on" ]);
level.zombie_vars[team]["zombie_half_damage"] = 0;
level.zombie_vars[team]["zombie_insta_kill"] = !is_true(level.zombie_vars[team]["zombie_powerup_half_damage_on"]);
level.zombie_vars[ team ][ "zombie_powerup_insta_kill_on" ] = 1;
level.zombie_vars[team]["zombie_powerup_insta_kill_on"] = 1;
while (level.zombie_vars[ team ][ "zombie_powerup_insta_kill_time" ] >= 0)
while (level.zombie_vars[team]["zombie_powerup_insta_kill_time"] >= 0)
{
wait 0.05;
level.zombie_vars[ team ][ "zombie_powerup_insta_kill_time" ] -= 0.05;
level.zombie_vars[team]["zombie_powerup_insta_kill_time"] -= 0.05;
}
level.zombie_vars[ team ][ "zombie_half_damage" ] = is_true(level.zombie_vars[ team ][ "zombie_powerup_half_damage_on" ]);
level.zombie_vars[ team ][ "zombie_insta_kill" ] = 0;
level.zombie_vars[team]["zombie_half_damage"] = is_true(level.zombie_vars[team]["zombie_powerup_half_damage_on"]);
level.zombie_vars[team]["zombie_insta_kill"] = 0;
level.zombie_vars[ team ][ "zombie_powerup_insta_kill_on" ] = 0;
level.zombie_vars[ team ][ "zombie_powerup_insta_kill_time" ] = time;
level.zombie_vars[team]["zombie_powerup_insta_kill_on"] = 0;
level.zombie_vars[team]["zombie_powerup_insta_kill_time"] = time;
get_players()[ 0 ] playsoundtoteam("zmb_insta_kill", team);
get_players()[0] playsoundtoteam("zmb_insta_kill", team);
temp_enta stoploopsound(2);
temp_enta delete();
@ -670,9 +670,9 @@ insta_kill_powerup(drop_item, player)
while (i < players.size)
{
if (isDefined(players[ i ]))
if (isDefined(players[i]))
{
players[ i ] notify("insta_kill_over");
players[i] notify("insta_kill_over");
}
i++;
@ -685,28 +685,28 @@ half_damage_powerup(drop_item, player)
time = 15;
if (level.zombie_vars[ team ][ "zombie_powerup_half_damage_on" ])
if (level.zombie_vars[team]["zombie_powerup_half_damage_on"])
{
level.zombie_vars[ team ][ "zombie_powerup_half_damage_time" ] += time;
level.zombie_vars[team]["zombie_powerup_half_damage_time"] += time;
return;
}
level.zombie_vars[ team ][ "zombie_insta_kill" ] = 0;
level.zombie_vars[ team ][ "zombie_half_damage" ] = !is_true(level.zombie_vars[ team ][ "zombie_powerup_insta_kill_on" ]);
level.zombie_vars[team]["zombie_insta_kill"] = 0;
level.zombie_vars[team]["zombie_half_damage"] = !is_true(level.zombie_vars[team]["zombie_powerup_insta_kill_on"]);
level.zombie_vars[ team ][ "zombie_powerup_half_damage_on" ] = 1;
level.zombie_vars[team]["zombie_powerup_half_damage_on"] = 1;
while (level.zombie_vars[ team ][ "zombie_powerup_half_damage_time" ] >= 0)
while (level.zombie_vars[team]["zombie_powerup_half_damage_time"] >= 0)
{
wait 0.05;
level.zombie_vars[ team ][ "zombie_powerup_half_damage_time" ] -= 0.05;
level.zombie_vars[team]["zombie_powerup_half_damage_time"] -= 0.05;
}
level.zombie_vars[ team ][ "zombie_insta_kill" ] = is_true(level.zombie_vars[ team ][ "zombie_powerup_insta_kill_on" ]);
level.zombie_vars[ team ][ "zombie_half_damage" ] = 0;
level.zombie_vars[team]["zombie_insta_kill"] = is_true(level.zombie_vars[team]["zombie_powerup_insta_kill_on"]);
level.zombie_vars[team]["zombie_half_damage"] = 0;
level.zombie_vars[ team ][ "zombie_powerup_half_damage_on" ] = 0;
level.zombie_vars[ team ][ "zombie_powerup_half_damage_time" ] = time;
level.zombie_vars[team]["zombie_powerup_half_damage_on"] = 0;
level.zombie_vars[team]["zombie_powerup_half_damage_time"] = time;
}
double_points_powerup(drop_item, player)
@ -721,9 +721,9 @@ double_points_powerup(drop_item, player)
level thread half_points_powerup(drop_item, player);
}
if (level.zombie_vars[ team ][ "zombie_powerup_point_doubler_on" ])
if (level.zombie_vars[team]["zombie_powerup_point_doubler_on"])
{
level.zombie_vars[ team ][ "zombie_powerup_point_doubler_time" ] += time;
level.zombie_vars[team]["zombie_powerup_point_doubler_time"] += time;
return;
}
@ -751,24 +751,24 @@ double_points_powerup(drop_item, player)
for (i = 0; i < players.size; i++)
{
players[ i ] setclientfield("score_cf_double_points_active", 1);
players[i] setclientfield("score_cf_double_points_active", 1);
}
temp_ent = spawn("script_origin", (0, 0, 0));
temp_ent playloopsound("zmb_double_point_loop");
level.zombie_vars[ team ][ "zombie_point_scalar" ] *= 2;
level.zombie_vars[ team ][ "zombie_powerup_point_doubler_on" ] = 1;
level.zombie_vars[team]["zombie_point_scalar"] *= 2;
level.zombie_vars[team]["zombie_powerup_point_doubler_on"] = 1;
while (level.zombie_vars[ team ][ "zombie_powerup_point_doubler_time" ] >= 0)
while (level.zombie_vars[team]["zombie_powerup_point_doubler_time"] >= 0)
{
wait 0.05;
level.zombie_vars[ team ][ "zombie_powerup_point_doubler_time" ] -= 0.05;
level.zombie_vars[team]["zombie_powerup_point_doubler_time"] -= 0.05;
}
level.zombie_vars[ team ][ "zombie_point_scalar" ] /= 2;
level.zombie_vars[ team ][ "zombie_powerup_point_doubler_on" ] = 0;
level.zombie_vars[ team ][ "zombie_powerup_point_doubler_time" ] = time;
level.zombie_vars[team]["zombie_point_scalar"] /= 2;
level.zombie_vars[team]["zombie_powerup_point_doubler_on"] = 0;
level.zombie_vars[team]["zombie_powerup_point_doubler_time"] = time;
temp_ent stoploopsound(2);
temp_ent delete();
@ -777,8 +777,8 @@ double_points_powerup(drop_item, player)
for (i = 0; i < players.size; i++)
{
players[ i ] playsound("zmb_points_loop_off");
players[ i ] setclientfield("score_cf_double_points_active", 0);
players[i] playsound("zmb_points_loop_off");
players[i] setclientfield("score_cf_double_points_active", 0);
}
level._race_team_double_points = undefined;
@ -790,24 +790,24 @@ half_points_powerup(drop_item, player)
time = 15;
if (level.zombie_vars[ team ][ "zombie_powerup_point_halfer_on" ])
if (level.zombie_vars[team]["zombie_powerup_point_halfer_on"])
{
level.zombie_vars[ team ][ "zombie_powerup_point_halfer_time" ] += time;
level.zombie_vars[team]["zombie_powerup_point_halfer_time"] += time;
return;
}
level.zombie_vars[ team ][ "zombie_point_scalar" ] /= 2;
level.zombie_vars[ team ][ "zombie_powerup_point_halfer_on" ] = 1;
level.zombie_vars[team]["zombie_point_scalar"] /= 2;
level.zombie_vars[team]["zombie_powerup_point_halfer_on"] = 1;
while (level.zombie_vars[ team ][ "zombie_powerup_point_halfer_time" ] >= 0)
while (level.zombie_vars[team]["zombie_powerup_point_halfer_time"] >= 0)
{
wait 0.05;
level.zombie_vars[ team ][ "zombie_powerup_point_halfer_time" ] -= 0.05;
level.zombie_vars[team]["zombie_powerup_point_halfer_time"] -= 0.05;
}
level.zombie_vars[ team ][ "zombie_point_scalar" ] *= 2;
level.zombie_vars[ team ][ "zombie_powerup_point_halfer_on" ] = 0;
level.zombie_vars[ team ][ "zombie_powerup_point_halfer_time" ] = time;
level.zombie_vars[team]["zombie_point_scalar"] *= 2;
level.zombie_vars[team]["zombie_powerup_point_halfer_on"] = 0;
level.zombie_vars[team]["zombie_powerup_point_halfer_time"] = time;
}
start_fire_sale(item)

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

@ -26,11 +26,11 @@ doriotshielddeploy(origin, angles)
self maps\mp\zombies\_zm_weapons::switch_back_primary_weapon(self.riotshield_prev_wep);
if (isdefined(level.equipment_planted))
self [[ level.equipment_planted ]](shield_ent, level.riotshield_name, self);
self [[level.equipment_planted]](shield_ent, level.riotshield_name, self);
if (isdefined(level.equipment_safe_to_drop))
{
if (!self [[ level.equipment_safe_to_drop ]](shield_ent))
if (!self [[level.equipment_safe_to_drop]](shield_ent))
{
self notify("destroy_riotshield");
shield_ent delete();

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

@ -26,11 +26,11 @@ doriotshielddeploy(origin, angles)
self maps\mp\zombies\_zm_weapons::switch_back_primary_weapon(self.riotshield_prev_wep);
if (isdefined(level.equipment_planted))
self [[ level.equipment_planted ]](shield_ent, level.riotshield_name, self);
self [[level.equipment_planted]](shield_ent, level.riotshield_name, self);
if (isdefined(level.equipment_safe_to_drop))
{
if (!self [[ level.equipment_safe_to_drop ]](shield_ent))
if (!self [[level.equipment_safe_to_drop]](shield_ent))
{
self notify("destroy_riotshield");
shield_ent delete();

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

@ -26,11 +26,11 @@ doriotshielddeploy(origin, angles)
self maps\mp\zombies\_zm_weapons::switch_back_primary_weapon(self.riotshield_prev_wep);
if (isdefined(level.equipment_planted))
self [[ level.equipment_planted ]](shield_ent, level.riotshield_name, self);
self [[level.equipment_planted]](shield_ent, level.riotshield_name, self);
if (isdefined(level.equipment_safe_to_drop))
{
if (!self [[ level.equipment_safe_to_drop ]](shield_ent))
if (!self [[level.equipment_safe_to_drop]](shield_ent))
{
self notify("destroy_riotshield");
shield_ent delete();

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

@ -17,7 +17,7 @@ add_to_player_score(points, add_to_total)
points = int(points); // points must be an int
self.score += points;
self.pers[ "score" ] = self.score;
self.pers["score"] = self.score;
if (add_to_total)
{
@ -36,7 +36,7 @@ minus_to_player_score(points)
points = int(points); // points must be an int
self.score -= points;
self.pers[ "score" ] = self.score;
self.pers["score"] = self.score;
}
player_add_points_kill_bonus(mod, hit_location)

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

@ -58,7 +58,7 @@ zombie_damage(mod, hit_location, hit_origin, player, amount, team)
if (isDefined(self.zombie_damage_fx_func))
{
self [[ self.zombie_damage_fx_func ]](mod, hit_location, hit_origin, player);
self [[self.zombie_damage_fx_func]](mod, hit_location, hit_origin, player);
}
if (is_placeable_mine(self.damageweapon))
@ -79,7 +79,7 @@ zombie_damage(mod, hit_location, hit_origin, player, amount, team)
if (isDefined(self.zombie_damage_claymore_func))
{
self [[ self.zombie_damage_claymore_func ]](mod, hit_location, hit_origin, player);
self [[self.zombie_damage_claymore_func]](mod, hit_location, hit_origin, player);
}
else if (isDefined(player) && isalive(player))
{
@ -270,7 +270,7 @@ zombie_gib_on_damage()
}
if (isdefined(level.custom_derive_damage_refs))
refs = self [[ level.custom_derive_damage_refs ]](refs, point, weaponname);
refs = self [[level.custom_derive_damage_refs]](refs, point, weaponname);
if (refs.size)
{
@ -293,7 +293,7 @@ zombie_gib_on_damage()
}
if (isdefined(self.crawl_anim_override))
self [[ self.crawl_anim_override ]]();
self [[self.crawl_anim_override]]();
}
}
@ -302,7 +302,7 @@ zombie_gib_on_damage()
self thread maps\mp\animscripts\zm_death::do_gib();
if (isdefined(level.gib_on_damage))
self thread [[ level.gib_on_damage ]]();
self thread [[level.gib_on_damage]]();
}
}
}

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

@ -112,40 +112,40 @@ create_zombie_point_of_interest_attractor_positions(num_attract_dists, diff_per_
for (i = 0; i < num_attract_dists; i++)
{
self.last_index[ i ] = -1;
self.last_index[i] = -1;
}
self.attract_dists = [];
for (i = 0; i < self.num_attract_dists; i++)
{
self.attract_dists[ i ] = diff_per_dist * (i + 1);
self.attract_dists[i] = diff_per_dist * (i + 1);
}
max_positions = [];
for (i = 0; i < self.num_attract_dists; i++)
{
max_positions[ i ] = int((6.28 * self.attract_dists[ i ]) / attractor_width);
max_positions[i] = int((6.28 * self.attract_dists[i]) / attractor_width);
}
num_attracts_per_dist = self.num_poi_attracts / self.num_attract_dists;
self.max_attractor_dist = self.attract_dists[ self.attract_dists.size - 1 ] * 1.1;
self.max_attractor_dist = self.attract_dists[self.attract_dists.size - 1] * 1.1;
diff = 0;
actual_num_positions = [];
i = 0;
while (i < self.num_attract_dists)
{
if (num_attracts_per_dist > (max_positions[ i ] + diff))
if (num_attracts_per_dist > (max_positions[i] + diff))
{
actual_num_positions[ i ] = max_positions[ i ];
diff += num_attracts_per_dist - max_positions[ i ];
actual_num_positions[i] = max_positions[i];
diff += num_attracts_per_dist - max_positions[i];
i++;
continue;
}
actual_num_positions[ i ] = num_attracts_per_dist + diff;
actual_num_positions[i] = num_attracts_per_dist + diff;
diff = 0;
i++;
}
@ -157,21 +157,21 @@ create_zombie_point_of_interest_attractor_positions(num_attract_dists, diff_per_
for (j = 0; j < 4; j++)
{
if ((actual_num_positions[ j ] + failed) < max_positions[ j ])
if ((actual_num_positions[j] + failed) < max_positions[j])
{
actual_num_positions[ j ] += failed;
actual_num_positions[j] += failed;
failed = 0;
}
else if (actual_num_positions[ j ] < max_positions[ j ])
else if (actual_num_positions[j] < max_positions[j])
{
actual_num_positions[ j ] = max_positions[ j ];
failed = max_positions[ j ] - actual_num_positions[ j ];
actual_num_positions[j] = max_positions[j];
failed = max_positions[j] - actual_num_positions[j];
}
failed += self generated_radius_attract_positions(forward, angle_offset, actual_num_positions[ j ], self.attract_dists[ j ]);
failed += self generated_radius_attract_positions(forward, angle_offset, actual_num_positions[j], self.attract_dists[j]);
angle_offset += 15;
self.last_index[ j ] = int((actual_num_positions[ j ] - failed) + prev_last_index);
prev_last_index = self.last_index[ j ];
self.last_index[j] = int((actual_num_positions[j] - failed) + prev_last_index);
prev_last_index = self.last_index[j];
self notify("attractor_positions_generated");
level notify("attractor_positions_generated");

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

@ -52,7 +52,7 @@ on_spawn(watcher, player)
}
}
watcher.objectarray[ watcher.objectarray.size ] = retrievable_model;
watcher.objectarray[watcher.objectarray.size] = retrievable_model;
retrievable_model thread drop_knives_to_ground(player);
if (isfriendly)
@ -120,7 +120,7 @@ watch_use_trigger(trigger, model, callback, weapon, playersoundonuse, npcsoundon
player playsound(npcsoundonuse);
}
player thread [[ callback ]](weapon, model, trigger);
player thread [[callback]](weapon, model, trigger);
return;
}
}

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

@ -57,7 +57,7 @@ player_throw_beacon(grenade, num_attractors, max_attract_dist, attract_dist_diff
grenade waittill("stationary");
if (isdefined(level.grenade_planted))
self thread [[ level.grenade_planted ]](grenade, model);
self thread [[level.grenade_planted]](grenade, model);
if (isdefined(grenade))
{
@ -88,7 +88,7 @@ player_throw_beacon(grenade, num_attractors, max_attract_dist, attract_dist_diff
valid_poi = check_point_in_enabled_zone(grenade.origin, undefined, undefined);
if (isdefined(level.check_valid_poi))
valid_poi = grenade [[ level.check_valid_poi ]](valid_poi);
valid_poi = grenade [[level.check_valid_poi]](valid_poi);
if (valid_poi)
{

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

@ -116,7 +116,7 @@ claymore_detonation()
self.damagearea = damagearea;
self thread delete_claymores_on_death(self.owner, damagearea);
self.owner.claymores[ self.owner.claymores.size ] = self;
self.owner.claymores[self.owner.claymores.size] = self;
while (1)
{
@ -127,12 +127,12 @@ claymore_detonation()
continue;
}
if (isDefined(ent.pers) && isDefined(ent.pers[ "team" ]) && ent.pers[ "team" ] == self.team)
if (isDefined(ent.pers) && isDefined(ent.pers["team"]) && ent.pers["team"] == self.team)
{
continue;
}
if (isDefined(ent.pers) && isDefined(ent.pers[ "team" ]) && ent.pers[ "team" ] == getOtherTeam(self.team))
if (isDefined(ent.pers) && isDefined(ent.pers["team"]) && ent.pers["team"] == getOtherTeam(self.team))
{
continue;
}

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

@ -81,7 +81,7 @@ player_throw_cymbal_monkey(grenade, num_attractors, max_attract_dist, attract_di
grenade waittill("stationary");
if (isdefined(level.grenade_planted))
self thread [[ level.grenade_planted ]](grenade, model);
self thread [[level.grenade_planted]](grenade, model);
if (isdefined(grenade))
{
@ -112,7 +112,7 @@ player_throw_cymbal_monkey(grenade, num_attractors, max_attract_dist, attract_di
valid_poi = check_point_in_enabled_zone(grenade.origin, undefined, undefined);
if (isdefined(level.check_valid_poi))
valid_poi = grenade [[ level.check_valid_poi ]](valid_poi);
valid_poi = grenade [[level.check_valid_poi]](valid_poi);
if (valid_poi)
{

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

@ -14,8 +14,8 @@ emp_detonate(grenade)
grenade waittill("explode", grenade_origin);
emp_radius = level.zombie_vars[ "emp_perk_off_range" ];
emp_time = level.zombie_vars[ "emp_perk_off_time" ];
emp_radius = level.zombie_vars["emp_perk_off_range"];
emp_time = level.zombie_vars["emp_perk_off_time"];
origin = grenade_origin;
if (!isDefined(origin))
@ -28,7 +28,7 @@ emp_detonate(grenade)
if (isDefined(level.custom_emp_detonate))
{
thread [[ level.custom_emp_detonate ]](grenade_origin);
thread [[level.custom_emp_detonate]](grenade_origin);
}
if (isDefined(grenade_owner))
@ -171,7 +171,7 @@ player_emp_fx(time)
for (i = 0; i < time; i += wait_time)
{
playfxontag(level._effect[ "elec_torso" ], self, "J_SpineLower");
playfxontag(level._effect["elec_torso"], self, "J_SpineLower");
wait wait_time;
}
@ -243,12 +243,12 @@ player_perk_pause(perk)
self.disabled_perks = [];
}
if (!is_true(self.disabled_perks[ perk ]) && self hasperk(perk))
if (!is_true(self.disabled_perks[perk]) && self hasperk(perk))
{
self.disabled_perks[ perk ] = 1;
self.disabled_perks[perk] = 1;
}
if (self.disabled_perks[ perk ])
if (self.disabled_perks[perk])
{
self unsetperk(perk);
self maps\mp\zombies\_zm_perks::set_perk_clientfield(perk, 2);
@ -273,9 +273,9 @@ player_perk_pause(perk)
self.hasperkspecialtytombstone = 0;
}
if (isDefined(level._custom_perks[ perk ]) && isDefined(level._custom_perks[ perk ].player_thread_take))
if (isDefined(level._custom_perks[perk]) && isDefined(level._custom_perks[perk].player_thread_take))
{
self thread [[ level._custom_perks[ perk ].player_thread_take ]]();
self thread [[level._custom_perks[perk].player_thread_take]]();
}
}
@ -294,9 +294,9 @@ player_perk_unpause(perk)
return;
}
if (isDefined(self.disabled_perks) && is_true(self.disabled_perks[ perk ]))
if (isDefined(self.disabled_perks) && is_true(self.disabled_perks[perk]))
{
self.disabled_perks[ perk ] = undefined;
self.disabled_perks[perk] = undefined;
self maps\mp\zombies\_zm_perks::set_perk_clientfield(perk, 1);
self setperk(perk);
@ -307,9 +307,9 @@ player_perk_unpause(perk)
self maps\mp\zombies\_zm_perks::perk_set_max_health_if_jugg(perk, 0, 0);
if (isDefined(level._custom_perks[ perk ]) && isDefined(level._custom_perks[ perk ].player_thread_give))
if (isDefined(level._custom_perks[perk]) && isDefined(level._custom_perks[perk].player_thread_give))
{
self thread [[ level._custom_perks[ perk ].player_thread_give ]]();
self thread [[level._custom_perks[perk].player_thread_give]]();
}
}

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

@ -156,8 +156,8 @@ jetgun_check_enemies_in_range(zombie, view_pos, drag_range_squared, gib_range_sq
if (test_range_squared < grind_range_squared)
{
level.jetgun_fling_enemies[ level.jetgun_fling_enemies.size ] = zombie;
level.jetgun_grind_enemies[ level.jetgun_grind_enemies.size ] = dot < 0;
level.jetgun_fling_enemies[level.jetgun_fling_enemies.size] = zombie;
level.jetgun_grind_enemies[level.jetgun_grind_enemies.size] = dot < 0;
}
else
{
@ -173,7 +173,7 @@ jetgun_check_enemies_in_range(zombie, view_pos, drag_range_squared, gib_range_sq
if (test_range_squared < drag_range_squared && dot > 0)
{
level.jetgun_drag_enemies[ level.jetgun_drag_enemies.size ] = zombie;
level.jetgun_drag_enemies[level.jetgun_drag_enemies.size] = zombie;
}
}
}
@ -191,9 +191,9 @@ jetgun_grind_zombie(player)
if (is_mature())
{
if (isDefined(level._effect[ "zombie_guts_explosion" ]))
if (isDefined(level._effect["zombie_guts_explosion"]))
{
playfx(level._effect[ "zombie_guts_explosion" ], self gettagorigin("J_SpineLower"));
playfx(level._effect["zombie_guts_explosion"], self gettagorigin("J_SpineLower"));
}
}

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

@ -169,7 +169,7 @@ riotshield_fling_zombie(player, fling_vec, index)
if (isdefined(self.riotshield_fling_func))
{
self [[ self.riotshield_fling_func ]](player);
self [[self.riotshield_fling_func]](player);
return;
}
@ -192,7 +192,7 @@ riotshield_fling_zombie(player, fling_vec, index)
zombie_knockdown(player, gib)
{
if (isdefined(level.override_riotshield_damage_func))
self [[ level.override_riotshield_damage_func ]](player, gib);
self [[level.override_riotshield_damage_func]](player, gib);
else
{
if (gib)
@ -213,7 +213,7 @@ riotshield_knockdown_zombie(player, gib)
return;
if (isdefined(self.riotshield_knockdown_func))
self [[ self.riotshield_knockdown_func ]](player, gib);
self [[self.riotshield_knockdown_func]](player, gib);
else
self zombie_knockdown(player, gib);

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

@ -169,7 +169,7 @@ riotshield_fling_zombie(player, fling_vec, index)
if (isdefined(self.riotshield_fling_func))
{
self [[ self.riotshield_fling_func ]](player);
self [[self.riotshield_fling_func]](player);
return;
}
@ -192,7 +192,7 @@ riotshield_fling_zombie(player, fling_vec, index)
zombie_knockdown(player, gib)
{
if (isdefined(level.override_riotshield_damage_func))
self [[ level.override_riotshield_damage_func ]](player, gib);
self [[level.override_riotshield_damage_func]](player, gib);
else
{
if (gib)
@ -213,7 +213,7 @@ riotshield_knockdown_zombie(player, gib)
return;
if (isdefined(self.riotshield_knockdown_func))
self [[ self.riotshield_knockdown_func ]](player, gib);
self [[self.riotshield_knockdown_func]](player, gib);
else
self zombie_knockdown(player, gib);

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

@ -170,7 +170,7 @@ riotshield_fling_zombie(player, fling_vec, index)
if (isdefined(self.riotshield_fling_func))
{
self [[ self.riotshield_fling_func ]](player);
self [[self.riotshield_fling_func]](player);
return;
}
@ -193,7 +193,7 @@ riotshield_fling_zombie(player, fling_vec, index)
zombie_knockdown(player, gib)
{
if (isdefined(level.override_riotshield_damage_func))
self [[ level.override_riotshield_damage_func ]](player, gib);
self [[level.override_riotshield_damage_func]](player, gib);
else
{
if (gib)
@ -214,7 +214,7 @@ riotshield_knockdown_zombie(player, gib)
return;
if (isdefined(self.riotshield_knockdown_func))
self [[ self.riotshield_knockdown_func ]](player, gib);
self [[self.riotshield_knockdown_func]](player, gib);
else
self zombie_knockdown(player, gib);

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

@ -333,7 +333,7 @@ weapon_give(weapon, is_upgrade, magic_box, nosound)
{
if (isDefined(self.player_shield_reset_health))
{
self [[ self.player_shield_reset_health ]]();
self [[self.player_shield_reset_health]]();
}
}
@ -429,7 +429,7 @@ weapon_give(weapon, is_upgrade, magic_box, nosound)
if (isDefined(level.zombiemode_offhand_weapon_give_override))
{
if (self [[ level.zombiemode_offhand_weapon_give_override ]](weapon))
if (self [[level.zombiemode_offhand_weapon_give_override]](weapon))
{
return;
}
@ -452,9 +452,9 @@ weapon_give(weapon, is_upgrade, magic_box, nosound)
return;
}
if (isDefined(level.zombie_weapons_callbacks) && isDefined(level.zombie_weapons_callbacks[ weapon ]))
if (isDefined(level.zombie_weapons_callbacks) && isDefined(level.zombie_weapons_callbacks[weapon]))
{
self thread [[ level.zombie_weapons_callbacks[ weapon ] ]]();
self thread [[level.zombie_weapons_callbacks[weapon]]]();
play_weapon_vo(weapon, magic_box);
return;
}
@ -464,7 +464,7 @@ weapon_give(weapon, is_upgrade, magic_box, nosound)
self play_sound_on_ent("purchase");
}
if (is_true(magic_box) && is_limited_weapon(weapon) && level.limited_weapons[ weapon ] == 1)
if (is_true(magic_box) && is_limited_weapon(weapon) && level.limited_weapons[weapon] == 1)
{
playsoundatposition("mus_raygun_stinger", (0, 0, 0));
}
@ -686,7 +686,7 @@ weapon_spawn_think()
if (isDefined(player.player_shield_reset_health))
{
player [[ player.player_shield_reset_health ]]();
player [[player.player_shield_reset_health]]();
}
}
else if (self.zombie_weapon_upgrade == "jetgun_zm")
@ -750,7 +750,7 @@ weapon_spawn_think()
ammo_cost = maps\mp\zombies\_zm_weapons::get_ammo_cost(str_weapon);
}
if (is_true(player.pers_upgrades_awarded[ "nube" ]))
if (is_true(player.pers_upgrades_awarded["nube"]))
{
ammo_cost = maps\mp\zombies\_zm_pers_upgrades_functions::pers_nube_override_ammo_cost(player, self.zombie_weapon_upgrade, ammo_cost);
}
@ -786,7 +786,7 @@ weapon_spawn_think()
{
if (isDefined(player.player_shield_reset_health))
{
ammo_given = player [[ player.player_shield_reset_health ]]();
ammo_given = player [[player.player_shield_reset_health]]();
}
else
{
@ -795,7 +795,7 @@ weapon_spawn_think()
}
else if (player maps\mp\zombies\_zm_weapons::has_upgrade(str_weapon))
{
ammo_given = player maps\mp\zombies\_zm_weapons::ammo_give(level.zombie_weapons[ str_weapon ].upgrade_name);
ammo_given = player maps\mp\zombies\_zm_weapons::ammo_give(level.zombie_weapons[str_weapon].upgrade_name);
}
else
{
@ -814,7 +814,7 @@ weapon_spawn_think()
if (isDefined(level.custom_generic_deny_vo_func))
{
player [[ level.custom_generic_deny_vo_func ]]();
player [[level.custom_generic_deny_vo_func]]();
}
else
{
@ -825,16 +825,16 @@ weapon_spawn_think()
if (isDefined(self.stub) && isDefined(self.stub.prompt_and_visibility_func))
{
self [[ self.stub.prompt_and_visibility_func ]](player);
self [[self.stub.prompt_and_visibility_func]](player);
}
}
}
get_upgraded_ammo_cost(weapon_name)
{
if (isDefined(level.zombie_weapons[ weapon_name ].upgraded_ammo_cost))
if (isDefined(level.zombie_weapons[weapon_name].upgraded_ammo_cost))
{
return level.zombie_weapons[ weapon_name ].upgraded_ammo_cost;
return level.zombie_weapons[weapon_name].upgraded_ammo_cost;
}
return 2500;

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

@ -14,61 +14,61 @@
struct_class_init()
{
level.struct_class_names = [];
level.struct_class_names[ "target" ] = [];
level.struct_class_names[ "targetname" ] = [];
level.struct_class_names[ "script_noteworthy" ] = [];
level.struct_class_names[ "script_linkname" ] = [];
level.struct_class_names[ "script_unitrigger_type" ] = [];
level.struct_class_names["target"] = [];
level.struct_class_names["targetname"] = [];
level.struct_class_names["script_noteworthy"] = [];
level.struct_class_names["script_linkname"] = [];
level.struct_class_names["script_unitrigger_type"] = [];
foreach (s_struct in level.struct)
{
if (isDefined(s_struct.targetname))
{
if (!isDefined(level.struct_class_names[ "targetname" ][ s_struct.targetname ]))
if (!isDefined(level.struct_class_names["targetname"][s_struct.targetname]))
{
level.struct_class_names[ "targetname" ][ s_struct.targetname ] = [];
level.struct_class_names["targetname"][s_struct.targetname] = [];
}
size = level.struct_class_names[ "targetname" ][ s_struct.targetname ].size;
level.struct_class_names[ "targetname" ][ s_struct.targetname ][ size ] = s_struct;
size = level.struct_class_names["targetname"][s_struct.targetname].size;
level.struct_class_names["targetname"][s_struct.targetname][size] = s_struct;
}
if (isDefined(s_struct.target))
{
if (!isDefined(level.struct_class_names[ "target" ][ s_struct.target ]))
if (!isDefined(level.struct_class_names["target"][s_struct.target]))
{
level.struct_class_names[ "target" ][ s_struct.target ] = [];
level.struct_class_names["target"][s_struct.target] = [];
}
size = level.struct_class_names[ "target" ][ s_struct.target ].size;
level.struct_class_names[ "target" ][ s_struct.target ][ size ] = s_struct;
size = level.struct_class_names["target"][s_struct.target].size;
level.struct_class_names["target"][s_struct.target][size] = s_struct;
}
if (isDefined(s_struct.script_noteworthy))
{
if (!isDefined(level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ]))
if (!isDefined(level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy]))
{
level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ] = [];
level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy] = [];
}
size = level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ].size;
level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ][ size ] = s_struct;
size = level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy].size;
level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy][size] = s_struct;
}
if (isDefined(s_struct.script_linkname))
{
level.struct_class_names[ "script_linkname" ][ s_struct.script_linkname ][ 0 ] = s_struct;
level.struct_class_names["script_linkname"][s_struct.script_linkname][0] = s_struct;
}
if (isDefined(s_struct.script_unitrigger_type))
{
if (!isDefined(level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ]))
if (!isDefined(level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type]))
{
level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ] = [];
level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type] = [];
}
size = level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ].size;
level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ][ size ] = s_struct;
size = level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type].size;
level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type][size] = s_struct;
}
}
@ -77,13 +77,13 @@ struct_class_init()
if (array_validate(level.add_struct_gamemode_location_funcs))
{
if (array_validate(level.add_struct_gamemode_location_funcs[ gametype ]))
if (array_validate(level.add_struct_gamemode_location_funcs[gametype]))
{
if (array_validate(level.add_struct_gamemode_location_funcs[ gametype ][ location ]))
if (array_validate(level.add_struct_gamemode_location_funcs[gametype][location]))
{
for (i = 0; i < level.add_struct_gamemode_location_funcs[ gametype ][ location ].size; i++)
for (i = 0; i < level.add_struct_gamemode_location_funcs[gametype][location].size; i++)
{
[[ level.add_struct_gamemode_location_funcs[ gametype ][ location ][ i ] ]]();
[[level.add_struct_gamemode_location_funcs[gametype][location][i]]]();
}
}
}
@ -94,51 +94,51 @@ add_struct(s_struct)
{
if (isDefined(s_struct.targetname))
{
if (!isDefined(level.struct_class_names[ "targetname" ][ s_struct.targetname ]))
if (!isDefined(level.struct_class_names["targetname"][s_struct.targetname]))
{
level.struct_class_names[ "targetname" ][ s_struct.targetname ] = [];
level.struct_class_names["targetname"][s_struct.targetname] = [];
}
size = level.struct_class_names[ "targetname" ][ s_struct.targetname ].size;
level.struct_class_names[ "targetname" ][ s_struct.targetname ][ size ] = s_struct;
size = level.struct_class_names["targetname"][s_struct.targetname].size;
level.struct_class_names["targetname"][s_struct.targetname][size] = s_struct;
}
if (isDefined(s_struct.script_noteworthy))
{
if (!isDefined(level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ]))
if (!isDefined(level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy]))
{
level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ] = [];
level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy] = [];
}
size = level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ].size;
level.struct_class_names[ "script_noteworthy" ][ s_struct.script_noteworthy ][ size ] = s_struct;
size = level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy].size;
level.struct_class_names["script_noteworthy"][s_struct.script_noteworthy][size] = s_struct;
}
if (isDefined(s_struct.target))
{
if (!isDefined(level.struct_class_names[ "target" ][ s_struct.target ]))
if (!isDefined(level.struct_class_names["target"][s_struct.target]))
{
level.struct_class_names[ "target" ][ s_struct.target ] = [];
level.struct_class_names["target"][s_struct.target] = [];
}
size = level.struct_class_names[ "target" ][ s_struct.target ].size;
level.struct_class_names[ "target" ][ s_struct.target ][ size ] = s_struct;
size = level.struct_class_names["target"][s_struct.target].size;
level.struct_class_names["target"][s_struct.target][size] = s_struct;
}
if (isDefined(s_struct.script_linkname))
{
level.struct_class_names[ "script_linkname" ][ s_struct.script_linkname ][ 0 ] = s_struct;
level.struct_class_names["script_linkname"][s_struct.script_linkname][0] = s_struct;
}
if (isDefined(s_struct.script_unitrigger_type))
{
if (!isDefined(level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ]))
if (!isDefined(level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type]))
{
level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ] = [];
level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type] = [];
}
size = level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ].size;
level.struct_class_names[ "script_unitrigger_type" ][ s_struct.script_unitrigger_type ][ size ] = s_struct;
size = level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type].size;
level.struct_class_names["script_unitrigger_type"][s_struct.script_unitrigger_type][size] = s_struct;
}
}
@ -224,8 +224,8 @@ wallbuy(weapon_name, target, targetname, origin, angles, play_chalk_fx = 1)
bounds = absmaxs - absmins;
unitrigger_stub.script_length = 64;
unitrigger_stub.script_width = bounds[ 1 ];
unitrigger_stub.script_height = bounds[ 2 ];
unitrigger_stub.script_width = bounds[1];
unitrigger_stub.script_height = bounds[2];
unitrigger_stub.target = target;
unitrigger_stub.targetname = targetname;
unitrigger_stub.cursor_hint = "HINT_NOICON";
@ -342,7 +342,7 @@ playchalkfx(effect, origin, angles)
{
while (1)
{
fx = SpawnFX(level._effect[ effect ], origin, AnglesToForward(angles), AnglesToUp(angles));
fx = SpawnFX(level._effect[effect], origin, AnglesToForward(angles), AnglesToUp(angles));
TriggerFX(fx);
level waittill("connected", player);
fx Delete();
@ -373,13 +373,13 @@ barrier(model, origin, angles, not_solid)
level.survival_barriers_index = 0;
}
level.survival_barriers[ level.survival_barriers_index ] = spawn("script_model", origin);
level.survival_barriers[ level.survival_barriers_index ] setModel(model);
level.survival_barriers[ level.survival_barriers_index ] rotateTo(angles, 0.1);
level.survival_barriers[level.survival_barriers_index] = spawn("script_model", origin);
level.survival_barriers[level.survival_barriers_index] setModel(model);
level.survival_barriers[level.survival_barriers_index] rotateTo(angles, 0.1);
if (is_true(not_solid))
{
level.survival_barriers[ level.survival_barriers_index ] notSolid();
level.survival_barriers[level.survival_barriers_index] notSolid();
}
level.survival_barriers_index++;
@ -392,15 +392,15 @@ add_struct_location_gamemode_func(gametype, location, func)
level.add_struct_gamemode_location_funcs = [];
}
if (!isDefined(level.add_struct_gamemode_location_funcs[ gametype ]))
if (!isDefined(level.add_struct_gamemode_location_funcs[gametype]))
{
level.add_struct_gamemode_location_funcs[ gametype ] = [];
level.add_struct_gamemode_location_funcs[gametype] = [];
}
if (!isDefined(level.add_struct_gamemode_location_funcs[ gametype ][ location ]))
if (!isDefined(level.add_struct_gamemode_location_funcs[gametype][location]))
{
level.add_struct_gamemode_location_funcs[ gametype ][ location ] = [];
level.add_struct_gamemode_location_funcs[gametype][location] = [];
}
level.add_struct_gamemode_location_funcs[ gametype ][ location ][ level.add_struct_gamemode_location_funcs[ gametype ][ location ].size ] = func;
level.add_struct_gamemode_location_funcs[gametype][location][level.add_struct_gamemode_location_funcs[gametype][location].size] = func;
}

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

@ -404,7 +404,7 @@ meat_stink_on_ground(position_to_play)
attractor_point setmodel("tag_origin");
attractor_point playsound("zmb_land_meat");
wait 0.2;
playfxontag(level._effect[ "meat_stink_torso" ], attractor_point, "tag_origin");
playfxontag(level._effect["meat_stink_torso"], attractor_point, "tag_origin");
attractor_point playloopsound("zmb_meat_flies");
attractor_point create_zombie_point_of_interest(768, 48, 10000);
attractor_point.attract_to_origin = 1;

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

@ -101,8 +101,8 @@ grief_treasure_chest_init()
chest2 = getstruct("cafe_chest", "script_noteworthy");
setdvar("disableLookAtEntityLogic", 1);
level.chests = [];
level.chests[ level.chests.size ] = chest1;
level.chests[ level.chests.size ] = chest2;
level.chests[level.chests.size] = chest1;
level.chests[level.chests.size] = chest2;
maps\mp\zombies\_zm_magicbox::treasure_chest_init("start_chest");
}
@ -121,31 +121,31 @@ main()
maps\mp\zombies\_zm_ai_brutus::precache();
maps\mp\zombies\_zm_ai_brutus::init();
level.enemy_location_override_func = ::enemy_location_override;
level._effect[ "butterflies" ] = loadfx("maps/zombie_alcatraz/fx_alcatraz_skull_elec");
level._effect["butterflies"] = loadfx("maps/zombie_alcatraz/fx_alcatraz_skull_elec");
a_t_door_triggers = getentarray("zombie_door", "targetname");
triggers = a_t_door_triggers;
i = 0;
while (i < triggers.size)
{
if (isDefined(triggers[ i ].script_flag))
if (isDefined(triggers[i].script_flag))
{
if (triggers[ i ].script_flag == "activate_cellblock_citadel" || triggers[ i ].script_flag == "activate_shower_room" || triggers[ i ].script_flag == "activate_cellblock_infirmary" || triggers[ i ].script_flag == "activate_infirmary")
if (triggers[i].script_flag == "activate_cellblock_citadel" || triggers[i].script_flag == "activate_shower_room" || triggers[i].script_flag == "activate_cellblock_infirmary" || triggers[i].script_flag == "activate_infirmary")
{
triggers[ i ] delete();
triggers[i] delete();
i++;
continue;
}
if (triggers[ i ].script_flag == "activate_cafeteria" || triggers[ i ].script_flag == "activate_cellblock_east" || triggers[ i ].script_flag == "activate_cellblock_west" || triggers[ i ].script_flag == "activate_cellblock_barber" || triggers[ i ].script_flag == "activate_cellblock_gondola" || triggers[ i ].script_flag == "activate_cellblock_east_west" || triggers[ i ].script_flag == "activate_warden_office")
if (triggers[i].script_flag == "activate_cafeteria" || triggers[i].script_flag == "activate_cellblock_east" || triggers[i].script_flag == "activate_cellblock_west" || triggers[i].script_flag == "activate_cellblock_barber" || triggers[i].script_flag == "activate_cellblock_gondola" || triggers[i].script_flag == "activate_cellblock_east_west" || triggers[i].script_flag == "activate_warden_office")
{
i++;
continue;
}
if (isDefined(triggers[ i ].target))
if (isDefined(triggers[i].target))
{
str_target = triggers[ i ].target;
str_target = triggers[i].target;
a_door_and_clip = getentarray(str_target, "targetname");
foreach (ent in a_door_and_clip)
@ -154,7 +154,7 @@ main()
}
}
triggers[ i ] delete();
triggers[i] delete();
}
i++;
@ -175,16 +175,16 @@ main()
zbarriers = getzbarrierarray();
a_str_zones = [];
a_str_zones[ 0 ] = "zone_start";
a_str_zones[ 1 ] = "zone_library";
a_str_zones[ 2 ] = "zone_cafeteria";
a_str_zones[ 3 ] = "zone_cafeteria_end";
a_str_zones[ 4 ] = "zone_warden_office";
a_str_zones[ 5 ] = "zone_cellblock_east";
a_str_zones[ 6 ] = "zone_cellblock_west_warden";
a_str_zones[ 7 ] = "zone_cellblock_west_barber";
a_str_zones[ 8 ] = "zone_cellblock_west";
a_str_zones[ 9 ] = "zone_cellblock_west_gondola";
a_str_zones[0] = "zone_start";
a_str_zones[1] = "zone_library";
a_str_zones[2] = "zone_cafeteria";
a_str_zones[3] = "zone_cafeteria_end";
a_str_zones[4] = "zone_warden_office";
a_str_zones[5] = "zone_cellblock_east";
a_str_zones[6] = "zone_cellblock_west_warden";
a_str_zones[7] = "zone_cellblock_west_barber";
a_str_zones[8] = "zone_cellblock_west";
a_str_zones[9] = "zone_cellblock_west_gondola";
foreach (barrier in zbarriers)
{
@ -201,7 +201,7 @@ main()
{
for (i = 0; i < a_str_zones.size; i++)
{
if (str_model == a_str_zones[ i ])
if (str_model == a_str_zones[i])
{
b_delete_barrier = 0;
break;
@ -472,15 +472,15 @@ turn_afterlife_interact_on()
{
if (!isDefined(level.shockbox_anim))
{
level.shockbox_anim[ "on" ] = %fxanim_zom_al_shock_box_on_anim;
level.shockbox_anim[ "off" ] = %fxanim_zom_al_shock_box_off_anim;
level.shockbox_anim["on"] = %fxanim_zom_al_shock_box_on_anim;
level.shockbox_anim["off"] = %fxanim_zom_al_shock_box_off_anim;
}
if (issubstr(self.model, "p6_zm_al_shock_box"))
{
self useanimtree(-1);
self setmodel("p6_zm_al_shock_box_on");
self setanim(level.shockbox_anim[ "on" ]);
self setanim(level.shockbox_anim["on"]);
}
}
else

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

@ -50,22 +50,22 @@ start_alcatraz_sidequest()
level thread warden_fence_hotjoin_handler();
if (isdefined(level.host_migration_listener_custom_func))
level thread [[ level.host_migration_listener_custom_func ]]();
level thread [[level.host_migration_listener_custom_func]]();
else
level thread host_migration_listener();
if (isdefined(level.manage_electric_chairs_custom_func))
level thread [[ level.manage_electric_chairs_custom_func ]]();
level thread [[level.manage_electric_chairs_custom_func]]();
else
level thread manage_electric_chairs();
if (isdefined(level.plane_flight_thread_custom_func))
level thread [[ level.plane_flight_thread_custom_func ]]();
level thread [[level.plane_flight_thread_custom_func]]();
else
level thread plane_flight_thread();
if (isdefined(level.track_quest_status_thread_custom_func))
level thread [[ level.track_quest_status_thread_custom_func ]]();
level thread [[level.track_quest_status_thread_custom_func]]();
else
level thread track_quest_status_thread();
@ -348,7 +348,7 @@ plane_flight_thread()
if (!level.final_flight_activated)
{
if (isdefined(level.brutus_on_the_bridge_custom_func))
level thread [[ level.brutus_on_the_bridge_custom_func ]]();
level thread [[level.brutus_on_the_bridge_custom_func]]();
else
level thread brutus_on_the_bridge();
}
@ -376,7 +376,7 @@ manage_electric_chairs()
t_electric_chair = getent(str_trigger_targetname, "targetname");
if (isdefined(level.electric_chair_trigger_thread_custom_func))
t_electric_chair thread [[ level.electric_chair_trigger_thread_custom_func ]](i);
t_electric_chair thread [[level.electric_chair_trigger_thread_custom_func]](i);
else
t_electric_chair thread electric_chair_trigger_thread(i);

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

@ -372,7 +372,7 @@ tower_trap_fires(a_zombies)
{
if (isdefined(level.custom_tower_trap_fires_func))
{
self thread [[ level.custom_tower_trap_fires_func ]](a_zombies);
self thread [[level.custom_tower_trap_fires_func]](a_zombies);
return;
}

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

@ -36,7 +36,7 @@ blundergat_upgrade_station()
if (isdefined(level.custom_craftable_validation))
{
valid = t_upgrade [[ level.custom_craftable_validation ]](player);
valid = t_upgrade [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -129,7 +129,7 @@ wait_for_player_to_take(player, str_valid_weapon)
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;

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

@ -57,7 +57,7 @@ main()
return;
}
level.buildables_built[ "pap" ] = 1;
level.buildables_built["pap"] = 1;
level.equipment_team_pick_up = 1;
level.zones["zone_mansion"].is_enabled = 0;
level thread maps\mp\zombies\_zm_buildables::think_buildables();
@ -105,10 +105,10 @@ street_treasure_chest_init()
gun_chest = getstruct("gunshop_chest", "script_noteworthy");
setdvar("disableLookAtEntityLogic", 1);
level.chests = [];
level.chests[ level.chests.size ] = start_chest;
level.chests[ level.chests.size ] = court_chest;
level.chests[ level.chests.size ] = jail_chest;
level.chests[ level.chests.size ] = gun_chest;
level.chests[level.chests.size] = start_chest;
level.chests[level.chests.size] = court_chest;
level.chests[level.chests.size] = jail_chest;
level.chests[level.chests.size] = gun_chest;
chest_names = array("start_chest", "courtroom_chest1", "jail_chest1", "gunshop_chest");
chest_name = random(chest_names);
@ -136,9 +136,9 @@ builddynamicwallbuy(location, weaponname)
for (i = 0; i < level._spawned_wallbuys.size; i++)
{
if (level._spawned_wallbuys[ i ].target == wallbuy.targetname)
if (level._spawned_wallbuys[i].target == wallbuy.targetname)
{
spawned_wallbuy = level._spawned_wallbuys[ i ];
spawned_wallbuy = level._spawned_wallbuys[i];
break;
}
}
@ -176,7 +176,7 @@ builddynamicwallbuy(location, weaponname)
}
maps\mp\zombies\_zm_weapons::add_dynamic_wallbuy(weaponname, wallbuy.targetname, 1);
thread wait_and_remove(stub, stub.buildablezone.pieces[ 0 ]);
thread wait_and_remove(stub, stub.buildablezone.pieces[0]);
}
}
}

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

@ -115,7 +115,7 @@ richtofen_zombie_deathfunction_override()
}
}
return self [[ self.deathfunction_old ]]();
return self [[self.deathfunction_old]]();
}
sq_give_player_rewards()

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

@ -211,7 +211,7 @@ insta_kill_player(perks_can_respawn_player, kill_if_falling)
self.waiting_to_revive = 1;
points = getstruct("zone_green_start", "script_noteworthy");
spawn_points = getstructarray(points.target, "targetname");
point = spawn_points[ 0 ];
point = spawn_points[0];
if (in_last_stand == 0)
{

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

@ -40,7 +40,7 @@ meleecombat()
set_zombie_melee_anim_state(self);
if (isdefined(self.melee_anim_func))
self thread [[ self.melee_anim_func ]]();
self thread [[self.melee_anim_func]]();
while (true)
{
@ -69,9 +69,9 @@ meleecombat()
if (self.enemy.health >= oldhealth)
{
if (isdefined(self.melee_miss_func))
self [[ self.melee_miss_func ]]();
self [[self.melee_miss_func]]();
else if (isdefined(level.melee_miss_func))
self [[ level.melee_miss_func ]]();
self [[level.melee_miss_func]]();
}
}
else if (note == "stop")

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

@ -101,7 +101,7 @@ final_flight_trigger()
{
if (isdefined(level.custom_plane_validation))
{
valid = self [[ level.custom_plane_validation ]](e_triggerer);
valid = self [[level.custom_plane_validation]](e_triggerer);
if (!valid)
continue;

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

@ -25,7 +25,7 @@ dotraverse(traversestate, traversealias, no_powerups)
self.traversestartz = self.origin[2];
if (isdefined(self.pre_traverse))
self [[ self.pre_traverse ]]();
self [[self.pre_traverse]]();
self setanimstatefromasd(traversestate, traversealias);
self maps\mp\animscripts\zm_shared::donotetracks("traverse_anim");
@ -33,7 +33,7 @@ dotraverse(traversestate, traversealias, no_powerups)
self.a.nodeath = 0;
if (isdefined(self.post_traverse))
self [[ self.post_traverse ]]();
self [[self.post_traverse]]();
self maps\mp\animscripts\zm_run::needsupdate();

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

@ -122,7 +122,7 @@ get_random_perk()
for (i = 0; i < level._random_perk_machine_perk_list.size; i++)
{
perk = level._random_perk_machine_perk_list[ i ];
perk = level._random_perk_machine_perk_list[i];
if (isDefined(self.perk_purchased) && self.perk_purchased == perk)
{
@ -132,7 +132,7 @@ get_random_perk()
{
if (!self hasperk(perk) && !self maps\mp\zombies\_zm_perks::has_perk_paused(perk))
{
perks[ perks.size ] = perk;
perks[perks.size] = perk;
}
}
}
@ -140,7 +140,7 @@ get_random_perk()
if (perks.size > 0)
{
perks = array_randomize(perks);
random_perk = perks[ 0 ];
random_perk = perks[0];
return random_perk;
}
}

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

@ -28,7 +28,7 @@ capture_zombie_spawn_init(animname_set = 0)
self.sndname = "capzomb";
if (isdefined(get_gamemode_var("pre_init_zombie_spawn_func")))
self [[ get_gamemode_var("pre_init_zombie_spawn_func") ]]();
self [[get_gamemode_var("pre_init_zombie_spawn_func")]]();
self thread play_ambient_zombie_vocals();
self.zmb_vocals_attack = "zmb_vocals_capzomb_attack";
@ -102,7 +102,7 @@ capture_zombie_spawn_init(animname_set = 0)
self.team = level.zombie_team;
if (isdefined(get_gamemode_var("post_init_zombie_spawn_func")))
self [[ get_gamemode_var("post_init_zombie_spawn_func") ]]();
self [[get_gamemode_var("post_init_zombie_spawn_func")]]();
self.zombie_init_done = 1;
self notify("zombie_init_done");

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

@ -485,7 +485,7 @@ bus_bridge_speedcontrol()
if (isdefined(zombies[i].depot_lava_pit))
{
if (zombies[i] istouching(volume))
zombies[i] thread [[ zombies[i].depot_lava_pit ]]();
zombies[i] thread [[zombies[i].depot_lava_pit]]();
continue;
}

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

@ -16,7 +16,7 @@ station_treasure_chest_init()
{
chest1 = getstruct("depot_chest", "script_noteworthy");
level.chests = [];
level.chests[ level.chests.size ] = chest1;
level.chests[level.chests.size] = chest1;
maps\mp\zombies\_zm_magicbox::treasure_chest_init("depot_chest");
}

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

@ -15,7 +15,7 @@ station_treasure_chest_init()
{
chest1 = getstruct("depot_chest", "script_noteworthy");
level.chests = [];
level.chests[ level.chests.size ] = chest1;
level.chests[level.chests.size] = chest1;
maps\mp\zombies\_zm_magicbox::treasure_chest_init("depot_chest");
}

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

@ -122,7 +122,7 @@ item_meat_watch_bounce()
if (isdefined(level.meat_bounce_override))
{
self thread [[ level.meat_bounce_override ]](pos, normal, ent, true);
self thread [[level.meat_bounce_override]](pos, normal, ent, true);
}
}
@ -139,7 +139,7 @@ item_meat_watch_stationary()
if (isdefined(level.meat_bounce_override))
{
self thread [[ level.meat_bounce_override ]](pos, normal, undefined, false);
self thread [[level.meat_bounce_override]](pos, normal, undefined, false);
}
self.meat_is_moving = 0;
@ -161,7 +161,7 @@ item_meat_watch_below()
if (isdefined(level.meat_bounce_override))
{
self thread [[ level.meat_bounce_override ]](self.origin, undefined, undefined, false);
self thread [[level.meat_bounce_override]](self.origin, undefined, undefined, false);
}
self delete();

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

@ -1550,43 +1550,43 @@ custom_end_screen()
while (i < players.size)
{
players[ i ].game_over_hud = newclienthudelem(players[ i ]);
players[ i ].game_over_hud.alignx = "center";
players[ i ].game_over_hud.aligny = "middle";
players[ i ].game_over_hud.horzalign = "center";
players[ i ].game_over_hud.vertalign = "middle";
players[ i ].game_over_hud.y -= 130;
players[ i ].game_over_hud.foreground = 1;
players[ i ].game_over_hud.fontscale = 3;
players[ i ].game_over_hud.alpha = 0;
players[ i ].game_over_hud.color = (1, 1, 1);
players[ i ].game_over_hud.hidewheninmenu = 1;
players[ i ].game_over_hud settext(&"ZOMBIE_GAME_OVER");
players[ i ].game_over_hud fadeovertime(1);
players[ i ].game_over_hud.alpha = 1;
players[i].game_over_hud = newclienthudelem(players[i]);
players[i].game_over_hud.alignx = "center";
players[i].game_over_hud.aligny = "middle";
players[i].game_over_hud.horzalign = "center";
players[i].game_over_hud.vertalign = "middle";
players[i].game_over_hud.y -= 130;
players[i].game_over_hud.foreground = 1;
players[i].game_over_hud.fontscale = 3;
players[i].game_over_hud.alpha = 0;
players[i].game_over_hud.color = (1, 1, 1);
players[i].game_over_hud.hidewheninmenu = 1;
players[i].game_over_hud settext(&"ZOMBIE_GAME_OVER");
players[i].game_over_hud fadeovertime(1);
players[i].game_over_hud.alpha = 1;
if (players[ i ] issplitscreen())
if (players[i] issplitscreen())
{
players[ i ].game_over_hud.fontscale = 2;
players[ i ].game_over_hud.y += 40;
players[i].game_over_hud.fontscale = 2;
players[i].game_over_hud.y += 40;
}
players[ i ].survived_hud = newclienthudelem(players[ i ]);
players[ i ].survived_hud.alignx = "center";
players[ i ].survived_hud.aligny = "middle";
players[ i ].survived_hud.horzalign = "center";
players[ i ].survived_hud.vertalign = "middle";
players[ i ].survived_hud.y -= 100;
players[ i ].survived_hud.foreground = 1;
players[ i ].survived_hud.fontscale = 2;
players[ i ].survived_hud.alpha = 0;
players[ i ].survived_hud.color = (1, 1, 1);
players[ i ].survived_hud.hidewheninmenu = 1;
players[i].survived_hud = newclienthudelem(players[i]);
players[i].survived_hud.alignx = "center";
players[i].survived_hud.aligny = "middle";
players[i].survived_hud.horzalign = "center";
players[i].survived_hud.vertalign = "middle";
players[i].survived_hud.y -= 100;
players[i].survived_hud.foreground = 1;
players[i].survived_hud.fontscale = 2;
players[i].survived_hud.alpha = 0;
players[i].survived_hud.color = (1, 1, 1);
players[i].survived_hud.hidewheninmenu = 1;
if (players[ i ] issplitscreen())
if (players[i] issplitscreen())
{
players[ i ].survived_hud.fontscale = 1.5;
players[ i ].survived_hud.y += 40;
players[i].survived_hud.fontscale = 1.5;
players[i].survived_hud.y += 40;
}
winner_text = "YOU WIN!";
@ -1594,22 +1594,22 @@ custom_end_screen()
if (isDefined(level.host_ended_game) && level.host_ended_game)
{
players[ i ].survived_hud settext(&"MP_HOST_ENDED_GAME");
players[i].survived_hud settext(&"MP_HOST_ENDED_GAME");
}
else
{
if (isDefined(level.gamemodulewinningteam) && players[ i ]._encounters_team == level.gamemodulewinningteam)
if (isDefined(level.gamemodulewinningteam) && players[i]._encounters_team == level.gamemodulewinningteam)
{
players[ i ].survived_hud settext(winner_text);
players[i].survived_hud settext(winner_text);
}
else
{
players[ i ].survived_hud settext(loser_text);
players[i].survived_hud settext(loser_text);
}
}
players[ i ].survived_hud fadeovertime(1);
players[ i ].survived_hud.alpha = 1;
players[i].survived_hud fadeovertime(1);
players[i].survived_hud.alpha = 1;
i++;
}
}
@ -1643,7 +1643,7 @@ game_module_player_damage_callback(einflictor, eattacker, idamage, idflags, smea
return 0;
}
if (isDefined(level._effect[ "butterflies" ]))
if (isDefined(level._effect["butterflies"]))
{
self do_game_mode_stun_fx(einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
}
@ -1797,7 +1797,7 @@ game_module_player_damage_callback(einflictor, eattacker, idamage, idflags, smea
eattacker.killsdenied++;
}
if (isDefined(level._effect[ "butterflies" ]))
if (isDefined(level._effect["butterflies"]))
{
self do_game_mode_stun_fx(einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
}
@ -2033,25 +2033,25 @@ grief_laststand_weapons_return()
while (i < self.grief_savedweapon_weapons.size)
{
if (isdefined(self.grief_savedweapon_grenades) && self.grief_savedweapon_weapons[ i ] == self.grief_savedweapon_grenades || (isdefined(self.grief_savedweapon_tactical) && self.grief_savedweapon_weapons[ i ] == self.grief_savedweapon_tactical))
if (isdefined(self.grief_savedweapon_grenades) && self.grief_savedweapon_weapons[i] == self.grief_savedweapon_grenades || (isdefined(self.grief_savedweapon_tactical) && self.grief_savedweapon_weapons[i] == self.grief_savedweapon_tactical))
{
i++;
continue;
}
if (is_temporary_zombie_weapon(self.grief_savedweapon_weapons[ i ]))
if (is_temporary_zombie_weapon(self.grief_savedweapon_weapons[i]))
{
i++;
continue;
}
if ("item_meat_zm" == self.grief_savedweapon_weapons[ i ])
if ("item_meat_zm" == self.grief_savedweapon_weapons[i])
{
i++;
continue;
}
if (isweaponprimary(self.grief_savedweapon_weapons[ i ]))
if (isweaponprimary(self.grief_savedweapon_weapons[i]))
{
if (primary_weapons_returned >= get_player_weapon_limit(self))
{
@ -2114,31 +2114,31 @@ grief_laststand_weapons_return()
}
}
self giveweapon(self.grief_savedweapon_weapons[ i ], 0, self maps\mp\zombies\_zm_weapons::get_pack_a_punch_weapon_options(self.grief_savedweapon_weapons[ i ]));
self giveweapon(self.grief_savedweapon_weapons[i], 0, self maps\mp\zombies\_zm_weapons::get_pack_a_punch_weapon_options(self.grief_savedweapon_weapons[i]));
if (isdefined(self.grief_savedweapon_weaponsammo_clip[ i ]))
if (isdefined(self.grief_savedweapon_weaponsammo_clip[i]))
{
self setweaponammoclip(self.grief_savedweapon_weapons[ i ], self.grief_savedweapon_weaponsammo_clip[ i ]);
self setweaponammoclip(self.grief_savedweapon_weapons[i], self.grief_savedweapon_weaponsammo_clip[i]);
}
if (isdefined(self.grief_savedweapon_weaponsammo_clip_dualwield[ i ]))
if (isdefined(self.grief_savedweapon_weaponsammo_clip_dualwield[i]))
{
self setweaponammoclip(weaponDualWieldWeaponName(self.grief_savedweapon_weapons[ i ]), self.grief_savedweapon_weaponsammo_clip_dualwield[ i ]);
self setweaponammoclip(weaponDualWieldWeaponName(self.grief_savedweapon_weapons[i]), self.grief_savedweapon_weaponsammo_clip_dualwield[i]);
}
if (isdefined(self.grief_savedweapon_weaponsammo_stock[ i ]))
if (isdefined(self.grief_savedweapon_weaponsammo_stock[i]))
{
self setweaponammostock(self.grief_savedweapon_weapons[ i ], self.grief_savedweapon_weaponsammo_stock[ i ]);
self setweaponammostock(self.grief_savedweapon_weapons[i], self.grief_savedweapon_weaponsammo_stock[i]);
}
if (isdefined(self.grief_savedweapon_weaponsammo_clip_alt[ i ]))
if (isdefined(self.grief_savedweapon_weaponsammo_clip_alt[i]))
{
self setweaponammoclip(weaponAltWeaponName(self.grief_savedweapon_weapons[ i ]), self.grief_savedweapon_weaponsammo_clip_alt[ i ]);
self setweaponammoclip(weaponAltWeaponName(self.grief_savedweapon_weapons[i]), self.grief_savedweapon_weaponsammo_clip_alt[i]);
}
if (isdefined(self.grief_savedweapon_weaponsammo_stock_alt[ i ]))
if (isdefined(self.grief_savedweapon_weaponsammo_stock_alt[i]))
{
self setweaponammostock(weaponAltWeaponName(self.grief_savedweapon_weapons[ i ]), self.grief_savedweapon_weaponsammo_stock_alt[ i ]);
self setweaponammostock(weaponAltWeaponName(self.grief_savedweapon_weapons[i]), self.grief_savedweapon_weaponsammo_stock_alt[i]);
}
i++;
@ -2215,7 +2215,7 @@ grief_laststand_weapons_return()
{
if (isDefined(self.player_shield_reset_health))
{
self [[ self.player_shield_reset_health ]]();
self [[self.player_shield_reset_health]]();
}
}
@ -2254,7 +2254,7 @@ grief_laststand_weapons_return()
if (primaries.size > 0)
{
self switchtoweapon(primaries[ 0 ]);
self switchtoweapon(primaries[0]);
return 1;
}

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

@ -96,7 +96,7 @@ buried_special_weapon_magicbox_check(weapon)
while (i < players.size)
{
if (is_player_valid(players[ i ], undefined, 1) && players[ i ] is_player_tactical_grenade(weapon))
if (is_player_valid(players[i], undefined, 1) && players[i] is_player_tactical_grenade(weapon))
{
return 0;
}

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

@ -125,17 +125,17 @@ highrise_respawn_override(revivee, return_struct)
for (i = 0; i < players.size; i++)
{
if (is_player_valid(players[ i ], undefined, 1) && players[ i ] != self)
if (is_player_valid(players[i], undefined, 1) && players[i] != self)
{
for (j = 0; j < spawn_points.size; j++)
{
if (isDefined(spawn_points[ j ].script_noteworthy))
if (isDefined(spawn_points[j].script_noteworthy))
{
zone = level.zones[ spawn_points[ j ].script_noteworthy ];
zone = level.zones[spawn_points[j].script_noteworthy];
for (k = 0; k < zone.volumes.size; k++)
{
if (players[ i ] istouching(zone.volumes[ k ]))
if (players[i] istouching(zone.volumes[k]))
{
closest_group = j;
spawn_location = maps\mp\zombies\_zm::get_valid_spawn_location(revivee, spawn_points, closest_group, return_struct);

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

@ -132,7 +132,7 @@ check_for_special_weapon_limit_exist(weapon)
return 0;
}
limit = level.limited_weapons[ "blundergat_zm" ];
limit = level.limited_weapons["blundergat_zm"];
}
else
{
@ -141,7 +141,7 @@ check_for_special_weapon_limit_exist(weapon)
return 0;
}
limit = level.limited_weapons[ "minigun_alcatraz_zm" ];
limit = level.limited_weapons["minigun_alcatraz_zm"];
}
i = 0;
@ -150,7 +150,7 @@ check_for_special_weapon_limit_exist(weapon)
{
if (weapon == "blundergat_zm")
{
if (players[ i ] maps\mp\zombies\_zm_weapons::has_weapon_or_upgrade("blundersplat_zm") || isDefined(players[ i ].is_pack_splatting) && players[ i ].is_pack_splatting)
if (players[i] maps\mp\zombies\_zm_weapons::has_weapon_or_upgrade("blundersplat_zm") || isDefined(players[i].is_pack_splatting) && players[i].is_pack_splatting)
{
count++;
i++;
@ -159,7 +159,7 @@ check_for_special_weapon_limit_exist(weapon)
}
else
{
if (players[ i ] afterlife_weapon_limit_check(weapon))
if (players[i] afterlife_weapon_limit_check(weapon))
{
count++;
}
@ -275,7 +275,7 @@ craftable_place_think()
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -301,24 +301,24 @@ craftable_place_think()
self sethintstring(self.stub.hint_string);
if (isdefined(self.stub.oncantuse))
self.stub [[ self.stub.oncantuse ]](player);
self.stub [[self.stub.oncantuse]](player);
}
else
{
if (isdefined(self.stub.onbeginuse))
self.stub [[ self.stub.onbeginuse ]](player);
self.stub [[self.stub.onbeginuse]](player);
result = self craftable_use_hold_think(player);
team = player.pers["team"];
if (isdefined(self.stub.onenduse))
self.stub [[ self.stub.onenduse ]](team, player, result);
self.stub [[self.stub.onenduse]](team, player, result);
if (!result)
continue;
if (isdefined(self.stub.onuse))
self.stub [[ self.stub.onuse ]](player);
self.stub [[self.stub.onuse]](player);
prompt = player player_craft(self.stub.craftablespawn);
player_crafted = player;
@ -329,7 +329,7 @@ craftable_place_think()
if (isdefined(self.stub.craftablestub.onfullycrafted))
{
b_result = self.stub [[ self.stub.craftablestub.onfullycrafted ]]();
b_result = self.stub [[self.stub.craftablestub.onfullycrafted]]();
if (!b_result)
return;
@ -387,7 +387,7 @@ craftable_place_think()
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -417,7 +417,7 @@ craftable_place_think()
player maps\mp\zombies\_zm_weapons::weapon_give(self.stub.weaponname);
if (isdefined(level.zombie_include_craftables[self.stub.equipname].onbuyweapon))
self [[ level.zombie_include_craftables[self.stub.equipname].onbuyweapon ]](player);
self [[level.zombie_include_craftables[self.stub.equipname].onbuyweapon]](player);
if (!maps\mp\zombies\_zm_weapons::limited_weapon_below_quota(self.stub.weaponname, undefined))
self.stub.hint_string = &"ZOMBIE_GO_TO_THE_BOX_LIMITED";
@ -445,7 +445,7 @@ craftable_place_think()
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -479,13 +479,13 @@ craftable_place_think()
if (isdefined(level.zombie_craftable_persistent_weapon))
{
if (self [[ level.zombie_craftable_persistent_weapon ]](player))
if (self [[level.zombie_craftable_persistent_weapon]](player))
continue;
}
if (isdefined(level.zombie_custom_equipment_setup))
{
if (self [[ level.zombie_custom_equipment_setup ]](player))
if (self [[level.zombie_custom_equipment_setup]](player))
continue;
}
@ -499,7 +499,7 @@ craftable_place_think()
player setweaponammoclip(self.stub.weaponname, 1);
if (isdefined(level.zombie_include_craftables[self.stub.equipname].onbuyweapon))
self [[ level.zombie_include_craftables[self.stub.equipname].onbuyweapon ]](player);
self [[level.zombie_include_craftables[self.stub.equipname].onbuyweapon]](player);
else if (self.stub.weaponname != "keys_zm")
player setactionslot(1, "weapon", self.stub.weaponname);
@ -582,7 +582,7 @@ manage_zones(initial_zone)
}
if (isdefined(level.zone_manager_init_func))
[[ level.zone_manager_init_func ]]();
[[level.zone_manager_init_func]]();
if (isarray(initial_zone))
{
@ -631,7 +631,7 @@ manage_zones(initial_zone)
continue;
if (isdefined(level.zone_occupied_func))
newzone.is_occupied = [[ level.zone_occupied_func ]](zkeys[z]);
newzone.is_occupied = [[level.zone_occupied_func]](zkeys[z]);
else
newzone.is_occupied = player_in_zone(zkeys[z]);
@ -696,7 +696,7 @@ manage_zones(initial_zone)
}
}
[[ level.create_spawner_list_func ]](zkeys);
[[level.create_spawner_list_func]](zkeys);
level.active_zone_names = maps\mp\zombies\_zm_zonemgr::get_active_zone_names();
wait 1;

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

@ -103,9 +103,9 @@ tomb_special_weapon_magicbox_check(weapon)
}
}
if (isDefined(level.zombie_weapons[ weapon ].shared_ammo_weapon))
if (isDefined(level.zombie_weapons[weapon].shared_ammo_weapon))
{
if (self maps\mp\zombies\_zm_weapons::has_weapon_or_upgrade(level.zombie_weapons[ weapon ].shared_ammo_weapon))
if (self maps\mp\zombies\_zm_weapons::has_weapon_or_upgrade(level.zombie_weapons[weapon].shared_ammo_weapon))
{
return 0;
}
@ -259,7 +259,7 @@ craftable_place_think()
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -285,24 +285,24 @@ craftable_place_think()
self sethintstring(self.stub.hint_string);
if (isdefined(self.stub.oncantuse))
self.stub [[ self.stub.oncantuse ]](player);
self.stub [[self.stub.oncantuse]](player);
}
else
{
if (isdefined(self.stub.onbeginuse))
self.stub [[ self.stub.onbeginuse ]](player);
self.stub [[self.stub.onbeginuse]](player);
result = self craftable_use_hold_think(player);
team = player.pers["team"];
if (isdefined(self.stub.onenduse))
self.stub [[ self.stub.onenduse ]](team, player, result);
self.stub [[self.stub.onenduse]](team, player, result);
if (!result)
continue;
if (isdefined(self.stub.onuse))
self.stub [[ self.stub.onuse ]](player);
self.stub [[self.stub.onuse]](player);
prompt = player player_craft(self.stub.craftablespawn);
player_crafted = player;
@ -313,7 +313,7 @@ craftable_place_think()
if (isdefined(self.stub.craftablestub.onfullycrafted))
{
b_result = self.stub [[ self.stub.craftablestub.onfullycrafted ]]();
b_result = self.stub [[self.stub.craftablestub.onfullycrafted]]();
if (!b_result)
return;
@ -371,7 +371,7 @@ craftable_place_think()
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -401,7 +401,7 @@ craftable_place_think()
player maps\mp\zombies\_zm_weapons::weapon_give(self.stub.weaponname);
if (isdefined(level.zombie_include_craftables[self.stub.equipname].onbuyweapon))
self [[ level.zombie_include_craftables[self.stub.equipname].onbuyweapon ]](player);
self [[level.zombie_include_craftables[self.stub.equipname].onbuyweapon]](player);
if (!maps\mp\zombies\_zm_weapons::limited_weapon_below_quota(self.stub.weaponname, undefined))
self.stub.hint_string = &"ZOMBIE_GO_TO_THE_BOX_LIMITED";
@ -429,7 +429,7 @@ craftable_place_think()
if (isdefined(level.custom_craftable_validation))
{
valid = self [[ level.custom_craftable_validation ]](player);
valid = self [[level.custom_craftable_validation]](player);
if (!valid)
continue;
@ -463,13 +463,13 @@ craftable_place_think()
if (isdefined(level.zombie_craftable_persistent_weapon))
{
if (self [[ level.zombie_craftable_persistent_weapon ]](player))
if (self [[level.zombie_craftable_persistent_weapon]](player))
continue;
}
if (isdefined(level.zombie_custom_equipment_setup))
{
if (self [[ level.zombie_custom_equipment_setup ]](player))
if (self [[level.zombie_custom_equipment_setup]](player))
continue;
}
@ -483,7 +483,7 @@ craftable_place_think()
player setweaponammoclip(self.stub.weaponname, 1);
if (isdefined(level.zombie_include_craftables[self.stub.equipname].onbuyweapon))
self [[ level.zombie_include_craftables[self.stub.equipname].onbuyweapon ]](player);
self [[level.zombie_include_craftables[self.stub.equipname].onbuyweapon]](player);
else if (self.stub.weaponname != "keys_zm")
player setactionslot(1, "weapon", self.stub.weaponname);
@ -530,7 +530,7 @@ craftablestub_update_prompt(player, unitrigger)
can_use = 1;
if (isdefined(self.custom_craftablestub_update_prompt) && !self [[ self.custom_craftablestub_update_prompt ]](player))
if (isdefined(self.custom_craftablestub_update_prompt) && !self [[self.custom_craftablestub_update_prompt]](player))
return false;
if (!(isdefined(self.crafted) && self.crafted))

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

@ -742,20 +742,20 @@ manage_zones(initial_zone)
for (i = 0; i < spawn_points.size; i++)
{
spawn_points[ i ].locked = 1;
spawn_points[i].locked = 1;
}
if (isDefined(level.zone_manager_init_func))
{
[[ level.zone_manager_init_func ]]();
[[level.zone_manager_init_func]]();
}
if (isarray(initial_zone))
{
for (i = 0; i < initial_zone.size; i++)
{
zone_init(initial_zone[ i ]);
enable_zone(initial_zone[ i ]);
zone_init(initial_zone[i]);
enable_zone(initial_zone[i]);
}
}
else
@ -771,7 +771,7 @@ manage_zones(initial_zone)
for (z = 0; z < zkeys.size; z++)
{
level.newzones[ zkeys[ z ] ] = spawnstruct();
level.newzones[zkeys[z]] = spawnstruct();
}
oldzone = undefined;
@ -782,8 +782,8 @@ manage_zones(initial_zone)
{
for (z = 0; z < zkeys.size; z++)
{
level.newzones[ zkeys[ z ] ].is_active = 0;
level.newzones[ zkeys[ z ] ].is_occupied = 0;
level.newzones[zkeys[z]].is_active = 0;
level.newzones[zkeys[z]].is_occupied = 0;
}
a_zone_is_active = 0;
@ -793,8 +793,8 @@ manage_zones(initial_zone)
while (z < zkeys.size)
{
zone = level.zones[ zkeys[ z ] ];
newzone = level.newzones[ zkeys[ z ] ];
zone = level.zones[zkeys[z]];
newzone = level.newzones[zkeys[z]];
if (!zone.is_enabled)
{
@ -804,11 +804,11 @@ manage_zones(initial_zone)
if (isdefined(level.zone_occupied_func))
{
newzone.is_occupied = [[ level.zone_occupied_func ]](zkeys[ z ]);
newzone.is_occupied = [[level.zone_occupied_func]](zkeys[z]);
}
else
{
newzone.is_occupied = player_in_zone(zkeys[ z ]);
newzone.is_occupied = player_in_zone(zkeys[z]);
}
if (newzone.is_occupied)
@ -823,7 +823,7 @@ manage_zones(initial_zone)
if (!isdefined(oldzone) || oldzone != newzone)
{
level notify("newzoneActive", zkeys[ z ]);
level notify("newzoneActive", zkeys[z]);
oldzone = newzone;
}
@ -831,11 +831,11 @@ manage_zones(initial_zone)
for (az = 0; az < zone.adjacent_zones.size; az++)
{
if (zone.adjacent_zones[ azkeys[ az ] ].is_connected && level.zones[ azkeys[ az ] ].is_enabled)
if (zone.adjacent_zones[azkeys[az]].is_connected && level.zones[azkeys[az]].is_enabled)
{
level.newzones[ azkeys[ az ] ].is_active = 1;
level.newzones[azkeys[az]].is_active = 1;
if (level.zones[ azkeys[ az ] ].is_spawning_allowed)
if (level.zones[azkeys[az]].is_spawning_allowed)
{
a_zone_is_spawning_allowed = 1;
}
@ -858,27 +858,27 @@ manage_zones(initial_zone)
for (z = 0; z < zkeys.size; z++)
{
level.zones[ zkeys[ z ] ].is_active = level.newzones[ zkeys[ z ] ].is_active;
level.zones[ zkeys[ z ] ].is_occupied = level.newzones[ zkeys[ z ] ].is_occupied;
level.zones[zkeys[z]].is_active = level.newzones[zkeys[z]].is_active;
level.zones[zkeys[z]].is_occupied = level.newzones[zkeys[z]].is_occupied;
}
if (!a_zone_is_active || !a_zone_is_spawning_allowed)
{
if (isarray(initial_zone))
{
level.zones[ initial_zone[ 0 ] ].is_active = 1;
level.zones[ initial_zone[ 0 ] ].is_occupied = 1;
level.zones[ initial_zone[ 0 ] ].is_spawning_allowed = 1;
level.zones[initial_zone[0]].is_active = 1;
level.zones[initial_zone[0]].is_occupied = 1;
level.zones[initial_zone[0]].is_spawning_allowed = 1;
}
else
{
level.zones[ initial_zone ].is_active = 1;
level.zones[ initial_zone ].is_occupied = 1;
level.zones[ initial_zone ].is_spawning_allowed = 1;
level.zones[initial_zone].is_active = 1;
level.zones[initial_zone].is_occupied = 1;
level.zones[initial_zone].is_spawning_allowed = 1;
}
}
[[ level.create_spawner_list_func ]](zkeys);
[[level.create_spawner_list_func]](zkeys);
level.active_zone_names = maps\mp\zombies\_zm_zonemgr::get_active_zone_names();
wait 1;
}