From: MirceaKitsune Date: Thu, 2 Sep 2010 18:59:46 +0000 (+0300) Subject: This isn't Pyria any more X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=47342c7b254e8783948e2d4851111a27774386ff;p=voretournament%2Fvoretournament.git This isn't Pyria any more --- diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds index 5be4d5d5..2328ad98 100644 --- a/data/models/player/vixen.zym.sounds +++ b/data/models/player/vixen.zym.sounds @@ -1,37 +1,37 @@ -//TAG: pyria-skadi +//TAG: female //affirmative sound/player/carni-lycan/player/affirmative 0 -attack sound/player/pyria-skadi/coms/attack 2 +attack sound/player/female/coms/attack 2 //attacking sound/player/carni-lycan/player/attacking 0 -attackinfive sound/player/pyria-skadi/coms/attackinfive 0 -//coverme sound/player/pyria-skadi/coms/coverme 0 -//defend sound/player/pyria-skadi/coms/defend 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/carni-lycan/player/defending 0 //droppedflag sound/player/carni-lycan/player/droppedflag 0 //flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0 -freelance sound/player/pyria-skadi/coms/freelance 2 +freelance sound/player/female/coms/freelance 2 //getflag sound/player/carni-lycan/player/getflag 0 -//incoming sound/player/pyria-skadi/coms/incoming 0 -meet sound/player/pyria-skadi/coms/meet 0 -needhelp sound/player/pyria-skadi/coms/needhelp 1 +//incoming sound/player/female/coms/incoming 0 +meet sound/player/female/coms/meet 0 +needhelp sound/player/female/coms/needhelp 1 //negative sound/player/carni-lycan/player/negative 0 //onmyway sound/player/carni-lycan/player/onmyway 0 //roaming sound/player/carni-lycan/player/roaming 0 //seenenemy sound/player/carni-lycan/player/seenenemy 0 -seenflag sound/player/pyria-skadi/coms/seenflag 0 -taunt sound/player/pyria-skadi/coms/taunt 5 -teamshoot sound/player/pyria-skadi/coms/teamshoot 4 -death sound/player/pyria-skadi/player/death 3 -drown sound/player/pyria-skadi/player/drown 0 +seenflag sound/player/female/coms/seenflag 0 +taunt sound/player/female/coms/taunt 5 +teamshoot sound/player/female/coms/teamshoot 4 +death sound/player/female/player/death 3 +drown sound/player/female/player/drown 0 //fall sound/player/carni-lycan/player/fall 0 -falling sound/player/pyria-skadi/player/falling 0 -gasp sound/player/pyria-skadi/player/gasp 0 -jump sound/player/pyria-skadi/player/jump 0 -swallow sound/player/pyria-skadi/player/swallow 0 -digest sound/player/pyria-skadi/player/digest 0 -regurgitate sound/player/pyria-skadi/player/regurgitate 0 -regurgitate_prepare sound/player/pyria-skadi/player/regurgitate_prepare 0 -gurgle sound/player/pyria-skadi/player/gurgle 0 -pain25 sound/player/pyria-skadi/player/pain25 0 -pain50 sound/player/pyria-skadi/player/pain50 0 -pain75 sound/player/pyria-skadi/player/pain75 0 -pain100 sound/player/pyria-skadi/player/pain100 0 +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 0 +digest sound/player/female/player/digest 0 +regurgitate sound/player/female/player/regurgitate 0 +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/sound/player/female/coms/attack1.ogg b/data/sound/player/female/coms/attack1.ogg new file mode 100644 index 00000000..c15aec80 Binary files /dev/null and b/data/sound/player/female/coms/attack1.ogg differ diff --git a/data/sound/player/female/coms/attack2.ogg b/data/sound/player/female/coms/attack2.ogg new file mode 100644 index 00000000..c6d6fcd1 Binary files /dev/null and b/data/sound/player/female/coms/attack2.ogg differ diff --git a/data/sound/player/female/coms/attackinfive.ogg b/data/sound/player/female/coms/attackinfive.ogg new file mode 100644 index 00000000..b393337d Binary files /dev/null and b/data/sound/player/female/coms/attackinfive.ogg differ diff --git a/data/sound/player/female/coms/coverme.ogg b/data/sound/player/female/coms/coverme.ogg new file mode 100644 index 00000000..84487a93 Binary files /dev/null and b/data/sound/player/female/coms/coverme.ogg differ diff --git a/data/sound/player/female/coms/defend.ogg b/data/sound/player/female/coms/defend.ogg new file mode 100644 index 00000000..689c6bcb Binary files /dev/null and b/data/sound/player/female/coms/defend.ogg differ diff --git a/data/sound/player/female/coms/freelance1.ogg b/data/sound/player/female/coms/freelance1.ogg new file mode 100644 index 00000000..a55cf9ca Binary files /dev/null and b/data/sound/player/female/coms/freelance1.ogg differ diff --git a/data/sound/player/female/coms/freelance2.ogg b/data/sound/player/female/coms/freelance2.ogg new file mode 100644 index 00000000..61010a2e Binary files /dev/null and b/data/sound/player/female/coms/freelance2.ogg differ diff --git a/data/sound/player/female/coms/incoming.ogg b/data/sound/player/female/coms/incoming.ogg new file mode 100644 index 00000000..96ae6c7f Binary files /dev/null and b/data/sound/player/female/coms/incoming.ogg differ diff --git a/data/sound/player/female/coms/meet.ogg b/data/sound/player/female/coms/meet.ogg new file mode 100644 index 00000000..2df86ce4 Binary files /dev/null and b/data/sound/player/female/coms/meet.ogg differ diff --git a/data/sound/player/female/coms/needhelp1.ogg b/data/sound/player/female/coms/needhelp1.ogg new file mode 100644 index 00000000..7834a874 Binary files /dev/null and b/data/sound/player/female/coms/needhelp1.ogg differ diff --git a/data/sound/player/female/coms/needhelp2.ogg b/data/sound/player/female/coms/needhelp2.ogg new file mode 100644 index 00000000..904bc255 Binary files /dev/null and b/data/sound/player/female/coms/needhelp2.ogg differ diff --git a/data/sound/player/female/coms/seenflag.ogg b/data/sound/player/female/coms/seenflag.ogg new file mode 100644 index 00000000..2cf58a30 Binary files /dev/null and b/data/sound/player/female/coms/seenflag.ogg differ diff --git a/data/sound/player/female/coms/taunt1.ogg b/data/sound/player/female/coms/taunt1.ogg new file mode 100644 index 00000000..a8cf700b Binary files /dev/null and b/data/sound/player/female/coms/taunt1.ogg differ diff --git a/data/sound/player/female/coms/taunt2.ogg b/data/sound/player/female/coms/taunt2.ogg new file mode 100644 index 00000000..a688f4c1 Binary files /dev/null and b/data/sound/player/female/coms/taunt2.ogg differ diff --git a/data/sound/player/female/coms/taunt3.ogg b/data/sound/player/female/coms/taunt3.ogg new file mode 100644 index 00000000..30c383c6 Binary files /dev/null and b/data/sound/player/female/coms/taunt3.ogg differ diff --git a/data/sound/player/female/coms/taunt4.ogg b/data/sound/player/female/coms/taunt4.ogg new file mode 100644 index 00000000..2cbf56b9 Binary files /dev/null and b/data/sound/player/female/coms/taunt4.ogg differ diff --git a/data/sound/player/female/coms/taunt5.ogg b/data/sound/player/female/coms/taunt5.ogg new file mode 100644 index 00000000..dcb9e4e4 Binary files /dev/null and b/data/sound/player/female/coms/taunt5.ogg differ diff --git a/data/sound/player/female/coms/teamshoot1.ogg b/data/sound/player/female/coms/teamshoot1.ogg new file mode 100644 index 00000000..ab17ada0 Binary files /dev/null and b/data/sound/player/female/coms/teamshoot1.ogg differ diff --git a/data/sound/player/female/coms/teamshoot2.ogg b/data/sound/player/female/coms/teamshoot2.ogg new file mode 100644 index 00000000..c4482c84 Binary files /dev/null and b/data/sound/player/female/coms/teamshoot2.ogg differ diff --git a/data/sound/player/female/coms/teamshoot3.ogg b/data/sound/player/female/coms/teamshoot3.ogg new file mode 100644 index 00000000..195060bd Binary files /dev/null and b/data/sound/player/female/coms/teamshoot3.ogg differ diff --git a/data/sound/player/female/coms/teamshoot4.ogg b/data/sound/player/female/coms/teamshoot4.ogg new file mode 100644 index 00000000..b3be062d Binary files /dev/null and b/data/sound/player/female/coms/teamshoot4.ogg differ diff --git a/data/sound/player/female/player/death1.ogg b/data/sound/player/female/player/death1.ogg new file mode 100644 index 00000000..8a0f5a4e Binary files /dev/null and b/data/sound/player/female/player/death1.ogg differ diff --git a/data/sound/player/female/player/death2.ogg b/data/sound/player/female/player/death2.ogg new file mode 100644 index 00000000..241ba754 Binary files /dev/null and b/data/sound/player/female/player/death2.ogg differ diff --git a/data/sound/player/female/player/death3.ogg b/data/sound/player/female/player/death3.ogg new file mode 100644 index 00000000..6b5e774d Binary files /dev/null and b/data/sound/player/female/player/death3.ogg differ diff --git a/data/sound/player/female/player/digest.wav b/data/sound/player/female/player/digest.wav new file mode 100644 index 00000000..8d5a28c1 Binary files /dev/null and b/data/sound/player/female/player/digest.wav differ diff --git a/data/sound/player/female/player/drown.ogg b/data/sound/player/female/player/drown.ogg new file mode 100644 index 00000000..c124c068 Binary files /dev/null and b/data/sound/player/female/player/drown.ogg differ diff --git a/data/sound/player/female/player/fall1.ogg b/data/sound/player/female/player/fall1.ogg new file mode 100644 index 00000000..eecf14ad Binary files /dev/null and b/data/sound/player/female/player/fall1.ogg differ diff --git a/data/sound/player/female/player/falling.ogg b/data/sound/player/female/player/falling.ogg new file mode 100644 index 00000000..634bad8b Binary files /dev/null and b/data/sound/player/female/player/falling.ogg differ diff --git a/data/sound/player/female/player/gasp.ogg b/data/sound/player/female/player/gasp.ogg new file mode 100644 index 00000000..2bd8694a Binary files /dev/null and b/data/sound/player/female/player/gasp.ogg differ diff --git a/data/sound/player/female/player/gurgle.ogg b/data/sound/player/female/player/gurgle.ogg new file mode 100644 index 00000000..e1ee710e Binary files /dev/null and b/data/sound/player/female/player/gurgle.ogg differ diff --git a/data/sound/player/female/player/jump.ogg b/data/sound/player/female/player/jump.ogg new file mode 100644 index 00000000..40475f25 Binary files /dev/null and b/data/sound/player/female/player/jump.ogg differ diff --git a/data/sound/player/female/player/pain100.ogg b/data/sound/player/female/player/pain100.ogg new file mode 100644 index 00000000..0fbb4b23 Binary files /dev/null and b/data/sound/player/female/player/pain100.ogg differ diff --git a/data/sound/player/female/player/pain25.ogg b/data/sound/player/female/player/pain25.ogg new file mode 100644 index 00000000..e31d485c Binary files /dev/null and b/data/sound/player/female/player/pain25.ogg differ diff --git a/data/sound/player/female/player/pain50.ogg b/data/sound/player/female/player/pain50.ogg new file mode 100644 index 00000000..6e8ac4df Binary files /dev/null and b/data/sound/player/female/player/pain50.ogg differ diff --git a/data/sound/player/female/player/pain75.ogg b/data/sound/player/female/player/pain75.ogg new file mode 100644 index 00000000..c7cf6cc8 Binary files /dev/null and b/data/sound/player/female/player/pain75.ogg differ diff --git a/data/sound/player/female/player/regurgitate.ogg b/data/sound/player/female/player/regurgitate.ogg new file mode 100644 index 00000000..c27e75c3 Binary files /dev/null and b/data/sound/player/female/player/regurgitate.ogg differ diff --git a/data/sound/player/female/player/regurgitate_prepare.ogg b/data/sound/player/female/player/regurgitate_prepare.ogg new file mode 100644 index 00000000..d40d58b3 Binary files /dev/null and b/data/sound/player/female/player/regurgitate_prepare.ogg differ diff --git a/data/sound/player/female/player/swallow.ogg b/data/sound/player/female/player/swallow.ogg new file mode 100644 index 00000000..9264917d Binary files /dev/null and b/data/sound/player/female/player/swallow.ogg differ diff --git a/data/sound/player/pyria-skadi/coms/attack1.ogg b/data/sound/player/pyria-skadi/coms/attack1.ogg deleted file mode 100644 index c15aec80..00000000 Binary files a/data/sound/player/pyria-skadi/coms/attack1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/attack2.ogg b/data/sound/player/pyria-skadi/coms/attack2.ogg deleted file mode 100644 index c6d6fcd1..00000000 Binary files a/data/sound/player/pyria-skadi/coms/attack2.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/attackinfive.ogg b/data/sound/player/pyria-skadi/coms/attackinfive.ogg deleted file mode 100644 index b393337d..00000000 Binary files a/data/sound/player/pyria-skadi/coms/attackinfive.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/coverme.ogg b/data/sound/player/pyria-skadi/coms/coverme.ogg deleted file mode 100644 index 84487a93..00000000 Binary files a/data/sound/player/pyria-skadi/coms/coverme.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/defend.ogg b/data/sound/player/pyria-skadi/coms/defend.ogg deleted file mode 100644 index 689c6bcb..00000000 Binary files a/data/sound/player/pyria-skadi/coms/defend.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/freelance1.ogg b/data/sound/player/pyria-skadi/coms/freelance1.ogg deleted file mode 100644 index a55cf9ca..00000000 Binary files a/data/sound/player/pyria-skadi/coms/freelance1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/freelance2.ogg b/data/sound/player/pyria-skadi/coms/freelance2.ogg deleted file mode 100644 index 61010a2e..00000000 Binary files a/data/sound/player/pyria-skadi/coms/freelance2.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/incoming.ogg b/data/sound/player/pyria-skadi/coms/incoming.ogg deleted file mode 100644 index 96ae6c7f..00000000 Binary files a/data/sound/player/pyria-skadi/coms/incoming.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/meet.ogg b/data/sound/player/pyria-skadi/coms/meet.ogg deleted file mode 100644 index 2df86ce4..00000000 Binary files a/data/sound/player/pyria-skadi/coms/meet.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/needhelp1.ogg b/data/sound/player/pyria-skadi/coms/needhelp1.ogg deleted file mode 100644 index 7834a874..00000000 Binary files a/data/sound/player/pyria-skadi/coms/needhelp1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/needhelp2.ogg b/data/sound/player/pyria-skadi/coms/needhelp2.ogg deleted file mode 100644 index 904bc255..00000000 Binary files a/data/sound/player/pyria-skadi/coms/needhelp2.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/seenflag.ogg b/data/sound/player/pyria-skadi/coms/seenflag.ogg deleted file mode 100644 index 2cf58a30..00000000 Binary files a/data/sound/player/pyria-skadi/coms/seenflag.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/taunt1.ogg b/data/sound/player/pyria-skadi/coms/taunt1.ogg deleted file mode 100644 index a8cf700b..00000000 Binary files a/data/sound/player/pyria-skadi/coms/taunt1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/taunt2.ogg b/data/sound/player/pyria-skadi/coms/taunt2.ogg deleted file mode 100644 index a688f4c1..00000000 Binary files a/data/sound/player/pyria-skadi/coms/taunt2.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/taunt3.ogg b/data/sound/player/pyria-skadi/coms/taunt3.ogg deleted file mode 100644 index 30c383c6..00000000 Binary files a/data/sound/player/pyria-skadi/coms/taunt3.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/taunt4.ogg b/data/sound/player/pyria-skadi/coms/taunt4.ogg deleted file mode 100644 index 2cbf56b9..00000000 Binary files a/data/sound/player/pyria-skadi/coms/taunt4.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/taunt5.ogg b/data/sound/player/pyria-skadi/coms/taunt5.ogg deleted file mode 100644 index dcb9e4e4..00000000 Binary files a/data/sound/player/pyria-skadi/coms/taunt5.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/teamshoot1.ogg b/data/sound/player/pyria-skadi/coms/teamshoot1.ogg deleted file mode 100644 index ab17ada0..00000000 Binary files a/data/sound/player/pyria-skadi/coms/teamshoot1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/teamshoot2.ogg b/data/sound/player/pyria-skadi/coms/teamshoot2.ogg deleted file mode 100644 index c4482c84..00000000 Binary files a/data/sound/player/pyria-skadi/coms/teamshoot2.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/teamshoot3.ogg b/data/sound/player/pyria-skadi/coms/teamshoot3.ogg deleted file mode 100644 index 195060bd..00000000 Binary files a/data/sound/player/pyria-skadi/coms/teamshoot3.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/coms/teamshoot4.ogg b/data/sound/player/pyria-skadi/coms/teamshoot4.ogg deleted file mode 100644 index b3be062d..00000000 Binary files a/data/sound/player/pyria-skadi/coms/teamshoot4.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/death1.ogg b/data/sound/player/pyria-skadi/player/death1.ogg deleted file mode 100644 index 8a0f5a4e..00000000 Binary files a/data/sound/player/pyria-skadi/player/death1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/death2.ogg b/data/sound/player/pyria-skadi/player/death2.ogg deleted file mode 100644 index 241ba754..00000000 Binary files a/data/sound/player/pyria-skadi/player/death2.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/death3.ogg b/data/sound/player/pyria-skadi/player/death3.ogg deleted file mode 100644 index 6b5e774d..00000000 Binary files a/data/sound/player/pyria-skadi/player/death3.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/digest.wav b/data/sound/player/pyria-skadi/player/digest.wav deleted file mode 100644 index 8d5a28c1..00000000 Binary files a/data/sound/player/pyria-skadi/player/digest.wav and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/drown.ogg b/data/sound/player/pyria-skadi/player/drown.ogg deleted file mode 100644 index c124c068..00000000 Binary files a/data/sound/player/pyria-skadi/player/drown.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/fall1.ogg b/data/sound/player/pyria-skadi/player/fall1.ogg deleted file mode 100644 index eecf14ad..00000000 Binary files a/data/sound/player/pyria-skadi/player/fall1.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/falling.ogg b/data/sound/player/pyria-skadi/player/falling.ogg deleted file mode 100644 index 634bad8b..00000000 Binary files a/data/sound/player/pyria-skadi/player/falling.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/gasp.ogg b/data/sound/player/pyria-skadi/player/gasp.ogg deleted file mode 100644 index 2bd8694a..00000000 Binary files a/data/sound/player/pyria-skadi/player/gasp.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/gurgle.ogg b/data/sound/player/pyria-skadi/player/gurgle.ogg deleted file mode 100644 index e1ee710e..00000000 Binary files a/data/sound/player/pyria-skadi/player/gurgle.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/jump.ogg b/data/sound/player/pyria-skadi/player/jump.ogg deleted file mode 100644 index 40475f25..00000000 Binary files a/data/sound/player/pyria-skadi/player/jump.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/pain100.ogg b/data/sound/player/pyria-skadi/player/pain100.ogg deleted file mode 100644 index 0fbb4b23..00000000 Binary files a/data/sound/player/pyria-skadi/player/pain100.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/pain25.ogg b/data/sound/player/pyria-skadi/player/pain25.ogg deleted file mode 100644 index e31d485c..00000000 Binary files a/data/sound/player/pyria-skadi/player/pain25.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/pain50.ogg b/data/sound/player/pyria-skadi/player/pain50.ogg deleted file mode 100644 index 6e8ac4df..00000000 Binary files a/data/sound/player/pyria-skadi/player/pain50.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/pain75.ogg b/data/sound/player/pyria-skadi/player/pain75.ogg deleted file mode 100644 index c7cf6cc8..00000000 Binary files a/data/sound/player/pyria-skadi/player/pain75.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/regurgitate.ogg b/data/sound/player/pyria-skadi/player/regurgitate.ogg deleted file mode 100644 index c27e75c3..00000000 Binary files a/data/sound/player/pyria-skadi/player/regurgitate.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/regurgitate_prepare.ogg b/data/sound/player/pyria-skadi/player/regurgitate_prepare.ogg deleted file mode 100644 index d40d58b3..00000000 Binary files a/data/sound/player/pyria-skadi/player/regurgitate_prepare.ogg and /dev/null differ diff --git a/data/sound/player/pyria-skadi/player/swallow.ogg b/data/sound/player/pyria-skadi/player/swallow.ogg deleted file mode 100644 index 9264917d..00000000 Binary files a/data/sound/player/pyria-skadi/player/swallow.ogg and /dev/null differ