From 5b6bd68833a8cd98a7a408c97d85d0431caffcbf Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 23 Feb 2015 16:58:17 +0100
Subject: [PATCH] Nest fixes.

---
 maps/nest_chamber_13.map                |  34 +++++--
 models/nest_chamber_13/nest_protect.bsp | Bin 2492 -> 0 bytes
 models/nest_chamber_13/nest_protect.mtl |   4 +
 models/nest_chamber_13/nest_protect.obj | 124 ++++++++++++++++++++++++
 4 files changed, 155 insertions(+), 7 deletions(-)
 delete mode 100644 models/nest_chamber_13/nest_protect.bsp
 create mode 100644 models/nest_chamber_13/nest_protect.mtl
 create mode 100644 models/nest_chamber_13/nest_protect.obj

diff --git a/maps/nest_chamber_13.map b/maps/nest_chamber_13.map
index e22767d5..e74bfa33 100644
--- a/maps/nest_chamber_13.map
+++ b/maps/nest_chamber_13.map
@@ -57485,22 +57485,42 @@ brushDef
 "sound" "sound/nest_chamber_13/hushed.wav"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "target_spawn"
 "targetname" "for_precaching_only"
-"model" "models/nest_chamber_13/nest_protect.bsp"
-"effects" "16"
+"message" "classname misc_gamemodel targetname for_precaching_only model models/nest_chamber_13/nest_protect.obj effects 16 $ spawnfunc_misc_gamemodel"
+"spawnflags" "1"
+}
+{
+"classname" "trigger_gamestart"
+"target" "nest_protect_timer"
+"wait" "14.213562373095048801688724209"
 }
 {
 "classname" "trigger_multivibrator"
 "target" "nest_protect"
+"targetname" "nest_protect_timer"
 "target_random" "1"
-"wait" "3.1415926535897932384626433832795028841971"
-"respawntime" "2.7182818284590452353602874713526624977572"
-"spawnflags" "1"
+"wait" "5.926535897932384626433832795028841971"
+"respawntime" "7.182818284590452353602874713526624977572"
+}
+{
+"classname" "target_spawn"
+"targetname" "nest_protect"
+"message" "classname func_breakable health 100 respawntime 30 respawntimejitter 10 mdl TE_TEI_BIGEXPLOSION model models/nest_chamber_13/nest_protect.obj noise1 sound/nest_chamber_13/canthushhere.ogg noise sound/nest_chamber_13/hushed.wav origin $self.origin $ spawnfunc_func_breakable"
+"count" "1"
+"origin" "352.000000 -576.000000 160.000000"
+}
+{
+"classname" "target_spawn"
+"targetname" "nest_protect"
+"message" "classname func_breakable health 100 respawntime 30 respawntimejitter 10 mdl TE_TEI_BIGEXPLOSION model models/nest_chamber_13/nest_protect.obj noise1 sound/nest_chamber_13/canthushhere.ogg noise sound/nest_chamber_13/hushed.wav origin $self.origin $ spawnfunc_func_breakable"
+"count" "1"
+"origin" "352.000000 224.000000 160.000000"
 }
 {
 "classname" "target_spawn"
 "targetname" "nest_protect"
-"message" "classname func_breakable health 100 respawntime 30 respawntimejitter 10 mdl TE_TEI_BIGEXPLOSION model models/nest_chamber_13/nest_protect.bsp noise sound/nest_chamber_13/canthushhere.ogg noise1 sound/nest_chamber_13/hushed.wav $ spwawnfunc_func_breakable"
+"message" "classname func_breakable health 100 respawntime 30 respawntimejitter 10 mdl TE_TEI_BIGEXPLOSION model models/nest_chamber_13/nest_protect.obj noise1 sound/nest_chamber_13/canthushhere.ogg noise sound/nest_chamber_13/hushed.wav origin $self.origin $ spawnfunc_func_breakable"
 "count" "1"
+"origin" "352.000000 -176.000000 192.000000"
 }
