diff --git a/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt b/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt index 79639ed..fe29759 100644 --- a/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt +++ b/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt @@ -360,29 +360,12 @@ } // =========================== - // ZHP + // ZSpawn // =========================== - // General - - "ZHP enable" + "ZSpawn double spawn" { - "en" "HP display enabled, your real HP will be displayed after infection." - } - - "ZHP disable" - { - "en" "HP display disabled." - "ru" "Отображение здоровья включено." - } - - // HUD - - "Display HP" - { - "#format" "{1:d}" - "en" "HP: {1}" - "ru" "Здоровье: {1}" + "en" "ZSpawn can only be used if you joined late during a round in progress." } // =========================== @@ -427,6 +410,32 @@ "en" "Teleported back to spawn. (Count: {1}/{2})" } + // =========================== + // ZHP + // =========================== + + // General + + "ZHP enable" + { + "en" "HP display enabled, your real HP will be displayed after infection." + } + + "ZHP disable" + { + "en" "HP display disabled." + "ru" "Отображение здоровья включено." + } + + // HUD + + "Display HP" + { + "#format" "{1:d}" + "en" "HP: {1}" + "ru" "Здоровье: {1}" + } + "Unfair camping" diff --git a/src/zombiereloaded.sp b/src/zombiereloaded.sp index 849c6bc..425db11 100644 --- a/src/zombiereloaded.sp +++ b/src/zombiereloaded.sp @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: (base) zombiereloaded.sp - * Description: Plugins base file. + * File: zombiereloaded.sp + * Type: Base + * Description: Plugins base file. * * ============================================================================ */ diff --git a/src/zr/account.inc b/src/zr/account.inc index d21bec4..188b87b 100644 --- a/src/zr/account.inc +++ b/src/zr/account.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: account.inc - * Description: (Module) Handles client's accounts. (cash) + * File: account.inc + * Type: Module + * Description: Handles client's accounts. (cash) * * ============================================================================ */ diff --git a/src/zr/antistick.inc b/src/zr/antistick.inc index 97f23f6..b624c84 100644 --- a/src/zr/antistick.inc +++ b/src/zr/antistick.inc @@ -1,9 +1,13 @@ -/** - * ==================== +/* + * ============================================================================ + * * Zombie:Reloaded - * File: antistick.inc - * Author: Greyscale - * ==================== + * + * File: antistick.inc + * Type: Module + * Description: Antistick system. + * + * ============================================================================ */ /** diff --git a/src/zr/config.inc b/src/zr/config.inc index 56d3638..d582631 100644 --- a/src/zr/config.inc +++ b/src/zr/config.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: config.inc - * Description: Config API and executing. + * File: config.inc + * Type: Core + * Description: Config API and executing. * * ============================================================================ */ diff --git a/src/zr/cvars.inc b/src/zr/cvars.inc index 197a3e4..b94781e 100644 --- a/src/zr/cvars.inc +++ b/src/zr/cvars.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: cvars.inc - * Description: Config creation and cvar control. + * File: cvars.inc + * Type: Core + * Description: Config creation and cvar control. * * ============================================================================ */ diff --git a/src/zr/damage.inc b/src/zr/damage.inc index ffe02ec..e079a41 100644 --- a/src/zr/damage.inc +++ b/src/zr/damage.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: damage.inc - * Description: (Core) Modify damage stuff here. + * File: damage.inc + * Type: Core + * Description: Modify damage stuff here. * * ============================================================================ */ diff --git a/src/zr/event.inc b/src/zr/event.inc index c4f843c..7bf0ffc 100644 --- a/src/zr/event.inc +++ b/src/zr/event.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: (Core) event.inc - * Description: Event hooking and forwarding. + * File: event.inc + * Type: Core + * Description: Event hooking and forwarding. * * ============================================================================ */ diff --git a/src/zr/global.inc b/src/zr/global.inc index b73502c..8d6d9b3 100644 --- a/src/zr/global.inc +++ b/src/zr/global.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: (Core) global.inc - * Description: External API. + * File: global.inc + * Type: Core + * Description: External API. * * ============================================================================ */ diff --git a/src/zr/hitgroups.inc b/src/zr/hitgroups.inc index 2952b76..f9e43a7 100644 --- a/src/zr/hitgroups.inc +++ b/src/zr/hitgroups.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: hitgroup.inc - * Description: API for loading hitgroup specific settings. + * File: hitgroup.inc + * Type: Core + * Description: API for loading hitgroup specific settings. * * ============================================================================ */ diff --git a/src/zr/infect.inc b/src/zr/infect.inc index 3d2f7a4..7b4c3ae 100644 --- a/src/zr/infect.inc +++ b/src/zr/infect.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: infect.inc - * Description: Client infection functions. + * File: infect.inc + * Type: Core + * Description: Client infection functions. * * ============================================================================ */ diff --git a/src/zr/jumpboost.inc b/src/zr/jumpboost.inc index 3a780dd..7105b57 100644 --- a/src/zr/jumpboost.inc +++ b/src/zr/jumpboost.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: jumpboost.inc - * Description: Modified jump vector magnitudes. + * File: jumpboost.inc + * Type: Module + * Description: Modified jump vector magnitudes. * * ============================================================================ */ diff --git a/src/zr/knockback.inc b/src/zr/knockback.inc index 868150c..43e7190 100644 --- a/src/zr/knockback.inc +++ b/src/zr/knockback.inc @@ -1,9 +1,13 @@ -/** - * ==================== +/* + * ============================================================================ + * * Zombie:Reloaded - * File: knockback.inc - * Author: Greyscale - * ==================== + * + * File: knockback.inc + * Type: Module + * Description: Handles knockback on clients. + * + * ============================================================================ */ /** Client has been hurt. diff --git a/src/zr/log.inc b/src/zr/log.inc index 94f5845..5101de6 100644 --- a/src/zr/log.inc +++ b/src/zr/log.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: log.inc - * Description: Logging API. + * File: log.inc + * Type: Core + * Description: Logging API. * * ============================================================================ */ diff --git a/src/zr/menu.inc b/src/zr/menu.inc index 474710c..eaa451a 100644 --- a/src/zr/menu.inc +++ b/src/zr/menu.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: menu.inc - * Description: Base menu functions for the plugin. + * File: menu.inc + * Type: Core + * Description: Base menu functions for the plugin. * * ============================================================================ */ diff --git a/src/zr/models.inc b/src/zr/models.inc index 32d9929..7b2da1c 100644 --- a/src/zr/models.inc +++ b/src/zr/models.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: models.inc - * Description: Model validation and API + * File: models.inc + * Type: Core + * Description: Model validation and API * * ============================================================================ */ diff --git a/src/zr/napalm.inc b/src/zr/napalm.inc index c8d792a..2ff71ef 100644 --- a/src/zr/napalm.inc +++ b/src/zr/napalm.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: napalm.inc - * Description: Grenades burn zombies when damaged by them. + * File: napalm.inc + * Type: Module + * Description: Grenades burn zombies when damaged by them. * * ============================================================================ */ diff --git a/src/zr/playerclasses/apply.inc b/src/zr/playerclasses/apply.inc index dede0e4..3672cea 100644 --- a/src/zr/playerclasses/apply.inc +++ b/src/zr/playerclasses/apply.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: apply.inc - * Description: Functions for applying attributes and effects on a client. + * File: apply.inc + * Type: Core + * Description: Functions for applying attributes and effects on a client. * * ============================================================================ */ diff --git a/src/zr/playerclasses/attributes.inc b/src/zr/playerclasses/attributes.inc index f0d7fe4..b5ba255 100644 --- a/src/zr/playerclasses/attributes.inc +++ b/src/zr/playerclasses/attributes.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: attributes.inc - * Description: Retrieving class attributes from certain caches. + * File: attributes.inc + * Type: Core + * Description: Retrieving class attributes from certain caches. * * ============================================================================ */ diff --git a/src/zr/playerclasses/classevents.inc b/src/zr/playerclasses/classevents.inc index 40faffd..c13d63b 100644 --- a/src/zr/playerclasses/classevents.inc +++ b/src/zr/playerclasses/classevents.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: classevents.inc - * Description: Functions for handling class related events. + * File: classevents.inc + * Type: Core + * Description: Functions for handling class related events. * * ============================================================================ */ diff --git a/src/zr/playerclasses/classmenus.inc b/src/zr/playerclasses/classmenus.inc index da58b56..e3bf138 100644 --- a/src/zr/playerclasses/classmenus.inc +++ b/src/zr/playerclasses/classmenus.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: classmenus.inc - * Description: Provides functions for managing class menus. + * File: classmenus.inc + * Type: Core + * Description: Provides functions for managing class menus. * * ============================================================================ */ diff --git a/src/zr/playerclasses/clientalpha.inc b/src/zr/playerclasses/clientalpha.inc index 793dbff..b744385 100644 --- a/src/zr/playerclasses/clientalpha.inc +++ b/src/zr/playerclasses/clientalpha.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: clientalpha.inc - * Description: Handles transparency on clients. + * File: clientalpha.inc + * Type: Core + * Description: Handles transparency on clients. * * ============================================================================ */ diff --git a/src/zr/playerclasses/clientoverlays.inc b/src/zr/playerclasses/clientoverlays.inc index e2687be..95dbcfe 100644 --- a/src/zr/playerclasses/clientoverlays.inc +++ b/src/zr/playerclasses/clientoverlays.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: clientoverlays.inc - * Description: Handles overlays on clients, as a part of class attributes. + * File: clientoverlays.inc + * Type: Core + * Description: Handles overlays on clients, as a part of class attributes. * * ============================================================================ */ diff --git a/src/zr/playerclasses/filtertools.inc b/src/zr/playerclasses/filtertools.inc index 43a9123..a84759f 100644 --- a/src/zr/playerclasses/filtertools.inc +++ b/src/zr/playerclasses/filtertools.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: filtertools.inc - * Description: Class system tools; validating, getting indexes or lists + * File: filtertools.inc + * Type: Core + * Description: Class system tools; validating, getting indexes or lists * * ============================================================================ */ diff --git a/src/zr/playerclasses/healthregen.inc b/src/zr/playerclasses/healthregen.inc index 080542c..f66d003 100644 --- a/src/zr/playerclasses/healthregen.inc +++ b/src/zr/playerclasses/healthregen.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: healthregen.inc - * Description: Functions for managing health regeneration on a client. + * File: healthregen.inc + * Type: Core + * Description: Functions for managing health regeneration on a client. * * ============================================================================ */ diff --git a/src/zr/playerclasses/playerclasses.inc b/src/zr/playerclasses/playerclasses.inc index bf8a0a6..f7a65da 100644 --- a/src/zr/playerclasses/playerclasses.inc +++ b/src/zr/playerclasses/playerclasses.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: playerclasses.inc - * Description: Provides functions for managing classes. + * File: playerclasses.inc + * Type: Core + * Description: Provides functions for managing classes. * * ============================================================================ */ diff --git a/src/zr/respawn.inc b/src/zr/respawn.inc index 3f1ff50..2704a42 100644 --- a/src/zr/respawn.inc +++ b/src/zr/respawn.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: respawn.inc - * Description: Players come back to life + * File: respawn.inc + * Type: Module + * Description: Players come back to life * * ============================================================================ */ diff --git a/src/zr/roundend.inc b/src/zr/roundend.inc index 955b54a..0f512a4 100644 --- a/src/zr/roundend.inc +++ b/src/zr/roundend.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: roundend.inc - * Description: (Core) Handles round end actions. + * File: roundend.inc + * Type: Core + * Description: Handles round end actions. * * ============================================================================ */ diff --git a/src/zr/sayhooks.inc b/src/zr/sayhooks.inc index 6da21a1..af9f2a4 100644 --- a/src/zr/sayhooks.inc +++ b/src/zr/sayhooks.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: sayhooks.inc - * Description: Hook plugin say commands and redirect to their handling module. + * File: sayhooks.inc + * Type: Core + * Description: Hook plugin say commands and redirect to their handling module. * * ============================================================================ */ diff --git a/src/zr/soundeffects/ambientsounds.inc b/src/zr/soundeffects/ambientsounds.inc index 8543612..61bb890 100644 --- a/src/zr/soundeffects/ambientsounds.inc +++ b/src/zr/soundeffects/ambientsounds.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: ambientsounds.inc - * Description: Plays ambient sounds to clients. + * File: ambientsounds.inc + * Type: Core + * Description: Plays ambient sounds to clients. * * ============================================================================ */ diff --git a/src/zr/soundeffects/soundeffects.inc b/src/zr/soundeffects/soundeffects.inc index e85e155..71aa2bf 100644 --- a/src/zr/soundeffects/soundeffects.inc +++ b/src/zr/soundeffects/soundeffects.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: soundeffects.inc - * Description: Basic sound-management API. + * File: soundeffects.inc + * Type: Core + * Description: Basic sound-management API. * * ============================================================================ */ diff --git a/src/zr/soundeffects/zombiesounds.inc b/src/zr/soundeffects/zombiesounds.inc index 1a57d53..d4c8719 100644 --- a/src/zr/soundeffects/zombiesounds.inc +++ b/src/zr/soundeffects/zombiesounds.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: zombiesounds.inc - * Description: Zombie sound effects. + * File: zombiesounds.inc + * Type: Core + * Description: Zombie sound effects. * * ============================================================================ */ diff --git a/src/zr/spawnprotect.inc b/src/zr/spawnprotect.inc index c73c585..13d4ff5 100644 --- a/src/zr/spawnprotect.inc +++ b/src/zr/spawnprotect.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: spawnprotect.inc - * Description: Protects late-joining players from zombies for x seconds. + * File: spawnprotect.inc + * Type: Module + * Description: Protects late-joining players from zombies for x seconds. * * ============================================================================ */ diff --git a/src/zr/tools.inc b/src/zr/tools.inc index 99d7c1a..059da71 100644 --- a/src/zr/tools.inc +++ b/src/zr/tools.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: tools.inc - * Description: Find offsets and signatures. + * File: tools.inc + * Type: Core + * Description: Find offsets and signatures. * * ============================================================================ */ diff --git a/src/zr/tools_functions.inc b/src/zr/tools_functions.inc index 345657f..d6b15ff 100644 --- a/src/zr/tools_functions.inc +++ b/src/zr/tools_functions.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: tools_functions.inc - * Description: API for offsets/signatures exposed in tools.inc + * File: tools_functions.inc + * Type: Core + * Description: API for offsets/signatures exposed in tools.inc * * ============================================================================ */ diff --git a/src/zr/translation.inc b/src/zr/translation.inc index 6b37558..a457e90 100644 --- a/src/zr/translation.inc +++ b/src/zr/translation.inc @@ -1,9 +1,13 @@ -/** - * ==================== +/* + * ============================================================================ + * * Zombie:Reloaded - * File: translations.inc - * Author: Greyscale - * ==================== + * + * File: translation.inc + * Type: Core + * Description: Translation parsing functions. + * + * ============================================================================ */ FormatTextString(String:text[], maxlen) diff --git a/src/zr/visualeffects.inc b/src/zr/visualeffects.inc index 39bb4c6..4486f2b 100644 --- a/src/zr/visualeffects.inc +++ b/src/zr/visualeffects.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: visualeffects.inc - * Description: Visual effects such as map darkening, fog, etc.. + * File: visualeffects.inc + * Type: Module + * Description: Visual effects such as map darkening, fog, etc.. * * ============================================================================ */ diff --git a/src/zr/weapons/markethandler.inc b/src/zr/weapons/markethandler.inc index 786ce83..63afc04 100644 --- a/src/zr/weapons/markethandler.inc +++ b/src/zr/weapons/markethandler.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: markethandler.inc - * Description: Handles market (optional plugin) API, natives, and forwards. + * File: markethandler.inc + * Type: Core + * Description: Handles market (optional plugin) API, natives, and forwards. * * ============================================================================ */ diff --git a/src/zr/weapons/menu_weapons.inc b/src/zr/weapons/menu_weapons.inc index 2484c30..c4d728e 100644 --- a/src/zr/weapons/menu_weapons.inc +++ b/src/zr/weapons/menu_weapons.inc @@ -1,9 +1,13 @@ -/** - * ==================== +/* + * ============================================================================ + * * Zombie:Reloaded - * File: menu_weapons.inc - * Author: Greyscale - * ==================== + * + * File: menu_weapons.inc + * Type: Core + * Description: Handles weapons management menu. + * + * ============================================================================ */ /** diff --git a/src/zr/weapons/restrict.inc b/src/zr/weapons/restrict.inc index 3e7fed2..ee8688c 100644 --- a/src/zr/weapons/restrict.inc +++ b/src/zr/weapons/restrict.inc @@ -1,9 +1,13 @@ -/** - * ==================== +/* + * ============================================================================ + * * Zombie:Reloaded - * File: restriction.inc - * Author: Greyscale - * ==================== + * + * File: restrict.inc + * Type: Core + * Description: Weapon restriction system. + * + * ============================================================================ */ /** diff --git a/src/zr/weapons/weapons.inc b/src/zr/weapons/weapons.inc index 4568e0a..fc02f50 100644 --- a/src/zr/weapons/weapons.inc +++ b/src/zr/weapons/weapons.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: weapons.inc - * Description: API for all weapon-related functions. + * File: weapons.inc + * Type: Core + * Description: API for all weapon-related functions. * * ============================================================================ */ diff --git a/src/zr/zadmin.inc b/src/zr/zadmin.inc index 9da22cd..7db926c 100644 --- a/src/zr/zadmin.inc +++ b/src/zr/zadmin.inc @@ -1,9 +1,13 @@ -/** - * ==================== +/* + * ============================================================================ + * * Zombie:Reloaded - * File: admin.inc - * Author: Richard H - * ==================== + * + * File: zadmin.inc + * Type: Core + * Description: Handle admin functions and menus. + * + * ============================================================================ */ #include "include/adminmenu.inc" diff --git a/src/zr/zhp.inc b/src/zr/zhp.inc index 9ec2f80..3a517eb 100644 --- a/src/zr/zhp.inc +++ b/src/zr/zhp.inc @@ -3,9 +3,9 @@ * * Zombie:Reloaded * - * File: zhp.inc - * Description: Displays HP to zombies. - * Author: Greyscale, Richard Helgeby + * File: zhp.inc + * Type: Module + * Description: Displays HP to zombies. * * ============================================================================ */ diff --git a/src/zr/zombiereloaded.inc b/src/zr/zombiereloaded.inc index deb9b85..f4dca48 100644 --- a/src/zr/zombiereloaded.inc +++ b/src/zr/zombiereloaded.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: zombiereloaded.inc - * Description: General plugin functions and defines. + * File: zombiereloaded.inc + * Type: Core + * Description: General plugin functions and defines. * * ============================================================================ */ diff --git a/src/zr/zspawn.inc b/src/zr/zspawn.inc index 11ef9ad..9ebfb5a 100644 --- a/src/zr/zspawn.inc +++ b/src/zr/zspawn.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: (Module) zspawn.inc - * Description: Handles zspawn command, spawns late-joining clients into the game. + * File: zspawn.inc + * Type: Module + * Description: Handles zspawn command, spawns late-joining clients into the game. * * ============================================================================ */ @@ -42,35 +43,41 @@ ZSpawnOnRoundStart() } } -ZSpawnClient(client) +/** + * Spawns a late-joining client into the game. + * + * @param client The client index. + * @return True if successful, false otherwise. + */ +bool:ZSpawnClient(client) { // If zspawn is disabled, then stop. new bool:zspawn = GetConVarBool(g_hCvarsList[CVAR_ZSPAWN]); if (!zspawn) { ZR_PrintToChat(client, "Feature is disabled"); - return; - } - - // If client isn't on a team, then stop. - if (!ZRIsClientOnTeam(client)) - { - return; + return false; } // If client is alive, then stop. if (IsPlayerAlive(client)) { - return; + // Tell client the command may only be used when joining late. + ZR_PrintToChat(client, "Must be alive"); + return false; } // Block if client has already played during this round. new serial = GetClientSerial(client); if (g_bZSpawnBlock[serial]) { - return; + // Tell client the command may only be used when joining late. + ZR_PrintToChat(client, "ZSpawn double spawn"); + return false; } // Tell respawn module to respawn client. RespawnSpawnClient(client); + + return true; } diff --git a/src/zr/ztele.inc b/src/zr/ztele.inc index b5c02ed..6048c37 100644 --- a/src/zr/ztele.inc +++ b/src/zr/ztele.inc @@ -3,8 +3,9 @@ * * Zombie:Reloaded * - * File: ztele.inc - * Description: ZTele handle functions. + * File: ztele.inc + * Type: Module + * Description: ZTele handle functions. * * ============================================================================ */