]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Relocate guide descriptions for nades & buffs into their QC files
authorotta8634 <k9wolf@pm.me>
Tue, 25 Feb 2025 16:37:17 +0000 (00:37 +0800)
committerotta8634 <k9wolf@pm.me>
Tue, 25 Feb 2025 16:37:17 +0000 (00:37 +0800)
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.

48 files changed:
qcsrc/common/mutators/mutator/buffs/buff/ammo.qc
qcsrc/common/mutators/mutator/buffs/buff/ammo.qh
qcsrc/common/mutators/mutator/buffs/buff/bash.qc
qcsrc/common/mutators/mutator/buffs/buff/bash.qh
qcsrc/common/mutators/mutator/buffs/buff/disability.qc
qcsrc/common/mutators/mutator/buffs/buff/disability.qh
qcsrc/common/mutators/mutator/buffs/buff/flight.qc
qcsrc/common/mutators/mutator/buffs/buff/flight.qh
qcsrc/common/mutators/mutator/buffs/buff/inferno.qc
qcsrc/common/mutators/mutator/buffs/buff/inferno.qh
qcsrc/common/mutators/mutator/buffs/buff/jump.qc
qcsrc/common/mutators/mutator/buffs/buff/jump.qh
qcsrc/common/mutators/mutator/buffs/buff/luck.qc
qcsrc/common/mutators/mutator/buffs/buff/luck.qh
qcsrc/common/mutators/mutator/buffs/buff/magnet.qc
qcsrc/common/mutators/mutator/buffs/buff/magnet.qh
qcsrc/common/mutators/mutator/buffs/buff/medic.qc
qcsrc/common/mutators/mutator/buffs/buff/medic.qh
qcsrc/common/mutators/mutator/buffs/buff/resistance.qc
qcsrc/common/mutators/mutator/buffs/buff/resistance.qh
qcsrc/common/mutators/mutator/buffs/buff/swapper.qc
qcsrc/common/mutators/mutator/buffs/buff/swapper.qh
qcsrc/common/mutators/mutator/buffs/buff/vampire.qc
qcsrc/common/mutators/mutator/buffs/buff/vampire.qh
qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc
qcsrc/common/mutators/mutator/buffs/buff/vengeance.qh
qcsrc/common/mutators/mutator/nades/nade/ammo.qc
qcsrc/common/mutators/mutator/nades/nade/ammo.qh
qcsrc/common/mutators/mutator/nades/nade/darkness.qc
qcsrc/common/mutators/mutator/nades/nade/darkness.qh
qcsrc/common/mutators/mutator/nades/nade/entrap.qc
qcsrc/common/mutators/mutator/nades/nade/entrap.qh
qcsrc/common/mutators/mutator/nades/nade/heal.qc
qcsrc/common/mutators/mutator/nades/nade/heal.qh
qcsrc/common/mutators/mutator/nades/nade/ice.qc
qcsrc/common/mutators/mutator/nades/nade/ice.qh
qcsrc/common/mutators/mutator/nades/nade/monster.qc
qcsrc/common/mutators/mutator/nades/nade/monster.qh
qcsrc/common/mutators/mutator/nades/nade/napalm.qc
qcsrc/common/mutators/mutator/nades/nade/napalm.qh
qcsrc/common/mutators/mutator/nades/nade/normal.qc
qcsrc/common/mutators/mutator/nades/nade/normal.qh
qcsrc/common/mutators/mutator/nades/nade/spawn.qc
qcsrc/common/mutators/mutator/nades/nade/spawn.qh
qcsrc/common/mutators/mutator/nades/nade/translocate.qc
qcsrc/common/mutators/mutator/nades/nade/translocate.qh
qcsrc/common/mutators/mutator/nades/nade/veil.qc
qcsrc/common/mutators/mutator/nades/nade/veil.qh

