Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_invasion.qc

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index de8b13e44b3ebbf4ad23caf7214a11b9f1da0d5e..f7442c1ca03e53a6462863f17e9fdc01a2402ab9 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -1,7 +1,7 @@
 void invasion_spawnpoint()
 {
        if(!g_invasion) { remove(self); return; }
-       
+
        self.classname = "invasion_spawnpoint";
 }
 
@@ -12,47 +12,47 @@ float invasion_PickMonster(float supermonster_count)
 
        float i;
        entity mon;
-       
+
        RandomSelection_Init();
-       
+
        for(i = MON_FIRST; i <= MON_LAST; ++i)
        {
                mon = get_monsterinfo(i);
                if((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM) || (mon.spawnflags & MON_FLAG_SUPERMONSTER && supermonster_count >= 1))
                        continue; // flying/swimming monsters not yet supported
-               
+
                RandomSelection_Add(world, i, "", 1, 1);
        }
-       
+
        return RandomSelection_chosen_float;
 }
 
 entity invasion_PickSpawn()
 {
        entity e;
-       
+
        RandomSelection_Init();
-       
+
        for(e = world;(e = find(e, classname, "invasion_spawnpoint")); )
                RandomSelection_Add(e, 0, string_null, 1, 1);
-               
+
        return RandomSelection_chosen_ent;
 }
 
 void invasion_SpawnChosenMonster(float mon)
 {
        entity spawn_point, monster;
-       
+
        spawn_point = invasion_PickSpawn();
-       
+
        if(spawn_point == world)
        {
                dprint("Warning: couldn't find any invasion_spawnpoint spawnpoints, no monsters will spawn!\n");
                return;
        }
-       
+
        monster = spawnmonster("", mon, spawn_point, spawn_point, spawn_point.origin, FALSE, 2);
-       
+
        if(roundcnt >= maxrounds)
                monster.spawnflags |= MONSTERFLAG_MINIBOSS;
 }
@@ -60,7 +60,7 @@ void invasion_SpawnChosenMonster(float mon)
 void invasion_SpawnMonsters(float supermonster_count)
 {
        float chosen_monster = invasion_PickMonster(supermonster_count);
-       
+
        invasion_SpawnChosenMonster(chosen_monster);
 }
 
@@ -71,19 +71,19 @@ float Invasion_CheckWinner()
        {
                FOR_EACH_MONSTER(head)
                        monster_remove(head);
-               
+
                if(roundcnt >= maxrounds)
                {
                        NextLevel();
                        return 1;
                }
-       
+
                Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
                round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit);
                return 1;
        }
-       
+
        // boss round
        if(roundcnt >= maxrounds)
        {
@@ -96,7 +96,7 @@ float Invasion_CheckWinner()
        else
        {
                float total_alive_monsters = 0, supermonster_count = 0;
-               
+
                FOR_EACH_MONSTER(head) if(head.health > 0)
                {
                        if((get_monsterinfo(head.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
@@ -111,23 +111,23 @@ float Invasion_CheckWinner()
                                invasion_SpawnMonsters(supermonster_count);
                                last_check = time + 2;
                        }
-                       
+
                        return 0;
                }
        }
-       
+
        if(numspawned < 1 || numkilled < maxspawned)
                return 0; // nothing has spawned yet, or there are still alive monsters
-       
+
        if(roundcnt >= maxrounds)
        {
                NextLevel();
                return 1;
        }
-       
+
        entity winner = world;
        float winning_score = 0;
-       
+
        FOR_EACH_PLAYER(head)
        {
                float cs = PlayerScore_Add(head, SP_KILLS, 0);
@@ -137,7 +137,7 @@ float Invasion_CheckWinner()
                        winner = head;
                }
        }
-       
+
        FOR_EACH_MONSTER(head)
                monster_remove(head);
 
@@ -146,7 +146,7 @@ float Invasion_CheckWinner()
                Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_PLAYER_WIN, winner.netname);
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_PLAYER_WIN, winner.netname);
        }
