From: MirceaKitsune Date: Sun, 3 Feb 2013 14:38:38 +0000 (+0200) Subject: Switch stomach and swallow models to iqm as well, and export higher polygon versions X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=39dbb55d63e957c2e871df2032a37b7557f3bdb9 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 index 00000000..023a8121 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 index 00000000..6d94f538 --- /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 index 00000000..07919b55 --- /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 index 977272ca..00000000 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 index 6d94f538..00000000 --- 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 index 07919b55..00000000 --- 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 index 00000000..ead9c323 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 index 00000000..057f9bca --- /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 index 00000000..ce79c83b --- /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 index 7aa22589..00000000 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 index 057f9bca..00000000 --- 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 index ce79c83b..00000000 --- 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 4615381e..576fa502 100644 --- 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 respawn_time *= -1; // remove mark now that we checked it if(getstati(STAT_VORE_EATEN)) - str = strcat("^1Cannot respawn while in the stomach"); + str = strcat("^1Will respawn after leaving the stomach"); else if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag) str = strcat("^1Respawning..."); else diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 2f0b07d2..757e85fc 100644 --- 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 // 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 // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww) - stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length + stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.iqm"); // 4 is the extension length float chase; chase = other.cvar_chase_active; diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 719a2b18..a3ecfb55 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -271,7 +271,7 @@ void Vore_SwallowModel_Update(entity prey, entity pred) // properties that should update whenever possible, but when the predator is available string player_swallowmodel; - player_swallowmodel = strcat(substring(pred.playermodel, 0, strlen(pred.playermodel) - 4), "_swallow.md3"); // 4 is the extension length + player_swallowmodel = strcat(substring(pred.playermodel, 0, strlen(pred.playermodel) - 4), "_swallow.iqm"); // 4 is the extension length if(prey.swallow_model.model != player_swallowmodel) // player model can be changed while the predator is active setmodel(prey.swallow_model, player_swallowmodel); if(prey.swallow_model.skin != pred.skin) // player skin can be changed while the predator is active diff --git a/docs/TODO.txt b/docs/TODO.txt index 338c386b..9121f85e 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -238,9 +238,7 @@ - 0.8: Add shortcuts for video capture keys, and make sure video capture defaults are good. -- 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 +- 0.8: Orient swallow model based on the direction between you and the player eating you - 0.8: If you see the swallow model of a predator you swallow first, clear the model instantly diff --git a/misc/source/media/models/player/vixen_stomach.blend b/misc/source/media/models/player/vixen_stomach.blend index 0d2830a7..958467f7 100644 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 b002c643..b679f26d 100644 Binary files a/misc/source/media/models/player/vixen_swallow.blend and b/misc/source/media/models/player/vixen_swallow.blend differ