Tweaks to how the predator's angles are applied to prey positions

[voretournament/voretournament.git] / data / qcsrc / server / vore.qc

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 154817c831ed28b961979050e5ef1ca255b62aec..77e1d4cdbbd3114333d388e28c9984c0c27c4c44 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -98,17 +98,74 @@ float Vore_CanLeave()
 // position the camera properly for prey\r
 void Vore_SetCamera()\r
 {\r
-       if not(self.stat_eaten)\r
-               return;\r
+       local entity head;\r
+       local vector oldforward, oldright, oldup;\r
+       local float position_counter;\r
+       local vector origin_apply;\r
+       oldforward = v_forward;\r
+       oldright = v_right;\r
+       oldup = v_up;\r
+\r
+       makevectors(self.v_angle);\r
 \r
-       self.view_ofs = PL_PREY_VIEW_OFS;\r
+       // In order to allow prey to see each other in the stomach, we must position each occupant differently,\r
+       // else all players would overlap in the center. To do this, we run a loop on all players in the same stomach.\r
+       // For each player, the origin is updated, then a new origin is used for the next player.\r
+       // This requires that no more than 9 players can be in a stomach at a time!\r
+       FOR_EACH_PLAYER(head)\r
+       {\r
+               if(head.predator == self)\r
+               {\r
+                       switch(position_counter)\r
+                       {\r
+                               case 0:\r
+                                       origin_apply = '0 0 0'; // first occupant sits in the middle\r
+                                       break;\r
+                               case 1:\r
+                                       origin_apply = '1 0 0'; // second occupant sits in the front\r
+                                       break;\r
+                               case 2:\r
+                                       origin_apply = '-1 0 0'; // third occupant sits in the back\r
+                                       break;\r
+                               case 3:\r
+                                       origin_apply = '0 1 0'; // fourth occupant sits in the right\r
+                                       break;\r
+                               case 4:\r
+                                       origin_apply = '0 -1 0'; // fifth occupant sits in the left\r
+                                       break;\r
+                               case 5:\r
+                                       origin_apply = '1 1 0'; // sixth occupant sits in the front-right\r
+                                       break;\r
+                               case 6:\r
+                                       origin_apply = '-1 1 0'; // seventh occupant sits in the back-right\r
+                                       break;\r
+                               case 7:\r
+                                       origin_apply = '1 -1 0'; // eigth occupant sits in the front-left\r
+                                       break;\r
+                               case 8:\r
+                                       origin_apply = '-1 -1 0'; // ninth occupant sits in the back-left\r
+                                       break;\r
+                               default:\r
+                                       break;\r
+                       }\r
+                       // since prey have their predators set as an aiment, view_ofs will specify the real origin of prey, not just the view offset\r
+                       origin_apply_x *= v_forward_x; // position depends on the predator's rotation\r
+                       origin_apply_y *= v_forward_y; // position depends on the predator's rotation\r
+                       head.view_ofs = PL_PREY_VIEW_OFS + origin_apply * cvar("g_vore_neighborprey_distance");\r
+                       position_counter += 1;\r
+               }\r
+       }\r
 \r
-       float prey_height;\r
+       v_forward = oldforward;\r
+       v_right = oldright;\r
+       v_up = oldup;\r
+\r
+       /*float prey_height;\r
        if(self.fakeprey)\r
                prey_height = (self.scale - self.fakepredator.scale) * cvar("g_healthsize_vore_pos");\r
        else\r
                prey_height = (self.scale - self.predator.scale) * cvar("g_healthsize_vore_pos");\r
-       self.view_ofs_z += prey_height;\r
+       self.view_ofs_z += prey_height;*/\r
 }\r
 \r
 .float gurgle_oldstomachload;\r
@@ -434,15 +491,30 @@ void Vore_AutoTaunt()
 \r
 void Vore_SetSbarRings()\r
 {\r
-       if(time <= self.action_delay)\r
+       // first clear the ring stats, then configure them if needed\r
+       self.stat_sbring1_type = self.stat_sbring1_clip = 0;\r
+       self.stat_sbring2_type = self.stat_sbring2_clip = 0;\r
+\r
+       if(self.stat_eaten)\r
        {\r
-               self.stat_sbring1_type = 1; // ring shows vore action delay\r
-               self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
+               if(time <= self.stomachkick_delay)\r
+               {\r
+                       self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress\r
+                       self.stat_sbring1_clip = bound(0, (time / self.stomachkick_delay - 1) / ((self.stomachkick_delay - cvar("g_balance_vore_kick_delay")) / self.stomachkick_delay - 1), 1);\r
+               }\r
        }\r
        else\r
        {\r
-               self.stat_sbring1_type = 0;\r
-               self.stat_sbring1_clip = 0;\r
+               if(time <= self.action_delay)\r
+               {\r
+                       self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress\r
+                       self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);\r
+               }\r
+               if(time <= self.regurgitate_prepare)\r
+               {\r
+                       self.stat_sbring2_type = 1; // ring shows regurgitation preparing, fills with progress\r
+                       self.stat_sbring2_clip = 1 - bound(0, (time / self.regurgitate_prepare - 1) / ((self.regurgitate_prepare - cvar("g_balance_vore_regurgitate_delay")) / self.regurgitate_prepare - 1), 1);\r
+               }\r
        }\r
 }\r
 \r