diff --git a/models/nest_chamber_13/nest_protect.bsp b/models/nest_chamber_13/nest_protect.bsp
deleted file mode 100644
index 9530e5069a3b1dcd5cb6f61da75c296aac7dcb32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2492
zcmbW3$!-%t5QaPKn6Qci$C1SW4o*By3?vs6BoL7j5rl-qDH@z1jIhUMY?2^^<cHzN
zBOpQUJOU4Z#1{4~5dOcXf2ZyEL`gk0UG-H>b$89!vzKlxj2UAl4;s^ieuZ%r<MaqF
z7$^4`^K=*H7#q8d**pL{g!&ltDB{jQzrcJH`XzK3n)xVCpieo?x$M%kQ8a(%;%0-n
zYd0?k^S6TQ6Z10*m7p?K9ShH=rRAhkil?Tkwc3TCnFjM1SK`}2Wg-aAO_!_FVHi}(
zVYP79v^w!x=Rp>?$L~b7q@HvhhT&wAuB?r(M)i8B*37bGshO24uw{7_JFnaZCtYK@
z7d6Rs_c=7|9P)K%Fo#$l_4>BYa`4M%Irt?uhd*b2@RVMD=T{CsPd>}RFQ1(c_^pk3
zCEfhS&p}Hshx6yu|6bVx9B7XnGU6=kC(6dw)|U9((tkxO_JlD%z*943n80mCKJj{<
z?9{9UZQduWNBJ2mr|RA#1N3X>S1tZ}#qV`IbCTD3y)^b#JP<21l2!e~c*fwB?FsXX
zXKc@b8|~wM&!~E|H~xCXYfW0K!UxY+ynCf>?aZs3+9Sn_w~NI^^@>+bKF{?QoI$)a
z^DCB!&h?PvRX=%-!Ft5=yG9|enB3Ce&*FhuQC`0W#Zi-I{f9Y$kY|4JoadhWsy;j7
zjN*Mxu|&ilb-d~)@5eZIkLP-|uYL^ohlA(O8hBpnHFC`9GjN-~uxVd7A7ohLA26zQ
zkl~!q;5+jR9Oo3~VL#~1Sj#4CzdeR~;WLc;37h)eubDosi*+#0?{U>khQfN-(_h`Q
zl*jK+#(#(Zo5!dgxU6sw*^4|Mf1l~pKJ)$ya_~&ZaL#(D#jyX`L$nWL$g*ZW?;{w+
zOZ$8H8U9Zmqka;@Tp!@)S_f;UkLzYV$1&c38^*w8>p21a);)`y>Y<;)T<>9j=P|0s
z0`8(7)O)R7(sxJS6`i{u+kbC=tJh(}u)nJ_{r>#DcvL7Z-k)eht;*s`oVAl?S`3Oq
z{+|@LxmshXo}@9jQX}p}LFrx`x8{=NyPbAWS^-$AN9}eRHHfS>v-(oI6|JVl!ejSw
M<NK&}Q1hMo2Ti6h8UO$Q

diff --git a/models/nest_chamber_13/nest_protect.mtl b/models/nest_chamber_13/nest_protect.mtl
new file mode 100644
index 00000000..d0651d30
--- /dev/null
+++ b/models/nest_chamber_13/nest_protect.mtl
@@ -0,0 +1,4 @@
+# Generated by Q3Map2 (ydnar) -convert -format obj
+newmtl textures/facility114invx/wall-corridor02invr
+Kd 0.850108 0.834451 1.000000
+map_Kd textures/facility114invx/wall-corridor02invr
diff --git a/models/nest_chamber_13/nest_protect.obj b/models/nest_chamber_13/nest_protect.obj
new file mode 100644
index 00000000..501eeddd
--- /dev/null
+++ b/models/nest_chamber_13/nest_protect.obj
@@ -0,0 +1,124 @@
+o nest_protect
+# Generated by Q3Map2 (ydnar) -convert -format obj
+mtllib nest_protect.mtl
+g mat0model0surf0
+# SURFACETYPE MST_PLANAR
+usemtl textures/facility114invx/wall-corridor02invr
+# vertex 1
+v 16.000000 16.000000 -8.000000
+vn 1.000000 0.000000 0.000000
+vt 0.906250 0.078125
+# vertex 2
+v 16.000000 -16.000000 -8.000000
+vn 1.000000 0.000000 0.000000
+vt 0.593750 0.078125
+# vertex 3
+v 16.000000 16.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vt 0.906250 0.156250
+# vertex 4
+v 16.000000 -16.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vt 0.593750 0.156250
+f 1/1/1 3/3/3 2/2/2
+f 3/3/3 4/4/4 2/2/2
+g mat0model0surf1
+# SURFACETYPE MST_PLANAR
+# vertex 5
+v -16.000000 16.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vt 0.718750 0.156250
+# vertex 6
+v -16.000000 16.000000 -8.000000
+vn 0.000000 1.000000 0.000000
+vt 0.718750 0.078125
+# vertex 7
+v 16.000000 16.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vt 0.406250 0.156250
+# vertex 8
+v 16.000000 16.000000 -8.000000
+vn 0.000000 1.000000 0.000000
+vt 0.406250 0.078125
+f 5/5/5 7/7/7 6/6/6
+f 7/7/7 8/8/8 6/6/6
+g mat0model0surf2
+# SURFACETYPE MST_PLANAR
+# vertex 9
+v 16.000000 -16.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vt 0.593750 0.593750
+# vertex 10
+v -16.000000 -16.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vt 0.593750 0.906250
+# vertex 11
+v 16.000000 16.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vt 0.906250 0.593750
+# vertex 12
+v -16.000000 16.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vt 0.906250 0.906250
+f 9/9/9 11/11/11 10/10/10
+f 11/11/11 12/12/12 10/10/10
+g mat0model0surf3
+# SURFACETYPE MST_PLANAR
+# vertex 13
+v -16.000000 16.000000 -8.000000
+vn 0.000000 0.000000 -1.000000
+vt 0.906250 0.406250
+# vertex 14
+v -16.000000 -16.000000 -8.000000
+vn 0.000000 0.000000 -1.000000
+vt 0.593750 0.406250
+# vertex 15
+v 16.000000 16.000000 -8.000000
+vn 0.000000 0.000000 -1.000000
+vt 0.906250 0.718750
+# vertex 16
+v 16.000000 -16.000000 -8.000000
+vn 0.000000 0.000000 -1.000000
+vt 0.593750 0.718750
+f 13/13/13 15/15/15 14/14/14
+f 15/15/15 16/16/16 14/14/14
+g mat0model0surf4
+# SURFACETYPE MST_PLANAR
+# vertex 17
+v 16.000000 -16.000000 -8.000000
+vn 0.000000 -1.000000 0.000000
+vt 0.531250 0.078125
+# vertex 18
+v -16.000000 -16.000000 -8.000000
+vn 0.000000 -1.000000 0.000000
+vt 0.218750 0.078125
+# vertex 19
+v 16.000000 -16.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vt 0.531250 0.156250
+# vertex 20
+v -16.000000 -16.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vt 0.218750 0.156250
+f 17/17/17 19/19/19 18/18/18
+f 19/19/19 20/20/20 18/18/18
+g mat0model0surf5
+# SURFACETYPE MST_PLANAR
+# vertex 21
+v -16.000000 -16.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vt 0.343750 0.156250
+# vertex 22
+v -16.000000 -16.000000 -8.000000
+vn -1.000000 0.000000 0.000000
+vt 0.343750 0.078125
+# vertex 23
+v -16.000000 16.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vt 0.031250 0.156250
+# vertex 24
+v -16.000000 16.000000 -8.000000
+vn -1.000000 0.000000 0.000000
+vt 0.031250 0.078125
+f 21/21/21 23/23/23 22/22/22
+f 23/23/23 24/24/24 22/22/22
-- 
2.39.2