X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fbalance.cfg;h=47665a22c75b49ab32f97af80b1f03fe0971cc1b;hp=67afb2f9169be0afb585972e14e7eee3bb88a013;hb=5d22c74b270b02537ccff37e4854dd69a106fb8c;hpb=cc148bf19700d380a18d7f51a706f9bbe959811b

diff --git a/data/balance.cfg b/data/balance.cfg
index 67afb2f9..47665a22 100644
--- a/data/balance.cfg
+++ b/data/balance.cfg
@@ -1,10 +1,6 @@
 // {{{ deprecated armor system
-// the armor system is NOT supported in Vore Tournament by default!
+// armor pickups are NOT supported in Vore Tournament by default!
 // the code however still exists, and these cvars are required for compatibility
-// the armor code is still there and can be used in mods, although it's recommended not to
-set g_balance_armor_start 0
-set g_warmup_start_armor 100 "starting values when being in warmup-stage"
-set g_lms_start_armor 100
 set g_pickup_armorsmall 10
 set g_pickup_armorsmall_max 100
 set g_pickup_armormedium 25
@@ -13,16 +9,6 @@ set g_pickup_armorbig 50
 set g_pickup_armorbig_max 100
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 100
-set g_balance_armor_regen 0
-set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0
-set g_balance_armor_rotlinear 0
-set g_balance_pause_armor_rot 1
-set g_balance_pause_armor_rot_spawn 1
-set g_balance_armor_regenstable 100
-set g_balance_armor_rotstable 100
-set g_balance_armor_limit 999
-set g_balance_armor_blockpercent 0.6
 // }}}
 
 // {{{ weapon replacement
