diff --git a/project/assets/tilemap/tilemaps.aseprite b/project/assets/tilemap/tilemaps.aseprite index c24a16e..1eef37a 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 f5c20ea..958987a 100644 --- a/project/assets/tilemap/tilemaps/sprite.json +++ b/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}]}]} \ No newline at end of file +{"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} \ 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 f949135..48394e9 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 65cd72d..6c00c63 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/assets/tilemap/tilemaps/tilemap_player.png b/project/assets/tilemap/tilemaps/tilemap_player.png index 7581cf0..af7889c 100644 Binary files a/project/assets/tilemap/tilemaps/tilemap_player.png and b/project/assets/tilemap/tilemaps/tilemap_player.png differ diff --git a/project/scripts/tilemap/TileMapTileTypes.gd b/project/scripts/tilemap/TileMapTileTypes.gd index 07e9a48..f9c4c19 100644 --- a/project/scripts/tilemap/TileMapTileTypes.gd +++ b/project/scripts/tilemap/TileMapTileTypes.gd @@ -11,11 +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_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)