From f1a0a1dfd5dbc92a9b32270076350ada34e5755e Mon Sep 17 00:00:00 2001
From: Henry Sanger <henry@sanger.io>
Date: Wed, 3 Apr 2024 22:18:40 -0400
Subject: [PATCH] fix: white tugboat

---
 common/src/definitions/buildings.ts | 38 ++++++++++++++---------------
 server/src/data/maps.ts             |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts
index a3d61dda7..b2d355291 100644
--- a/common/src/definitions/buildings.ts
+++ b/common/src/definitions/buildings.ts
@@ -2295,25 +2295,25 @@ export const Buildings = ObjectDefinitions.create<BuildingDefinition>()(
                 { type: "metal", hitbox: RectangleHitbox.fromRect(10, 8.7, Vec.create(89.9, -46)) }
             ],
             obstacles: [
-                { idString: "tugboat", position: Vec.create(0, 0), rotation: 0 },
-                { idString: "tire", position: Vec.create(21.28, 5.18), rotation: 0 },
-                { idString: "tire", position: Vec.create(21.4, 14.57), rotation: 0 },
-                { idString: "tire", position: Vec.create(21.4, 24.17), rotation: 0 },
-                { idString: "tire", position: Vec.create(-21.55, 24.17), rotation: 0 },
-                { idString: "tire", position: Vec.create(-21.5, 14.57), rotation: 0 },
-                { idString: "tire", position: Vec.create(-21.45, 5.12), rotation: 0 },
-                { idString: "regular_crate", position: Vec.create(-11.48, -37.36) },
-                { idString: "regular_crate", position: Vec.create(11.49, -11.45) },
-                { idString: "grenade_crate", position: Vec.create(12.3, -38.43) },
-                { idString: "barrel", position: Vec.create(12.74, -26.23) },
-                { idString: "tugboat_control_panel", position: Vec.create(0, 24.1), rotation: 0 },
-                { idString: "office_chair", position: Vec.create(0, 16.65), rotation: 0 },
-                { idString: "door", position: Vec.create(0.45, -4.8), rotation: 0 },
-                { idString: "large_drawer", position: Vec.create(9.29, 2.98), rotation: 3 },
-                { idString: "life_preserver", position: Vec.create(11.23, 14.67), rotation: 0 },
-                { idString: "lux_crate", position: Vec.create(-9.62, 4.29), rotation: 1 },
-                { idString: "window2", position: Vec.create(-6.09, 30.75), rotation: 1 },
-                { idString: "window2", position: Vec.create(5.63, 30.75), rotation: 1 }
+                { idString: "tugboat", position: Vec.create(90, 0), rotation: 0 },
+                { idString: "tire", position: Vec.create(111.28, 5.18), rotation: 0 },
+                { idString: "tire", position: Vec.create(111.4, 14.57), rotation: 0 },
+                { idString: "tire", position: Vec.create(111.4, 24.17), rotation: 0 },
+                { idString: "tire", position: Vec.create(71.55, 24.17), rotation: 0 },
+                { idString: "tire", position: Vec.create(71.5, 14.57), rotation: 0 },
+                { idString: "tire", position: Vec.create(71.45, 5.12), rotation: 0 },
+                { idString: "regular_crate", position: Vec.create(81.48, -37.36) },
+                { idString: "regular_crate", position: Vec.create(101.49, -11.45) },
+                { idString: "grenade_crate", position: Vec.create(102.3, -38.43) },
+                { idString: "barrel", position: Vec.create(102.74, -26.23) },
+                { idString: "tugboat_control_panel", position: Vec.create(90, 24.1), rotation: 0 },
+                { idString: "office_chair", position: Vec.create(90, 16.65), rotation: 0 },
+                { idString: "door", position: Vec.create(90.45, -4.8), rotation: 0 },
+                { idString: "large_drawer", position: Vec.create(99.29, 2.98), rotation: 3 },
+                { idString: "life_preserver", position: Vec.create(101.23, 14.67), rotation: 0 },
+                { idString: "gun_case", position: Vec.create(80.38, 4.29), rotation: 1 },
+                { idString: "window2", position: Vec.create(83.91, 30.75), rotation: 1 },
+                { idString: "window2", position: Vec.create(95.63, 30.75), rotation: 1 }
             ]
         },
         {
diff --git a/server/src/data/maps.ts b/server/src/data/maps.ts
index 4c21620c9..11f9475a5 100644
--- a/server/src/data/maps.ts
+++ b/server/src/data/maps.ts
@@ -346,7 +346,7 @@ const maps = {
         oceanSize: 64,
         genCallback(map) {
             // map.game.grid.addObject(new Decal(map.game, "sea_traffic_control_decal", Vec.create(this.width / 2, this.height / 2), 0));
-            map.generateBuilding("green_house", Vec.create(this.width / 2, this.height / 2), 0);
+            map.generateBuilding("tugboat_white", Vec.create(this.width / 2, this.height / 2), 0);
         }
     },
     singleObstacle: {