@@ -38,11 +24,14 @@ set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (f
 // {{{ starting gear
 set g_start_weapon_grabber -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_balance_health_start 100
+set g_balance_armor_start 0
 set g_start_ammo_fuel 100
 set g_warmup_start_health 200 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_warmup_start_armor 100 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_fuel 150 "starting values when being in warmup-stage"
 set g_lms_start_health 200
-set g_lms_start_ammo_fuel 0
+set g_lms_start_armor 100
+set g_lms_start_ammo_fuel 150
 // }}}
 
 // {{{ pickup items
@@ -52,9 +41,9 @@ set g_pickup_fuel_max 250
 set g_pickup_healthsmall 10
 set g_pickup_healthsmall_max 200
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 200
+set g_pickup_healthmedium_max 100
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_max 150
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_respawntime_short 15
@@ -73,16 +62,28 @@ set g_pickup_respawntimejitter_ammo 0
 
 // {{{ regen/rot
 set g_balance_health_regen 0
-set g_balance_health_regenlinear 5
+set g_balance_health_regenlinear 3
+set g_balance_armor_regen 0
+set g_balance_armor_regenlinear 20
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
+set g_balance_pause_armor_regen 8
+set g_balance_pause_armor_regen_spawn 4
 set g_balance_health_rot 0
 set g_balance_health_rotlinear 5
+set g_balance_armor_rot 0
+set g_balance_armor_rotlinear 0
 set g_balance_pause_health_rot 3
 set g_balance_pause_health_rot_spawn 1
+set g_balance_pause_armor_rot 3
+set g_balance_pause_armor_rot_spawn 5
 set g_balance_health_regenstable 25
 set g_balance_health_rotstable 150
 set g_balance_health_limit 200
+set g_balance_armor_regenstable 100
+set g_balance_armor_rotstable 100
+set g_balance_armor_limit 100
+set g_balance_armor_blockpercent 0.4
 set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
 set g_balance_fuel_regenlinear 0
 set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
@@ -126,10 +127,10 @@ set g_projectiles_spread_style 0
 // 5: forward + circle with 1-r falloff
 // 6: forward + circle with 1-r^2 falloff
 // 7: forward + circle with (1-r)(2-r) falloff
-set g_balance_falldamage_deadminspeed 150
-set g_balance_falldamage_minspeed 1400
+set g_balance_falldamage_deadminspeed 100
+set g_balance_falldamage_minspeed 600
 set g_balance_falldamage_factor 0.15
-set g_balance_falldamage_maxdamage 25
+set g_balance_falldamage_maxdamage 35
 // }}}
 
 // {{{ powerups
@@ -174,22 +175,30 @@ set g_balance_grabber_primary_grabbered_fuel 4 // fuel per second grabbered
 set g_balance_grabber_secondary_ammo 10
 set g_balance_grabber_secondary_refire 0.5
 set g_balance_grabber_secondary_animtime 0.3 // good shoot anim
-set g_balance_grabber_secondary_damage 35
+set g_balance_grabber_secondary_damage 45
 set g_balance_grabber_secondary_force 175
 set g_balance_grabber_secondary_radius 75
 // }}}
 // {{{ stomach
-set g_balance_vore_swallow_range 50 "distance at which you can swallow another player when facing them"
-set g_balance_vore_swallow_limit 3 "how many players can fit inside a stomach, should not be greater than 3 due to the number of stomach states for player models"
-set g_balance_vore_swallow_delay 0.5 "how many seconds must pass before you can swallow someone again"
+set g_balance_vore_swallow_range 50 "distance below which you can swallow another player when facing them"
+set g_balance_vore_swallow_limit 3 "how many players can fit inside a stomach (should not be greater than 3 due to the number of stomach state models for players)"
+set g_balance_vore_swallow_delay 0.8 "how many seconds must pass before you can swallow again, after swallowing or regurgitating another player"
+set g_balance_vore_swallow_stealprey 0.6 "probability of stealing someone's prey when eating them (when true their prey joins your stomach rather than popping out). 0 = never, 1 = always"
+set g_balance_vore_swallow_dropweapon 0.8 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"
+set g_balance_vore_regurgitate_speedcap 1200 "when a predator is going faster than this, their prey is squeezed out of them"
+set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing"
+set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing"
 set g_balance_vore_regurgitate_delay 0.135 "regurgitation delay"
-set g_balance_vore_regurgitate_velocitylimit 1200 "when a predator is going faster than this, the prey is squeezed out of them"
-set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"
-set g_balance_vore_digestion_vampire 1 "amount of health you gain from each enemy during digestion"
-set g_balance_vore_digestion_vampire_stable 150 "you stop gaining health past this point (best to keep equal or lower than g_balance_health_rotstable)"
+set g_balance_vore_digestion_damage 5 "amount of damage applied to victims during digestion"
+set g_balance_vore_digestion_vampire 1 "amount of health you gain from digestion"
+set g_balance_vore_digestion_vampire_stable 150 "maximum amount of health you can gain from digestion (best kept equal or less than g_balance_health_rotstable)"
+set g_balance_vore_teamheal 1 "when enabled, having a team mate in your stomach will keep healing them by this amount"
+set g_balance_vore_teamheal_stable 150 "maximum amount of health you can gain from a teamheal (best kept equal or less than g_balance_health_rotstable)"
 set g_balance_vore_weight_gravity 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"
 set g_balance_vore_weight_speed 0.15 "you get this slower the more you eat, at 0.5 each meal makes you two times slower"
-set g_balance_vore_kick_damage_min 10 "minimum amount of damage you can do during a stomach kick"
-set g_balance_vore_kick_damage_max 30 "maximum amount of damage you can do during a stomach kick"
-set g_balance_vore_kick_delay 1 "how many seconds must pass before you can perform another stomach kick"
+set g_balance_vore_kick_damage_min 15 "minimum amount of damage you can do with a stomach kick"
+set g_balance_vore_kick_damage_max 30 "maximum amount of damage you can do with a stomach kick"
+set g_balance_vore_kick_delay 0.6 "how many seconds must pass before you can perform another stomach kick"
+set g_balance_vore_kick_force 140 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing"
+set g_balance_vore_kick_escapeprobability 0.125 "probability of getting regurgitated while performing stomach kicks (0 = never, 1 = always)"
 // }}}