Merge pull request #1321 from haze-au/staging

Fix new_balance med and capture flag
FortressOne · Apr 18, 2024 · c4594aa · c4594aa
2 parents e29f388 + bc0a516
commit c4594aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/ssqc/client.qc b/ssqc/client.qc
@@ -259,8 +259,8 @@ void ActivateOrgGame() {
     PC_PYRO_AIRBLAST_COOLDOWN = 10;
     PC_ENGINEER_GRENADE_TYPE_2_RANGE = 200;
 
-    float use_new_cap = CF_GetSetting("nbcc", "new_balance_conc_cap", "4");
-    if (use_new_cap == 4 && ServerRegion() == kRegionOCE)
+    float use_new_cap = CF_GetSetting("nbcc", "new_balance_conc_cap", "0");
+    if (use_new_cap == 4)
         use_new_cap = 1;
     else
         use_new_cap = 0;

diff --git a/ssqc/scout.qc b/ssqc/scout.qc
@@ -830,8 +830,8 @@ void (entity inflictor, entity attacker, float bounce,
     local entity te;
     local vector org;
 
-    if (NewBalanceActive() && inflictor.owner.playerclass == PC_MEDIC)
-        actual_cuss_time = 2;
+    //if (NewBalanceActive() && inflictor.owner.playerclass == PC_MEDIC)
+    //    actual_cuss_time = 2;
 
     head = findradius(inflictor.origin, bounce + 40);
     while (head) {

diff --git a/ssqc/teamplay.qc b/ssqc/teamplay.qc
@@ -39,6 +39,7 @@ static void ApplyRadius(vector org, float rad,
 
 void RemovePrimedGrenades(entity player);
 
+/* Disabled new-balance remove chaser ammo mechanic
 static void EffStrip(entity player) {
   player.ammo_cells = 0;
   player.ammo_rockets = 0;
@@ -54,7 +55,7 @@ static void EffStrip(entity player) {
   stuffcmd(player, "bf\n");
   sprint(player, PRINT_HIGH, msg, "\n");
   centerprint(player, msg);
-}
+}*/
 
 float IsEngEnt(entity ent);
 void RemoveEngEnt(entity bld, float explode);
@@ -97,7 +98,7 @@ void TeamPlay_Cap(vector origin, entity player) {
   if (!org_game || !new_balance)
     return;
 
-  ApplyRadius(origin, 1500,
-      FilTeamNEQ[player.team_no - 1], EffStrip,
-      FilOwnerTeamNEQ[player.team_no - 1], EffRemove);
+  //ApplyRadius(origin, 1500,
+  //    FilTeamNEQ[player.team_no - 1], EffStrip,
+  //    FilOwnerTeamNEQ[player.team_no - 1], EffRemove);
 }