From: otta8634 Date: Tue, 25 Feb 2025 16:51:18 +0000 (+0800) Subject: Improve some nade and buff descriptions X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b522c3141d1f589dcea7d533d6879e957b23c79;p=xonotic%2Fxonotic-data.pk3dir.git Improve some nade and buff descriptions Affected veil nade, darkness nade, translocate nade, ammo buff, vengeance buff, and vampire buff. --- diff --git a/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc b/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc index ac28046bef..a41ecd1fcf 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/ammo.qc @@ -58,11 +58,14 @@ METHOD(AmmoBuff, m_tick, void(StatusEffect this, entity actor)) } #endif // SVQC #ifdef MENUQC +#include +#include + 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"))); + "It also removes the need to reload any weapons that require reloading, like the %s and %s"), + COLORED_NAME_WITH_CONCAT(this, _("Buff")), COLORED_NAME(WEP_RIFLE), COLORED_NAME(WEP_OVERKILL_MACHINEGUN)); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/jump.qc b/qcsrc/common/mutators/mutator/buffs/buff/jump.qc index ca252294ed..a82d73366c 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/jump.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/jump.qc @@ -21,7 +21,8 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPhysics) 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"), + return sprintf(_("The %s greatly increases your jump height, while the buff is active\n\n" + "It also makes you immune to fall damage"), COLORED_NAME_WITH_CONCAT(this, _("Buff"))); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc b/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc index 1305cb333f..de4176e27b 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/swapper.qc @@ -85,7 +85,8 @@ 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"), + "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\n\n" + "The range that the buff works over is limited, so sometimes it may do nothing if there are no enemies nearby"), COLORED_NAME_WITH_CONCAT(this, _("Buff"))); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc b/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc index 38337972c5..9916f7c36f 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/vampire.qc @@ -18,10 +18,13 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerDamage_SplitHealthArmor) } #endif // SVQC #ifdef MENUQC +#include "vengeance.qh" + 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"))); + return sprintf(_("The %s converts some of the damage you deal to enemies and monsters into health for yourself, until the buff expires\n\n" + "In some sense, this is the opposite of the %s"), + COLORED_NAME_WITH_CONCAT(this, _("Buff")), COLORED_NAME_WITH_CONCAT(BUFF_VENGEANCE, _("Buff"))); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc b/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc index e1cef4994d..a7c72436fd 100644 --- a/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc +++ b/qcsrc/common/mutators/mutator/buffs/buff/vengeance.qc @@ -15,10 +15,13 @@ float buff_Vengeance_CalculateDamage(float frag_damage) } #endif // SVQC #ifdef MENUQC +#include "vampire.qh" + 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"))); + return sprintf(_("The %s reciprocates a portion of the damage enemies deal to you onto them, until the buff expires\n\n" + "In some sense, this is the opposite of the %s"), + COLORED_NAME_WITH_CONCAT(this, _("Buff")), COLORED_NAME_WITH_CONCAT(BUFF_VAMPIRE, _("Buff"))); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/darkness.qc b/qcsrc/common/mutators/mutator/nades/nade/darkness.qc index eec2aca839..d2178d84b1 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/darkness.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/darkness.qc @@ -137,10 +137,13 @@ MUTATOR_HOOKFUNCTION(cl_nades, HUD_Draw_overlay) } #endif // CSQC #ifdef MENUQC +#include "darkness.qh" + 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)); + return sprintf(_("The %s detonates after a short delay, creating a dark field which temporarily blinds enemies who enter it\n\n" + "This is sort of the opposite of the %s"), + COLORED_NAME(this), COLORED_NAME(NADE_TYPE_VEIL)); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/translocate.qc b/qcsrc/common/mutators/mutator/nades/nade/translocate.qc index 1e14361f36..9ac1db4738 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/translocate.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/translocate.qc @@ -41,7 +41,9 @@ bool nade_translocate_DestroyDamage(entity this, entity attacker) METHOD(TranslocateNade, describe, string(TranslocateNade this)) { TC(TranslocateNade, this); - return sprintf(_("The %s detonates after a short delay, teleporting you to where it detonated"), + return sprintf(_("The %s detonates after a short delay, teleporting you to where it detonated\n\n" + "A common use of this nade is saving yourself from the void in space maps, however mastering this is very tricky\n\n" + "If this grenade is destroyed by an attacker, it will deal some damage to them"), COLORED_NAME(this)); } #endif // MENUQC diff --git a/qcsrc/common/mutators/mutator/nades/nade/veil.qc b/qcsrc/common/mutators/mutator/nades/nade/veil.qc index 49498b71ac..c1c65763c5 100644 --- a/qcsrc/common/mutators/mutator/nades/nade/veil.qc +++ b/qcsrc/common/mutators/mutator/nades/nade/veil.qc @@ -44,11 +44,14 @@ void nade_veil_Apply(entity player) } #endif // SVQC #ifdef MENUQC +#include "darkness.qh" + 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)); + return sprintf(_("The %s 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\n\n" + "This is sort of the opposite of the %s"), + COLORED_NAME(this), COLORED_NAME(NADE_TYPE_DARKNESS)); } #endif // MENUQC