From: drjaska Date: Sun, 7 Mar 2021 03:16:06 +0000 (+0200) Subject: oopsies forgot to git add --all X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=851851565f156abfeb0e4dfafadc8131557fc301;p=xonotic%2Fxonotic-data.pk3dir.git oopsies forgot to git add --all --- diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/_mod.inc b/qcsrc/common/gamemodes/gamemode/tmayhem/_mod.inc new file mode 100644 index 000000000..e78eb59b1 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/_mod.inc @@ -0,0 +1,5 @@ +// generated file; do not modify +#include +#ifdef SVQC + #include +#endif diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/_mod.qh b/qcsrc/common/gamemodes/gamemode/tmayhem/_mod.qh new file mode 100644 index 000000000..261392346 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/_mod.qh @@ -0,0 +1,5 @@ +// generated file; do not modify +#include +#ifdef SVQC + #include +#endif diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc new file mode 100644 index 000000000..0d5baf05d --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc @@ -0,0 +1,132 @@ +#include "sv_tmayhem.qh" + +// TODO? rename to teamdeathmatch +int autocvar_g_tmayhem_teams; +int autocvar_g_tmayhem_teams_override; + +bool autocvar_g_tmayhem_regenerate; +string autocvar_g_tmayhem_weaponarena; +bool autocvar_g_tmayhem_powerups; + +// code from here on is just to support maps that don't have team entities +void tmayhem_SpawnTeam (string teamname, int teamcolor) +{ + entity this = new_pure(tmayhem_team); + this.netname = teamname; + this.cnt = teamcolor - 1; + this.team = teamcolor; + this.spawnfunc_checked = true; + //spawnfunc_tmayhem_team(this); +} + +void tmayhem_DelayedInit(entity this) +{ + // if no teams are found, spawn defaults + if(find(NULL, classname, "tmayhem_team") == NULL) + { + LOG_TRACE("No \"tmayhem_team\" entities found on this map, creating them anyway."); + + int numteams = autocvar_g_tmayhem_teams_override; + if(numteams < 2) { numteams = autocvar_g_tmayhem_teams; } + + int teams = BITS(bound(2, numteams, 4)); + if(teams & BIT(0)) + tmayhem_SpawnTeam("Red", NUM_TEAM_1); + if(teams & BIT(1)) + tmayhem_SpawnTeam("Blue", NUM_TEAM_2); + if(teams & BIT(2)) + tmayhem_SpawnTeam("Yellow", NUM_TEAM_3); + if(teams & BIT(3)) + tmayhem_SpawnTeam("Pink", NUM_TEAM_4); + } +} + +void tmayhem_Initialize() +{ + GameRules_teams(true); + GameRules_spawning_teams(autocvar_g_tmayhem_team_spawns); + GameRules_limit_score(autocvar_g_tmayhem_point_limit); + GameRules_limit_lead(autocvar_g_tmayhem_point_leadlimit); + + InitializeEntity(NULL, tmayhem_DelayedInit, INITPRIO_GAMETYPE); +} + +MUTATOR_HOOKFUNCTION(tmayhem, TeamBalance_CheckAllowedTeams, CBC_ORDER_EXCLUSIVE) +{ + M_ARGV(1, string) = "tmayhem_team"; +} + +MUTATOR_HOOKFUNCTION(tmayhem, Scores_CountFragsRemaining) +{ + // announce remaining frags + return true; +} + +MUTATOR_HOOKFUNCTION(tmayhem, SetStartItems) +{ + start_items &= ~(IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS); + start_health = warmup_start_health = cvar("g_lms_start_health"); + start_armorvalue = warmup_start_armorvalue = cvar("g_lms_start_armor"); + start_ammo_shells = warmup_start_ammo_shells = cvar("g_lms_start_ammo_shells"); + start_ammo_nails = warmup_start_ammo_nails = cvar("g_lms_start_ammo_nails"); + start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_lms_start_ammo_rockets"); + start_ammo_cells = warmup_start_ammo_cells = cvar("g_lms_start_ammo_cells"); + start_ammo_plasma = warmup_start_ammo_plasma = cvar("g_lms_start_ammo_plasma"); + start_ammo_fuel = warmup_start_ammo_fuel = cvar("g_lms_start_ammo_fuel"); +} + +MUTATOR_HOOKFUNCTION(tmayhem, PlayerRegen) +{ + if(autocvar_g_tmayhem_regenerate) + return false; + return true; +} + +MUTATOR_HOOKFUNCTION(tmayhem, ForbidThrowCurrentWeapon) +{ + return true; +} + +MUTATOR_HOOKFUNCTION(tmayhem, SetWeaponArena) +{ + if (M_ARGV(0, string) == "0" || M_ARGV(0, string) == "") + M_ARGV(0, string) = autocvar_g_tmayhem_weaponarena; +} + +MUTATOR_HOOKFUNCTION(tmayhem, FilterItem) +{ + entity item = M_ARGV(0, entity); + if (autocvar_g_powerups == 1){ + if (item.flags & FL_POWERUP){ + return false; + } + } + else if (autocvar_g_powerups == -1){ + if (item.flags & FL_POWERUP){ + if (autocvar_g_tmayhem_powerups){ + return false; + } + } + } + if (autocvar_g_pickup_items <= 0) + return true; +} + +MUTATOR_HOOKFUNCTION(tmayhem, Damage_Calculate) +{ + entity frag_attacker = M_ARGV(1, entity); + entity frag_target = M_ARGV(2, entity); + float frag_deathtype = M_ARGV(3, float); + float frag_damage = M_ARGV(4, float); + float frag_mirrordamage = M_ARGV(5, float); + + if (IS_PLAYER(frag_target)) + if (!IS_DEAD(frag_target)) + if (frag_target == frag_attacker || SAME_TEAM(frag_target, frag_attacker) || frag_deathtype == DEATH_FALL.m_id) + frag_damage = 0; + + frag_mirrordamage = 0; + + M_ARGV(4, float) = frag_damage; + M_ARGV(5, float) = frag_mirrordamage; +} \ No newline at end of file diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qh b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qh new file mode 100644 index 000000000..59077fbad --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qh @@ -0,0 +1,17 @@ +#pragma once + +#include +int autocvar_g_tmayhem_point_limit; +int autocvar_g_tmayhem_point_leadlimit; +bool autocvar_g_tmayhem_team_spawns; +void tmayhem_Initialize(); + +REGISTER_MUTATOR(tmayhem, false) +{ + MUTATOR_STATIC(); + MUTATOR_ONADD + { + tmayhem_Initialize(); + } + return 0; +} diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qc b/qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qc new file mode 100644 index 000000000..b05860a8c --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qc @@ -0,0 +1 @@ +#include "tmayhem.qh" diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qh b/qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qh new file mode 100644 index 000000000..01a808df7 --- /dev/null +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/tmayhem.qh @@ -0,0 +1,50 @@ +#pragma once + +#include +#include + +CLASS(tmayhem, Gametype) + INIT(tmayhem) + { + this.gametype_init(this, _("Team Mayhem"),"tmayhem","g_tmayhem",GAMETYPE_FLAG_TEAMPLAY | GAMETYPE_FLAG_USEPOINTS | GAMETYPE_FLAG_PRIORITY,"","timelimit=15 pointlimit=50 teams=2 leadlimit=0",_("The team with the most frags in total mayhem wins!")); + } + METHOD(tmayhem, m_parse_mapinfo, bool(string k, string v)) + { + if (!k) { + cvar_set("g_tmayhem_teams", cvar_defstring("g_tmayhem_teams")); + return true; + } + switch (k) { + case "teams": + cvar_set("g_tmayhem_teams", v); + return true; + } + return false; + } + METHOD(tmayhem, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + return true; + } + METHOD(tmayhem, m_isForcedSupported, bool(Gametype this)) + { + if(!(MapInfo_Map_supportedGametypes & this.m_flags) && (MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH.m_flags)){ + return true; + } + if(!(MapInfo_Map_supportedGametypes & this.m_flags) && (MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH.m_flags)){ + return true; + } + return false; + } + METHOD(tmayhem, m_setTeams, void(string sa)) + { + cvar_set("g_tmayhem_teams", sa); + } + METHOD(tmayhem, m_configuremenu, void(Gametype this, entity menu, void(entity me, string pLabel, float pMin, float pMax, float pStep, string pCvar, string tCvar, string pTooltip) returns)) + { + TC(Gametype, this); + returns(menu, _("Point limit:"), 5, 100, 5, "g_tmayhem_point_limit", "g_tmayhem_teams_override", _("The amount of points needed before the match will end")); + } + ATTRIB(tmayhem, m_legacydefaults, string, "50 20 2 0"); +ENDCLASS(tmayhem) +REGISTER_GAMETYPE(TEAM_MAYHEM, NEW(tmayhem)); +#define g_tmayhem IS_GAMETYPE(TEAM_MAYHEM)