Merge branch 'master' into Mirio/darkzone

diff --git a/maps/atelier.map b/maps/atelier.map
index 6f1e7699cf1841f6e9dcb234f0162d1470de36ee..908419fcd8add596af8ac9e4fa786e71b4e61c2f 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -10865,26 +10865,26 @@ trak5x/light-light2a-surfacelight
 ( -512 -1056 128 ) ( -384 -1056 128 ) ( -512 -1056 193 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -184 -1464 768 ) ( -184 -1544 768 ) ( -384 -1464 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -184 -1472 768 ) ( -384 -1472 768 ) ( -184 -1472 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1464 768 ) ( 192 -1464 192 ) ( 192 -1544 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -384 -1544 192 ) ( -184 -1544 192 ) ( -384 -1464 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -384 -1760 192 ) ( -384 -1760 768 ) ( -184 -1760 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -384 -1544 192 ) ( -384 -1464 192 ) ( -384 -1544 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 168 -1472 -64 ) ( 192 -1496 -64 ) ( 168 -1472 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -184 -1464 768 ) ( -184 -1544 768 ) ( -384 -1464 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -184 -1472 768 ) ( -384 -1472 768 ) ( -184 -1472 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1464 768 ) ( 192 -1464 192 ) ( 192 -1544 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -384 -1544 192 ) ( -184 -1544 192 ) ( -384 -1464 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -384 -1760 192 ) ( -384 -1760 768 ) ( -184 -1760 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -384 -1544 192 ) ( -384 -1464 192 ) ( -384 -1544 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 168 -1472 -64 ) ( 192 -1496 -64 ) ( 168 -1472 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 448 -1728 768 ) ( 448 -1760 768 ) ( 192 -1728 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 448 -1728 768 ) ( 192 -1728 768 ) ( 448 -1728 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 448 -1728 768 ) ( 448 -1728 192 ) ( 448 -1760 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1760 192 ) ( 448 -1760 192 ) ( 192 -1728 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1760 192 ) ( 192 -1760 768 ) ( 448 -1760 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 192 -1760 192 ) ( 192 -1728 192 ) ( 192 -1760 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 448 -1728 768 ) ( 448 -1760 768 ) ( 192 -1728 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 448 -1728 768 ) ( 192 -1728 768 ) ( 448 -1728 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 448 -1728 768 ) ( 448 -1728 192 ) ( 448 -1760 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1760 192 ) ( 448 -1760 192 ) ( 192 -1728 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1760 192 ) ( 192 -1760 768 ) ( 448 -1760 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 192 -1760 192 ) ( 192 -1728 192 ) ( 192 -1760 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 3 0 0 0 )
 (
 ( ( 192 -1664 448 0 -1 ) ( 192 -1664 320 0 -0.5 ) ( 192 -1664 192 0 0 ) )
@@ -10896,7 +10896,7 @@ common/clip
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 3 0 0 0 )
 (
 ( ( 384 -1728 448 0 -1 ) ( 384 -1728 320 0 -0.5 ) ( 384 -1728 192 0 0 ) )
@@ -10906,13 +10906,13 @@ common/clip
 }
 }
 {
-( 1024 -1464 768 ) ( 824 -1544 768 ) ( 824 -1464 768 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 824 -1472 192 ) ( 1024 -1472 768 ) ( 824 -1472 768 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 448 -1544 768 ) ( 448 -1464 192 ) ( 448 -1464 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 1024 -1464 192 ) ( 824 -1544 192 ) ( 1024 -1544 192 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 824 -1760 192 ) ( 1024 -1760 768 ) ( 1024 -1760 192 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( 1024 -1544 768 ) ( 1024 -1464 192 ) ( 1024 -1544 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 472 -1472 64 ) ( 448 -1496 -64 ) ( 472 -1472 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1024 -1464 768 ) ( 824 -1544 768 ) ( 824 -1464 768 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 824 -1472 192 ) ( 1024 -1472 768 ) ( 824 -1472 768 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 448 -1544 768 ) ( 448 -1464 192 ) ( 448 -1464 768 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1024 -1464 192 ) ( 824 -1544 192 ) ( 1024 -1544 192 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 824 -1760 192 ) ( 1024 -1760 768 ) ( 1024 -1760 192 ) common/weapclip 0 0 0 -0.25 0.25 0 0 0
+( 1024 -1544 768 ) ( 1024 -1464 192 ) ( 1024 -1544 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 472 -1472 64 ) ( 448 -1496 -64 ) ( 472 -1472 -64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -10927,13 +10927,13 @@ common/weapclip
 }
 }
 {
-( 896 -1328 480 ) ( 896 -1408 480 ) ( 768 -1328 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 896 -1088 480 ) ( 768 -1088 480 ) ( 896 -1088 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 1024 -1296 480 ) ( 1024 -1296 192 ) ( 1024 -1376 480 ) common/clip 128 0 0 0.25 0.25 0 0 0
-( 768 -1408 192 ) ( 896 -1408 192 ) ( 768 -1328 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 768 -1408 192 ) ( 768 -1408 480 ) ( 896 -1408 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 768 -1408 192 ) ( 768 -1328 192 ) ( 768 -1408 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 768 -1112 -64 ) ( 792 -1088 -64 ) ( 768 -1112 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 896 -1328 480 ) ( 896 -1408 480 ) ( 768 -1328 480 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 896 -1088 480 ) ( 768 -1088 480 ) ( 896 -1088 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1024 -1296 480 ) ( 1024 -1296 192 ) ( 1024 -1376 480 ) common/weapclip 128 0 0 0.25 0.25 0 0 0
+( 768 -1408 192 ) ( 896 -1408 192 ) ( 768 -1328 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 768 -1408 192 ) ( 768 -1408 480 ) ( 896 -1408 192 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 768 -1408 192 ) ( 768 -1328 192 ) ( 768 -1408 480 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 768 -1112 -64 ) ( 792 -1088 -64 ) ( 768 -1112 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 424 256 448 ) ( 264 256 448 ) ( 424 256 416 ) common/clip 0 0 0 0.25 0.25 0 0 0

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index 61e03b754efe010cd812a0abba2bb2efacd68803..95cec6220e5e2cc7e28bb24d1c52f1138ac7c295 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 4a
\ No newline at end of file
+Version: 4b
\ No newline at end of file

diff --git a/maps/finalrage.map b/maps/finalrage.map
index 8cc5375424429425d78308e4f74261b5c16481b3..569849f6900505a4535e37b05f84725febc545fa 100644 (file)
--- a/maps/finalrage.map
+++ b/maps/finalrage.map
@@ -15187,12 +15187,12 @@ map_stormkeep/rock
 "classname" "trigger_teleport"
 "target" "t4"
 {
-( -519.0294189453 -368.2843017578 -96 ) ( -564.2842407227 -323.0294799805 -96 ) ( -598.2253417969 -356.9705810547 -96 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
-( -598.2253417969 -356.9705810547 24 ) ( -564.2842407227 -323.0294799805 24 ) ( -519.0294189453 -368.2843017578 24 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
-( -598.2253417969 -356.9705810547 24 ) ( -552.9705200195 -402.2254333496 24 ) ( -552.9705200195 -402.2254333496 -96 ) common/trigger 28.6720066071 51.2000045776 0 -0.1767769009 0.4687499702 0 7 0
-( -552.9705200195 -402.2254333496 24 ) ( -519.0294189453 -368.2843017578 24 ) ( -519.0294189453 -368.2843017578 -96 ) common/trigger 217.7735290527 51.1999969482 0 0.1325825602 0.4687499702 0 7 0
-( -519.0294189453 -368.2843017578 24 ) ( -564.2842407227 -323.0294799805 24 ) ( -564.2842407227 -323.0294799805 -96 ) common/trigger 220.6688079834 51.1999969482 0 -0.1767766476 0.4687499702 0 7 0
-( -564.2842407227 -323.0294799805 24 ) ( -598.2253417969 -356.9705810547 24 ) ( -598.2253417969 -356.9705810547 -96 ) common/trigger 132.4413757324 51.2000045776 0 0.1325825006 0.4687499702 0 7 0
+( -519.0294189453 -368.2843017578 -120 ) ( -564.2842407227 -323.0294799805 -120 ) ( -598.2253417969 -356.9705810547 -120 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
+( -598.2253417969 -356.9705810547 64 ) ( -564.2842407227 -323.0294799805 64 ) ( -519.0294189453 -368.2843017578 64 ) common/trigger 170.3711547852 237.7310943604 -45 0.250000149 0.1875000298 0 7 0
+( -588.1003417969 -355.8455810547 24 ) ( -542.8455200195 -401.1004333496 24 ) ( -542.8455200195 -401.1004333496 -96 ) common/trigger 35.0359573364 51.2000045776 0 -0.1767769009 0.4687499702 0 7 0
+( -522.3455200195 -416.8504333496 24 ) ( -488.4044189453 -382.9093017578 24 ) ( -488.4044189453 -382.9093017578 -96 ) common/trigger 72.0821456909 51.1999969482 0 0.1325825602 0.4687499702 0 7 0
+( -520.2794189453 -378.2843017578 24 ) ( -565.5342407227 -333.0294799805 24 ) ( -565.5342407227 -333.0294799805 -96 ) common/trigger 164.1002655029 51.1999969482 0 -0.1767766476 0.4687499702 0 7 0
+( -586.7842407227 -300.2794799805 24 ) ( -620.7253417969 -334.2205810547 24 ) ( -620.7253417969 -334.2205810547 -96 ) common/trigger 216.8500976563 51.2000045776 0 0.1325825006 0.4687499702 0 7 0
 }
 }
 {
@@ -15375,6 +15375,7 @@ map_stormkeep/rock
 "angle" "-179.999985"
 "noise" "sound/map_finalrage/electrified.wav"
 "targetname" "warped_02"
+"volume" "0.4"
 }
 {
 "classname" "misc_model"

diff --git a/maps/finalrage.map.options b/maps/finalrage.map.options
index 9c9fc54af25948dfa1fb2c62e968f188e81ca264..89ea9fc14157bf561332a32363db84f7cfab0069 100644 (file)
--- a/maps/finalrage.map.options
+++ b/maps/finalrage.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 1d
\ No newline at end of file
+Version: 1f
\ No newline at end of file

diff --git a/maps/fuse.map b/maps/fuse.map
index 9dd2daa8793c42743ce541f2e32443d78c9c71a3..5ac456099c023009497588dbdaf89fe35efd44c1 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -2943,12 +2943,12 @@ brushDef
 {
 brushDef
 {
-( -320 184 -256 ) ( -320 128 -256 ) ( -328 184 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
-( -320 256 -256 ) ( -328 256 -256 ) ( -320 256 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
-( -320 120 -256 ) ( -320 120 -384 ) ( -320 64 -256 ) ( ( 0.048828125 0 0 ) ( 0 0.048828125 0 ) ) common/clip 134217728 0 0
-( -328 128 -384 ) ( -320 128 -384 ) ( -328 184 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
-( -328 128 -384 ) ( -328 128 -256 ) ( -320 128 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
-( -328 128 -384 ) ( -328 184 -384 ) ( -328 128 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -320 184 -256 ) ( -320 128 -256 ) ( -328 184 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
+( -320 256 -256 ) ( -328 256 -256 ) ( -320 256 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
+( -320 120 -256 ) ( -320 120 -384 ) ( -320 64 -256 ) ( ( 0.048828125 0 0 ) ( 0 0.048828125 0 ) ) common/weapclip 134217728 0 0
+( -328 128 -384 ) ( -320 128 -384 ) ( -328 184 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
+( -328 128 -384 ) ( -328 128 -256 ) ( -320 128 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
+( -328 128 -384 ) ( -328 184 -384 ) ( -328 128 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 134217728 0 0
 }
 }
 {
@@ -3188,12 +3188,12 @@ brushDef
 {
 brushDef
 {
-( -128 320 -256 ) ( -128 256 -256 ) ( -256 320 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -104 640 -256 ) ( -232 640 -256 ) ( -104 640 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -128 320 -256 ) ( -128 320 -384 ) ( -128 256 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -256 256 -384 ) ( -128 256 -384 ) ( -256 320 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -256 256 -384 ) ( -256 256 -256 ) ( -128 256 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -256 256 -384 ) ( -256 320 -384 ) ( -256 256 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -128 320 -256 ) ( -128 256 -256 ) ( -256 320 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -104 640 -256 ) ( -232 640 -256 ) ( -104 640 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -128 320 -256 ) ( -128 320 -384 ) ( -128 256 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -256 256 -384 ) ( -128 256 -384 ) ( -256 320 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -256 256 -384 ) ( -256 256 -256 ) ( -128 256 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -256 256 -384 ) ( -256 320 -384 ) ( -256 256 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
 }
 }
 {
@@ -12079,7 +12079,7 @@ brushDef
 {
 brushDef
 {
-( -248 -1600 328 ) ( -248 -1664 328 ) ( -376 -1600 328 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.875 ) ) common/caulk 0 0 0
+( -248 -1600 328 ) ( -248 -1664 328 ) ( -376 -1600 328 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal06rust 0 0 0
 ( -256 -1600 320 ) ( -384 -1600 320 ) ( -256 -1600 0 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0 ) ) exx/wall-pipe 0 0 0
 ( -272 -1600 320 ) ( -272 -1600 0 ) ( -272 -1664 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -384 -1664 0 ) ( -256 -1664 0 ) ( -384 -1600 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
@@ -12090,7 +12090,7 @@ brushDef
 {
 brushDef
 {
-( -272 -1600 328 ) ( -272 -1664 328 ) ( -384 -1600 328 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( -272 -1600 328 ) ( -272 -1664 328 ) ( -384 -1600 328 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal06rust 0 0 0
 ( -272 -1584 320 ) ( -384 -1584 320 ) ( -272 -1584 264 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.041015625 ) ) exx/wall-metalb01 0 0 0
 ( -272 -1600 320 ) ( -272 -1600 264 ) ( -272 -1664 320 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.041015625 ) ) exx/wall-metalb01 0 0 0
 ( -384 -1664 264 ) ( -272 -1664 264 ) ( -384 -1600 264 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal01 0 0 0
@@ -13448,23 +13448,11 @@ brushDef
 {
 brushDef
 {
-( 192 -448 164 ) ( 194 -424 164 ) ( 194 -448 164 ) ( ( -0.015625 0 245 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 192 -448 164 ) ( 194 -432 164 ) ( 194 -432 -128 ) ( ( -0.015625 0 245.0849456787 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 194 -424 -128 ) ( 194 -432 -128 ) ( 194 -432 164 ) ( ( -0.015625 0 245 ) ( 0 0.015625 2.5 ) ) common/clip 0 0 0
 ( 192 -448 -128 ) ( 194 -424 -128 ) ( 192 -424 -128 ) ( ( -0.015625 0 245 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 194 -424 -128 ) ( 192 -424 4 ) ( 192 -424 -128 ) ( ( -0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 192 -424 4 ) ( 192 -448 -128 ) ( 192 -424 -128 ) ( ( -0.015625 0 11 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-}
-}
-{
-brushDef
-{
-( 194 -256 164 ) ( 194 -280 164 ) ( 192 -256 164 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 194 -272 -128 ) ( 194 -272 164 ) ( 192 -256 164 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 194 -272 164 ) ( 194 -272 -128 ) ( 194 -280 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 2.5 ) ) common/clip 0 0 0
-( 192 -280 -128 ) ( 194 -280 -128 ) ( 192 -256 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 192 -280 -128 ) ( 192 -280 4 ) ( 194 -280 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 192 -280 -128 ) ( 192 -256 -128 ) ( 192 -280 4 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 192 -416 4 ) ( 192 -440 -128 ) ( 192 -416 -128 ) ( ( -0.015625 0 10.875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -432 32 ) ( -64 -424 32 ) ( 64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -432 32 ) ( -64 -432 24 ) ( 64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
 {
@@ -13624,12 +13612,12 @@ brushDef
 {
 brushDef
 {
-( -136 -64 -256 ) ( -136 64 -256 ) ( -128 -64 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/clip 0 0 0
-( -128 64 -376 ) ( -160 64 -376 ) ( -128 64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -128 64 -376 ) ( -128 64 -384 ) ( -128 -64 -376 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -160 -64 -384 ) ( -128 -64 -384 ) ( -160 64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -160 -64 -384 ) ( -160 -64 -376 ) ( -128 -64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -136 64 -256 ) ( -136 -64 -256 ) ( -160 64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -136 -64 -256 ) ( -136 64 -256 ) ( -128 -64 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/weapclip 0 0 0
+( -128 64 -376 ) ( -160 64 -376 ) ( -128 64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -128 64 -376 ) ( -128 64 -384 ) ( -128 -64 -376 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -160 -64 -384 ) ( -128 -64 -384 ) ( -160 64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -160 -64 -384 ) ( -160 -64 -376 ) ( -128 -64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
+( -136 64 -256 ) ( -136 -64 -256 ) ( -160 64 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
 }
 }
 {
@@ -13645,7 +13633,7 @@ brushDef
 {
 brushDef
 {
-( -272 -1664 328 ) ( -272 -1792 328 ) ( -576 -1664 328 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( -272 -1664 328 ) ( -272 -1792 328 ) ( -576 -1664 328 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal06rust 0 0 0
 ( -272 -1664 328 ) ( -576 -1664 328 ) ( -272 -1664 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -272 -1664 328 ) ( -272 -1664 0 ) ( -272 -1792 328 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -576 -1792 0 ) ( -272 -1792 0 ) ( -576 -1664 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
@@ -13798,12 +13786,12 @@ brushDef
 {
 brushDef
 {
-( 496 -160 384 ) ( 496 -192 384 ) ( 416 -160 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 488 96 304 ) ( 408 96 304 ) ( 488 96 240 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 488 -160 304 ) ( 488 -160 240 ) ( 488 -192 304 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 408 -192 232 ) ( 488 -192 232 ) ( 408 -160 232 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 408 -192 240 ) ( 408 -192 304 ) ( 488 -192 240 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 408 -192 240 ) ( 408 -160 240 ) ( 408 -192 304 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 480 -160 384 ) ( 480 -192 384 ) ( 400 -160 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/clip 0 0 0
+( 472 96 304 ) ( 392 96 304 ) ( 472 96 240 ) ( ( 0.015625 0 255.75 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 528 -160 304 ) ( 528 -160 240 ) ( 528 -192 304 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 392 -192 232 ) ( 472 -192 232 ) ( 392 -160 232 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/clip 0 0 0
+( 392 -192 240 ) ( 392 -192 304 ) ( 472 -192 240 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 384 -192 240 ) ( 384 -160 240 ) ( 384 -192 304 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
 {
@@ -13961,7 +13949,7 @@ brushDef
 ( -488 -1536 384 ) ( -640 -1536 384 ) ( -488 -1536 256 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 5 ) ) common/caulk 0 0 0
 ( -384 -1000 384 ) ( -384 -1000 256 ) ( -384 -1152 384 ) ( ( 0.0078125 0 0 ) ( 0 0.015625 5 ) ) exx/panel-q201d 0 0 0
 ( -568 -1152 320 ) ( -416 -1152 320 ) ( -568 -1000 320 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal06rust 0 0 0
-( -568 -1664 256 ) ( -568 -1664 384 ) ( -416 -1664 256 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 5 ) ) common/caulk 0 0 0
+( -568 -1664 256 ) ( -568 -1664 384 ) ( -416 -1664 256 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.015625 5 ) ) exx/panel-q201d 0 0 0
 ( -576 -1152 256 ) ( -576 -1000 256 ) ( -576 -1152 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 5 ) ) common/caulk 0 0 0
 }
 }
@@ -21647,17 +21635,6 @@ brushDef
 {
 brushDef
 {
-( -104 -96 -192 ) ( -104 -88 -192 ) ( -88 -112 -192 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0
-( -104 -88 -152 ) ( -104 -88 -328 ) ( -88 -104 -328 ) ( ( 0.0156249991 0 0 ) ( 0 0.015625 0.875 ) ) common/caulk 134217728 0 0
-( -92 -108 -328 ) ( -92 -108 -152 ) ( -88 -104 -152 ) ( ( 0.0078124995 0 0 ) ( 0 0.0078125 0.4375 ) ) exx/base-metal01 134217728 0 0
-( -96 -88 -296 ) ( -96 -96 -296 ) ( -80 -112 -296 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.0625 ) ) exx/base-metal01 134217728 0 0
-( -90 -106 -152 ) ( -90 -106 -328 ) ( -106 -90 -152 ) ( ( 0.0441941768 0 0.5 ) ( 0 0.0096149286 510.1539916992 ) ) exx/light-panel01-surfacelight 134217728 0 0
-( -108 -92 -152 ) ( -108 -92 -328 ) ( -104 -88 -328 ) ( ( 0.0078124995 0 0 ) ( 0 0.0078125 0.4375 ) ) exx/base-metal01 134217728 0 0
-}
-}
-{
-brushDef
-{
 ( -960 -144 -380 ) ( -960 -288 -380 ) ( -1032 -144 -380 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -960 -120 -376 ) ( -1032 -120 -376 ) ( -960 -120 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -960 -144 -376 ) ( -960 -144 -384 ) ( -960 -288 -376 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
@@ -25184,7 +25161,7 @@ brushDef
 brushDef
 {
 ( 864 -1792 384 ) ( 864 -1856 384 ) ( 512 -1792 384 ) ( ( 0.015625 0 2 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( 864 -1792 384 ) ( 512 -1792 384 ) ( 864 -1792 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 864 -1792 384 ) ( 512 -1792 384 ) ( 864 -1792 320 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/wall-bigrib02 0 0 0
 ( 864 -1792 384 ) ( 864 -1792 320 ) ( 864 -1856 384 ) ( ( 0.015625 0 2 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 512 -1856 320 ) ( 864 -1856 320 ) ( 512 -1792 320 ) ( ( 0.015625 0 2 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 512 -1920 320 ) ( 512 -1920 384 ) ( 864 -1920 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
@@ -25207,7 +25184,7 @@ brushDef
 {
 ( -576 -1768 384 ) ( -576 -1920 384 ) ( -640 -1768 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -584 -1472 384 ) ( -648 -1472 384 ) ( -584 -1472 320 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( -576 -1768 384 ) ( -576 -1768 320 ) ( -576 -1920 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( -576 -1768 384 ) ( -576 -1768 320 ) ( -576 -1920 384 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/wall-bigrib02 0 0 0
 ( -640 -1920 320 ) ( -576 -1920 320 ) ( -640 -1768 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -640 -1920 320 ) ( -640 -1920 384 ) ( -576 -1920 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -640 -1800 320 ) ( -640 -1648 320 ) ( -640 -1800 384 ) ( ( 0.015625 0 1.875 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
@@ -27803,12 +27780,12 @@ brushDef
 {
 brushDef
 {
-( -64 -832 -236 ) ( -64 -834 -236 ) ( -72 -832 -236 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -61.875 -832 -62 ) ( -61.875 -834 -62 ) ( -69.875 -832 -62 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.966796875 ) ) common/clip 0 0 0
 ( -64 -832 -236 ) ( -72 -832 -236 ) ( -64 -832 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -64 -832 -236 ) ( -64 -832 -384 ) ( -64 -834 -236 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -72 -834 -384 ) ( -64 -834 -384 ) ( -72 -832 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -72 -834 -384 ) ( -72 -834 -236 ) ( -64 -834 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-( -72 -834 -384 ) ( -72 -832 -384 ) ( -72 -834 -236 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -70.25 -834 -300.875 ) ( -70.25 -832 -300.875 ) ( -70.25 -834 -152.875 ) ( ( 0.015625 0 0 ) ( 0 0.015625 1.298828125 ) ) common/clip 0 0 0
 }
 }
 {
@@ -28039,7 +28016,7 @@ brushDef
 {
 brushDef
 {
-( 672 96 -300 ) ( 672 88 -300 ) ( 670 96 -300 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( 673.875 96 -136 ) ( 673.875 88 -136 ) ( 671.875 96 -136 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.970703125 ) ) common/clip 0 0 0
 ( 672 96 -300 ) ( 670 96 -300 ) ( 672 96 -448 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( 672 96 -300 ) ( 672 96 -448 ) ( 672 88 -300 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( 670 88 -448 ) ( 672 88 -448 ) ( 670 96 -448 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
@@ -28049,7 +28026,7 @@ brushDef
 {
 brushDef
 {
-( -832 328 4 ) ( -832 320 4 ) ( -834 328 4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -833.375 328 104 ) ( -833.375 320 104 ) ( -835.375 328 104 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.021484375 ) ) common/clip 0 0 0
 ( -832 328 4 ) ( -832 328 -192 ) ( -832 320 4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -834 320 -192 ) ( -832 320 -192 ) ( -834 328 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -834 320 -192 ) ( -834 320 4 ) ( -832 320 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
@@ -28070,7 +28047,7 @@ brushDef
 {
 brushDef
 {
-( -834 72 4 ) ( -834 64 4 ) ( -848 72 4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -830.5 72 104 ) ( -830.5 64 104 ) ( -844.5 72 104 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.9453125 ) ) common/clip 0 0 0
 ( -834 72 4 ) ( -834 72 -192 ) ( -834 64 4 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -848 64 -192 ) ( -834 64 -192 ) ( -848 72 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -848 64 -192 ) ( -848 64 4 ) ( -834 64 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
@@ -28206,9 +28183,9 @@ brushDef
 {
 brushDef
 {
-( -894 -664 196 ) ( -894 -672 196 ) ( -896 -664 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -894 -664 320 ) ( -894 -672 320 ) ( -896 -664 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -896 -672 64 ) ( -894 -672 64 ) ( -896 -664 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-( -896 -672 64 ) ( -896 -672 196 ) ( -894 -672 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -896 -672 188 ) ( -896 -672 320 ) ( -894 -672 188 ) ( ( 0.015625 0 0 ) ( 0 0.015625 1.9375 ) ) common/clip 0 0 0
 ( -896 -672 64 ) ( -896 -664 64 ) ( -896 -672 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -896 -664 -64 ) ( -894 -672 -64 ) ( -896 -664 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
@@ -28216,7 +28193,7 @@ brushDef
 {
 brushDef
 {
-( -894 -832 196 ) ( -894 -840 196 ) ( -896 -832 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -894 -832 320 ) ( -894 -840 320 ) ( -896 -832 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -894 -832 196 ) ( -896 -832 196 ) ( -894 -832 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -896 -840 64 ) ( -894 -840 64 ) ( -896 -832 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -896 -840 64 ) ( -896 -832 64 ) ( -896 -840 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
@@ -28226,16 +28203,6 @@ brushDef
 {
 brushDef
 {
-( -568 -992 196 ) ( -568 -994 196 ) ( -576 -992 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-( -568 -992 196 ) ( -576 -992 196 ) ( -568 -992 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-( -576 -994 64 ) ( -568 -994 64 ) ( -576 -992 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-( -576 -994 64 ) ( -576 -992 64 ) ( -576 -994 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-( -568 -992 -64 ) ( -576 -994 -64 ) ( -568 -992 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-}
-}
-{
-brushDef
-{
 ( -824 -994 128 ) ( -824 -1012 128 ) ( -840 -994 128 ) ( ( 0.015625 0 0.28125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -824 -994 128 ) ( -840 -994 128 ) ( -824 -994 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -840 -1012 64 ) ( -824 -1012 64 ) ( -840 -994 64 ) ( ( 0.015625 0 0.28125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
@@ -28338,7 +28305,7 @@ brushDef
 ( 512 -872 160 ) ( 512 -872 0 ) ( 512 -944 160 ) ( ( 0.015625 0 0.625 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 416 -904 0 ) ( 448 -904 0 ) ( 416 -832 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( 432 -904 0 ) ( 432 -832 0 ) ( 432 -904 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 448 -1032 -64 ) ( 440 -1024 -64 ) ( 448 -1032 64 ) ( ( 0.0156249991 0 255.911605835 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 456 -1032 -64 ) ( 448 -1024 -64 ) ( 456 -1032 64 ) ( ( 0.0156249981 0 255.8232116699 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 432 -816 -64 ) ( 440 -808 -64 ) ( 432 -816 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
@@ -28408,6 +28375,246 @@ brushDef
 ( 80 64 136 ) ( 112 64 136 ) ( 80 -64 136 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 }
 }
+{
+brushDef
+{
+( 192 -448 164 ) ( 194 -424 164 ) ( 194 -448 164 ) ( ( -0.015625 0 245 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 192 -448 164 ) ( 194 -432 164 ) ( 194 -432 -128 ) ( ( -0.015625 0 245.0849456787 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 194 -360 -128 ) ( 194 -368 -128 ) ( 194 -368 164 ) ( ( -0.015625 0 246 ) ( 0 0.015625 2.5 ) ) common/clip 0 0 0
+( 194 -352 -128 ) ( 192 -352 4 ) ( 192 -352 -128 ) ( ( -0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 192 -416 4 ) ( 192 -440 -128 ) ( 192 -416 -128 ) ( ( -0.015625 0 10.875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 64 -432 32 ) ( -64 -424 32 ) ( -64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 194 -256 164 ) ( 194 -280 164 ) ( 192 -256 164 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 194 -272 -128 ) ( 194 -272 164 ) ( 192 -256 164 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 194 -280 164 ) ( 194 -280 -128 ) ( 194 -288 -128 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 2.5 ) ) common/clip 0 0 0
+( 184 -352 -128 ) ( 184 -352 4 ) ( 186 -352 -128 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 192 -344 -128 ) ( 192 -320 -128 ) ( 192 -344 4 ) ( ( 0.015625 0 255 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 64 -432 32 ) ( -64 -424 32 ) ( -64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 194 -360 -128 ) ( 194 -368 -128 ) ( 194 -368 164 ) ( ( -0.015625 0 246 ) ( 0 0.015625 2.5 ) ) common/clip 0 0 0
+( 192 -416 4 ) ( 192 -440 -128 ) ( 192 -416 -128 ) ( ( -0.015625 0 10.875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -432 32 ) ( -64 -424 32 ) ( 64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( 64 -432 32 ) ( -64 -432 24 ) ( -64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -404 32 ) ( -64 -404.125 31.875 ) ( 64 -404 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 194 -272 -128 ) ( 194 -272 164 ) ( 192 -256 164 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 192 -280 -128 ) ( 194 -280 -128 ) ( 192 -256 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 192 -344 -128 ) ( 192 -320 -128 ) ( 192 -344 4 ) ( ( 0.015625 0 255 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -432 32 ) ( -64 -424 32 ) ( 64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( 64 -272 32 ) ( -64 -272 24 ) ( -64 -272 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 194 -280 164 ) ( 194 -280 -128 ) ( 194 -288 -128 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 2.5 ) ) common/clip 0 0 0
+( 192 -344 -128 ) ( 192 -320 -128 ) ( 192 -344 4 ) ( ( 0.015625 0 255 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -432 32 ) ( -64 -424 32 ) ( 64 -432 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -272 32 ) ( -64 -272 24 ) ( 64 -272 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( 64 -299.875 32 ) ( -64 -299 31.125 ) ( -64 -299.875 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( -894 -640 320 ) ( -894 -832 320 ) ( -958 -640 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.96875 ) ) common/clip 0 0 0
+( -894 -672 320 ) ( -958 -672 320 ) ( -894 -672 256 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -894 -640 320 ) ( -894 -640 256 ) ( -894 -832 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -958 -832 224 ) ( -894 -832 224 ) ( -958 -640 224 ) ( ( 0 0.015625 0.03125 ) ( -0.015625 0 0 ) ) common/clip 0 0 0
+( -958 -832 256 ) ( -958 -832 320 ) ( -894 -832 256 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -896 -832 256 ) ( -896 -640 256 ) ( -896 -832 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( -910 -832 224 ) ( -894 -804 224 ) ( -894 -832 224 ) ( ( -0.015625 0 232.5 ) ( 0 0.015625 255.96875 ) ) common/clip 134217728 0 0
+( -894 -832 196 ) ( -910 -832 224 ) ( -894 -832 224 ) ( ( -0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -894 -804 224 ) ( -894 -832 196 ) ( -894 -832 224 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -896 -803.25 224 ) ( -896 -831.25 196 ) ( -896 -803.25 196 ) ( ( 0.015625 0 0.01171875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 18 -832 196 ) ( -110 -804 224 ) ( -110 -832 196 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( -894 -672 224 ) ( -894 -700 224 ) ( -910 -672 224 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.96875 ) ) common/clip 134217728 0 0
+( -894 -672 224 ) ( -910 -672 224 ) ( -894 -672 196 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -894 -672 224 ) ( -894 -672 196 ) ( -894 -700 224 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -896 -697.375 196 ) ( -896 -669.375 196 ) ( -896 -697.375 224 ) ( ( 0.015625 0 0.041015625 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -110 -672 196 ) ( -110 -700 224 ) ( 18 -672 196 ) ( ( 0.015625 0 1023.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( -576 -926 320 ) ( -576 -990 320 ) ( -832 -926 320 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -576 -926 320 ) ( -832 -926 320 ) ( -576 -926 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -576 -926 320 ) ( -576 -926 64 ) ( -576 -990 320 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -832 -990 224 ) ( -576 -990 224 ) ( -832 -926 224 ) ( ( 0.015625 0 255.46875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -834.125 -928 64 ) ( -834.125 -928 320 ) ( -578.125 -928 64 ) ( ( 0.015625 0 0.033203125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -832 -990 64 ) ( -832 -926 64 ) ( -832 -990 320 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( -508.25 -930 320 ) ( -508.25 -994 320 ) ( -572.25 -930 320 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 255.94140625 ) ) common/clip 0 0 0
+( -384 -896.375 192 ) ( -384 -896.375 64 ) ( -384 -992.375 64 ) ( ( 0.015625 0 0.005859375 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -576 -994 64 ) ( -512 -994 64 ) ( -576 -930 64 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -550.75 -994 64 ) ( -550.75 -994 320 ) ( -486.75 -994 64 ) ( ( 0.015625 0 8.60546875 ) ( 0 0.015625 3 ) ) common/clip 0 0 0
+( -576 -994 64 ) ( -576 -930 64 ) ( -576 -994 320 ) ( ( 0.015625 0 1023.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -576 -992 -64 ) ( -575.75 -992 -64 ) ( -576 -992 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 198 -64 320 ) ( 198 -256 320 ) ( 134 -64 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.03125 ) ) common/clip 0 0 0
+( 196 -272 64 ) ( 132 -272 64 ) ( 196 -272 -320 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 128 -64 64 ) ( 128 -64 -320 ) ( 128 -256 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 166 -256 32 ) ( 230 -256 32 ) ( 166 -64 32 ) ( ( 0.0192307699 0 7.7692308426 ) ( 0 0.027777778 4.8888888359 ) ) common/clip 0 0 0
+( 138 -432 -320 ) ( 138 -432 64 ) ( 202 -432 -320 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 126 -256 -320 ) ( 126 -64 -320 ) ( 126 -256 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 174 -432 32 ) ( 190 -404 32 ) ( 190 -432 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.03125 ) ) common/clip 134217728 0 0
+( 190 -432 4 ) ( 174 -432 32 ) ( 190 -432 32 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 128 -402.125 32 ) ( 128 -430.125 4 ) ( 128 -430.125 32 ) ( ( 0.015625 0 1023.970703125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 126 -404 32 ) ( 126 -432 4 ) ( 126 -404 4 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 14 -432 4 ) ( -114 -404 32 ) ( -114 -432 4 ) ( ( 0.027777778 0 251.890625 ) ( 0 0.02525381 6.3582572937 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 190 -272.125 32 ) ( 190 -300.125 32 ) ( 174 -272.125 32 ) ( ( 0.015625 0 0.001953125 ) ( 0 0.015625 0.03125 ) ) common/clip 134217728 0 0
+( 190 -272.125 32 ) ( 174 -272.125 32 ) ( 190 -272.125 4 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 128 -273.5 32 ) ( 128 -273.5 4 ) ( 128 -301.5 32 ) ( ( 0.015625 0 0.0234375 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 126 -300.125 4 ) ( 126 -272.125 4 ) ( 126 -300.125 32 ) ( ( 0.015625 0 1023.998046875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -114 -272.125 4 ) ( -114 -300.125 32 ) ( 14 -272.125 4 ) ( ( 0.027777778 0 252.111114502 ) ( 0 0.02525381 5.9308018684 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 184.375 -706 -62 ) ( 184.375 -818 -62 ) ( -7.625 -706 -62 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 255.994140625 ) ) common/clip 0 0 0
+( 128.25 -832 320 ) ( -63.75 -832 320 ) ( 128.25 -832 -384 ) ( ( 0.015625 0 0.00390625 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 128 -706 320 ) ( 128 -706 -384 ) ( 128 -818 320 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -24 -818 -208 ) ( 168 -818 -208 ) ( -24 -706 -208 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -834 -384 ) ( -64 -834 320 ) ( 128 -834 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( -64 -818 -320 ) ( -64 -706 -320 ) ( -64 -818 384 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 128 -766 -208 ) ( 100 -766 -208 ) ( 128 -702 -208 ) ( ( 0.015625 0 3.78125 ) ( 0 0.015625 0.0625 ) ) common/clip 134217728 0 0
+( 128 -766 -208 ) ( 128 -702 -208 ) ( 128 -766 -236 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 252.25 ) ) common/clip 134217728 0 0
+( -8 -834 -208 ) ( -8 -834 -236 ) ( -36 -834 -208 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 107.25 -832 -236 ) ( 135.25 -832 -236 ) ( 107.25 -832 -208 ) ( ( 0.015625 0 0.11328125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 128 -514 -236 ) ( 100 -514 -208 ) ( 128 -642 -236 ) ( ( 0.015625 0 1023.96875 ) ( 0 0.0156249991 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( -64 -702 -208 ) ( -36 -766 -208 ) ( -64 -766 -208 ) ( ( -0.015625 0 240.71875 ) ( 0 0.015625 0.0625 ) ) common/clip 134217728 0 0
+( -64 -766 -236 ) ( -64 -702 -208 ) ( -64 -766 -208 ) ( ( -0.015625 0 255.96875 ) ( 0 0.015625 252.25 ) ) common/clip 134217728 0 0
+( 100 -834 -208 ) ( 72 -834 -236 ) ( 72 -834 -208 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -33.625 -832 -208 ) ( -61.625 -832 -236 ) ( -33.625 -832 -236 ) ( ( 0.015625 0 0.037109375 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -64 -702 -236 ) ( -36 -574 -208 ) ( -64 -574 -236 ) ( ( 0.015625 0 0.03125 ) ( 0 0.0156249991 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( -702 320 320 ) ( -702 64 320 ) ( -798 320 320 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 255.984375 ) ) common/clip 0 0 0
+( -734 320 320 ) ( -830 320 320 ) ( -734 320 -384 ) ( ( 0.0078125 0 0.015625 ) ( 0 0.0078125 0 ) ) common/clip 0 0 0
+( -702 320 320 ) ( -702 320 -384 ) ( -702 64 320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.5 ) ) common/clip 0 0 0
+( -758 64 32 ) ( -662 64 32 ) ( -758 320 32 ) ( ( 0.015625 0 1010 ) ( 0 0.015625 11.1681833267 ) ) common/clip 0 0 0
+( -830 64 -384 ) ( -830 64 320 ) ( -734 64 -384 ) ( ( 0.0078125 0 255.984375 ) ( 0 0.0078125 0 ) ) common/clip 0 0 0
+( -834 63.5 -384 ) ( -834 319.5 -384 ) ( -834 63.5 320 ) ( ( 0.015625 0 255.9921875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 718 295.875 320 ) ( 718 95.875 320 ) ( 654 295.875 320 ) ( ( 0.015625 0 0.001953125 ) ( 0 0.015625 0.03125 ) ) common/clip 0 0 0
+( 734 287.875 160 ) ( 670 287.875 160 ) ( 734 287.875 -224 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 672 298.75 160 ) ( 672 298.75 -224 ) ( 672 98.75 160 ) ( ( 0.015625 0 255.95703125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 686 95.875 48 ) ( 750 95.875 48 ) ( 686 295.875 48 ) ( ( 0.015625 0 0.001953125 ) ( 0 0.015625 1023.96875 ) ) common/clip 0 0 0
+( 670 95.875 -224 ) ( 670 95.875 160 ) ( 734 95.875 -224 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 670 95.875 -224 ) ( 670 295.875 -224 ) ( 670 95.875 160 ) ( ( 0.015625 0 4095.998046875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 670 96 48 ) ( 686 124 48 ) ( 686 96 48 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.03125 ) ) common/clip 134217728 0 0
+( 686 96 20 ) ( 670 96 48 ) ( 686 96 48 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 672 109.75 48 ) ( 672 81.75 20 ) ( 672 81.75 48 ) ( ( 0.015625 0 0.22265625 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 670 124 48 ) ( 670 96 20 ) ( 670 124 20 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 62 96 20 ) ( -66 100 24 ) ( -66 96 20 ) ( ( 0.015625 0 1023.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 686 288 48 ) ( 686 260 48 ) ( 670 288 48 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.03125 ) ) common/clip 134217728 0 0
+( 686 288 48 ) ( 670 288 48 ) ( 686 288 20 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 672 285.75 48 ) ( 672 285.75 20 ) ( 672 257.75 48 ) ( ( 0.015625 0 0.03515625 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 670 260 20 ) ( 670 288 20 ) ( 670 260 48 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -66 288 20 ) ( -66 284 24 ) ( 62 288 20 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 734 296 -136 ) ( 734 96 -136 ) ( 670 296 -136 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.03125 ) ) common/clip 0 0 0
+( 734 288 -128 ) ( 670 288 -128 ) ( 734 288 -512 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 672 301.25 -128 ) ( 672 301.25 -512 ) ( 672 101.25 -128 ) ( ( 0.015625 0 255.91796875 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 694 96 -272 ) ( 758 96 -272 ) ( 694 296 -272 ) ( ( 0 0.015625 1023.96875 ) ( -0.015625 0 0 ) ) common/clip 0 0 0
+( 670 96 -512 ) ( 670 96 -128 ) ( 734 96 -512 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 670 96 -512 ) ( 670 296 -512 ) ( 670 96 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+}
+}
+{
+brushDef
+{
+( 670 96 -272 ) ( 686 124 -272 ) ( 686 96 -272 ) ( ( -0.015625 0 6 ) ( 0 0.015625 0.03125 ) ) common/clip 134217728 0 0
+( 686 96 -300 ) ( 670 96 -272 ) ( 686 96 -272 ) ( ( -0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 672 120.5 -272 ) ( 672 92.5 -300 ) ( 672 92.5 -272 ) ( ( -0.015625 0 5.9453125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 670 124 -272 ) ( 670 96 -300 ) ( 670 124 -300 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 62 96 -300 ) ( -66 100 -296 ) ( -66 96 -300 ) ( ( 0.015625 0 1023.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 686 288 -272 ) ( 686 260 -272 ) ( 670 288 -272 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.03125 ) ) common/clip 134217728 0 0
+( 686 288 -272 ) ( 670 288 -272 ) ( 686 288 -300 ) ( ( 0.015625 0 255.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 672 281.5 -272 ) ( 672 281.5 -300 ) ( 672 253.5 -272 ) ( ( 0.015625 0 0.1015625 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 670 260 -300 ) ( 670 288 -300 ) ( 670 260 -272 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -66 288 -300 ) ( -66 284 -296 ) ( 62 288 -300 ) ( ( 0.015625 0 0.03125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
 }
 {
 "classname" "func_group"
@@ -37831,3 +38038,55 @@ brushDef
 "classname" "item_strength"
 "origin" "-256.000000 -1272.000000 -296.000000"
 }
+{
+"classname" "func_group"
+{
+brushDef
+{
+( -576 -990 224 ) ( -604 -990 224 ) ( -576 -974 224 ) ( ( 0 0.015625 254.5 ) ( -0.015625 0 226.53125 ) ) common/clip 134217728 0 0
+( -576 -990 224 ) ( -576 -974 224 ) ( -576 -990 196 ) ( ( 0.015625 0 29.46875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -577 -928 224 ) ( -577 -928 196 ) ( -605 -928 224 ) ( ( 0.015625 0 0.015625 ) ( 0 0.015625 0.02734375 ) ) common/clip 134217728 0 0
+( -604 -926 196 ) ( -576 -926 196 ) ( -604 -926 224 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -576 -1774 196 ) ( -604 -1774 224 ) ( -576 -1902 196 ) ( ( 0.015625 0 0.03125 ) ( 0 0.0156249981 0 ) ) common/clip 134217728 0 0
+}
+}
+}
+{
+"classname" "func_group"
+{
+brushDef
+{
+( -832 -974 224 ) ( -804 -990 224 ) ( -832 -990 224 ) ( ( 0 -0.015625 232.5 ) ( -0.015625 0 226.53125 ) ) common/clip 134217728 0 0
+( -832 -990 196 ) ( -832 -974 224 ) ( -832 -990 224 ) ( ( -0.015625 0 29.46875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -805.125 -928 224 ) ( -833.125 -928 196 ) ( -833.125 -928 224 ) ( ( 0.015625 0 0.017578125 ) ( 0 0.015625 0.02734375 ) ) common/clip 134217728 0 0
+( -804 -926 224 ) ( -832 -926 196 ) ( -804 -926 196 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -832 -1902 196 ) ( -804 -1774 224 ) ( -832 -1774 196 ) ( ( 0.015625 0 1023.96875 ) ( 0 0.0156249991 0 ) ) common/clip 134217728 0 0
+}
+}
+}
+{
+"classname" "func_group"
+{
+brushDef
+{
+( -770 64 32 ) ( -706 92 32 ) ( -706 64 32 ) ( ( -0.015625 0 252.75 ) ( 0 0.015625 14.03125 ) ) common/clip 134217728 0 0
+( -706 64 4 ) ( -770 64 32 ) ( -706 64 32 ) ( ( -0.015625 0 241.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -702 228 32 ) ( -702 200 4 ) ( -702 200 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.5 ) ) common/clip 134217728 0 0
+( -834 100.5 32 ) ( -834 72.5 4 ) ( -834 100.5 4 ) ( ( 0.015625 0 0.1328125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -834 64 4 ) ( -962 92 32 ) ( -962 64 4 ) ( ( 0.015625 0 1010.03125 ) ( 0 0.015625 11.1369333267 ) ) common/clip 134217728 0 0
+}
+}
+}
+{
+"classname" "func_group"
+{
+brushDef
+{
+( -706 320 32 ) ( -706 292 32 ) ( -770 320 32 ) ( ( 0.015625 0 246.75 ) ( 0 0.015625 14.03125 ) ) common/clip 134217728 0 0
+( -706 320 32 ) ( -770 320 32 ) ( -706 320 4 ) ( ( 0.015625 0 241.96875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -702 184 32 ) ( -702 184 4 ) ( -702 156 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.5 ) ) common/clip 134217728 0 0
+( -834 293.875 4 ) ( -834 321.875 4 ) ( -834 293.875 32 ) ( ( 0.015625 0 0.029296875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( -1022 320 4 ) ( -1022 292 32 ) ( -894 320 4 ) ( ( 0.015625 0 14.96875 ) ( 0 0.015625 1017.4592895508 ) ) common/clip 134217728 0 0
+}
+}
+}

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index 429024cdbd5cc7487478b79f14d18b890f79c4dd..db3f7b25e58b4f54fd5b47486fb11c9e4c7171a5 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8d
\ No newline at end of file
+Version: 8e
\ No newline at end of file

diff --git a/scripts/crystals.shader b/scripts/crystals.shader
deleted file mode 100644 (file)
index 1401580..0000000
--- a/scripts/crystals.shader
+++ /dev/null
@@ -1,13 +0,0 @@
-models/crystals/crystal1
-{
-       dpglossintensitymod 5
-       dpglossexponentmod 2
-       dpreflectcube cubemaps/default/sky
-       {
-               map "models/crystals/crystal1"
-       }
-       {
-               map $lightmap
-       }
-}
-

diff --git a/scripts/entities.ent b/scripts/entities.ent
index f37e0b2299f2f0751b96b16d7dbe1b770bad8de8..c27c2ec3ed2f01634d3d349dae08bbddc6ac917a 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -820,6 +820,8 @@ Generic placeholder for inserting MD3 models in game. Requires compilation of ma
 </point>
 
 <point name="misc_gamemodel" color="0 .5 .8" box="-8 -8 -8 8 8 8">
+NOTE: usually misc_clientmodel will predict better and have more fps!
+Use this only if you need to.
 A way to load models from a map by the engine (e.g. self-animated zym models).
 Is non-solid by default.
 The keys below actually apply to most engine-loaded model entities as they are engine features; however, they are described here as they aren't overridden by game code in misc_gamemodel. Its q3map2 keys below will work on any brush entity!

diff --git a/scripts/map_catharsis.shader b/scripts/map_catharsis.shader
index a1d5b186734027a54739b5f6fbb395029d8865e0..f05f609bcab225287a8353f550fc4cf979cf2784 100644 (file)
--- a/scripts/map_catharsis.shader
+++ b/scripts/map_catharsis.shader
@@ -162,46 +162,6 @@ textures/map_catharsis/50_armor
        }
        
 }
-textures/map_catharsis/dirt1
-{
-       qer_editorimage textures/map_catharsis/dirt1.tga
-
-       surfaceparm trans
-       surfaceparm nonsolid
-       surfaceparm nodlight
-       surfaceparm nolightmap
-
-       polygonOffset
-       sort 6
-       cull none
-
-
-       {
-               map textures/map_catharsis/dirt1.tga
-               blendFunc filter
-               rgbgen identity
-       }
-}
-textures/map_catharsis/dirt2
-{
-       qer_editorimage textures/map_catharsis/dirt2
-
-       surfaceparm trans
-       surfaceparm nonsolid
-       surfaceparm nodlight
-       surfaceparm nolightmap
-
-       polygonOffset
-       sort 6
-       cull none
-
-
-       {
-               map textures/map_catharsis/dirt2
-               blendFunc filter
-               rgbgen identity
-       }
-}
 textures/map_catharsis/red
 {
        qer_editorimage textures/map_catharsis/red.tga
@@ -243,27 +203,3 @@ textures/map_catharsis/red-surfacelight
                blendfunc filter
        }
 }
-justinterrain
-          {
-                  q3map_nonplanar
-                  q3map_shadeangle 65
-                  q3map_lightmapSampleOffset 3
-                  q3map_lightmapSampleSize 64
-                  q3map_globalTexture
-     qer_editorimage textures/map_catharsis/rock.tga
-                  dpnoshadow
-  {
-    map textures/map_catharsis/rock.tga
-  }
-      {
-         map textures/map_catharsis/sand.tga
-                          blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-                          alphagen vertex
-      }
-           
-                  {
-                          map $lightmap
-                          blendfunc GL_DST_COLOR GL_ZERO
-                          rgbGen identity
-                  }
-}
\ No newline at end of file

diff --git a/scripts/model_crystals.shader b/scripts/model_crystals.shader
new file mode 100644 (file)
index 0000000..1401580
--- /dev/null
+++ b/scripts/model_crystals.shader
@@ -0,0 +1,13 @@
+models/crystals/crystal1
+{
+       dpglossintensitymod 5
+       dpglossexponentmod 2
+       dpreflectcube cubemaps/default/sky
+       {
+               map "models/crystals/crystal1"
+       }
+       {
+               map $lightmap
+       }
+}
+

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c583f0ee4f7a041026011f0ab56d800e009f01c4..46dcb86575400ff0c5e645905fa76ee6149ce505 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -233,8 +233,8 @@ use_texture()
                                        ;;
                        esac
                        ;;
-               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod
-               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*)
+               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod, solarpanel
+               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*|textures/solarpanel/*)
                        pre=`echo "$1" | cut -d / -f 1-2`
                        case "$2" in
                                "$pre"/*)
@@ -342,17 +342,22 @@ parse_shaderstage_post()
                        mainalphagen=$ss_alphagen
                elif [ x"$ss_alphagen" = x"vertex" ] && ! $textureblending; then
                        case "$mainblendfunc:$mainalphafunc:$ss_blendfunc:$ss_alphafunc" in
+                               # none, blend
+                               none:none:blend:none) textureblending=true ;;
                                none:none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
-                               none:none:filter:none) textureblending=true ;;
+                               "gl_one gl_zero":none:blend:none) textureblending=true ;;
+                               "gl_one zl_zero":none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
+                               # none, alphafunc
                                none:none:none:g*) textureblending=true ;;
-                               "gl_one gl_zero":none:filter:none) textureblending=true ;;
+                               none:none:"gl_one gl_zero":g*) textureblending=true ;;
                                "gl_one gl_zero":none:none:g*) textureblending=true ;;
+                               "gl_one gl_zero":none:"gl_one gl_zero":g*) textureblending=true ;;
                                *)
-                                       err "texture blending requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
+                                       err "$parsing_shader uses texture blending, but that requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
                                        ;;
                        esac
                else
-                       err "multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
+                       err "$parsing_shader, a multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
                fi
        fi
 }

diff --git a/scripts/shader-parser.subr b/scripts/shader-parser.subr
index ef82832f427839513e1d036c5a5e7caedeec8f55..5f18cec84a90434f80a55540bfd15bf52c99b8b9 100644 (file)
--- a/scripts/shader-parser.subr
+++ b/scripts/shader-parser.subr
@@ -4,7 +4,7 @@
 
 shader_normalize()
 {
-       echo "$1" | sed 's/\.\(tga\|jpg\|png\)$//'
+       echo "$1" | sed 's/^"//; s/"$//; s/\.\(tga\|jpg\|png\)$//'
 }
 
 parse_shaderstage_pre()

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 1ab8c0ece645d29ec903330dd0fcb29556405552..4d4aaf2be32d85d4ff52ed2a7e0850618d2d410b 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,6 +1,5 @@
 alphamod
 common
-crystals
 decals
 effects_beam
 effects_forcefield
@@ -38,6 +37,7 @@ map_xoylent
 metaltechx
 model_bigfan01
 model_crate02
+model_crystals
 model_desertfactory
 model_teleporters
 model_trak

diff --git a/scripts/solarpanel.shader b/scripts/solarpanel.shader
new file mode 100644 (file)
index 0000000..8dbd271
--- /dev/null
+++ b/scripts/solarpanel.shader
@@ -0,0 +1,27 @@
+textures/solarpanel/panels
+{
+       qer_editorimage textures/solarpanel/panels.tga
+       {
+               map textures/solarpanel/panels
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/solarpanel/solarmetal
+{
+       qer_editorimage textures/solarpanel/solarmetal.tga
+       {
+               map textures/solarpanel/solarmetal
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}

diff --git a/textures/solarpanel/panels_bump.jpg b/textures/solarpanel/panels_bump.jpg
deleted file mode 100644 (file)
index e4b9d86..0000000
Binary files a/textures/solarpanel/panels_bump.jpg and /dev/null differ

diff --git a/textures/solarpanel/panels_norm.jpg b/textures/solarpanel/panels_norm.jpg
deleted file mode 100644 (file)
index 97903ab..0000000
Binary files a/textures/solarpanel/panels_norm.jpg and /dev/null differ

diff --git a/textures/solarpanel/panels_norm.tga b/textures/solarpanel/panels_norm.tga
new file mode 100644 (file)
index 0000000..fff343c
Binary files /dev/null and b/textures/solarpanel/panels_norm.tga differ