diff --git a/assets/config.json b/assets/config.json index b0f8dc9..18c9606 100644 --- a/assets/config.json +++ b/assets/config.json @@ -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": { diff --git a/assets/devices.json b/assets/devices.json index b15d94f..285edba 100644 --- a/assets/devices.json +++ b/assets/devices.json @@ -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"} ] } } diff --git a/assets/rope_vines_up-256.png b/assets/rope_vines_up-256.png new file mode 100644 index 0000000..31159e9 Binary files /dev/null and b/assets/rope_vines_up-256.png differ diff --git a/assets/tripwire_trap-256.png b/assets/tripwire_trap-256.png new file mode 100644 index 0000000..1a6b4c0 Binary files /dev/null and b/assets/tripwire_trap-256.png differ diff --git a/gui.cpp b/gui.cpp index 212a16c..39fc972 100644 --- a/gui.cpp +++ b/gui.cpp @@ -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(end - start); $stats.sample(1/elapsed.count()); + draw_gui(); draw_weapon(); }