diff --git a/assets/config.json b/assets/config.json index df06df3..c1001ca 100644 --- a/assets/config.json +++ b/assets/config.json @@ -232,7 +232,12 @@ "frame_height": 256 }, "door_plain": - {"path": "assets/sprites/door_plain.png", + {"path": "assets/doors/door_plain.png", + "frame_width": 256, + "frame_height": 256 + }, + "door_moss_wall": + {"path": "assets/doors/door_moss_wall.png", "frame_width": 256, "frame_height": 256 }, diff --git a/assets/doors/door_moss_wall.png b/assets/doors/door_moss_wall.png new file mode 100644 index 0000000..c480888 Binary files /dev/null and b/assets/doors/door_moss_wall.png differ diff --git a/assets/doors/door_plain.png b/assets/doors/door_plain.png new file mode 100644 index 0000000..ab6c3d5 Binary files /dev/null and b/assets/doors/door_plain.png differ diff --git a/assets/room_themes.json b/assets/room_themes.json index b1822d4..2f0bbb4 100644 --- a/assets/room_themes.json +++ b/assets/room_themes.json @@ -8,10 +8,5 @@ "name": "Plain", "floor": "floor_tile", "walls": "wall_plain" - }, - { - "name": "Wood Walls", - "floor": "floor_tile", - "walls": "wood_wall" } ] diff --git a/assets/textures/glowing_moss_wall.png b/assets/textures/glowing_moss_wall.png index 1838adb..dc9e181 100644 Binary files a/assets/textures/glowing_moss_wall.png and b/assets/textures/glowing_moss_wall.png differ diff --git a/assets/tiles.json b/assets/tiles.json index edd2100..b6c7660 100644 --- a/assets/tiles.json +++ b/assets/tiles.json @@ -50,26 +50,26 @@ "background": "tiles/bg:gray_stone_floor_light", "id": 6 }, - "wood_wall": { - "texture": "assets/textures/wood_wall.png", - "display": 10747, - "light": 0, - "foreground": "tiles/fg:wood_wall", - "background": "tiles/bg:wood_wall", - "id": 7 - }, "zBUGceiling_blue_light": { "texture": "assets/textures/ceiling_blue_light.png", "display": 8285, "light": 0, "foreground": "color:BAD", "background": "color:BAD", - "id": 8 + "id": 7 }, "door_plain": { "texture": "assets/doors/door_plain.png", "display": 1087, - "light": 0, + "light": 10, + "foreground": "tiles/fg:wall_plain", + "background": "tiles/bg:wall_plain", + "id": 8 + }, + "door_moss_wall": { + "texture": "assets/doors/door_moss_wall.png", + "display": 1089, + "light": 20, "foreground": "tiles/fg:wall_plain", "background": "tiles/bg:wall_plain", "id": 9 diff --git a/src/constants.hpp b/src/constants.hpp index e2f72f1..312ad83 100644 --- a/src/constants.hpp +++ b/src/constants.hpp @@ -74,7 +74,7 @@ constexpr int COMBAT_UI_HEIGHT = SCREEN_HEIGHT - RAY_VIEW_HEIGHT; constexpr int INITIAL_MAP_W = 21; constexpr int INITIAL_MAP_H = 21; -constexpr float DEFAULT_ROTATE=0.25f; +constexpr float DEFAULT_ROTATE=0.5f; // for the panels/renderer constexpr wchar_t BG_TILE = L'█'; diff --git a/src/game/worldbuilder.cpp b/src/game/worldbuilder.cpp index e8a5cdd..5745f28 100644 --- a/src/game/worldbuilder.cpp +++ b/src/game/worldbuilder.cpp @@ -174,7 +174,7 @@ void WorldBuilder::place_doors(DinkyECS::World& world, GameConfig& config) { auto entity_data = device_config["DOOR_PLAIN"]; auto& tiles = $map.tiles(); - size_t door_id = textures::get_id("door_plain"); + size_t door_id = textures::get_id("door_moss_wall"); for(auto [door_at, _] : $map.$doors) { $map.$walls[door_at.y][door_at.x] = WALL_VALUE; diff --git a/src/graphics/textures.cpp b/src/graphics/textures.cpp index dc229d3..4853fc6 100644 --- a/src/graphics/textures.cpp +++ b/src/graphics/textures.cpp @@ -67,6 +67,7 @@ namespace textures { for(auto &el : tiles.items()) { auto &config = el.value(); const string& texture_fname = config["texture"]; + // BUG: if the tiles.json ids aren't exactly in order this fails, but do I need this? size_t surface_i = config["id"]; dbc::check(!TMGR.name_to_id.contains(el.key()),