Merge master and resolve merge conflicts

[xonotic/xonotic-maps.pk3dir.git] / maps / erbium.map

diff --git a/maps/erbium.map b/maps/erbium.map
index c5d99166b1486f767fb7840a20aeac9ab8220018..4f7ca94f369f7c3ece1e9fd3db4da9876f167cf7 100644 (file)
--- a/maps/erbium.map
+++ b/maps/erbium.map
@@ -11198,8 +11198,8 @@ brushDef
 {
 ( -116 -1008 48 ) ( -116 -1336 48 ) ( -544 -1008 48 ) ( ( -0.0052083335 -0 -0.021484375 ) ( 0 -0.0052083335 0.126953125 ) ) map_erbium/black-tiles-mossy 0 0 0
 ( -544 -1336 0 ) ( -116 -1336 0 ) ( -544 -1008 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -520 -1112 -64 ) ( -524 -1108 -64 ) ( -520 -1112 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -432 -1016 -64 ) ( -428 -1020 -64 ) ( -432 -1016 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -544 -1136 -64 ) ( -548 -1132 -64 ) ( -544 -1136 64 ) ( ( 0.0156249963 0 0.0000000149 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( -424 -1024 -64 ) ( -420 -1028 -64 ) ( -424 -1024 64 ) ( ( 0.0156249991 0 0.1767766774 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -180 -1444 -64 ) ( -180 -1448 -64 ) ( -180 -1444 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -320 -1032 -64 ) ( -320 -1024 -64 ) ( -320 -1032 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -13085,17 +13085,6 @@ brushDef
 {
 brushDef
 {
-( 208 -1424 364 ) ( 208 -1504 364 ) ( -196 -1424 364 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
-( 208 -1420 764 ) ( -196 -1420 764 ) ( 208 -1420 -68 ) ( ( 0.015625 0 0 ) ( 0 0.015625 250.5625 ) ) common/weapclip 0 0 0
-( 208 -1424 764 ) ( 208 -1424 -68 ) ( 208 -1504 764 ) ( ( 0.015625 0 0 ) ( 0 0.015625 250.5625 ) ) common/weapclip 0 0 0
-( -196 -1504 -68 ) ( 208 -1504 -68 ) ( -196 -1424 -68 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
-( -196 -1504 -68 ) ( -196 -1504 764 ) ( 208 -1504 -68 ) ( ( 0.015625 0 0 ) ( 0 0.015625 250.5625 ) ) common/weapclip 0 0 0
-( -196 -1504 -68 ) ( -196 -1424 -68 ) ( -196 -1504 764 ) ( ( 0.015625 0 0 ) ( 0 0.015625 250.5625 ) ) common/weapclip 0 0 0
-}
-}
-{
-brushDef
-{
 ( 458 232 906 ) ( 458 -116 906 ) ( 204 232 906 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/weapclip 0 0 0
 ( 532 144 688 ) ( 278 144 688 ) ( 532 144 686 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/weapclip 0 0 0
 ( 516 224 688 ) ( 516 224 686 ) ( 516 -124 688 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/weapclip 0 0 0
@@ -20678,7 +20667,7 @@ brushDef
 "angle" "146.169861"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "1420.000000 -1128.000000 400.000000"
 }
 {
@@ -20853,11 +20842,11 @@ brushDef
 "origin" "-340.000000 -1228.000000 360.000000"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "-296.000000 456.000000 320.000000"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-92.000000 -1364.000000 100.000000"
 }
 {
@@ -20998,7 +20987,7 @@ brushDef
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "1376.000000 96.000000 128.000000"
 }
 {
@@ -22949,10 +22938,6 @@ brushDef
 "origin" "912.000000 403.000000 280.000000"
 }
 {
-"classname" "func_group"
-"_lightmapscale" "0.2"
-}
-{
 "classname" "misc_model"
 "origin" "888.799011 -72.768448 130.391052"
 "model" "models/map_erbium/circle.ase"
@@ -23725,7 +23710,7 @@ brushDef
 {
 "classname" "dom_controlpoint"
 "origin" "176.000000 -504.000000 544.000000"
-"message" " has captured the ^2Waterfall ^3control point"
+"message" " has captured the ^2Mega Health ^3control point"
 }
 {
 "classname" "dom_controlpoint"
@@ -23783,11 +23768,11 @@ brushDef
 brushDef
 {
 ( -420 -1280 48 ) ( -228 -868 48 ) ( -420 -868 48 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -256 -1172 48 ) ( -256 -1172 256 ) ( -672 -748 256 ) ( ( 0.004111086 0 3.5802931786 ) ( 0 0.0048076925 1.2307692766 ) ) map_erbium/con-tiled 0 0 0
+( -256 -1172 48 ) ( -256 -1172 256 ) ( -672 -748 256 ) ( ( 0.0041110632 0 -0.4197070599 ) ( -0 0.0048076925 0.2307617217 ) ) map_erbium/con-tiled 0 0 0
 ( -296 64 256 ) ( -272 64 256 ) ( -296 -64 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -367 -1271 -64 ) ( -371 -1267 -64 ) ( -367 -1271 64 ) ( ( 0.0040106885 0 -0.9985351563 ) ( -0 0.0062500001 0.9250000119 ) ) map_erbium/con-tiled 0 0 0
 ( -640 -64 336 ) ( -640 64 328 ) ( -640 64 336 ) ( ( 0.0040106885 0 -0.9985351563 ) ( -0 0.0062500001 0.9250000119 ) ) map_erbium/con-tiled 0 0 0
-( -608 -856 -64 ) ( -608 -864 -64 ) ( -608 -856 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -608 -856 -64 ) ( -608 -864 -64 ) ( -608 -856 64 ) ( ( 0.0041110632 0 -0.4197070599 ) ( -0 0.0048076925 0.2307617217 ) ) map_erbium/con-tiled 0 0 0
 }
 }
 {
@@ -23798,7 +23783,7 @@ brushDef
 ( -64 64 280 ) ( -48 64 280 ) ( -64 -64 280 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -367 -1271 -64 ) ( -371 -1267 -64 ) ( -367 -1271 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -640 -64 336 ) ( -640 64 328 ) ( -640 64 336 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( -608 -856 -64 ) ( -608 -864 -64 ) ( -608 -856 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -608 -856 -64 ) ( -608 -864 -64 ) ( -608 -856 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 }
 }
 {
@@ -23809,7 +23794,7 @@ brushDef
 ( -64 -64 280 ) ( -48 64 280 ) ( -64 64 280 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -321 -1317 280 ) ( -421 -1217 380 ) ( -321 -1317 380 ) ( ( 0.005892491 0 -0.0166601539 ) ( -0 0.0044642859 0.5 ) ) map_erbium/black-tiles 0 0 0
 ( -640 -64 336 ) ( -640 64 328 ) ( -640 64 336 ) ( ( 0.005892491 0 -0.0166601539 ) ( -0 0.0044642859 0.5 ) ) map_erbium/black-tiles 0 0 0
-( -608 -856 -64 ) ( -608 -864 -64 ) ( -608 -856 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -608 -856 -64 ) ( -608 -864 -64 ) ( -608 -856 64 ) ( ( 0.005892491 0 -0.03125 ) ( -0 0.0044642859 0.5 ) ) map_erbium/black-tiles 0 0 0
 }
 }
 {
@@ -23840,7 +23825,7 @@ brushDef
 brushDef
 {
 ( -306 -1314 336 ) ( -340 -1148 336 ) ( -300 -1148 336 ) ( ( 0.0052083335 -0 -0.7082812786 ) ( -0 -0.0052083335 0.75 ) ) exx/base-crete03 0 0 0
-( -256 -1212 280 ) ( -256 -1212 336 ) ( -672 -788 336 ) ( ( 0.0058925566 -0 -0.03125 ) ( 0 0.0044642859 0.5000001192 ) ) map_erbium/black-tiles 0 0 0
+( -256 -1212 280 ) ( -256 -1212 336 ) ( -672 -788 336 ) ( ( 0.005892491 0 -0.03125 ) ( -0 0.0044642859 0.5 ) ) map_erbium/black-tiles 0 0 0
 ( -252 -1248 280 ) ( -318 -1314 380 ) ( -252 -1248 380 ) ( ( 0.0058925566 -0 -0.0234375 ) ( 0 0.0044642859 0.5000001192 ) ) map_erbium/black-tiles 0 0 0
 ( -64 -64 280 ) ( -48 64 280 ) ( -64 64 280 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -256 -1212 336 ) ( -256 -1212 280 ) ( -256 -1252 280 ) ( ( 0.0058925566 -0 -0.9296875 ) ( 0 0.0044642859 0.5000001192 ) ) map_erbium/black-tiles 0 0 0