All of the assets I need right now are done.

master
Zed A. Shaw 4 weeks ago
parent 4027b70867
commit d38e2cb0f2
  1. 2
      assets/config.json
  2. 16
      assets/devices.json
  3. BIN
      assets/rope_vines_up-256.png
  4. BIN
      assets/tripwire_trap-256.png
  5. 3
      gui.cpp

@ -13,6 +13,8 @@
"ceiling": "assets/ceiling_test-256.png",
"healing_potion_small": "assets/healing_potion_small-256.png",
"well_down": "assets/well_down-256.png",
"rope_vines_up": "assets/rope_vines_up-256.png",
"tripwire_trap": "assets/tripwire_trap-256.png",
"cinqueda": "assets/cinqueda_1-256.png"
},
"enemy": {

@ -19,8 +19,8 @@
},
"STAIRS_UP": {
"id": "STAIRS_UP",
"name": "Stairs Up",
"description": "Stairs that go up, for the weak.",
"name": "Rope Up",
"description": "A old rope, covered in vines, going up for the weak.",
"inventory_count": 0,
"placement": "fixed",
"components": [
@ -31,13 +31,13 @@
{"_type": "Device",
"config": {"test": true},
"events": ["Events::GUI::STAIRS_UP"]},
{"_type": "Sprite", "name": "barrel_small"}
{"_type": "Sprite", "name": "rope_vines_up"}
]
},
"SPIKE_TRAP": {
"id": "SPIKE_TRAP",
"name": "Spike trap",
"description": "Spikes stab you from the floor.",
"TRIPEWIRE_TRAP": {
"id": "TRIPEWIRE_TRAP",
"name": "Tripwire Trap",
"description": "Watch where you're going.",
"inventory_count": 0,
"components": [
{"_type": "Tile", "display": "\u1ac7",
@ -47,7 +47,7 @@
{"_type": "Device",
"config": {"test": true},
"events": ["Events::GUI::TRAP"]},
{"_type": "Sprite", "name": "barrel_small"}
{"_type": "Sprite", "name": "tripwire_trap"}
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

@ -255,8 +255,6 @@ namespace gui {
}
void FSM::render() {
draw_gui();
if(in_state(State::MAPPING)) {
$window.clear();
$map_view.render();
@ -268,6 +266,7 @@ namespace gui {
auto elapsed = std::chrono::duration<double>(end - start);
$stats.sample(1/elapsed.count());
draw_gui();
draw_weapon();
}

Loading…
Cancel
Save