Switch stomach and swallow models to iqm as well, and export higher polygon versions

diff --git a/data/models/player/vixen_stomach.iqm b/data/models/player/vixen_stomach.iqm
new file mode 100644 (file)
index 0000000..023a812
Binary files /dev/null and b/data/models/player/vixen_stomach.iqm differ

diff --git a/data/models/player/vixen_stomach.iqm_0.skin b/data/models/player/vixen_stomach.iqm_0.skin
new file mode 100644 (file)
index 0000000..6d94f53
--- /dev/null
+++ b/data/models/player/vixen_stomach.iqm_0.skin
@@ -0,0 +1 @@
+vixen_stomach,textures/player/vixen-1_stomach
\ No newline at end of file

diff --git a/data/models/player/vixen_stomach.iqm_1.skin b/data/models/player/vixen_stomach.iqm_1.skin
new file mode 100644 (file)
index 0000000..07919b5
--- /dev/null
+++ b/data/models/player/vixen_stomach.iqm_1.skin
@@ -0,0 +1 @@
+vixen_stomach,textures/player/vixen-2_stomach
\ No newline at end of file

diff --git a/data/models/player/vixen_stomach.md3 b/data/models/player/vixen_stomach.md3
deleted file mode 100644 (file)
index 977272c..0000000
Binary files a/data/models/player/vixen_stomach.md3 and /dev/null differ

diff --git a/data/models/player/vixen_stomach.md3_0.skin b/data/models/player/vixen_stomach.md3_0.skin
deleted file mode 100644 (file)
index 6d94f53..0000000
--- a/data/models/player/vixen_stomach.md3_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen_stomach,textures/player/vixen-1_stomach
\ No newline at end of file

diff --git a/data/models/player/vixen_stomach.md3_1.skin b/data/models/player/vixen_stomach.md3_1.skin
deleted file mode 100644 (file)
index 07919b5..0000000
--- a/data/models/player/vixen_stomach.md3_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen_stomach,textures/player/vixen-2_stomach
\ No newline at end of file

diff --git a/data/models/player/vixen_swallow.iqm b/data/models/player/vixen_swallow.iqm
new file mode 100644 (file)
index 0000000..ead9c32
Binary files /dev/null and b/data/models/player/vixen_swallow.iqm differ

diff --git a/data/models/player/vixen_swallow.iqm_0.skin b/data/models/player/vixen_swallow.iqm_0.skin
new file mode 100644 (file)
index 0000000..057f9bc
--- /dev/null
+++ b/data/models/player/vixen_swallow.iqm_0.skin
@@ -0,0 +1 @@
+vixen_swallow,textures/player/vixen-1_swallow
\ No newline at end of file

diff --git a/data/models/player/vixen_swallow.iqm_1.skin b/data/models/player/vixen_swallow.iqm_1.skin
new file mode 100644 (file)
index 0000000..ce79c83
--- /dev/null
+++ b/data/models/player/vixen_swallow.iqm_1.skin
@@ -0,0 +1 @@
+vixen_swallow,textures/player/vixen-2_swallow
\ No newline at end of file

diff --git a/data/models/player/vixen_swallow.md3 b/data/models/player/vixen_swallow.md3
deleted file mode 100644 (file)
index 7aa2258..0000000
Binary files a/data/models/player/vixen_swallow.md3 and /dev/null differ

diff --git a/data/models/player/vixen_swallow.md3_0.skin b/data/models/player/vixen_swallow.md3_0.skin
deleted file mode 100644 (file)
index 057f9bc..0000000
--- a/data/models/player/vixen_swallow.md3_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen_swallow,textures/player/vixen-1_swallow
\ No newline at end of file

diff --git a/data/models/player/vixen_swallow.md3_1.skin b/data/models/player/vixen_swallow.md3_1.skin
deleted file mode 100644 (file)
index ce79c83..0000000
--- a/data/models/player/vixen_swallow.md3_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen_swallow,textures/player/vixen-2_swallow
\ No newline at end of file

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index 4615381e30e56eaa36543680f3aea83af007e8c2..576fa502d16f49836a7c0b1db5ab3aae2c398633 100644 (file)
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -1651,7 +1651,7 @@ void Sbar_DrawScoreboard()
                        // a negative number means we are awaiting respawn, time value is still the same\r
                        respawn_time *= -1; // remove mark now that we checked it\r
                        if(getstati(STAT_VORE_EATEN))\r
-                               str = strcat("^1Cannot respawn while in the stomach");\r
+                               str = strcat("^1Will respawn after leaving the stomach");\r
                        else if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag)\r
                                str = strcat("^1Respawning...");\r
                        else\r

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 2f0b07d26b6912d3390c03a7e1a07b96e3eab0b8..757e85fc99cfbad82b41cdc743ec307fbcbde8f9 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -521,7 +521,7 @@ float Client_customizeentityforclient()
        // now change the predator's player model into a stomach model for the prey\r
        // in other words, when a player is swallowed by another player, the predator becomes an inward stomach model so the prey can see theirself in the stomach\r
        // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww)\r
-       stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
+       stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.iqm"); // 4 is the extension length\r
 \r
        float chase;\r
        chase = other.cvar_chase_active;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 719a2b18a8e0c8fe9f5fe23e82ac52b0049189ca..a3ecfb558499f6f4fa0b186ae396952dd158a0c5 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -271,7 +271,7 @@ void Vore_SwallowModel_Update(entity prey, entity pred)
 \r
        // properties that should update whenever possible, but when the predator is available\r
        string player_swallowmodel;\r
-       player_swallowmodel = strcat(substring(pred.playermodel, 0, strlen(pred.playermodel) - 4), "_swallow.md3"); // 4 is the extension length\r
+       player_swallowmodel = strcat(substring(pred.playermodel, 0, strlen(pred.playermodel) - 4), "_swallow.iqm"); // 4 is the extension length\r
        if(prey.swallow_model.model != player_swallowmodel) // player model can be changed while the predator is active\r
                setmodel(prey.swallow_model, player_swallowmodel);\r
        if(prey.swallow_model.skin != pred.skin) // player skin can be changed while the predator is active\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 338c386b37f001d71cf94dd0435b5d14a24a7343..9121f85e663b2f8b7b3cbe1ed908e244dc92a709 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -238,9 +238,7 @@
 \r
 - 0.8: Add shortcuts for video capture keys, and make sure video capture defaults are good.\r
 \r
-- 0.8: Orient swallow model based on the direction between you and the player eating you
-
-- 0.8: Use a new texture I found for the stomach\r
+- 0.8: Orient swallow model based on the direction between you and the player eating you\r
 \r
 - 0.8: If you see the swallow model of a predator you swallow first, clear the model instantly\r
 \r

diff --git a/misc/source/media/models/player/vixen_stomach.blend b/misc/source/media/models/player/vixen_stomach.blend
index 0d2830a76146a13be3f51947eafd182e2583c653..958467f7c0e06b5514c99da4ad54ae08de2770b7 100644 (file)
Binary files a/misc/source/media/models/player/vixen_stomach.blend and b/misc/source/media/models/player/vixen_stomach.blend differ

diff --git a/misc/source/media/models/player/vixen_swallow.blend b/misc/source/media/models/player/vixen_swallow.blend
index b002c64359b2bb9c648ae8e7546a48b023a35c02..b679f26d0ef7576df3072d2162509bf537daad89 100644 (file)
Binary files a/misc/source/media/models/player/vixen_swallow.blend and b/misc/source/media/models/player/vixen_swallow.blend differ