From: MirceaKitsune Date: Wed, 20 Feb 2013 19:03:50 +0000 (+0200) Subject: A male version of the fox character, with proper male sounds and appearance. You... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bfc9cffd9c291c4e7e3d3c6c597d2666ae73b7b;p=voretournament%2Fvoretournament.git A male version of the fox character, with proper male sounds and appearance. You can choose your gender in the character selection menu. Males and females can be visually separated by the long hair. The same fox model is used, and genders are defined as skins. --- diff --git a/data/models/player/fox.iqm_2.skin b/data/models/player/fox.iqm_2.skin new file mode 100644 index 00000000..54cb4738 --- /dev/null +++ b/data/models/player/fox.iqm_2.skin @@ -0,0 +1 @@ +fox_body, textures/player/fox_body diff --git a/data/models/player/fox.iqm_2.sounds b/data/models/player/fox.iqm_2.sounds new file mode 100644 index 00000000..728a73a1 --- /dev/null +++ b/data/models/player/fox.iqm_2.sounds @@ -0,0 +1,40 @@ +//TAG: female +//affirmative sound/player/fox_male/coms/affirmative 0 +attack sound/player/fox_male/coms/attack 0 +//attacking sound/player/fox_male/coms/attacking 0 +attackinfive sound/player/fox_male/coms/attackinfive 0 +coverme sound/player/fox_male/coms/coverme 0 +defend sound/player/fox_male/coms/defend 0 +//defending sound/player/fox_male/coms/defending 0 +//droppedflag sound/player/fox_male/coms/droppedflag 0 +//flagcarriertakingdamage sound/player/fox_male/coms/flagcarriertakingdamage 0 +freelance sound/player/fox_male/coms/freelance 2 +//getflag sound/player/fox_male/coms/getflag 0 +incoming sound/player/fox_male/coms/incoming 0 +meet sound/player/fox_male/coms/meet 0 +needhelp sound/player/fox_male/coms/needhelp 2 +//negative sound/player/fox_male/coms/negative 0 +//onmyway sound/player/fox_male/coms/onmyway 0 +//roaming sound/player/fox_male/coms/roaming 0 +//seenenemy sound/player/fox_male/coms/seenenemy 0 +seenflag sound/player/fox_male/coms/seenflag 0 +taunt sound/player/fox_male/coms/taunt 3 +pred sound/player/fox_male/coms/pred 5 +prey sound/player/fox_male/coms/prey 5 +teamshoot sound/player/fox_male/coms/teamshoot 4 +death sound/player/fox_male/player/death 3 +drown sound/player/fox_male/player/drown 0 +fall sound/player/fox_male/player/fall 1 +falling sound/player/fox_male/player/falling 0 +gasp sound/player/fox_male/player/gasp 0 +jump sound/player/fox_male/player/jump 0 +grab sound/player/fox_male/player/grab 0 +swallow sound/player/fox_male/player/swallow 2 +digest sound/player/fox_male/player/digest 0 +regurgitate sound/player/fox_male/player/regurgitate 2 +regurgitate_prepare sound/player/fox_male/player/regurgitate_prepare 0 +gurgle sound/player/fox_male/player/gurgle 0 +pain25 sound/player/fox_male/player/pain25 0 +pain50 sound/player/fox_male/player/pain50 0 +pain75 sound/player/fox_male/player/pain75 0 +pain100 sound/player/fox_male/player/pain100 0 diff --git a/data/models/player/fox.iqm_3.skin b/data/models/player/fox.iqm_3.skin new file mode 100644 index 00000000..b26f2365 --- /dev/null +++ b/data/models/player/fox.iqm_3.skin @@ -0,0 +1,2 @@ +fox_body, textures/player/fox_body +fox_armor, textures/player/fox_armor diff --git a/data/models/player/fox.iqm_3.sounds b/data/models/player/fox.iqm_3.sounds new file mode 100644 index 00000000..728a73a1 --- /dev/null +++ b/data/models/player/fox.iqm_3.sounds @@ -0,0 +1,40 @@ +//TAG: female +//affirmative sound/player/fox_male/coms/affirmative 0 +attack sound/player/fox_male/coms/attack 0 +//attacking sound/player/fox_male/coms/attacking 0 +attackinfive sound/player/fox_male/coms/attackinfive 0 +coverme sound/player/fox_male/coms/coverme 0 +defend sound/player/fox_male/coms/defend 0 +//defending sound/player/fox_male/coms/defending 0 +//droppedflag sound/player/fox_male/coms/droppedflag 0 +//flagcarriertakingdamage sound/player/fox_male/coms/flagcarriertakingdamage 0 +freelance sound/player/fox_male/coms/freelance 2 +//getflag sound/player/fox_male/coms/getflag 0 +incoming sound/player/fox_male/coms/incoming 0 +meet sound/player/fox_male/coms/meet 0 +needhelp sound/player/fox_male/coms/needhelp 2 +//negative sound/player/fox_male/coms/negative 0 +//onmyway sound/player/fox_male/coms/onmyway 0 +//roaming sound/player/fox_male/coms/roaming 0 +//seenenemy sound/player/fox_male/coms/seenenemy 0 +seenflag sound/player/fox_male/coms/seenflag 0 +taunt sound/player/fox_male/coms/taunt 3 +pred sound/player/fox_male/coms/pred 5 +prey sound/player/fox_male/coms/prey 5 +teamshoot sound/player/fox_male/coms/teamshoot 4 +death sound/player/fox_male/player/death 3 +drown sound/player/fox_male/player/drown 0 +fall sound/player/fox_male/player/fall 1 +falling sound/player/fox_male/player/falling 0 +gasp sound/player/fox_male/player/gasp 0 +jump sound/player/fox_male/player/jump 0 +grab sound/player/fox_male/player/grab 0 +swallow sound/player/fox_male/player/swallow 2 +digest sound/player/fox_male/player/digest 0 +regurgitate sound/player/fox_male/player/regurgitate 2 +regurgitate_prepare sound/player/fox_male/player/regurgitate_prepare 0 +gurgle sound/player/fox_male/player/gurgle 0 +pain25 sound/player/fox_male/player/pain25 0 +pain50 sound/player/fox_male/player/pain50 0 +pain75 sound/player/fox_male/player/pain75 0 +pain100 sound/player/fox_male/player/pain100 0 diff --git a/data/models/player/fox_gullet.iqm_2.skin b/data/models/player/fox_gullet.iqm_2.skin new file mode 100644 index 00000000..0b269d03 --- /dev/null +++ b/data/models/player/fox_gullet.iqm_2.skin @@ -0,0 +1 @@ +fox_gullet,textures/player/fox_gullet \ No newline at end of file diff --git a/data/models/player/fox_gullet.iqm_3.skin b/data/models/player/fox_gullet.iqm_3.skin new file mode 100644 index 00000000..0b269d03 --- /dev/null +++ b/data/models/player/fox_gullet.iqm_3.skin @@ -0,0 +1 @@ +fox_gullet,textures/player/fox_gullet \ No newline at end of file diff --git a/data/models/player/fox_male_heavy.tga b/data/models/player/fox_male_heavy.tga new file mode 100644 index 00000000..4a319c3b Binary files /dev/null and b/data/models/player/fox_male_heavy.tga differ diff --git a/data/models/player/fox_male_heavy.txt b/data/models/player/fox_male_heavy.txt new file mode 100644 index 00000000..55ae22ae --- /dev/null +++ b/data/models/player/fox_male_heavy.txt @@ -0,0 +1,11 @@ +Fox - Male - Heavy +models/player/fox_male_heavy +3 +models/player/fox.iqm +species human + +Species: Fox +Sex: Male +Type: Heavy +Weight: 147 lb +Age: 21 diff --git a/data/models/player/fox_male_light.tga b/data/models/player/fox_male_light.tga new file mode 100644 index 00000000..d334cbcf Binary files /dev/null and b/data/models/player/fox_male_light.tga differ diff --git a/data/models/player/fox_male_light.txt b/data/models/player/fox_male_light.txt new file mode 100644 index 00000000..4be3021a --- /dev/null +++ b/data/models/player/fox_male_light.txt @@ -0,0 +1,11 @@ +Fox - Male - Light +models/player/fox_male_light +2 +models/player/fox.iqm +species human + +Species: Fox +Sex: Male +Type: Light +Weight: 104 lb +Age: 25 diff --git a/data/models/player/fox_state1.iqm_2.skin b/data/models/player/fox_state1.iqm_2.skin new file mode 100644 index 00000000..54cb4738 --- /dev/null +++ b/data/models/player/fox_state1.iqm_2.skin @@ -0,0 +1 @@ +fox_body, textures/player/fox_body diff --git a/data/models/player/fox_state1.iqm_3.skin b/data/models/player/fox_state1.iqm_3.skin new file mode 100644 index 00000000..b26f2365 --- /dev/null +++ b/data/models/player/fox_state1.iqm_3.skin @@ -0,0 +1,2 @@ +fox_body, textures/player/fox_body +fox_armor, textures/player/fox_armor diff --git a/data/models/player/fox_state2.iqm_2.skin b/data/models/player/fox_state2.iqm_2.skin new file mode 100644 index 00000000..54cb4738 --- /dev/null +++ b/data/models/player/fox_state2.iqm_2.skin @@ -0,0 +1 @@ +fox_body, textures/player/fox_body diff --git a/data/models/player/fox_state2.iqm_3.skin b/data/models/player/fox_state2.iqm_3.skin new file mode 100644 index 00000000..b26f2365 --- /dev/null +++ b/data/models/player/fox_state2.iqm_3.skin @@ -0,0 +1,2 @@ +fox_body, textures/player/fox_body +fox_armor, textures/player/fox_armor diff --git a/data/models/player/fox_state3.iqm_2.skin b/data/models/player/fox_state3.iqm_2.skin new file mode 100644 index 00000000..54cb4738 --- /dev/null +++ b/data/models/player/fox_state3.iqm_2.skin @@ -0,0 +1 @@ +fox_body, textures/player/fox_body diff --git a/data/models/player/fox_state3.iqm_3.skin b/data/models/player/fox_state3.iqm_3.skin new file mode 100644 index 00000000..b26f2365 --- /dev/null +++ b/data/models/player/fox_state3.iqm_3.skin @@ -0,0 +1,2 @@ +fox_body, textures/player/fox_body +fox_armor, textures/player/fox_armor diff --git a/data/models/player/fox_stomach.iqm_2.skin b/data/models/player/fox_stomach.iqm_2.skin new file mode 100644 index 00000000..77d97eb0 --- /dev/null +++ b/data/models/player/fox_stomach.iqm_2.skin @@ -0,0 +1 @@ +fox_stomach,textures/player/fox_stomach \ No newline at end of file diff --git a/data/models/player/fox_stomach.iqm_3.skin b/data/models/player/fox_stomach.iqm_3.skin new file mode 100644 index 00000000..77d97eb0 --- /dev/null +++ b/data/models/player/fox_stomach.iqm_3.skin @@ -0,0 +1 @@ +fox_stomach,textures/player/fox_stomach \ No newline at end of file diff --git a/data/sound/player/fox_male/coms/attack.ogg b/data/sound/player/fox_male/coms/attack.ogg new file mode 100644 index 00000000..cdce892c Binary files /dev/null and b/data/sound/player/fox_male/coms/attack.ogg differ diff --git a/data/sound/player/fox_male/coms/attackinfive.ogg b/data/sound/player/fox_male/coms/attackinfive.ogg new file mode 100644 index 00000000..6d4f0185 Binary files /dev/null and b/data/sound/player/fox_male/coms/attackinfive.ogg differ diff --git a/data/sound/player/fox_male/coms/coverme.ogg b/data/sound/player/fox_male/coms/coverme.ogg new file mode 100644 index 00000000..e05641c0 Binary files /dev/null and b/data/sound/player/fox_male/coms/coverme.ogg differ diff --git a/data/sound/player/fox_male/coms/defend.ogg b/data/sound/player/fox_male/coms/defend.ogg new file mode 100644 index 00000000..a539b190 Binary files /dev/null and b/data/sound/player/fox_male/coms/defend.ogg differ diff --git a/data/sound/player/fox_male/coms/freelance1.ogg b/data/sound/player/fox_male/coms/freelance1.ogg new file mode 100644 index 00000000..850cdab2 Binary files /dev/null and b/data/sound/player/fox_male/coms/freelance1.ogg differ diff --git a/data/sound/player/fox_male/coms/freelance2.ogg b/data/sound/player/fox_male/coms/freelance2.ogg new file mode 100644 index 00000000..48ffbf91 Binary files /dev/null and b/data/sound/player/fox_male/coms/freelance2.ogg differ diff --git a/data/sound/player/fox_male/coms/incoming.ogg b/data/sound/player/fox_male/coms/incoming.ogg new file mode 100644 index 00000000..b21add50 Binary files /dev/null and b/data/sound/player/fox_male/coms/incoming.ogg differ diff --git a/data/sound/player/fox_male/coms/meet.ogg b/data/sound/player/fox_male/coms/meet.ogg new file mode 100644 index 00000000..f446a223 Binary files /dev/null and b/data/sound/player/fox_male/coms/meet.ogg differ diff --git a/data/sound/player/fox_male/coms/needhelp1.ogg b/data/sound/player/fox_male/coms/needhelp1.ogg new file mode 100644 index 00000000..2b6714dc Binary files /dev/null and b/data/sound/player/fox_male/coms/needhelp1.ogg differ diff --git a/data/sound/player/fox_male/coms/needhelp2.ogg b/data/sound/player/fox_male/coms/needhelp2.ogg new file mode 100644 index 00000000..277845ef Binary files /dev/null and b/data/sound/player/fox_male/coms/needhelp2.ogg differ diff --git a/data/sound/player/fox_male/coms/pred1.ogg b/data/sound/player/fox_male/coms/pred1.ogg new file mode 100644 index 00000000..b09771a4 Binary files /dev/null and b/data/sound/player/fox_male/coms/pred1.ogg differ diff --git a/data/sound/player/fox_male/coms/pred2.ogg b/data/sound/player/fox_male/coms/pred2.ogg new file mode 100644 index 00000000..81cb9009 Binary files /dev/null and b/data/sound/player/fox_male/coms/pred2.ogg differ diff --git a/data/sound/player/fox_male/coms/pred3.ogg b/data/sound/player/fox_male/coms/pred3.ogg new file mode 100644 index 00000000..c9e4e3bb Binary files /dev/null and b/data/sound/player/fox_male/coms/pred3.ogg differ diff --git a/data/sound/player/fox_male/coms/pred4.ogg b/data/sound/player/fox_male/coms/pred4.ogg new file mode 100644 index 00000000..30050705 Binary files /dev/null and b/data/sound/player/fox_male/coms/pred4.ogg differ diff --git a/data/sound/player/fox_male/coms/pred5.ogg b/data/sound/player/fox_male/coms/pred5.ogg new file mode 100644 index 00000000..d4a4a8e3 Binary files /dev/null and b/data/sound/player/fox_male/coms/pred5.ogg differ diff --git a/data/sound/player/fox_male/coms/prey1.ogg b/data/sound/player/fox_male/coms/prey1.ogg new file mode 100644 index 00000000..7f001a40 Binary files /dev/null and b/data/sound/player/fox_male/coms/prey1.ogg differ diff --git a/data/sound/player/fox_male/coms/prey2.ogg b/data/sound/player/fox_male/coms/prey2.ogg new file mode 100644 index 00000000..954334db Binary files /dev/null and b/data/sound/player/fox_male/coms/prey2.ogg differ diff --git a/data/sound/player/fox_male/coms/prey3.ogg b/data/sound/player/fox_male/coms/prey3.ogg new file mode 100644 index 00000000..1d451862 Binary files /dev/null and b/data/sound/player/fox_male/coms/prey3.ogg differ diff --git a/data/sound/player/fox_male/coms/prey4.ogg b/data/sound/player/fox_male/coms/prey4.ogg new file mode 100644 index 00000000..0e7756f7 Binary files /dev/null and b/data/sound/player/fox_male/coms/prey4.ogg differ diff --git a/data/sound/player/fox_male/coms/prey5.ogg b/data/sound/player/fox_male/coms/prey5.ogg new file mode 100644 index 00000000..9a77f338 Binary files /dev/null and b/data/sound/player/fox_male/coms/prey5.ogg differ diff --git a/data/sound/player/fox_male/coms/seenflag.ogg b/data/sound/player/fox_male/coms/seenflag.ogg new file mode 100644 index 00000000..08b48606 Binary files /dev/null and b/data/sound/player/fox_male/coms/seenflag.ogg differ diff --git a/data/sound/player/fox_male/coms/taunt1.ogg b/data/sound/player/fox_male/coms/taunt1.ogg new file mode 100644 index 00000000..a66faf4b Binary files /dev/null and b/data/sound/player/fox_male/coms/taunt1.ogg differ diff --git a/data/sound/player/fox_male/coms/taunt2.ogg b/data/sound/player/fox_male/coms/taunt2.ogg new file mode 100644 index 00000000..5d03705d Binary files /dev/null and b/data/sound/player/fox_male/coms/taunt2.ogg differ diff --git a/data/sound/player/fox_male/coms/taunt3.ogg b/data/sound/player/fox_male/coms/taunt3.ogg new file mode 100644 index 00000000..20dea0e9 Binary files /dev/null and b/data/sound/player/fox_male/coms/taunt3.ogg differ diff --git a/data/sound/player/fox_male/coms/teamshoot1.ogg b/data/sound/player/fox_male/coms/teamshoot1.ogg new file mode 100644 index 00000000..952b5b4c Binary files /dev/null and b/data/sound/player/fox_male/coms/teamshoot1.ogg differ diff --git a/data/sound/player/fox_male/coms/teamshoot2.ogg b/data/sound/player/fox_male/coms/teamshoot2.ogg new file mode 100644 index 00000000..7bb1a9ba Binary files /dev/null and b/data/sound/player/fox_male/coms/teamshoot2.ogg differ diff --git a/data/sound/player/fox_male/coms/teamshoot3.ogg b/data/sound/player/fox_male/coms/teamshoot3.ogg new file mode 100644 index 00000000..16947248 Binary files /dev/null and b/data/sound/player/fox_male/coms/teamshoot3.ogg differ diff --git a/data/sound/player/fox_male/coms/teamshoot4.ogg b/data/sound/player/fox_male/coms/teamshoot4.ogg new file mode 100644 index 00000000..69c45553 Binary files /dev/null and b/data/sound/player/fox_male/coms/teamshoot4.ogg differ diff --git a/data/sound/player/fox_male/player/death1.ogg b/data/sound/player/fox_male/player/death1.ogg new file mode 100644 index 00000000..cf536fd8 Binary files /dev/null and b/data/sound/player/fox_male/player/death1.ogg differ diff --git a/data/sound/player/fox_male/player/death2.ogg b/data/sound/player/fox_male/player/death2.ogg new file mode 100644 index 00000000..7434cc13 Binary files /dev/null and b/data/sound/player/fox_male/player/death2.ogg differ diff --git a/data/sound/player/fox_male/player/death3.ogg b/data/sound/player/fox_male/player/death3.ogg new file mode 100644 index 00000000..1ff75291 Binary files /dev/null and b/data/sound/player/fox_male/player/death3.ogg differ diff --git a/data/sound/player/fox_male/player/digest.ogg b/data/sound/player/fox_male/player/digest.ogg new file mode 100644 index 00000000..86d758dc Binary files /dev/null and b/data/sound/player/fox_male/player/digest.ogg differ diff --git a/data/sound/player/fox_male/player/drown.ogg b/data/sound/player/fox_male/player/drown.ogg new file mode 100644 index 00000000..c8eb1895 Binary files /dev/null and b/data/sound/player/fox_male/player/drown.ogg differ diff --git a/data/sound/player/fox_male/player/fall1.ogg b/data/sound/player/fox_male/player/fall1.ogg new file mode 100644 index 00000000..ce867ecc Binary files /dev/null and b/data/sound/player/fox_male/player/fall1.ogg differ diff --git a/data/sound/player/fox_male/player/falling.ogg b/data/sound/player/fox_male/player/falling.ogg new file mode 100644 index 00000000..a6f6cdc2 Binary files /dev/null and b/data/sound/player/fox_male/player/falling.ogg differ diff --git a/data/sound/player/fox_male/player/gasp.ogg b/data/sound/player/fox_male/player/gasp.ogg new file mode 100644 index 00000000..b7d7154e Binary files /dev/null and b/data/sound/player/fox_male/player/gasp.ogg differ diff --git a/data/sound/player/fox_male/player/grab.ogg b/data/sound/player/fox_male/player/grab.ogg new file mode 100644 index 00000000..9f130adf Binary files /dev/null and b/data/sound/player/fox_male/player/grab.ogg differ diff --git a/data/sound/player/fox_male/player/gurgle.ogg b/data/sound/player/fox_male/player/gurgle.ogg new file mode 100644 index 00000000..efdea7d4 Binary files /dev/null and b/data/sound/player/fox_male/player/gurgle.ogg differ diff --git a/data/sound/player/fox_male/player/jump.ogg b/data/sound/player/fox_male/player/jump.ogg new file mode 100644 index 00000000..36337b36 Binary files /dev/null and b/data/sound/player/fox_male/player/jump.ogg differ diff --git a/data/sound/player/fox_male/player/pain100.ogg b/data/sound/player/fox_male/player/pain100.ogg new file mode 100644 index 00000000..a62597f6 Binary files /dev/null and b/data/sound/player/fox_male/player/pain100.ogg differ diff --git a/data/sound/player/fox_male/player/pain25.ogg b/data/sound/player/fox_male/player/pain25.ogg new file mode 100644 index 00000000..d44daef2 Binary files /dev/null and b/data/sound/player/fox_male/player/pain25.ogg differ diff --git a/data/sound/player/fox_male/player/pain50.ogg b/data/sound/player/fox_male/player/pain50.ogg new file mode 100644 index 00000000..37dc983f Binary files /dev/null and b/data/sound/player/fox_male/player/pain50.ogg differ diff --git a/data/sound/player/fox_male/player/pain75.ogg b/data/sound/player/fox_male/player/pain75.ogg new file mode 100644 index 00000000..f6654dfd Binary files /dev/null and b/data/sound/player/fox_male/player/pain75.ogg differ diff --git a/data/sound/player/fox_male/player/regurgitate1.ogg b/data/sound/player/fox_male/player/regurgitate1.ogg new file mode 100644 index 00000000..8619b83c Binary files /dev/null and b/data/sound/player/fox_male/player/regurgitate1.ogg differ diff --git a/data/sound/player/fox_male/player/regurgitate2.ogg b/data/sound/player/fox_male/player/regurgitate2.ogg new file mode 100644 index 00000000..98ef19ab Binary files /dev/null and b/data/sound/player/fox_male/player/regurgitate2.ogg differ diff --git a/data/sound/player/fox_male/player/regurgitate_prepare.ogg b/data/sound/player/fox_male/player/regurgitate_prepare.ogg new file mode 100644 index 00000000..b3cffe35 Binary files /dev/null and b/data/sound/player/fox_male/player/regurgitate_prepare.ogg differ diff --git a/data/sound/player/fox_male/player/swallow1.ogg b/data/sound/player/fox_male/player/swallow1.ogg new file mode 100644 index 00000000..73cb314d Binary files /dev/null and b/data/sound/player/fox_male/player/swallow1.ogg differ diff --git a/data/sound/player/fox_male/player/swallow2.ogg b/data/sound/player/fox_male/player/swallow2.ogg new file mode 100644 index 00000000..b502a1ed Binary files /dev/null and b/data/sound/player/fox_male/player/swallow2.ogg differ diff --git a/docs/Release notes.txt b/docs/Release notes.txt index 23e1cada..de5bd1e6 100644 --- a/docs/Release notes.txt +++ b/docs/Release notes.txt @@ -348,6 +348,8 @@ Features: - Brand new fox model of much higher quality, which replaces the old vixen player. +- A male version of the fox character, with male voices and player sounds. Males and females visually differ by the presence / absence of hair. + - Player size also influences weight. Macros will have more gravity while micros float more easily. Jump pads throw players at the correct destination if their weight is changed by scale, but a loaded stomach will still reduce traveling speed. - Health items are now swallowed slowly like players. The swallow speed depends on an item's health compared to the player's health, rather than a size comparison as done between players. This does not conflict with consumable items, and the two can be toggled individually. Items are still eaten by standing over them.