From: MirceaKitsune Date: Sun, 10 Jul 2011 19:24:40 +0000 (+0300) Subject: Get the swallow model working as intended. Adjustments still needed however X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=8ff8d01538fcc92673fd48cca4be32e5c2e46bca;hp=ad0585bcdc78b240c27c18614ac2492d26bc47aa Get the swallow model working as intended. Adjustments still needed however --- diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index ddfb7828..cb0c139d 100644 --- 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" 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" set g_vore_neighborprey_scale 1 "When neighborprey is enabled, all prey is resized by this amount" +set g_vore_swallowmodel_range 200 "Distance by which the swallow model oscillates based on swallow progress" set g_healthsize 100 "Players who are low on health shrink and become smaller, value specifies health at which the player has default size" set g_healthsize_movementfactor 0.5 "Amount by which player size affects jumping and running" diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 53202c6e..c9897f62 100644 --- 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; //self.view_ofs = self.owner.view_ofs; - self.view_ofs = '1 0 0' * 500; + 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 // if our swallow progress is gone, the swallow model must also go if(!self.owner.swallow_progress_prey) @@ -231,7 +231,7 @@ void Vore_SwallowModel_Update(entity prey) prey.swallow_model.solid = SOLID_NOT; prey.swallow_model.skin = self.skin; - prey.swallow_model.scale = self.scale; + //prey.swallow_model.scale = self.scale; // FIX LATER // apply the properties of the prey prey.swallow_model.viewmodelforclient = prey;