#define _SSMAGIX "SUPERSPEC_OPTIONSFILE_V1"
#define _ISLOCAL(ent) ((edict_num(1) == (ent)) ? true : false)
-const float ASF_STRENGTH = BIT(0);
-const float ASF_SHIELD = BIT(1);
-const float ASF_MEGA_AR = BIT(2);
-const float ASF_MEGA_HP = BIT(3);
-const float ASF_FLAG_GRAB = BIT(4);
-const float ASF_OBSERVER_ONLY = BIT(5);
-const float ASF_SHOWWHAT = BIT(6);
-const float ASF_SSIM = BIT(7);
-const float ASF_FOLLOWKILLER = BIT(8);
-const float ASF_ALL = 0xFFFFFF;
+const float ASF_STRENGTH = BIT(0);
+const float ASF_SHIELD = BIT(1);
+const float ASF_MEGA_AR = BIT(2);
+const float ASF_MEGA_HP = BIT(3);
+const float ASF_FLAG_GRAB = BIT(4);
+const float ASF_OBSERVER_ONLY = BIT(5);
+const float ASF_SHOWWHAT = BIT(6);
+const float ASF_SSIM = BIT(7);
+const float ASF_FOLLOWKILLER = BIT(8);
+const float ASF_ALL = 0xFFFFFF;
.float autospec_flags;
const float SSF_SILENT = 1;
const float SSF_ITEMMSG = 4;
.float superspec_flags;
-.string superspec_itemfilter; //"classname1 classname2 ..."
+.string superspec_itemfilter; // "classname1 classname2 ..."
bool superspec_Spectate(entity this, entity targ)
{
- if(Spectate(this, targ) == 1)
- TRANSMUTE(Spectator, this);
+ if (Spectate(this, targ) == 1) {
+ TRANSMUTE(Spectator, this);
+ }
return true;
}
string fn = "superspec-local.options";
float fh;
- if (!_ISLOCAL(this))
- {
- if(this.crypto_idfp == "")
+ if (!_ISLOCAL(this)) {
+ if (this.crypto_idfp == "") {
return;
+ }
fn = sprintf("superspec-%s.options", uri_escape(this.crypto_idfp));
}
fh = fopen(fn, FILE_WRITE);
- if(fh < 0)
- {
+ if (fh < 0) {
LOG_TRACE("^1ERROR: ^7 superspec can not open ", fn, " for writing.");
- }
- else
- {
+ } else {
fputs(fh, _SSMAGIX);
fputs(fh, "\n");
fputs(fh, ftos(this.autospec_flags));
{
sprint(_to, strcat(_con_title, _msg));
- if(_to.superspec_flags & SSF_SILENT)
+ if (_to.superspec_flags & SSF_SILENT) {
return;
+ }
- if(_spamlevel > 1)
- if (!(_to.superspec_flags & SSF_VERBOSE))
+ if (_spamlevel > 1) {
+ 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 == "")
+ if (_for.superspec_itemfilter == "") {
return true;
+ }
float l = tokenize_console(_for.superspec_itemfilter);
- for(i = 0; i < l; ++i)
- {
- if(argv(i) == _item.classname)
+ for (i = 0; i < l; ++i) {
+ if (argv(i) == _item.classname) {
return true;
+ }
}
return false;
entity toucher = M_ARGV(1, entity);
FOREACH_CLIENT(true, {
- if(!IS_SPEC(it) && !IS_OBSERVER(it))
+ if (!IS_SPEC(it) && !IS_OBSERVER(it)) {
continue;
- if(it.superspec_flags & SSF_ITEMMSG)
- if(superspec_filteritem(it, item))
- {
- if(it.superspec_flags & SSF_VERBOSE)
+ }
+ if (it.superspec_flags & SSF_ITEMMSG) {
+ if (superspec_filteritem(it, item)) {
+ if (it.superspec_flags & SSF_VERBOSE) {
superspec_msg("", "", it, sprintf("Player %s^7 just picked up ^3%s\n", toucher.netname, item.netname), 1);
- else
+ } else {
superspec_msg("", "", it, sprintf("Player %s^7 just picked up ^3%s\n^8(%s^8)\n", toucher.netname, item.netname, item.classname), 1);
- if((it.autospec_flags & ASF_SSIM) && it.enemy != toucher)
- {
+ }
+ if ((it.autospec_flags & ASF_SSIM) && it.enemy != toucher) {
superspec_Spectate(it, toucher);
return MUT_ITEMTOUCH_CONTINUE;
}
}
+ }
- if((it.autospec_flags & ASF_SHIELD && item.invincible_finished) ||
- (it.autospec_flags & ASF_STRENGTH && item.strength_finished) ||
- (it.autospec_flags & ASF_MEGA_AR && item.itemdef == ITEM_ArmorMega) ||
- (it.autospec_flags & ASF_MEGA_HP && item.itemdef == ITEM_HealthMega) ||
- (it.autospec_flags & ASF_FLAG_GRAB && item.classname == "item_flag_team"))
- {
-
- if((it.enemy != toucher) || IS_OBSERVER(it))
- {
- if(it.autospec_flags & ASF_OBSERVER_ONLY && !IS_OBSERVER(it))
- {
- if(it.superspec_flags & SSF_VERBOSE)
+ if ((it.autospec_flags & ASF_SHIELD && item.invincible_finished)
+ || (it.autospec_flags & ASF_STRENGTH && item.strength_finished)
+ || (it.autospec_flags & ASF_MEGA_AR && item.itemdef == ITEM_ArmorMega)
+ || (it.autospec_flags & ASF_MEGA_HP && item.itemdef == ITEM_HealthMega)
+ || (it.autospec_flags & ASF_FLAG_GRAB && item.classname == "item_flag_team")) {
+ if ((it.enemy != toucher) || IS_OBSERVER(it)) {
+ if (it.autospec_flags & ASF_OBSERVER_ONLY && !IS_OBSERVER(it)) {
+ if (it.superspec_flags & SSF_VERBOSE) {
superspec_msg("", "", it, sprintf("^8Ignored that ^7%s^8 grabbed %s^8 since the observer_only option is ON\n", toucher.netname, item.netname), 2);
- }
- else
- {
- if(it.autospec_flags & ASF_SHOWWHAT)
+ }
+ } else {
+ if (it.autospec_flags & ASF_SHOWWHAT) {
superspec_msg("", "", it, sprintf("^7Following %s^7 due to picking up %s\n", toucher.netname, item.netname), 2);
+ }
superspec_Spectate(it, toucher);
}
MUTATOR_HOOKFUNCTION(superspec, SV_ParseClientCommand)
{
-#define OPTIONINFO(flag,var,test,text,long,short) \
- var = strcat(var, ((flag & test) ? "^2[ON] ^7" : "^1[OFF] ^7")); \
- var = strcat(var, text," ^7(^3 ", long, "^7 | ^3", short, " ^7)\n")
+#define OPTIONINFO(flag, var, test, text, long, short) \
+ var = strcat(var, ((flag & test) ? "^2[ON] ^7" : "^1[OFF] ^7")); \
+ var = strcat(var, text, " ^7(^3 ", long, "^7 | ^3", short, " ^7)\n")
- if(MUTATOR_RETURNVALUE) // command was already handled?
+ if (MUTATOR_RETURNVALUE) { // command was already handled?
return;
+ }
entity player = M_ARGV(0, entity);
string cmd_name = M_ARGV(1, string);
int cmd_argc = M_ARGV(2, int);
- if(IS_PLAYER(player))
+ if (IS_PLAYER(player)) {
return;
+ }
- if(cmd_name == "superspec_itemfilter")
- {
- if(argv(1) == "help")
- {
+ if (cmd_name == "superspec_itemfilter") {
+ if (argv(1) == "help") {
string _aspeco;
_aspeco = "^7 superspec_itemfilter ^3\"item_classname1 item_classname2\"^7 only show thise items when ^2superspec ^3item_message^7 is on\n";
_aspeco = strcat(_aspeco, "^3 clear^7 Remove the filter (show all pickups)\n");
_aspeco = strcat(_aspeco, "^3 show ^7 Display current filter\n");
superspec_msg("^3superspec_itemfilter help:\n\n\n", "\n^3superspec_itemfilter help:\n", player, _aspeco, 1);
- }
- else if(argv(1) == "clear")
- {
- if(player.superspec_itemfilter != "")
+ } else if (argv(1) == "clear") {
+ if (player.superspec_itemfilter != "") {
strunzone(player.superspec_itemfilter);
+ }
player.superspec_itemfilter = "";
- }
- else if(argv(1) == "show" || argv(1) == "")
- {
- if(player.superspec_itemfilter == "")
- {
+ } else if (argv(1) == "show" || argv(1) == "") {
+ if (player.superspec_itemfilter == "") {
superspec_msg("^3superspec_itemfilter^7 is ^1not^7 set", "\n^3superspec_itemfilter^7 is ^1not^7 set\n", player, "", 1);
return true;
}
float i;
float l = tokenize_console(player.superspec_itemfilter);
string _msg = "";
- for(i = 0; i < l; ++i)
+ for (i = 0; i < l; ++i) {
_msg = strcat(_msg, "^3#", ftos(i), " ^7", argv(i), "\n");
- //_msg = sprintf("^3#%d^7 %s\n%s", i, _msg, argv(i));
+ }
+ // _msg = sprintf("^3#%d^7 %s\n%s", i, _msg, argv(i));
- _msg = strcat(_msg,"\n");
+ _msg = strcat(_msg, "\n");
superspec_msg("^3superspec_itemfilter is:\n\n\n", "\n^3superspec_itemfilter is:\n", player, _msg, 1);
- }
- else
- {
- if(player.superspec_itemfilter != "")
+ } else {
+ if (player.superspec_itemfilter != "") {
strunzone(player.superspec_itemfilter);
+ }
player.superspec_itemfilter = strzone(argv(1));
}
return true;
}
- if(cmd_name == "superspec")
- {
+ if (cmd_name == "superspec") {
string _aspeco;
- if(cmd_argc > 1)
- {
+ if (cmd_argc > 1) {
float i, _bits = 0, _start = 1;
- if(argv(1) == "help")
- {
+ 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) supresses ALL messages from superspectate.\n");
_aspeco = strcat(_aspeco, "^3 verbose ^7(short^5 ve^7) makes superspectate print some additional information.\n");
return true;
}
- if(argv(1) == "clear")
- {
+ if (argv(1) == "clear") {
player.superspec_flags = 0;
_start = 2;
}
- for(i = _start; i < cmd_argc; ++i)
- {
- if(argv(i) == "on" || argv(i) == "1")
- {
+ for (i = _start; i < cmd_argc; ++i) {
+ if (argv(i) == "on" || argv(i) == "1") {
player.superspec_flags |= _bits;
_bits = 0;
- }
- else if(argv(i) == "off" || argv(i) == "0")
- {
- if(_start == 1)
+ } else if (argv(i) == "off" || argv(i) == "0") {
+ if (_start == 1) {
player.superspec_flags &= ~_bits;
+ }
_bits = 0;
- }
- else
- {
- if((argv(i) == "silent") || (argv(i) == "si")) _bits |= SSF_SILENT ;
- if((argv(i) == "verbose") || (argv(i) == "ve")) _bits |= SSF_VERBOSE;
- if((argv(i) == "item_message") || (argv(i) == "im")) _bits |= SSF_ITEMMSG;
+ } else {
+ if ((argv(i) == "silent") || (argv(i) == "si")) { _bits |= SSF_SILENT; }
+ if ((argv(i) == "verbose") || (argv(i) == "ve")) { _bits |= SSF_VERBOSE; }
+ if ((argv(i) == "item_message") || (argv(i) == "im")) { _bits |= SSF_ITEMMSG; }
}
}
}
/////////////////////
- if(cmd_name == "autospec")
- {
+ if (cmd_name == "autospec") {
string _aspeco;
- if(cmd_argc > 1)
- {
- if(argv(1) == "help")
- {
+ if (cmd_argc > 1) {
+ if (argv(1) == "help") {
_aspeco = "use cmd autospec [option] [on|off] to set options\n\n";
_aspeco = strcat(_aspeco, "^3 strength ^7(short^5 st^7) for automatic spectate on strength powerup\n");
_aspeco = strcat(_aspeco, "^3 shield ^7(short^5 sh^7) for automatic spectate on shield powerup\n");
}
float i, _bits = 0, _start = 1;
- if(argv(1) == "clear")
- {
+ if (argv(1) == "clear") {
player.autospec_flags = 0;
_start = 2;
}
- for(i = _start; i < cmd_argc; ++i)
- {
- if(argv(i) == "on" || argv(i) == "1")
- {
+ for (i = _start; i < cmd_argc; ++i) {
+ if (argv(i) == "on" || argv(i) == "1") {
player.autospec_flags |= _bits;
_bits = 0;
- }
- else if(argv(i) == "off" || argv(i) == "0")
- {
- if(_start == 1)
+ } else if (argv(i) == "off" || argv(i) == "0") {
+ if (_start == 1) {
player.autospec_flags &= ~_bits;
+ }
_bits = 0;
- }
- else
- {
- if((argv(i) == "strength") || (argv(i) == "st")) _bits |= ASF_STRENGTH;
- if((argv(i) == "shield") || (argv(i) == "sh")) _bits |= ASF_SHIELD;
- if((argv(i) == "mega_health") || (argv(i) == "mh")) _bits |= ASF_MEGA_HP;
- if((argv(i) == "mega_armor") || (argv(i) == "ma")) _bits |= ASF_MEGA_AR;
- if((argv(i) == "flag_grab") || (argv(i) == "fg")) _bits |= ASF_FLAG_GRAB;
- 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;
+ } else {
+ if ((argv(i) == "strength") || (argv(i) == "st")) { _bits |= ASF_STRENGTH; }
+ if ((argv(i) == "shield") || (argv(i) == "sh")) { _bits |= ASF_SHIELD; }
+ if ((argv(i) == "mega_health") || (argv(i) == "mh")) { _bits |= ASF_MEGA_HP; }
+ if ((argv(i) == "mega_armor") || (argv(i) == "ma")) { _bits |= ASF_MEGA_AR; }
+ if ((argv(i) == "flag_grab") || (argv(i) == "fg")) { _bits |= ASF_FLAG_GRAB; }
+ 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(player.autospec_flags, _aspeco, ASF_SHIELD, "Shield", "shield", "sh");
OPTIONINFO(player.autospec_flags, _aspeco, ASF_MEGA_HP, "Mega Health", "mega_health", "mh");
OPTIONINFO(player.autospec_flags, _aspeco, ASF_MEGA_AR, "Mega Armor", "mega_armor", "ma");
- OPTIONINFO(player.autospec_flags, _aspeco, ASF_FLAG_GRAB, "Flag grab", "flag_grab","fg");
+ OPTIONINFO(player.autospec_flags, _aspeco, ASF_FLAG_GRAB, "Flag grab", "flag_grab", "fg");
OPTIONINFO(player.autospec_flags, _aspeco, ASF_OBSERVER_ONLY, "Only switch if observer", "observer_only", "oo");
OPTIONINFO(player.autospec_flags, _aspeco, ASF_SHOWWHAT, "Show what item triggered spectate", "show_what", "sw");
OPTIONINFO(player.autospec_flags, _aspeco, ASF_SSIM, "Switch on superspec item message", "item_msg", "im");
return true;
}
- if(cmd_name == "followpowerup")
- {
- FOREACH_CLIENT(IS_PLAYER(it) && (it.strength_finished > time || it.invincible_finished > time), { return superspec_Spectate(player, it); });
+ if (cmd_name == "followpowerup") {
+ FOREACH_CLIENT(IS_PLAYER(it) && (it.strength_finished > time || it.invincible_finished > time), { return superspec_Spectate(player, it);
+ });
superspec_msg("", "", player, "No active powerup\n", 1);
return true;
}
- if(cmd_name == "followstrength")
- {
- FOREACH_CLIENT(IS_PLAYER(it) && it.strength_finished > time, { return superspec_Spectate(player, it); });
+ if (cmd_name == "followstrength") {
+ FOREACH_CLIENT(IS_PLAYER(it) && it.strength_finished > time, { return superspec_Spectate(player, it);
+ });
superspec_msg("", "", player, "No active Strength\n", 1);
return true;
}
- if(cmd_name == "followshield")
- {
- FOREACH_CLIENT(IS_PLAYER(it) && it.invincible_finished > time, { return superspec_Spectate(player, it); });
+ if (cmd_name == "followshield") {
+ FOREACH_CLIENT(IS_PLAYER(it) && it.invincible_finished > time, { return superspec_Spectate(player, it);
+ });
superspec_msg("", "", player, "No active Shield\n", 1);
return true;
void superspec_hello(entity this)
{
- if(this.enemy.crypto_idfp == "")
+ if (this.enemy.crypto_idfp == "") {
Send_Notification(NOTIF_ONE_ONLY, this.enemy, MSG_INFO, INFO_SUPERSPEC_MISSING_UID);
+ }
delete(this);
}
{
entity player = M_ARGV(0, entity);
- if(!IS_REAL_CLIENT(player))
+ if (!IS_REAL_CLIENT(player)) {
return;
+ }
string fn = "superspec-local.options";
float fh;
setthink(_hello, superspec_hello);
_hello.nextthink = time + 5;
- if (!_ISLOCAL(player))
- {
- if(player.crypto_idfp == "")
+ if (!_ISLOCAL(player)) {
+ if (player.crypto_idfp == "") {
return;
+ }
fn = sprintf("superspec-%s.options", uri_escape(player.crypto_idfp));
}
fh = fopen(fn, FILE_READ);
- if(fh < 0)
- {
+ if (fh < 0) {
LOG_TRACE("^1ERROR: ^7 superspec can not open ", fn, " for reading.");
- }
- else
- {
+ } else {
string _magic = fgets(fh);
- if(_magic != _SSMAGIX)
- {
+ if (_magic != _SSMAGIX) {
LOG_TRACE("^1ERROR^7 While reading superspec options file: unknown magic");
- }
- else
- {
+ } else {
player.autospec_flags = stof(fgets(fh));
player.superspec_flags = stof(fgets(fh));
player.superspec_itemfilter = strzone(fgets(fh));
entity frag_target = M_ARGV(2, entity);
FOREACH_CLIENT(IS_SPEC(it), {
- if(it.autospec_flags & ASF_FOLLOWKILLER && IS_PLAYER(frag_attacker) && it.enemy == frag_target)
- {
- if(it.autospec_flags & ASF_SHOWWHAT)
+ if (it.autospec_flags & ASF_FOLLOWKILLER && IS_PLAYER(frag_attacker) && it.enemy == frag_target) {
+ if (it.autospec_flags & ASF_SHOWWHAT) {
superspec_msg("", "", it, sprintf("^7Following %s^7 due to followkiller\n", frag_attacker.netname), 2);
+ }
superspec_Spectate(it, frag_attacker);
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff