From: Mario <mario.mario@y7mail.com>
Date: Tue, 15 Jun 2021 23:30:51 +0000 (+1000)
Subject: Add notes to the hidden status effects and disable their icons, matching master
X-Git-Tag: xonotic-v0.8.5~393^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a7e3d8f5b89c9af8ef5a8365bd36445e9affd84d;p=xonotic%2Fxonotic-data.pk3dir.git

Add notes to the hidden status effects and disable their icons, matching master
---

diff --git a/qcsrc/common/monsters/monster/spider.qh b/qcsrc/common/monsters/monster/spider.qh
index ac4770517..943833f99 100644
--- a/qcsrc/common/monsters/monster/spider.qh
+++ b/qcsrc/common/monsters/monster/spider.qh
@@ -33,8 +33,12 @@ REGISTER_WEAPON(SPIDER_ATTACK, NEW(SpiderAttack));
 
 CLASS(Webbed, StatusEffects)
     ATTRIB(Webbed, netname, string, "webbed");
+#if 0
+    // NOTE: status effect name and icon disabled as they are not displayed
+    // re-enable if status effects are given a visual element
     ATTRIB(Webbed, m_name, string, _("Webbed"));
     ATTRIB(Webbed, m_icon, string, "buff_disability");
+#endif
     ATTRIB(Webbed, m_color, vector, '0.94 0.3 1');
     ATTRIB(Webbed, m_hidden, bool, true);
     ATTRIB(Webbed, m_lifetime, float, 10);
diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc
index 8739c3a40..72f54dcd2 100644
--- a/qcsrc/common/mutators/mutator/buffs/all.inc
+++ b/qcsrc/common/mutators/mutator/buffs/all.inc
@@ -77,8 +77,12 @@ BUFF_SPAWNFUNCS(disability, BUFF_DISABILITY)
 // status effect applied to targets by the disability buff
 CLASS(Disabled, StatusEffects)
     ATTRIB(Disabled, netname, string, "disabled");
+#if 0
+    // NOTE: status effect name and icon disabled as they are not displayed
+    // re-enable if status effects are given a visual element
     ATTRIB(Disabled, m_name, string, _("Disabled"));
     ATTRIB(Disabled, m_icon, string, "buff_disability");
+#endif
     ATTRIB(Disabled, m_color, vector, '0.94 0.3 1');
     ATTRIB(Disabled, m_hidden, bool, true);
     ATTRIB(Disabled, m_lifetime, float, 10);
diff --git a/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh b/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh
index af31e7b34..14db80807 100644
--- a/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh
+++ b/qcsrc/common/mutators/mutator/status_effects/status_effect/spawnshield.qh
@@ -4,8 +4,12 @@
 
 CLASS(SpawnShield, StatusEffects)
     ATTRIB(SpawnShield, netname, string, "spawnshield");
+#if 0
+    // NOTE: status effect name and icon disabled as they are not displayed
+    // re-enable if status effects are given a visual element
     ATTRIB(SpawnShield, m_name, string, _("Spawn Shield"));
     ATTRIB(SpawnShield, m_icon, string, "shield");
+#endif
     ATTRIB(SpawnShield, m_color, vector, '0.36 1 0.07');
     ATTRIB(SpawnShield, m_hidden, bool, true);
     ATTRIB(SpawnShield, m_lifetime, float, 10);