#define ASF_OBSERVER_ONLY 32
#define ASF_SHOWWHAT 64
#define ASF_SSIM 128
+#define ASF_FOLLOWKILLER 256
#define ASF_ALL 0xFFFFFF
.float autospec_flags;
float _spectate(entity _player)
{
if(Spectate(_player) == 1)
- {
- PutObserverInServer();
self.classname = "spectator";
- }
return TRUE;
}
string fn = "superspec-local.options";
float fh;
-
- if not(_ISLOCAL)
+ if (!_ISLOCAL)
{
if(self.crypto_idfp == "")
return;
void superspec_msg(string _center_title, string _con_title, entity _to, string _msg, float _spamlevel)
{
-
sprint(_to, strcat(_con_title, _msg));
if(_to.superspec_flags & SSF_SILENT)
return;
if(_spamlevel > 1)
- if not(_to.superspec_flags & SSF_VERBOSE)
+ if (!(_to.superspec_flags & SSF_VERBOSE))
return;
centerprint(_to, strcat(_center_title, _msg));
{
float i;
- if(!_for.superspec_itemfilter)
+ if(_for.superspec_itemfilter == "")
return TRUE;
if(_for.superspec_itemfilter == "")
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);
self = _oldself;
- return FALSE;
+ return MUT_ITEMTOUCH_CONTINUE;
}
}
-
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))
if(self.autospec_flags & ASF_OBSERVER_ONLY && !IS_OBSERVER(self))
{
if(self.superspec_flags & SSF_VERBOSE)
- superspec_msg("", "", self, sprintf("^8Ignored that %s^8 grabbed %s^8 since the observer_only option is ON\n", other.netname, _item.netname), 2);
+ superspec_msg("", "", self, sprintf("^8Ignored that ^7%s^8 grabbed %s^8 since the observer_only option is ON\n", other.netname, _item.netname), 2);
}
else
{
self = _oldself;
- return FALSE;
+ return MUT_ITEMTOUCH_CONTINUE;
}
MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
self.superspec_itemfilter = strzone(argv(1));
}
-
return TRUE;
}
if(argv(1) == "help")
{
_aspeco = "use cmd superspec [option] [on|off] to set options\n\n";
- _aspeco = strcat(_aspeco, "^3 silent ^7(short^5 si^7) supress ALL mesagess from superspectate.\n");
- _aspeco = strcat(_aspeco, "^3 verrbose ^7(short^5 ve^7) makes superspectate print some additional information.\n");
- _aspeco = strcat(_aspeco, "^3 item_message ^7(short^5 im^7) makes superspectate print items that was picked up.\n");
+ _aspeco = strcat(_aspeco, "^3 silent ^7(short^5 si^7) supresses ALL messages from superspectate.\n");
+ _aspeco = strcat(_aspeco, "^3 verbose ^7(short^5 ve^7) makes superspectate print some additional information.\n");
+ _aspeco = strcat(_aspeco, "^3 item_message ^7(short^5 im^7) makes superspectate print items that were picked up.\n");
_aspeco = strcat(_aspeco, "^7 Use cmd superspec_itemfilter \"item_class1 item_class2\" to set up a filter of what to show with ^3item_message.\n");
superspec_msg("^2Available Super Spectate ^3options:\n\n\n", "\n^2Available Super Spectate ^3options:\n", self, _aspeco, 1);
return TRUE;
else if(argv(i) == "off" || argv(i) == "0")
{
if(_start == 1)
- self.superspec_flags &~= _bits;
+ self.superspec_flags &= ~_bits;
_bits = 0;
}
}
}
-
_aspeco = "";
OPTIONINFO(self.superspec_flags, _aspeco, SSF_SILENT, "Silent", "silent", "si");
OPTIONINFO(self.superspec_flags, _aspeco, SSF_VERBOSE, "Verbose", "verbose", "ve");
OPTIONINFO(self.superspec_flags, _aspeco, SSF_ITEMMSG, "Item pickup messages", "item_message", "im");
superspec_msg("^3Current Super Spectate options are:\n\n\n\n\n", "\n^3Current Super Spectate options are:\n", self, _aspeco, 1);
- return TRUE;
+ return TRUE;
}
/////////////////////
_aspeco = strcat(_aspeco, "^3 mega_health ^7(short^5 mh^7) for automatic spectate on mega health\n");
_aspeco = strcat(_aspeco, "^3 mega_armor ^7(short^5 ma^7) for automatic spectate on mega armor\n");
_aspeco = strcat(_aspeco, "^3 flag_grab ^7(short^5 fg^7) for automatic spectate on CTF flag grab\n");
- _aspeco = strcat(_aspeco, "^3 observer_only (short^5 oo^7) for automatic spectate only if in observer mode\n");
- _aspeco = strcat(_aspeco, "^3 show_what (short^5 sw^7) to display what event triggerd autospectate\n");
- _aspeco = strcat(_aspeco, "^3 item_msg ^7(short^5 im^7) to autospec when item_message in superspectate is triggerd\n");
- _aspeco = strcat(_aspeco, "^3 all ^7(short ^5aa^7) turn everything on/off\n");
+ _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;
}
else if(argv(i) == "off" || argv(i) == "0")
{
if(_start == 1)
- self.autospec_flags &~= _bits;
+ self.autospec_flags &= ~_bits;
_bits = 0;
}
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;
}
}
OPTIONINFO(self.autospec_flags, _aspeco, ASF_MEGA_HP, "Mega Health", "mega_health", "mh");
OPTIONINFO(self.autospec_flags, _aspeco, ASF_MEGA_AR, "Mega Armor", "mega_armor", "ma");
OPTIONINFO(self.autospec_flags, _aspeco, ASF_FLAG_GRAB, "Flag grab", "flag_grab","fg");
- OPTIONINFO(self.autospec_flags, _aspeco, ASF_OBSERVER_ONLY, "Only switch if Observer", "observer_only", "oo");
+ 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;
return _spectate(_player);
}
- superspec_msg("", "", self, "No active powerups\n", 1);
+ superspec_msg("", "", self, "No active powerup\n", 1);
return TRUE;
}
return TRUE;
}
- if(cmd_name == "followstshield")
+ if(cmd_name == "followshield")
{
entity _player;
FOR_EACH_PLAYER(_player)
entity _player;
float _team = 0;
+ float found = FALSE;
if(cmd_argc == 2)
{
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;
}
return 0;
}
-/*
-MUTATOR_HOOKFUNCTION(superspec_PlayerSpawn)
-{
-
- return FALSE;
-}
-*/
-
void superspec_hello()
{
if(self.enemy.crypto_idfp == "")
- centerprint(self.enemy, "Your client have/allow no crypto id, superspec options will not be saved/restored.");
- else
- centerprint(self.enemy, sprintf("Hello %s\nSince your client has a Crypto ID, your superspec preferenses will be presisted on this server.", self.enemy.netname));
+ Send_Notification(NOTIF_ONE_ONLY, self.enemy, MSG_INFO, INFO_SUPERSPEC_MISSING_UID);
remove(self);
}
_hello.think = superspec_hello;
_hello.nextthink = time + 5;
- if not(_ISLOCAL)
+ if (!_ISLOCAL)
{
if(self.crypto_idfp == "")
return FALSE;
string _magic = fgets(fh);
if(_magic != _SSMAGIX)
{
- dprint("^1ERROR^7 While reading superspec options file: unkown magic\n");
+ dprint("^1ERROR^7 While reading superspec options file: unknown magic\n");
}
else
{
return FALSE;
}
-MUTATOR_HOOKFUNCTION(superspec_ClientDisconnect)
+MUTATOR_HOOKFUNCTION(superspec_PlayerDies)
{
- superspec_save_client_conf();
- return FALSE;
-}
+ 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);
+ }
+ }
-/*
-MUTATOR_HOOKFUNCTION(superspec_MakePlayerObserver)
-{
- return FALSE;
+ self = _old_self;
+ return FALSE;
}
-MUTATOR_HOOKFUNCTION(superspec_PlayerPreThink)
+MUTATOR_HOOKFUNCTION(superspec_ClientDisconnect)
{
- return FALSE;
+ superspec_save_client_conf();
+ return FALSE;
}
-*/
MUTATOR_DEFINITION(mutator_superspec)
{
MUTATOR_HOOK(SV_ParseClientCommand, superspec_SV_ParseClientCommand, CBC_ORDER_ANY);
MUTATOR_HOOK(ItemTouch, superspec_ItemTouch, CBC_ORDER_ANY);
MUTATOR_HOOK(ClientConnect, superspec_ClientConnect, CBC_ORDER_ANY);
- //MUTATOR_HOOK(PlayerSpawn, superspec_PlayerSpawn, CBC_ORDER_ANY);
- //MUTATOR_HOOK(PlayerPreThink, superspec_PlayerPreThink, CBC_ORDER_ANY);
- //MUTATOR_HOOK(MakePlayerObserver, superspec_MakePlayerObserver, CBC_ORDER_ANY);
MUTATOR_HOOK(ClientDisconnect, superspec_ClientDisconnect, CBC_ORDER_ANY);
+ MUTATOR_HOOK(PlayerDies, superspec_PlayerDies, CBC_ORDER_ANY);
return 0;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff