Merge pull request #1280 from newbytf/dev-cur

Dev cur
FortressOne · Jan 18, 2024 · 54f49cd · 54f49cd
2 parents 7466e12 + 0b04574
commit 54f49cd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/csqc/hud.qc b/csqc/hud.qc
@@ -1058,6 +1058,9 @@ void Hud_DrawIdentifyPanel(string identify) {
         // click event
     }
 
+    if (time > last_id_time + 3)
+        return;
+
     vector fontSize = FO_Hud_Icon_Font_Size * panel->Scale;
 
     float count = tokenizebyseparator(identify, "\n");

diff --git a/ssqc/client.qc b/ssqc/client.qc
@@ -256,7 +256,7 @@ void ActivateNewBalance() {
     SetAllRoles(9, 1, 4);  // 4 gren1 for engineer
     SetAllRoles(3, 1, 4);  // 4 gren1 for soldier
 
-    PC_PYRO_AIRBLAST_COOLDOWN = 15;
+    PC_PYRO_AIRBLAST_COOLDOWN = 10;
     PC_ENGINEER_GRENADE_TYPE_2_RANGE = 200;
 
     float use_new_conc = CF_GetSetting("nbc", "new_balance_concs", "1");
@@ -1089,8 +1089,10 @@ void () DecodeLevelParms = {
     // Overrides other settings.
     new_balance = CF_GetSetting("new_balance", "new_balance", "4");
 
+    float new_balance_region = (ServerRegion() == kRegionUS ||
+                                ServerRegion() == kRegionOCE);
     if (new_balance == 4)
-        new_balance = ((ServerRegion() == kRegionUS) && ServerIsStaging()) ? 1 : 0;
+        new_balance = (new_balance_region && ServerIsStaging()) ? 1 : 0;
 
     // mirror current state into desired state bit
     new_balance |= (new_balance << 1);

diff --git a/ssqc/qw.qc b/ssqc/qw.qc
@@ -117,7 +117,6 @@ float remote_client_time();
 
 // Identify variables
 .string ident_string;           // Status bar string for identify
-.string last_ident_string;      // Last Status bar string for identify
 .float ident_time;              // The time when last identify found a player
 .float autoid_type;             // 0 = ignore noone, 1 = ignore teammates, 2 = ignore enemies
 .float autoid_time;             // Time when autoid settings were last checked

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

diff --git a/ssqc/status.qc b/ssqc/status.qc
@@ -800,10 +800,6 @@ void UpdateClientGrenadeThrown(entity pl) = {
 void UpdateClientIDString(entity pl) {
     string ident = time < pl.ident_time ? pl.ident_string : "";
 
-    if (ident == pl.last_ident_string)  // only send updates
-        return;
-    pl.last_ident_string = ident;
-
     if (ident == "")  // No need to send null, we'll expire clientside.
         return;