Merge pull request #1263 from newbytf/dev-cur

Dev cur
FortressOne · Dec 24, 2023 · 0b5022a · 0b5022a
2 parents 3b5291e + 60693b2
commit 0b5022a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/share/defs.h b/share/defs.h
@@ -1125,7 +1125,6 @@ enumflags {
 #define PC_ENGINEER_GRENADE_MAX_1	4
 #define PC_ENGINEER_GRENADE_MAX_2	4
 #define PC_ENGINEER_TF_ITEMS		0
-#define PC_ENGINEER_GRENADE_TYPE_2_RANGE	240
 #define PC_ENGINEER_RAILSPEED		1500
 
 // Class Details for CIVILIAN

diff --git a/ssqc/client.qc b/ssqc/client.qc
@@ -237,7 +237,8 @@ float ActivateNewBalance() {
     Role_None.gren2_limits[4] = 1;  // 1 mirv for demoman
     Role_None.gren2_limits[6] = 0;  // 0 mirv for heavy
 
-    PC_PYRO_AIRBLAST_COOLDOWN = 20;
+    PC_PYRO_AIRBLAST_COOLDOWN = 15;
+    PC_ENGINEER_GRENADE_TYPE_2_RANGE = 200;
 }
 
 void () DecodeLevelParms = {

diff --git a/ssqc/pyro.qc b/ssqc/pyro.qc
@@ -169,8 +169,11 @@ void () NapalmGrenadeExplode2 = {
             if (head.takedamage) {
                 deathmsg = DMSG_FLAME;
 
-                TF_T_Damage(head, self, self.owner, explodeDam, TF_TD_NOTTEAM,
-                            TF_TD_FIRE);
+                float aflags = TF_TD_FIRE;
+                if (ServerIsNewBalance())
+                    aflags |= TF_TD_NOMOMENTUM;
+
+                TF_T_Damage(head, self, self.owner, explodeDam, TF_TD_NOTTEAM, aflags);
                 other = head;
                 Napalm_touch();
                 if (other.classname == "player") {

diff --git a/ssqc/qw.qc b/ssqc/qw.qc
@@ -803,3 +803,4 @@ float fo_login_required;
 
 float new_balance;
 var float PC_PYRO_AIRBLAST_COOLDOWN = 5;
+var float PC_ENGINEER_GRENADE_TYPE_2_RANGE = 240;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -803,3 +803,4 @@ float fo_login_required;

		float new_balance;
		var float PC_PYRO_AIRBLAST_COOLDOWN = 5;
		var float PC_ENGINEER_GRENADE_TYPE_2_RANGE = 240;