Updates to g_balance_contents_* cvars, plus new one for setting the delay for how...

diff --git a/balance25.cfg b/balance25.cfg
index e64025e635435f0f51d1d7c972a39dcd5ad10bbd..a123eabe19cf0ff06b7f9ebcdf4db0eec4c706c9 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -179,11 +179,12 @@ set g_balance_falldamage_minspeed 1400
 set g_balance_falldamage_factor 0.15
 set g_balance_falldamage_maxdamage 25
 set g_balance_damagepush_speedfactor 0
-set g_balance_contents_damagerate 5 
-set g_balance_contents_playerdamage_drowning 5
-set g_balance_contents_playerdamage_lava 10
-set g_balance_contents_playerdamage_slime 5
-set g_balance_contents_projectiledamage 15
+set g_balance_contents_damagerate 5 // how many times to apply damage per second (so 5 is 0.2 second delay per impulse of damage)
+set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
+set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
+set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
+set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
+set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
 // }}}
 
 // {{{ powerups

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 948c04aecafb519fde660ef69b35244a1c580b12..44599ba310663a6f27cc3762b8ea56712ba2b93e 100644 (file)
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -179,11 +179,12 @@ set g_balance_falldamage_minspeed 800
 set g_balance_falldamage_factor 0.20
 set g_balance_falldamage_maxdamage 15
 set g_balance_damagepush_speedfactor 2.5
-set g_balance_contents_damagerate 5 
-set g_balance_contents_playerdamage_drowning 5
-set g_balance_contents_playerdamage_lava 10
-set g_balance_contents_playerdamage_slime 5
-set g_balance_contents_projectiledamage 15
+set g_balance_contents_damagerate 5 // how many times to apply damage per second (so 5 is 0.2 second delay per impulse of damage)
+set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
+set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
+set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
+set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
+set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
 // }}}
 
 // {{{ powerups

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index d1951cd39ac9aee812a8d3d0d53d802065296545..a2e24a33637551b0a069fb503f074420308333fc 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -179,11 +179,12 @@ set g_balance_falldamage_minspeed 1400
 set g_balance_falldamage_factor 0.15
 set g_balance_falldamage_maxdamage 25
 set g_balance_damagepush_speedfactor 0
-set g_balance_contents_damagerate 5 
-set g_balance_contents_playerdamage_drowning 5
-set g_balance_contents_playerdamage_lava 10
-set g_balance_contents_playerdamage_slime 5
-set g_balance_contents_projectiledamage 15
+set g_balance_contents_damagerate 5 // how many times to apply damage per second (so 5 is 0.2 second delay per impulse of damage)
+set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
+set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
+set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
+set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
+set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
 // }}}
 
 // {{{ powerups

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 58ccde304d9f5bf72c713888ded434907358ce73..cc177e0b7be7cd0b4cda903e4ad53a412c19fcab 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -179,11 +179,12 @@ set g_balance_falldamage_minspeed 900
 set g_balance_falldamage_factor 0.20
 set g_balance_falldamage_maxdamage 40
 set g_balance_damagepush_speedfactor 2.5
-set g_balance_contents_damagerate 5
-set g_balance_contents_playerdamage_drowning 20
-set g_balance_contents_playerdamage_lava 50
-set g_balance_contents_playerdamage_slime 30
-set g_balance_contents_projectiledamage 100
+set g_balance_contents_damagerate 5 // how many times to apply damage per second (so 5 is 0.2 second delay per impulse of damage)
+set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
+set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
+set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
+set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
+set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
 // }}}
 
 // {{{ powerups

diff --git a/balancetZork.cfg b/balancetZork.cfg
index e6917804d031a909877d8ad410f33cf7b3a928ce..13e4af6cbd7d4adbb9f85933b4d51f170cbeb0d7 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -179,11 +179,12 @@ set g_balance_falldamage_minspeed 800
 set g_balance_falldamage_factor 0.02 // maxspeed = minspeed + maxdamage / factor = 4550
 set g_balance_falldamage_maxdamage 75
 set g_balance_damagepush_speedfactor 0
-set g_balance_contents_damagerate 5 
-set g_balance_contents_playerdamage_drowning 5
-set g_balance_contents_playerdamage_lava 10
-set g_balance_contents_playerdamage_slime 5
-set g_balance_contents_projectiledamage 15
+set g_balance_contents_damagerate 5 // how many times to apply damage per second (so 5 is 0.2 second delay per impulse of damage)
+set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
+set g_balance_contents_playerdamage_drowning 20 // damage per second for while player is drowning
+set g_balance_contents_playerdamage_lava 50 // damage per second for while player is inside lava
+set g_balance_contents_playerdamage_slime 30 // damage per second for while player is inside slime
+set g_balance_contents_projectiledamage 10000 // instantly kill projectiles upon touching lava/slime
 // }}}
 
 // {{{ powerups

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index de0a0713969f0bba9ad608e4db94d4d2e6b4c13b..db65669ee038a57fbcf7684485dcaca37dc81af9 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -121,6 +121,7 @@ float autocvar_g_balance_rifle_reload_ammo;
 float autocvar_g_balance_rifle_reload_time;
 float autocvar_g_balance_cloaked_alpha;
 float autocvar_g_balance_contents_damagerate;
+float autocvar_g_balance_contents_drowndelay;
 float autocvar_g_balance_contents_playerdamage_drowning;
 float autocvar_g_balance_contents_playerdamage_lava;
 float autocvar_g_balance_contents_playerdamage_slime;

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index b71245b202f15dc897d0c41b312d58f3b36550c5..8c38c3bc9675a0eef9f28c01567abddd9c06cc64 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -27,9 +27,9 @@ void CreatureFrame (void)
                        {
                                if (self.waterlevel != WATERLEVEL_SUBMERGED)
                                {
-                                       if(self.air_finished < time + 9)
+                                       if(self.air_finished < time)
                                                PlayerSound(playersound_gasp, CH_PLAYER, VOICETYPE_PLAYERSOUND);
-                                       self.air_finished = time + 12;
+                                       self.air_finished = time + autocvar_g_balance_contents_drowndelay;
                                        self.dmg = 2;
                                }
                                else if (self.air_finished < time)