Merge branch 't0uYK8Ne/map-fixes' into 'master'

t0uYK8Ne/map fixes

See merge request !63

diff --git a/maps/_hudsetup.map b/maps/_hudsetup.map
index a147942546328a2a8fef18fbc72fe4886a7fb9df..3ecd1f9717987ba4f9e9f1864198acbbfd910f8a 100644 (file)
--- a/maps/_hudsetup.map
+++ b/maps/_hudsetup.map
@@ -432,7 +432,7 @@ facility114x/misc-tube
 {
 "classname" "misc_model"
 "origin" "-192.000000 0.000000 32.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight07.md3"
+"model" "models/lights/xonlight07.md3"
 "angle" "-90.000000"
 "_castshadows" "1"
 "_receiveshadows" "1"

diff --git a/maps/afterslime.map b/maps/afterslime.map
index 301bedca59a69ab4f7a49312a928cbe01d4ff24f..04162364ed7a930930187ebe85223d48aab7a1d0 100644 (file)
--- a/maps/afterslime.map
+++ b/maps/afterslime.map
@@ -53412,14 +53412,14 @@ exx/base-metal03
 {
 "classname" "misc_model"
 "origin" "831.999939 -224.000000 216.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "0.000001 -90.000000 179.999985"
 "modelscale" "0.800000"
 }
 {
 "classname" "misc_model"
 "origin" "831.999939 -480.000000 216.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "0.000001 -90.000000 179.999985"
 "modelscale" "0.800000"
 }
@@ -54177,28 +54177,28 @@ trak5x/base-pipe1a
 {
 "classname" "misc_model"
 "origin" "-416.000031 -64.000092 399.999939"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "0.000009 0.000001 -179.999985"
 "modelscale" "0.800000"
 }
 {
 "classname" "misc_model"
 "origin" "-511.999939 -864.000061 399.999939"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-0.000017 90.000000 -179.999985"
 "modelscale" "0.800000"
 }
 {
 "classname" "misc_model"
 "origin" "-351.999969 -1280.000000 399.999939"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-0.000017 -179.999985 179.999985"
 "modelscale" "0.800000"
 }
 {
 "classname" "misc_model"
 "origin" "672.000000 -1280.000000 399.999939"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-0.000017 -179.999985 179.999985"
 "modelscale" "0.800000"
 }
@@ -54560,14 +54560,14 @@ trak5x/base-pipe1a
 {
 "classname" "misc_model"
 "origin" "1048.000000 -1855.999878 544.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-90.000000 0.000000 -179.999985"
 "modelscale" "0.800000"
 }
 {
 "classname" "misc_model"
 "origin" "-743.999939 -1855.999756 544.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-90.000000 0.000000 -179.999985"
 "modelscale" "0.800000"
 }
@@ -54773,14 +54773,14 @@ trak5x/base-pipe1a
 {
 "classname" "misc_model"
 "origin" "-343.999939 -1856.000000 544.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-90.000000 0.000000 -179.999985"
 "modelscale" "0.800000"
 }
 {
 "classname" "misc_model"
 "origin" "664.000061 -1855.999878 544.000000"
-"model" "xonotic-maps.pk3dir/models/lights/xonlight03.md3"
+"model" "models/lights/xonlight03.md3"
 "angles" "-90.000000 0.000000 -179.999985"
 "modelscale" "0.800000"
 }

diff --git a/maps/atelier.map b/maps/atelier.map
index de090ea46feb32cbe0ad2b84f36997041c80958b..c2d9f0d8e45a1a637db7a56e9fcf1415e77d0cdd 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -17327,11 +17327,11 @@ trak5x/base-pipe1d
 }
 {
 ( -776 952 312 ) ( -760 824 312 ) ( -760 952 312 ) exx/trim-01 13.7662734985 127.3338394165 45 0.25 0.25 134217728 0 0
-( -1032 1072 312 ) ( -1024 1088 312 ) ( -1024 1088 440 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
-( -760 824 440 ) ( -880 944 440 ) ( -880 944 312 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( -1068 1108 320 ) ( -1068 1108 312 ) ( -1056 1120 312 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
+( -1056 1120 320 ) ( -1056 1120 312 ) ( -832 896 312 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 ( -776 952 320 ) ( -760 824 320 ) ( -776 824 320 ) common/caulk 32 192 0 0.25 0.25 134217728 0 0
 ( -832 896 312 ) ( -848 888 312 ) ( -848 888 440 ) common/caulk 64 32 0 0.25 -0.25 134217728 0 0
-( -776 816 312 ) ( -888 928 312 ) ( -888 928 440 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( -1068 1108 312 ) ( -1068 1108 320 ) ( -848 888 320 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 }
 {
 ( -928 352 768 ) ( -928 128 768 ) ( -992 352 768 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
@@ -17530,11 +17530,11 @@ trak5x/base-pipe1d
 }
 {
 ( -264 952 312 ) ( -264 824 312 ) ( -248 952 312 ) exx/trim-01 61.4566879272 303.0244140625 135 0.25 -0.25 134217728 0 0
-( 0 1088 440 ) ( 0 1088 312 ) ( 8 1072 312 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
-( -144 944 312 ) ( -144 944 440 ) ( -264 824 440 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( 44 1108 312 ) ( 44 1108 320 ) ( 32 1120 320 ) common/caulk 0 32 0 0.25 -0.25 134217728 0 0
+( 32 1120 312 ) ( 32 1120 320 ) ( -192 896 320 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 ( -248 824 320 ) ( -264 824 320 ) ( -248 952 320 ) common/caulk 32 192 0 -0.25 0.25 134217728 0 0
 ( -176 888 440 ) ( -176 888 312 ) ( -192 896 312 ) common/caulk 64 32 180 0.25 0.25 134217728 0 0
-( -136 928 440 ) ( -136 928 312 ) ( -248 816 312 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
+( 44 1108 320 ) ( 44 1108 312 ) ( -176 888 320 ) map_atelier/9techwall03b 0 288 0 0.25 -0.25 134217728 0 0
 }
 {
 ( -32 352 768 ) ( -96 128 768 ) ( -96 352 768 ) common/caulk 128 0 0 -0.25 0.25 134217728 0 0

diff --git a/maps/silentsiege.map b/maps/silentsiege.map
index 690a2eb5a031c54e478681aa0c2e867300fcfcb7..e251eba26df073b4a5b6e2fe844d5e64bf6fa70a 100644 (file)
--- a/maps/silentsiege.map
+++ b/maps/silentsiege.map
@@ -2347,7 +2347,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -496 384 640 ) ( -496 384 0 ) ( -496 128 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -1152 128 0 ) ( -1152 128 640 ) ( -384 128 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 384 64 ) ( -544 352 -64 ) ( -544 384 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 352 -64 ) ( -512 352 -64 ) ( -544 352 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -2380,7 +2380,7 @@ phillipk2x/base-pk02_generic01b
 {
 patchDef2
 {
-trak5x/floor-floor2a
+phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
 ( ( -496 352 608 -3.875 -2.75 ) ( -496 400 608 -3.875 -3.125 ) ( -544 400 608 -4.25 -3.125 ) )
@@ -6321,7 +6321,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -384 400 640 ) ( -1152 400 640 ) ( -384 400 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -544 384 -64 ) ( -544 352 -64 ) ( -544 384 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 352 64 ) ( -512 352 -64 ) ( -544 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -848 352 -64 ) ( -848 368 -64 ) ( -848 352 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -22362,7 +22362,7 @@ phillipk2x/base-pk02_generic01b
 {
 patchDef2
 {
-trak5x/base-base1c
+phillipk2x/base-pk02_generic01b
 ( 3 3 0 0 0 )
 (
 ( ( 864 480 960 5.25 -6 ) ( 864 480 1120 5.25 -7.25 ) ( 736 480 1120 4.25 -7.25 ) )
@@ -24832,7 +24832,7 @@ brushDef
 brushDef
 {
 ( -736 -736 736 ) ( -736 -736 992 ) ( -320 -736 736 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -384 -736 -64 ) ( -416 -704 -64 ) ( -384 -736 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal04 0 0 0
+( -384 -736 -64 ) ( -416 -704 -64 ) ( -384 -736 64 ) ( ( 0 0.015625 0 ) ( -0.0052083335 0 0.5 ) ) exx/trim-metalsupp01 0 0 0
 ( -384 -672 0 ) ( -320 -736 0 ) ( -384 -672 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/base-base1c 0 0 0
 ( -416 -704 0 ) ( -384 -672 0 ) ( -416 -704 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 64 -672 896 ) ( -64 -640 896 ) ( -64 -672 896 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -35463,7 +35463,7 @@ brushDef
 {
 ( -384 384 640 ) ( -384 128 640 ) ( -1152 384 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-crete01 0 0 0
 ( -384 400 640 ) ( -1152 400 640 ) ( -384 400 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak5x/floor-floor2a 0 0 0
+( -1152 160 608 ) ( -384 160 608 ) ( -1152 416 608 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( -544 352 64 ) ( -512 352 -64 ) ( -544 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -848 352 64 ) ( -848 368 -64 ) ( -848 352 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -896 128 -64 ) ( -896 144 -64 ) ( -896 128 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0

diff --git a/maps/solarium.map b/maps/solarium.map
index 2c2087f9c0c4ee281f809b8ce44fdfe6bd5ece37..a0136f992542df08a781e52cee27164f72d24e79 100644 (file)
--- a/maps/solarium.map
+++ b/maps/solarium.map
@@ -20581,7 +20581,7 @@ trak5x/base-base1a
 {
 ( 1014 -1728 16 ) ( 76 -1728 16 ) ( 1014 -1728 -144 ) common/waternodraw 76 0 0 0.25 0.25 0 0 0
 ( -29 -2816 -144 ) ( 909 -2816 -144 ) ( -29 -1707 -144 ) common/waternodraw 240 0 0 0.25 0.25 0 0 0
-( -576 -1728 2 ) ( -576 -1920 2 ) ( -576 -1728 -144 ) common/waternodraw 504 0 0 0.25 0.25 0 0 0
+( -608 -1728 2 ) ( -608 -1920 2 ) ( -608 -1728 -144 ) common/waternodraw 504 0 0 0.25 0.25 0 0 0
 ( -166 -1920 64 ) ( -150 -1920 -64 ) ( -166 -1920 -64 ) common/waternodraw 0 0 0 0.25 0.25 0 0 0
 ( -192 -1730 -60 ) ( -192 -1754 -60 ) ( -192 -1730 68 ) common/waternodraw 0 16 0 0.25 0.25 0 0 0
 ( -184 64 0 ) ( -180 64 0 ) ( -184 -64 0 ) map_solarium/water4 0 0 0 0.25 0.25 0 0 0
@@ -23587,6 +23587,14 @@ trak5x/base-base1a
 ( -1320 -800 -144 ) ( -1320 -800 112 ) ( -1320 -696 -144 ) common/full_clip 0 0 0 0.25 0.25 0 0 0
 ( -1320 -968 -160 ) ( -1336 -968 -160 ) ( -1320 -968 96 ) common/full_clip 64 0 0 -0.25 0.25 0 0 0
 }
+{
+( -2436 -824 -84 ) ( -2436 -1424 -84 ) ( -2508 -824 -84 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2436 -824 -84 ) ( -2508 -824 -84 ) ( -2436 -824 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2436 -824 -84 ) ( -2436 -824 -160 ) ( -2436 -1424 -84 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2508 -1424 -160 ) ( -2436 -1424 -160 ) ( -2508 -824 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2508 -1424 -160 ) ( -2508 -1424 -84 ) ( -2436 -1424 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2508 -1424 -160 ) ( -2508 -824 -160 ) ( -2508 -1424 -84 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 2adc87e913c94fb8f527f6643ac743ad41eeabfd..066a73ee258da1467e214a4d208afa0ae3a578d1 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -326,9 +326,9 @@
 {
 ( 192 -736 -128 ) ( -192 -736 -128 ) ( -192 -256 -128 ) trak5x/trim-trim1b 0 0 90 0.25 0.25 0 0 0
 ( -192 -736 -192 ) ( 192 -736 -192 ) ( -192 -256 -192 ) trak5x/wall-wall5a 0 0 0 0.25 0.25 0 0 0
-( 192 -736 -192 ) ( 192 -736 -128 ) ( 192 -256 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 256 -736 -192 ) ( 256 -736 -128 ) ( 256 -256 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 192 -256 64 ) ( 64 -256 -64 ) ( 192 -256 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -192 -256 -128 ) ( -192 -736 -128 ) ( -192 -736 -192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -256 -256 -128 ) ( -256 -736 -128 ) ( -256 -736 -192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -352 -64 ) ( -64 -352 -64 ) ( 64 -352 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -3708,7 +3708,7 @@ effects_beam/beam-purple
 ( 128 -3776 -144 ) ( 128 -4032 -144 ) ( -128 -3776 -144 ) trak5x/misc-glass 0 0 0 0.25 0.25 0 0 0
 ( 128 -3776 -128 ) ( -128 -3776 -128 ) ( 128 -3776 -192 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
 ( 64 -3776 -128 ) ( 64 -3776 -192 ) ( 64 -4032 -128 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -128 -4032 -176 ) ( 128 -4032 -176 ) ( -128 -3776 -176 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -128 -4032 -176 ) ( 128 -4032 -176 ) ( -128 -3776 -176 ) trak5x/misc-glass 0 0 0 0.25 0.25 0 0 0
 ( -128 -3904 -192 ) ( -128 -3904 -128 ) ( 128 -3904 -192 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
 ( -64 -4032 -192 ) ( -64 -3776 -192 ) ( -64 -4032 -128 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
 ( -64 -3792 -64 ) ( -48 -3776 -64 ) ( -64 -3792 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
@@ -5857,7 +5857,7 @@ trak5x/base-pipe1b
 ( -256 -224 -128 ) ( -256 -224 -224 ) ( -256 -704 -128 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( -320 -704 -224 ) ( -260 -704 -224 ) ( -320 -224 -224 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( -288 -704 -224 ) ( -288 -224 -224 ) ( -288 -704 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
-( -256 -704 32 ) ( -288 -736 32 ) ( -256 -704 160 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
+( -256 -704 32 ) ( -288 -736 32 ) ( -256 -704 160 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -544 -256 -320 ) ( -224 -256 -320 ) ( -224 -384 -320 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
@@ -13391,9 +13391,9 @@ proceduralx/wall-fruitconcrete
 {
 ( -192 736 -128 ) ( 192 736 -128 ) ( 192 256 -128 ) trak5x/trim-trim1b 0 0 -90 0.25 0.25 0 0 0
 ( 192 736 -192 ) ( -192 736 -192 ) ( 192 256 -192 ) trak5x/wall-wall5a 512 -0 180 0.25 0.25 0 0 0
-( -192 736 -192 ) ( -192 736 -128 ) ( -192 256 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -256 736 -192 ) ( -256 736 -128 ) ( -256 256 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -192 256 64 ) ( -64 256 -64 ) ( -192 256 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 192 256 -128 ) ( 192 736 -128 ) ( 192 736 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 256 256 -128 ) ( 256 736 -128 ) ( 256 736 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 352 -64 ) ( 64 352 -64 ) ( -64 352 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
@@ -16755,7 +16755,7 @@ proceduralx/wall-fruitconcrete
 ( -128 3776 -144 ) ( -128 4032 -144 ) ( 128 3776 -144 ) trak5x/misc-glass 128 -0 180 0.25 0.25 0 0 0
 ( -128 3776 -128 ) ( 128 3776 -128 ) ( -128 3776 -192 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
 ( -64 3776 -128 ) ( -64 3776 -192 ) ( -64 4032 -128 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( 128 4032 -176 ) ( -128 4032 -176 ) ( 128 3776 -176 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
+( 128 4032 -176 ) ( -128 4032 -176 ) ( 128 3776 -176 ) trak5x/misc-glass 512 -0 180 0.25 0.25 0 0 0
 ( 128 3904 -192 ) ( 128 3904 -128 ) ( -128 3904 -192 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
 ( 64 4032 -192 ) ( 64 3776 -192 ) ( 64 4032 -128 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
 ( 64 3792 -64 ) ( 48 3776 -64 ) ( 64 3792 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
@@ -18903,7 +18903,7 @@ trak5x/base-pipe1c
 ( 256 224 -128 ) ( 256 224 -224 ) ( 256 704 -128 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
 ( 320 704 -224 ) ( 260 704 -224 ) ( 320 224 -224 ) proceduralx/wall-fruitconcrete 1024 -0 180 0.25 0.25 0 0 0
 ( 288 704 -224 ) ( 288 224 -224 ) ( 288 704 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
-( 256 704 32 ) ( 288 736 32 ) ( 256 704 160 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
+( 256 704 32 ) ( 288 736 32 ) ( 256 704 160 ) trak5x/floor-floor2f 0 0 0 -0.25 0.25 0 0 0
 }
 {
 ( 544 256 -320 ) ( 224 256 -320 ) ( 224 384 -320 ) proceduralx/wall-fruitconcrete 1024 -0 180 0.25 0.25 0 0 0
@@ -27150,18 +27150,18 @@ effects_jumppad/jumppadfx1_a
 }
 {
 ( 176 192 -544 ) ( 176 -96 -544 ) ( 48 192 -544 ) proceduralx/wall-fruitconcrete_purple 576 192 0 0.25 0.25 0 0 0
-( 176 208 -544 ) ( 48 208 -544 ) ( 176 208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 56 136 -552 ) ( 64 136 -552 ) ( 64 144 -544 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
 ( 64 200 -544 ) ( 64 200 -552 ) ( 64 -88 -544 ) proceduralx/wall-fruitconcrete_purple 800 0 0 0.25 0.25 0 0 0
-( 48 -152 -552 ) ( 176 -152 -552 ) ( 48 136 -552 ) proceduralx/wall-fruitconcrete_purple 576 992 0 0.25 0.25 0 0 0
-( 48 -208 -552 ) ( 48 -208 -544 ) ( 176 -208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 64 136 -552 ) ( 56 136 -552 ) ( 56 -136 -552 ) proceduralx/wall-fruitconcrete_purple 576 992 0 0.25 0.25 0 0 0
+( 64 -136 -552 ) ( 56 -136 -552 ) ( 56 -144 -544 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
 ( 56 -168 -552 ) ( 56 120 -552 ) ( 56 -168 -544 ) proceduralx/wall-fruitconcrete_purple 96 0 0 0.25 0.25 0 0 0
 }
 {
 ( 56 88 -544 ) ( 56 -200 -544 ) ( -72 88 -544 ) proceduralx/wall-fruitconcrete_purple 32 800 0 0.25 0.25 0 0 0
-( 56 144 -544 ) ( -72 144 -544 ) ( 56 144 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -64 136 -552 ) ( -56 136 -552 ) ( -56 144 -544 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
 ( -56 128 -544 ) ( -56 128 -552 ) ( -56 -160 -544 ) proceduralx/wall-fruitconcrete_purple 64 0 0 0.25 0.25 0 0 0
-( -72 -144 -552 ) ( 56 -144 -552 ) ( -72 144 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
-( -72 -208 -552 ) ( -72 -208 -544 ) ( 56 -208 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -56 136 -552 ) ( -64 136 -552 ) ( -64 -136 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -56 -136 -552 ) ( -64 -136 -552 ) ( -64 -144 -544 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
 ( -64 -144 -552 ) ( -64 144 -552 ) ( -64 -144 -544 ) proceduralx/wall-fruitconcrete_purple 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -27762,6 +27762,30 @@ effects_jumppad/jumppadfx1_a
 ( 32 -2304 64 ) ( 32 -2272 -64 ) ( 32 -2304 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -16 -64 -464 ) ( 16 64 -464 ) ( -16 64 -464 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 176 208 -544 ) ( 176 -80 -544 ) ( 48 208 -544 ) proceduralx/wall-fruitconcrete_purple 576 256 0 0.25 0.25 0 0 0
+( 176 208 -544 ) ( 48 208 -544 ) ( 176 208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 64 216 -544 ) ( 64 216 -552 ) ( 64 -72 -544 ) proceduralx/wall-fruitconcrete_purple 736 0 0 0.25 0.25 0 0 0
+( 48 -80 -576 ) ( 176 -80 -576 ) ( 48 208 -576 ) proceduralx/wall-fruitconcrete_purple 576 256 0 0.25 0.25 0 0 0
+( 48 144 -552 ) ( 48 144 -544 ) ( 176 144 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 56 -80 -552 ) ( 56 208 -552 ) ( 56 -80 -544 ) proceduralx/wall-fruitconcrete_purple 768 0 0 0.25 0.25 0 0 0
+}
+{
+( 56 -144 -544 ) ( 56 -432 -544 ) ( -72 -144 -544 ) proceduralx/wall-fruitconcrete_purple 32 896 0 0.25 0.25 0 0 0
+( 56 -144 -544 ) ( -72 -144 -544 ) ( 56 -144 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -56 -136 -544 ) ( -56 -136 -552 ) ( -56 -424 -544 ) proceduralx/wall-fruitconcrete_purple 96 0 0 0.25 0.25 0 0 0
+( -72 -432 -576 ) ( 56 -432 -576 ) ( -72 -144 -576 ) proceduralx/wall-fruitconcrete_purple 32 896 0 0.25 0.25 0 0 0
+( -72 -208 -552 ) ( -72 -208 -544 ) ( 56 -208 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -64 -432 -552 ) ( -64 -144 -552 ) ( -64 -432 -544 ) proceduralx/wall-fruitconcrete_purple 128 0 0 0.25 0.25 0 0 0
+}
+{
+( 176 -144 -544 ) ( 176 -432 -544 ) ( 48 -144 -544 ) proceduralx/wall-fruitconcrete_purple 576 896 0 0.25 0.25 0 0 0
+( 176 -144 -544 ) ( 48 -144 -544 ) ( 176 -144 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 64 -136 -544 ) ( 64 -136 -552 ) ( 64 -424 -544 ) proceduralx/wall-fruitconcrete_purple 96 0 0 0.25 0.25 0 0 0
+( 48 -432 -576 ) ( 176 -432 -576 ) ( 48 -144 -576 ) proceduralx/wall-fruitconcrete_purple 576 896 0 0.25 0.25 0 0 0
+( 48 -208 -552 ) ( 48 -208 -544 ) ( 176 -208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 56 -432 -552 ) ( 56 -144 -552 ) ( 56 -432 -544 ) proceduralx/wall-fruitconcrete_purple 128 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "target_position"
@@ -30489,12 +30513,6 @@ effects_jumppad/jumppadfx1_a
 "origin" "-704.000000 -3616.000000 -96.000000"
 }
 {
-"classname" "misc_teleporter_dest"
-"origin" "0.000000 0.000000 408.000000"
-"angles" "0.000001 0.000005 0.000000"
-"targetname" "misc_teleporter_dest1"
-}
-{
 "classname" "item_health_mega"
 "origin" "0.000000 2208.000000 -400.000000"
 }

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index f32b0e2b07277f772bf14934d7d7c80fac07eafc..68609494d4fe801c6040288a89ffc646b902e067 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -667,7 +667,7 @@
 ( 736 -1024 328 ) ( 736 -224 328 ) ( 736 -224 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 ( 480 -928 328 ) ( 728 -928 328 ) ( 728 -928 288 ) common/clip 128 0 0 0.25 0.25 0 13 0
 ( 488 -1024 320 ) ( 488 -224 320 ) ( 736 -224 320 ) common/clip 128 0 0 0.25 0.25 0 13 0
-( 736 -224 288 ) ( 488 -224 288 ) ( 488 -1024 288 ) common/clip 128 0 0 0.25 0.25 0 13 0
+( 736 -224 256 ) ( 488 -224 256 ) ( 488 -1024 256 ) common/clip 128 0 0 0.25 0.25 0 13 0
 }
 {
 ( 224 -224 288 ) ( -160 -928 288 ) ( 224 -928 288 ) common/caulk 0 0 0 0.25 0.25 0 4 0
@@ -13083,7 +13083,7 @@ trak5x/base-pipe1b
 ( 1072 -1616 320 ) ( -160 -928 320 ) ( 1072 -928 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 1088 -1152 288 ) ( -144 -1152 320 ) ( 1088 -1152 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 1408 -464 320 ) ( 1408 -1152 288 ) ( 1408 -1152 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 160 -928 320 ) ( 1392 -928 288 ) ( 1392 -928 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 160 -928 320 ) ( 1392 -928 288 ) ( 1392 -928 320 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -160 -1616 288 ) ( -160 -928 320 ) ( -160 -1616 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
@@ -13396,7 +13396,7 @@ map_stormkeep/largebrick1a
 }
 {
 ( -914.1526489258 1529.3031005859 -32 ) ( -909.9691772461 1481.4858398438 -32 ) ( -954.0004272461 1525.8168945313 -32 ) exx/floor-simple05 197.5458984375 12.6291503906 5 0.25 0.25 134217728 0 0
-( -914.1526489258 1529.3031005859 -32 ) ( -954.0004272461 1525.8168945313 -32 ) ( -914.1526489258 1529.3031005859 -64 ) common/caulk 229.5458984375 0 0 0.2509549558 0.25 134217728 0 0
+( -914.1526489258 1529.3031005859 -32 ) ( -954.0004272461 1525.8168945313 -32 ) ( -914.1526489258 1529.3031005859 -64 ) exx/base-metal01 448.6199951172 165.6736450195 20 0.25 0.25 134217728 0 0
 ( -930.1526489258 1529.3031005859 -32 ) ( -930.1526489258 1529.3031005859 -64 ) ( -925.9691772461 1481.4858398438 -32 ) exx/base-metal01 448.6199951172 165.6736450195 20 0.25 0.25 134217728 0 0
 ( -949.8169555664 1477.9995117188 -40 ) ( -909.9691772461 1481.4858398438 -40 ) ( -954.0004272461 1525.8168945313 -40 ) common/caulk 229.5458984375 140.6291503906 5 0.25 0.25 134217728 0 0
 ( -949.8169555664 1485.9995117188 -64 ) ( -949.8169555664 1485.9995117188 -32 ) ( -909.9691772461 1489.4858398438 -64 ) exx/base-metal01 448.6199951172 165.6736450195 20 0.25 0.25 134217728 0 0

diff --git a/maps/vorix.map b/maps/vorix.map
index 72b6b3db513b0f623d14e2ac73fb5c1f347be667..1e172d59b88a0cd9c83458b7e0939b282a5719e6 100644 (file)
--- a/maps/vorix.map
+++ b/maps/vorix.map
@@ -3356,24 +3356,6 @@ patchDef2
 trak5x/base-pipe1c
 ( 9 3 0 0 0 )
 (
-( ( 496 -3764 64 0 0 ) ( 494 -3764 64 0 -0.03125 ) ( 494 -3760 64 0 -0.09375 ) )
-( ( 496 -3764 68 0.0625 0 ) ( 494 -3764 68 0.0625 -0.03125 ) ( 494 -3760 64 0.0625 -0.09375 ) )
-( ( 496 -3760 68 0.125 0 ) ( 494 -3760 68 0.125 -0.03125 ) ( 494 -3760 64 0.125 -0.09375 ) )
-( ( 496 -3756 68 0.1875 0 ) ( 494 -3756 68 0.1875 -0.03125 ) ( 494 -3760 64 0.1875 -0.09375 ) )
-( ( 496 -3756 64 0.25 0 ) ( 494 -3756 64 0.25 -0.03125 ) ( 494 -3760 64 0.25 -0.09375 ) )
-( ( 496 -3756 60 0.3125 0 ) ( 494 -3756 60 0.3125 -0.03125 ) ( 494 -3760 64 0.3125 -0.09375 ) )
-( ( 496 -3760 60 0.375 0 ) ( 494 -3760 60 0.375 -0.03125 ) ( 494 -3760 64 0.375 -0.09375 ) )
-( ( 496 -3764 60 0.4375 0 ) ( 494 -3764 60 0.4375 -0.03125 ) ( 494 -3760 64 0.4375 -0.09375 ) )
-( ( 496 -3764 64 0.5 0 ) ( 494 -3764 64 0.5 -0.03125 ) ( 494 -3760 64 0.5 -0.09375 ) )
-)
-}
-}
-{
-patchDef2
-{
-trak5x/base-pipe1c
-( 9 3 0 0 0 )
-(
 ( ( 1064 -3372 228 0 0 ) ( 820 -3372 228 0 -3.8125 ) ( 576 -3372 228 0 -7.625 ) )
 ( ( 1064 -3372 224 0.0625 0 ) ( 820 -3372 224 0.0625 -3.8125 ) ( 576 -3372 224 0.0625 -7.625 ) )
 ( ( 1064 -3376 224 0.125 0 ) ( 820 -3376 224 0.125 -3.8125 ) ( 576 -3376 224 0.125 -7.625 ) )
@@ -34417,24 +34399,6 @@ patchDef2
 trak5x/base-pipe1b
 ( 9 3 0 0 0 )
 (
-( ( -496 3764 64 0 0 ) ( -494 3764 64 0 -0.03125 ) ( -494 3760 64 0 -0.09375 ) )
-( ( -496 3764 68 0.0625 0 ) ( -494 3764 68 0.0625 -0.03125 ) ( -494 3760 64 0.0625 -0.09375 ) )
-( ( -496 3760 68 0.125 0 ) ( -494 3760 68 0.125 -0.03125 ) ( -494 3760 64 0.125 -0.09375 ) )
-( ( -496 3756 68 0.1875 0 ) ( -494 3756 68 0.1875 -0.03125 ) ( -494 3760 64 0.1875 -0.09375 ) )
-( ( -496 3756 64 0.25 0 ) ( -494 3756 64 0.25 -0.03125 ) ( -494 3760 64 0.25 -0.09375 ) )
-( ( -496 3756 60 0.3125 0 ) ( -494 3756 60 0.3125 -0.03125 ) ( -494 3760 64 0.3125 -0.09375 ) )
-( ( -496 3760 60 0.375 0 ) ( -494 3760 60 0.375 -0.03125 ) ( -494 3760 64 0.375 -0.09375 ) )
-( ( -496 3764 60 0.4375 0 ) ( -494 3764 60 0.4375 -0.03125 ) ( -494 3760 64 0.4375 -0.09375 ) )
-( ( -496 3764 64 0.5 0 ) ( -494 3764 64 0.5 -0.03125 ) ( -494 3760 64 0.5 -0.09375 ) )
-)
-}
-}
-{
-patchDef2
-{
-trak5x/base-pipe1b
-( 9 3 0 0 0 )
-(
 ( ( -1064 3372 228 0 0 ) ( -820 3372 228 0 -3.8125 ) ( -576 3372 228 0 -7.625 ) )
 ( ( -1064 3372 224 0.0625 0 ) ( -820 3372 224 0.0625 -3.8125 ) ( -576 3372 224 0.0625 -7.625 ) )
 ( ( -1064 3376 224 0.125 0 ) ( -820 3376 224 0.125 -3.8125 ) ( -576 3376 224 0.125 -7.625 ) )
@@ -60806,7 +60770,7 @@ trak5x/base-pipe1a
 ( 832 736 192 ) ( 944 736 320 ) ( 944 736 192 ) trak5x/base-base1b 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( 832 928 416 ) ( 832 928 224 ) ( 832 1184 416 ) exx/base-metal03 320 16 180 0.25 0.25 0 0 0
+( 832 928 416 ) ( 832 928 224 ) ( 832 1184 416 ) trak5x/base-base1b 0 0 0 -0.25 0.25 0 0 0
 ( 1936 1264 192 ) ( 1728 1264 192 ) ( 1936 1008 192 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 ( 1088 928 320 ) ( 1088 976 320 ) ( 1216 928 320 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 ( 1408 1288 224 ) ( 1408 1032 224 ) ( 1408 1288 416 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -71899,6 +71863,14 @@ trak5x/base-pipe1a
 ( -64 304 896 ) ( -64 304 880 ) ( 64 304 896 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 48 896 ) ( -64 48 864 ) ( -64 48 896 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 1984 4216 280 ) ( 1968 4216 280 ) ( 1968 4224 288 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 1984 4224 288 ) ( 1968 4224 288 ) ( 1984 4224 192 ) trak5x/trim-basictrim1a 0 128 0 0.125 -0.125 134217728 0 0
+( 1984 4224 288 ) ( 1984 4224 192 ) ( 1984 4216 288 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 1968 4216 200 ) ( 1984 4216 200 ) ( 1984 4224 192 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 1984 4216 200 ) ( 1968 4216 200 ) ( 1968 4216 280 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 1968 4216 192 ) ( 1968 4224 192 ) ( 1968 4216 288 ) trak5x/trim-trim1a 0 256 180 0.0625 0.0625 134217728 0 0
+}
 }
 {
 "classname" "info_player_team2"