Merged heads.
This commit is contained in:
commit
460b6ddf6d
|
@ -29,4 +29,4 @@ materials/overlays/zr/humans_win.vmt
|
|||
materials/overlays/zr/zvision.vtf
|
||||
materials/overlays/zr/zvision.vmt
|
||||
|
||||
// ** END DEFAULTS **
|
||||
// ** END DEFAULTS **
|
||||
|
|
|
@ -14,4 +14,4 @@ models/player/zh/zh_zombie003
|
|||
models/player/zh/zh_corpse002
|
||||
models/player/ics/hellknight_red/t_guerilla
|
||||
|
||||
// ** END DEFAULTS **
|
||||
// ** END DEFAULTS **
|
||||
|
|
|
@ -66,4 +66,4 @@
|
|||
"flashbang" {}
|
||||
"smokegrenade" {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,4 +34,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -646,4 +646,4 @@
|
|||
"en" "Missing file for download: \"{1}\", check downloads.txt"
|
||||
"ru" "Пропущен файл для скачивания: \"{1}\", проверьте downloads.txt"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
// ===============================
|
||||
// Zombie:Reloaded External API
|
||||
// ===============================
|
||||
// ===============================
|
||||
|
|
|
@ -233,4 +233,4 @@ public OnClientDisconnect(client)
|
|||
DamageOnClientDisconnect(client);
|
||||
ZSpawnOnClientDisconnect(client);
|
||||
ZTeleResetClient(client);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,4 +56,4 @@ AccountSetClientCash(client, value)
|
|||
|
||||
// Set client's cash.
|
||||
SetEntData(client, g_iToolsAccount, value, 4);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -188,5 +188,3 @@ AntiStickClientCollisionGroup(client, bool:apply = true, collisiongroup = 0)
|
|||
|
||||
return GetEntData(client, g_iToolsCollisionGroup, 1);
|
||||
}
|
||||
|
||||
|
|
@ -366,4 +366,4 @@ public Action:Command_LogFlags(client, argc)
|
|||
|
||||
ReplyToCommand(client, message);
|
||||
return Plugin_Handled;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -328,4 +328,4 @@ ConfigBoolToSetting(bool:bOption, String:option[] = "", maxlen)
|
|||
{
|
||||
strcopy(option, maxlen, "no");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -581,4 +581,4 @@ public CvarsHookRestartGame(Handle:cvar, const String:oldvalue[], const String:n
|
|||
{
|
||||
LogMessageFormatted(-1, "Cvars", "Restart Game", "\"mp_restartgame\" was caught and blocked, commencing round.", LOG_FORMAT_TYPE_FULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -337,4 +337,4 @@ public Action:DamageSuicideIntercept(client, argc)
|
|||
|
||||
// Block command.
|
||||
return Plugin_Handled;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,4 +14,4 @@
|
|||
*/
|
||||
CreateGlobals()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
|
@ -163,4 +163,4 @@ bool:HitgroupsCanDamageHitgroup(hitgroup)
|
|||
|
||||
// If hitgroup is missing, then default to "yes."
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -679,4 +679,4 @@ bool:InfectIsClientHuman(client)
|
|||
|
||||
// Return opposite of client's zombie flag.
|
||||
return !bZombie[client];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,4 +41,4 @@ JumpBoostOnClientJump(client)
|
|||
JumpBoostSetClientVelocity(client, const Float:vecVelocity[3])
|
||||
{
|
||||
SetEntDataVector(client, g_iToolsBaseVelocity, vecVelocity, true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -174,4 +174,4 @@ KnockbackFindExplodingGrenade(Float:heLoc[3])
|
|||
KnockbackGetClientEyeAngles(client, Float:vecAngles[3])
|
||||
{
|
||||
SDKCall(g_hToolsEyeAngles, client, vecAngles);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -241,4 +241,4 @@ LogToggleFlag(flag)
|
|||
|
||||
// Set new value to logflags cvar.
|
||||
SetConVarInt(g_hLogFlags, logflags);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -138,4 +138,4 @@ public MenuMainHandle(Handle:menu, MenuAction:action, client, slot)
|
|||
MenuGetItemDraw(bool:condition)
|
||||
{
|
||||
return condition ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -248,4 +248,4 @@ ModelsPrepDownloads()
|
|||
|
||||
// Log model validation info.
|
||||
LogMessageFormatted(-1, "Downloads", "Config Validation", "Total: %d | Successful: %d | Unsuccessful: %d", LOG_FORMAT_TYPE_FULL, downloadcount, downloadvalidcount, downloadcount - downloadvalidcount);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -96,4 +96,4 @@ public Action:NapalmIgniteGrenade(Handle:timer)
|
|||
IgniteEntity(x, GRENADE_FUSE_TIME);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -62,4 +62,4 @@ public Action:ClassHealthRegenTimer(Handle:timer, any:client)
|
|||
}
|
||||
|
||||
return Plugin_Continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -133,30 +133,30 @@
|
|||
#define ZR_CLASS_ALPHA_DAMAGED_MIN 0
|
||||
#define ZR_CLASS_ALPHA_DAMAGED_MAX 255
|
||||
#define ZR_CLASS_ALPHA_DAMAGE_MIN 0
|
||||
#define ZR_CLASS_ALPHA_DAMAGE_MAX 16384
|
||||
#define ZR_CLASS_ALPHA_DAMAGE_MAX 20000
|
||||
/** Overlay path is optional, and file is checked for existance if specified. */
|
||||
#define ZR_CLASS_FOV_MIN 15
|
||||
#define ZR_CLASS_FOV_MAX 165
|
||||
#define ZR_CLASS_NAPALM_TIME_MIN 0.0
|
||||
#define ZR_CLASS_NAPALM_TIME_MAX 600.0
|
||||
#define ZR_CLASS_HEALTH_MIN 1
|
||||
#define ZR_CLASS_HEALTH_MAX 16384
|
||||
#define ZR_CLASS_HEALTH_MAX 20000
|
||||
#define ZR_CLASS_HEALTH_REGEN_INTERVAL_MIN 0.0
|
||||
#define ZR_CLASS_HEALTH_REGEN_INTERVAL_MAX 900.0
|
||||
#define ZR_CLASS_HEALTH_REGEN_AMOUNT_MIN 0.0
|
||||
#define ZR_CLASS_HEALTH_REGEN_AMOUNT_MAX 16384
|
||||
#define ZR_CLASS_HEALTH_REGEN_AMOUNT_MAX 10000
|
||||
#define ZR_CLASS_HEALTH_INFECT_GAIN_MIN 0
|
||||
#define ZR_CLASS_HEALTH_INFECT_GAIN_MAX 16384
|
||||
#define ZR_CLASS_HEALTH_INFECT_GAIN_MAX 20000
|
||||
#define ZR_CLASS_KILL_BONUS_MIN 0
|
||||
#define ZR_CLASS_KILL_BONUS_MAX 16
|
||||
#define ZR_CLASS_SPEED_MIN 10.0
|
||||
#define ZR_CLASS_SPEED_MAX 2000.0
|
||||
#define ZR_CLASS_KNOCKBACK_MIN -10.0
|
||||
#define ZR_CLASS_KNOCKBACK_MAX 20.0
|
||||
#define ZR_CLASS_JUMP_HEIGHT_MIN 0.0
|
||||
#define ZR_CLASS_JUMP_HEIGHT_MAX 1024.0
|
||||
#define ZR_CLASS_JUMP_DISTANCE_MIN 0.0
|
||||
#define ZR_CLASS_JUMP_DISTANCE_MAX 1024.0
|
||||
#define ZR_CLASS_KNOCKBACK_MIN -30.0
|
||||
#define ZR_CLASS_KNOCKBACK_MAX 30.0
|
||||
#define ZR_CLASS_JUMP_HEIGHT_MIN -500.0
|
||||
#define ZR_CLASS_JUMP_HEIGHT_MAX 500.0
|
||||
#define ZR_CLASS_JUMP_DISTANCE_MIN -500.0
|
||||
#define ZR_CLASS_JUMP_DISTANCE_MAX 500.0
|
||||
/**
|
||||
* @endsection
|
||||
*/
|
||||
|
|
|
@ -199,4 +199,4 @@ public Action:RespawnTimer(Handle:timer, any:client)
|
|||
|
||||
// Spawn player.
|
||||
RespawnSpawnClient(client);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -500,4 +500,4 @@ public Action:RoundEndOverlayTimer(Handle:timer)
|
|||
{
|
||||
// Stop all overlays.
|
||||
RoundEndOverlayStop();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -179,4 +179,4 @@ SayHooksChatToFlag(const String:chat[])
|
|||
|
||||
// Return 0.
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -211,4 +211,4 @@ public Action:AmbientSoundsTimer(Handle:timer)
|
|||
|
||||
// Start new timer with sound length as delay.
|
||||
tAmbientSounds = CreateTimer(ambientlength, AmbientSoundsTimer, _, TIMER_FLAG_NO_MAPCHANGE);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -189,4 +189,4 @@ SEffectsEmitSoundFromClient(client, const String:sound[], level = SNDLEVEL_NORMA
|
|||
|
||||
// Emit sound from client.
|
||||
EmitSoundToAll(sound, client, _, level);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -263,4 +263,4 @@ public Action:ZombieSoundsMoanTimer(Handle:timer, any:client)
|
|||
|
||||
// Allow timer to continue.
|
||||
return Plugin_Continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -162,4 +162,4 @@ public Action:SpawnProtectTimer(Handle:timer, any:client)
|
|||
|
||||
// Allow timer to continue repeating.
|
||||
return Plugin_Continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -545,4 +545,4 @@ AbortTeleport(client, bool:abort_cooldown = true)
|
|||
KillTimer(ztele_cooldown_timer[client]);
|
||||
ztele_cooldown_timer[client] = INVALID_HANDLE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -196,4 +196,4 @@ ToolsSetupGameData()
|
|||
{
|
||||
LogMessageFormatted(-1, "Tools", "GameData", "Signature \"CBasePlaye::CSWeaponDrop\" was not found.", LOG_FORMAT_TYPE_FATALERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -146,4 +146,4 @@ ToolsSetClientAlpha(client, alpha)
|
|||
|
||||
// Set alpha value on the client.
|
||||
SetEntData(client, g_iToolsRender + 3, alpha, 1, true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -140,4 +140,4 @@ stock ZR_ReplyToCommandLong(client, const String:text[])
|
|||
ReplyToCommand(client, partbuffer);
|
||||
pos += cellswritten;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -326,4 +326,4 @@ VEffectsShakeClientScreen(client, Float:amplitude, Float:frequency, Float:durati
|
|||
|
||||
// End usermsg and send to client.
|
||||
EndMessage();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -152,4 +152,4 @@ public Market_PostOnWeaponSelected(client, &bool:allowed)
|
|||
|
||||
// Resend market menu.
|
||||
ZMarketMenu(client);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -470,4 +470,4 @@ public WeaponsMenuMarketHandle(Handle:menu_weapons_market, MenuAction:action, cl
|
|||
{
|
||||
CloseHandle(menu_weapons_market);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -894,4 +894,4 @@ public RestrictCanUse(client, weapon, dummy1, dummy2, dummy3, dummy4)
|
|||
|
||||
// Allow pickup.
|
||||
return Hacks_Continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -376,4 +376,4 @@ WeaponForceClientDrop(client, weapon)
|
|||
{
|
||||
// Force client to drop weapon.
|
||||
SDKCall(g_hToolsCSWeaponDrop, client, weapon, true, false);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -715,4 +715,4 @@ AddToKnockbackMultiplier(Float:value)
|
|||
AddToClassKnockback(classindex, Float:value)
|
||||
{
|
||||
arrayClasses[classindex][data_knockback] = arrayClasses[classindex][data_knockback] + value;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -206,4 +206,4 @@ public Action:ZHPTimer(Handle:timer, any:client)
|
|||
|
||||
// Allow timer to continue.
|
||||
return Plugin_Continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -58,4 +58,4 @@ RemoveObjectives()
|
|||
RemoveEdict(x);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -73,4 +73,4 @@ ZSpawnClient(client)
|
|||
|
||||
// Tell respawn module to respawn client.
|
||||
RespawnSpawnClient(client);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user