From: MirceaKitsune Date: Mon, 19 Mar 2012 12:26:03 +0000 (+0200) Subject: Make jump pads account the scale gravity of players, so macros can reach their destin... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9dfe7b783df7656658d6d28ffe620c47770ce2c;p=voretournament%2Fvoretournament.git Make jump pads account the scale gravity of players, so macros can reach their destination and micros aren't sent flying too far. Stomach load will still make jump pads throw you at a lesser distance however (as this is intentional) --- diff --git a/data/qcsrc/server/t_jumppads.qc b/data/qcsrc/server/t_jumppads.qc index 906e63de..b875c211 100644 --- a/data/qcsrc/server/t_jumppads.qc +++ b/data/qcsrc/server/t_jumppads.qc @@ -121,8 +121,12 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) } vs = sdist / trigger_push_calculatevelocity_flighttime; + // apply size-based weight to jump pads + float scalefac; + scalefac = (cvar("g_healthsize") && other.classname == "player") ? pow(other.scale, cvar("g_healthsize_weight") * 0.5) : 1; + // finally calculate the velocity - return sdir * vs + '0 0 1' * vz; + return sdir * vs + '0 0 1' * vz * scalefac; } void trigger_push_touch() diff --git a/docs/Release notes.txt b/docs/Release notes.txt index 26cdc9c6..bc3457e7 100644 --- a/docs/Release notes.txt +++ b/docs/Release notes.txt @@ -344,4 +344,6 @@ Bug fixes: Features: +- ? + Known bugs: diff --git a/docs/TODO.txt b/docs/TODO.txt index dd4d822c..8632a533 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -104,6 +104,8 @@ - +0.8: Some sort of bullet time feature in single player, by setting the slowmo cvar +- 0.8: Does the wind trigger brush need to account scale based gravity? + - 0.8: Make some g_healthsize cvars g_balance_healthsize, and move them to balanceVT.cfg - 0.8: Make player fatness depend on frags, using a trick I heard about with shaders