Fix barrel going through wall, and change a few more things in blue base

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 5866861da1198408f479b5c73f6cc8672cd702cf..4ef40ecdf9f33552e560ab3ed12bb44372023d02 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -42363,14 +42363,6 @@ exx/floor-metal02
 ( 1896 -544 32 ) ( 1896 -672 32 ) ( 1896 -544 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( 1259.3078613281 -1134.7041473389 588.5 ) ( 1339.2956695557 -1133.3079833984 588.5 ) ( 1260.7040252686 -1214.6919555664 588.5 ) common/weapclip 210.0354919434 226.7474975586 91 0.25 0.25 134217728 0 0
-( 1269.1430358887 -1129.9108734131 526.5 ) ( 1259.3934936523 -1209.3145599365 526.5 ) ( 1269.1430358887 -1129.9108734131 518.5 ) common/weapclip 144.0809326172 26 0 0.2600226998 0.25 134217728 0 0
-( 1264.6853485107 -1133.3935089111 526.5 ) ( 1264.6853485107 -1133.3935089111 518.5 ) ( 1344.0890808105 -1143.1431274414 526.5 ) common/weapclip 28.4551391602 26 0 -0.2600226998 0.25 134217728 0 0
-( 1334.8269958496 -1218.5766296387 518.5 ) ( 1344.5765533447 -1139.1728973389 518.5 ) ( 1255.423324585 -1208.8270263672 518.5 ) common/weapclip 219.2743377686 122.46118927 83 0.2500000298 0.2500000298 134217728 0 0
-( 1330.856842041 -1218.0891113281 518.5 ) ( 1330.856842041 -1218.0891113281 526.5 ) ( 1340.6063232422 -1138.6854095459 518.5 ) common/weapclip 144.0809326172 26 0 0.2600226998 0.25 134217728 0 0
-( 1335.3144683838 -1214.6064605713 518.5 ) ( 1255.910736084 -1204.856842041 518.5 ) ( 1335.3144683838 -1214.6064605713 526.5 ) common/weapclip 28.4551391602 26 0 -0.2600226998 0.25 134217728 0 0
-}
-{
 ( 2234.5239257813 -44.5749511719 -66 ) ( 2311.4248046875 -22.5240478516 -66 ) ( 2256.5749511719 -121.4759521484 -66 ) common/weapclip 177.1238708496 124.3555984497 106 0.25 0.25 134217728 0 0
 ( 2242.7834472656 -37.3995361328 -128 ) ( 2253.9172363281 -116.6209716797 -128 ) ( 2242.7834472656 -37.3995361328 -136 ) common/weapclip 152.7462005615 0 0 0.2512224317 0.25 134217728 0 0
 ( 2239.37890625 -41.9172363281 -128 ) ( 2239.37890625 -41.9172363281 -136 ) ( 2318.6003417969 -30.7834472656 -128 ) common/weapclip 238.8514404297 0 0 -0.2512224317 0.25 134217728 0 0
@@ -42915,16 +42907,16 @@ exx/trim-simple03
 ( 64 -984 544 ) ( 64 -992 552 ) ( -64 -984 544 ) common/caulk 0 192 180 0.25 0.25 134217728 0 0
 }
 {
-( 1120 -1216 493 ) ( 1088 -1216 493 ) ( 1120 -1184 493 ) common/weapclip 128 128 -90 0.25 0.25 134217728 0 0
-( 1120 -1216 450 ) ( 1120 -1184 450 ) ( 1120 -1216 448 ) common/weapclip 128 0 0 -0.25 0.25 134217728 0 0
-( 1120 -1216 450 ) ( 1120 -1216 448 ) ( 1088 -1216 450 ) common/weapclip 128 0 0 0.25 0.25 134217728 0 0
-( 1088 -1184 448 ) ( 1088 -1216 448 ) ( 1120 -1184 448 ) common/weapclip 128 128 -90 0.25 0.25 134217728 0 0
-( 1088 -1184 448 ) ( 1088 -1184 450 ) ( 1088 -1216 448 ) common/weapclip 128 0 0 -0.25 0.25 134217728 0 0
-( 1088 -1184 448 ) ( 1120 -1184 448 ) ( 1088 -1184 450 ) common/weapclip 128 0 0 0.25 0.25 134217728 0 0
-( 1110 -1184 320 ) ( 1120 -1194 320 ) ( 1110 -1184 448 ) common/weapclip 88 0 0 -0.25 0.25 134217728 0 0
-( 1120 -1206 320 ) ( 1110 -1216 320 ) ( 1120 -1206 448 ) common/weapclip 216 0 0 0.25 0.25 134217728 0 0
-( 1098 -1216 320 ) ( 1088 -1206 320 ) ( 1098 -1216 448 ) common/weapclip 168 0 0 -0.25 0.25 134217728 0 0
-( 1088 -1194 320 ) ( 1098 -1184 320 ) ( 1088 -1194 448 ) common/weapclip 40 0 0 0.25 0.25 134217728 0 0
+( 1133.2548828125 -600.0000305176 501 ) ( 1110.6274719238 -622.6274414063 501 ) ( 1110.6274719238 -577.3726196289 501 ) common/weapclip 128 128 -90 0.25 0.25 134217728 0 0
+( 1133.2548828125 -600.0000305176 458 ) ( 1110.6274719238 -577.3726196289 458 ) ( 1133.2548828125 -600.0000305176 456 ) common/weapclip 128 0 0 -0.25 0.25 134217728 0 0
+( 1133.2548828125 -600.0000305176 458 ) ( 1133.2548828125 -600.0000305176 456 ) ( 1110.6274719238 -622.6274414063 458 ) common/weapclip 128 0 0 0.25 0.25 134217728 0 0
+( 1088.0000610352 -600.0000305176 456 ) ( 1110.6274719238 -622.6274414063 456 ) ( 1110.6274719238 -577.3726196289 456 ) common/weapclip 128 128 -90 0.25 0.25 134217728 0 0
+( 1088.0000610352 -600.0000305176 456 ) ( 1088.0000610352 -600.0000305176 458 ) ( 1110.6274719238 -622.6274414063 456 ) common/weapclip 128 0 0 -0.25 0.25 134217728 0 0
+( 1088.0000610352 -600.0000305176 456 ) ( 1110.6274719238 -577.3726196289 456 ) ( 1088.0000610352 -600.0000305176 458 ) common/weapclip 128 0 0 0.25 0.25 134217728 0 0
+( 1103.5563964844 -584.4436798096 328 ) ( 1117.6985321045 -584.4436798096 328 ) ( 1103.5563964844 -584.4436798096 456 ) common/weapclip 88 0 0 -0.25 0.25 134217728 0 0
+( 1126.1838226318 -592.9289703369 328 ) ( 1126.1838226318 -607.0710906982 328 ) ( 1126.1838226318 -592.9289703369 456 ) common/weapclip 216 0 0 0.25 0.25 134217728 0 0
+( 1117.6985321045 -615.5563812256 328 ) ( 1103.5563964844 -615.5563812256 328 ) ( 1117.6985321045 -615.5563812256 456 ) common/weapclip 168 0 0 -0.25 0.25 134217728 0 0
+( 1095.0711212158 -607.0710906982 328 ) ( 1095.0711212158 -592.9289703369 328 ) ( 1095.0711212158 -607.0710906982 456 ) common/weapclip 40 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( 4609.3667755127 -76.9712219238 188.556854248 ) ( 4616.0589141846 -80.8349151611 190.6274108887 ) ( 4612.0589141846 -87.7631225586 190.6274108887 ) common/caulk 219.5738677979 227.9510498047 150 0.5176380873 0.5 134217728 0 0
@@ -57785,16 +57777,16 @@ trak5x/base-pipe1c
 ( 2178 56 -211 ) ( 2168 66 -211 ) ( 2178 56 -83 ) common/weapclip 192 0 0 -0.25 0.25 134217728 0 0
 }
 {
-( 3616 692 109 ) ( 3616 724 109 ) ( 3648 692 109 ) common/weapclip 64 192 180 0.25 0.25 134217728 0 0
-( 3616 692 66 ) ( 3648 692 66 ) ( 3616 692 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3616 692 66 ) ( 3616 692 64 ) ( 3616 724 66 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3648 724 64 ) ( 3616 724 64 ) ( 3648 692 64 ) common/weapclip 64 192 180 0.25 0.25 134217728 0 0
-( 3648 724 64 ) ( 3648 724 66 ) ( 3616 724 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3648 724 64 ) ( 3648 692 64 ) ( 3648 724 66 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3648 702 -64 ) ( 3638 692 -64 ) ( 3648 702 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3626 692 -64 ) ( 3616 702 -64 ) ( 3626 692 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3616 714 -64 ) ( 3626 724 -64 ) ( 3616 714 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
-( 3638 724 -64 ) ( 3648 714 -64 ) ( 3638 724 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3616 688 109 ) ( 3616 720 109 ) ( 3648 688 109 ) common/weapclip 64 192 180 0.25 0.25 134217728 0 0
+( 3616 688 66 ) ( 3648 688 66 ) ( 3616 688 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3616 688 66 ) ( 3616 688 64 ) ( 3616 720 66 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3648 720 64 ) ( 3616 720 64 ) ( 3648 688 64 ) common/weapclip 64 192 180 0.25 0.25 134217728 0 0
+( 3648 720 64 ) ( 3648 720 66 ) ( 3616 720 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3648 720 64 ) ( 3648 688 64 ) ( 3648 720 66 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3648 698 -64 ) ( 3638 688 -64 ) ( 3648 698 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3626 688 -64 ) ( 3616 698 -64 ) ( 3626 688 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3616 710 -64 ) ( 3626 720 -64 ) ( 3616 710 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
+( 3638 720 -64 ) ( 3648 710 -64 ) ( 3638 720 64 ) common/weapclip 64 0 0 -0.25 0.25 134217728 0 0
 }
 {
 ( 2072.7036132813 -312.6920776367 486 ) ( 2071.3073730469 -232.7042236328 486 ) ( 2152.69140625 -311.2958984375 486 ) common/weapclip 226.9931945801 254.8997497559 -179 0.2500000298 0.2500000298 134217728 0 0
@@ -75474,15 +75466,6 @@ exx/trim-vert01
 }
 {
 "classname" "misc_gamemodel"
-"origin" "1300.000000 -1174.000488 518.500000"
-"model" "models/containers/crate01.md3"
-"_castShadows" "1"
-"lodmodel1" "models/containers/crate01_lod.md3"
-"loddistance1" "450"
-"angle" "-97.000618"
-}
-{
-"classname" "misc_gamemodel"
 "origin" "2283.999756 -72.000000 -136.000000"
 "model" "models/containers/crate01.md3"
 "_castShadows" "1"
@@ -75691,10 +75674,10 @@ exx/trim-vert01
 }
 {
 "classname" "misc_gamemodel"
-"origin" "1103.999512 -1199.999512 448.000000"
+"origin" "1110.626709 -600.000000 456.000000"
 "model" "models/containers/barrel01.md3"
 "_castShadows" "1"
-"angle" "150.000000"
+"angle" "-165.000015"
 }
 {
 "classname" "func_group"
@@ -126062,7 +126045,7 @@ trak5x/base-pipe1c
 }
 {
 "classname" "misc_gamemodel"
-"origin" "3632.000000 708.000000 64.000000"
+"origin" "3632.000000 704.000000 64.000000"
 "model" "models/containers/barrel01.md3"
 "_castShadows" "1"
 }