]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Punchangle effect when voring. Your view will get tilted back when swallowing someone...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 9 Sep 2010 18:15:25 +0000 (21:15 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 9 Sep 2010 18:15:25 +0000 (21:15 +0300)
data/defaultVoretournament.cfg
data/qcsrc/server/cl_physics.qc
data/qcsrc/server/defs.qh
data/qcsrc/server/miscfunctions.qc
data/qcsrc/server/vore.qc

index a1b08f936cef378fd9cfbed14428914dc32daefb..c4cfaac82d27563406aeac6cb9df08a2b26ec92c 100644 (file)
@@ -1497,6 +1497,7 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co
 \r
 set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between 0 and 1 = alpha"\r
 set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when getting swallowed, 0 disables"\r
+set cl_vore_punchangle 10 "your view gets tilted by this amount when swallowing or regurgitating someone"\r
 set g_vore_regurgitatecolor_release "0.875 1 0.375" "the color players will have when regurgitated alive"\r
 set g_vore_regurgitatecolor_digest "0.125 0.25 0" "the color players will have when digested"\r
 set g_vore_gurglesound 1 "predators make an ambient gurgling sound"\r
index 81c2afc1c680bfa85bd998455b72c0d8fc9b5257..8f9812f44aa1b4045c900b7dbcb8854c8a9644e0 100644 (file)
@@ -645,7 +645,7 @@ void SV_PlayerPhysics()
 \r
        if (self.punchangle != '0 0 0')\r
        {\r
-               f = vlen(self.punchangle) - 10 * frametime;\r
+               f = vlen(self.punchangle) - 15 * frametime;\r
                if (f > 0)\r
                        self.punchangle = normalize(self.punchangle) * f;\r
                else\r
index 6d316524576a53b26efb63a604ee59e8539f0e68..efe6696391a26f4e7378f9d89283f0e35e0af0ff 100644 (file)
@@ -333,6 +333,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_noantilag;\r
 .float cvar_cl_vore_stomachmodel;\r
 .float cvar_cl_vore_cameraspeed;\r
+.float cvar_cl_vore_punchangle;\r
 .float cvar_chase_active;\r
 \r
 void Announce(string snd);\r
index 93e162b1d5e2bf23361756b2741ae3dc59777d7c..a66b274b4a43feeae35ab9b5095aca209e833aa0 100644 (file)
@@ -617,6 +617,7 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_cameraspeed, "cl_vore_cameraspeed");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_punchangle, "cl_vore_punchangle");\r
 \r
        self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);\r
        self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive);\r
index 2791d0462d53ffc372b25ea9ee70b26f5b8d0be1..151cad9d67b5a06c5ec4e087c41a2fc464847e34 100644 (file)
@@ -162,6 +162,7 @@ void Vore_Swallow(entity e)
 \r
        PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
+       e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle;\r
        e.predator.stomach_load += 1;\r
        e.predator.regurgitate_prepare = 0;\r
        Vore_Weight_apply(e.predator);\r
@@ -200,6 +201,7 @@ void Vore_Regurgitate(entity e)
        PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);\r
+       e.predator.punchangle_x += e.predator.cvar_cl_vore_punchangle;\r
        e.predator.stomach_load -= 1;\r
        e.predator.regurgitate_prepare = 0;\r
        e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r