From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 16 Nov 2011 22:53:30 +0000 (+0200)
Subject: Major changes to the vixen model! Players now use the iqm format, which is newer... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=480d3ec896809677703c1047b17de647e0a6758c;p=voretournament%2Fvoretournament.git

Major changes to the vixen model! Players now use the iqm format, which is newer and better than zym meshes. The vixen now uses twice the polygon count, which looks better and smoother. Bellies were also tweaked to make bulges more visible (instead of just being round)
---

diff --git a/data/models/player/vixen-1.txt b/data/models/player/vixen-1.txt
index 2f2abcf3..261103ea 100644
--- a/data/models/player/vixen-1.txt
+++ b/data/models/player/vixen-1.txt
@@ -1,7 +1,7 @@
 Purple Vixen
 models/player/vixen-1
 0
-models/player/vixen.zym
+models/player/vixen.iqm
 species human
 
 Anthro fox warrior
diff --git a/data/models/player/vixen-2.txt b/data/models/player/vixen-2.txt
index d0f2a757..0bf8f091 100644
--- a/data/models/player/vixen-2.txt
+++ b/data/models/player/vixen-2.txt
@@ -1,7 +1,7 @@
 Color Vixen
 models/player/vixen-2
 1
-models/player/vixen.zym
+models/player/vixen.iqm
 species human
 
 Anthro fox warrior
