Merge branch 'master' into Mario/mutator_array_fix

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / buffs / all.inc

diff --git a/qcsrc/common/mutators/mutator/buffs/all.inc b/qcsrc/common/mutators/mutator/buffs/all.inc
index f6c25f76103353e9bd865123f944ec7d61303070..943c75594eb7d7f5987a64e9e71ea6ad1b7eda38 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.inc
+++ b/qcsrc/common/mutators/mutator/buffs/all.inc
@@ -1,3 +1,15 @@
+string Buff_UndeprecateName(string buffname)
+{
+    switch(buffname)
+    {
+        case "ammoregen": return "ammo";
+        case "haste": case "scout": return "speed";
+        case "doubler": return "medic";
+        case "invis": return "invisible";
+        default: return buffname;
+    }
+}
+
 REGISTER_BUFF(AMMO) {
     this.m_prettyName = _("Ammo");
     this.m_name = "ammo";
@@ -116,3 +128,11 @@ REGISTER_BUFF(LUCK) {
     this.m_color = '1 0.23 0.44';
 }
 BUFF_SPAWNFUNCS(luck, BUFF_LUCK)
+
+REGISTER_BUFF(FLIGHT) {
+    this.m_prettyName = _("Flight");
+    this.m_name = "flight";
+    this.m_skin = 11;
+    this.m_color = '0.23 0.44 1';
+}
+BUFF_SPAWNFUNCS(flight, BUFF_FLIGHT)