]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Some more tweaks
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Nov 2011 21:00:41 +0000 (23:00 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Nov 2011 21:00:41 +0000 (23:00 +0200)
data/balanceVT.cfg
data/qcsrc/server/vore.qc

index fc4fce28943532e5deb249d047483c0d02f71b51..16a42206e09da46e5c7f5355fae13df37fc40077 100644 (file)
@@ -216,8 +216,8 @@ set g_balance_vore_regurgitate_delay 0.5 "regurgitation delay"
 set g_balance_vore_regurgitate_predator_punchangle 12 "your view gets tilted by this amount when regurgitating someone"\r
 set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted by this amount when regurgitating an item"\r
 set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r
-set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"\r
-set g_balance_vore_digestion_damage_death 2 "amplify digestion damage by this amount when the prey is dead"\r
+set g_balance_vore_digestion_damage 3 "amount of damage applied to victims during digestion"\r
+set g_balance_vore_digestion_damage_death 3 "amount of damage applied to dead victims during digestion"\r
 set g_balance_vore_digestion_damage_item 1 "amount of damage applied to items during digestion"\r
 set g_balance_vore_digestion_limit -100 "prey can be digested down to this amount of health"\r
 set g_balance_vore_digestion_limit_regurgitate 1 "the predator automatically regurgitates prey that has reached the digestion limit"\r
index ffe88bdce5119968ede00ffc2fdb7bc992326263..b7a71a2a8b513f879d968cdaf471873586290713 100644 (file)
@@ -463,9 +463,10 @@ void Vore_Digest()
                if(cvar("g_healthsize") && cvar("g_balance_vore_digestion_scalediff")) // apply player scale to digestion damage\r
                        damage_offset *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_digestion_scalediff"));\r
 \r
-               damage = cvar("g_balance_vore_digestion_damage") / damage_offset;\r
-               if(cvar("g_balance_vore_digestion_damage_death") && self.deadflag != DEAD_NO) // amplify digestion damage for dead prey\r
-                       damage *= cvar("g_balance_vore_digestion_damage_death");\r
+               if(self.deadflag != DEAD_NO)\r
+                       damage = cvar("g_balance_vore_digestion_damage_death") / damage_offset;\r
+               else\r
+                       damage = cvar("g_balance_vore_digestion_damage") / damage_offset;\r
 \r
                Damage(self, self.predator, self.predator, damage, DEATH_DIGESTION, self.origin, '0 0 0');\r
                if(cvar("g_balance_vore_digestion_vampire") && self.predator.health < cvar("g_balance_vore_digestion_vampire_stable"))\r