Player size now influences a player's weight as well, alongside stomach load. Macros...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 83d5f7bb50d9f0af2912132f5dba9da62b032d49..68d2bdb63f3aecde518ac479aa9c87bf041c6839 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1677,6 +1677,7 @@ set g_healthsize_min 50 "Player size may not drop below this amount of health"
 set g_healthsize_max 150 "Player size may not grow past this amount of health"\r
 set g_healthsize_death 0.25 "Dead players are further shrunken by this amount"\r
 set g_healthsize_death_min -100 "Health at which dead players stop being shrunken"\r
+set g_healthsize_weight 0.75 "Size affects player gravity by this amount"\r
 set g_healthsize_movementfactor 0.5 "Amount by which player size affects jumping and running"\r
 set g_healthsize_viewfactor 2 "The view is offset by this amount based on player size"\r
 set g_healthsize_soundfactor 0.5 "The sounds players make are amplified or reduced by this amount based on their size"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index fa8f453e90f866adf89fd7d19d766e42aa32f5af..e64eaab61b59fcf4e7fcaeb06e0145c73092f9bc 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -209,7 +209,7 @@ void Vore_StomachLoad_Apply()
        self.stomach_load = final_load;\r
 \r
        // apply weight\r
-       self.gravity = 1 + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_weight");\r
+       self.gravity = 1 * (cvar("g_healthsize") ? pow(self.scale, cvar("g_healthsize_weight")) : 1) + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_weight");\r
        if(!self.gravity && self.stomach_load)\r
                self.gravity = 0.00001; // 0 becomes 1 for gravity, so do this to allow 0 gravity\r
 }\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index bb800c0cf371edf0c27945d4abf6b66e17baeb0d..dd4d822c628b483ab8764c631d1ce8aab10a51cf 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -104,7 +104,7 @@
 \r
 - +0.8: Some sort of bullet time feature in single player, by setting the slowmo cvar\r
 \r
-- 0.8: Make weight depend on player size as well, not only stomach load\r
+- 0.8: Make some g_healthsize cvars g_balance_healthsize, and move them to balanceVT.cfg\r
 \r
 - 0.8: Make player fatness depend on frags, using a trick I heard about with shaders\r
 \r