From: Mario Date: Fri, 12 May 2017 22:34:27 +0000 (+1000) Subject: Add a "type" option to invasion, allowing switching to hunting or stage modes (kill... X-Git-Tag: xonotic-v0.8.5~2506^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f2e3cd6c6554bda254111dee0746fea05aac047;p=xonotic%2Fxonotic-data.pk3dir.git Add a "type" option to invasion, allowing switching to hunting or stage modes (kill all mapper-placed monsters, or find the ending goal) --- diff --git a/gamemodes.cfg b/gamemodes.cfg index 80d990226..67ce20ee3 100644 --- a/gamemodes.cfg +++ b/gamemodes.cfg @@ -553,3 +553,4 @@ set g_invasion_spawn_delay 0.25 set g_invasion_spawnpoint_spawn_delay 0.5 set g_invasion_teams 0 "number of teams in invasion (note: use mapinfo to set this)" set g_invasion_team_spawns 1 "use team spawns in teamplay invasion mode" +set g_invasion_type 0 "type of invasion mode - 0: round-based, 1: hunting, 2: complete the stage (note: use mapinfo to set this)" diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 4c0fd7829..2dd84596e 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -458,7 +458,7 @@ REGISTER_GAMETYPE(KEEPAWAY, NEW(Keepaway)); CLASS(Invasion, Gametype) INIT(Invasion) { - this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,"","pointlimit=50 teams=0",_("Survive against waves of monsters")); + this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,"","pointlimit=50 teams=0 type=0",_("Survive against waves of monsters")); } METHOD(Invasion, m_parse_mapinfo, bool(string k, string v)) { @@ -466,6 +466,9 @@ CLASS(Invasion, Gametype) case "teams": cvar_set("g_invasion_teams", v); return true; + case "type": + cvar_set("g_invasion_type", v); + return true; } return false; } diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 55c8f881d..ff149e064 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -268,6 +268,7 @@ void cvar_changes_init() BADCVAR("g_freezetag"); BADCVAR("g_freezetag_teams"); BADCVAR("g_invasion_teams"); + BADCVAR("g_invasion_type"); BADCVAR("g_jailbreak"); BADCVAR("g_jailbreak_teams"); BADCVAR("g_keepaway"); diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc index 1355134bb..51e8459d8 100644 --- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc +++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qc @@ -5,6 +5,9 @@ #include +IntrusiveList g_invasion_roundends; +STATIC_INIT(g_invasion_roundends) { g_invasion_roundends = IL_NEW(); } + IntrusiveList g_invasion_waves; STATIC_INIT(g_invasion_waves) { g_invasion_waves = IL_NEW(); } @@ -18,8 +21,44 @@ int autocvar_g_invasion_monster_count; bool autocvar_g_invasion_zombies_only; float autocvar_g_invasion_spawn_delay; +bool victent_present; +.bool inv_endreached; + .string spawnmob; +void target_invasion_roundend_use(entity this, entity actor, entity trigger) +{ + if(!IS_PLAYER(actor)) { return; } + + actor.inv_endreached = true; + + int plnum = 0; + int realplnum = 0; + // let's not count bots + FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), { + ++realplnum; + if(it.inv_endreached) + ++plnum; + }); + if(plnum < ceil(realplnum * min(1, this.count))) // 70% of players + return; + + this.winning = true; +} + +spawnfunc(target_invasion_roundend) +{ + if(!g_invasion) { delete(this); return; } + + victent_present = true; // a victory entity is present, we don't need to rely on monster count TODO: merge this with the intrusive list (can check empty) + + if(!this.count) { this.count = 0.7; } // require at least 70% of the players to reach the end before triggering victory + + this.use = target_invasion_roundend_use; + + IL_PUSH(g_invasion_roundends, this); +} + spawnfunc(invasion_wave) { if(!g_invasion) { delete(this); return; } @@ -35,6 +74,58 @@ spawnfunc(invasion_spawnpoint) IL_PUSH(g_invasion_spawns, this); } +// Invasion stage mode winning condition: If the attackers triggered a round end (by fulfilling all objectives) +// they win. +int WinningCondition_Invasion() +{ + WinningConditionHelper(NULL); // set worldstatus + + int status = WINNING_NO; + + if(autocvar_g_invasion_type == INV_TYPE_STAGE) + { + SetWinners(inv_endreached, true); + + int found = 0; + IL_EACH(g_invasion_roundends, true, + { + ++found; + if(it.winning) + { + bprint("Invasion: round completed.\n"); + // winners already set (TODO: teamplay support) + + status = WINNING_YES; + break; + } + }); + + if(!found) + status = WINNING_YES; // just end it? TODO: should warn mapper! + } + else if(autocvar_g_invasion_type == INV_TYPE_HUNT) + { + ClearWinners(); + + int found = 0; // NOTE: this ends the round if no monsters are placed + IL_EACH(g_monsters, !(it.spawnflags & MONSTERFLAG_RESPAWNED), + { + ++found; + }); + + if(found <= 0) + { + FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it), + { + it.winning = true; + }); + status = WINNING_YES; + } + } + + return status; +} + Monster invasion_PickMonster(int supermonster_count) { RandomSelection_Init(); @@ -320,8 +411,11 @@ MUTATOR_HOOKFUNCTION(inv, MonsterDies) if(!(frag_target.spawnflags & MONSTERFLAG_RESPAWNED)) { - inv_numkilled += 1; - inv_maxcurrent -= 1; + if(autocvar_g_invasion_type == INV_TYPE_ROUND) + { + inv_numkilled += 1; + inv_maxcurrent -= 1; + } if(teamplay) { inv_monsters_perteam[frag_target.team] -= 1; } if(IS_PLAYER(frag_attacker)) @@ -339,6 +433,10 @@ MUTATOR_HOOKFUNCTION(inv, MonsterDies) MUTATOR_HOOKFUNCTION(inv, MonsterSpawn) { entity mon = M_ARGV(0, entity); + mon.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP; + + if(autocvar_g_invasion_type == INV_TYPE_HUNT) + return false; // allowed if(!(mon.spawnflags & MONSTERFLAG_SPAWNED)) return true; @@ -353,29 +451,20 @@ MUTATOR_HOOKFUNCTION(inv, MonsterSpawn) if((get_monsterinfo(mon.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER) Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_INVASION_SUPERMONSTER, mon.monster_name); - - mon.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP; -} - -MUTATOR_HOOKFUNCTION(inv, OnEntityPreSpawn) -{ - entity ent = M_ARGV(0, entity); - - // TODO: allow these as "rogues" or something - if(startsWith(ent.classname, "monster_")) - if(!(ent.spawnflags & MONSTERFLAG_SPAWNED)) - return true; } MUTATOR_HOOKFUNCTION(inv, SV_StartFrame) { + if(autocvar_g_invasion_type != INV_TYPE_ROUND) + return; // uses map spawned monsters + monsters_total = inv_maxspawned; // TODO: make sure numspawned never exceeds maxspawned monsters_killed = inv_numkilled; } MUTATOR_HOOKFUNCTION(inv, PlayerRegen) { - // no regeneration in invasion + // no regeneration in invasion, regardless of the game type return true; } @@ -405,28 +494,6 @@ MUTATOR_HOOKFUNCTION(inv, Damage_Calculate) } } -MUTATOR_HOOKFUNCTION(inv, SV_ParseClientCommand) -{ - if(MUTATOR_RETURNVALUE) // command was already handled? - return; - - entity player = M_ARGV(0, entity); - string cmd_name = M_ARGV(1, string); - - if(cmd_name == "debuginvasion") - { - sprint(player, strcat("inv_maxspawned = ", ftos(inv_maxspawned), "\n")); - sprint(player, strcat("inv_numspawned = ", ftos(inv_numspawned), "\n")); - sprint(player, strcat("inv_numkilled = ", ftos(inv_numkilled), "\n")); - sprint(player, strcat("inv_roundcnt = ", ftos(inv_roundcnt), "\n")); - sprint(player, strcat("monsters_total = ", ftos(monsters_total), "\n")); - sprint(player, strcat("monsters_killed = ", ftos(monsters_killed), "\n")); - sprint(player, strcat("inv_monsterskill = ", ftos(inv_monsterskill), "\n")); - - return true; - } -} - MUTATOR_HOOKFUNCTION(inv, BotShouldAttack) { entity targ = M_ARGV(1, entity); @@ -437,8 +504,11 @@ MUTATOR_HOOKFUNCTION(inv, BotShouldAttack) MUTATOR_HOOKFUNCTION(inv, SetStartItems) { - start_health = 200; - start_armorvalue = 200; + if(autocvar_g_invasion_type == INV_TYPE_ROUND) + { + start_health = 200; + start_armorvalue = 200; + } } MUTATOR_HOOKFUNCTION(inv, AccuracyTargetValid) @@ -457,6 +527,15 @@ MUTATOR_HOOKFUNCTION(inv, AllowMobSpawning) return true; } +MUTATOR_HOOKFUNCTION(inv, CheckRules_World) +{ + if(autocvar_g_invasion_type == INV_TYPE_ROUND) + return false; + + M_ARGV(0, float) = WinningCondition_Invasion(); + return true; +} + MUTATOR_HOOKFUNCTION(inv, CheckAllowedTeams, CBC_ORDER_EXCLUSIVE) { M_ARGV(0, float) = invasion_teams; @@ -479,6 +558,9 @@ void invasion_ScoreRules(int inv_teams) void invasion_DelayedInit(entity this) // Do this check with a delay so we can wait for teams to be set up. { + if(autocvar_g_invasion_type == INV_TYPE_HUNT || autocvar_g_invasion_type == INV_TYPE_STAGE) + cvar_set("fraglimit", "0"); + if(autocvar_g_invasion_teams) { invasion_teams = bound(2, autocvar_g_invasion_teams, 4); @@ -499,11 +581,14 @@ void invasion_DelayedInit(entity this) // Do this check with a delay so we can w independent_players = 0; - round_handler_Spawn(Invasion_CheckPlayers, Invasion_CheckWinner, Invasion_RoundStart); - round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit); + if(autocvar_g_invasion_type == INV_TYPE_ROUND) + { + round_handler_Spawn(Invasion_CheckPlayers, Invasion_CheckWinner, Invasion_RoundStart); + round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit); - inv_roundcnt = 0; - inv_maxrounds = 15; // 15? + inv_roundcnt = 0; + inv_maxrounds = 15; // 15? + } } void invasion_Initialize() diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qh b/qcsrc/server/mutators/mutator/gamemode_invasion.qh index e934f8745..98322bcac 100644 --- a/qcsrc/server/mutators/mutator/gamemode_invasion.qh +++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qh @@ -4,6 +4,7 @@ #define autocvar_g_invasion_point_limit cvar("g_invasion_point_limit") int autocvar_g_invasion_teams; +int autocvar_g_invasion_type; bool autocvar_g_invasion_team_spawns; bool g_invasion; void invasion_Initialize(); @@ -58,3 +59,7 @@ float inv_monsters_perteam[17]; float inv_monsterskill; const float ST_INV_KILLS = 1; + +const int INV_TYPE_ROUND = 0; // round-based waves of enemies +const int INV_TYPE_HUNT = 1; // clear the map of placed enemies +const int INV_TYPE_STAGE = 2; // reach the end of the level