Bring in basic placeholder assets for things like walls, souns, and font.

assets/animation.json

@@ -98,7 +98,7 @@
       "close": []
     }
  },
-  "female_hand": {
+  "hands_sword_attack": {
     "sheet": {
       "frames": 3,
       "frame_width": 900,

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",
+    "walk": "assets/sounds/walk.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"
   },
   "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":
+    "hands_sword_attack":
-    {"path": "assets/sprites/peasant_girl_2.png",
+    {"path": "assets/hands/hands_sword_attack.png",
-      "frame_width": 256,
-      "frame_height": 256
-    },
-    "female_hand":
-    {"path": "assets/hands/female_hand.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"
   }
 }

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
   }
 }

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",

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<Player>();
-
-  auto torch_id = System::spawn_item(world, "TORCH_BAD");
-
   auto &inventory = world.get<inventory::Model>(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);

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"]);
   }

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;