Merge branch 'master' into Mario/race_cts_mutators

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_superspec.qc

diff --git a/qcsrc/server/mutators/mutator_superspec.qc b/qcsrc/server/mutators/mutator_superspec.qc
index e5d2e8348606f5950182c89858a9fecd92a433be..c323262f069b7a198f7e29ca75b20c4d186408cc 100644 (file)
--- a/qcsrc/server/mutators/mutator_superspec.qc
+++ b/qcsrc/server/mutators/mutator_superspec.qc
@@ -9,6 +9,7 @@
 #define ASF_OBSERVER_ONLY   32
 #define ASF_SHOWWHAT        64
 #define ASF_SSIM            128
+#define ASF_FOLLOWKILLER    256
 #define ASF_ALL             0xFFFFFF
 .float autospec_flags;
 
@@ -32,7 +33,7 @@ void superspec_save_client_conf()
        string fn = "superspec-local.options";
        float fh;
 
-       if not(_ISLOCAL)
+       if (!_ISLOCAL)
        {
                if(self.crypto_idfp == "")
                        return;
@@ -67,7 +68,7 @@ void superspec_msg(string _center_title, string _con_title, entity _to, string _
                return;
 
        if(_spamlevel > 1)
-               if not(_to.superspec_flags & SSF_VERBOSE)
+               if (!(_to.superspec_flags & SSF_VERBOSE))
                        return;
 
        centerprint(_to, strcat(_center_title, _msg));
@@ -107,7 +108,7 @@ MUTATOR_HOOKFUNCTION(superspec_ItemTouch)
                                        superspec_msg("", "", self, sprintf("Player %s^7 just picked up ^3%s\n", other.netname, _item.netname), 1);
                                else
                                        superspec_msg("", "", self, sprintf("Player %s^7 just picked up ^3%s\n^8(%s^8)\n", other.netname, _item.netname, _item.classname), 1);
-                               if(self.autospec_flags& ASF_SSIM && self.enemy != other)
+                               if((self.autospec_flags & ASF_SSIM) && self.enemy != other)
                                {
                                        _spectate(other);
 
@@ -118,9 +119,9 @@ MUTATOR_HOOKFUNCTION(superspec_ItemTouch)
 
                if((self.autospec_flags & ASF_SHIELD && _item.invincible_finished) ||
                                (self.autospec_flags & ASF_STRENGTH && _item.strength_finished) ||
-                               (self.autospec_flags& ASF_MEGA_AR && _item.classname == "item_armor_large") ||
-                               (self.autospec_flags& ASF_MEGA_HP && _item.classname == "item_health_mega") ||
-                               (self.autospec_flags& ASF_FLAG_GRAB && _item.classname == "item_flag_team"))
+                               (self.autospec_flags & ASF_MEGA_AR && _item.classname == "item_armor_large") ||
+                               (self.autospec_flags & ASF_MEGA_HP && _item.classname == "item_health_mega") ||
+                               (self.autospec_flags & ASF_FLAG_GRAB && _item.classname == "item_flag_team"))
                {
 
                        if((self.enemy != other) || IS_OBSERVER(self))
@@ -238,7 +239,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                else if(argv(i) == "off" || argv(i) == "0")
                                {
                                        if(_start == 1)
-                                               self.superspec_flags &~= _bits;
+                                               self.superspec_flags &= ~_bits;
 
                                        _bits = 0;
                                }
@@ -279,6 +280,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                _aspeco = strcat(_aspeco, "^3 observer_only ^7(short^5 oo^7) for automatic spectate only if in observer mode\n");
                                _aspeco = strcat(_aspeco, "^3 show_what ^7(short^5 sw^7) to display what event triggered autospectate\n");
                                _aspeco = strcat(_aspeco, "^3 item_msg ^7(short^5 im^7) to autospec when item_message in superspectate is triggered\n");
+                               _aspeco = strcat(_aspeco, "^3 followkiller ^7(short ^5fk^7) to autospec the killer/off\n");
                                _aspeco = strcat(_aspeco, "^3 all ^7(short ^5aa^7) to turn everything on/off\n");
                                superspec_msg("^2Available Auto Spectate ^3options:\n\n\n", "\n^2Available Auto Spectate ^3options:\n", self, _aspeco, 1);
                                return TRUE;
@@ -301,7 +303,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                else if(argv(i) == "off" || argv(i) == "0")
                                {
                                        if(_start == 1)
-                                               self.autospec_flags &~= _bits;
+                                               self.autospec_flags &= ~_bits;
 
                                        _bits = 0;
                                }
@@ -315,6 +317,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                        if((argv(i) == "observer_only") || (argv(i) == "oo")) _bits |= ASF_OBSERVER_ONLY;
                                        if((argv(i) == "show_what") || (argv(i) == "sw")) _bits |= ASF_SHOWWHAT;
                                        if((argv(i) == "item_msg") || (argv(i) == "im")) _bits |= ASF_SSIM;
+                                       if((argv(i) == "followkiller") || (argv(i) == "fk")) _bits |= ASF_FOLLOWKILLER;
                                        if((argv(i) == "all") || (argv(i) == "aa")) _bits |= ASF_ALL;
                                }
                        }
@@ -329,6 +332,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                OPTIONINFO(self.autospec_flags, _aspeco, ASF_OBSERVER_ONLY, "Only switch if observer", "observer_only", "oo");
                OPTIONINFO(self.autospec_flags, _aspeco, ASF_SHOWWHAT, "Show what item triggered spectate", "show_what", "sw");
                OPTIONINFO(self.autospec_flags, _aspeco, ASF_SSIM, "Switch on superspec item message", "item_msg", "im");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_FOLLOWKILLER, "Followkiller", "followkiller", "fk");
 
                superspec_msg("^3Current auto spectate options are:\n\n\n\n\n", "\n^3Current auto spectate options are:\n", self, _aspeco, 1);
                return TRUE;
