From cbe6d3e90fe865dd6477a4a16ef882a836f510b5 Mon Sep 17 00:00:00 2001
From: Fishedotjpg <Fishe.jpg@gmail.com>
Date: Wed, 10 Jun 2026 13:26:54 +0100
Subject: [PATCH] locators for balkans

---
 gfx/map/map_object_data/activities.txt        | 130 ++++++-------
 gfx/map/map_object_data/building_locators.txt | 146 +++++++-------
 gfx/map/map_object_data/combat_locators.txt   | 110 +++++------
 .../generated/reeds_01_generator_1.txt        |  17 +-
 .../generated/tree_pine_01_b_generator_1.txt  |   3 +-
 .../map_object_data/player_stack_locators.txt | 126 ++++++------
 gfx/map/map_object_data/siege_locators.txt    | 184 +++++++++---------
 .../special_building_locators.txt             |   8 +-
 gfx/map/terrain/masks/beach_02_mask.png       |   4 +-
 gfx/map/terrain/masks/hills_01_mask.png       |   4 +-
 gfx/map/terrain/masks/plains_01_mask.png      |   4 +-
 .../terrain/masks/plains_01_rough_mask.png    |   4 +-
 .../masks_gen/gen_central_base_mask.png       |   4 +-
 .../gen_central_lowlands_02_mask.png          |   4 +-
 .../masks_gen/gen_central_lowlands_mask.png   |   4 +-
 15 files changed, 381 insertions(+), 371 deletions(-)

diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt
index 3ffabf37..5f14b3c0 100644
--- a/gfx/map/map_object_data/activities.txt
+++ b/gfx/map/map_object_data/activities.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="activities"
 	render_pass=Map
 	clamp_to_water_level=no
