From: Mario Date: Thu, 1 Sep 2016 11:35:03 +0000 (+1000) Subject: Remove gakarmored and ignishalfmasked X-Git-Tag: xonotic-v0.8.2~628 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4ca621eb9d4c30df1f9c519659078d87977ad81;p=xonotic%2Fxonotic-data.pk3dir.git Remove gakarmored and ignishalfmasked --- diff --git a/bots.txt b/bots.txt index fc8082f49..18df7f835 100644 --- a/bots.txt +++ b/bots.txt @@ -2,7 +2,7 @@ //default team values (team-override): 1 = red, 2 = blue, 3 = yellow, 4 = pink //use -1 for shirt-color or pants-color to get random colors Hellfire ignis 0 4 0 0 0 0 -0.5 -1 1 1 -0.5 -1 -1 2 0.5 -1 -Toxic gakarmored 0 14 7 0 -1 -1.5 -0.5 0 1 0 0 0 2 -0.5 -0.5 1 +Toxic gakmasked 0 14 7 0 -1 -1.5 -0.5 0 1 0 0 0 2 -0.5 -0.5 1 Discovery erebus 0 2 6 0 0 -1 -0.5 -0.5 1 -0.5 0.5 1.5 -0.5 -1 1 0.5 Pegasus umbra 0 13 11 0 1 1 1 1 -1 0 0.5 0 -2 0 -1 0 Eureka umbra 0 12 7 0 0 0 -1.5 -0.5 -0.5 0 0 0 0 -0.5 1.5 1.5 @@ -10,7 +10,7 @@ Airhead ignis 0 11 1 0 -1 -1.5 -1 -0.5 1 1 -1 1 -0.5 1 0.5 0 Gator gak 0 3 10 0 0 1 0 0.5 -0.5 0.5 -0.5 -1 0 0 -0.5 0 Delirium gakmasked 0 8 12 0 0 -1 -1 -1 0 2 0 1 0 2 -1 -1 Death gakmasked 0 4 11 0 -0.5 0 0 1 -0.5 0 1 0 0 0 0 0 -Scorcher ignishalfmasked 0 13 13 0 0 -1 0 -0.5 0.5 1 0 1 -2 1 0 0 +Scorcher ignismasked 0 13 13 0 0 -1 0 -0.5 0.5 1 0 1 -2 1 0 0 Necrotic nyx 0 12 14 0 0 0 0 1 0 -1 -0.5 -1 1 0 0 0 Dominator nyx 0 3 9 0 0 0 0 2 -1 0 0 0 -1 0 0 0 Thunderstorm erebus 0 13 6 0 0 0 0 -0.5 -1 1 0.5 0.5 -0.5 0 0.5 0 diff --git a/models/player/gakarmored.iqm b/models/player/gakarmored.iqm deleted file mode 100644 index 824e52ae6..000000000 Binary files a/models/player/gakarmored.iqm and /dev/null differ diff --git a/models/player/gakarmored.iqm.framegroups b/models/player/gakarmored.iqm.framegroups deleted file mode 100644 index 98eabd70b..000000000 --- a/models/player/gakarmored.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -0 36 15.000000 0 // dieone -36 20 15.000000 0 // dietwo -56 15 15.000000 1 // draw -71 20 15.000000 1 // duck -91 21 30.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 5.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 15.000000 0 // painone -359 17 15.000000 0 // paintwo -376 3 15.000000 0 // shoot -379 21 15.000000 1 // taunt -400 21 35.000000 1 // run -421 21 35.000000 1 // runbackwards -442 21 35.000000 1 // strafeleft -463 21 35.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 21 35.000000 1 // forwardright -509 21 35.000000 1 // forwardleft -530 21 35.000000 1 // backright -551 21 30.000000 1 // backleft -572 21 20.000000 0 // melee -593 21 30.000000 1 // duckwalkbackwards -91 21 30.000000 1 // duckwalkstrafeleft -91 21 30.000000 1 // duckwalkstraferight -91 21 30.000000 1 // duckwalkforwardright -91 21 30.000000 1 // duckwalkforwardleft -593 21 30.000000 1 // duckwalkbackright -593 21 30.000000 1 // duckwalkbackleft \ No newline at end of file diff --git a/models/player/gakarmored.iqm_0.skin b/models/player/gakarmored.iqm_0.skin deleted file mode 100644 index 1e8d3e9cf..000000000 --- a/models/player/gakarmored.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -gak1.001,gak -gak1,gakarmor diff --git a/models/player/gakarmored.iqm_0.sounds b/models/player/gakarmored.iqm_0.sounds deleted file mode 100644 index fb5b767df..000000000 --- a/models/player/gakarmored.iqm_0.sounds +++ /dev/null @@ -1,32 +0,0 @@ -//TAG: reptilian -//affirmative sound/player/carni-lycan/player/affirmative 0 -attack sound/player/reptilian/coms/attack 0 -//attacking sound/player/carni-lycan/player/attacking 0 -attackinfive sound/player/reptilian/coms/attackinfive 0 -coverme sound/player/reptilian/coms/coverme 0 -defend sound/player/reptilian/coms/defend 0 -//defending sound/player/carni-lycan/player/defending 0 -//droppedflag sound/player/carni-lycan/player/droppedflag 0 -//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0 -freelance sound/player/reptilian/coms/freelance 2 -//getflag sound/player/soldier/player/getflag 0 -incoming sound/player/reptilian/coms/incoming 0 -meet sound/player/reptilian/coms/meet 0 -needhelp sound/player/reptilian/coms/needhelp 2 -//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/reptilian/coms/seenflag 0 -taunt sound/player/reptilian/coms/taunt 3 -teamshoot sound/player/reptilian/coms/teamshoot 3 -death sound/player/reptilian/player/death 3 -drown sound/player/reptilian/player/drown 0 -fall sound/player/reptilian/player/fall 0 -falling sound/player/reptilian/player/falling 0 -gasp sound/player/reptilian/player/gasp 0 -jump sound/player/reptilian/player/jump 0 -pain25 sound/player/reptilian/player/pain25 0 -pain50 sound/player/reptilian/player/pain50 0 -pain75 sound/player/reptilian/player/pain75 0 -pain100 sound/player/reptilian/player/pain100 0 diff --git a/models/player/gakarmored.iqm_0.tga b/models/player/gakarmored.iqm_0.tga deleted file mode 100644 index 0fbb375cd..000000000 Binary files a/models/player/gakarmored.iqm_0.tga and /dev/null differ diff --git a/models/player/gakarmored.iqm_0.txt b/models/player/gakarmored.iqm_0.txt deleted file mode 100644 index 46977b885..000000000 --- a/models/player/gakarmored.iqm_0.txt +++ /dev/null @@ -1,12 +0,0 @@ -name Gak Armored -species alien -sex Male -weight 90 -age 20 -description Heavyweight Xonotic Soldier -bone_upperbody spine2 -bone_aim0 0.25 spine2 -bone_aim1 0.4 spine4 -bone_aim2 0.35 bip01 r hand -bone_weapon bip01 r hand -fixbone 1 diff --git a/models/player/gakarmored.iqm_1.skin b/models/player/gakarmored.iqm_1.skin deleted file mode 100644 index 3377bcb48..000000000 --- a/models/player/gakarmored.iqm_1.skin +++ /dev/null @@ -1,2 +0,0 @@ -gak1.001,gakfullbright -gak1,gakarmorfb diff --git a/models/player/gakarmored_lod1.iqm b/models/player/gakarmored_lod1.iqm deleted file mode 100644 index bbf00f701..000000000 Binary files a/models/player/gakarmored_lod1.iqm and /dev/null differ diff --git a/models/player/gakarmored_lod1.iqm.framegroups b/models/player/gakarmored_lod1.iqm.framegroups deleted file mode 100644 index 98eabd70b..000000000 --- a/models/player/gakarmored_lod1.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -0 36 15.000000 0 // dieone -36 20 15.000000 0 // dietwo -56 15 15.000000 1 // draw -71 20 15.000000 1 // duck -91 21 30.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 5.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 15.000000 0 // painone -359 17 15.000000 0 // paintwo -376 3 15.000000 0 // shoot -379 21 15.000000 1 // taunt -400 21 35.000000 1 // run -421 21 35.000000 1 // runbackwards -442 21 35.000000 1 // strafeleft -463 21 35.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 21 35.000000 1 // forwardright -509 21 35.000000 1 // forwardleft -530 21 35.000000 1 // backright -551 21 30.000000 1 // backleft -572 21 20.000000 0 // melee -593 21 30.000000 1 // duckwalkbackwards -91 21 30.000000 1 // duckwalkstrafeleft -91 21 30.000000 1 // duckwalkstraferight -91 21 30.000000 1 // duckwalkforwardright -91 21 30.000000 1 // duckwalkforwardleft -593 21 30.000000 1 // duckwalkbackright -593 21 30.000000 1 // duckwalkbackleft \ No newline at end of file diff --git a/models/player/gakarmored_lod1.iqm_0.skin b/models/player/gakarmored_lod1.iqm_0.skin deleted file mode 100644 index 1e8d3e9cf..000000000 --- a/models/player/gakarmored_lod1.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -gak1.001,gak -gak1,gakarmor diff --git a/models/player/gakarmored_lod1.iqm_1.skin b/models/player/gakarmored_lod1.iqm_1.skin deleted file mode 100644 index 3377bcb48..000000000 --- a/models/player/gakarmored_lod1.iqm_1.skin +++ /dev/null @@ -1,2 +0,0 @@ -gak1.001,gakfullbright -gak1,gakarmorfb diff --git a/models/player/gakarmored_lod2.iqm b/models/player/gakarmored_lod2.iqm deleted file mode 100644 index 8fdbceffa..000000000 Binary files a/models/player/gakarmored_lod2.iqm and /dev/null differ diff --git a/models/player/gakarmored_lod2.iqm.framegroups b/models/player/gakarmored_lod2.iqm.framegroups deleted file mode 100644 index 98eabd70b..000000000 --- a/models/player/gakarmored_lod2.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -0 36 15.000000 0 // dieone -36 20 15.000000 0 // dietwo -56 15 15.000000 1 // draw -71 20 15.000000 1 // duck -91 21 30.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 5.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 15.000000 0 // painone -359 17 15.000000 0 // paintwo -376 3 15.000000 0 // shoot -379 21 15.000000 1 // taunt -400 21 35.000000 1 // run -421 21 35.000000 1 // runbackwards -442 21 35.000000 1 // strafeleft -463 21 35.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 21 35.000000 1 // forwardright -509 21 35.000000 1 // forwardleft -530 21 35.000000 1 // backright -551 21 30.000000 1 // backleft -572 21 20.000000 0 // melee -593 21 30.000000 1 // duckwalkbackwards -91 21 30.000000 1 // duckwalkstrafeleft -91 21 30.000000 1 // duckwalkstraferight -91 21 30.000000 1 // duckwalkforwardright -91 21 30.000000 1 // duckwalkforwardleft -593 21 30.000000 1 // duckwalkbackright -593 21 30.000000 1 // duckwalkbackleft \ No newline at end of file diff --git a/models/player/gakarmored_lod2.iqm_0.skin b/models/player/gakarmored_lod2.iqm_0.skin deleted file mode 100644 index 1e8d3e9cf..000000000 --- a/models/player/gakarmored_lod2.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -gak1.001,gak -gak1,gakarmor diff --git a/models/player/gakarmored_lod2.iqm_1.skin b/models/player/gakarmored_lod2.iqm_1.skin deleted file mode 100644 index 3377bcb48..000000000 --- a/models/player/gakarmored_lod2.iqm_1.skin +++ /dev/null @@ -1,2 +0,0 @@ -gak1.001,gakfullbright -gak1,gakarmorfb diff --git a/models/player/ignishalfmasked.iqm b/models/player/ignishalfmasked.iqm deleted file mode 100644 index 7b11d80ed..000000000 Binary files a/models/player/ignishalfmasked.iqm and /dev/null differ diff --git a/models/player/ignishalfmasked.iqm.framegroups b/models/player/ignishalfmasked.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/ignishalfmasked.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -0 36 30.000000 0 // dieone -36 20 25.000000 0 // dietwo -56 15 30.000000 1 // draw -71 20 15.000000 1 // duck -91 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/ignishalfmasked.iqm_0.skin b/models/player/ignishalfmasked.iqm_0.skin deleted file mode 100644 index 9523f9edb..000000000 --- a/models/player/ignishalfmasked.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -ignis1,ignis -ignis2.001,ignishead diff --git a/models/player/ignishalfmasked.iqm_0.sounds b/models/player/ignishalfmasked.iqm_0.sounds deleted file mode 100644 index 952ba1c79..000000000 --- a/models/player/ignishalfmasked.iqm_0.sounds +++ /dev/null @@ -1,32 +0,0 @@ -//TAG: insurrectionist -//affirmative sound/player/carni-lycan/player/affirmative 0 -attack sound/player/insurrectionist/coms/attack 0 -//attacking sound/player/carni-lycan/player/attacking 0 -attackinfive sound/player/insurrectionist/coms/attackinfive 0 -coverme sound/player/insurrectionist/coms/coverme 0 -defend sound/player/insurrectionist/coms/defend 0 -//defending sound/player/carni-lycan/player/defending 0 -//droppedflag sound/player/carni-lycan/player/droppedflag 0 -//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0 -freelance sound/player/insurrectionist/coms/freelance 2 -//getflag sound/player/soldier/player/getflag 0 -incoming sound/player/insurrectionist/coms/incoming 0 -meet sound/player/insurrectionist/coms/meet 0 -needhelp sound/player/insurrectionist/coms/needhelp 2 -//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/insurrectionist/coms/seenflag 0 -taunt sound/player/insurrectionist/coms/taunt 4 -teamshoot sound/player/insurrectionist/coms/teamshoot 3 -death sound/player/insurrectionist/player/death 3 -drown sound/player/insurrectionist/player/drown 0 -fall sound/player/insurrectionist/player/fall 0 -falling sound/player/insurrectionist/player/falling 0 -gasp sound/player/insurrectionist/player/gasp 0 -jump sound/player/insurrectionist/player/jump 0 -pain25 sound/player/insurrectionist/player/pain25 0 -pain50 sound/player/insurrectionist/player/pain50 0 -pain75 sound/player/insurrectionist/player/pain75 0 -pain100 sound/player/insurrectionist/player/pain100 0 diff --git a/models/player/ignishalfmasked.iqm_0.tga b/models/player/ignishalfmasked.iqm_0.tga deleted file mode 100644 index 487a13116..000000000 Binary files a/models/player/ignishalfmasked.iqm_0.tga and /dev/null differ diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt deleted file mode 100644 index 01c99adf0..000000000 --- a/models/player/ignishalfmasked.iqm_0.txt +++ /dev/null @@ -1,13 +0,0 @@ -name Ignis - Half Masked -species human -sex Male -weight 90 -age 31 -description Heavyweight Xonotic Soldier -bone_upperbody spine2 -bone_aim0 0.25 spine2 -bone_aim1 0.4 spine4 -bone_aim2 0.2 upperarm_L -bone_aim3 0.35 bip01 r hand -bone_weapon bip01 r hand -fixbone 1 diff --git a/models/player/ignishalfmasked.iqm_1.skin b/models/player/ignishalfmasked.iqm_1.skin deleted file mode 100644 index 89a002028..000000000 --- a/models/player/ignishalfmasked.iqm_1.skin +++ /dev/null @@ -1,2 +0,0 @@ -ignis1,ignisfullbright -ignis2.001,ignishead diff --git a/models/player/ignishalfmasked_lod1.iqm b/models/player/ignishalfmasked_lod1.iqm deleted file mode 100644 index e3877a753..000000000 Binary files a/models/player/ignishalfmasked_lod1.iqm and /dev/null differ diff --git a/models/player/ignishalfmasked_lod1.iqm.framegroups b/models/player/ignishalfmasked_lod1.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/ignishalfmasked_lod1.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -0 36 30.000000 0 // dieone -36 20 25.000000 0 // dietwo -56 15 30.000000 1 // draw -71 20 15.000000 1 // duck -91 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/ignishalfmasked_lod1.iqm_0.skin b/models/player/ignishalfmasked_lod1.iqm_0.skin deleted file mode 100644 index 9523f9edb..000000000 --- a/models/player/ignishalfmasked_lod1.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -ignis1,ignis -ignis2.001,ignishead diff --git a/models/player/ignishalfmasked_lod1.iqm_1.skin b/models/player/ignishalfmasked_lod1.iqm_1.skin deleted file mode 100644 index 89a002028..000000000 --- a/models/player/ignishalfmasked_lod1.iqm_1.skin +++ /dev/null @@ -1,2 +0,0 @@ -ignis1,ignisfullbright -ignis2.001,ignishead diff --git a/models/player/ignishalfmasked_lod2.iqm b/models/player/ignishalfmasked_lod2.iqm deleted file mode 100644 index 48b0696de..000000000 Binary files a/models/player/ignishalfmasked_lod2.iqm and /dev/null differ diff --git a/models/player/ignishalfmasked_lod2.iqm.framegroups b/models/player/ignishalfmasked_lod2.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/ignishalfmasked_lod2.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -0 36 30.000000 0 // dieone -36 20 25.000000 0 // dietwo -56 15 30.000000 1 // draw -71 20 15.000000 1 // duck -91 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/ignishalfmasked_lod2.iqm_0.skin b/models/player/ignishalfmasked_lod2.iqm_0.skin deleted file mode 100644 index 9523f9edb..000000000 --- a/models/player/ignishalfmasked_lod2.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -ignis1,ignis -ignis2.001,ignishead diff --git a/models/player/ignishalfmasked_lod2.iqm_1.skin b/models/player/ignishalfmasked_lod2.iqm_1.skin deleted file mode 100644 index 89a002028..000000000 --- a/models/player/ignishalfmasked_lod2.iqm_1.skin +++ /dev/null @@ -1,2 +0,0 @@ -ignis1,ignisfullbright -ignis2.001,ignishead