All of the assets I need right now are done.
This commit is contained in:
parent
4027b70867
commit
d38e2cb0f2
5 changed files with 11 additions and 10 deletions
|
@ -13,6 +13,8 @@
|
||||||
"ceiling": "assets/ceiling_test-256.png",
|
"ceiling": "assets/ceiling_test-256.png",
|
||||||
"healing_potion_small": "assets/healing_potion_small-256.png",
|
"healing_potion_small": "assets/healing_potion_small-256.png",
|
||||||
"well_down": "assets/well_down-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"
|
"cinqueda": "assets/cinqueda_1-256.png"
|
||||||
},
|
},
|
||||||
"enemy": {
|
"enemy": {
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
},
|
},
|
||||||
"STAIRS_UP": {
|
"STAIRS_UP": {
|
||||||
"id": "STAIRS_UP",
|
"id": "STAIRS_UP",
|
||||||
"name": "Stairs Up",
|
"name": "Rope Up",
|
||||||
"description": "Stairs that go up, for the weak.",
|
"description": "A old rope, covered in vines, going up for the weak.",
|
||||||
"inventory_count": 0,
|
"inventory_count": 0,
|
||||||
"placement": "fixed",
|
"placement": "fixed",
|
||||||
"components": [
|
"components": [
|
||||||
|
@ -31,13 +31,13 @@
|
||||||
{"_type": "Device",
|
{"_type": "Device",
|
||||||
"config": {"test": true},
|
"config": {"test": true},
|
||||||
"events": ["Events::GUI::STAIRS_UP"]},
|
"events": ["Events::GUI::STAIRS_UP"]},
|
||||||
{"_type": "Sprite", "name": "barrel_small"}
|
{"_type": "Sprite", "name": "rope_vines_up"}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"SPIKE_TRAP": {
|
"TRIPEWIRE_TRAP": {
|
||||||
"id": "SPIKE_TRAP",
|
"id": "TRIPEWIRE_TRAP",
|
||||||
"name": "Spike trap",
|
"name": "Tripwire Trap",
|
||||||
"description": "Spikes stab you from the floor.",
|
"description": "Watch where you're going.",
|
||||||
"inventory_count": 0,
|
"inventory_count": 0,
|
||||||
"components": [
|
"components": [
|
||||||
{"_type": "Tile", "display": "\u1ac7",
|
{"_type": "Tile", "display": "\u1ac7",
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
{"_type": "Device",
|
{"_type": "Device",
|
||||||
"config": {"test": true},
|
"config": {"test": true},
|
||||||
"events": ["Events::GUI::TRAP"]},
|
"events": ["Events::GUI::TRAP"]},
|
||||||
{"_type": "Sprite", "name": "barrel_small"}
|
{"_type": "Sprite", "name": "tripwire_trap"}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
BIN
assets/rope_vines_up-256.png
Normal file
BIN
assets/rope_vines_up-256.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 28 KiB |
BIN
assets/tripwire_trap-256.png
Normal file
BIN
assets/tripwire_trap-256.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.6 KiB |
3
gui.cpp
3
gui.cpp
|
@ -255,8 +255,6 @@ namespace gui {
|
||||||
}
|
}
|
||||||
|
|
||||||
void FSM::render() {
|
void FSM::render() {
|
||||||
draw_gui();
|
|
||||||
|
|
||||||
if(in_state(State::MAPPING)) {
|
if(in_state(State::MAPPING)) {
|
||||||
$window.clear();
|
$window.clear();
|
||||||
$map_view.render();
|
$map_view.render();
|
||||||
|
@ -268,6 +266,7 @@ namespace gui {
|
||||||
auto elapsed = std::chrono::duration<double>(end - start);
|
auto elapsed = std::chrono::duration<double>(end - start);
|
||||||
$stats.sample(1/elapsed.count());
|
$stats.sample(1/elapsed.count());
|
||||||
|
|
||||||
|
draw_gui();
|
||||||
draw_weapon();
|
draw_weapon();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue