From: Mirio <opivy@hotmail.de>
Date: Thu, 19 Mar 2015 19:16:22 +0000 (+0100)
Subject: More weapon clips, fix zfight
X-Git-Tag: xonotic-v0.8.1~9^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38b572156b15125efdb2467695643e690ec5de46;p=xonotic%2Fxonotic-maps.pk3dir.git

More weapon clips, fix zfight
---

diff --git a/maps/atelier.map b/maps/atelier.map
index 1712298a..8fa73ad4 100644
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -5561,8 +5561,8 @@ exx/base-metal01
 ( 192 -1280 480 ) ( 184 -1272 480 ) ( 184 -1272 512 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
 ( 256 -1280 512 ) ( 192 -1280 480 ) ( 192 -1280 512 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
 ( 192 -1272 480 ) ( 256 -1280 480 ) ( 256 -1272 480 ) exx/base-metal01 256 0 90 0.25 0.25 134217728 0 0
-( 512 -1280 512 ) ( 504 -1272 512 ) ( 504 -1272 480 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
 ( 184 -1272 480 ) ( 248 -1272 480 ) ( 248 -1272 512 ) trak5x/trim/trim_basictrim1a 0 0 90 0.25 0.25 134217728 0 0
+( 256 64 512 ) ( 256 64 480 ) ( 256 -64 512 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( 288 -1536 512 ) ( 288 -1544 512 ) ( 192 -1536 512 ) exx/base-metal01 256 0 90 0.25 0.25 134217728 0 0
@@ -11772,6 +11772,14 @@ common/clip
 ( -1256 1112 736 ) ( -1256 1112 816 ) ( -1136 1112 736 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -1224 1128 736 ) ( -1224 1200 736 ) ( -1224 1128 816 ) common/clip 192 0 0 0.25 0.25 0 0 0
 }
+{
+( 192 -1272 512 ) ( 256 -1280 512 ) ( 192 -1280 512 ) exx/base-metal01 256 0 90 0.25 0.25 134217728 0 0
+( 256 -1280 512 ) ( 192 -1280 480 ) ( 192 -1280 512 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
+( 192 -1272 480 ) ( 256 -1280 480 ) ( 256 -1272 480 ) exx/base-metal01 256 0 90 0.25 0.25 134217728 0 0
+( 512 -1280 512 ) ( 504 -1272 512 ) ( 504 -1272 480 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
+( 184 -1272 480 ) ( 248 -1272 480 ) ( 248 -1272 512 ) trak5x/trim/trim_basictrim1a 0 0 90 0.25 0.25 134217728 0 0
+( 352 -64 512 ) ( 352 64 480 ) ( 352 64 512 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0
+}
 }
 {
 "classname" "func_group"
@@ -40733,3 +40741,105 @@ common/clip
 }
 }
 }
+{
+"classname" "func_group"
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( 864 -15.5 960 0 0 ) ( 699.5555419922 144.5 960 2.9999997616 0 ) ( 592.6666870117 248.5 960 5.9999995232 0 ) )
+( ( 864 -15.5 768 0 0.4999999702 ) ( 699.5555419922 144.5 768 2.9999997616 0.5000005364 ) ( 592.6666870117 248.5 768 5.9999995232 0.5000005364 ) )
+( ( 839.3333129883 -39.5 768 0 0.9999999404 ) ( 674.8889160156 120.5 768 3 0.999999702 ) ( 568 224.5 768 5.9999995232 1.0000010729 ) )
+)
+}
+}
+}
+{
+"classname" "func_group"
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( 1192 -15.5 960 0 0 ) ( 1024 -167.5 960 2.9999997616 0 ) ( 856 -15.5 960 5.9999995232 0 ) )
+( ( 1192 -15.5 768 0 0.4999999702 ) ( 1024 -167.5 768 2.9999997616 0.5000005364 ) ( 856 -15.5 768 5.9999995232 0.5000005364 ) )
+( ( 1216 -39.5 768 0 0.9999999404 ) ( 1024 -215.5 768 3 0.999999702 ) ( 832 -39.5 768 5.9999995232 1.0000010729 ) )
+)
+}
+}
+}
+{
+"classname" "func_group"
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( 1392 184.5 960 5.9999995232 0 ) ( 1288 80.5 960 2.9999997616 0 ) ( 1192 -15.4999961853 960 0 0 ) )
+( ( 1392 184.5 768 5.9999995232 0.5000005364 ) ( 1288 80.5 768 2.9999997616 0.5000005364 ) ( 1192 -15.4999961853 768 0 0.4999999702 ) )
+( ( 1408 152.5 768 5.9999995232 1.0000010729 ) ( 1312 56.5000038147 768 3 0.999999702 ) ( 1216 -39.4999923706 768 0 0.9999999404 ) )
+)
+}
+}
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( 1544 184.5 960 5.9999995232 0 ) ( 1468 184.5 960 2.9999997616 0 ) ( 1392 184.5 960 0 0 ) )
+( ( 1544 184.5 768 5.9999995232 0.5000005364 ) ( 1468 184.5 768 2.9999997616 0.5000005364 ) ( 1392 184.5 768 0 0.4999999702 ) )
+( ( 1528.8000488281 152.5 768 5.9999995232 1.0000010729 ) ( 1468 152.5 768 3 0.999999702 ) ( 1407.1999511719 152.5 768 0 0.9999999404 ) )
+)
+}
+}
+}
+{
+"classname" "func_group"
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( -256 -143.5 960 -0.25 0 ) ( -512 -143.5 960 2.7499997616 0 ) ( -768 -143.5 960 5.7499995232 0 ) )
+( ( -256 -143.5 768 -0.25 0.4999999702 ) ( -512 -143.5 768 2.7499997616 0.5000005364 ) ( -768 -143.5 768 5.7499995232 0.5000005364 ) )
+( ( -256 -175.5 768 -0.25 0.9999999404 ) ( -512 -175.5 768 2.75 0.999999702 ) ( -768 -175.5 768 5.7499995232 1.0000010729 ) )
+)
+}
+}
+}
+{
+"classname" "func_group"
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( -768 -143.5 960 -0.0625 0 ) ( -1056 -143.5 960 2.9374997616 0 ) ( -1056 144.5 960 5.9374995232 0 ) )
+( ( -768 -143.5 768 -0.0625 0.4999999702 ) ( -1056 -143.5 768 2.9374997616 0.5000005364 ) ( -1056 144.5 768 5.9374995232 0.5000005364 ) )
+( ( -768 -175.5 768 -0.0625 0.9999999404 ) ( -1088 -175.5 768 2.9375 0.999999702 ) ( -1088 144.5 768 5.9374995232 1.0000010729 ) )
+)
+}
+}
+}
+{
+"classname" "func_group"
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( 16 136.5 960 -0.25 0 ) ( 16 -151.5 960 2.7499997616 0 ) ( -272 -151.5 960 5.7499995232 0 ) )
+( ( 16 136.5 768 -0.25 0.4999999702 ) ( 16 -151.5 768 2.7499997616 0.5000005364 ) ( -272 -151.5 768 5.7499995232 0.5000005364 ) )
+( ( 48 136.5 768 -0.25 0.9999999404 ) ( 48 -183.5 768 2.75 0.999999702 ) ( -272 -183.5 768 5.7499995232 1.0000010729 ) )
+)
+}
+}
+}
diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index be00295e..ba6b9a49 100644
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -2,5 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 1b
+Version: 1c