Fix conflict

[xonotic/xonotic-maps.pk3dir.git] / maps / afterslime.waypoints

diff --git a/maps/afterslime.waypoints b/maps/afterslime.waypoints
index 2658bd1a39238b09093a745b2f31dc4eb72eb85d..0c79b5b4a019281c5d61c0a1ef76e66468de1e5e 100644 (file)
--- a/maps/afterslime.waypoints
+++ b/maps/afterslime.waypoints
@@ -1,150 +1,480 @@
-'121.0 -117.1 -40.0'\r
-'121.0 -117.1 -40.0'\r
-0\r
-'2080.0 -357.5 600.0'\r
-'2080.0 -357.5 600.0'\r
-0\r
-'2086.1 -608.2 600.0'\r
-'2086.1 -608.2 600.0'\r
-0\r
-'2074.5  40.5 600.0'\r
-'2074.5  40.5 600.0'\r
-0\r
-'1695.7  19.3 520.0'\r
-'1695.7  19.3 520.0'\r
-0\r
-'1704.6 -600.1 520.0'\r
-'1704.6 -600.1 520.0'\r
-0\r
-'1700.0 -351.9 520.0'\r
-'1700.0 -351.9 520.0'\r
-0\r
-'-541.3 -2364.1 408.0'\r
-'-541.3 -2364.1 408.0'\r
-0\r
-'-913.6 -2240.9 408.0'\r
-'-913.6 -2240.9 408.0'\r
-0\r
-'-1025.9 -1642.4 408.0'\r
-'-1025.9 -1642.4 408.0'\r
-0\r
-'163.2 -1633.0 -104.0'\r
-'163.2 -1633.0 -104.0'\r
-0\r
-'846.0 -2356.8 408.0'\r
-'846.0 -2356.8 408.0'\r
-0\r
-'1194.2 -2250.4 408.0'\r
-'1194.2 -2250.4 408.0'\r
-0\r
-'1350.4 -1598.8 408.0'\r
-'1350.4 -1598.8 408.0'\r
-0\r
-'2143.5 -1610.7 600.0'\r
-'2143.5 -1610.7 600.0'\r
-0\r
-'2048.0 -1026.4 600.0'\r
-'2048.0 -1026.4 600.0'\r
-0\r
-'1148.0 -982.4 600.0'\r
-'1148.0 -982.4 600.0'\r
-0\r
-'1149.4 -364.1 520.0'\r
-'1149.4 -364.1 520.0'\r
-0\r
-'1156.2 132.0 344.0'\r
-'1156.2 132.0 344.0'\r
-0\r
-'575.1 116.7 344.0'\r
-'575.1 116.7 344.0'\r
-0\r
-'-322.2 128.2 344.0'\r
-'-322.2 128.2 344.0'\r
-0\r
-'-1021.7 129.2 344.0'\r
-'-1021.7 129.2 344.0'\r
-0\r
-'-1492.7 -575.9 280.0'\r
-'-1492.7 -575.9 280.0'\r
-0\r
-'-1480.8 -876.5 280.0'\r
-'-1480.8 -876.5 280.0'\r
-0\r
-'-1478.3 -260.1 280.0'\r
-'-1478.3 -260.1 280.0'\r
-0\r
-'-1030.3 -248.0 280.0'\r
-'-1030.3 -248.0 280.0'\r
-0\r
-'-1029.9 -896.6 280.0'\r
-'-1029.9 -896.6 280.0'\r
-0\r
-'1023.4 -352.1 -88.0'\r
-'1023.4 -352.1 -88.0'\r
-0\r
-'491.7 -1053.5 -168.0'\r
-'491.7 -1053.5 -168.0'\r
-0\r
-'-446.6 -1056.6 128.0'\r
-'-446.6 -1056.6 128.0'\r
-0\r
-'-492.2 -580.0 280.0'\r
-'-492.2 -580.0 280.0'\r
-0\r
-'-686.5 -775.7 264.0'\r
-'-686.5 -775.7 264.0'\r
-0\r
-'-678.9 -374.1 264.0'\r
-'-678.9 -374.1 264.0'\r
-0\r
-'-1244.4 -373.5  24.0'\r
-'-1244.4 -373.5  24.0'\r
-0\r
-'-1256.0 -775.8  24.0'\r
-'-1256.0 -775.8  24.0'\r
-0\r
-'-1291.1 -574.4  24.0'\r
-'-1291.1 -574.4  24.0'\r
-0\r
-'991.3 -1285.8 -168.0'\r
-'991.3 -1285.8 -168.0'\r
-0\r
-'993.6 -1986.3  24.0'\r
-'993.6 -1986.3  24.0'\r
-0\r
-'160.6 -2050.0  20.0'\r
-'160.6 -2050.0  20.0'\r
-0\r
-'-671.1 -1988.8  24.0'\r
-'-671.1 -1988.8  24.0'\r
-0\r
-'-435.0 -1057.6 -168.0'\r
-'-435.0 -1057.6 -168.0'\r
-0\r
-'-668.1 -1055.6 -168.0'\r
-'-668.1 -1055.6 -168.0'\r
-0\r
-'443.8 -111.2 -40.0'\r
-'443.8 -111.2 -40.0'\r
-0\r
-'448.3 -456.2 -164.0'\r
-'448.3 -456.2 -164.0'\r
-0\r
-'-189.9 -124.7 -40.0'\r
-'-189.9 -124.7 -40.0'\r
-0\r
-'-192.7 -447.6 -160.0'\r
-'-192.7 -447.6 -160.0'\r
-0\r
-'-448.7 -576.8 -168.0'\r
-'-448.7 -576.8 -168.0'\r
-0\r
-'127.9 -767.2 -172.0'\r
-'127.9 -767.2 -172.0'\r
-0\r
-'1025.7 -766.8 -168.0'\r
-'1025.7 -766.8 -168.0'\r
-0\r
-'635.1 -340.1 -168.0'\r
-'635.1 -340.1 -168.0'\r
-0\r
+'1860.2 -347.2 648.1'
+'1860.2 -347.2 648.1'
+0
+'-1063.8 -791.3 120.1'
+'-1063.8 -791.3 120.1'
+0
+'-1042.0 -380.2 120.1'
+'-1042.0 -380.2 120.1'
+0
+'499.2 -754.4 -167.9'
+'499.2 -754.4 -167.9'
+0
+'1510.3 -344.7 520.1'
+'1510.3 -344.7 520.1'
+0
+'1146.5 -864.4 600.1'
+'1146.5 -864.4 600.1'
+0
+'458.8 -113.8 -39.9'
+'458.8 -113.8 -39.9'
+0
+'1011.9 -365.5 -87.9'
+'1011.9 -365.5 -87.9'
+0
+'-1012.8 -696.4 248.1'
+'-1012.8 -696.4 248.1'
+0
+'-1011.8 -454.4 248.1'
+'-1011.8 -454.4 248.1'
+0
+'-965.6 -941.5 280.0'
+'-965.6 -941.5 280.0'
+0
+'-1131.3 -233.0 280.0'
+'-1131.3 -233.0 280.0'
+0
+'-914.5 -231.9 280.0'
+'-914.5 -231.9 280.0'
+0
+'-1073.4 188.9 344.0'
+'-1073.4 188.9 344.0'
+0
+'-527.5 122.1 344.0'
+'-527.5 122.1 344.0'
+0
+'-317.0  57.5 344.0'
+'-317.0  57.5 344.0'
+0
+'920.3 -223.8 536.0'
+'920.3 -223.8 536.0'
+0
+'927.2 -499.9 536.0'
+'927.2 -499.9 536.0'
+0
+'1259.7 -945.5 600.0'
+'1259.7 -945.5 600.0'
+0
+'1024.0 -835.1 600.0'
+'1024.0 -835.1 600.0'
+0
+'944.5 -891.3 600.0'
+'944.5 -891.3 600.0'
+0
+'1237.2 -419.5 520.0'
+'1237.2 -419.5 520.0'
+0
+'1304.7 -316.0 520.0'
+'1304.7 -316.0 520.0'
+0
+'1744.1 -45.7 520.0'
+'1744.1 -45.7 520.0'
+0
+'1757.5 -558.6 520.0'
+'1757.5 -558.6 520.0'
+0
+'2007.7 -671.7 604.1'
+'2007.7 -671.7 604.1'
+0
+'2334.9 -814.9 520.1'
+'2334.9 -814.9 520.1'
+0
+'2334.9 254.9 520.1'
+'2334.9 254.9 520.1'
+0
+'1425.1 254.9 520.1'
+'1425.1 254.9 520.1'
+0
+'1445.7 -297.0 520.0'
+'1445.7 -297.0 520.0'
+0
+'1425.1 -161.6 520.1'
+'1425.1 -161.6 520.1'
+0
+'1896.9 254.9 520.1'
+'1896.9 254.9 520.1'
+0
+'2334.9 -259.7 520.1'
+'2334.9 -259.7 520.1'
+0
+'1425.1 -814.9 520.1'
+'1425.1 -814.9 520.1'
+0
+'1863.0 -814.9 520.1'
+'1863.0 -814.9 520.1'
+0
+'1425.1 -576.8 520.1'
+'1425.1 -576.8 520.1'
+0
+'1441.4 -417.4 520.0'
+'1441.4 -417.4 520.0'
+0
+'2021.1 -23.9 600.0'
+'2021.1 -23.9 600.0'
+0
+'2059.2 -918.7 600.0'
+'2059.2 -918.7 600.0'
+0
+'1987.1 -1497.2 568.0'
+'1987.1 -1497.2 568.0'
+0
+'1774.2 -1220.1 600.0'
+'1774.2 -1220.1 600.0'
+0
+'1493.7 -1056.2 600.0'
+'1493.7 -1056.2 600.0'
+0
+'1422.6 -1673.7 408.0'
+'1422.6 -1673.7 408.0'
+0
+'1245.0 -1693.7 408.0'
+'1245.0 -1693.7 408.0'
+0
+'1116.8 -1627.8 408.0'
+'1116.8 -1627.8 408.0'
+0
+'-179.3 -1549.2 -104.0'
+'-179.3 -1549.2 -104.0'
+0
+'463.8 -1539.1 -104.0'
+'463.8 -1539.1 -104.0'
+0
+'-966.3 -1815.3 408.0'
+'-966.3 -1815.3 408.0'
+0
+'-925.2 -1581.0 408.0'
+'-925.2 -1581.0 408.0'
+0
+'-916.5 -1679.7 408.0'
+'-916.5 -1679.7 408.0'
+0
+'1005.0 162.6 344.0'
+'1005.0 162.6 344.0'
+0
+'1596.3 -1624.2 440.0'
+'1596.3 -1624.2 440.0'
+0
+'1536.0 -1412.2 600.0'
+'1536.0 -1412.2 600.0'
+0
+'1763.8 -1396.8 600.0'
+'1763.8 -1396.8 600.0'
+0
+'1000.3 -1266.2 -168.0'
+'1000.3 -1266.2 -168.0'
+0
+'1064.2 -743.1 -168.0'
+'1064.2 -743.1 -168.0'
+0
+'745.6 -354.2 -168.0'
+'745.6 -354.2 -168.0'
+0
+'425.0 168.3 -40.0'
+'425.0 168.3 -40.0'
+0
+'-150.0 174.3 -40.0'
+'-150.0 174.3 -40.0'
+0
+'-184.2 -18.3 -40.0'
+'-184.2 -18.3 -40.0'
+0
+'-294.3 -427.8 -152.0'
+'-294.3 -427.8 -152.0'
+0
+'-460.8 -645.1 -168.0'
+'-460.8 -645.1 -168.0'
+0
+'-457.3 -480.1 -168.0'
+'-457.3 -480.1 -168.0'
+0
+'-35.6 -402.0 -168.0'
+'-35.6 -402.0 -168.0'
+0
+'286.6 -406.5 -168.0'
+'286.6 -406.5 -168.0'
+0
+'536.6 -454.3 -168.0'
+'536.6 -454.3 -168.0'
+0
+'812.6 -954.8 -168.0'
+'812.6 -954.8 -168.0'
+0
+'442.7 -1185.5 -152.0'
+'442.7 -1185.5 -152.0'
+0
+'204.1 -888.5 -168.0'
+'204.1 -888.5 -168.0'
+0
+'192.9 -1059.6 -168.0'
+'192.9 -1059.6 -168.0'
+0
+'-661.8 -1165.5 -168.0'
+'-661.8 -1165.5 -168.0'
+0
+'-143.3 -877.5 -168.0'
+'-143.3 -877.5 -168.0'
+0
+' 82.1 -664.3 -168.0'
+' 82.1 -664.3 -168.0'
+0
+'174.2 -1945.3  24.0'
+'174.2 -1945.3  24.0'
+0
+'-177.9 -1985.6  24.0'
+'-177.9 -1985.6  24.0'
+0
+'-610.4 -1902.2  24.0'
+'-610.4 -1902.2  24.0'
+0
+'942.3 -1915.9  24.0'
+'942.3 -1915.9  24.0'
+0
+'1376.0 -954.4 -168.0'
+'1376.0 -954.4 -168.0'
+0
+'-487.1 -1030.2 -168.0'
+'-487.1 -1030.2 -168.0'
+0
+'-421.8 -877.3 -168.0'
+'-421.8 -877.3 -168.0'
+0
+'447.6 -1019.1 -168.0'
+'447.6 -1019.1 -168.0'
+0
+'-190.2 -1043.5 136.0'
+'-190.2 -1043.5 136.0'
+0
+'-497.1 -640.2 280.0'
+'-497.1 -640.2 280.0'
+0
+'-1287.9 -465.5  24.0'
+'-1287.9 -465.5  24.0'
+0
+'-940.9  50.7 344.0'
+'-940.9  50.7 344.0'
+0
+'1251.2 -1937.8 408.0'
+'1251.2 -1937.8 408.0'
+0
+'-939.6 -1967.6 408.0'
+'-939.6 -1967.6 408.0'
+0
+'-388.5 -1237.0 -168.0'
+'-388.5 -1237.0 -168.0'
+0
+'-720.1 -727.6 264.0'
+'-720.1 -727.6 264.0'
+0
+'-705.7 -431.0 264.0'
+'-705.7 -431.0 264.0'
+0
+'-353.9 -1027.0 128.0'
+'-353.9 -1027.0 128.0'
+0
+'-1072.6 -963.4 280.0'
+'-1072.6 -963.4 280.0'
+0
+'-639.5 -707.8 264.0'
+'-639.5 -707.8 264.0'
+0
+'-782.4 -853.9 280.0'
+'-782.4 -853.9 280.0'
+0
+'452.8 -200.6 -40.0'
+'452.8 -200.6 -40.0'
+0
+'392.9 -19.7 352.1'
+'392.9 -19.7 352.1'
+0
+'-136.7 -17.1 352.1'
+'-136.7 -17.1 352.1'
+0
+'596.5  74.4 344.0'
+'596.5  74.4 344.0'
+0
+'-820.8 -2208.4 408.0'
+'-820.8 -2208.4 408.0'
+0
+'-576.8 -2312.4 408.0'
+'-576.8 -2312.4 408.0'
+0
+'893.2 -2305.6 408.0'
+'893.2 -2305.6 408.0'
+0
+'1121.4 -2230.7 408.0'
+'1121.4 -2230.7 408.0'
+0
+'799.5 -145.1 -87.9'
+'799.5 -145.1 -87.9'
+0
+'1089.5 -185.2 -88.0'
+'1089.5 -185.2 -88.0'
+0
+'-45.4 -318.4 -168.0'
+'-45.4 -318.4 -168.0'
+0
+'-42.6 -255.0 -168.0'
+'-42.6 -255.0 -168.0'
+0
+'295.2 -248.5 -168.0'
+'295.2 -248.5 -168.0'
+0
+'289.6 -320.0 -168.0'
+'289.6 -320.0 -168.0'
+0
+'-420.8 -240.3 -168.0'
+'-420.8 -240.3 -168.0'
+0
+'347.0 -2124.3  24.0'
+'347.0 -2124.3  24.0'
+0
+'-26.0 -2125.5  24.0'
+'-26.0 -2125.5  24.0'
+0
+'-672.4 -2119.5  24.0'
+'-672.4 -2119.5  24.0'
+0
+'-832.1 -1916.0  24.0'
+'-832.1 -1916.0  24.0'
+0
+'-679.5 -1526.9 -72.0'
+'-679.5 -1526.9 -72.0'
+0
+'-229.3 -648.7 -168.0'
+'-229.3 -648.7 -168.0'
+0
+'-865.5 -580.5 -56.0'
+'-865.5 -580.5 -56.0'
+0
+'-1031.3 -1251.4 328.0'
+'-1031.3 -1251.4 328.0'
+0
+'-1082.6 -1633.7 408.0'
+'-1082.6 -1633.7 408.0'
+0
+'-1007.4 -2187.4 408.0'
+'-1007.4 -2187.4 408.0'
+0
+'529.7 -1991.4  24.0'
+'529.7 -1991.4  24.0'
+0
+'665.6 -2125.4  24.0'
+'665.6 -2125.4  24.0'
+0
+'-346.7 -2122.0  24.0'
+'-346.7 -2122.0  24.0'
+0
+'2085.4 -1257.2 600.0'
+'2085.4 -1257.2 600.0'
+0
+'1332.4 -2172.1 408.0'
+'1332.4 -2172.1 408.0'
+0
+'1135.0 -1053.4 -168.0'
+'1135.0 -1053.4 -168.0'
+0
+'158.9 -1625.9 -104.0'
+'158.9 -1625.9 -104.0'
+0
+'158.8 -1511.3 -103.9'
+'158.8 -1511.3 -103.9'
+0
+'1658.2 -1398.1 600.0'
+'1658.2 -1398.1 600.0'
+0
+'1286.9 -142.6 536.1'
+'1286.9 -142.6 536.1'
+0
+'-334.9 -1119.8 -168.0'
+'-334.9 -1119.8 -168.0'
+0
+'-164.1 -1174.8 -168.0'
+'-164.1 -1174.8 -168.0'
+0
+'1150.2 -1912.0  24.0'
+'1150.2 -1912.0  24.0'
+0
+'936.8 -2131.4  24.0'
+'936.8 -2131.4  24.0'
+0
+'852.5 -2450.5 408.0'
+'852.5 -2450.5 408.0'
+0
+'751.1 -2521.6 408.0'
+'751.1 -2521.6 408.0'
+0
+'214.4 -2532.4 408.0'
+'214.4 -2532.4 408.0'
+0
+' 60.1 -2535.1 408.3'
+' 60.1 -2535.1 408.3'
+0
+'158.9 -2334.6 416.0'
+'158.9 -2334.6 416.0'
+0
+'-553.9 -2435.7 408.0'
+'-553.9 -2435.7 408.0'
+0
+'-420.7 -2535.1 408.4'
+'-420.7 -2535.1 408.4'
+0
+'738.9 -685.6 -168.0'
+'738.9 -685.6 -168.0'
+0
+'1787.4 -943.3 600.0'
+'1787.4 -943.3 600.0'
+0
+'1601.2 -1215.8 600.0'
+'1601.2 -1215.8 600.0'
+0
+'1282.5 -1511.0 408.0'
+'1282.5 -1511.0 408.0'
+0
+'124.8 121.5 344.0'
+'124.8 121.5 344.0'
+0
+'-1622.2 -574.4 296.0'
+'-1622.2 -574.4 296.0'
+0
+'-1331.5 -868.1 280.0'
+'-1331.5 -868.1 280.0'
+0
+'-139.9 -199.2 -40.0'
+'-139.9 -199.2 -40.0'
+0
+'-1268.8 -701.6  24.0'
+'-1268.8 -701.6  24.0'
+0
+'-1357.6 -820.8  96.0'
+'-1357.6 -820.8  96.0'
+0
+'-719.5 -793.2 264.0'
+'-719.5 -793.2 264.0'
+0
+'-1338.0 -281.1 280.0'
+'-1338.0 -281.1 280.0'
+0
+'-738.0 -313.9 280.0'
+'-738.0 -313.9 280.0'
+0
+'2035.5 -466.5 600.0'
+'2035.5 -466.5 600.0'
+0
+'2023.8 -254.8 600.0'
+'2023.8 -254.8 600.0'
+0
+'254.3 -62.4 -40.0'
+'254.3 -62.4 -40.0'
+0
+' 33.8 -45.8 -40.0'
+' 33.8 -45.8 -40.0'
+0
+'131.7 168.4  -8.0'
+'131.7 168.4  -8.0'
+0
+'1206.0 -751.3 -168.0'
+'1206.0 -751.3 -168.0'
+0
+'-415.0 -475.4 280.0'
+'-415.0 -475.4 280.0'
+0