diff --git a/data/vrtnarija/2012/atlantis/atlantis-e.th2 b/data/vrtnarija/2012/atlantis/atlantis-e.th2 index 60faa8f4..965e9a32 100644 --- a/data/vrtnarija/2012/atlantis/atlantis-e.th2 +++ b/data/vrtnarija/2012/atlantis/atlantis-e.th2 @@ -63,11 +63,9 @@ line wall endline line wall - -704.6106 74.1822 - -704.6106 74.1822 -692.1268 81.1442 -686.8452 81.1442 - -681.5637 81.1442 -672.2009 84.9854 -671.4807 81.1442 - -670.7604 77.3031 -667.8796 74.1822 -670.5204 71.0612 - -673.1612 67.9403 -678.4427 64.3392 -678.4427 64.3392 + -686.9053 85.5256 + -687.7146 87.049 -682.5481 90.7608 -675.4418 87.326 + -670.6866 85.0277 -668.7663 81.0227 -667.9262 78.2619 endline line wall @@ -77,7 +75,7 @@ line wall endline line wall - -628.9576 86.461 + -618.9576 90.461 -571.6849 106.433 -571.6849 106.433 -556.3203 113.6352 -536.1543 107.8735 -530.1813 106.1669 -506.6579 100.22 -476.3051 92.6568 diff --git a/data/vrtnarija/2012/ingloriousbasterd/ingloriousbasterd-e.th2 b/data/vrtnarija/2012/ingloriousbasterd/ingloriousbasterd-e.th2 index a8334754..f796ef2a 100644 --- a/data/vrtnarija/2012/ingloriousbasterd/ingloriousbasterd-e.th2 +++ b/data/vrtnarija/2012/ingloriousbasterd/ingloriousbasterd-e.th2 @@ -2,29 +2,64 @@ encoding utf-8 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000 ##XTHERION## xth_me_area_zoom_to 100 -scrap DELETE-ME-survey-legs-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -line survey - -103.23 69.57 - -62.30 51.30 + +scrap ingloriousbasterd-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] + +point -40.1598 -76.3202 u:label_MY -align br -attr text "Inglorious Basterd" -attr lvl 3 +line rock-border -close on -outline in + 64.6556 -64.4889 + 63.989 -58.6566 + 58.6566 -55.4905 + 53.3242 -56.6569 + 56.8236 -62.4893 endline -line survey - -62.30 51.30 - -13.82 -6.50 + +line rock-border -close on -outline in + -14.8308 -28.8284 + -21.163 -29.3283 + -20.1632 -35.1606 + -15.1641 -36.827 + -10.8315 -33.9942 endline -line survey - -13.82 -6.50 - 27.14 -43.35 + +line rock-border -close on -outline in + -33.3276 -7.832 + -25.9955 -9.4984 + -20.3298 -15.1641 + -26.1622 -21.4963 + -35.3273 -16.6638 + -37.8268 -9.1651 endline -line survey - 27.14 -43.35 - 103.23 -69.57 + +line rock-border -close on -outline in + -48.4917 -0.1666 + -47.8251 0.8332 -40.1598 7.1654 -37.6602 5.8323 + -35.1606 4.4992 -30.6614 5.1658 -30.6614 2.9995 + -30.6614 0.8332 -34.1608 -2.9995 -35.4939 -4.3326 + -36.827 -5.6657 -47.1586 -8.4985 -47.4918 -7.6653 + -47.8251 -6.8322 -48.4917 -0.1666 -48.4917 -0.1666 endline -endscrap -scrap ingloriousbasterd-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -point -62.30 51.30 station -name 4 +line wall + 106.3151 -60.9895 + 106.3151 -60.9895 39.9931 -46.3254 40.993 -41.9928 + 41.9928 -37.6602 48.9916 -38.66 42.3261 -33.9942 + 35.6605 -29.3283 -7.9986 -1.3331 -14.6641 7.3321 + -21.3297 15.9973 -32.5091 34.2229 -34.3274 35.9938 + -48.7964 50.0854 -53.4639 58.296 -56.9902 65.822 +endline + +line wall + -97.4832 50.6579 + -97.4832 50.6579 -90.0162 35.7261 -80.9448 21.0854 + -66.8994 -1.5828 -46.0426 -29.5772 -41.9928 -30.9947 + -35.3273 -33.3276 101.9825 -81.6526 101.9825 -81.6526 +endline + +point -62.3 51.3 station -name 4 point -103.23 69.57 station -name 5 -point -13.82 -6.50 station -name 3 +point -13.82 -6.5 station -name 3 point 27.14 -43.35 station -name 2 point 103.23 -69.57 station -name 1 endscrap + diff --git a/data/vrtnarija/2012/minestrone2/minestrone2-e.th2 b/data/vrtnarija/2012/minestrone2/minestrone2-e.th2 index ca73d3b4..89f39e49 100644 --- a/data/vrtnarija/2012/minestrone2/minestrone2-e.th2 +++ b/data/vrtnarija/2012/minestrone2/minestrone2-e.th2 @@ -2,50 +2,35 @@ encoding utf-8 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000 ##XTHERION## xth_me_area_zoom_to 100 -scrap DELETE-ME-survey-legs-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -line survey - 216.27 -85.98 - 275.25 -89.06 -endline -line survey - 216.27 -85.98 - 192.03 -85.51 -endline -line survey - 192.03 -85.51 - 130.34 -60.63 -endline -line survey - 130.34 -60.63 - 75.89 -32.91 -endline -line survey - 75.89 -32.91 - 11.11 4.49 -endline -line survey - 11.11 4.49 - -38.59 19.69 -endline -line survey - -38.59 19.69 - -72.14 30.63 -endline -line survey - -72.14 30.63 - -124.54 57.32 -endline -line survey - -124.54 57.32 - -170.73 62.99 + +scrap minestrone2-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] + +line wall + 263.5988 -72.0215 + 263.5988 -72.0215 208.3823 -72.5017 193.978 -70.5811 + 179.5737 -68.6605 141.6423 -49.9349 135.8806 -45.6136 + 130.1189 -41.2923 80.184 -14.4043 77.3031 -9.1227 + 74.4222 -3.8411 28.3285 21.6065 20.6462 26.888 + 12.9639 32.1696 -20.6462 44.6569 -38.8916 47.0576 + -57.1371 49.4584 -99.7001 59.9291 -108.3427 63.2901 + -113.1276 65.1509 -153.8675 64.4102 -173.7403 68.9852 + -189.7618 72.6737 -188.7679 75.3952 -188.7679 75.3952 endline -line survey - -170.73 62.99 - -275.25 89.06 + +line wall + -233.2948 63.9656 + -229.6141 59.498 -232.6566 52.4006 -221.0069 47.9126 + -213.6057 45.0613 -198.4859 40.2372 -191.3542 40.0941 + -174.0691 38.6536 -130.599 34.0902 -124.3572 29.7689 + -118.1153 25.4476 -48.0143 3.361 -30.249 -1.9206 + -12.4837 -7.2022 53.7761 -37.9313 60.0179 -41.2923 + 66.2598 -44.6533 123.877 -69.1407 129.6387 -72.5017 + 135.4005 -75.8627 157.4871 -90.7471 165.6495 -93.1478 + 173.8119 -95.5486 218.4653 -94.1081 218.4653 -94.1081 + 270.8009 -96.989 endline -endscrap -scrap minestrone2-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] +point 267.536 -121.4285 u:label_MY -align bl -attr text Minestrone -attr lvl 2 point 275.25 -89.06 station -name 11 point 216.27 -85.98 station -name 10 point 192.03 -85.51 station -name 9 @@ -58,3 +43,4 @@ point -124.54 57.32 station -name 3 point -170.73 62.99 station -name 2 point -275.25 89.06 station -name 1 endscrap + diff --git a/data/vrtnarija/2013/were_not_alone/were_not_alone-e.th2 b/data/vrtnarija/2013/were_not_alone/were_not_alone-e.th2 index 474de0ce..5c504a0e 100644 --- a/data/vrtnarija/2013/were_not_alone/were_not_alone-e.th2 +++ b/data/vrtnarija/2013/were_not_alone/were_not_alone-e.th2 @@ -2,34 +2,41 @@ encoding utf-8 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000 ##XTHERION## xth_me_area_zoom_to 100 -scrap DELETE-ME-survey-legs-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -line survey - -73.94 10.91 - -155.40 -10.91 -endline -line survey - -41.99 7.52 - -73.94 10.91 -endline -line survey - -0.11 6.81 - -41.99 7.52 + +scrap were_not_alone-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] + +point 29.0283 24.9542 u:label_MY -align tr -attr text "We're Not Alone" -attr lvl 3 +line rock-border -close on + 146.6695 -4.2439 + 148.0275 -3.2254 154.648 -0.1698 154.648 -0.1698 + 158.2129 -5.0927 + 157.7037 -10.3551 + 149.3856 -11.8829 endline -line survey - 100.32 -5.55 - -0.11 6.81 + +line wall + 153.6459 2.8809 + 153.6459 2.8809 70.5811 3.8411 66.4999 4.5614 + 62.4187 5.2816 -14.4043 15.6047 -22.8068 15.6047 + -31.2093 15.6047 -65.2995 19.2057 -70.341 19.4458 + -72.7245 19.5593 -82.5523 23.12 -91.9785 21.552 + -102.4903 19.8033 -112.7301 12.8345 -116.2742 11.4422 endline -line survey - 100.32 -5.55 - 155.40 -7.44 + +line wall + -97.3728 6.4989 + -95.6916 6.257 -93.1488 7.6 -90.0599 7.2 + -83.1943 6.3109 -77.4581 1.5473 -74.6623 1.6805 + -69.6208 1.9206 -30.249 -3.1209 -19.6859 -2.4007 + -9.1227 -1.6805 59.2977 -12.0036 66.7399 -12.2437 + 74.1822 -12.4837 157.0069 -13.6841 157.0069 -13.6841 endline -endscrap -scrap were_not_alone-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -point -155.40 -10.91 station -name 6 +point -155.4 -10.91 station -name 6 point -73.94 10.91 station -name 5 point -41.99 7.52 station -name 4 point -0.11 6.81 station -name 3 point 100.32 -5.55 station -name 1 -point 155.40 -7.44 station -name 2 +point 155.4 -7.44 station -name 2 endscrap + diff --git a/data/vrtnarija/vrtnarija-e.thm b/data/vrtnarija/vrtnarija-e.thm index 1f97836f..77afe334 100644 --- a/data/vrtnarija/vrtnarija-e.thm +++ b/data/vrtnarija/vrtnarija-e.thm @@ -126,6 +126,9 @@ map m-below-friendship-e -projection extended endmap map m-s_extensions-e -projection extended + m-all-e@minestrone2 + m-all-e@were_not_alone + m-all-e@ingloriousbasterd m-all-e@atlantis m-all-e@lethe m-all-e@sicsempertyrannis diff --git a/data/vrtnarija/vrtnarija.th b/data/vrtnarija/vrtnarija.th index 66bee8da..63067a3f 100644 --- a/data/vrtnarija/vrtnarija.th +++ b/data/vrtnarija/vrtnarija.th @@ -599,7 +599,9 @@ survey vrtnarija -title "Vrtnarija" join brezno_slapov-1e@brezno_slapov atlantis-1e@atlantis join bravenewworld-1p@bravenewworld salvation-1p@salvation join ingloriousbasterd-1p@ingloriousbasterd atlantis-3p@atlantis + join ingloriousbasterd-1e@ingloriousbasterd atlantis-2e@atlantis join minestrone2-1p@minestrone2 atlantis-3p@atlantis + join minestrone2-1e@minestrone2 atlantis-2e@atlantis join minestrone1-1p@minestrone1 minestrone2-1p@minestrone2 join milkyway-4p@milkyway dreamsforthesoul-1p@dreamsforthesoul join guillotine2-1p@guillotine2 guillotine-1p@guillotine @@ -685,6 +687,7 @@ survey vrtnarija -title "Vrtnarija" join lethe-1p@lethe brezno_slapov-1p@brezno_slapov join lethe-1e@lethe brezno_slapov-1e@brezno_slapov join were_not_alone-1p@were_not_alone atlantis-1p@atlantis + join were_not_alone-1e@were_not_alone atlantis-1e@atlantis join RCC_passage-1p@RCC_passage invictus-1p@invictus join hash-1p@hash eastlinks-1p@eastlinks join hash2-1p@hash2 hash-1p@hash