From 5aa9b8de9296c85a0248a078f30797d2064cd977 Mon Sep 17 00:00:00 2001 From: otta8634 Date: Wed, 26 Feb 2025 00:37:17 +0800 Subject: [PATCH] Relocate guide descriptions for nades & buffs into their QC files They were previously in their .qh files, which is inconsistent with mostly everything else in the guide. Putting them in the .qc file can prevent circular includes, so the guide entries can reference each other. --- qcsrc/common/mutators/mutator/buffs/buff/ammo.qc | 9 +++++++++ qcsrc/common/mutators/mutator/buffs/buff/ammo.qh | 9 --------- qcsrc/common/mutators/mutator/buffs/buff/bash.qc | 9 +++++++++ qcsrc/common/mutators/mutator/buffs/buff/bash.qh | 9 --------- qcsrc/common/mutators/mutator/buffs/buff/disability.qc | 9 +++++++++ qcsrc/common/mutators/mutator/buffs/buff/disability.qh | 9 --------- qcsrc/common/mutators/mutator/buffs/buff/flight.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/flight.qh | 8 -------- qcsrc/common/mutators/mutator/buffs/buff/inferno.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/inferno.qh | 8 -------- qcsrc/common/mutators/mutator/buffs/buff/jump.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/jump.qh | 8 -------- qcsrc/common/mutators/mutator/buffs/buff/luck.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/luck.qh | 8 -------- qcsrc/common/mutators/mutator/buffs/buff/magnet.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/magnet.qh | 8 -------- qcsrc/common/mutators/mutator/buffs/buff/medic.qc | 9 +++++++++ qcsrc/common/mutators/mutator/buffs/buff/medic.qh | 9 --------- qcsrc/common/mutators/mutator/buffs/buff/resistance.qc | 9 +++++++++ qcsrc/common/mutators/mutator/buffs/buff/resistance.qh | 9 --------- qcsrc/common/mutators/mutator/buffs/buff/swapper.qc | 9 +++++++++ qcsrc/common/mutators/mutator/buffs/buff/swapper.qh | 9 --------- qcsrc/common/mutators/mutator/buffs/buff/vampire.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/vampire.qh | 8 -------- qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc | 8 ++++++++ qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh | 8 -------- qcsrc/common/mutators/mutator/nades/nade/ammo.qc | 10 ++++++++++ qcsrc/common/mutators/mutator/nades/nade/ammo.qh | 10 ---------- qcsrc/common/mutators/mutator/nades/nade/darkness.qc | 8 ++++++++ qcsrc/common/mutators/mutator/nades/nade/darkness.qh | 8 -------- qcsrc/common/mutators/mutator/nades/nade/entrap.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/entrap.qh | 9 --------- qcsrc/common/mutators/mutator/nades/nade/heal.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/heal.qh | 9 --------- qcsrc/common/mutators/mutator/nades/nade/ice.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/ice.qh | 9 --------- qcsrc/common/mutators/mutator/nades/nade/monster.qc | 8 ++++++++ qcsrc/common/mutators/mutator/nades/nade/monster.qh | 8 -------- qcsrc/common/mutators/mutator/nades/nade/napalm.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/napalm.qh | 9 --------- qcsrc/common/mutators/mutator/nades/nade/normal.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/normal.qh | 9 --------- qcsrc/common/mutators/mutator/nades/nade/spawn.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/spawn.qh | 9 --------- .../common/mutators/mutator/nades/nade/translocate.qc | 8 ++++++++ .../common/mutators/mutator/nades/nade/translocate.qh | 8 -------- qcsrc/common/mutators/mutator/nades/nade/veil.qc | 9 +++++++++ qcsrc/common/mutators/mutator/nades/nade/veil.qh | 9 --------- 48 files changed, 207 insertions(+), 207 deletions(-) diff --git a/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc b/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc index 441034a2b0..ac28046bef 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc @@ -57,3 +57,12 @@ METHOD(AmmoBuff, m_tick, void(StatusEffect this, entity actor)) SUPER(AmmoBuff).m_tick(this, actor); } #endif // SVQC +#ifdef MENUQC +METHOD(AmmoBuff, describe, string(AmmoBuff this)) +{ + TC(AmmoBuff, this); + return sprintf(_("The %s gives you infinite ammo until the buff expires, so you don't need to worry about running out of ammo\n\n" + "It also removes the need to reload any weapons that require reloading"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/ammo.qh b/qcsrc/common/mutators/mutator/buffs/buff/ammo.qh index fdb96d892f..ee654c8ad9 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/ammo.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/ammo.qh @@ -13,15 +13,6 @@ CLASS(AmmoBuff, Buff) ATTRIB(AmmoBuff, m_icon, string, "buff_ammo"); ATTRIB(AmmoBuff, m_skin, int, 3); ATTRIB(AmmoBuff, m_color, vector, '0.76 1 0.1'); -#ifdef MENUQC - METHOD(AmmoBuff, describe, string(AmmoBuff this)) - { - TC(AmmoBuff, this); - return sprintf(_("The %s gives you infinite ammo until the buff expires, so you don't need to worry about running out of ammo\n\n" - "It also removes the need to reload any weapons that require reloading"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(AmmoBuff) REGISTER_BUFF(AMMO, NEW(AmmoBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/bash.qc b/qcsrc/common/mutators/mutator/buffs/buff/bash.qc index a14d6755eb..c54b27bcf8 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/bash.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/bash.qc @@ -19,3 +19,12 @@ vector buff_Bash_AttackerCalculateForce(vector frag_force, entity frag_target, e return frag_force; } #endif // SVQC +#ifdef MENUQC +METHOD(BashBuff, describe, string(BashBuff this)) +{ + TC(BashBuff, this); + return sprintf(_("The %s increases knockback force you deal, and makes you immune to knockback while the buff is active\n\n" + "It also slightly increases knockback you deal to yourself"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/bash.qh b/qcsrc/common/mutators/mutator/buffs/buff/bash.qh index 25a7210856..ba306eec59 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/bash.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/bash.qh @@ -16,15 +16,6 @@ CLASS(BashBuff, Buff) ATTRIB(BashBuff, m_icon, string, "buff_bash"); ATTRIB(BashBuff, m_skin, int, 5); ATTRIB(BashBuff, m_color, vector, '1 0.39 0'); -#ifdef MENUQC - METHOD(BashBuff, describe, string(BashBuff this)) - { - TC(BashBuff, this); - return sprintf(_("The %s increases knockback force you deal, and makes you immune to knockback while the buff is active\n\n" - "It also slightly increases knockback you deal to yourself"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(BashBuff) REGISTER_BUFF(BASH, NEW(BashBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/disability.qc b/qcsrc/common/mutators/mutator/buffs/buff/disability.qc index 967a0d1988..7c1ae9de21 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/disability.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/disability.qc @@ -42,3 +42,12 @@ MUTATOR_HOOKFUNCTION(buffs, WeaponSpeedFactor) M_ARGV(0, float) *= autocvar_g_buffs_disability_weaponspeed; } #endif // SVQC +#ifdef MENUQC +METHOD(DisabilityBuff, describe, string(DisabilityBuff this)) +{ + TC(DisabilityBuff, this); + return sprintf(_("The %s causes your enemies and monsters to slow down for a few seconds when you attack them, while the buff is active\n\n" + "This is particularly useful against speedy players, especially in %s"), + COLORED_NAME_WITH_CONCAT(this, _("Buff")), COLORED_NAME(MAPINFO_TYPE_CTF)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/disability.qh b/qcsrc/common/mutators/mutator/buffs/buff/disability.qh index ea81ad5cb3..26d3c446b8 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/disability.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/disability.qh @@ -17,15 +17,6 @@ CLASS(DisabilityBuff, Buff) ATTRIB(DisabilityBuff, m_icon, string, "buff_disability"); ATTRIB(DisabilityBuff, m_skin, int, 7); ATTRIB(DisabilityBuff, m_color, vector, '0.94 0.3 1'); -#ifdef MENUQC - METHOD(DisabilityBuff, describe, string(DisabilityBuff this)) - { - TC(DisabilityBuff, this); - return sprintf(_("The %s causes your enemies and monsters to slow down for a few seconds when you attack them, while the buff is active\n\n" - "This is particularly useful against speedy players, especially in %s"), - COLORED_NAME_WITH_CONCAT(this, _("Buff")), COLORED_NAME(MAPINFO_TYPE_CTF)); - } -#endif ENDCLASS(DisabilityBuff) REGISTER_BUFF(DISABILITY, NEW(DisabilityBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/flight.qc b/qcsrc/common/mutators/mutator/buffs/buff/flight.qc index 2c1a3b23e9..864ac4a58b 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/flight.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/flight.qc @@ -23,3 +23,11 @@ METHOD(FlightBuff, m_remove, void(StatusEffect this, entity actor, int removal_t SUPER(FlightBuff).m_remove(this, actor, removal_type); } #endif // SVQC +#ifdef MENUQC +METHOD(FlightBuff, describe, string(FlightBuff this)) +{ + TC(FlightBuff, this); + return sprintf(_("While you have the %s, you can crouch while midair to switch your gravity, allowing flight"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif diff --git a/qcsrc/common/mutators/mutator/buffs/buff/flight.qh b/qcsrc/common/mutators/mutator/buffs/buff/flight.qh index 27dda96916..90903a8227 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/flight.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/flight.qh @@ -13,14 +13,6 @@ CLASS(FlightBuff, Buff) ATTRIB(FlightBuff, m_icon, string, "buff_flight"); ATTRIB(FlightBuff, m_skin, int, 11); ATTRIB(FlightBuff, m_color, vector, '0.23 0.44 1'); -#ifdef MENUQC - METHOD(FlightBuff, describe, string(FlightBuff this)) - { - TC(FlightBuff, this); - return sprintf(_("While you have the %s, you can crouch while midair to switch your gravity, allowing flight"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(FlightBuff) REGISTER_BUFF(FLIGHT, NEW(FlightBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/inferno.qc b/qcsrc/common/mutators/mutator/buffs/buff/inferno.qc index 0521de9161..b9c0a792e4 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/inferno.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/inferno.qc @@ -15,3 +15,11 @@ float buff_Inferno_CalculateDamage(float frag_damage) return frag_damage * autocvar_g_buffs_inferno_damagemultiplier; } #endif // SVQC +#ifdef MENUQC +METHOD(InfernoBuff, describe, string(InfernoBuff this)) +{ + TC(InfernoBuff, this); + return sprintf(_("The %s sets any enemies or monsters you attack alight, dealing burn damage to them for several seconds until the buff expires"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/inferno.qh b/qcsrc/common/mutators/mutator/buffs/buff/inferno.qh index ec6141e2d2..57148e01ed 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/inferno.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/inferno.qh @@ -19,14 +19,6 @@ CLASS(InfernoBuff, Buff) ATTRIB(InfernoBuff, m_icon, string, "buff_inferno"); ATTRIB(InfernoBuff, m_skin, int, 16); ATTRIB(InfernoBuff, m_color, vector, '1 0.62 0'); -#ifdef MENUQC - METHOD(InfernoBuff, describe, string(InfernoBuff this)) - { - TC(InfernoBuff, this); - return sprintf(_("The %s sets any enemies or monsters you attack alight, dealing burn damage to them for several seconds until the buff expires"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(InfernoBuff) REGISTER_BUFF(INFERNO, NEW(InfernoBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/jump.qc b/qcsrc/common/mutators/mutator/buffs/buff/jump.qc index 820a5f4a8f..ca252294ed 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/jump.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/jump.qc @@ -17,3 +17,11 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPhysics) STAT(MOVEVARS_JUMPVELOCITY, player) = autocvar_g_buffs_jump_height; } #endif // SVQC +#ifdef MENUQC +METHOD(JumpBuff, describe, string(JumpBuff this)) +{ + TC(JumpBuff, this); + return sprintf(_("The %s greatly increases your jump height, while the buff is active\n\nIt also makes you immune to fall damage"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/jump.qh b/qcsrc/common/mutators/mutator/buffs/buff/jump.qh index f635c938b0..7163f542ce 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/jump.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/jump.qh @@ -14,14 +14,6 @@ CLASS(JumpBuff, Buff) ATTRIB(JumpBuff, m_icon, string, "buff_jump"); ATTRIB(JumpBuff, m_skin, int, 10); ATTRIB(JumpBuff, m_color, vector, '0.24 0.78 1'); -#ifdef MENUQC - METHOD(JumpBuff, describe, string(JumpBuff this)) - { - TC(JumpBuff, this); - return sprintf(_("The %s greatly increases your jump height, while the buff is active\n\nIt also makes you immune to fall damage"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(JumpBuff) REGISTER_BUFF(JUMP, NEW(JumpBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/luck.qc b/qcsrc/common/mutators/mutator/buffs/buff/luck.qc index 395da3439f..9aeada4af6 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/luck.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/luck.qc @@ -9,3 +9,11 @@ float buff_Luck_CalculateDamage(float frag_damage) return frag_damage; } #endif // SVQC +#ifdef MENUQC +METHOD(LuckBuff, describe, string(LuckBuff this)) +{ + TC(LuckBuff, this); + return sprintf(_("While you have the %s, each attack has a chance of being a critical hit with greatly increased damage"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/luck.qh b/qcsrc/common/mutators/mutator/buffs/buff/luck.qh index cd7f9148ec..1fd1226d19 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/luck.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/luck.qh @@ -15,14 +15,6 @@ CLASS(LuckBuff, Buff) ATTRIB(LuckBuff, m_icon, string, "buff_luck"); ATTRIB(LuckBuff, m_skin, int, 19); ATTRIB(LuckBuff, m_color, vector, '1 0.23 0.44'); -#ifdef MENUQC - METHOD(LuckBuff, describe, string(LuckBuff this)) - { - TC(LuckBuff, this); - return sprintf(_("While you have the %s, each attack has a chance of being a critical hit with greatly increased damage"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(LuckBuff) REGISTER_BUFF(LUCK, NEW(LuckBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/magnet.qc b/qcsrc/common/mutators/mutator/buffs/buff/magnet.qc index 15aa097f1a..36def830ac 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/magnet.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/magnet.qc @@ -24,3 +24,11 @@ METHOD(MagnetBuff, m_tick, void(StatusEffect this, entity actor)) SUPER(MagnetBuff).m_tick(this, actor); } #endif // SVQC +#ifdef MENUQC +METHOD(MagnetBuff, describe, string(MagnetBuff this)) +{ + TC(MagnetBuff, this); + return sprintf(_("The %s greatly increases your item pickup range, collecting nearby items for you while the buff is active"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/magnet.qh b/qcsrc/common/mutators/mutator/buffs/buff/magnet.qh index dd1739becc..1b04615c0b 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/magnet.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/magnet.qh @@ -13,14 +13,6 @@ CLASS(MagnetBuff, Buff) ATTRIB(MagnetBuff, m_icon, string, "buff_magnet"); ATTRIB(MagnetBuff, m_skin, int, 18); ATTRIB(MagnetBuff, m_color, vector, '1 0.95 0.18'); -#ifdef MENUQC - METHOD(MagnetBuff, describe, string(MagnetBuff this)) - { - TC(MagnetBuff, this); - return sprintf(_("The %s greatly increases your item pickup range, collecting nearby items for you while the buff is active"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(MagnetBuff) REGISTER_BUFF(MAGNET, NEW(MagnetBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/medic.qc b/qcsrc/common/mutators/mutator/buffs/buff/medic.qc index ef1c34537b..273b941a46 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/medic.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/medic.qc @@ -20,3 +20,12 @@ float buff_Medic_CalculateSurviveDamage(float frag_damage, float health) return frag_damage; } #endif // SVQC +#ifdef MENUQC +METHOD(MedicBuff, describe, string(MedicBuff this)) +{ + TC(MedicBuff, this); + return sprintf(_("The %s increases health regeneration speed, increases the maximum health you can have before health starts to rot, and reduces health rot speed until the buff expires\n\n" + "It also gives you a chance to survive a fatal hit, with a small amount of health left over"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/medic.qh b/qcsrc/common/mutators/mutator/buffs/buff/medic.qh index eaad97e66d..c3021c1189 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/medic.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/medic.qh @@ -18,15 +18,6 @@ CLASS(MedicBuff, Buff) ATTRIB(MedicBuff, m_icon, string, "buff_medic"); ATTRIB(MedicBuff, m_skin, int, 1); ATTRIB(MedicBuff, m_color, vector, '1 0.12 0'); -#ifdef MENUQC - METHOD(MedicBuff, describe, string(MedicBuff this)) - { - TC(MedicBuff, this); - return sprintf(_("The %s increases health regeneration speed, increases the maximum health you can have before health starts to rot, and reduces health rot speed until the buff expires\n\n" - "It also gives you a chance to survive a fatal hit, with a small amount of health left over"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(MedicBuff) REGISTER_BUFF(MEDIC, NEW(MedicBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/resistance.qc b/qcsrc/common/mutators/mutator/buffs/buff/resistance.qc index 0bb9f424db..4247701622 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/resistance.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/resistance.qc @@ -6,3 +6,12 @@ float buff_Resistance_CalculateDamage(float frag_damage) return bound(0, frag_damage * (1 - autocvar_g_buffs_resistance_blockpercent), frag_damage); } #endif // SVQC +#ifdef MENUQC +METHOD(ResistanceBuff, describe, string(ResistanceBuff this)) +{ + TC(ResistanceBuff, this); + return sprintf(_("The %s greatly reduces your damage taken while the buff is active\n\n" + "This also impacts the damage you deal to yourself"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/resistance.qh b/qcsrc/common/mutators/mutator/buffs/buff/resistance.qh index d888a22afd..d351a9453f 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/resistance.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/resistance.qh @@ -14,15 +14,6 @@ CLASS(ResistanceBuff, Buff) ATTRIB(ResistanceBuff, m_icon, string, "buff_resistance"); ATTRIB(ResistanceBuff, m_skin, int, 0); ATTRIB(ResistanceBuff, m_color, vector, '0.36 1 0.07'); -#ifdef MENUQC - METHOD(ResistanceBuff, describe, string(ResistanceBuff this)) - { - TC(ResistanceBuff, this); - return sprintf(_("The %s greatly reduces your damage taken while the buff is active\n\n" - "This also impacts the damage you deal to yourself"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(ResistanceBuff) REGISTER_BUFF(RESISTANCE, NEW(ResistanceBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc b/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc index 7c17cb1104..1305cb333f 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc @@ -80,3 +80,12 @@ MUTATOR_HOOKFUNCTION(buffs, ForbidThrowCurrentWeapon) } } #endif // SVQC +#ifdef MENUQC +METHOD(SwapperBuff, describe, string(SwapperBuff this)) +{ + TC(SwapperBuff, this); + return sprintf(_("The %s allows you to press the ^3drop weapon^7 bind to switch places with a nearby enemy once\n\n" + "A common usage of this buff is to jump over the map's void, then swap with an enemy, to cause them to fall into the void"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/swapper.qh b/qcsrc/common/mutators/mutator/buffs/buff/swapper.qh index c08d7a9c60..6b795ac84e 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/swapper.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/swapper.qh @@ -12,15 +12,6 @@ CLASS(SwapperBuff, Buff) ATTRIB(SwapperBuff, m_icon, string, "buff_swapper"); ATTRIB(SwapperBuff, m_skin, int, 17); ATTRIB(SwapperBuff, m_color, vector, '0.63 0.36 1'); -#ifdef MENUQC - METHOD(SwapperBuff, describe, string(SwapperBuff this)) - { - TC(SwapperBuff, this); - return sprintf(_("The %s allows you to press the ^3drop weapon^7 bind to switch places with a nearby enemy once\n\n" - "A common usage of this buff is to jump over the map's void, then swap with an enemy, to cause them to fall into the void"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(SwapperBuff) REGISTER_BUFF(SWAPPER, NEW(SwapperBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc b/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc index 7145bbe080..38337972c5 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc @@ -17,3 +17,11 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerDamage_SplitHealthArmor) } } #endif // SVQC +#ifdef MENUQC +METHOD(VampireBuff, describe, string(VampireBuff this)) +{ + TC(VampireBuff, this); + return sprintf(_("The %s converts some of the damage you deal to enemies and monsters into health for yourself, until the buff expires"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/vampire.qh b/qcsrc/common/mutators/mutator/buffs/buff/vampire.qh index 0b09fa994c..1311733379 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/vampire.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/vampire.qh @@ -12,14 +12,6 @@ CLASS(VampireBuff, Buff) ATTRIB(VampireBuff, m_icon, string, "buff_vampire"); ATTRIB(VampireBuff, m_skin, int, 2); ATTRIB(VampireBuff, m_color, vector, '1 0 0.24'); -#ifdef MENUQC - METHOD(VampireBuff, describe, string(VampireBuff this)) - { - TC(VampireBuff, this); - return sprintf(_("The %s converts some of the damage you deal to enemies and monsters into health for yourself, until the buff expires"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(VampireBuff) REGISTER_BUFF(VAMPIRE, NEW(VampireBuff)); diff --git a/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc b/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc index 049dba3cf1..e1cef4994d 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc @@ -14,3 +14,11 @@ float buff_Vengeance_CalculateDamage(float frag_damage) return frag_damage * autocvar_g_buffs_vengeance_damage_multiplier; } #endif // SVQC +#ifdef MENUQC +METHOD(VengeanceBuff, describe, string(VengeanceBuff this)) +{ + TC(VengeanceBuff, this); + return sprintf(_("The %s reciprocates a portion of the damage enemies deal to you onto them, until the buff expires"), + COLORED_NAME_WITH_CONCAT(this, _("Buff"))); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh b/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh index 3400589827..5391821068 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh +++ b/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh @@ -15,14 +15,6 @@ CLASS(VengeanceBuff, Buff) ATTRIB(VengeanceBuff, m_icon, string, "buff_vengeance"); ATTRIB(VengeanceBuff, m_skin, int, 15); ATTRIB(VengeanceBuff, m_color, vector, '1 0.23 0.61'); -#ifdef MENUQC - METHOD(VengeanceBuff, describe, string(VengeanceBuff this)) - { - TC(VengeanceBuff, this); - return sprintf(_("The %s reciprocates a portion of the damage enemies deal to you onto them, until the buff expires"), - COLORED_NAME_WITH_CONCAT(this, _("Buff"))); - } -#endif ENDCLASS(VengeanceBuff) REGISTER_BUFF(VENGEANCE, NEW(VengeanceBuff)); diff --git a/qcsrc/common/mutators/mutator/nades/nade/ammo.qc b/qcsrc/common/mutators/mutator/nades/nade/ammo.qc index 25338029fc..ea86b1ad92 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/ammo.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/ammo.qc @@ -64,3 +64,13 @@ void nade_ammo_boom(entity this) orb.colormod = '0.66 0.33 0'; } #endif // SVQC +#ifdef MENUQC +METHOD(AmmoNade, describe, string(AmmoNade this)) +{ + TC(AmmoNade, this); + return sprintf(_("The %s detonates after a short delay, temporarily creating an orb around the point where it detonated for several seconds. " + "If your team members enter the orb they will recover ammo, and if enemies enter the sphere they will lose ammo\n\n" + "This does not impact weapon magazines, so it won't reload your weapons for you"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/ammo.qh b/qcsrc/common/mutators/mutator/nades/nade/ammo.qh index f0fa72e407..beca99bf68 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/ammo.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/ammo.qh @@ -21,16 +21,6 @@ CLASS(AmmoNade, Nade) ATTRIB(AmmoNade, m_color, vector, '0.66 0.33 0'); ATTRIB(AmmoNade, m_name, string, _("Ammo grenade")); ATTRIB(AmmoNade, m_icon, string, "nade_ammo"); -#ifdef MENUQC - METHOD(AmmoNade, describe, string(AmmoNade this)) - { - TC(AmmoNade, this); - return sprintf(_("The %s detonates after a short delay, temporarily creating an orb around the point where it detonated for several seconds. " - "If your team members enter the orb they will recover ammo, and if enemies enter the sphere they will lose ammo\n\n" - "This does not impact weapon magazines, so it won't reload your weapons for you"), - COLORED_NAME(this)); - } -#endif ATTRIB(AmmoNade, netname, string, "ammo"); ATTRIB(AmmoNade, impulse, int, 10); ENDCLASS(AmmoNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/darkness.qc b/qcsrc/common/mutators/mutator/nades/nade/darkness.qc index 01bd0ca0de..eec2aca839 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/darkness.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/darkness.qc @@ -136,3 +136,11 @@ MUTATOR_HOOKFUNCTION(cl_nades, HUD_Draw_overlay) return false; } #endif // CSQC +#ifdef MENUQC +METHOD(DarknessNade, describe, string(DarknessNade this)) +{ + TC(DarknessNade, this); + return sprintf(_("The %s detonates after a short delay, creating a dark field which temporarily blinds enemies who enter it"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/darkness.qh b/qcsrc/common/mutators/mutator/nades/nade/darkness.qh index a3fa5876ee..efccc06a25 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/darkness.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/darkness.qh @@ -18,14 +18,6 @@ CLASS(DarknessNade, Nade) ATTRIB(DarknessNade, m_color, vector, '0.23 0 0.23'); ATTRIB(DarknessNade, m_name, string, _("Darkness grenade")); ATTRIB(DarknessNade, m_icon, string, "nade_darkness"); -#ifdef MENUQC - METHOD(DarknessNade, describe, string(DarknessNade this)) - { - TC(DarknessNade, this); - return sprintf(_("The %s detonates after a short delay, creating a dark field which temporarily blinds enemies who enter it"), - COLORED_NAME(this)); - } -#endif ATTRIB(DarknessNade, netname, string, "darkness"); ATTRIB(DarknessNade, impulse, int, 11); ENDCLASS(DarknessNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/entrap.qc b/qcsrc/common/mutators/mutator/nades/nade/entrap.qc index c0a348f4ba..99ca888be5 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/entrap.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/entrap.qc @@ -64,3 +64,12 @@ MUTATOR_HOOKFUNCTION(nades, MonsterMove) } } #endif // SVQC +#ifdef MENUQC +METHOD(EntrapNade, describe, string(EntrapNade this)) +{ + TC(EntrapNade, this); + return sprintf(_("The %s detonates after a short delay, temporarily creating an orb around the point where it detonated for several seconds. " + "Players and projectiles that enter the sphere will be slowed down, including yourself"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/entrap.qh b/qcsrc/common/mutators/mutator/nades/nade/entrap.qh index dc509cabea..4a260813c6 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/entrap.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/entrap.qh @@ -21,15 +21,6 @@ CLASS(EntrapNade, Nade) ATTRIB(EntrapNade, m_color, vector, '0.15 0.85 0'); ATTRIB(EntrapNade, m_name, string, _("Entrap grenade")); ATTRIB(EntrapNade, m_icon, string, "nade_entrap"); -#ifdef MENUQC - METHOD(EntrapNade, describe, string(EntrapNade this)) - { - TC(EntrapNade, this); - return sprintf(_("The %s detonates after a short delay, temporarily creating an orb around the point where it detonated for several seconds. " - "Players and projectiles that enter the sphere will be slowed down, including yourself"), - COLORED_NAME(this)); - } -#endif ATTRIB(EntrapNade, netname, string, "entrap"); ATTRIB(EntrapNade, impulse, int, 8); ENDCLASS(EntrapNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/heal.qc b/qcsrc/common/mutators/mutator/nades/nade/heal.qc index 9d376762a3..6d36b12225 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/heal.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/heal.qc @@ -39,3 +39,12 @@ void nade_heal_boom(entity this) orb.colormod = '1 0 0'; } #endif // SVQC +#ifdef MENUQC +METHOD(HealNade, describe, string(HealNade this)) +{ + TC(HealNade, this); + return sprintf(_("The %s detonates after a short delay, temporarily creating a healing orb around the point where it detonated for several seconds. " + "If your team members enter the orb they will recover health, and if enemies enter the sphere they will be harmed"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/heal.qh b/qcsrc/common/mutators/mutator/nades/nade/heal.qh index a64a4722dc..01386aedd2 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/heal.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/heal.qh @@ -19,15 +19,6 @@ CLASS(HealNade, Nade) ATTRIB(HealNade, m_color, vector, '1 0 0'); ATTRIB(HealNade, m_name, string, _("Heal grenade")); ATTRIB(HealNade, m_icon, string, "nade_heal"); -#ifdef MENUQC - METHOD(HealNade, describe, string(HealNade this)) - { - TC(HealNade, this); - return sprintf(_("The %s detonates after a short delay, temporarily creating a healing orb around the point where it detonated for several seconds. " - "If your team members enter the orb they will recover health, and if enemies enter the sphere they will be harmed"), - COLORED_NAME(this)); - } -#endif ATTRIB(HealNade, netname, string, "heal"); ATTRIB(HealNade, impulse, int, 6); ENDCLASS(HealNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/ice.qc b/qcsrc/common/mutators/mutator/nades/nade/ice.qc index 24feb75be6..8f57260af1 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/ice.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/ice.qc @@ -114,3 +114,12 @@ void nade_ice_boom(entity this) setmodel(fountain, MDL_Null); } #endif // SVQC +#ifdef MENUQC +METHOD(IceNade, describe, string(IceNade this)) +{ + TC(IceNade, this); + return sprintf(_("The %s detonates after a short delay, freezing any enemies who walk within the explosion radius for a few seconds after the explosion. " + "While frozen, enemies are progressively dealt damage"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/ice.qh b/qcsrc/common/mutators/mutator/nades/nade/ice.qh index 8fbced0627..ed64a8303e 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/ice.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/ice.qh @@ -19,15 +19,6 @@ CLASS(IceNade, Nade) ATTRIB(IceNade, m_color, vector, '0 0.5 2'); ATTRIB(IceNade, m_name, string, _("Ice grenade")); ATTRIB(IceNade, m_icon, string, "nade_ice"); -#ifdef MENUQC - METHOD(IceNade, describe, string(IceNade this)) - { - TC(IceNade, this); - return sprintf(_("The %s detonates after a short delay, freezing any enemies who walk within the explosion radius for a few seconds after the explosion. " - "While frozen, enemies are progressively dealt damage"), - COLORED_NAME(this)); - } -#endif ATTRIB(IceNade, netname, string, "ice"); ATTRIB(IceNade, impulse, int, 3); ENDCLASS(IceNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/monster.qc b/qcsrc/common/mutators/mutator/nades/nade/monster.qc index 4c5c7d1654..36ed81b8d3 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/monster.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/monster.qc @@ -19,3 +19,11 @@ void nade_monster_boom(entity this) e.monster_skill = MONSTER_SKILL_INSANE; } #endif // SVQC +#ifdef MENUQC +METHOD(MonsterNade, describe, string(MonsterNade this)) +{ + TC(MonsterNade, this); + return sprintf(_("The %s explodes after a short delay, spawning one of four monster types"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/monster.qh b/qcsrc/common/mutators/mutator/nades/nade/monster.qh index cf3978b226..50d3e8c69f 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/monster.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/monster.qh @@ -18,14 +18,6 @@ CLASS(MonsterNade, Nade) ATTRIB(MonsterNade, m_color, vector, '0.25 0.75 0'); ATTRIB(MonsterNade, m_name, string, _("Monster grenade")); ATTRIB(MonsterNade, m_icon, string, "nade_monster"); -#ifdef MENUQC - METHOD(MonsterNade, describe, string(MonsterNade this)) - { - TC(MonsterNade, this); - return sprintf(_("The %s explodes after a short delay, spawning one of four monster types"), - COLORED_NAME(this)); - } -#endif ATTRIB(MonsterNade, netname, string, "pokenade"); // TODO: "monster"? nade needs renaming! ATTRIB(MonsterNade, impulse, int, 7); ENDCLASS(MonsterNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/napalm.qc b/qcsrc/common/mutators/mutator/nades/nade/napalm.qc index ed0aecb9c3..b5470c67cc 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/napalm.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/napalm.qc @@ -176,3 +176,12 @@ void nade_napalm_boom(entity this) CSQCProjectile(fountain, true, PROJECTILE_NAPALM_FOUNTAIN, true); } #endif // SVQC +#ifdef MENUQC +METHOD(NapalmNade, describe, string(NapalmNade this)) +{ + TC(NapalmNade, this); + return sprintf(_("The %s explodes after a short delay, spreading fiery napalm globs around in the fountain. " + "The napalm fire balls burn for a while, and damage players who get too close"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/napalm.qh b/qcsrc/common/mutators/mutator/nades/nade/napalm.qh index 873bae13ea..e8ee871e44 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/napalm.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/napalm.qh @@ -30,15 +30,6 @@ CLASS(NapalmNade, Nade) ATTRIB(NapalmNade, m_color, vector, '2 0.5 0'); ATTRIB(NapalmNade, m_name, string, _("Napalm grenade")); ATTRIB(NapalmNade, m_icon, string, "nade_napalm"); -#ifdef MENUQC - METHOD(NapalmNade, describe, string(NapalmNade this)) - { - TC(NapalmNade, this); - return sprintf(_("The %s explodes after a short delay, spreading fiery napalm globs around in the fountain. " - "The napalm fire balls burn for a while, and damage players who get too close"), - COLORED_NAME(this)); - } -#endif ATTRIB(NapalmNade, netname, string, "napalm"); ATTRIB(NapalmNade, impulse, int, 2); ENDCLASS(NapalmNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/normal.qc b/qcsrc/common/mutators/mutator/nades/nade/normal.qc index 4136fb59d2..a764108475 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/normal.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/normal.qc @@ -9,3 +9,12 @@ void normal_nade_boom(entity this) autocvar_g_nades_nade_radius, '1 1 1' * autocvar_g_nades_nade_force, this.projectiledeathtype, 0, this); } #endif // SVQC +#ifdef MENUQC +METHOD(NormalNade, describe, string(NormalNade this)) +{ + TC(NormalNade, this); + return sprintf(_("The (normal) %s explodes after a short delay, dealing damage to nearby players\n\n" + "Make sure you remember to throw it with ^3drop weapon^7, or else it will blow up in your hands!"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/normal.qh b/qcsrc/common/mutators/mutator/nades/nade/normal.qh index bc129ef8c0..76c19eb770 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/normal.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/normal.qh @@ -10,15 +10,6 @@ CLASS(NormalNade, Nade) ATTRIB(NormalNade, m_color, vector, '1 1 1'); ATTRIB(NormalNade, m_name, string, _("Grenade")); ATTRIB(NormalNade, m_icon, string, "nade_normal"); -#ifdef MENUQC - METHOD(NormalNade, describe, string(NormalNade this)) - { - TC(NormalNade, this); - return sprintf(_("The (normal) %s explodes after a short delay, dealing damage to nearby players\n\n" - "Make sure you remember to throw it with ^3drop weapon^7, or else it will blow up in your hands!"), - COLORED_NAME(this)); - } -#endif ATTRIB(NormalNade, impulse, int, 1); ATTRIB(NormalNade, netname, string, "normal"); ENDCLASS(NormalNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/spawn.qc b/qcsrc/common/mutators/mutator/nades/nade/spawn.qc index ea09f3d75f..a1959b4d03 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/spawn.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/spawn.qc @@ -32,3 +32,12 @@ bool nade_spawn_DestroyDamage(entity this, entity attacker) return false; } #endif // SVQC +#ifdef MENUQC +METHOD(SpawnNade, describe, string(SpawnNade this)) +{ + TC(SpawnNade, this); + return sprintf(_("The %s detonates after a short delay, temporarily setting your spawn point to where it detonated. " + "It is useful for cases where you want to go back to some point on the map after you die"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/spawn.qh b/qcsrc/common/mutators/mutator/nades/nade/spawn.qh index d71b1db9f7..5d9f09c5fb 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/spawn.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/spawn.qh @@ -16,15 +16,6 @@ CLASS(SpawnNade, Nade) ATTRIB(SpawnNade, m_color, vector, '1 0.9 0'); ATTRIB(SpawnNade, m_name, string, _("Spawn grenade")); ATTRIB(SpawnNade, m_icon, string, "nade_spawn"); -#ifdef MENUQC - METHOD(SpawnNade, describe, string(SpawnNade this)) - { - TC(SpawnNade, this); - return sprintf(_("The %s detonates after a short delay, temporarily setting your spawn point to where it detonated. " - "It is useful for cases where you want to go back to some point on the map after you die"), - COLORED_NAME(this)); - } -#endif ATTRIB(SpawnNade, netname, string, "spawn"); ATTRIB(SpawnNade, impulse, int, 5); ENDCLASS(SpawnNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/translocate.qc b/qcsrc/common/mutators/mutator/nades/nade/translocate.qc index 4ddf739fd3..1e14361f36 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/translocate.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/translocate.qc @@ -37,3 +37,11 @@ bool nade_translocate_DestroyDamage(entity this, entity attacker) return false; } #endif // SVQC +#ifdef MENUQC +METHOD(TranslocateNade, describe, string(TranslocateNade this)) +{ + TC(TranslocateNade, this); + return sprintf(_("The %s detonates after a short delay, teleporting you to where it detonated"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/translocate.qh b/qcsrc/common/mutators/mutator/nades/nade/translocate.qh index 5da2ba1bbf..0c01e73747 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/translocate.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/translocate.qh @@ -16,14 +16,6 @@ CLASS(TranslocateNade, Nade) ATTRIB(TranslocateNade, m_color, vector, '1 0 1'); ATTRIB(TranslocateNade, m_name, string, _("Translocate grenade")); ATTRIB(TranslocateNade, m_icon, string, "nade_translocate"); -#ifdef MENUQC - METHOD(TranslocateNade, describe, string(TranslocateNade this)) - { - TC(TranslocateNade, this); - return sprintf(_("The %s detonates after a short delay, teleporting you to where it detonated"), - COLORED_NAME(this)); - } -#endif ATTRIB(TranslocateNade, netname, string, "translocate"); ATTRIB(TranslocateNade, impulse, int, 4); ENDCLASS(TranslocateNade) diff --git a/qcsrc/common/mutators/mutator/nades/nade/veil.qc b/qcsrc/common/mutators/mutator/nades/nade/veil.qc index dda5e5203d..49498b71ac 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/veil.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/veil.qc @@ -43,3 +43,12 @@ void nade_veil_Apply(entity player) } } #endif // SVQC +#ifdef MENUQC +METHOD(VeilNade, describe, string(VeilNade this)) +{ + TC(VeilNade, this); + return sprintf(_("The Veil grenade detonates after a short delay, temporarily creating an orb around the point where it detonated for several seconds. " + "Players inside the orb will be invisible to those outside it"), + COLORED_NAME(this)); +} +#endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/veil.qh b/qcsrc/common/mutators/mutator/nades/nade/veil.qh index cf459bf0c1..95312a4747 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/veil.qh +++ b/qcsrc/common/mutators/mutator/nades/nade/veil.qh @@ -22,15 +22,6 @@ CLASS(VeilNade, Nade) ATTRIB(VeilNade, m_name, string, _("Veil grenade")); ATTRIB(VeilNade, m_icon, string, "nade_veil"); ATTRIB(VeilNade, m_alpha, float, 0.45); -#ifdef MENUQC - METHOD(VeilNade, describe, string(VeilNade this)) - { - TC(VeilNade, this); - return sprintf(_("The Veil grenade detonates after a short delay, temporarily creating an orb around the point where it detonated for several seconds. " - "Players inside the orb will be invisible to those outside it"), - COLORED_NAME(this)); - } -#endif ATTRIB(VeilNade, netname, string, "veil"); ATTRIB(VeilNade, impulse, int, 9); ENDCLASS(VeilNade) -- 2.39.5