More shards, fix wire texture, try trickjump

diff --git a/maps/atomforge.map b/maps/atomforge.map
index c6449f7bb2eec59b765cb9a43670040ccaab91e7..ad29b175635af58bf2cc8f1606ac358f7e1ea863 100644 (file)
--- a/maps/atomforge.map
+++ b/maps/atomforge.map
@@ -2559,7 +2559,7 @@ exomorphx/wall-metal_panel03
 ( -512 -296 584 ) ( -512 -336 584 ) ( -1280 -296 584 ) common/caulk 0 192 0 0.25 0.25 0 0 0
 ( -512 -304 584 ) ( -1280 -304 584 ) ( -512 -304 576 ) common/caulk 0 224 0 0.25 0.25 0 0 0
 ( -512 -296 584 ) ( -512 -296 576 ) ( -512 -336 584 ) common/caulk 64 0 0 0.25 0.25 0 0 0
-( -1280 -336 576 ) ( -512 -336 576 ) ( -1280 -296 576 ) phillipk2x/pipes-pk02_pipes01 0 64 90 0.25 0.25 0 0 0
+( -1280 -336 576 ) ( -512 -336 576 ) ( -1280 -296 576 ) exomorphx/wall-metal_panel03 318 928 0 0.25 0.25 0 0 0
 ( -1152 -368 576 ) ( -1152 -368 584 ) ( -384 -368 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1152 -336 576 ) ( -1152 -296 576 ) ( -1152 -336 584 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 }
@@ -2715,9 +2715,9 @@ exomorphx/wall-metal_panel03
 ( -512 -376 584 ) ( -512 -336 584 ) ( 256 -376 584 ) common/caulk 0 64 180 0.25 0.25 0 0 0
 ( -512 -368 584 ) ( 256 -368 584 ) ( -512 -368 576 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
 ( -512 -376 584 ) ( -512 -376 576 ) ( -512 -336 584 ) common/caulk 192 0 0 -0.25 0.25 0 0 0
-( 256 -336 576 ) ( -512 -336 576 ) ( 256 -376 576 ) phillipk2x/pipes-pk02_pipes01 0 64 90 0.25 0.25 0 0 0
+( 256 -336 576 ) ( -512 -336 576 ) ( 256 -376 576 ) exomorphx/wall-metal_panel03 832 928 0 0.25 0.25 0 0 0
 ( 0 -304 576 ) ( 0 -304 584 ) ( -768 -304 576 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 0 -336 576 ) ( 0 -376 576 ) ( 0 -336 584 ) common/caulk 192 0 0 -0.25 0.25 0 0 0
+( -448 -304 -64 ) ( -448 -368 -64 ) ( -448 -304 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -512 -176 576 ) ( -512 -168 576 ) ( 256 -176 576 ) common/caulk 0 64 180 0.25 0.25 0 0 0
@@ -20376,6 +20376,53 @@ decals/scorch01
 )
 }
 }