@@ -2803,7 +2803,7 @@ game_object_locator={
 		}
 		{
 			id=471
-			position={ 2144.564453 0.000000 2461.956543 }
+			position={ 2150.126221 0.000000 2451.996826 }
 			rotation={ -0.000000 0.449129 -0.000000 0.893467 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2827,7 +2827,7 @@ game_object_locator={
 		}
 		{
 			id=475
-			position={ 2216.445801 0.000000 2265.027344 }
+			position={ 2189.582031 0.000000 2256.541016 }
 			rotation={ -0.000000 -0.560737 -0.000000 0.827994 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2869,7 +2869,7 @@ game_object_locator={
 		}
 		{
 			id=482
-			position={ 2332.156250 0.000000 2239.461914 }
+			position={ 2331.056885 0.000000 2241.023926 }
 			rotation={ -0.000000 0.354031 -0.000000 0.935234 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2941,7 +2941,7 @@ game_object_locator={
 		}
 		{
 			id=494
-			position={ 2474.762695 0.000000 2506.197510 }
+			position={ 2468.829834 0.000000 2530.025879 }
 			rotation={ -0.000000 0.425666 -0.000000 0.904881 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2953,13 +2953,13 @@ game_object_locator={
 		}
 		{
 			id=496
-			position={ 2581.761963 0.000000 2486.784424 }
+			position={ 2583.565186 0.000000 2488.777832 }
 			rotation={ -0.000000 0.178842 -0.000000 0.983878 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=497
-			position={ 2505.206787 0.000000 2525.466309 }
+			position={ 2504.671631 0.000000 2533.007080 }
 			rotation={ -0.000000 0.335727 -0.000000 0.941959 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3007,7 +3007,7 @@ game_object_locator={
 		}
 		{
 			id=505
-			position={ 2107.579834 0.000000 2698.869141 }
+			position={ 2101.693848 0.000000 2706.542480 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -12649,7 +12649,7 @@ game_object_locator={
 		}
 		{
 			id=2519
-			position={ 1714.465942 0.000000 2771.185547 }
+			position={ 1735.172241 0.000000 2787.735107 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18103,7 +18103,7 @@ game_object_locator={
 		}
 		{
 			id=3528
-			position={ 1909.020752 0.000000 2777.930420 }
+			position={ 1907.782471 0.000000 2772.835205 }
 			rotation={ -0.000000 0.352603 -0.000000 0.935773 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18115,7 +18115,7 @@ game_object_locator={
 		}
 		{
 			id=3530
-			position={ 1975.552612 0.000000 2761.545898 }
+			position={ 1970.289795 0.000000 2755.355957 }
 			rotation={ -0.000000 -0.214030 -0.000000 0.976827 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18133,7 +18133,7 @@ game_object_locator={
 		}
 		{
 			id=3533
-			position={ 1884.041138 0.000000 2782.214600 }
+			position={ 1913.751221 0.000000 2790.664795 }
 			rotation={ -0.000000 0.515478 -0.000000 0.856903 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18145,7 +18145,7 @@ game_object_locator={
 		}
 		{
 			id=3535
-			position={ 1857.153076 0.000000 2789.442383 }
+			position={ 1859.600098 0.000000 2778.183105 }
 			rotation={ -0.000000 -0.479586 -0.000000 0.877495 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18157,7 +18157,7 @@ game_object_locator={
 		}
 		{
 			id=3537
-			position={ 1842.513306 0.000000 2773.019043 }
+			position={ 1837.865845 0.000000 2766.996582 }
 			rotation={ -0.000000 -0.179923 -0.000000 0.983681 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18217,13 +18217,13 @@ game_object_locator={
 		}
 		{
 			id=3547
-			position={ 1839.495605 0.000000 2659.541748 }
+			position={ 1847.498657 0.000000 2666.207275 }
 			rotation={ -0.000000 -0.442668 -0.000000 0.896685 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3548
-			position={ 1875.303223 0.000000 2674.351562 }
+			position={ 1878.762451 0.000000 2657.517334 }
 			rotation={ -0.000000 -0.437366 -0.000000 0.899284 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18241,7 +18241,7 @@ game_object_locator={
 		}
 		{
 			id=3551
-			position={ 1880.593140 0.000000 2653.876709 }
+			position={ 1902.881470 0.000000 2632.959229 }
 			rotation={ -0.000000 -0.352332 -0.000000 0.935875 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18367,13 +18367,13 @@ game_object_locator={
 		}
 		{
 			id=3572
-			position={ 2012.862549 0.000000 2566.338135 }
+			position={ 1998.958496 0.000000 2574.451172 }
 			rotation={ -0.000000 -0.383192 -0.000000 0.923669 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3573
-			position={ 2004.474365 0.000000 2557.068848 }
+			position={ 2016.528076 0.000000 2559.871094 }
 			rotation={ -0.000000 0.359875 -0.000000 0.933001 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18403,7 +18403,7 @@ game_object_locator={
 		}
 		{
 			id=3578
-			position={ 2067.814453 0.000000 2546.499268 }
+			position={ 2064.350098 0.000000 2546.465088 }
 			rotation={ -0.000000 -0.400096 -0.000000 0.916473 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18433,7 +18433,7 @@ game_object_locator={
 		}
 		{
 			id=3583
-			position={ 2027.619751 0.000000 2619.771973 }
+			position={ 2034.454224 0.000000 2621.067383 }
 			rotation={ -0.000000 0.195959 -0.000000 0.980612 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18505,7 +18505,7 @@ game_object_locator={
 		}
 		{
 			id=3595
-			position={ 2102.765381 0.000000 2541.402832 }
+			position={ 2113.569092 0.000000 2583.779053 }
 			rotation={ -0.000000 0.378197 -0.000000 0.925725 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18565,7 +18565,7 @@ game_object_locator={
 		}
 		{
 			id=3605
-			position={ 2072.000000 0.000000 2705.000000 }
+			position={ 2069.316895 0.000000 2703.662109 }
 			rotation={ -0.000000 0.305405 -0.000000 0.952223 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18583,13 +18583,13 @@ game_object_locator={
 		}
 		{
 			id=3608
-			position={ 1959.256592 0.000000 2792.368652 }
+			position={ 1969.745972 0.000000 2793.864258 }
 			rotation={ -0.000000 0.496526 -0.000000 0.868022 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3609
-			position={ 1986.781250 0.000000 2766.687744 }
+			position={ 1997.149170 0.000000 2778.332764 }
 			rotation={ -0.000000 0.557955 -0.000000 0.829872 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18631,7 +18631,7 @@ game_object_locator={
 		}
 		{
 			id=3617
-			position={ 2314.160156 0.000000 2485.102051 }
+			position={ 2312.512207 0.000000 2497.420410 }
 			rotation={ -0.000000 0.281425 -0.000000 0.959583 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18757,7 +18757,7 @@ game_object_locator={
 		}
 		{
 			id=3638
-			position={ 2182.127686 0.000000 2427.816650 }
+			position={ 2165.630127 0.000000 2446.005127 }
 			rotation={ -0.000000 0.385840 -0.000000 0.922566 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18841,7 +18841,7 @@ game_object_locator={
 		}
 		{
 			id=3652
-			position={ 2263.812500 0.000000 2512.909668 }
+			position={ 2260.795410 0.000000 2528.687744 }
 			rotation={ -0.000000 0.312980 -0.000000 0.949760 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18853,7 +18853,7 @@ game_object_locator={
 		}
 		{
 			id=3654
-			position={ 2224.715576 0.000000 2569.382812 }
+			position={ 2215.963623 0.000000 2577.598633 }
 			rotation={ -0.000000 0.525198 -0.000000 0.850980 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18883,7 +18883,7 @@ game_object_locator={
 		}
 		{
 			id=3659
-			position={ 2167.216064 0.000000 2566.168457 }
+			position={ 2164.660156 0.000000 2584.170166 }
 			rotation={ -0.000000 -0.494857 -0.000000 0.868975 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18901,7 +18901,7 @@ game_object_locator={
 		}
 		{
 			id=3662
-			position={ 2256.202393 0.000000 2606.631836 }
+			position={ 2246.852783 0.000000 2603.684570 }
 			rotation={ -0.000000 -0.287130 -0.000000 0.957892 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19099,7 +19099,7 @@ game_object_locator={
 		}
 		{
 			id=3695
-			position={ 2522.000000 0.000000 2689.000000 }
+			position={ 2525.825195 0.000000 2702.850098 }
 			rotation={ -0.000000 0.420772 -0.000000 0.907167 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19165,7 +19165,7 @@ game_object_locator={
 		}
 		{
 			id=3706
-			position={ 2164.280273 0.000000 2373.820312 }
+			position={ 2145.301270 0.000000 2387.863770 }
 			rotation={ -0.000000 -0.309093 -0.000000 0.951032 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19225,7 +19225,7 @@ game_object_locator={
 		}
 		{
 			id=3716
-			position={ 2129.017334 0.000000 2393.719971 }
+			position={ 2128.790771 0.000000 2390.029541 }
 			rotation={ -0.000000 -0.283796 -0.000000 0.958885 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19477,13 +19477,13 @@ game_object_locator={
 		}
 		{
 			id=3758
-			position={ 2535.951416 0.000000 2524.812500 }
+			position={ 2524.917236 0.000000 2532.206055 }
 			rotation={ -0.000000 0.289322 -0.000000 0.957232 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3759
-			position={ 2542.893555 0.000000 2497.140137 }
+			position={ 2532.218018 0.000000 2511.471436 }
 			rotation={ -0.000000 -0.328934 -0.000000 0.944353 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19495,31 +19495,31 @@ game_object_locator={
 		}
 		{
 			id=3761
-			position={ 2557.765869 0.000000 2479.885742 }
+			position={ 2549.537109 0.000000 2482.527100 }
 			rotation={ -0.000000 0.392587 -0.000000 0.919715 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3762
-			position={ 2539.388428 0.000000 2478.822266 }
+			position={ 2526.556641 0.000000 2487.054199 }
 			rotation={ -0.000000 0.397493 -0.000000 0.917605 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3763
-			position={ 2481.914307 0.000000 2478.521973 }
+			position={ 2469.347900 0.000000 2483.536377 }
 			rotation={ -0.000000 0.059444 -0.000000 0.998232 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3764
-			position={ 2510.215332 0.000000 2467.435059 }
+			position={ 2502.736328 0.000000 2466.580078 }
 			rotation={ -0.000000 0.457968 -0.000000 0.888969 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3765
-			position={ 2474.442139 0.000000 2464.708984 }
+			position={ 2480.786133 0.000000 2474.669678 }
 			rotation={ -0.000000 0.519786 -0.000000 0.854297 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19723,7 +19723,7 @@ game_object_locator={
 		}
 		{
 			id=3799
-			position={ 2300.967041 0.000000 2196.414795 }
+			position={ 2302.890381 0.000000 2201.735352 }
 			rotation={ -0.000000 -0.401605 -0.000000 0.915813 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19855,7 +19855,7 @@ game_object_locator={
 		}
 		{
 			id=3821
-			position={ 1862.716797 0.000000 2895.553955 }
+			position={ 1866.421387 0.000000 2893.936279 }
 			rotation={ -0.000000 -0.308397 -0.000000 0.951258 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20107,7 +20107,7 @@ game_object_locator={
 		}
 		{
 			id=3863
-			position={ 2016.915527 0.000000 2814.133789 }
+			position={ 2028.461548 0.000000 2813.885254 }
 			rotation={ -0.000000 0.416864 -0.000000 0.908969 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20233,7 +20233,7 @@ game_object_locator={
 		}
 		{
 			id=3884
-			position={ 2161.273438 0.000000 2746.263916 }
+			position={ 2142.938721 0.000000 2751.398438 }
 			rotation={ -0.000000 -0.349174 -0.000000 0.937058 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20347,7 +20347,7 @@ game_object_locator={
 		}
 		{
 			id=3903
-			position={ 2140.463379 0.000000 2851.027344 }
+			position={ 2156.004150 0.000000 2844.786133 }
 			rotation={ -0.000000 -0.357624 -0.000000 0.933866 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20401,7 +20401,7 @@ game_object_locator={
 		}
 		{
 			id=3912
-			position={ 2177.644775 0.000000 2955.330811 }
+			position={ 2191.072754 0.000000 2964.005127 }
 			rotation={ -0.000000 0.484079 -0.000000 0.875024 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20761,7 +20761,7 @@ game_object_locator={
 		}
 		{
 			id=3977
-			position={ 1855.244751 0.000000 2872.472168 }
+			position={ 1861.289185 0.000000 2881.530029 }
 			rotation={ -0.000000 0.215341 -0.000000 0.976539 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26719,7 +26719,7 @@ game_object_locator={
 		}
 		{
 			id=4975
-			position={ 2196.250244 0.000000 2731.834473 }
+			position={ 2205.524170 0.000000 2729.970703 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28603,7 +28603,7 @@ game_object_locator={
 		}
 		{
 			id=5289
-			position={ 3048.911133 0.000000 2817.673096 }
+			position={ 3068.471680 0.000000 2819.497070 }
 			rotation={ -0.000000 0.262719 -0.000000 0.964873 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28645,25 +28645,25 @@ game_object_locator={
 		}
 		{
 			id=5296
-			position={ 3022.797119 0.000000 2779.653809 }
+			position={ 2999.525635 0.000000 2781.218750 }
 			rotation={ -0.000000 -0.237515 -0.000000 0.971384 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5297
-			position={ 3072.285889 0.000000 2778.837646 }
+			position={ 3116.576904 0.000000 2793.253174 }
 			rotation={ -0.000000 0.339117 -0.000000 0.940744 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5298
-			position={ 3059.359619 0.000000 2748.579834 }
+			position={ 3066.970459 0.000000 2791.806885 }
 			rotation={ -0.000000 -0.193444 -0.000000 0.981111 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5299
-			position={ 3149.021484 0.000000 2739.328857 }
+			position={ 3121.514404 0.000000 2768.332031 }
 			rotation={ -0.000000 0.519421 -0.000000 0.854519 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28675,7 +28675,7 @@ game_object_locator={
 		}
 		{
 			id=5301
-			position={ 3117.296631 0.000000 2800.526855 }
+			position={ 3157.826172 0.000000 2790.517822 }
 			rotation={ -0.000000 -0.252073 -0.000000 0.967708 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47683,13 +47683,13 @@ game_object_locator={
 		}
 		{
 			id=8831
-			position={ 2568.000000 0.000000 2482.000000 }
+			position={ 2566.536621 0.000000 2483.124756 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8832
-			position={ 2517.000000 0.000000 2476.000000 }
+			position={ 2510.909668 0.000000 2477.959717 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47959,19 +47959,19 @@ game_object_locator={
 		}
 		{
 			id=8877
-			position={ 3010.000000 0.000000 2788.000000 }
+			position={ 3007.666016 0.000000 2780.084717 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8878
-			position={ 3030.000000 0.000000 2778.000000 }
+			position={ 3030.794189 0.000000 2787.219482 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8879
-			position={ 2985.000000 0.000000 2793.000000 }
+			position={ 2999.520752 0.000000 2787.847412 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52573,7 +52573,7 @@ game_object_locator={
 		}
 		{
 			id=9781
-			position={ 6651.000000 0.000000 1941.000000 }
+			position={ 1840.222534 0.000000 2880.153076 }
 			rotation={ 0.000000 0.163058 0.000000 0.986617 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -64975,14 +64975,14 @@ game_object_locator={
 		}
 		{
 			id=12323
-			position={ 2343.000000 0.000000 2233.000000 }
+			position={ 2346.900879 0.000000 2245.613770 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12324
-			position={ 2339.673340 0.000000 2224.200439 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			position={ 2341.147705 0.000000 2222.353027 }
+			rotation={ -0.000000 0.074090 -0.000000 0.997252 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -65011,7 +65011,7 @@ game_object_locator={
 		}
 		{
 			id=12329
-			position={ 2301.000000 0.000000 2191.000000 }
+			position={ 2298.563232 0.000000 2194.791016 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt
index 3159b6cd..d1dda7d5 100644
--- a/gfx/map/map_object_data/building_locators.txt
+++ b/gfx/map/map_object_data/building_locators.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="buildings"
 	render_pass=Map
 	clamp_to_water_level=yes
@@ -2761,7 +2761,7 @@ game_object_locator={
 		}
 		{
 			id=464
-			position={ 1797.884155 0.000000 2743.553711 }
+			position={ 1794.226929 0.000000 2742.667480 }
 			rotation={ -0.000000 -0.181072 -0.000000 0.983470 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2803,7 +2803,7 @@ game_object_locator={
 		}
 		{
 			id=471
-			position={ 2153.844482 0.000000 2449.464844 }
+			position={ 2149.489990 0.000000 2461.755127 }
 			rotation={ -0.000000 -0.667908 -0.000000 0.744244 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2827,7 +2827,7 @@ game_object_locator={
 		}
 		{
 			id=475
-			position={ 2209.077637 0.000000 2256.085449 }
+			position={ 2199.380127 0.000000 2253.423096 }
 			rotation={ -0.000000 -0.416644 -0.000000 -0.909070 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2863,13 +2863,13 @@ game_object_locator={
 		}
 		{
 			id=481
-			position={ 2263.077637 0.000000 2221.085449 }
+			position={ 2293.244873 0.000000 2209.338867 }
 			rotation={ -0.000000 -0.891463 -0.000000 0.453094 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=482
-			position={ 2340.077637 0.000000 2238.085449 }
+			position={ 2337.179443 0.000000 2243.013184 }
 			rotation={ -0.000000 -0.292808 -0.000000 -0.956171 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2941,7 +2941,7 @@ game_object_locator={
 		}
 		{
 			id=494
-			position={ 2477.077637 0.000000 2496.085449 }
+			position={ 2476.481201 0.000000 2529.422607 }
 			rotation={ -0.000000 -0.244469 -0.000000 -0.969657 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2953,13 +2953,13 @@ game_object_locator={
 		}
 		{
 			id=496
-			position={ 2591.287842 0.000000 2475.662598 }
+			position={ 2590.938965 0.000000 2476.689209 }
 			rotation={ -0.000000 -0.150522 -0.000000 0.988607 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=497
-			position={ 2519.238525 0.000000 2522.248535 }
+			position={ 2498.284668 0.000000 2527.330078 }
 			rotation={ -0.000000 -0.992824 -0.000000 0.119584 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3007,7 +3007,7 @@ game_object_locator={
 		}
 		{
 			id=505
-			position={ 2111.077637 0.000000 2705.085449 }
+			position={ 2105.887695 0.000000 2717.856201 }
 			rotation={ -0.000000 -0.862915 -0.000000 0.505350 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -12649,7 +12649,7 @@ game_object_locator={
 		}
 		{
 			id=2519
-			position={ 1715.077637 0.000000 2764.085449 }
+			position={ 1723.584961 0.000000 2777.309570 }
 			rotation={ -0.000000 -0.899551 -0.000000 0.436816 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -15937,7 +15937,7 @@ game_object_locator={
 		}
 		{
 			id=3095
-			position={ 1761.077637 0.000000 2785.085449 }
+			position={ 1772.510376 0.000000 2792.615479 }
 			rotation={ -0.000000 -0.581706 -0.000000 -0.813399 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18103,8 +18103,8 @@ game_object_locator={
 		}
 		{
 			id=3528
-			position={ 1910.077637 0.000000 2771.085449 }
-			rotation={ -0.000000 -0.439993 -0.000000 -0.898001 }
+			position={ 1892.515259 0.000000 2779.818848 }
+			rotation={ -0.000000 -0.830534 -0.000000 -0.556968 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18127,13 +18127,13 @@ game_object_locator={
 		}
 		{
 			id=3532
-			position={ 1929.077637 0.000000 2798.085449 }
+			position={ 1935.315918 0.000000 2803.360596 }
 			rotation={ -0.000000 -0.708992 -0.000000 0.705216 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3533
-			position={ 1892.077637 0.000000 2785.085449 }
+			position={ 1902.507446 0.000000 2802.685791 }
 			rotation={ -0.000000 -0.216030 -0.000000 -0.976387 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18145,7 +18145,7 @@ game_object_locator={
 		}
 		{
 			id=3535
-			position={ 1854.573730 0.000000 2781.725098 }
+			position={ 1857.020752 0.000000 2770.465820 }
 			rotation={ -0.000000 -1.000000 -0.000000 0.000138 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18157,8 +18157,8 @@ game_object_locator={
 		}
 		{
 			id=3537
-			position={ 1838.077637 0.000000 2762.085449 }
-			rotation={ -0.000000 -0.997774 -0.000000 0.066683 }
+			position={ 1838.770508 0.000000 2766.534180 }
+			rotation={ -0.000000 -0.738654 -0.000000 -0.674085 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18217,13 +18217,13 @@ game_object_locator={
 		}
 		{
 			id=3547
-			position={ 1833.331665 0.000000 2657.408691 }
+			position={ 1833.597778 0.000000 2661.153076 }
 			rotation={ -0.000000 -0.987025 -0.000000 -0.160565 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3548
-			position={ 1867.077637 0.000000 2678.085449 }
+			position={ 1869.456421 0.000000 2667.142334 }
 			rotation={ -0.000000 -0.895439 -0.000000 -0.445185 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18241,7 +18241,7 @@ game_object_locator={
 		}
 		{
 			id=3551
-			position={ 1873.077637 0.000000 2656.085449 }
+			position={ 1885.612183 0.000000 2641.753906 }
 			rotation={ -0.000000 -0.042084 -0.000000 -0.999114 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18433,7 +18433,7 @@ game_object_locator={
 		}
 		{
 			id=3583
-			position={ 2036.077637 0.000000 2614.085449 }
+			position={ 2026.390503 0.000000 2620.076172 }
 			rotation={ -0.000000 -0.709737 -0.000000 -0.704467 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18493,7 +18493,7 @@ game_object_locator={
 		}
 		{
 			id=3593
-			position={ 2148.844238 0.000000 2587.818359 }
+			position={ 2146.269043 0.000000 2596.783203 }
 			rotation={ -0.000000 -0.879375 -0.000000 -0.476129 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18565,7 +18565,7 @@ game_object_locator={
 		}
 		{
 			id=3605
-			position={ 2079.077637 0.000000 2707.085449 }
+			position={ 2076.614014 0.000000 2700.853271 }
 			rotation={ -0.000000 -0.583595 -0.000000 -0.812045 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18583,13 +18583,13 @@ game_object_locator={
 		}
 		{
 			id=3608
-			position={ 1958.077637 0.000000 2785.085449 }
+			position={ 1966.239136 0.000000 2781.188721 }
 			rotation={ -0.000000 -0.989181 -0.000000 0.146702 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3609
-			position={ 1987.077637 0.000000 2774.085449 }
+			position={ 1986.863892 0.000000 2770.306152 }
 			rotation={ -0.000000 -0.951515 -0.000000 -0.307603 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18631,7 +18631,7 @@ game_object_locator={
 		}
 		{
 			id=3617
-			position={ 2321.077637 0.000000 2480.085449 }
+			position={ 2313.838623 0.000000 2487.299805 }
 			rotation={ -0.000000 -0.883265 -0.000000 -0.468875 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18757,13 +18757,13 @@ game_object_locator={
 		}
 		{
 			id=3638
-			position={ 2189.077637 0.000000 2431.085449 }
+			position={ 2169.939453 0.000000 2453.322510 }
 			rotation={ -0.000000 -0.971970 -0.000000 -0.235104 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3639
-			position={ 2141.541260 0.000000 2433.493164 }
+			position={ 2137.173828 0.000000 2433.890625 }
 			rotation={ -0.000000 -0.011309 -0.000000 0.999936 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18841,8 +18841,8 @@ game_object_locator={
 		}
 		{
 			id=3652
-			position={ 2269.077637 0.000000 2506.085449 }
-			rotation={ -0.000000 -0.810258 -0.000000 -0.586074 }
+			position={ 2270.970215 0.000000 2510.760498 }
+			rotation={ -0.000000 -0.939031 -0.000000 -0.343834 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18853,7 +18853,7 @@ game_object_locator={
 		}
 		{
 			id=3654
-			position={ 2227.077637 0.000000 2562.085449 }
+			position={ 2223.252197 0.000000 2575.578369 }
 			rotation={ -0.000000 -0.765503 -0.000000 -0.643432 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18901,7 +18901,7 @@ game_object_locator={
 		}
 		{
 			id=3662
-			position={ 2250.452393 0.000000 2614.909180 }
+			position={ 2246.087158 0.000000 2611.473389 }
 			rotation={ -0.000000 -0.344847 -0.000000 0.938659 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18949,7 +18949,7 @@ game_object_locator={
 		}
 		{
 			id=3670
-			position={ 2216.697754 0.000000 2637.453613 }
+			position={ 2233.471436 0.000000 2650.513428 }
 			rotation={ -0.000000 -0.027935 -0.000000 0.999610 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19099,7 +19099,7 @@ game_object_locator={
 		}
 		{
 			id=3695
-			position={ 2530.077637 0.000000 2689.085449 }
+			position={ 2531.904297 0.000000 2699.424316 }
 			rotation={ -0.000000 -0.172736 -0.000000 0.984968 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19477,13 +19477,13 @@ game_object_locator={
 		}
 		{
 			id=3758
-			position={ 2535.782227 0.000000 2534.109375 }
+			position={ 2522.830322 0.000000 2528.247314 }
 			rotation={ -0.000000 -0.181926 -0.000000 0.983312 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3759
-			position={ 2535.343994 0.000000 2500.211426 }
+			position={ 2533.449463 0.000000 2524.638184 }
 			rotation={ -0.000000 -0.994352 -0.000000 0.106137 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19495,13 +19495,13 @@ game_object_locator={
 		}
 		{
 			id=3761
-			position={ 2564.077637 0.000000 2484.085449 }
+			position={ 2552.644531 0.000000 2490.760254 }
 			rotation={ -0.000000 -0.998027 -0.000000 0.062785 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3762
-			position={ 2535.524170 0.000000 2474.520996 }
+			position={ 2537.600586 0.000000 2494.886230 }
 			rotation={ -0.000000 -0.279454 -0.000000 0.960159 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19513,13 +19513,13 @@ game_object_locator={
 		}
 		{
 			id=3764
-			position={ 2517.430176 0.000000 2469.644043 }
+			position={ 2505.204834 0.000000 2461.785400 }
 			rotation={ -0.000000 -0.135276 -0.000000 -0.990808 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3765
-			position={ 2473.077637 0.000000 2457.085449 }
+			position={ 2467.893799 0.000000 2465.567139 }
 			rotation={ -0.000000 -0.040115 -0.000000 0.999195 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19561,7 +19561,7 @@ game_object_locator={
 		}
 		{
 			id=3772
-			position={ 2331.382080 0.000000 2459.979004 }
+			position={ 2333.915283 0.000000 2462.003662 }
 			rotation={ -0.000000 -0.925277 -0.000000 0.379291 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19681,7 +19681,7 @@ game_object_locator={
 		}
 		{
 			id=3792
-			position={ 2271.077637 0.000000 2295.085449 }
+			position={ 2268.947754 0.000000 2297.311279 }
 			rotation={ -0.000000 -0.031669 -0.000000 -0.999498 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19723,7 +19723,7 @@ game_object_locator={
 		}
 		{
 			id=3799
-			position={ 2304.128906 0.000000 2187.263184 }
+			position={ 2321.741943 0.000000 2194.240967 }
 			rotation={ -0.000000 -0.742669 -0.000000 0.669659 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19855,7 +19855,7 @@ game_object_locator={
 		}
 		{
 			id=3821
-			position={ 1856.077637 0.000000 2899.085449 }
+			position={ 1868.504272 0.000000 2898.997314 }
 			rotation={ -0.000000 -0.573190 -0.000000 -0.819422 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20017,7 +20017,7 @@ game_object_locator={
 		}
 		{
 			id=3848
-			position={ 1994.663330 0.000000 2968.620117 }
+			position={ 2003.600220 0.000000 2968.199951 }
 			rotation={ -0.000000 -0.999963 -0.000000 -0.008604 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20107,7 +20107,7 @@ game_object_locator={
 		}
 		{
 			id=3863
-			position={ 2012.077637 0.000000 2821.085449 }
+			position={ 2013.842285 0.000000 2807.545654 }
 			rotation={ -0.000000 -0.866336 -0.000000 -0.499461 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20125,7 +20125,7 @@ game_object_locator={
 		}
 		{
 			id=3866
-			position={ 2046.077637 0.000000 2836.085449 }
+			position={ 2033.966187 0.000000 2839.309326 }
 			rotation={ -0.000000 -0.431254 -0.000000 -0.902231 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20233,7 +20233,7 @@ game_object_locator={
 		}
 		{
 			id=3884
-			position={ 2157.715576 0.000000 2736.325195 }
+			position={ 2151.998047 0.000000 2742.207764 }
 			rotation={ -0.000000 -0.899012 -0.000000 0.437923 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20347,7 +20347,7 @@ game_object_locator={
 		}
 		{
 			id=3903
-			position={ 2134.077637 0.000000 2856.085449 }
+			position={ 2144.868164 0.000000 2851.664551 }
 			rotation={ -0.000000 -0.978348 -0.000000 -0.206968 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20401,7 +20401,7 @@ game_object_locator={
 		}
 		{
 			id=3912
-			position={ 2180.077637 0.000000 2949.085449 }
+			position={ 2178.279785 0.000000 2968.822266 }
 			rotation={ -0.000000 -0.770036 -0.000000 -0.638000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20761,13 +20761,13 @@ game_object_locator={
 		}
 		{
 			id=3977
-			position={ 1856.077637 0.000000 2880.085449 }
+			position={ 1862.122070 0.000000 2889.143311 }
 			rotation={ -0.000000 -0.740847 -0.000000 0.671674 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3978
-			position={ 2104.077637 0.000000 3022.085449 }
+			position={ 2109.264160 0.000000 3029.177246 }
 			rotation={ -0.000000 -0.783548 -0.000000 0.621331 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26719,7 +26719,7 @@ game_object_locator={
 		}
 		{
 			id=4975
-			position={ 2191.077637 0.000000 2728.085449 }
+			position={ 2193.935547 0.000000 2723.471924 }
 			rotation={ -0.000000 -0.533511 -0.000000 0.845793 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28603,7 +28603,7 @@ game_object_locator={
 		}
 		{
 			id=5289
-			position={ 3057.077637 0.000000 2820.085449 }
+			position={ 3080.015137 0.000000 2826.446045 }
 			rotation={ -0.000000 -0.966352 -0.000000 -0.257225 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28645,25 +28645,25 @@ game_object_locator={
 		}
 		{
 			id=5296
-			position={ 3012.721924 0.000000 2778.606445 }
+			position={ 2983.356201 0.000000 2776.762695 }
 			rotation={ -0.000000 -0.685419 -0.000000 -0.728149 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5297
-			position={ 3074.471191 0.000000 2772.301270 }
+			position={ 3102.022705 0.000000 2790.695068 }
 			rotation={ -0.000000 -0.789717 -0.000000 0.613471 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5298
-			position={ 3069.077637 0.000000 2733.085449 }
+			position={ 3060.961914 0.000000 2789.903320 }
 			rotation={ -0.000000 -0.185564 -0.000000 0.982632 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5299
-			position={ 3160.077637 0.000000 2744.085449 }
+			position={ 3131.276367 0.000000 2751.239258 }
 			rotation={ -0.000000 -0.277660 -0.000000 -0.960680 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28675,7 +28675,7 @@ game_object_locator={
 		}
 		{
 			id=5301
-			position={ 3109.077637 0.000000 2804.085449 }
+			position={ 3140.242920 0.000000 2802.119873 }
 			rotation={ -0.000000 -0.381606 -0.000000 0.924325 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28885,7 +28885,7 @@ game_object_locator={
 		}
 		{
 			id=5336
-			position={ 3036.077637 0.000000 2835.085449 }
+			position={ 3023.312500 0.000000 2842.350830 }
 			rotation={ -0.000000 -0.977652 -0.000000 -0.210229 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47683,13 +47683,13 @@ game_object_locator={
 		}
 		{
 			id=8831
-			position={ 2571.000000 0.000000 2482.000000 }
+			position={ 2571.557373 0.000000 2488.263184 }
 			rotation={ -0.000000 -0.149469 -0.000000 0.988766 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8832
-			position={ 2520.000000 0.000000 2476.000000 }
+			position={ 2528.473389 0.000000 2472.052002 }
 			rotation={ -0.000000 -0.851638 -0.000000 0.524130 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47971,19 +47971,19 @@ game_object_locator={
 		}
 		{
 			id=8879
-			position={ 2988.000000 0.000000 2793.000000 }
+			position={ 2982.252197 0.000000 2796.471191 }
 			rotation={ -0.000000 -0.650848 -0.000000 0.759208 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8880
-			position={ 3041.000000 0.000000 2808.000000 }
+			position={ 3044.480225 0.000000 2802.027344 }
 			rotation={ -0.000000 -0.996219 -0.000000 -0.086880 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8881
-			position={ 3042.000000 0.000000 2823.000000 }
+			position={ 3046.176758 0.000000 2820.596680 }
 			rotation={ -0.000000 -0.990935 -0.000000 0.134343 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52573,8 +52573,8 @@ game_object_locator={
 		}
 		{
 			id=9781
-			position={ 6519.937500 0.000000 1752.756958 }
-			rotation={ 0.000000 0.163058 0.000000 0.986617 }
+			position={ 1845.621460 0.000000 2882.448975 }
+			rotation={ -0.000000 0.520139 -0.000000 0.854082 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -64981,7 +64981,7 @@ game_object_locator={
 		}
 		{
 			id=12324
-			position={ 2331.812744 0.000000 2231.003662 }
+			position={ 2336.843018 0.000000 2227.057617 }
 			rotation={ -0.000000 -0.996900 -0.000000 0.078680 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -65011,7 +65011,7 @@ game_object_locator={
 		}
 		{
 			id=12329
-			position={ 2305.000000 0.000000 2190.000000 }
+			position={ 2304.561523 0.000000 2185.922119 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -66127,13 +66127,13 @@ game_object_locator={
 		}
 		{
 			id=12538
-			position={ 2736.963623 0.000000 2951.316650 }
+			position={ 2736.871094 0.000000 2964.562012 }
 			rotation={ -0.000000 -0.851638 -0.000000 0.524130 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12539
-			position={ 2689.000000 0.000000 2937.000000 }
+			position={ 2694.366943 0.000000 2928.558350 }
 			rotation={ -0.000000 -0.955055 -0.000000 -0.296429 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt
index 590a0de1..931b7076 100644
--- a/gfx/map/map_object_data/combat_locators.txt
+++ b/gfx/map/map_object_data/combat_locators.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="combat"
 	render_pass=Map
 	clamp_to_water_level=yes
@@ -2821,7 +2821,7 @@ game_object_locator={
 		}
 		{
 			id=471
-			position={ 2154.697998 0.000000 2463.770996 }
+			position={ 2151.294434 0.000000 2461.494385 }
 			rotation={ -0.000000 -0.342949 -0.000000 0.939354 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2845,7 +2845,7 @@ game_object_locator={
 		}
 		{
 			id=475
-			position={ 2217.174072 0.000000 2270.195312 }
+			position={ 2195.336182 0.000000 2260.739990 }
 			rotation={ -0.000000 -0.980514 -0.000000 -0.196449 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2959,7 +2959,7 @@ game_object_locator={
 		}
 		{
 			id=494
-			position={ 2479.000000 0.000000 2514.000000 }
+			position={ 2477.970703 0.000000 2524.522217 }
 			rotation={ -0.000000 -0.989502 -0.000000 0.144520 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2971,7 +2971,7 @@ game_object_locator={
 		}
 		{
 			id=496
-			position={ 2582.379150 0.000000 2485.868652 }
+			position={ 2591.945068 0.000000 2478.197998 }
 			rotation={ -0.000000 -0.849827 -0.000000 0.527062 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2983,7 +2983,7 @@ game_object_locator={
 		}
 		{
 			id=498
-			position={ 2519.688965 0.000000 2610.091797 }
+			position={ 2517.742432 0.000000 2600.067383 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -14335,7 +14335,7 @@ game_object_locator={
 		}
 		{
 			id=2519
-			position={ 1719.166260 0.000000 2776.893799 }
+			position={ 1728.447021 0.000000 2778.922607 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19987,7 +19987,7 @@ game_object_locator={
 		}
 		{
 			id=3528
-			position={ 1909.277954 0.000000 2784.242432 }
+			position={ 1894.958618 0.000000 2778.255371 }
 			rotation={ -0.000000 -0.981045 -0.000000 0.193778 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20011,13 +20011,13 @@ game_object_locator={
 		}
 		{
 			id=3532
-			position={ 1916.000000 0.000000 2805.000000 }
+			position={ 1935.867432 0.000000 2800.728516 }
 			rotation={ -0.000000 -0.922429 -0.000000 0.386167 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3533
-			position={ 1889.618530 0.000000 2798.258789 }
+			position={ 1900.383789 0.000000 2803.239746 }
 			rotation={ -0.000000 -0.974171 -0.000000 0.225813 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20029,7 +20029,7 @@ game_object_locator={
 		}
 		{
 			id=3535
-			position={ 1848.992432 0.000000 2790.846191 }
+			position={ 1851.439453 0.000000 2779.586914 }
 			rotation={ -0.000000 -0.949713 -0.000000 0.313122 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20041,7 +20041,7 @@ game_object_locator={
 		}
 		{
 			id=3537
-			position={ 1855.000000 0.000000 2764.000000 }
+			position={ 1836.637939 0.000000 2759.310547 }
 			rotation={ -0.000000 -0.636790 -0.000000 0.771037 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20107,7 +20107,7 @@ game_object_locator={
 		}
 		{
 			id=3548
-			position={ 1873.643799 0.000000 2689.914551 }
+			position={ 1870.791992 0.000000 2665.578613 }
 			rotation={ -0.000000 -0.336306 -0.000000 0.941753 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20125,7 +20125,7 @@ game_object_locator={
 		}
 		{
 			id=3551
-			position={ 1890.746826 0.000000 2645.476807 }
+			position={ 1893.190918 0.000000 2638.023682 }
 			rotation={ -0.000000 -0.331123 -0.000000 0.943587 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20227,7 +20227,7 @@ game_object_locator={
 		}
 		{
 			id=3568
-			position={ 2024.515381 0.000000 2657.586182 }
+			position={ 2029.081909 0.000000 2648.118408 }
 			rotation={ -0.000000 0.344652 -0.000000 0.938731 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20257,7 +20257,7 @@ game_object_locator={
 		}
 		{
 			id=3573
-			position={ 2007.870361 0.000000 2560.689453 }
+			position={ 2019.924072 0.000000 2563.491699 }
 			rotation={ -0.000000 -0.211778 -0.000000 0.977318 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20275,7 +20275,7 @@ game_object_locator={
 		}
 		{
 			id=3576
-			position={ 2062.264893 0.000000 2512.639893 }
+			position={ 2054.338135 0.000000 2515.321777 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20287,7 +20287,7 @@ game_object_locator={
 		}
 		{
 			id=3578
-			position={ 2076.728027 0.000000 2537.704590 }
+			position={ 2055.640869 0.000000 2541.926514 }
 			rotation={ -0.000000 -0.050767 -0.000000 0.998711 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20329,7 +20329,7 @@ game_object_locator={
 		}
 		{
 			id=3585
-			position={ 2027.507080 0.000000 2608.192139 }
+			position={ 2043.918945 0.000000 2597.487793 }
 			rotation={ -0.000000 -0.531675 -0.000000 0.846948 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20449,7 +20449,7 @@ game_object_locator={
 		}
 		{
 			id=3605
-			position={ 2064.000000 0.000000 2710.000000 }
+			position={ 2074.260254 0.000000 2699.717041 }
 			rotation={ -0.000000 -0.916924 -0.000000 0.399062 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20515,7 +20515,7 @@ game_object_locator={
 		}
 		{
 			id=3617
-			position={ 2306.000000 0.000000 2495.000000 }
+			position={ 2311.079590 0.000000 2489.729248 }
 			rotation={ -0.000000 -0.804098 -0.000000 0.594496 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20611,7 +20611,7 @@ game_object_locator={
 		}
 		{
 			id=3633
-			position={ 2433.000000 0.000000 2540.000000 }
+			position={ 2447.441406 0.000000 2539.083496 }
 			rotation={ -0.000000 -0.928438 -0.000000 0.371487 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20671,7 +20671,7 @@ game_object_locator={
 		}
 		{
 			id=3643
-			position={ 2169.000000 0.000000 2529.000000 }
+			position={ 2184.708740 0.000000 2528.235107 }
 			rotation={ -0.000000 -0.738941 -0.000000 0.673771 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20695,7 +20695,7 @@ game_object_locator={
 		}
 		{
 			id=3647
-			position={ 2204.000000 0.000000 2474.000000 }
+			position={ 2191.046875 0.000000 2467.329346 }
 			rotation={ -0.000000 -0.590705 -0.000000 0.806888 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20725,7 +20725,7 @@ game_object_locator={
 		}
 		{
 			id=3652
-			position={ 2263.000000 0.000000 2522.000000 }
+			position={ 2270.548096 0.000000 2514.970459 }
 			rotation={ -0.000000 -0.954178 -0.000000 0.299241 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20791,7 +20791,7 @@ game_object_locator={
 		}
 		{
 			id=3663
-			position={ 2239.000000 0.000000 2598.000000 }
+			position={ 2248.889648 0.000000 2581.010986 }
 			rotation={ -0.000000 -0.798542 -0.000000 0.601939 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20983,7 +20983,7 @@ game_object_locator={
 		}
 		{
 			id=3695
-			position={ 2510.423096 0.000000 2692.345947 }
+			position={ 2530.346436 0.000000 2697.865234 }
 			rotation={ -0.000000 -0.853244 -0.000000 0.521513 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21109,7 +21109,7 @@ game_object_locator={
 		}
 		{
 			id=3716
-			position={ 2121.662354 0.000000 2394.790527 }
+			position={ 2128.466064 0.000000 2389.723389 }
 			rotation={ -0.000000 -0.067758 -0.000000 0.997702 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21361,13 +21361,13 @@ game_object_locator={
 		}
 		{
 			id=3758
-			position={ 2541.474365 0.000000 2514.821289 }
+			position={ 2517.339355 0.000000 2522.410400 }
 			rotation={ -0.000000 -0.445198 -0.000000 0.895432 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3759
-			position={ 2531.959473 0.000000 2508.149658 }
+			position={ 2532.031006 0.000000 2517.857178 }
 			rotation={ -0.000000 0.247020 -0.000000 0.969010 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21385,19 +21385,19 @@ game_object_locator={
 		}
 		{
 			id=3762
-			position={ 2539.087891 0.000000 2481.832764 }
+			position={ 2533.584229 0.000000 2489.725098 }
 			rotation={ -0.000000 0.254258 -0.000000 0.967137 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3763
-			position={ 2476.000000 0.000000 2479.000000 }
+			position={ 2477.396484 0.000000 2495.113037 }
 			rotation={ -0.000000 -0.917655 -0.000000 0.397377 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3764
-			position={ 2503.946533 0.000000 2479.406250 }
+			position={ 2512.073975 0.000000 2456.351562 }
 			rotation={ -0.000000 -0.922552 -0.000000 0.385873 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21991,7 +21991,7 @@ game_object_locator={
 		}
 		{
 			id=3863
-			position={ 2015.635010 0.000000 2833.937012 }
+			position={ 2022.137085 0.000000 2803.199707 }
 			rotation={ -0.000000 -0.849777 -0.000000 0.527143 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -22117,7 +22117,7 @@ game_object_locator={
 		}
 		{
 			id=3884
-			position={ 2165.558105 0.000000 2745.098145 }
+			position={ 2147.223389 0.000000 2750.232666 }
 			rotation={ -0.000000 -0.483777 -0.000000 0.875191 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -22363,7 +22363,7 @@ game_object_locator={
 		}
 		{
 			id=3925
-			position={ 2220.360840 0.000000 2889.064453 }
+			position={ 2230.112793 0.000000 2888.700439 }
 			rotation={ -0.000000 -0.833324 -0.000000 0.552785 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28603,7 +28603,7 @@ game_object_locator={
 		}
 		{
 			id=4975
-			position={ 2193.895996 0.000000 2734.199463 }
+			position={ 2194.458984 0.000000 2721.409424 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28663,7 +28663,7 @@ game_object_locator={
 		}
 		{
 			id=4985
-			position={ 2311.074707 0.000000 2696.605713 }
+			position={ 2303.941895 0.000000 2690.413086 }
 			rotation={ -0.000000 -0.992527 -0.000000 0.122029 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30385,7 +30385,7 @@ game_object_locator={
 		}
 		{
 			id=5272
-			position={ 2722.546387 0.000000 2921.703369 }
+			position={ 2733.268799 0.000000 2927.130371 }
 			rotation={ -0.000000 -0.775354 -0.000000 0.631527 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30529,25 +30529,25 @@ game_object_locator={
 		}
 		{
 			id=5296
-			position={ 3002.370850 0.000000 2784.516602 }
+			position={ 2980.924805 0.000000 2779.466553 }
 			rotation={ -0.000000 -0.927161 -0.000000 0.374664 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5297
-			position={ 3067.130615 0.000000 2786.207764 }
+			position={ 3098.166260 0.000000 2807.854736 }
 			rotation={ -0.000000 -0.999619 -0.000000 -0.027598 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5298
-			position={ 3087.000000 0.000000 2733.000000 }
+			position={ 3079.158447 0.000000 2788.844238 }
 			rotation={ -0.000000 -0.549331 -0.000000 0.835605 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5299
-			position={ 3144.000000 0.000000 2757.000000 }
+			position={ 3134.098145 0.000000 2746.882080 }
 			rotation={ -0.000000 -0.895212 -0.000000 0.445641 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30559,7 +30559,7 @@ game_object_locator={
 		}
 		{
 			id=5301
-			position={ 3130.000000 0.000000 2807.000000 }
+			position={ 3144.085938 0.000000 2796.739990 }
 			rotation={ -0.000000 -0.841780 -0.000000 0.539821 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30769,7 +30769,7 @@ game_object_locator={
 		}
 		{
 			id=5336
-			position={ 3017.980957 0.000000 2844.224365 }
+			position={ 3005.215820 0.000000 2851.489746 }
 			rotation={ -0.000000 -0.988895 -0.000000 0.148614 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -50665,19 +50665,19 @@ game_object_locator={
 		}
 		{
 			id=8831
-			position={ 7349.000000 0.000000 2361.000000 }
+			position={ 2570.371094 0.000000 2488.244141 }
 			rotation={ 0.000000 0.316228 0.000000 0.948683 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8832
-			position={ 7330.000000 0.000000 2339.000000 }
+			position={ 2519.714111 0.000000 2473.629639 }
 			rotation={ 0.000000 0.049814 0.000000 0.998759 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8833
-			position={ 7268.000000 0.000000 2319.000000 }
+			position={ 2488.247803 0.000000 2458.757080 }
 			rotation={ 0.000000 0.923880 0.000000 0.382683 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -50941,37 +50941,37 @@ game_object_locator={
 		}
 		{
 			id=8877
-			position={ 6953.000000 0.000000 2790.000000 }
+			position={ 3010.423096 0.000000 2792.696533 }
 			rotation={ 0.000000 0.671005 0.000000 0.741453 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8878
-			position={ 7005.000000 0.000000 2762.000000 }
+			position={ 3026.779297 0.000000 2782.661865 }
 			rotation={ 0.000000 -0.671005 0.000000 0.741453 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8879
-			position={ 6976.000000 0.000000 2731.000000 }
+			position={ 2981.424072 0.000000 2793.147461 }
 			rotation={ 0.000000 0.894427 0.000000 0.447214 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8880
-			position={ 7019.000000 0.000000 2719.000000 }
+			position={ 3044.662598 0.000000 2807.532715 }
 			rotation={ 0.000000 -0.741453 0.000000 0.671005 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8881
-			position={ 6974.000000 0.000000 2687.000000 }
+			position={ 3046.202637 0.000000 2821.863525 }
 			rotation={ 0.000000 0.998759 0.000000 0.049814 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8882
-			position={ 6928.000000 0.000000 2685.000000 }
+			position={ 2972.237549 0.000000 2806.258057 }
 			rotation={ 0.000000 0.811242 0.000000 0.584710 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -56293,7 +56293,7 @@ game_object_locator={
 		}
 		{
 			id=9781
-			position={ 6668.000000 0.000000 1945.000000 }
+			position={ 1848.430054 0.000000 2876.347412 }
 			rotation={ 0.000000 -0.316228 0.000000 0.948683 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/generated/reeds_01_generator_1.txt b/gfx/map/map_object_data/generated/reeds_01_generator_1.txt
index b5c3946a..6a4698f9 100644
--- a/gfx/map/map_object_data/generated/reeds_01_generator_1.txt
+++ b/gfx/map/map_object_data/generated/reeds_01_generator_1.txt
@@ -5,7 +5,7 @@
 	generated_content=yes
 	layer="grass_layer"
 	pdxmesh="reeds_06_grass_mesh"
-	count=12338
+	count=12341
 	transform="840.481323 0.000000 1068.100830 0.000000 0.245069 0.000000 0.969506 0.157621 0.157621 0.157621
 844.095215 0.000000 1079.398315 0.000000 0.213992 0.000000 0.976835 0.847758 0.847758 0.847758
 836.015686 0.000000 1068.648438 0.000000 0.354825 0.000000 0.934933 0.803960 0.803960 0.803960
@@ -4631,6 +4631,7 @@
 2197.729248 0.000000 3508.073730 0.000000 0.692719 0.000000 0.721208 0.487175 0.487175 0.487175
 2203.899658 0.000000 3510.036621 0.000000 0.061034 0.000000 0.998136 0.943464 0.943464 0.943464
 2195.994629 0.000000 3526.970215 0.000000 0.612434 0.000000 0.790522 0.419619 0.419619 0.419619
+2167.107178 0.000000 3518.116943 0.000000 0.286495 0.000000 0.958082 0.418299 0.418299 0.418299
 2201.883789 0.000000 3516.877930 0.000000 0.020490 0.000000 0.999790 0.063361 0.063361 0.063361
 2191.575195 0.000000 3517.149414 0.000000 0.439836 0.000000 0.898078 0.963800 0.963800 0.963800
 2172.009277 0.000000 3519.457764 0.000000 0.612592 0.000000 0.790399 0.419746 0.419746 0.419746
@@ -4643,6 +4644,7 @@
 2186.864990 0.000000 3516.333008 0.000000 0.491959 0.000000 0.870619 0.759988 0.759988 0.759988
 2204.250977 0.000000 3518.089111 0.000000 0.134803 0.000000 0.990872 0.731200 0.731200 0.731200
 2184.304199 0.000000 3510.730469 0.000000 0.041147 0.000000 0.999153 0.026202 0.026202 0.026202
+2183.569580 0.000000 3507.621094 0.000000 0.659757 0.000000 0.751479 0.532980 0.532980 0.532980
 2159.767334 0.000000 3520.939209 0.000000 0.357251 0.000000 0.934008 0.837486 0.837486 0.837486
 2199.890869 0.000000 3515.679688 0.000000 0.063280 0.000000 0.997996 0.706448 0.706448 0.706448
 2187.422363 0.000000 3520.781250 0.000000 0.159428 0.000000 0.987210 0.101930 0.101930 0.101930
@@ -4656,6 +4658,7 @@
 2195.625977 0.000000 3511.194824 0.000000 0.133718 0.000000 0.991019 0.085383 0.085383 0.085383
 2188.873535 0.000000 3524.455566 0.000000 0.571003 0.000000 0.820948 0.386891 0.386891 0.386891
 2185.563721 0.000000 3517.594971 0.000000 0.516252 0.000000 0.856437 0.691928 0.691928 0.691928
+2164.018311 0.000000 3516.450195 0.000000 0.597567 0.000000 0.801819 0.900127 0.900127 0.900127
 2162.906494 0.000000 3519.277832 0.000000 0.730011 0.000000 0.683436 0.791481 0.791481 0.791481
 2204.652832 0.000000 3526.549072 0.000000 0.415039 0.000000 0.909804 0.557772 0.557772 0.557772
 2168.531738 0.000000 3517.284424 0.000000 0.689202 0.000000 0.724569 0.484078 0.484078 0.484078
@@ -12352,7 +12355,7 @@ object={
 	generated_content=yes
 	layer="grass_layer"
 	pdxmesh="reeds_07_grass_mesh"
-	count=9896
+	count=9898
 	transform="835.735657 0.000000 1066.719971 0.000000 0.973073 0.000000 0.230498 0.878640 0.878640 0.878640
 834.646118 0.000000 1072.386475 0.000000 0.864682 0.000000 0.502320 0.984233 0.984233 0.984233
 838.819092 0.000000 1070.288086 0.000000 0.886091 0.000000 0.463510 0.821924 0.821924 0.821924
@@ -15973,6 +15976,7 @@ object={
 2191.832764 0.000000 3526.097412 0.000000 0.918470 0.000000 0.395491 0.741149 0.741149 0.741149
 2159.880127 0.000000 3523.957520 0.000000 0.930445 0.000000 0.366431 0.974711 0.974711 0.974711
 2171.422607 0.000000 3524.662109 0.000000 0.865396 0.000000 0.501088 0.934484 0.934484 0.934484
+2161.228027 0.000000 3518.865967 0.000000 0.978370 0.000000 0.206863 0.942778 0.942778 0.942778
 2188.111084 0.000000 3522.847656 0.000000 0.829199 0.000000 0.558954 0.622406 0.622406 0.622406
 2175.089111 0.000000 3522.774658 0.000000 0.809171 0.000000 0.587574 0.857314 0.857314 0.857314
 2201.766113 0.000000 3524.360840 0.000000 0.957009 0.000000 0.290059 0.987510 0.987510 0.987510
@@ -15993,6 +15997,7 @@ object={
 2167.661377 0.000000 3520.156006 0.000000 0.778924 0.000000 0.627119 0.854464 0.854464 0.854464
 2206.237061 0.000000 3519.580566 0.000000 0.835998 0.000000 0.548733 0.895592 0.895592 0.895592
 2187.139404 0.000000 3513.585449 0.000000 0.984588 0.000000 0.174892 0.933290 0.933290 0.933290
+2165.531982 0.000000 3517.094727 0.000000 0.769026 0.000000 0.639217 0.925554 0.925554 0.925554
 2195.831299 0.000000 3516.673340 0.000000 0.856177 0.000000 0.516682 0.959333 0.959333 0.959333
 2182.025635 0.000000 3523.156738 0.000000 0.990701 0.000000 0.136056 0.913115 0.913115 0.913115
 2196.856445 0.000000 3514.385254 0.000000 0.968581 0.000000 0.248698 0.975529 0.975529 0.975529
@@ -22257,7 +22262,7 @@ object={
 	generated_content=yes
 	layer="grass_layer"
 	pdxmesh="reeds_01_tall_grass_mesh"
-	count=24599
+	count=24605
 	transform="836.048096 0.000000 1062.567993 0.000000 0.930602 0.000000 -0.366032 1.210501 1.210501 1.210501
 839.566528 0.000000 1065.748169 0.000000 0.799143 0.000000 -0.601141 1.410574 1.410574 1.410574
 828.142944 0.000000 1079.501587 0.000000 0.804822 0.000000 -0.593517 1.164981 1.164981 1.164981
@@ -31394,6 +31399,8 @@ object={
 2178.184570 0.000000 3525.161377 0.000000 0.925741 0.000000 -0.378158 1.013554 1.013554 1.013554
 2188.683594 0.000000 3518.017578 0.000000 0.592277 0.000000 -0.805734 1.451437 1.451437 1.451437
 2202.497559 0.000000 3519.855225 0.000000 0.325904 0.000000 -0.945403 1.640208 1.640208 1.640208
+2189.300781 0.000000 3507.435059 0.000000 0.812102 0.000000 -0.583516 1.381092 1.381092 1.381092
+2170.184082 0.000000 3516.931641 0.000000 0.968142 0.000000 -0.250401 1.161125 1.161125 1.161125
 2194.333252 0.000000 3504.969727 0.000000 0.926200 0.000000 -0.377032 1.062734 1.062734 1.062734
 2182.011230 0.000000 3509.631592 0.000000 0.526335 0.000000 -0.850277 1.474563 1.474563 1.474563
 2192.018066 0.000000 3514.212402 0.000000 0.037359 0.000000 -0.999302 1.026798 1.026798 1.026798
@@ -31410,6 +31417,7 @@ object={
 2185.733643 0.000000 3508.659424 0.000000 0.377970 0.000000 -0.925818 1.753244 1.753244 1.753244
 2185.778076 0.000000 3519.461426 0.000000 0.999875 0.000000 -0.015820 1.010072 1.010072 1.010072
 2175.177246 0.000000 3525.974365 0.000000 0.550686 0.000000 -0.834712 1.061640 1.061640 1.061640
+2168.248779 0.000000 3514.436035 0.000000 0.216502 0.000000 -0.976282 1.698987 1.698987 1.698987
 2182.406006 0.000000 3518.775635 0.000000 0.269682 0.000000 -0.962949 1.826163 1.826163 1.826163
 2161.959229 0.000000 3521.807617 0.000000 0.709878 0.000000 -0.704325 1.321912 1.321912 1.321912
 2164.091797 0.000000 3518.119141 0.000000 0.795339 0.000000 -0.606165 1.094298 1.094298 1.094298
@@ -31417,6 +31425,7 @@ object={
 2200.240967 0.000000 3521.848877 0.000000 0.565998 0.000000 -0.824407 1.614563 1.614563 1.614563
 2197.510254 0.000000 3511.029541 0.000000 0.145192 0.000000 -0.989404 1.907240 1.907240 1.907240
 2191.464844 0.000000 3504.752686 0.000000 0.819624 0.000000 -0.572902 1.071581 1.071581 1.071581
+2171.303955 0.000000 3513.520264 0.000000 0.894597 0.000000 -0.446873 1.099465 1.099465 1.099465
 2211.403076 0.000000 3523.322021 0.000000 0.823847 0.000000 -0.566813 1.049649 1.049649 1.049649
 2177.388184 0.000000 3513.415039 0.000000 0.235939 0.000000 -0.971768 1.059885 1.059885 1.059885
 2192.971191 0.000000 3502.414307 0.000000 0.771294 0.000000 -0.636479 1.020669 1.020669 1.020669
@@ -31426,9 +31435,11 @@ object={
 2185.614502 0.000000 3522.867188 0.000000 0.440901 0.000000 -0.897556 1.709318 1.709318 1.709318
 2173.294922 0.000000 3512.138672 0.000000 0.619058 0.000000 -0.785345 1.151086 1.151086 1.151086
 2187.836914 0.000000 3510.030762 0.000000 0.659109 0.000000 -0.752047 1.541867 1.541867 1.541867
+2187.089844 0.000000 3506.310059 0.000000 0.988349 0.000000 -0.152203 1.097273 1.097273 1.097273
 2194.396729 0.000000 3520.561768 0.000000 0.260773 0.000000 -0.965400 1.626481 1.626481 1.626481
 2185.519531 0.000000 3514.266846 0.000000 0.128347 0.000000 -0.991729 1.122409 1.122409 1.122409
 2176.870850 0.000000 3520.144775 0.000000 0.998618 0.000000 0.052551 0.989893 0.989893 0.989893
+2189.117432 0.000000 3504.962891 0.000000 0.515256 0.000000 -0.857036 1.254447 1.254447 1.254447
 2165.765625 0.000000 3523.345947 0.000000 0.980959 0.000000 -0.194213 1.012687 1.012687 1.012687
 2187.038574 0.000000 3524.797607 0.000000 0.504994 0.000000 -0.863123 1.662989 1.662989 1.662989
 2177.131592 0.000000 3527.131836 0.000000 0.347065 0.000000 -0.937841 1.069844 1.069844 1.069844
diff --git a/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt b/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt
index 63b8ef39..661f9999 100644
--- a/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt
+++ b/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt
@@ -5,7 +5,7 @@
 	generated_content=yes
 	layer="tree_high_layer"
 	pdxmesh="tree_pine_01_b_mesh"
-	count=97361
+	count=97360
 	transform="668.392944 0.000000 2272.243652 0.000000 0.999225 0.000000 0.039361 0.400000 0.400000 0.400000
 738.418030 0.000000 2210.560547 0.000000 0.987297 0.000000 -0.158887 0.400000 0.400000 0.400000
 733.487671 0.000000 2210.893555 0.000000 0.974668 0.000000 0.223657 0.400000 0.400000 0.400000
@@ -10100,7 +10100,6 @@
 2088.032715 0.000000 3483.239502 0.000000 0.844413 0.000000 -0.535692 0.400000 0.400000 0.400000
 2134.508057 0.000000 3473.714600 0.000000 0.975497 0.000000 0.220014 0.400000 0.400000 0.400000
 2109.852051 0.000000 3498.248047 0.000000 0.464068 0.000000 0.885799 0.400000 0.400000 0.400000
-2087.887939 0.000000 3523.957520 0.000000 0.655356 0.000000 -0.755320 0.400000 0.400000 0.400000
 2101.113037 0.000000 3472.607910 0.000000 0.973877 0.000000 -0.227076 0.400000 0.400000 0.400000
 2114.189941 0.000000 3461.216309 0.000000 0.940501 0.000000 -0.339792 0.400000 0.400000 0.400000
 2093.804443 0.000000 3482.618164 0.000000 0.704944 0.000000 -0.709263 0.400000 0.400000 0.400000
diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt
index 2407060f..ea96000e 100644
--- a/gfx/map/map_object_data/player_stack_locators.txt
+++ b/gfx/map/map_object_data/player_stack_locators.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="unit_stack_player_owned"
 	render_pass=Map
 	clamp_to_water_level=yes
@@ -2821,7 +2821,7 @@ game_object_locator={
 		}
 		{
 			id=471
-			position={ 2155.000000 0.000000 2453.000000 }
+			position={ 2150.810059 0.000000 2461.649658 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2845,7 +2845,7 @@ game_object_locator={
 		}
 		{
 			id=475
-			position={ 2213.220215 0.000000 2260.859131 }
+			position={ 2197.984863 0.000000 2258.696289 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2881,13 +2881,13 @@ game_object_locator={
 		}
 		{
 			id=481
-			position={ 2273.000000 0.000000 2227.000000 }
+			position={ 2291.041748 0.000000 2217.625732 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=482
-			position={ 2346.000000 0.000000 2244.000000 }
+			position={ 2335.864746 0.000000 2247.871582 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2959,7 +2959,7 @@ game_object_locator={
 		}
 		{
 			id=494
-			position={ 2482.000000 0.000000 2504.000000 }
+			position={ 2478.328857 0.000000 2523.729248 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2971,19 +2971,19 @@ game_object_locator={
 		}
 		{
 			id=496
-			position={ 2574.777100 0.000000 2483.366211 }
+			position={ 2589.095215 0.000000 2480.401367 }
 			rotation={ -0.000000 0.621573 -0.000000 0.783356 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=497
-			position={ 2519.000000 0.000000 2528.000000 }
+			position={ 2499.441650 0.000000 2521.954102 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=498
-			position={ 2522.000000 0.000000 2605.000000 }
+			position={ 2520.053467 0.000000 2594.975586 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3025,7 +3025,7 @@ game_object_locator={
 		}
 		{
 			id=505
-			position={ 2115.000000 0.000000 2713.000000 }
+			position={ 2106.833740 0.000000 2715.561279 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -14335,7 +14335,7 @@ game_object_locator={
 		}
 		{
 			id=2519
-			position={ 1720.000000 0.000000 2772.000000 }
+			position={ 1727.514648 0.000000 2778.228027 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -17623,7 +17623,7 @@ game_object_locator={
 		}
 		{
 			id=3095
-			position={ 1760.327881 0.000000 2791.621094 }
+			position={ 1771.760620 0.000000 2799.151123 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19987,7 +19987,7 @@ game_object_locator={
 		}
 		{
 			id=3528
-			position={ 1915.000000 0.000000 2779.000000 }
+			position={ 1900.680664 0.000000 2773.012939 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19999,7 +19999,7 @@ game_object_locator={
 		}
 		{
 			id=3530
-			position={ 1969.000000 0.000000 2764.000000 }
+			position={ 1963.737183 0.000000 2757.810059 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20017,7 +20017,7 @@ game_object_locator={
 		}
 		{
 			id=3533
-			position={ 1897.000000 0.000000 2789.000000 }
+			position={ 1909.888550 0.000000 2797.344482 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20029,7 +20029,7 @@ game_object_locator={
 		}
 		{
 			id=3535
-			position={ 1859.496094 0.000000 2785.639404 }
+			position={ 1861.943115 0.000000 2774.380127 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20041,7 +20041,7 @@ game_object_locator={
 		}
 		{
 			id=3537
-			position={ 1845.000000 0.000000 2769.000000 }
+			position={ 1835.706543 0.000000 2760.798096 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20107,7 +20107,7 @@ game_object_locator={
 		}
 		{
 			id=3548
-			position={ 1874.672241 0.000000 2679.595947 }
+			position={ 1871.180664 0.000000 2664.594238 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20125,7 +20125,7 @@ game_object_locator={
 		}
 		{
 			id=3551
-			position={ 1879.869629 0.000000 2658.377686 }
+			position={ 1885.954834 0.000000 2642.652100 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20251,7 +20251,7 @@ game_object_locator={
 		}
 		{
 			id=3572
-			position={ 2016.191284 0.000000 2570.434082 }
+			position={ 2002.287231 0.000000 2578.547119 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20287,7 +20287,7 @@ game_object_locator={
 		}
 		{
 			id=3578
-			position={ 2065.252197 0.000000 2541.290527 }
+			position={ 2052.530518 0.000000 2540.738525 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20305,7 +20305,7 @@ game_object_locator={
 		}
 		{
 			id=3581
-			position={ 2054.000000 0.000000 2654.000000 }
+			position={ 2051.289795 0.000000 2645.702148 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20317,7 +20317,7 @@ game_object_locator={
 		}
 		{
 			id=3583
-			position={ 2035.214844 0.000000 2620.677246 }
+			position={ 2025.527710 0.000000 2626.667969 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20449,7 +20449,7 @@ game_object_locator={
 		}
 		{
 			id=3605
-			position={ 2085.000000 0.000000 2710.000000 }
+			position={ 2082.536377 0.000000 2703.767822 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20515,7 +20515,7 @@ game_object_locator={
 		}
 		{
 			id=3617
-			position={ 2322.000000 0.000000 2486.000000 }
+			position={ 2316.051514 0.000000 2488.305908 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20575,7 +20575,7 @@ game_object_locator={
 		}
 		{
 			id=3627
-			position={ 2463.000000 0.000000 2483.000000 }
+			position={ 2455.156738 0.000000 2481.783936 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20641,7 +20641,7 @@ game_object_locator={
 		}
 		{
 			id=3638
-			position={ 2194.000000 0.000000 2435.000000 }
+			position={ 2162.989502 0.000000 2453.057129 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20737,7 +20737,7 @@ game_object_locator={
 		}
 		{
 			id=3654
-			position={ 2232.382324 0.000000 2566.277832 }
+			position={ 2224.743896 0.000000 2572.310059 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20785,7 +20785,7 @@ game_object_locator={
 		}
 		{
 			id=3662
-			position={ 2254.000000 0.000000 2613.000000 }
+			position={ 2246.573730 0.000000 2610.337891 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21109,7 +21109,7 @@ game_object_locator={
 		}
 		{
 			id=3716
-			position={ 2133.478516 0.000000 2388.964355 }
+			position={ 2133.251953 0.000000 2385.273926 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21361,13 +21361,13 @@ game_object_locator={
 		}
 		{
 			id=3758
-			position={ 2532.929199 0.000000 2540.088867 }
+			position={ 2519.477539 0.000000 2526.217285 }
 			rotation={ -0.000000 -0.130664 -0.000000 0.991427 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3759
-			position={ 2535.160889 0.000000 2506.142090 }
+			position={ 2535.232422 0.000000 2515.849609 }
 			rotation={ -0.000000 -0.110033 -0.000000 0.993928 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21379,31 +21379,31 @@ game_object_locator={
 		}
 		{
 			id=3761
-			position={ 2572.000000 0.000000 2491.000000 }
+			position={ 2556.957764 0.000000 2487.725586 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3762
-			position={ 2545.000000 0.000000 2478.000000 }
+			position={ 2534.189941 0.000000 2490.338623 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3763
-			position={ 2491.000000 0.000000 2485.000000 }
+			position={ 2478.092285 0.000000 2496.761230 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3764
-			position={ 2515.916504 0.000000 2474.772949 }
+			position={ 2506.080322 0.000000 2460.300293 }
 			rotation={ -0.000000 0.311646 -0.000000 0.950198 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3765
-			position={ 2481.000000 0.000000 2460.000000 }
+			position={ 2471.743408 0.000000 2467.276611 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21739,7 +21739,7 @@ game_object_locator={
 		}
 		{
 			id=3821
-			position={ 1862.000000 0.000000 2902.000000 }
+			position={ 1874.426636 0.000000 2901.911865 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -21991,7 +21991,7 @@ game_object_locator={
 		}
 		{
 			id=3863
-			position={ 2021.338501 0.000000 2824.461182 }
+			position={ 2018.543701 0.000000 2807.439941 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -22009,7 +22009,7 @@ game_object_locator={
 		}
 		{
 			id=3866
-			position={ 2055.000000 0.000000 2841.000000 }
+			position={ 2040.003296 0.000000 2841.599609 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -22117,7 +22117,7 @@ game_object_locator={
 		}
 		{
 			id=3884
-			position={ 2163.364014 0.000000 2739.404785 }
+			position={ 2145.029297 0.000000 2744.539307 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -22285,7 +22285,7 @@ game_object_locator={
 		}
 		{
 			id=3912
-			position={ 2184.000000 0.000000 2956.000000 }
+			position={ 2179.835938 0.000000 2963.623291 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28603,7 +28603,7 @@ game_object_locator={
 		}
 		{
 			id=4975
-			position={ 2199.413330 0.000000 2726.454834 }
+			position={ 2200.486084 0.000000 2723.454102 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30487,7 +30487,7 @@ game_object_locator={
 		}
 		{
 			id=5289
-			position={ 3066.000000 0.000000 2820.000000 }
+			position={ 3081.020752 0.000000 2820.135742 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30529,25 +30529,25 @@ game_object_locator={
 		}
 		{
 			id=5296
-			position={ 3018.227539 0.000000 2783.585938 }
+			position={ 2987.325195 0.000000 2778.980225 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5297
-			position={ 3079.393555 0.000000 2778.215576 }
+			position={ 3106.945068 0.000000 2796.609375 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5298
-			position={ 3076.000000 0.000000 2740.000000 }
+			position={ 3068.158447 0.000000 2795.844238 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5299
-			position={ 3162.000000 0.000000 2752.000000 }
+			position={ 3128.927490 0.000000 2755.039062 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30559,7 +30559,7 @@ game_object_locator={
 		}
 		{
 			id=5301
-			position={ 3115.000000 0.000000 2808.000000 }
+			position={ 3140.791016 0.000000 2810.910645 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -30769,7 +30769,7 @@ game_object_locator={
 		}
 		{
 			id=5336
-			position={ 3039.000000 0.000000 2841.000000 }
+			position={ 3026.234863 0.000000 2848.265381 }
 			rotation={ -0.000000 -0.216440 -0.000000 0.976296 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -50665,19 +50665,19 @@ game_object_locator={
 		}
 		{
 			id=8831
-			position={ 7351.000000 0.000000 2347.000000 }
+			position={ 2571.794678 0.000000 2485.385498 }
 			rotation={ 0.000000 0.253790 0.000000 0.967259 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8832
-			position={ 7342.000000 0.000000 2338.000000 }
+			position={ 2523.532227 0.000000 2472.600342 }
 			rotation={ 0.000000 0.662411 0.000000 -0.749141 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8833
-			position={ 7289.000000 0.000000 2347.000000 }
+			position={ 2489.968994 0.000000 2459.651123 }
 			rotation={ 0.000000 0.596077 0.000000 -0.802927 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -50941,37 +50941,37 @@ game_object_locator={
 		}
 		{
 			id=8877
-			position={ 6958.000000 0.000000 2799.000000 }
+			position={ 3015.423096 0.000000 2801.696533 }
 			rotation={ 0.000000 0.789497 0.000000 0.613755 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8878
-			position={ 6994.000000 0.000000 2754.000000 }
+			position={ 3041.872803 0.000000 2775.449463 }
 			rotation={ 0.000000 0.972352 0.000000 0.233522 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8879
-			position={ 7009.000000 0.000000 2742.000000 }
+			position={ 2987.524170 0.000000 2793.654785 }
 			rotation={ 0.000000 0.592188 0.000000 0.805799 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8880
-			position={ 7008.000000 0.000000 2727.000000 }
-			rotation={ 0.000000 0.639456 0.000000 -0.768828 }
+			position={ 3050.387939 0.000000 2805.788818 }
+			rotation={ -0.000000 -0.379098 -0.000000 -0.925357 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8881
-			position={ 6982.000000 0.000000 2714.000000 }
+			position={ 3044.468262 0.000000 2826.788330 }
 			rotation={ 0.000000 0.966049 0.000000 0.258358 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8882
-			position={ 6953.000000 0.000000 2690.000000 }
+			position={ 2983.089600 0.000000 2808.765625 }
 			rotation={ 0.000000 0.167390 0.000000 -0.985891 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -56293,7 +56293,7 @@ game_object_locator={
 		}
 		{
 			id=9781
-			position={ 6658.000000 0.000000 1932.000000 }
+			position={ 1848.616943 0.000000 2879.019287 }
 			rotation={ 0.000000 0.163058 0.000000 0.986617 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -72223,8 +72223,8 @@ game_object_locator={
 		}
 		{
 			id=12453
-			position={ 2958.247070 0.000000 2947.405518 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			position={ 2961.276367 0.000000 2968.232910 }
+			rotation={ -0.000000 0.341384 -0.000000 0.939924 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt
index 9566bbc8..01c5edb7 100644
--- a/gfx/map/map_object_data/siege_locators.txt
+++ b/gfx/map/map_object_data/siege_locators.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="siege"
 	render_pass=Map
 	clamp_to_water_level=no
@@ -2803,7 +2803,7 @@ game_object_locator={
 		}
 		{
 			id=471
-			position={ 2162.000000 0.000000 2450.000000 }
+			position={ 2158.310547 0.000000 2464.498047 }
 			rotation={ -0.000000 -0.584710 -0.000000 0.811242 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2827,7 +2827,7 @@ game_object_locator={
 		}
 		{
 			id=475
-			position={ 2198.000000 0.000000 2259.000000 }
+			position={ 2190.115723 0.000000 2256.401367 }
 			rotation={ 0.000000 0.606994 0.000000 0.794707 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2863,13 +2863,13 @@ game_object_locator={
 		}
 		{
 			id=481
-			position={ 2272.000000 0.000000 2220.000000 }
-			rotation={ 0.000000 0.745128 0.000000 -0.666921 }
+			position={ 2282.568115 0.000000 2217.616699 }
+			rotation={ -0.000000 -0.476156 -0.000000 -0.879360 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=482
-			position={ 2335.000000 0.000000 2230.000000 }
+			position={ 2331.802490 0.000000 2237.116211 }
 			rotation={ 0.000000 0.961249 0.000000 0.275682 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2941,7 +2941,7 @@ game_object_locator={
 		}
 		{
 			id=494
-			position={ 2475.000000 0.000000 2488.000000 }
+			position={ 2474.403564 0.000000 2521.337158 }
 			rotation={ 0.000000 0.992508 0.000000 0.122183 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2959,7 +2959,7 @@ game_object_locator={
 		}
 		{
 			id=497
-			position={ 2515.000000 0.000000 2513.000000 }
+			position={ 2500.210205 0.000000 2513.645264 }
 			rotation={ 0.000000 0.995133 0.000000 -0.098538 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -3007,7 +3007,7 @@ game_object_locator={
 		}
 		{
 			id=505
-			position={ 2115.000000 0.000000 2696.000000 }
+			position={ 2109.810059 0.000000 2708.770752 }
 			rotation={ 0.000000 0.978216 0.000000 -0.207591 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -12649,7 +12649,7 @@ game_object_locator={
 		}
 		{
 			id=2519
-			position={ 1723.000000 0.000000 2767.000000 }
+			position={ 1731.507324 0.000000 2780.224121 }
 			rotation={ -0.000000 -0.569595 -0.000000 0.821926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -15937,7 +15937,7 @@ game_object_locator={
 		}
 		{
 			id=3095
-			position={ 1752.000000 0.000000 2785.000000 }
+			position={ 1763.432739 0.000000 2792.530029 }
 			rotation={ 0.000000 0.707107 0.000000 0.707107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18103,8 +18103,8 @@ game_object_locator={
 		}
 		{
 			id=3528
-			position={ 1907.000000 0.000000 2762.000000 }
-			rotation={ 0.000000 0.987087 0.000000 0.160182 }
+			position={ 1899.508545 0.000000 2772.755615 }
+			rotation={ -0.000000 0.934622 -0.000000 -0.355641 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18127,13 +18127,13 @@ game_object_locator={
 		}
 		{
 			id=3532
-			position={ 1920.000000 0.000000 2797.000000 }
+			position={ 1926.238281 0.000000 2802.275146 }
 			rotation={ 0.000000 0.745128 0.000000 0.666921 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3533
-			position={ 1890.000000 0.000000 2776.000000 }
+			position={ 1900.429810 0.000000 2793.600342 }
 			rotation={ 0.000000 0.994029 0.000000 0.109117 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18145,7 +18145,7 @@ game_object_locator={
 		}
 		{
 			id=3535
-			position={ 1844.496094 0.000000 2782.639404 }
+			position={ 1846.943115 0.000000 2771.380127 }
 			rotation={ 0.000000 0.671005 0.000000 0.741453 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18157,8 +18157,8 @@ game_object_locator={
 		}
 		{
 			id=3537
-			position={ 1847.000000 0.000000 2763.000000 }
-			rotation={ -0.000000 -0.666921 -0.000000 0.745128 }
+			position={ 1837.266113 0.000000 2755.411133 }
+			rotation={ -0.000000 -0.999413 -0.000000 0.034263 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18217,13 +18217,13 @@ game_object_locator={
 		}
 		{
 			id=3547
-			position={ 1840.955933 0.000000 2664.366211 }
+			position={ 1841.222046 0.000000 2668.110596 }
 			rotation={ -0.000000 -0.340691 -0.000000 0.940175 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3548
-			position={ 1866.000000 0.000000 2669.000000 }
+			position={ 1868.378784 0.000000 2658.056885 }
 			rotation={ 0.000000 0.998470 0.000000 0.055300 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18241,7 +18241,7 @@ game_object_locator={
 		}
 		{
 			id=3551
-			position={ 1881.000000 0.000000 2652.000000 }
+			position={ 1893.534546 0.000000 2637.668457 }
 			rotation={ 0.000000 0.850651 0.000000 -0.525731 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18433,7 +18433,7 @@ game_object_locator={
 		}
 		{
 			id=3583
-			position={ 2043.000000 0.000000 2610.000000 }
+			position={ 2033.312866 0.000000 2615.990723 }
 			rotation={ 0.000000 0.864910 0.000000 -0.501927 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18493,7 +18493,7 @@ game_object_locator={
 		}
 		{
 			id=3593
-			position={ 2152.041748 0.000000 2579.174561 }
+			position={ 2149.466553 0.000000 2588.139404 }
 			rotation={ 0.000000 0.973249 0.000000 -0.229753 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18565,7 +18565,7 @@ game_object_locator={
 		}
 		{
 			id=3605
-			position={ 2075.000000 0.000000 2697.000000 }
+			position={ 2072.536377 0.000000 2690.767822 }
 			rotation={ 0.000000 0.981956 0.000000 0.189107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18583,13 +18583,13 @@ game_object_locator={
 		}
 		{
 			id=3608
-			position={ 1968.000000 0.000000 2783.000000 }
+			position={ 1976.161499 0.000000 2779.103271 }
 			rotation={ 0.000000 0.773342 0.000000 -0.633989 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3609
-			position={ 1996.000000 0.000000 2767.000000 }
+			position={ 1995.786255 0.000000 2763.220703 }
 			rotation={ 0.000000 0.898315 0.000000 -0.439351 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18631,7 +18631,7 @@ game_object_locator={
 		}
 		{
 			id=3617
-			position={ 2330.000000 0.000000 2479.000000 }
+			position={ 2327.579346 0.000000 2483.800049 }
 			rotation={ 0.000000 0.745128 0.000000 -0.666921 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18691,8 +18691,8 @@ game_object_locator={
 		}
 		{
 			id=3627
-			position={ 2464.000000 0.000000 2477.000000 }
-			rotation={ 0.000000 0.819067 0.000000 -0.573697 }
+			position={ 2460.827393 0.000000 2490.414307 }
+			rotation={ -0.000000 0.203320 -0.000000 -0.979112 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18757,13 +18757,13 @@ game_object_locator={
 		}
 		{
 			id=3638
-			position={ 2179.000000 0.000000 2433.000000 }
-			rotation={ 0.000000 0.633989 0.000000 0.773342 }
+			position={ 2176.608887 0.000000 2440.929688 }
+			rotation={ -0.000000 0.962816 -0.000000 -0.270159 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3639
-			position={ 2152.138916 0.000000 2427.562256 }
+			position={ 2149.052002 0.000000 2426.515869 }
 			rotation={ -0.000000 0.893744 -0.000000 -0.448576 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18841,8 +18841,8 @@ game_object_locator={
 		}
 		{
 			id=3652
-			position={ 2259.000000 0.000000 2506.000000 }
-			rotation={ 0.000000 0.707107 0.000000 0.707107 }
+			position={ 2266.089111 0.000000 2521.515137 }
+			rotation={ -0.000000 0.208241 -0.000000 0.978078 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -18853,7 +18853,7 @@ game_object_locator={
 		}
 		{
 			id=3654
-			position={ 2230.000000 0.000000 2553.000000 }
+			position={ 2226.174561 0.000000 2566.492920 }
 			rotation={ 0.000000 0.987087 0.000000 -0.160182 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18901,7 +18901,7 @@ game_object_locator={
 		}
 		{
 			id=3662
-			position={ 2240.000000 0.000000 2611.000000 }
+			position={ 2237.028564 0.000000 2618.560791 }
 			rotation={ 0.000000 0.596931 0.000000 0.802293 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -18949,8 +18949,8 @@ game_object_locator={
 		}
 		{
 			id=3670
-			position={ 2223.000000 0.000000 2631.000000 }
-			rotation={ 0.000000 0.995133 0.000000 -0.098538 }
+			position={ 2246.715088 0.000000 2647.116943 }
+			rotation={ -0.000000 0.787981 -0.000000 -0.615699 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -19099,7 +19099,7 @@ game_object_locator={
 		}
 		{
 			id=3695
-			position={ 2536.000000 0.000000 2680.000000 }
+			position={ 2537.826660 0.000000 2690.338867 }
 			rotation={ 0.000000 0.957092 0.000000 -0.289784 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19477,13 +19477,13 @@ game_object_locator={
 		}
 		{
 			id=3758
-			position={ 2529.711670 0.000000 2527.837891 }
+			position={ 2516.759766 0.000000 2521.975830 }
 			rotation={ -0.000000 0.925612 -0.000000 0.378473 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3759
-			position={ 2539.432861 0.000000 2490.813965 }
+			position={ 2537.538330 0.000000 2515.240723 }
 			rotation={ -0.000000 0.978732 -0.000000 -0.205141 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19495,31 +19495,31 @@ game_object_locator={
 		}
 		{
 			id=3761
-			position={ 2566.000000 0.000000 2474.000000 }
+			position={ 2554.566895 0.000000 2480.674805 }
 			rotation={ 0.000000 0.995133 0.000000 -0.098538 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3762
-			position={ 2533.000000 0.000000 2474.000000 }
+			position={ 2529.794434 0.000000 2498.169678 }
 			rotation={ 0.000000 0.569595 0.000000 0.821926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3763
-			position={ 2481.000000 0.000000 2473.000000 }
+			position={ 2486.431152 0.000000 2501.789795 }
 			rotation={ 0.000000 0.838492 0.000000 0.544914 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3764
-			position={ 2516.000000 0.000000 2459.000000 }
+			position={ 2503.774658 0.000000 2451.141357 }
 			rotation={ 0.000000 0.981956 0.000000 0.189107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3765
-			position={ 2481.000000 0.000000 2450.000000 }
+			position={ 2475.223145 0.000000 2459.540771 }
 			rotation={ 0.000000 0.910633 0.000000 -0.413216 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19561,7 +19561,7 @@ game_object_locator={
 		}
 		{
 			id=3772
-			position={ 2344.179688 0.000000 2461.098633 }
+			position={ 2344.985352 0.000000 2464.705078 }
 			rotation={ -0.000000 0.636561 -0.000000 -0.771226 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19681,7 +19681,7 @@ game_object_locator={
 		}
 		{
 			id=3792
-			position={ 2279.000000 0.000000 2298.000000 }
+			position={ 2278.713135 0.000000 2301.688721 }
 			rotation={ -0.000000 -0.569595 -0.000000 0.821926 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -19723,8 +19723,8 @@ game_object_locator={
 		}
 		{
 			id=3799
-			position={ 2313.018066 0.000000 2194.258789 }
-			rotation={ -0.000000 -0.441523 -0.000000 0.897250 }
+			position={ 2307.487549 0.000000 2199.281738 }
+			rotation={ -0.000000 0.480292 -0.000000 0.877109 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -19855,7 +19855,7 @@ game_object_locator={
 		}
 		{
 			id=3821
-			position={ 1867.000000 0.000000 2899.000000 }
+			position={ 1879.426636 0.000000 2898.911865 }
 			rotation={ 0.000000 0.707107 0.000000 -0.707107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20017,7 +20017,7 @@ game_object_locator={
 		}
 		{
 			id=3848
-			position={ 1985.585693 0.000000 2968.534668 }
+			position={ 1994.522583 0.000000 2968.114502 }
 			rotation={ 0.000000 0.707107 0.000000 0.707107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20107,7 +20107,7 @@ game_object_locator={
 		}
 		{
 			id=3863
-			position={ 2022.000000 0.000000 2817.000000 }
+			position={ 2023.764648 0.000000 2803.460205 }
 			rotation={ 0.000000 0.828067 0.000000 -0.560629 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20125,7 +20125,7 @@ game_object_locator={
 		}
 		{
 			id=3866
-			position={ 2055.000000 0.000000 2833.000000 }
+			position={ 2042.888550 0.000000 2836.223877 }
 			rotation={ 0.000000 0.811242 0.000000 -0.584710 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20233,7 +20233,7 @@ game_object_locator={
 		}
 		{
 			id=3884
-			position={ 2146.637939 0.000000 2736.239502 }
+			position={ 2140.920410 0.000000 2742.122070 }
 			rotation={ 0.000000 0.707107 0.000000 0.707107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20347,7 +20347,7 @@ game_object_locator={
 		}
 		{
 			id=3903
-			position={ 2125.000000 0.000000 2859.000000 }
+			position={ 2135.790527 0.000000 2854.579102 }
 			rotation={ 0.000000 0.584710 0.000000 0.811242 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20401,7 +20401,7 @@ game_object_locator={
 		}
 		{
 			id=3912
-			position={ 2177.000000 0.000000 2940.000000 }
+			position={ 2175.202148 0.000000 2959.736816 }
 			rotation={ 0.000000 0.987087 0.000000 0.160182 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -20761,13 +20761,13 @@ game_object_locator={
 		}
 		{
 			id=3977
-			position={ 1863.000000 0.000000 2875.000000 }
+			position={ 1869.044434 0.000000 2884.057861 }
 			rotation={ 0.000000 0.889168 0.000000 -0.457582 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=3978
-			position={ 2098.000000 0.000000 3015.000000 }
+			position={ 2103.186523 0.000000 3022.091797 }
 			rotation={ 0.000000 0.937885 0.000000 0.346946 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -26719,7 +26719,7 @@ game_object_locator={
 		}
 		{
 			id=4975
-			position={ 2193.000000 0.000000 2719.000000 }
+			position={ 2195.857910 0.000000 2714.386475 }
 			rotation={ 0.000000 0.994029 0.000000 -0.109117 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28603,7 +28603,7 @@ game_object_locator={
 		}
 		{
 			id=5289
-			position={ 3055.000000 0.000000 2809.000000 }
+			position={ 3077.937500 0.000000 2815.360596 }
 			rotation={ 0.000000 0.995959 0.000000 0.089806 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28645,25 +28645,25 @@ game_object_locator={
 		}
 		{
 			id=5296
-			position={ 3020.227539 0.000000 2766.585938 }
+			position={ 2989.208496 0.000000 2767.744629 }
 			rotation={ 0.000000 0.968028 0.000000 -0.250841 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5297
-			position={ 3083.393555 0.000000 2768.215576 }
+			position={ 3110.945068 0.000000 2786.609375 }
 			rotation={ 0.000000 0.838492 0.000000 -0.544914 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5298
-			position={ 3078.000000 0.000000 2727.000000 }
+			position={ 3069.884277 0.000000 2783.817871 }
 			rotation={ 0.000000 0.881675 0.000000 -0.471858 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=5299
-			position={ 3164.000000 0.000000 2736.000000 }
+			position={ 3135.198730 0.000000 2743.153809 }
 			rotation={ 0.000000 0.973249 0.000000 -0.229753 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28675,7 +28675,7 @@ game_object_locator={
 		}
 		{
 			id=5301
-			position={ 3113.000000 0.000000 2793.000000 }
+			position={ 3144.165283 0.000000 2791.034424 }
 			rotation={ 0.000000 0.984833 0.000000 -0.173503 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -28885,7 +28885,7 @@ game_object_locator={
 		}
 		{
 			id=5336
-			position={ 3026.000000 0.000000 2837.000000 }
+			position={ 3013.234863 0.000000 2844.265381 }
 			rotation={ 0.000000 0.633989 0.000000 0.773342 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47689,19 +47689,19 @@ game_object_locator={
 		}
 		{
 			id=8831
-			position={ 7364.000000 0.000000 2349.000000 }
-			rotation={ 0.000000 -0.838492 0.000000 0.544914 }
+			position={ 2572.465088 0.000000 2478.863281 }
+			rotation={ -0.000000 -0.998469 -0.000000 0.055323 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8832
-			position={ 7341.000000 0.000000 2328.000000 }
+			position={ 2539.449707 0.000000 2470.921631 }
 			rotation={ 0.000000 -0.741453 0.000000 0.671005 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8833
-			position={ 7277.000000 0.000000 2336.000000 }
+			position={ 2490.221436 0.000000 2474.660156 }
 			rotation={ 0.000000 -0.098538 0.000000 0.995133 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -47965,37 +47965,37 @@ game_object_locator={
 		}
 		{
 			id=8877
-			position={ 6973.000000 0.000000 2787.000000 }
+			position={ 3021.387695 0.000000 2786.369629 }
 			rotation={ 0.000000 -0.773342 0.000000 0.633989 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8878
-			position={ 6987.000000 0.000000 2755.000000 }
+			position={ 3041.185303 0.000000 2785.256836 }
 			rotation={ 0.000000 0.894427 0.000000 0.447214 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8879
-			position={ 6994.000000 0.000000 2739.000000 }
+			position={ 2994.029297 0.000000 2796.086426 }
 			rotation={ 0.000000 -0.633989 0.000000 0.773342 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8880
-			position={ 7003.000000 0.000000 2712.000000 }
-			rotation={ 0.000000 0.948683 0.000000 0.316228 }
+			position={ 3053.102051 0.000000 2811.317627 }
+			rotation={ -0.000000 0.387725 -0.000000 -0.921775 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8881
-			position={ 6979.000000 0.000000 2706.000000 }
+			position={ 3051.715820 0.000000 2829.849609 }
 			rotation={ 0.000000 -0.207591 0.000000 0.978216 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=8882
-			position={ 6947.000000 0.000000 2688.000000 }
+			position={ 2991.237549 0.000000 2809.258057 }
 			rotation={ 0.000000 -0.707107 0.000000 0.707107 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -53305,8 +53305,8 @@ game_object_locator={
 		}
 		{
 			id=9781
-			position={ 6661.000000 0.000000 1927.000000 }
-			rotation={ 0.000000 0.998759 0.000000 0.049814 }
+			position={ 1850.866577 0.000000 2875.763428 }
+			rotation={ -0.000000 0.944939 -0.000000 -0.327248 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -68210,19 +68210,19 @@ game_object_locator={
 		{
 			id=12323
 			position={ 2348.833252 0.000000 2224.209961 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 0.987337 -0.000000 -0.158639 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12324
 			position={ 2330.107910 0.000000 2232.504150 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 0.426940 -0.000000 0.904280 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12325
 			position={ 2164.810547 0.000000 2390.536865 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 -0.737486 -0.000000 0.675363 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -68245,7 +68245,7 @@ game_object_locator={
 		}
 		{
 			id=12329
-			position={ 2309.675781 0.000000 2193.453613 }
+			position={ 2304.681641 0.000000 2193.812744 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -68672,7 +68672,7 @@ game_object_locator={
 		{
 			id=12400
 			position={ 2720.682861 0.000000 2871.152832 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 0.767710 -0.000000 -0.640797 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -68984,13 +68984,13 @@ game_object_locator={
 		{
 			id=12452
 			position={ 2941.242432 0.000000 2962.590576 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 -0.782674 -0.000000 0.622432 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12453
 			position={ 2960.442627 0.000000 2960.791504 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 0.999669 -0.000000 0.025744 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -69343,8 +69343,8 @@ game_object_locator={
 		}
 		{
 			id=12534
-			position={ 3009.472168 0.000000 3014.375488 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			position={ 3005.730713 0.000000 3021.673340 }
+			rotation={ -0.000000 -0.941085 -0.000000 0.338170 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -69356,7 +69356,7 @@ game_object_locator={
 		{
 			id=12536
 			position={ 2877.493164 0.000000 2979.465820 }
-			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
+			rotation={ -0.000000 0.744794 -0.000000 -0.667295 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -69367,13 +69367,13 @@ game_object_locator={
 		}
 		{
 			id=12538
-			position={ 2738.062744 0.000000 2956.931885 }
+			position={ 2737.970215 0.000000 2970.177246 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=12539
-			position={ 2688.989746 0.000000 2925.976807 }
+			position={ 2695.160645 0.000000 2937.487061 }
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/map_object_data/special_building_locators.txt b/gfx/map/map_object_data/special_building_locators.txt
index e3983d11..bc171eb9 100644
--- a/gfx/map/map_object_data/special_building_locators.txt
+++ b/gfx/map/map_object_data/special_building_locators.txt
@@ -1,4 +1,4 @@
-game_object_locator={
+game_object_locator={
 	name="special_building"
 	render_pass=Map
 	clamp_to_water_level=yes
@@ -2803,7 +2803,7 @@ game_object_locator={
 		}
 		{
 			id=471
-			position={ 2149.954102 0.684570 2468.444824 }
+			position={ 2157.937012 0.684570 2465.160156 }
 			rotation={ -0.000000 0.455621 -0.000000 0.890174 }
 			scale={ 0.648755 0.648755 0.648755 }
 		}
@@ -2869,7 +2869,7 @@ game_object_locator={
 		}
 		{
 			id=482
-			position={ 2339.698242 0.000000 2249.180664 }
+			position={ 2332.194824 0.000000 2248.642090 }
 			rotation={ -0.000000 0.414633 -0.000000 0.909989 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -2953,7 +2953,7 @@ game_object_locator={
 		}
 		{
 			id=496
-			position={ 2586.409424 0.000000 2482.878418 }
+			position={ 2588.021729 0.000000 2485.158203 }
 			rotation={ -0.000000 -0.760673 -0.000000 0.649135 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
diff --git a/gfx/map/terrain/masks/beach_02_mask.png b/gfx/map/terrain/masks/beach_02_mask.png
index b48e0104..98b6dd16 100644
--- a/gfx/map/terrain/masks/beach_02_mask.png
+++ b/gfx/map/terrain/masks/beach_02_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b87919e017e14a711ba2910d6433e91f59cfd24110186041c5d317b5cc859154
-size 4110602
+oid sha256:a6b4ea87cd8da831c5bb97bdeb8754006f6a22b0a40633cc4f0fbe2e4e3a084d
+size 4110591
diff --git a/gfx/map/terrain/masks/hills_01_mask.png b/gfx/map/terrain/masks/hills_01_mask.png
index b41b1ba4..8ee88634 100644
--- a/gfx/map/terrain/masks/hills_01_mask.png
+++ b/gfx/map/terrain/masks/hills_01_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8d61764f073488bfad16b1e0ea966ce111947daf7c660a1d12596d3a04b777d
-size 2763036
+oid sha256:c4ee21bd06df7efbc2853dbd9cd69318f569acdca1bd163d98439ea6da917c47
+size 2763043
diff --git a/gfx/map/terrain/masks/plains_01_mask.png b/gfx/map/terrain/masks/plains_01_mask.png
index 8054af41..5e32086b 100644
--- a/gfx/map/terrain/masks/plains_01_mask.png
+++ b/gfx/map/terrain/masks/plains_01_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf6c79d9980e6e8a68d30b92344984ca54ca198ef8bf68f81d6d9368af65e657
-size 3336616
+oid sha256:552fcb216accc4c26654af6937fde839d1b5e438e807728a232da6af5341c72c
+size 3336618
diff --git a/gfx/map/terrain/masks/plains_01_rough_mask.png b/gfx/map/terrain/masks/plains_01_rough_mask.png
index 0d4d6f66..b6ecab2a 100644
--- a/gfx/map/terrain/masks/plains_01_rough_mask.png
+++ b/gfx/map/terrain/masks/plains_01_rough_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:482825bf9f9e06f3fb482bbcc44d2f6e898565435f178c919c1d9f7cfdfd65b5
-size 3108906
+oid sha256:8cf8ce4d4aa25e32f32278268a134a01cb94569530f9c8e487747b82875de37a
+size 3108921
diff --git a/gfx/map/terrain/masks_gen/gen_central_base_mask.png b/gfx/map/terrain/masks_gen/gen_central_base_mask.png
index a7de7b4f..64899695 100644
--- a/gfx/map/terrain/masks_gen/gen_central_base_mask.png
+++ b/gfx/map/terrain/masks_gen/gen_central_base_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ba88703ec211774177fddeb9dd1d874f35b6253be8152440ade4ddcf8f948a6
-size 4207928
+oid sha256:c8f5b567111e1be3b965a43c7ea3562a80ebbd143da849740d6d4ad5baede56a
+size 4207922
diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png
index 816e2dbc..70af6f54 100644
--- a/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png
+++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38f4dead33321a10d435f54e5cfbd72d21a4402d59b913609ba76d115f042542
-size 6214415
+oid sha256:d50257969f32d38f9db96ef464d23ef06dff40a891e13397faffdf58f2dbe851
+size 6214421
diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png
index 0bdb7788..739033b6 100644
--- a/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png
+++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00f8da2985960fe1bb6b2f11bb106652c609d440eaf4c2a900608a439b693d9f
-size 6032320
+oid sha256:4dfe8ac89bad7af9b59d4d1daee3a5e734b7654b0146308c5c62eb4aaa305ef7
+size 6032316