diff --git a/project/assets/tilemap/tilemaps.aseprite b/project/assets/tilemap/tilemaps.aseprite index 98f6735..654c4bc 100644 Binary files a/project/assets/tilemap/tilemaps.aseprite and b/project/assets/tilemap/tilemaps.aseprite differ diff --git a/project/assets/tilemap/tilemaps/sprite.json b/project/assets/tilemap/tilemaps/sprite.json index 45a1804..2720f91 100644 --- a/project/assets/tilemap/tilemaps/sprite.json +++ b/project/assets/tilemap/tilemaps/sprite.json @@ -1 +1 @@ -{"filename":"tilemaps.aseprite","width":320,"layers":[{"cels":[{"frame":0,"image":"tilemaps/tilemap_ground.png"}],"name":"ground"},{"cels":[{"frame":0,"image":"tilemaps/tilemap_objects.png"}],"name":"objects"},{"cels":[{"frame":0,"image":"tilemaps/tilemap_temperature.png"}],"name":"temperature"},{"cels":[{"frame":0,"image":"tilemaps/tilemap_player.png"}],"name":"player"}],"height":320,"frames":[{"duration":0.1}]} \ No newline at end of file +{"height":320,"filename":"tilemaps.aseprite","frames":[{"duration":0.1}],"width":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}]}]} \ No newline at end of file diff --git a/project/assets/tilemap/tilemaps/tilemap_ground.png b/project/assets/tilemap/tilemaps/tilemap_ground.png index 849aad4..00fbdb8 100644 Binary files a/project/assets/tilemap/tilemaps/tilemap_ground.png and b/project/assets/tilemap/tilemaps/tilemap_ground.png differ diff --git a/project/assets/tilemap/tilemaps/tilemap_objects.png b/project/assets/tilemap/tilemaps/tilemap_objects.png index a5e4643..3454c49 100644 Binary files a/project/assets/tilemap/tilemaps/tilemap_objects.png and b/project/assets/tilemap/tilemaps/tilemap_objects.png differ diff --git a/project/scripts/tilemap/TileMapTileTypes.gd b/project/scripts/tilemap/TileMapTileTypes.gd index 1f3b430..6a19ac8 100644 --- a/project/scripts/tilemap/TileMapTileTypes.gd +++ b/project/scripts/tilemap/TileMapTileTypes.gd @@ -9,12 +9,18 @@ const GROUND_GRASS: Vector2i = Vector2i(0, 0) const GROUND_WATER_SHALLOW: Vector2i = Vector2i(1, 0) const GROUND_WATER_DEEP: Vector2i = Vector2i(2, 0) const GROUND_SAND: Vector2i = Vector2i(3, 0) +const GROUND_DOCK: 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) +const OBJECT_NI_FIREPIT_ON: Vector2i = Vector2i(7, 1) +const OBJECT_NI_TREE_CUT: Vector2i = Vector2i(2, 0) +const OBJECT_NI_BOAT_NO_ENIGNE: Vector2i= Vector2i(4, 4) + + # I = interactive const OBJECT_I_BOAT_ENGINE: Vector2i = Vector2i(0, 1) const OBJECT_I_FUEL: Vector2i = Vector2i(1, 1) @@ -22,12 +28,18 @@ const OBJECT_I_ANCHOR: Vector2i = Vector2i(2, 1) const OBJECT_I_EMPTY_BUSH: Vector2i = Vector2i(3, 0) const OBJECT_I_FILLED_BUSH: Vector2i = Vector2i(3, 1) const OBJECT_I_BERRY: Vector2i = Vector2i(0, 5) +const OBJECT_I_STICK: Vector2i = Vector2i(1, 5) const OBJECT_I_TREE_1: Vector2i = Vector2i(4, 0) const OBJECT_I_CHEST: Vector2i = Vector2i(0, 2) const OBJECT_I_GEARS: Vector2i = Vector2i(1, 2) const OBJECT_I_MEDIKIT: Vector2i = Vector2i(2, 2) const OBJECT_I_PADDLE: Vector2i = Vector2i(3, 2) const OBJECT_I_GAS_STOVE: Vector2i = Vector2i(4, 2) +const OBJECT_I_TENT: Vector2i = Vector2i(6, 2) + +const OBJECT_I_BOAT_WITH_ENGINE: Vector2i = Vector2i(6,4) +const OBJECT_I_FIREPIT_OFF: Vector2i = Vector2i(6, 1) + # collections const OBJECT_COLLECTION_BERRY_SOURCE: Array[Vector2i] = [OBJECT_I_FILLED_BUSH, OBJECT_I_BERRY] #