index 441034a2b03ed0f5c71d9ad18ad0bdcbd4ca9e08..ac28046befd7b772d8796c36289deb7a52108779 100644 (file)
@@ -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
index fdb96d892f079d56fc8feb874ec3c9a5aa1f0b6e..ee654c8ad9252c1730d71c90f4ddc0d32fb5013d 100644 (file)
@@ -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));
index a14d6755eb89cd5aac5bb11d5b26fad3c316f47c..c54b27bcf86f575fcd230bbe26e6cbf5e52bcab3 100644 (file)
@@ -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
index 25a7210856685d8d5146a242cf9df0d03dc55109..ba306eec5971949c799e2cc7b64b1bb73e864466 100644 (file)
@@ -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));
index 967a0d1988d920e511174b1d223b618886c940ee..7c1ae9de219ce80c079c6b738323bd0d6ebff7a8 100644 (file)
@@ -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
index ea81ad5cb300febc8f90520db5bce05aaf4874d5..26d3c446b8902f62e5186e3180b81b9a1f0be232 100644 (file)
@@ -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));
index 2c1a3b23e95717709dd5a76b2c20736c02b43842..864ac4a58b3724666522e300bb5c74ca03eeec51 100644 (file)
@@ -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
index 27dda9691687fc1b1ba85d0f29e04a5c1e2dd14c..90903a82279e2b4f0ed417c15c01f6234a88328e 100644 (file)
@@ -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));
index 0521de91618a47bfcd513bbab3c3f49e8fa41b9a..b9c0a792e44b7e24764c172d611d3ef6521b62d5 100644 (file)
@@ -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
index ec6141e2d2cb834b1c3c9598d87d3b55a579efaf..57148e01ed0fbfa8734c4f2ef1d430aa1de7f040 100644 (file)
@@ -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));
index 820a5f4a8ffd82ae80b1a3ee650464e5aab464b6..ca252294eda83fcba15d0320def8b8b7bb1207d1 100644 (file)
@@ -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
index f635c938b0b5a74dae6863c4beb3c36765dcaf59..7163f542ceb12b2fcc98375054d026393e9eb2c6 100644 (file)
@@ -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));
index 395da3439f216142a8500db5bea50abef23b4492..9aeada4af6d642a0b869d987e166bedcf82603df 100644 (file)
@@ -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
index cd7f9148ec5fd825d9aca530932e8613cd3b5494..1fd1226d190c7d1d59e03f8c9483d48855033c59 100644 (file)
@@ -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));
index 15aa097f1a594886f64760f811a71f2d06095b67..36def830ac0ac0247fc50c4d81facfb7dd14f554 100644 (file)
@@ -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
index dd1739beccc09519beb1b3773afff3debf0746a5..1b04615c0b8884fdfadf83e3ec37ca1ecd953691 100644 (file)
@@ -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));
index ef1c34537bee0ad378dfc6cf108aae3460bf5efa..273b941a469007d3051167a889dab7017b80d5fb 100644 (file)
@@ -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
index eaad97e66d59c13be469395735cb265fa3557f82..c3021c1189ff151da9d325a5483b629f55238316 100644 (file)
@@ -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));
index 0bb9f424dbd655af5fa64c44b1372d486b064005..424770162267b8423153c477e8dcec8975410368 100644 (file)
@@ -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
index d888a22afd165ec2f02b60a3725e74a1ab962a4e..d351a9453fb3f3219f1956e0789178d0747f160e 100644 (file)
@@ -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));
index 7c17cb11042c12b34109887dd90bb6d64c4e73e5..1305cb333f18c3e5fe1e40067f26622b2e2edc20 100644 (file)
@@ -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
index c08d7a9c6072d9ea39fb91528c65086a0794ae9e..6b795ac84eb8eb7d058d16742daf7211cb90a960 100644 (file)
@@ -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));
index 7145bbe0803d623111967ea0c42027d0bfe90276..38337972c5321578c4147f8a9c8dd8e11ec12768 100644 (file)
@@ -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
index 0b09fa994c191dd25eaf2b8fd98ddb44bc1a399b..1311733379901a8fa38785ec7f530dc8d213952d 100644 (file)
@@ -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));
index 049dba3cf187c57564b4dce02f73416e39ca250a..e1cef4994d612c4a0ecfc9b2b4d0494185283ef5 100644 (file)
@@ -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
index 3400589827ca7c1458f9ea5fd23b20b0177cff56..539182106866c5dc6a3112c10666ddf4bc8c6b1a 100644 (file)
@@ -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));
index 25338029fc6169874d13154180e568ade1071257..ea86b1ad927351aaaba8f7b0e1e3872088fc9532 100644 (file)
@@ -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
index f0fa72e407078ba5434c6ae93a1ae8d3ac56447f..beca99bf6807ba79bf3afbd6249490089d819f2c 100644 (file)
@@ -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)
index 01bd0ca0decbad7ccd7603e843820bca113ae74f..eec2aca83903749df2bdf0427251ad21673d5a3f 100644 (file)
@@ -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
index a3fa5876ee75e1d8447684c66ea94b1b17d68c8a..efccc06a25beff3b034d34be4da9a66447fe19e5 100644 (file)
@@ -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)
index c0a348f4bacfd8a068ede0226bf19a524ca5d33f..99ca888be59c795153c31c26af5fa04064cbf182 100644 (file)
@@ -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
index dc509cabea68dc141f7b7ebec74a5bec95f0188f..4a260813c653251a7bba418e54b41a24d0f2acd1 100644 (file)
@@ -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)
index 9d376762a3e360ece6eb7a814254b64f04f8e0e9..6d36b12225db9d422682c0d6a7f1701d68c80c62 100644 (file)
@@ -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
index a64a4722dcd0fcd05bb906afb4a949d2abe1ec69..01386aedd2b1916209086b7ea424d118c28d747e 100644 (file)
@@ -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)
index 24feb75be6c8fb0bfa7040a8570ba818548dd384..8f57260af195503e69e677eb656054bf9b8bbf3f 100644 (file)
@@ -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
index 8fbced062719e722b8388ddcaea0c7f3911e012c..ed64a8303e36f58d16243b96362b949c939b71c4 100644 (file)
@@ -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)
index 4c5c7d1654d941febde66892f692a0b80eb2b6e2..36ed81b8d3d078fcd83dd2498407e4eeae059dfb 100644 (file)
@@ -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
index cf3978b2263e1f69cd8be18d892f3b4b66cf1e97..50d3e8c69f9ef7d7effa84d451a9a5c437088002 100644 (file)
@@ -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)
index ed0aecb9c3b52845942ca447487a81435fc5ab77..b5470c67cce1533731c39e00c7a54d2636124a9d 100644 (file)
@@ -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
index 873bae13ea77f6a439d61be3e38bddba740e9efa..e8ee871e44ec456ef085719f5d5b172804f7bd21 100644 (file)
@@ -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)
index 4136fb59d2cc3e54d085d105b93b9eb3e6344812..a764108475824772975677dbd59be91aa1b9d96b 100644 (file)
@@ -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
index bc129ef8c07937b74bfcfe1357827e5bf9d7b96c..76c19eb770b1bbfcb69dbbd981b64acbec3afbea 100644 (file)
@@ -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)
index ea09f3d75f8ba526d50f4cf45edfa889b75cad82..a1959b4d031020524effe169a2729efdcf937406 100644 (file)
@@ -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
index d71b1db9f78c0a23de68e0f0f000b7f0a4b0983b..5d9f09c5fb167cd5fcb190cfc73bc3d757058295 100644 (file)
@@ -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)
index 4ddf739fd31d8668dcf0e2057e50c51c93caa7fb..1e14361f3637204ad380f3e94589b4dcb926e869 100644 (file)
@@ -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
index 5da2ba1bbfe1101f3451bf419dd895afc3e341a9..0c01e737479784af20cd750a3b8c022783b01839 100644 (file)
@@ -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)
index dda5e5203de631144c07b922394170ab75de08c6..49498b71acda0ecb68c3a608d7075198726c1941 100644 (file)
@@ -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
index cf459bf0c1442a35e8ee6b266bb0cd05c13cfdcb..95312a4747e8a8ec138037eae9f20f03dfb4f820 100644 (file)
@@ -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)