properly uploaded mp scripts instead of zm versions

Checked_weapon_utils for both mp and zm.
This commit is contained in:
JezuzLizard
2020-04-29 11:02:01 -07:00
parent 7e100abc34
commit 18b5824147
30 changed files with 7796 additions and 3440 deletions

View File

@ -1,7 +1,8 @@
#include maps/mp/killstreaks/_killstreaks;
#include maps/mp/_utility;
#include common_scripts/utility;
isgrenadelauncherweapon( weapon )
isgrenadelauncherweapon( weapon ) //checked matches cerberus output
{
if ( getsubstr( weapon, 0, 3 ) == "gl_" )
{
@ -17,7 +18,7 @@ isgrenadelauncherweapon( weapon )
}
}
isdumbrocketlauncherweapon( weapon )
isdumbrocketlauncherweapon( weapon ) //checked matches cerberus output
{
switch( weapon )
{
@ -29,7 +30,7 @@ isdumbrocketlauncherweapon( weapon )
}
}
isguidedrocketlauncherweapon( weapon )
isguidedrocketlauncherweapon( weapon ) //checked matches cerberus output
{
switch( weapon )
{
@ -44,7 +45,7 @@ isguidedrocketlauncherweapon( weapon )
}
}
isrocketlauncherweapon( weapon )
isrocketlauncherweapon( weapon ) //checked matches cerberus output
{
if ( isdumbrocketlauncherweapon( weapon ) )
{
@ -57,7 +58,7 @@ isrocketlauncherweapon( weapon )
return 0;
}
islauncherweapon( weapon )
islauncherweapon( weapon ) //checked matches cerberus output
{
if ( isrocketlauncherweapon( weapon ) )
{
@ -81,17 +82,21 @@ isreducedteamkillweapon( weapon )
}
}
ishackweapon( weapon )
ishackweapon( weapon ) //checked matches cerberus output
{
return 0;
}
ispistol( weapon )
ispistol( weapon ) //checked changed at own discretion
{
return isDefined( level.side_arm_array[ weapon ] );
if ( isDefined( level.side_arm_array[ weapon ] ) )
{
return 1;
}
return 0;
}
isflashorstunweapon( weapon )
isflashorstunweapon( weapon ) //checked matches cerberus output
{
if ( isDefined( weapon ) )
{
@ -107,13 +112,13 @@ isflashorstunweapon( weapon )
return 0;
}
isflashorstundamage( weapon, meansofdeath )
isflashorstundamage( weapon, meansofdeath ) //checked changed at own discretion
{
if ( isflashorstunweapon( weapon ) )
if ( ( meansofdeath == "MOD_GAS" || meansofdeath == "MOD_GRENADE_SPLASH" ) && isflashorstunweapon( weapon ) )
{
if ( meansofdeath != "MOD_GRENADE_SPLASH" )
{
return meansofdeath == "MOD_GAS";
}
return 1;
}
return 0;
}

View File

@ -48,6 +48,7 @@ patch_zm/maps/mp/zombies/_zm_pers_upgrades_functions.gsc
```
### The following scripts have been checked, but they have not been tested yet
```
patch_zm/maps/mp/gametypes_zm/_weapon_utils.gsc
patch_zm/maps/mp/zombies/_zm_blockers.gsc
patch_zm/maps/mp/zombies/_zm_buildables.gsc
patch_zm/maps/mp/zombies/_zm_equip_turbine.gsc
@ -92,7 +93,6 @@ patch_zm/maps/mp/gametypes_zm/_spawning.gsc
patch_zm/maps/mp/gametypes_zm/_spawnlogic.gsc
patch_zm/maps/mp/gametypes_zm/_spectating.gsc
patch_zm/maps/mp/gametypes_zm/_tweakables.gsc
patch_zm/maps/mp/gametypes_zm/_weapon_utils.gsc
patch_zm/maps/mp/gametypes_zm/_weaponobjects.gsc
patch_zm/maps/mp/gametypes_zm/_weapons.gsc
```