+{
+( -512 -376 584 ) ( -512 -336 584 ) ( 256 -376 584 ) common/caulk 0 64 180 0.25 0.25 0 0 0
+( -512 -368 584 ) ( 256 -368 584 ) ( -512 -368 576 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
+( 256 -336 576 ) ( -512 -336 576 ) ( 256 -376 576 ) phillipk2x/pipes-pk02_pipes01 0 64 90 0.25 0.25 0 0 0
+( 0 -304 576 ) ( 0 -304 584 ) ( -768 -304 576 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 0 -336 576 ) ( 0 -376 576 ) ( 0 -336 584 ) common/caulk 192 0 0 -0.25 0.25 0 0 0
+( -448 -304 64 ) ( -448 -368 -64 ) ( -448 -304 -64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -576 -616 168 ) ( -576 -632 168 ) ( -696 -616 168 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -576 -616 168 ) ( -696 -616 168 ) ( -576 -616 160 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -576 -616 168 ) ( -576 -616 160 ) ( -576 -632 168 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -696 -632 160 ) ( -576 -632 160 ) ( -696 -616 160 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -696 -632 160 ) ( -696 -632 168 ) ( -576 -632 160 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -696 -632 160 ) ( -696 -616 160 ) ( -696 -632 168 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 344 -616 576 ) ( 344 -632 576 ) ( 304 -616 576 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 344 -616 576 ) ( 304 -616 576 ) ( 344 -616 560 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 344 -616 576 ) ( 344 -616 560 ) ( 344 -632 576 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 304 -632 560 ) ( 344 -632 560 ) ( 304 -616 560 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 304 -632 560 ) ( 304 -632 576 ) ( 344 -632 560 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 304 -632 560 ) ( 304 -616 560 ) ( 304 -632 576 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -584 -576 240 ) ( -696 -576 240 ) ( -584 -576 112 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
+( -584 -576 240 ) ( -584 -576 112 ) ( -584 -592 240 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
+( -696 -592 144 ) ( -584 -592 144 ) ( -696 -576 144 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
+( -640 -592 112 ) ( -640 -576 112 ) ( -640 -592 240 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
+( 64 -576 200 ) ( -64 -608 144 ) ( -64 -576 200 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -376 -576 320 ) ( -376 -600 320 ) ( -440 -576 320 ) phillipk2x/walls-pk02_wall_big01b 960 256 0 0.25 0.25 0 0 0
+( -376 -576 320 ) ( -440 -576 320 ) ( -376 -576 264 ) phillipk2x/walls-pk02_wall_big01b 960 480 0 0.25 0.25 0 0 0
+( -368 -576 320 ) ( -368 -576 264 ) ( -368 -600 320 ) phillipk2x/walls-pk02_wall_big01b 768 480 0 0.25 0.25 0 0 0
+( -440 -600 312 ) ( -376 -600 312 ) ( -440 -576 312 ) exomorphx/wall-concrete_metal_wallplate02 960 256 0 0.25 0.25 0 0 0
+( -440 -616 264 ) ( -440 -616 320 ) ( -376 -616 264 ) phillipk2x/walls-pk02_wall_big01b 960 480 0 0.25 0.25 0 0 0
+( -440 -600 264 ) ( -440 -576 264 ) ( -440 -600 320 ) phillipk2x/walls-pk02_wall_big01b 768 480 0 0.25 0.25 0 0 0
+}
+{
+( -384 -630.0781860352 334.735824585 ) ( -384 -663.4217834473 369.2641296387 ) ( -392 -630.0781860352 334.735824585 ) phillipk2x/base-pk02_generic01b 0 0 0 0.25 0.25 0 0 0
+( -384 -615.0781860352 321.235824585 ) ( -392 -615.0781860352 321.235824585 ) ( -384 -620.832901001 315.6785583496 ) phillipk2x/base-pk02_generic01b 0 485 0 0.25 0.25 0 0 0
+( -384 -638.0781860352 342.735824585 ) ( -384 -643.832901001 337.1785583496 ) ( -384 -671.4217834473 377.2641296387 ) phillipk2x/base-pk02_generic01b 27 0 0 0.25 0.25 0 0 0
+( -392 -667.1764984131 372.7068634033 ) ( -384 -667.1764984131 372.7068634033 ) ( -392 -633.832901001 338.1785583496 ) phillipk2x/base-pk02_generic01b 0 0 0 0.25 0.25 0 0 0
+( -392 -679.4264984131 382.2068634033 ) ( -392 -673.6717834473 387.7641296387 ) ( -384 -679.4264984131 382.2068634033 ) phillipk2x/base-pk02_generic01b 0 485 0 0.25 0.25 0 0 0
+( -384.5 -677.1764984131 371.7068634033 ) ( -384.5 -643.832901001 337.1785583496 ) ( -384.5 -671.4217834473 377.2641296387 ) phillipk2x/base-pk02_generic01b 27 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -20882,7 +20929,7 @@ facility114invx/base-baseblack
 }
 {
 "classname" "misc_gamemodel"
-"origin" "-328.000092 -688.000122 384.000000"
+"origin" "-332.000092 -759.000122 384.000000"
 "model" "models/containers/crate02.md3"
 "modelscale" "0.800000"
 "angle" "29.000021"
@@ -21574,7 +21621,7 @@ facility114invx/base-baseblack
 }
 {
 "classname" "item_health_medium"
-"origin" "352.000000 -608.000000 160.000000"
+"origin" "648.000000 -1176.000000 160.000000"
 "angle" "90.000000"
 }
 {
@@ -22378,3 +22425,43 @@ facility114invx/base-baseblack
 "modelscale" "0.800000"
 "angle" "-129.999985"
 }
+{
+"classname" "item_health_small"
+"origin" "352.000000 -144.000000 160.000000"
+"angle" "90.000000"
+}
+{
+"classname" "item_armor_small"
+"origin" "352.000000 -64.000000 160.000000"
+"angle" "90.000000"
+}
+{
+"classname" "item_health_small"
+"origin" "352.000000 16.000000 160.000000"
+"angle" "90.000000"
+}
+{
+"classname" "item_armor_small"
+"origin" "352.000000 96.000000 160.000000"
+"angle" "90.000000"
+}
+{
+"classname" "item_armor_small"
+"origin" "-896.000000 544.000000 8.000000"
+"angle" "-179.999985"
+}
+{
+"classname" "item_health_small"
+"origin" "-976.000000 544.000000 8.000000"
+"angle" "-179.999985"
+}
+{
+"classname" "item_armor_small"
+"origin" "-1056.000000 544.000000 8.000000"
+"angle" "-179.999985"
+}
+{
+"classname" "item_health_small"
+"origin" "-1136.000000 544.000000 8.000000"
+"angle" "-179.999985"
+}

diff --git a/maps/atomforge.map.options b/maps/atomforge.map.options
index d5390dda51899d48f3768ed32eecbb085f87b365..4cbe448f0403910d0439b887837f8d383454913f 100644 (file)
--- a/maps/atomforge.map.options
+++ b/maps/atomforge.map.options
@@ -3,5 +3,5 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6e
+Version: 6f