Get the swallow model working as intended. Adjustments still needed however

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index ddfb7828af199cd54e194b1597c500d9ed50b560..cb0c139d6bcdce881e42d969bca88ccb4fd6dd76 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1597,6 +1597,7 @@ set g_vore_regurgitatecolor_digest "0.3 0.15 0" "the color players will have whe
 set g_vore_keepdeadprey 0.75 "If enabled, prey remains in the stomach after dying, else the predator throws up their dead body. 0 = disabled, 1 = ernabled, anything between = probability"\r
 set g_vore_neighborprey_distance 16 "Distance by which prey inside the same stomach are positioned away from each other. 0 disables seeing neighboring prey"\r
 set g_vore_neighborprey_scale 1 "When neighborprey is enabled, all prey is resized by this amount"\r
+set g_vore_swallowmodel_range 200 "Distance by which the swallow model oscillates based on swallow progress"\r
 \r
 set g_healthsize 100 "Players who are low on health shrink and become smaller, value specifies health at which the player has default size"\r
 set g_healthsize_movementfactor 0.5 "Amount by which player size affects jumping and running"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 53202c6e6d9570c834a3d00c45b0e7eba5117636..c9897f622ae68a40dd1c55c7326560bd90e5aeca 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -205,7 +205,7 @@ void Vore_SwallowModel_Think()
        //self.angles_x = self.owner.angles_x;\r
        //self.view_ofs = self.owner.view_ofs;\r
 \r
-       self.view_ofs = '1 0 0' * 500;\r
+       self.view_ofs = '-1 0 0' * (0.5 - self.owner.swallow_progress_prey) * cvar("g_vore_swallowmodel_range"); // the model is centered at 0.5 progress\r
 \r
        // if our swallow progress is gone, the swallow model must also go\r
        if(!self.owner.swallow_progress_prey)\r
@@ -231,7 +231,7 @@ void Vore_SwallowModel_Update(entity prey)
                prey.swallow_model.solid = SOLID_NOT;\r
 \r
                prey.swallow_model.skin = self.skin;\r
-               prey.swallow_model.scale = self.scale;\r
+               //prey.swallow_model.scale = self.scale; // FIX LATER\r
 \r
                // apply the properties of the prey\r
                prey.swallow_model.viewmodelforclient = prey;\r