diff --git a/data/models/player/vixen.iqm b/data/models/player/vixen.iqm
new file mode 100644
index 00000000..fcf168a1
Binary files /dev/null and b/data/models/player/vixen.iqm differ
diff --git a/data/models/player/vixen.iqm.sounds b/data/models/player/vixen.iqm.sounds
new file mode 100644
index 00000000..478f8c21
--- /dev/null
+++ b/data/models/player/vixen.iqm.sounds
@@ -0,0 +1,39 @@
+//TAG: female
+//affirmative sound/player/female/coms/affirmative 0
+attack sound/player/female/coms/attack 2
+//attacking sound/player/female/coms/attacking 0
+attackinfive sound/player/female/coms/attackinfive 0
+coverme sound/player/female/coms/coverme 0
+defend sound/player/female/coms/defend 0
+//defending sound/player/female/coms/defending 0
+//droppedflag sound/player/female/coms/droppedflag 0
+//flagcarriertakingdamage sound/player/female/coms/flagcarriertakingdamage 0
+freelance sound/player/female/coms/freelance 2
+//getflag sound/player/female/coms/getflag 0
+incoming sound/player/female/coms/incoming 0
+meet sound/player/female/coms/meet 0
+needhelp sound/player/female/coms/needhelp 1
+//negative sound/player/female/coms/negative 0
+//onmyway sound/player/female/coms/onmyway 0
+//roaming sound/player/female/coms/roaming 0
+//seenenemy sound/player/female/coms/seenenemy 0
+seenflag sound/player/female/coms/seenflag 0
+taunt sound/player/female/coms/taunt 5
+pred sound/player/female/coms/pred 6
+prey sound/player/female/coms/prey 6
+teamshoot sound/player/female/coms/teamshoot 4
+death sound/player/female/player/death 3
+drown sound/player/female/player/drown 0
+fall sound/player/female/player/fall 1
+falling sound/player/female/player/falling 0
+gasp sound/player/female/player/gasp 0
+jump sound/player/female/player/jump 0
+swallow sound/player/female/player/swallow 2
+digest sound/player/female/player/digest 0
+regurgitate sound/player/female/player/regurgitate 2
+regurgitate_prepare sound/player/female/player/regurgitate_prepare 0
+gurgle sound/player/female/player/gurgle 0
+pain25 sound/player/female/player/pain25 0
+pain50 sound/player/female/player/pain50 0
+pain75 sound/player/female/player/pain75 0
+pain100 sound/player/female/player/pain100 0
diff --git a/data/models/player/vixen.iqm_0.skin b/data/models/player/vixen.iqm_0.skin
new file mode 100644
index 00000000..93979d3f
--- /dev/null
+++ b/data/models/player/vixen.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen.iqm_1.skin b/data/models/player/vixen.iqm_1.skin
new file mode 100644
index 00000000..0a5e8edb
--- /dev/null
+++ b/data/models/player/vixen.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen.zym b/data/models/player/vixen.zym
deleted file mode 100644
index 064962e3..00000000
Binary files a/data/models/player/vixen.zym and /dev/null differ
diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds
deleted file mode 100644
index 478f8c21..00000000
--- a/data/models/player/vixen.zym.sounds
+++ /dev/null
@@ -1,39 +0,0 @@
-//TAG: female
-//affirmative sound/player/female/coms/affirmative 0
-attack sound/player/female/coms/attack 2
-//attacking sound/player/female/coms/attacking 0
-attackinfive sound/player/female/coms/attackinfive 0
-coverme sound/player/female/coms/coverme 0
-defend sound/player/female/coms/defend 0
-//defending sound/player/female/coms/defending 0
-//droppedflag sound/player/female/coms/droppedflag 0
-//flagcarriertakingdamage sound/player/female/coms/flagcarriertakingdamage 0
-freelance sound/player/female/coms/freelance 2
-//getflag sound/player/female/coms/getflag 0
-incoming sound/player/female/coms/incoming 0
-meet sound/player/female/coms/meet 0
-needhelp sound/player/female/coms/needhelp 1
-//negative sound/player/female/coms/negative 0
-//onmyway sound/player/female/coms/onmyway 0
-//roaming sound/player/female/coms/roaming 0
-//seenenemy sound/player/female/coms/seenenemy 0
-seenflag sound/player/female/coms/seenflag 0
-taunt sound/player/female/coms/taunt 5
-pred sound/player/female/coms/pred 6
-prey sound/player/female/coms/prey 6
-teamshoot sound/player/female/coms/teamshoot 4
-death sound/player/female/player/death 3
-drown sound/player/female/player/drown 0
-fall sound/player/female/player/fall 1
-falling sound/player/female/player/falling 0
-gasp sound/player/female/player/gasp 0
-jump sound/player/female/player/jump 0
-swallow sound/player/female/player/swallow 2
-digest sound/player/female/player/digest 0
-regurgitate sound/player/female/player/regurgitate 2
-regurgitate_prepare sound/player/female/player/regurgitate_prepare 0
-gurgle sound/player/female/player/gurgle 0
-pain25 sound/player/female/player/pain25 0
-pain50 sound/player/female/player/pain50 0
-pain75 sound/player/female/player/pain75 0
-pain100 sound/player/female/player/pain100 0
diff --git a/data/models/player/vixen.zym_0.skin b/data/models/player/vixen.zym_0.skin
deleted file mode 100644
index 93979d3f..00000000
--- a/data/models/player/vixen.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen.zym_1.skin b/data/models/player/vixen.zym_1.skin
deleted file mode 100644
index 0a5e8edb..00000000
--- a/data/models/player/vixen.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen_state1.iqm b/data/models/player/vixen_state1.iqm
new file mode 100644
index 00000000..a8fab036
Binary files /dev/null and b/data/models/player/vixen_state1.iqm differ
diff --git a/data/models/player/vixen_state1.iqm_0.skin b/data/models/player/vixen_state1.iqm_0.skin
new file mode 100644
index 00000000..93979d3f
--- /dev/null
+++ b/data/models/player/vixen_state1.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen_state1.iqm_1.skin b/data/models/player/vixen_state1.iqm_1.skin
new file mode 100644
index 00000000..0a5e8edb
--- /dev/null
+++ b/data/models/player/vixen_state1.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen_state1.zym b/data/models/player/vixen_state1.zym
deleted file mode 100644
index 5a1cb70b..00000000
Binary files a/data/models/player/vixen_state1.zym and /dev/null differ
diff --git a/data/models/player/vixen_state1.zym_0.skin b/data/models/player/vixen_state1.zym_0.skin
deleted file mode 100644
index 93979d3f..00000000
--- a/data/models/player/vixen_state1.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen_state1.zym_1.skin b/data/models/player/vixen_state1.zym_1.skin
deleted file mode 100644
index 0a5e8edb..00000000
--- a/data/models/player/vixen_state1.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen_state2.iqm b/data/models/player/vixen_state2.iqm
new file mode 100644
index 00000000..0895bfd3
Binary files /dev/null and b/data/models/player/vixen_state2.iqm differ
diff --git a/data/models/player/vixen_state2.iqm_0.skin b/data/models/player/vixen_state2.iqm_0.skin
new file mode 100644
index 00000000..93979d3f
--- /dev/null
+++ b/data/models/player/vixen_state2.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen_state2.iqm_1.skin b/data/models/player/vixen_state2.iqm_1.skin
new file mode 100644
index 00000000..0a5e8edb
--- /dev/null
+++ b/data/models/player/vixen_state2.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen_state2.zym b/data/models/player/vixen_state2.zym
deleted file mode 100644
index 5e3a1425..00000000
Binary files a/data/models/player/vixen_state2.zym and /dev/null differ
diff --git a/data/models/player/vixen_state2.zym_0.skin b/data/models/player/vixen_state2.zym_0.skin
deleted file mode 100644
index 93979d3f..00000000
--- a/data/models/player/vixen_state2.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen_state2.zym_1.skin b/data/models/player/vixen_state2.zym_1.skin
deleted file mode 100644
index 0a5e8edb..00000000
--- a/data/models/player/vixen_state2.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen_state3.iqm b/data/models/player/vixen_state3.iqm
new file mode 100644
index 00000000..955b85d8
Binary files /dev/null and b/data/models/player/vixen_state3.iqm differ
diff --git a/data/models/player/vixen_state3.iqm_0.skin b/data/models/player/vixen_state3.iqm_0.skin
new file mode 100644
index 00000000..93979d3f
--- /dev/null
+++ b/data/models/player/vixen_state3.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen_state3.iqm_1.skin b/data/models/player/vixen_state3.iqm_1.skin
new file mode 100644
index 00000000..0a5e8edb
--- /dev/null
+++ b/data/models/player/vixen_state3.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/models/player/vixen_state3.zym b/data/models/player/vixen_state3.zym
deleted file mode 100644
index 5cb154f6..00000000
Binary files a/data/models/player/vixen_state3.zym and /dev/null differ
diff --git a/data/models/player/vixen_state3.zym_0.skin b/data/models/player/vixen_state3.zym_0.skin
deleted file mode 100644
index 93979d3f..00000000
--- a/data/models/player/vixen_state3.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file
diff --git a/data/models/player/vixen_state3.zym_1.skin b/data/models/player/vixen_state3.zym_1.skin
deleted file mode 100644
index 0a5e8edb..00000000
--- a/data/models/player/vixen_state3.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file
diff --git a/data/qcsrc/server/cheats.qc b/data/qcsrc/server/cheats.qc
index 1f3a8553..e7c81152 100644
--- a/data/qcsrc/server/cheats.qc
+++ b/data/qcsrc/server/cheats.qc
@@ -221,11 +221,7 @@ float CheatImpulse(float i)
 			IS_CHEAT(i, 0, 0);
 			FOR_EACH_PLAYER(e)
 			{
-				if( e.playermodel == "models/player/jeandarc.zym"
-						||  e.playermodel == "models/player/pyria.zym"
-						||  e.playermodel == "models/player/skadi.zym"
-						|| (e.playermodel == "models/player/specop.zym" && random() < 0.5) // you never know
-						||  e.playermodel == "models/player/visitant.zym")
+				if(e.playermodel == "models/player/vixen.iqm")
 				{
 					makevectors(e.angles);
 					traceline(e.origin, e.origin + v_right * 256, MOVE_NORMAL, e);
diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index c01fc393..1edb3c18 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -396,7 +396,7 @@ Checks if the argument string can be a valid playermodel.
 Returns a valid one in doubt.
 =============
 */
-string FallbackPlayerModel = "models/player/vixen.zym";
+string FallbackPlayerModel = "models/player/vixen.iqm";
 string CheckPlayerModel(string plyermodel) {
 	if(strlen(plyermodel) < 4)
 		return FallbackPlayerModel;
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 9f4c0c8f..79244055 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1350,7 +1350,6 @@ void precache()
         precache_all_models("models/player/*.md3");
         precache_all_models("models/player/*.psk");
 		precache_all_models("models/player/*.iqm");
-        //precache_model("models/player/vixen.zym");
     }
 
     if (cvar("sv_defaultcharacter"))
diff --git a/misc/source/media/models/player/vixen.blend b/misc/source/media/models/player/vixen.blend
index 5eb0f17c..00e89535 100644
Binary files a/misc/source/media/models/player/vixen.blend and b/misc/source/media/models/player/vixen.blend differ
diff --git a/misc/source/media/models/player/vixen_belly1.blend b/misc/source/media/models/player/vixen_belly1.blend
index 476a484b..0be4ae82 100644
Binary files a/misc/source/media/models/player/vixen_belly1.blend and b/misc/source/media/models/player/vixen_belly1.blend differ
diff --git a/misc/source/media/models/player/vixen_belly2.blend b/misc/source/media/models/player/vixen_belly2.blend
index 3f8d8521..94bdeeae 100644
Binary files a/misc/source/media/models/player/vixen_belly2.blend and b/misc/source/media/models/player/vixen_belly2.blend differ
diff --git a/misc/source/media/models/player/vixen_belly3.blend b/misc/source/media/models/player/vixen_belly3.blend
index e7581277..7d64e001 100644
Binary files a/misc/source/media/models/player/vixen_belly3.blend and b/misc/source/media/models/player/vixen_belly3.blend differ