Add manual team control, still needs some work

Author: ruler501

source/src/bot/ac_bot_ai.cpp

@@ -68,6 +68,8 @@ bool CACBot::ChoosePreferredWeapon()
                 if(WeaponInfoTable[m_pMyEnt->primary].eWeaponType == TYPE_SNIPER) sWeaponScore += 10; // At a close range, knife & pistol are strong with a sniper like primary weapon
                 if(WeaponInfoTable[m_pMyEnt->primary].eWeaponType == TYPE_SHOTGUN) sWeaponScore -= 2; // Penalize a bit knife and pistol on close range with shotgun
             }
+
+            if(flDist < 50 && WeaponInfoTable[i].eWeaponType == TYPE_SNIPER) sWeaponScore -= 5;
         }
         else if (((flDist < WeaponInfoTable[i].flMinFireDistance) ||
                 (flDist > WeaponInfoTable[i].flMaxFireDistance)) && i != GUN_GRENADE && i != GUN_RPG)

source/src/server.cpp

@@ -1886,7 +1886,7 @@ void serverdied(client &target, client &actor_, int damage, int gun, int style,
     ts.lastspawn = -1;
     // don't issue respawn yet until DEATHMILLIS has elapsed
     // ts.respawn();
-    
+
     // log message
     const int logtype = actor->type == ST_AI && target.type == ST_AI ? ACLOG_VERBOSE : ACLOG_INFO;
     if (suic)
@@ -2065,6 +2065,8 @@ inline bool canspawn(client &c, bool connecting)
     return true;
 }
 
+VARP(clabalance, 0, 0, 16);
+VARP(rvsfbalance, 0, 0, 16);
 int chooseteam(client &cl, int def = rnd(2))
 {
     // zombies override
@@ -2075,7 +2077,20 @@ int chooseteam(client &cl, int def = rnd(2))
         return team_base(cl.team);
     // team sizes
     int *teamsizes = numteamclients(cl.clientnum, cl.type == ST_AI);
-    if(autoteam && teamsizes[TEAM_CLA] != teamsizes[TEAM_RVSF]) return teamsizes[TEAM_CLA] < teamsizes[TEAM_RVSF] ? TEAM_CLA : TEAM_RVSF;
+    if(clabalance || rvsfbalance){
+        int sendTo = teamsizes[TEAM_CLA] < teamsizes[TEAM_RVSF] ? TEAM_CLA : TEAM_RVSF;
+        if(teamsizes[TEAM_CLA] < teamsizes[TEAM_RVSF]){
+            if(teamsizes[TEAM_CLA] < clabalance) return TEAM_CLA;
+            else if(teamsizes[TEAM_RVSF] < rvsfbalance) return TEAM_RVSF;
+            else return TEAM_CLA_SPECT;
+        }
+        else{
+            if(teamsizes[TEAM_RVSF] < rvsfbalance) return TEAM_RVSF;
+            else if(teamsizes[TEAM_CLA] < clabalance) return TEAM_CLA;
+            else return TEAM_CLA_SPECT;
+        }
+    }
+    else if(autoteam && teamsizes[TEAM_CLA] != teamsizes[TEAM_RVSF]) return teamsizes[TEAM_CLA] < teamsizes[TEAM_RVSF] ? TEAM_CLA : TEAM_RVSF;
     else
     { // join weaker team
         int teamscore[2] = {0, 0}, sum = calcscores();
@@ -4192,7 +4207,7 @@ void process(ENetPacket *packet, int sender, int chan)
             {
                 unsigned char hash[20];
                 loopi(20) hash[i] = p.get();
-                logline(ACLOG_INFO, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", 
+                logline(ACLOG_INFO, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
                     hash[0], hash[1], hash[2], hash[3],
                     hash[4], hash[5], hash[6], hash[7],
                     hash[8], hash[9], hash[10], hash[11],

source/src/serverai.h

@@ -66,7 +66,8 @@ void deleteai(client &c)
     if(c.type != ST_AI || c.ownernum < 0)
         return;
     const int cn = c.clientnum;
-    c.ownernum = -1;
+    c.ownernum = -1;VARP(clabalance, 0, 0, 16);
+VARP(rvsfbalance, 0, 0, 16);
     clientdisconnect(c);
     sendf(NULL, 1, "ri2", SV_DELAI, cn);
 }
@@ -116,6 +117,9 @@ bool reassignai(int exclude = -1)
     return false;
 }
 
+
+extern int clabalance;
+extern int rsvfbalance;
 void checkai()
 {
     // check if bots are disallowed
@@ -143,22 +147,29 @@ void checkai()
     {
         int balance = 0;
         const int humans = numplayers(false);
-        if(humans) switch(botbalance)
-        {
-            case  0: // force no bots, except for zombies
-                if(!m_zombie(gamemode))
-                {
-                    balance = 0;
-                    break;
-                }
-                // fallthrough for zombies
-            case -1: // auto
-                if(m_zombie(gamemode)) balance = min(zombiebalance + humans, 30); // effectively zombiebalance, but capped at 30
-                else if(m_duke(gamemode, mutators)) balance = max(humans, maplayout_factor - 3); // 3 - 5 - 8 (6 - 8 - 11 layout factor)
-                else if(m_team(gamemode, mutators)) balance = clamp((smapstats.spawns[0] + smapstats.spawns[1]) / 3, max(6, humans), 14);
-                else balance = clamp(smapstats.spawns[2] / 3, max(4, humans), 10);
-                break; // auto
-            default: balance = max(humans, botbalance); break; // force bot count
+        if(humans){
+            if(!rvsfbalance && !clabalance) switch(botbalance)
+            {
+                case  0: // force no bots, except for zombies
+                    if(!m_zombie(gamemode))
+                    {
+                        balance = 0;
+                        break;
+                    }
+                    // fallthrough for zombies
+                case -1: // auto
+                    if(m_zombie(gamemode)) balance = min(zombiebalance + humans, 30); // effectively zombiebalance, but capped at 30
+                    else if(m_duke(gamemode, mutators)) balance = max(humans, maplayout_factor - 3); // 3 - 5 - 8 (6 - 8 - 11 layout factor)
+                    else if(m_team(gamemode, mutators)) balance = clamp((smapstats.spawns[0] + smapstats.spawns[1]) / 3, max(6, humans), 14);
+                    else balance = clamp(smapstats.spawns[2] / 3, max(4, humans), 10);
+                    break; // auto
+                default: balance = max(humans, botbalance); break; // force bot count
+            }
+            else
+                balance = rvsfbalance + clabalance;
+        }
+        else{
+            balance = -1;
         }
         if(balance > 0)
         {