-       
+
        round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit);
 
        return 1;
@@ -166,15 +166,15 @@ void Invasion_RoundStart()
                e.player_blocked = 0;
                ++numplayers;
        }
-               
+
        roundcnt += 1;
-       
+
        invasion_monsterskill = roundcnt + (numplayers * 0.3);
-       
+
        maxcurrent = 0;
        numspawned = 0;
        numkilled = 0;
-               
+
        if(roundcnt > 1)
                maxspawned = rint(autocvar_g_invasion_monster_count * (roundcnt * 0.5));
        else
@@ -187,11 +187,11 @@ MUTATOR_HOOKFUNCTION(invasion_MonsterDies)
        {
                numkilled += 1;
                maxcurrent -= 1;
-       
+
                if(IS_PLAYER(frag_attacker))
                        PlayerScore_Add(frag_attacker, SP_KILLS, +1);
        }
-       
+
        return FALSE;
 }
 
@@ -202,23 +202,23 @@ MUTATOR_HOOKFUNCTION(invasion_MonsterSpawn)
                monster_remove(self);
                return FALSE;
        }
-       
+
        if(roundcnt < maxrounds && self.spawnflags & MONSTERFLAG_MINIBOSS)
                self.spawnflags &= ~MONSTERFLAG_MINIBOSS;
-       
+
        if(!self.monster_respawned)
        {
                numspawned += 1;
                maxcurrent += 1;
        }
-       
+
        self.monster_skill = invasion_monsterskill;
-       
+
        if((get_monsterinfo(self.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
                Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_INVASION_SUPERMONSTER, M_NAME(self.monsterid));
-       
+
        self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
-       
+
        return FALSE;
 }
 
@@ -226,7 +226,7 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerThink)
 {
        monsters_total = maxspawned; // TODO: make sure numspawned never exceeds maxspawned
        monsters_killed = numkilled;
-       
+
        return FALSE;
 }
 
@@ -243,7 +243,7 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerDamage)
                frag_damage = 0;
                frag_force = '0 0 0';
        }
-       
+
        return FALSE;
 }
 
@@ -251,7 +251,7 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerCommand)
 {
        if(MUTATOR_RETURNVALUE) // command was already handled?
                return FALSE;
-       
+
        if(cmd_name == "debuginvasion")
        {
                sprint(self, strcat("maxspawned = ", ftos(maxspawned), "\n"));
@@ -261,10 +261,10 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerCommand)
                sprint(self, strcat("monsters_total = ", ftos(monsters_total), "\n"));
                sprint(self, strcat("monsters_killed = ", ftos(monsters_killed), "\n"));
                sprint(self, strcat("invasion_monsterskill = ", ftos(invasion_monsterskill), "\n"));
-               
+
                return TRUE;
        }
-       
+
        return FALSE;
 }
 
@@ -272,7 +272,7 @@ MUTATOR_HOOKFUNCTION(invasion_SetStartItems)
 {
        start_health = 200;
        start_armorvalue = 200;
-       
+
        return FALSE;
 }
 
@@ -288,14 +288,14 @@ void invasion_Initialize()
        independent_players = 1; // to disable extra useless scores
 
        invasion_ScoreRules();
-       
+
        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);
-       
+
        allowed_to_spawn = TRUE;
-       
+
        roundcnt = 0;
 }
 
@@ -308,13 +308,13 @@ MUTATOR_DEFINITION(gamemode_invasion)
        MUTATOR_HOOK(PlayerDamage_Calculate, invasion_PlayerDamage, CBC_ORDER_ANY);
        MUTATOR_HOOK(SV_ParseClientCommand, invasion_PlayerCommand, CBC_ORDER_ANY);
        MUTATOR_HOOK(SetStartItems, invasion_SetStartItems, CBC_ORDER_ANY);
-       
+
        MUTATOR_ONADD
        {
                if(time > 1) // game loads at time 1
                        error("This is a game type and it cannot be added at runtime.");
                invasion_Initialize();
-               
+
                cvar_settemp("g_monsters", "1");
        }