@@ -380,6 +384,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
 
                entity _player;
                float _team = 0;
+               float found = FALSE;
 
                if(cmd_argc == 2)
                {
@@ -392,10 +397,16 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                FOR_EACH_PLAYER(_player)
                {
                        if(_player.flagcarried && (_player.team == _team || _team == 0))
+                       {
+                               found = TRUE;
+                               if(_team == 0 && IS_SPEC(self) && self.enemy == _player)
+                                       continue; // already spectating a fc, try to find the other fc
                                return _spectate(_player);
+                       }
                }
 
-               superspec_msg("", "", self, "No active flag carrier\n", 1);
+               if(!found)
+                       superspec_msg("", "", self, "No active flag carrier\n", 1);
                return TRUE;
        }
 
@@ -441,7 +452,7 @@ MUTATOR_HOOKFUNCTION(superspec_ClientConnect)
        _hello.think = superspec_hello;
        _hello.nextthink = time + 5;
 
-       if not(_ISLOCAL)
+       if (!_ISLOCAL)
        {
                if(self.crypto_idfp == "")
                        return FALSE;
@@ -473,6 +484,25 @@ MUTATOR_HOOKFUNCTION(superspec_ClientConnect)
        return FALSE;
 }
 
+MUTATOR_HOOKFUNCTION(superspec_PlayerDies)
+{
+       entity _old_self = self;
+
+       FOR_EACH_SPEC(self)
+       {
+               if(self.autospec_flags & ASF_FOLLOWKILLER && IS_PLAYER(frag_attacker) && self.enemy == _old_self)
+               {
+                       if(self.autospec_flags & ASF_SHOWWHAT)
+                               superspec_msg("", "", self, sprintf("^7Following %s^7 due to followkiller\n", frag_attacker.netname), 2);
+
+                       _spectate(frag_attacker);
+               }
+       }
+
+       self = _old_self;
+       return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(superspec_ClientDisconnect)
 {
        superspec_save_client_conf();
@@ -488,6 +518,7 @@ MUTATOR_DEFINITION(mutator_superspec)
        MUTATOR_HOOK(ItemTouch, superspec_ItemTouch, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientConnect, superspec_ClientConnect, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientDisconnect, superspec_ClientDisconnect, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDies, superspec_PlayerDies, CBC_ORDER_ANY);
 
        return 0;
 }