diff --git a/assets/animation.json b/assets/animation.json index 9098a9f..9c4e368 100644 --- a/assets/animation.json +++ b/assets/animation.json @@ -98,7 +98,7 @@ "close": [] } }, - "female_hand": { + "hands_sword_attack": { "sheet": { "frames": 3, "frame_width": 900, diff --git a/assets/config.json b/assets/config.json index 00ecef8..9b0cf86 100644 --- a/assets/config.json +++ b/assets/config.json @@ -1,33 +1,10 @@ { "sounds": { - "Sword_Hit_1": "assets/sounds/Creature_Sounds-Sword_Hit_1.ogg", - "Evil_Eye_Sound_1": "assets/sounds/Creature_Sounds-Evil_Eye_Sound_1.ogg", - "Evil_Eye_Sound_2": "assets/sounds/Creature_Sounds-Evil_Eye_Sound_2.ogg", - "Giant_Voice_1": "assets/sounds/Creature_Sounds-Giant_Voice_1.ogg", - "Medium_Rat": "assets/sounds/Creature_Sounds-Medium_Rat.ogg", - "Ranger_1": "assets/sounds/Creature_Sounds-Ranger_1.ogg", - "Small_Rat": "assets/sounds/Creature_Sounds-Small_Rat.ogg", - "Spider_1": "assets/sounds/Creature_Sounds-Spider_1.ogg", - "Spider_2": "assets/sounds/Creature_Sounds-Spider_2.ogg", - "Sword_Hit_1": "assets/sounds/Creature_Sounds-Sword_Hit_1.ogg", - "Sword_Hit_2": "assets/sounds/Creature_Sounds-Sword_Hit_2.ogg", - "walk": "assets/sounds/Creature_Sounds-Walk.ogg", - "Creature_Death_1": "assets/sounds/Creature_Sounds-Creature_Death_1.ogg", - "Humanoid_Death_1": "assets/sounds/Creature_Sounds-Humanoid_Death_1.ogg", - "Marmot_Scream_1": "assets/sounds/Creature_Sounds-Marmot_Scream_1.ogg", "blank": "assets/sounds/blank.ogg", "pickup": "assets/sounds/pickup.ogg", - "ambient_1": "assets/sounds/ambient_1.ogg", "ui_click": "assets/sounds/ui_click.ogg", "ui_hover": "assets/sounds/ui_hover.ogg", - "punch_cartoony": "assets/sounds/punch_cartoony.ogg", - "electric_shock_01": "assets/sounds/electric_shock_01.ogg", - "fireball_01": "assets/sounds/fireball_01.ogg", - "hp_status_80": "assets/sounds/hp_status_80.ogg", - "hp_status_60": "assets/sounds/hp_status_60.ogg", - "hp_status_30": "assets/sounds/hp_status_30.ogg", - "hp_status_10": "assets/sounds/hp_status_10.ogg", - "hp_status_00": "assets/sounds/hp_status_00.ogg" + "walk": "assets/sounds/walk.ogg" }, "sprites": { "rat_with_sword": @@ -35,21 +12,6 @@ "frame_width": 256, "frame_height": 256 }, - "torch_crappy": - {"path": "assets/items/torch_crappy.png", - "frame_width": 256, - "frame_height": 256 - }, - "torch_horizontal_floor": - {"path": "assets/items/torch_horizontal_floor.png", - "frame_width": 256, - "frame_height": 256 - }, - "peasant_girl": - {"path": "assets/sprites/peasant_girl_2.png", - "frame_width": 256, - "frame_height": 256 - }, "healing_potion_small": {"path": "assets/items/healing_potion_small.png", "frame_width": 256, @@ -75,13 +37,8 @@ "frame_width": 256, "frame_height": 256 }, - "peasant_girl": - {"path": "assets/sprites/peasant_girl_2.png", - "frame_width": 256, - "frame_height": 256 - }, - "female_hand": - {"path": "assets/hands/female_hand.png", + "hands_sword_attack": + {"path": "assets/hands/hands_sword_attack.png", "frame_width": 900, "frame_height": 600 } @@ -109,9 +66,9 @@ "border_px": 1, "text_size": 20, "label_size": 20, - "font_file_name": "assets/text.otf" + "font_file_name": "assets/text.ttf" }, "player": { - "hands": "female_hand" + "hands": "hands_sword_attack" } } diff --git a/assets/doors/door_plain.png b/assets/doors/door_plain.png new file mode 100644 index 0000000..68474e0 Binary files /dev/null and b/assets/doors/door_plain.png differ diff --git a/assets/hands/hands_sword_attack.png b/assets/hands/hands_sword_attack.png new file mode 100644 index 0000000..1f08a45 Binary files /dev/null and b/assets/hands/hands_sword_attack.png differ diff --git a/assets/icons.json b/assets/icons.json index 904cd97..e4672f5 100644 --- a/assets/icons.json +++ b/assets/icons.json @@ -3,10 +3,5 @@ {"path": "assets/icons/healing_potion_small.png", "frame_width": 96, "frame_height": 96 - }, - "torch_horizontal_floor": - {"path": "assets/icons/torch_horizontal_floor.png", - "frame_width": 96, - "frame_height": 96 } } diff --git a/assets/icons/healing_potion_small.png b/assets/icons/healing_potion_small.png new file mode 100644 index 0000000..578cc0e Binary files /dev/null and b/assets/icons/healing_potion_small.png differ diff --git a/assets/items.json b/assets/items.json index 5c25db3..897fcae 100644 --- a/assets/items.json +++ b/assets/items.json @@ -1,19 +1,4 @@ { - "TORCH_BAD": { - "id": "TORCH_BAD", - "name": "Crappy Torch", - "description": "A torch that barely lights the way. You wonder if it'd be better to not see the person who murders you.", - "inventory_count": 1, - "components": [ - {"_type": "LightSource", "strength": 50, "radius": 2.5}, - {"_type": "Tile", "display": 3848, - "foreground": "items/fg:flame", - "background": "color:transparent" - }, - {"_type": "Sprite", "name": "torch_horizontal_floor", "width": 256, "height": 256, "scale": 1.0}, - {"_type": "Sound", "attack": "pickup", "death": "blank"} - ] - }, "POTION_HEALING_SMALL": { "id": "POTION_HEALING_SMALL", "name": "Small Healing Potion", diff --git a/assets/items/healing_postion_small.png b/assets/items/healing_postion_small.png new file mode 100644 index 0000000..5672f42 Binary files /dev/null and b/assets/items/healing_postion_small.png differ diff --git a/assets/items/healing_potion_small.png b/assets/items/healing_potion_small.png new file mode 100644 index 0000000..5672f42 Binary files /dev/null and b/assets/items/healing_potion_small.png differ diff --git a/assets/items/torch_horizontal_floor.png b/assets/items/torch_horizontal_floor.png new file mode 100644 index 0000000..2d8c7d7 Binary files /dev/null and b/assets/items/torch_horizontal_floor.png differ diff --git a/assets/map_tiles.png b/assets/map_tiles.png new file mode 100644 index 0000000..67c5ae3 Binary files /dev/null and b/assets/map_tiles.png differ diff --git a/assets/sounds/blank.ogg b/assets/sounds/blank.ogg new file mode 100644 index 0000000..3322d4b Binary files /dev/null and b/assets/sounds/blank.ogg differ diff --git a/assets/sounds/pickup.ogg b/assets/sounds/pickup.ogg new file mode 100644 index 0000000..de7e095 Binary files /dev/null and b/assets/sounds/pickup.ogg differ diff --git a/assets/sounds/ui_click.ogg b/assets/sounds/ui_click.ogg new file mode 100644 index 0000000..7ff2e8c Binary files /dev/null and b/assets/sounds/ui_click.ogg differ diff --git a/assets/sounds/ui_hover.ogg b/assets/sounds/ui_hover.ogg new file mode 100644 index 0000000..be6e679 Binary files /dev/null and b/assets/sounds/ui_hover.ogg differ diff --git a/assets/sounds/walk.ogg b/assets/sounds/walk.ogg new file mode 100644 index 0000000..3d288ad Binary files /dev/null and b/assets/sounds/walk.ogg differ diff --git a/assets/sprites/dead_body.png b/assets/sprites/dead_body.png new file mode 100644 index 0000000..4d0ef1c Binary files /dev/null and b/assets/sprites/dead_body.png differ diff --git a/assets/sprites/dead_body_lootable.png b/assets/sprites/dead_body_lootable.png new file mode 100644 index 0000000..e4a1187 Binary files /dev/null and b/assets/sprites/dead_body_lootable.png differ diff --git a/assets/sprites/rat_with_sword.png b/assets/sprites/rat_with_sword.png new file mode 100644 index 0000000..0d5763b Binary files /dev/null and b/assets/sprites/rat_with_sword.png differ diff --git a/assets/sprites/well_down.png b/assets/sprites/well_down.png new file mode 100644 index 0000000..f84bfd1 Binary files /dev/null and b/assets/sprites/well_down.png differ diff --git a/assets/text.ttf b/assets/text.ttf new file mode 100644 index 0000000..350d33b Binary files /dev/null and b/assets/text.ttf differ diff --git a/assets/textures/ceiling_black.png b/assets/textures/ceiling_black.png new file mode 100644 index 0000000..28099d3 Binary files /dev/null and b/assets/textures/ceiling_black.png differ diff --git a/assets/textures/floor_gray_stone.png b/assets/textures/floor_gray_stone.png new file mode 100644 index 0000000..55405e5 Binary files /dev/null and b/assets/textures/floor_gray_stone.png differ diff --git a/assets/textures/floor_plain.png b/assets/textures/floor_plain.png new file mode 100644 index 0000000..55405e5 Binary files /dev/null and b/assets/textures/floor_plain.png differ diff --git a/assets/textures/wall_plain.png b/assets/textures/wall_plain.png new file mode 100644 index 0000000..a4063bd Binary files /dev/null and b/assets/textures/wall_plain.png differ diff --git a/src/game/worldbuilder.cpp b/src/game/worldbuilder.cpp index cac4c5c..2c2ea23 100644 --- a/src/game/worldbuilder.cpp +++ b/src/game/worldbuilder.cpp @@ -199,12 +199,7 @@ void WorldBuilder::place_stairs(DinkyECS::World& world, GameConfig& config) { void WorldBuilder::configure_starting_items(DinkyECS::World &world) { auto& player = world.get_the(); - - auto torch_id = System::spawn_item(world, "TORCH_BAD"); - auto &inventory = world.get(player.entity); - inventory.add("hand_r", torch_id); - world.make_constant(torch_id); auto healing = System::spawn_item(world, "POTION_HEALING_SMALL"); inventory.add("pocket_l", healing); diff --git a/src/gui/main_ui.cpp b/src/gui/main_ui.cpp index 1d5cd2b..855ca36 100644 --- a/src/gui/main_ui.cpp +++ b/src/gui/main_ui.cpp @@ -17,7 +17,6 @@ namespace gui { $window.setFramerateLimit(FRAME_LIMIT); auto config = settings::get("config"); - $hand = textures::get_sprite(config["player"]["hands"]); $hand_anim = animation::load("assets/animation.json", config["player"]["hands"]); } diff --git a/tests/mazes.cpp b/tests/mazes.cpp index d66a71b..8e855a1 100644 --- a/tests/mazes.cpp +++ b/tests/mazes.cpp @@ -7,7 +7,7 @@ #include "algos/maze.hpp" #include "algos/stats.hpp" -#define DUMP 0 +#define DUMP 1 using std::string; using matrix::Matrix;