Merge remote branch 'origin/fruitiex/mapinfo_improvements'

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 2e385dac8f13b0032893b13c71d81df5bd4cef49..8580812262b485da9419e239c27113932c37a3e7 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -12280,9 +12280,9 @@ effects_jumppad/jumppadfx1_b
 ( 32 1472 -34 ) ( 32 1152 -34 ) ( -384 1472 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( 32 1408 -32 ) ( -384 1408 -32 ) ( 32 1408 -64 ) exx/base-metal03 128 192 0 0.25 0.25 134217728 0 0
 ( -256 1472 -32 ) ( -256 1472 -64 ) ( -256 1152 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -48 ) ( 32 1152 -48 ) ( -384 1472 -48 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -40 ) ( 32 1152 -40 ) ( -384 1472 -40 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
 ( -384 1152 -64 ) ( -384 1152 -32 ) ( 32 1152 -64 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -64 ) ( -384 1472 -64 ) ( -384 1152 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -56 ) ( -384 1472 -56 ) ( -384 1152 -24 ) common/caulk 0 32 0 0.25 0.25 134217728 0 0
 }
 {
 ( -576 448 -64 ) ( -576 432 -64 ) ( -1088 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -12521,9 +12521,9 @@ effects_jumppad/jumppadfx1_b
 ( -256 1152 -34 ) ( -256 1024 -34 ) ( -528 1152 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -528 1152 -32 ) ( -256 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -256 1152 -64 ) ( -256 1024 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -528 1024 -48 ) ( -256 1024 -48 ) ( -528 1152 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -528 1024 -40 ) ( -256 1024 -40 ) ( -528 1152 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -528 1024 -64 ) ( -528 1024 -32 ) ( -256 1024 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1024 -66 ) ( -832 1152 -66 ) ( -832 1024 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
+( -832 1024 -58 ) ( -832 1152 -58 ) ( -832 1024 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
 }
 {
 ( -840 448 -32 ) ( -840 432 -32 ) ( -896 448 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -13002,8 +13002,8 @@ exx/base-metal03
 {
 ( -320 1600 -34 ) ( -320 1472 -34 ) ( -592 1600 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -320 1152 -32 ) ( -592 1152 -32 ) ( -320 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1600 -34 ) ( -832 1600 -66 ) ( -832 1472 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
-( -592 1472 -48 ) ( -320 1472 -48 ) ( -592 1600 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -832 1600 -26 ) ( -832 1600 -58 ) ( -832 1472 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
+( -592 1472 -40 ) ( -320 1472 -40 ) ( -592 1600 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -592 448 -64 ) ( -592 448 -32 ) ( -320 448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -896 1472 -64 ) ( -896 1600 -64 ) ( -896 1472 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 }
@@ -13411,6 +13411,14 @@ exx/base-metal03
 ( 832 832 512 ) ( 912 960 512 ) ( 960 832 512 ) common/caulk 156.4449462891 213.3328857422 -90 0.1875 -0.1875 134217728 0 0
 ( 864 64 576 ) ( 976 64 464 ) ( 864 -64 576 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0
 }
+{
+( -256 1552 128 ) ( -256 1472 128 ) ( -384 1552 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 1600 128 ) ( -384 1600 128 ) ( -256 1600 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -224 1552 128 ) ( -224 1552 96 ) ( -224 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -256 1472 96 ) ( -384 1552 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -384 1472 128 ) ( -256 1472 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -416 1472 96 ) ( -416 1552 96 ) ( -416 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"