From: z411 Date: Fri, 14 Jul 2023 03:24:17 +0000 (-0400) Subject: Merge branch 'master' into z411/bai-server X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6491b766d925a1088212e86cf4767d4be7bf6a4f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into z411/bai-server --- 6491b766d925a1088212e86cf4767d4be7bf6a4f diff --cc qcsrc/client/hud/panel/scoreboard.qc index 6982da59e,35227ffab..92e0f4ed0 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@@ -137,57 -123,62 +137,63 @@@ string Label_getInfo(string label, int if (mode == 1) label = "bckills"; // first case in the switch + #define SCO_LABEL(strlabel, label, padding, help) \ + case label: \ + if (!mode) \ + return CTX(strlabel); \ + LOG_HELP("^3", label, padding, "^7", help); + switch(label) { - case "bckills": if (!mode) return CTX(_("SCO^bckills")); else LOG_HELP(strcat("^3", "bckills", " ^7", _("Number of ball carrier kills"))); - case "bctime": if (!mode) return CTX(_("SCO^bctime")); else LOG_HELP(strcat("^3", "bctime", " ^7", _("Total amount of time holding the ball in Keepaway"))); - case "caps": if (!mode) return CTX(_("SCO^caps")); else LOG_HELP(strcat("^3", "caps", " ^7", _("How often a flag (CTF) or a key (KeyHunt) was captured"))); - case "captime": if (!mode) return CTX(_("SCO^captime")); else LOG_HELP(strcat("^3", "captime", " ^7", _("Time of fastest capture (CTF)"))); - case "cn": if (!mode) return CTX(_("SCO^cn")); else LOG_HELP(strcat("^3", "cn", " ^7", _("Player country"))); //LegendGuard adds cn for Country column 05-04-2021 - case "deaths": if (!mode) return CTX(_("SCO^deaths")); else LOG_HELP(strcat("^3", "deaths", " ^7", _("Number of deaths"))); - case "destroyed": if (!mode) return CTX(_("SCO^destroyed")); else LOG_HELP(strcat("^3", "destroyed", " ^7", _("Number of keys destroyed by pushing them into void"))); - case "dmg": if (!mode) return CTX(_("SCO^damage")); else LOG_HELP(strcat("^3", "dmg", " ^7", _("The total damage done"))); - case "dmgtaken": if (!mode) return CTX(_("SCO^dmgtaken")); else LOG_HELP(strcat("^3", "dmgtaken", " ^7", _("The total damage taken"))); - case "drops": if (!mode) return CTX(_("SCO^drops")); else LOG_HELP(strcat("^3", "drops", " ^7", _("Number of flag drops"))); - case "elo": if (!mode) return CTX(_("SCO^elo")); else LOG_HELP(strcat("^3", "elo", " ^7", _("Player ELO"))); - case "fastest": if (!mode) return CTX(_("SCO^fastest")); else LOG_HELP(strcat("^3", "fastest", " ^7", _("Time of fastest lap (Race/CTS)"))); - case "faults": if (!mode) return CTX(_("SCO^faults")); else LOG_HELP(strcat("^3", "faults", " ^7", _("Number of faults committed"))); - case "fckills": if (!mode) return CTX(_("SCO^fckills")); else LOG_HELP(strcat("^3", "fckills", " ^7", _("Number of flag carrier kills"))); - case "fps": if (!mode) return CTX(_("SCO^fps")); else LOG_HELP(strcat("^3", "fps", " ^7", _("FPS"))); - case "frags": if (!mode) return CTX(_("SCO^frags")); else LOG_HELP(strcat("^3", "frags", " ^7", _("Number of kills minus suicides"))); - case "goals": if (!mode) return CTX(_("SCO^goals")); else LOG_HELP(strcat("^3", "goals", " ^7", _("Number of goals scored"))); - case "hunts": if (!mode) return CTX(_("SCO^hunts")); else LOG_HELP(strcat("^3", "hunts", " ^7", _("Number of hunts (Survival)"))); - case "kckills": if (!mode) return CTX(_("SCO^kckills")); else LOG_HELP(strcat("^3", "kckills", " ^7", _("Number of keys carrier kills"))); - case "kd": if (!mode) return CTX(_("SCO^k/d")); else LOG_HELP(strcat("^3", "kd", " ^7", _("The kill-death ratio"))); - case "kdr": if (!mode) return CTX(_("SCO^kdr")); else LOG_HELP(strcat("^3", "kdr", " ^7", _("The kill-death ratio"))); - case "kdratio": if (!mode) return CTX(_("SCO^kdratio")); else LOG_HELP(strcat("^3", "kdratio", " ^7", _("The kill-death ratio"))); - case "kills": if (!mode) return CTX(_("SCO^kills")); else LOG_HELP(strcat("^3", "kills", " ^7", _("Number of kills"))); - case "laps": if (!mode) return CTX(_("SCO^laps")); else LOG_HELP(strcat("^3", "laps", " ^7", _("Number of laps finished (Race/CTS)"))); - case "lives": if (!mode) return CTX(_("SCO^lives")); else LOG_HELP(strcat("^3", "lives", " ^7", _("Number of lives (LMS)"))); - case "losses": if (!mode) return CTX(_("SCO^losses")); else LOG_HELP(strcat("^3", "losses", " ^7", _("Number of times a key was lost"))); - case "name": if (!mode) return CTX(_("SCO^name")); else LOG_HELP(strcat("^3", "name", " ^7", _("Player name"))); - case "nick": if (!mode) return CTX(_("SCO^nick")); else LOG_HELP(strcat("^3", "nick", " ^7", _("Player name"))); - case "objectives": if (!mode) return CTX(_("SCO^objectives")); else LOG_HELP(strcat("^3", "objectives", " ^7", _("Number of objectives destroyed"))); - case "pickups": if (!mode) return CTX(_("SCO^pickups")); else LOG_HELP(strcat("^3", "pickups", " ^7", _("How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up"))); - case "ping": if (!mode) return CTX(_("SCO^ping")); else LOG_HELP(strcat("^3", "ping", " ^7", _("Ping time"))); - case "pl": if (!mode) return CTX(_("SCO^pl")); else LOG_HELP(strcat("^3", "pl", " ^7", _("Packet loss"))); - case "pushes": if (!mode) return CTX(_("SCO^pushes")); else LOG_HELP(strcat("^3", "pushes", " ^7", _("Number of players pushed into void"))); - case "rank": if (!mode) return CTX(_("SCO^rank")); else LOG_HELP(strcat("^3", "rank", " ^7", _("Player rank"))); - case "returns": if (!mode) return CTX(_("SCO^returns")); else LOG_HELP(strcat("^3", "returns", " ^7", _("Number of flag returns"))); - case "revivals": if (!mode) return CTX(_("SCO^revivals")); else LOG_HELP(strcat("^3", "revivals", " ^7", _("Number of revivals"))); - case "rounds": if (!mode) return CTX(_("SCO^rounds won")); else LOG_HELP(strcat("^3", "rounds", " ^7", _("Number of rounds won"))); - case "rounds_pl": if (!mode) return CTX(_("SCO^rounds played"));else LOG_HELP(strcat("^3", "rounds_pl", " ^7", _("Number of rounds played"))); - case "score": if (!mode) return CTX(_("SCO^score")); else LOG_HELP(strcat("^3", "score", " ^7", _("Total score"))); - case "suicides": if (!mode) return CTX(_("SCO^suicides")); else LOG_HELP(strcat("^3", "suicides", " ^7", _("Number of suicides"))); - case "sum": if (!mode) return CTX(_("SCO^sum")); else LOG_HELP(strcat("^3", "sum", " ^7", _("Number of kills minus deaths"))); - case "survivals": if (!mode) return CTX(_("SCO^survivals")); else LOG_HELP(strcat("^3", "survivals", " ^7", _("Number of survivals"))); - case "takes": if (!mode) return CTX(_("SCO^takes")); else LOG_HELP(strcat("^3", "takes", " ^7", _("Number of domination points taken (Domination)"))); - case "teamkills": if (!mode) return CTX(_("SCO^teamkills")); else LOG_HELP(strcat("^3", "teamkills", " ^7", _("Number of teamkills"))); - case "ticks": if (!mode) return CTX(_("SCO^ticks")); else LOG_HELP(strcat("^3", "ticks", " ^7", _("Number of ticks (Domination)"))); - case "time": if (!mode) return CTX(_("SCO^time")); else LOG_HELP(strcat("^3", "time", " ^7", _("Total time raced (Race/CTS)"))); - default: return label; + SCO_LABEL(_("SCO^bckills"), "bckills", " ", _("Number of ball carrier kills")); + SCO_LABEL(_("SCO^bctime"), "bctime", " ", _("Total amount of time holding the ball in Keepaway")); + SCO_LABEL(_("SCO^caps"), "caps", " ", _("How often a flag (CTF) or a key (KeyHunt) was captured")); + SCO_LABEL(_("SCO^captime"), "captime", " ", _("Time of fastest capture (CTF)")); ++ SCO_LABEL(_("SCO^cn"), "cn", " ", _("Country of player")); + SCO_LABEL(_("SCO^deaths"), "deaths", " ", _("Number of deaths")); + SCO_LABEL(_("SCO^destroyed"), "destroyed", " ", _("Number of keys destroyed by pushing them into void")); + SCO_LABEL(_("SCO^damage"), "dmg", " ", _("The total damage done")); + SCO_LABEL(_("SCO^dmgtaken"), "dmgtaken", " ", _("The total damage taken")); + SCO_LABEL(_("SCO^drops"), "drops", " ", _("Number of flag drops")); + SCO_LABEL(_("SCO^elo"), "elo", " ", _("Player ELO")); + SCO_LABEL(_("SCO^fastest"), "fastest", " ", _("Time of fastest lap (Race/CTS)")); + SCO_LABEL(_("SCO^faults"), "faults", " ", _("Number of faults committed")); + SCO_LABEL(_("SCO^fckills"), "fckills", " ", _("Number of flag carrier kills")); + SCO_LABEL(_("SCO^fps"), "fps", " ", _("FPS")); + SCO_LABEL(_("SCO^frags"), "frags", " ", _("Number of kills minus suicides")); + SCO_LABEL(_("SCO^goals"), "goals", " ", _("Number of goals scored")); + SCO_LABEL(_("SCO^hunts"), "hunts", " ", _("Number of hunts (Survival)")); + SCO_LABEL(_("SCO^kckills"), "kckills", " ", _("Number of keys carrier kills")); + SCO_LABEL(_("SCO^k/d"), "kd", " ", _("The kill-death ratio")); + SCO_LABEL(_("SCO^kdr"), "kdr", " ", _("The kill-death ratio")); + SCO_LABEL(_("SCO^kdratio"), "kdratio", " ", _("The kill-death ratio")); + SCO_LABEL(_("SCO^kills"), "kills", " ", _("Number of kills")); + SCO_LABEL(_("SCO^laps"), "laps", " ", _("Number of laps finished (Race/CTS)")); + SCO_LABEL(_("SCO^lives"), "lives", " ", _("Number of lives (LMS)")); + SCO_LABEL(_("SCO^losses"), "losses", " ", _("Number of times a key was lost")); + SCO_LABEL(_("SCO^name"), "name", " ", _("Player name")); + SCO_LABEL(_("SCO^nick"), "nick", " ", _("Player name")); + SCO_LABEL(_("SCO^objectives"), "objectives", " ", _("Number of objectives destroyed")); + SCO_LABEL(_("SCO^pickups"), "pickups", " ", _("How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up")); + SCO_LABEL(_("SCO^ping"), "ping", " ", _("Ping time")); + SCO_LABEL(_("SCO^pl"), "pl", " ", _("Packet loss")); + SCO_LABEL(_("SCO^pushes"), "pushes", " ", _("Number of players pushed into void")); + SCO_LABEL(_("SCO^rank"), "rank", " ", _("Player rank")); + SCO_LABEL(_("SCO^returns"), "returns", " ", _("Number of flag returns")); + SCO_LABEL(_("SCO^revivals"), "revivals", " ", _("Number of revivals")); + SCO_LABEL(_("SCO^rounds won"), "rounds", " ", _("Number of rounds won")); + SCO_LABEL(_("SCO^rounds played"), "rounds_pl", " ", _("Number of rounds played")); + SCO_LABEL(_("SCO^score"), "score", " ", _("Total score")); + SCO_LABEL(_("SCO^suicides"), "suicides", " ", _("Number of suicides")); + SCO_LABEL(_("SCO^sum"), "sum", " ", _("Number of kills minus deaths")); + SCO_LABEL(_("SCO^survivals"), "survivals", " ", _("Number of survivals")); + SCO_LABEL(_("SCO^takes"), "takes", " ", _("Number of domination points taken (Domination)")); + SCO_LABEL(_("SCO^teamkills"), "teamkills", " ", _("Number of teamkills")); + SCO_LABEL(_("SCO^ticks"), "ticks", " ", _("Number of ticks (Domination)")); + SCO_LABEL(_("SCO^time"), "time", " ", _("Total time raced (Race/CTS)")); } return label; + #undef SCO_LABEL } bool scoreboard_ui_disabling; @@@ -749,14 -740,15 +755,15 @@@ void Cmd_Scoreboard_Help( // otherwise the previous exclusive rule warns anyway // e.g. -teams,rc,cts,lms/kills ?+rc/kills #define SCOREBOARD_DEFAULT_COLUMNS \ -"ping pl fps name |" \ +"ping pl fps cn name |" \ - " -teams,rc,cts,inv,lms/kills +ft,tdm,tmayhem/kills ?+rc,inv/kills" \ - " -teams,lms/deaths +ft,tdm,tmayhem/deaths" \ + " -teams,rc,cts,surv,inv,lms/kills +ft,tdm,tmayhem/kills ?+rc,inv/kills" \ + " -teams,surv,lms/deaths +ft,tdm,tmayhem/deaths" \ " +tdm/sum" \ - " -teams,lms,rc,cts,inv,ka/suicides +ft,tdm,tmayhem/suicides ?+rc,inv/suicides" \ - " -cts,dm,tdm,ka,ft,mayhem,tmayhem/frags" /* tdm already has this in "score" */ \ + " -teams,lms,rc,cts,surv,inv,ka/suicides +ft,tdm,tmayhem/suicides ?+rc,inv/suicides" \ + " -cts,dm,tdm,surv,ka,ft,mayhem,tmayhem/frags" /* tdm already has this in "score" */ \ " +tdm,ft,dom,ons,as,tmayhem/teamkills"\ - " -rc,cts,nb/dmg -rc,cts,nb/dmgtaken" \ + " -rc,cts,surv,nb/dmg -rc,cts,surv,nb/dmgtaken" \ + " +surv/survivals +surv/hunts" \ " +ctf/pickups +ctf/fckills +ctf/returns +ctf/caps +ons/takes +ons/caps" \ " +lms/lives +lms/rank" \ " +kh/kckills +kh/losses +kh/caps" \ diff --cc qcsrc/common/ent_cs.qc index 3d3f4ebd9,85119de08..3dfea8f98 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@@ -169,16 -157,6 +169,11 @@@ ENTCS_PROP(SOLID, true, sv_solid, solid { WriteByte(chan, ent.sv_solid); }, { ent.sv_solid = ReadByte(); }) +// z411 weapon +ENTCS_PROP(ACTIVEWEPID, false, activewepid, activewepid, ENTCS_SET_NORMAL, + { WriteByte(chan, ent.activewepid); }, + { ent.activewepid = ReadByte(); }) + - // gamemode specific player survival status (independent of score and frags) - ENTCS_PROP(SURVIVAL_STATUS, true, survival_status, survival_status, ENTCS_SET_NORMAL, - { WriteShort(chan, ent.survival_status); }, - { ent.survival_status = ReadShort(); }) - #ifdef SVQC int ENTCS_PUBLICMASK = 0, ENTCS_PRIVATEMASK = 0; diff --cc qcsrc/server/command/vote.qc index cc7f6240f,e8c6812c2..e27c5fe8a --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@@ -758,10 -755,31 +769,33 @@@ int VoteCommand_parse(entity caller, st case MUT_VOTEPARSE_UNACCEPTABLE: { return 0; } } + vote_target_type = VOTE_TARGET_ALL; + switch (first_command) // now go through and parse the proper commands to adjust as needed. { + case "movetoauto": + case "movetored": + case "movetoblue": + case "movetoyellow": + case "movetopink": + case "movetospec": + { + entity victim = GetIndexedEntity(argc, (startpos + 1)); + float accepted = VerifyClientEntity(victim, true, false); + if (accepted > 0) + { + vote_parsed_command = vote_command; + vote_parsed_display = sprintf("^1%s #%d ^7%s", first_command, etof(victim), victim.netname); + } + else + { + print_to(caller, strcat("vcall: ", GetClientErrorString(accepted, argv(startpos + 1)), ".\n")); + return 0; + } + + break; + } + case "kick": case "kickban": // catch all kick/kickban commands { diff --cc xonotic-server.cfg index 0f2c68825,707e2ba8e..c799504e9 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@@ -200,10 -199,8 +200,9 @@@ set g_shootfromfixedorigin "" "if set t set g_weapon_stay 0 "1: ghost weapons can be picked up but give no ammo, thrown guns have ammo 2: ghost weapons can be picked up and refill ammo to one pickup size, thrown guns have no ammo (to prevent infinite ammo abuse)" set g_weapon_throwable 1 "if set to 1, weapons can be dropped" set g_powerups -1 "if set to 0 no powerups will spawn, if 1 they will spawn in all game modes, -1 is game mode default" -set g_powerups_drop 0 "allow dropping powerups (1 = timer continues, 2 = timer freezes until picked up)" -set g_powerups_drop_ondeath 1 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)" +// BaI mod changes this - set g_powerups_drop_ondeath 2 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)" +set g_powerups_drop 2 "allow dropping powerups (1 = timer continues, 2 = timer freezes until picked up)" +set g_powerups_drop_ondeath 2 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)" set g_powerups_stack 0 "enables stacking of powerup timers when picking up a powerup you already have; otherwise timer is reset to the time granted by the item, if greater than the time you currently have" set g_powerups_strength 1 "allow strength powerups to spawn" set g_powerups_shield 1 "allow shield powerups to spawn"