From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Thu, 12 May 2011 03:23:49 +0000 (-0400)
Subject: Make mega erebus fbskin only. Remove erebus fbskin.
X-Git-Tag: xonotic-v0.5.0~220^2~4^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02ed6b0208c13d9f349d22a6c6c241f809858ccc;p=xonotic%2Fxonotic-data.pk3dir.git

Make mega erebus fbskin only. Remove erebus fbskin.
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 73d5d6352..ab1a3df60 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1180,9 +1180,9 @@ alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color
 alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
 alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
 alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
-alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
-alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
-alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
+alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
+alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
+alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
 alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
 
 seta sv_servermodelsonly 1
diff --git a/models/player/erebus.iqm_1.skin b/models/player/erebus.iqm_1.skin
deleted file mode 100644
index 4597ceff1..000000000
--- a/models/player/erebus.iqm_1.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
diff --git a/models/player/erebus.iqm_1.sounds b/models/player/erebus.iqm_1.sounds
deleted file mode 100644
index a97a073b9..000000000
--- a/models/player/erebus.iqm_1.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/soldier/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/soldier/coms/attackinfive 0
-coverme sound/player/soldier/coms/coverme 0
-defend sound/player/soldier/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-flagcarriertakingdamage sound/player/soldier/coms/flagcarriertakingdamage 0
-freelance sound/player/soldier/coms/freelance 2
-getflag sound/player/soldier/coms/getflag 0
-incoming sound/player/soldier/coms/incoming 0
-meet sound/player/soldier/coms/meet 0
-needhelp sound/player/soldier/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/soldier/coms/seenflag 0
-taunt sound/player/soldier/coms/taunt 3
-teamshoot sound/player/soldier/coms/teamshoot 3
-death sound/player/soldier/player/death 3
-drown sound/player/soldier/player/drown 0
-fall sound/player/soldier/player/fall 0
-falling sound/player/soldier/player/falling 0
-gasp sound/player/soldier/player/gasp 0
-jump sound/player/soldier/player/jump 0
-pain25 sound/player/soldier/player/pain25 0
-pain50 sound/player/soldier/player/pain50 0
-pain75 sound/player/soldier/player/pain75 0
-pain100 sound/player/soldier/player/pain100 0
diff --git a/models/player/erebus.iqm_1.tga b/models/player/erebus.iqm_1.tga
deleted file mode 100644
index bf151b5d2..000000000
Binary files a/models/player/erebus.iqm_1.tga and /dev/null differ
diff --git a/models/player/erebus.iqm_1.txt b/models/player/erebus.iqm_1.txt
deleted file mode 100644
index 7b8389b40..000000000
--- a/models/player/erebus.iqm_1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-name Glowing Erebus
-species human
-sex Male
-weight 106
-age 26
-
-Heavyweight Xonotic Solider with LEDs
diff --git a/models/player/erebus_lod1.iqm_1.skin b/models/player/erebus_lod1.iqm_1.skin
deleted file mode 100644
index 4597ceff1..000000000
--- a/models/player/erebus_lod1.iqm_1.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
diff --git a/models/player/erebus_lod2.iqm_1.skin b/models/player/erebus_lod2.iqm_1.skin
deleted file mode 100644
index 4597ceff1..000000000
--- a/models/player/erebus_lod2.iqm_1.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-erebus,erebusfullbright
-erebus.001,shadowhead
diff --git a/models/player/megaerebus.iqm_0.skin b/models/player/megaerebus.iqm_0.skin
index 81c4f3bae..4597ceff1 100644
--- a/models/player/megaerebus.iqm_0.skin
+++ b/models/player/megaerebus.iqm_0.skin
@@ -1,2 +1,2 @@
-erebus,erebus
+erebus,erebusfullbright
 erebus.001,shadowhead