From: Samual Date: Thu, 29 Sep 2011 22:44:03 +0000 (-0400) Subject: Updates to g_balance_contents_* cvars, plus new one for setting the delay for how... X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~32 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5044752bc9918d6aecce1a690b45cf3c829b7e12;p=xonotic%2Fxonotic-data.pk3dir.git Updates to g_balance_contents_* cvars, plus new one for setting the delay for how long before you start drowning. --- diff --git a/balance25.cfg b/balance25.cfg index e64025e63..a123eabe1 100644 --- 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 948c04aec..44599ba31 100644 --- 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 d1951cd39..a2e24a336 100644 --- 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 58ccde304..cc177e0b7 100644 --- 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 e6917804d..13e4af6cb 100644 --- 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 de0a07139..db65669ee 100644 --- 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 b71245b20..8c38c3bc9 100644 --- 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)