Merge branch 'refs/heads/main' into Interacable-Items

# Conflicts:
#	project/assets/tilemap/tilemaps/tilemap_objects.png
#	project/scripts/tilemap/TileMapTileTypes.gd

project/assets/tilemap/tilemaps/sprite.json

@@ -1 +1 @@
-{"filename":"tilemaps.aseprite","width":320,"frames":[{"duration":0.1}],"height":320,"layers":[{"name":"ground","cels":[{"image":"tilemaps\\tilemap_ground.png","frame":0}]},{"name":"objects","cels":[{"image":"tilemaps\\tilemap_objects.png","frame":0}]},{"name":"temperature","cels":[{"image":"tilemaps\\tilemap_temperature.png","frame":0}]},{"name":"player","cels":[{"image":"tilemaps\\tilemap_player.png","frame":0}]}]}
+{"frames":[{"duration":0.1}],"layers":[{"name":"ground","cels":[{"image":"tilemaps\\tilemap_ground.png","frame":0}]},{"name":"objects","cels":[{"image":"tilemaps\\tilemap_objects.png","frame":0}]},{"name":"temperature","cels":[{"image":"tilemaps\\tilemap_temperature.png","frame":0}]},{"name":"player","cels":[{"image":"tilemaps\\tilemap_player.png","frame":0}]}],"height":320,"filename":"tilemaps.aseprite","width":320}

project/scripts/tilemap/TileMapTileTypes.gd

@@ -2,9 +2,7 @@ class_name TileMapTileTypes
 
 # global values
 const EMPTY: Vector2i = Vector2i(-1, -1)
-
-#Items
-const ITEM_STICK: String = "Stick"
+#
 # ground, sid = 0
 const GROUND_GRASS: Vector2i         = Vector2i(0, 0)
 const GROUND_WATER_SHALLOW: Vector2i = Vector2i(1, 0)
@@ -13,19 +11,22 @@ const GROUND_SAND: Vector2i          = Vector2i(3, 0)
 #
 # objects, sid = 1
 # NI = not interactive
+
 const OBJECT_NI_RANDOM_1: Vector2i = Vector2i(0, 0) # testing only, to be removed
 const OBJECT_NI_RANDOM_2: Vector2i = Vector2i(1, 0) # testing only, to be removed
 const OBJECT_NI_ROCK_1: Vector2i = Vector2i(2, 0)
 # I = interactive
-const OBJECT_I_TREE_1: Vector2i = Vector2i(0, 1)
-const OBJECT_I_CHEST_1: Vector2i = Vector2i(0, 2)
-const OBJECT_I_BERRY_1: Vector2i = Vector2i(0, 3)
-const OBJECT_I_CAMPFIRE_1: Vector2i = Vector2i(0, 4)
-const OBJECT_I_BOATPART_1: Vector2i = Vector2i(0, 5)
-const OBJECT_I_BOATPART_2: Vector2i = Vector2i(0, 6)
-const OBJECT_I_BOATPART_3: Vector2i = Vector2i(0, 7)
-#const OBJECT_I_BOATPART_BUILDING_PLACE: Vector2i = Vector2i(0, 8)
-
+const OBJECT_BOAT_ENGINE :Vector2i = Vector2i(0,1)
+const OBJECT_FUEL : Vectro2i = Vector2i(1,1)
+const OBJECT_ANCHOR: Vector2i = Vector2(2,1)
+const OBJECT_EMPTY_BUSH: Vector2i = Vector2(3,0)
+const OBJECT_BERRY_BUSH: Vector2i = Vector2(3,1)
+const OBJECT_TREE: Vector2i = Vector2(3,0)
+const OBJECT_CHEST: Vector2i = Vector(0,2)
+const OBJECT_GEARS: Vector2i = Vector(1,2)
+const OBJECT_MEDIKIT: Vector2i = Vector(2,2)
+const OBJECT_PADDLE: Vector2i = Vector(3,2)
+const OBJECT_GAS_STOVE: Vector2i = Vector(4,2)
 # temperature, sid = 2
 const TEMPERATURE_NORMAL: Vector2i = Vector2i(-1, -1)
 const TEMPERATURE_COLD_1: Vector2i = Vector2i(0, 0)