From: MirceaKitsune Date: Mon, 19 Mar 2012 16:39:09 +0000 (+0200) Subject: Separate and fix some cvars X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d707dc2acd582bb64eb63a9bc64adc5e3c050e67;p=voretournament%2Fvoretournament.git Separate and fix some cvars --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 620adc93..cfa8e93e 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -206,7 +206,8 @@ set g_balance_vore_load_prey_mass 30 "prey mass, influenced by player size" set g_balance_vore_swallow_range 140 "distance below which you can swallow another player when facing them" set g_balance_vore_swallow_speed_fill_player 2 "how long it takes to swallow a player, 0 is instant" set g_balance_vore_swallow_speed_fill_item 0.01 "how long it takes to swallow a health item, 0 is instant" -set g_balance_vore_swallow_speed_fill_scalediff 0.5 "fill rate depends on predator size compared to prey size by this amount, and player health compared to item health for items" +set g_balance_vore_swallow_speed_fill_scalediff_player 0.5 "fill rate depends on predator size compared to prey size by this amount" +set g_balance_vore_swallow_speed_fill_scalediff_item 0.75 "fill rate depends on predator health compared to item health" set g_balance_vore_swallow_speed_fill_stomachload 1 "fill rate is influenced by the prey's stomach load by this amount" set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress decreases, when the predator is no longer swallowing" set g_balance_vore_swallow_speed_cutspd_prey 1 "prey movement slows down by this amount the closer they are to being swallowed" diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index a382d710..4f24cec2 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -430,7 +430,7 @@ float Item_Swallow(entity item, entity player) // since map items don't have a scale, calculate one based on player size center and the item's health, in order to determine swallowing speed float scalediff; - scalediff = pow((item.health / cvar("g_healthsize_center")) / player.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff")); + scalediff = pow((item.health / cvar("g_healthsize_center")) / player.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff_item")); item.swallow_progress_prey += cvar("g_balance_vore_swallow_speed_fill_item") / scalediff; player.swallow_progress_pred = item.swallow_progress_prey; diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 12c0dbe6..54faf616 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -358,8 +358,8 @@ void Vore_SwallowStep(entity e) { float fill; fill = cvar("g_balance_vore_swallow_speed_fill_player") * frametime; - if(cvar("g_healthsize") && cvar("g_balance_vore_swallow_speed_fill_player_scalediff")) // fill rate depends on predator size compared to prey size - fill *= pow(self.scale / e.scale, cvar("g_balance_vore_swallow_speed_fill_player_scalediff")); + if(cvar("g_healthsize") && cvar("g_balance_vore_swallow_speed_fill_scalediff_player")) // fill rate depends on predator size compared to prey size + fill *= pow(self.scale / e.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff_player")); if(cvar("g_balance_vore_swallow_speed_fill_player_stomachload") && e.stomach_load) // fill rate is influenced by the prey's stomach load fill *= (1 - ((e.stomach_load / e.stomach_maxload) * bound(0, cvar("g_balance_vore_swallow_speed_fill_player_stomachload"), 1)));