Make a little crossed swords combat indicator show up.
This commit is contained in:
parent
0f9777988d
commit
f9346f3e87
6 changed files with 18 additions and 3 deletions
|
|
@ -72,7 +72,7 @@
|
||||||
"frame_height": 341
|
"frame_height": 341
|
||||||
},
|
},
|
||||||
"sequences": {
|
"sequences": {
|
||||||
"idle": {"frames": [0, 1, 2], "durations": [25, 5, 20] }
|
"idle": {"frames": [0, 1, 2], "durations": [10, 5, 15] }
|
||||||
},
|
},
|
||||||
"transforms": {
|
"transforms": {
|
||||||
"basic": {
|
"basic": {
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,11 @@
|
||||||
{"path": "assets/stories/win_story.png",
|
{"path": "assets/stories/win_story.png",
|
||||||
"frame_width": 1280,
|
"frame_width": 1280,
|
||||||
"frame_height": 720
|
"frame_height": 720
|
||||||
|
},
|
||||||
|
"combat_active":
|
||||||
|
{"path": "assets/sprites/combat_active.png",
|
||||||
|
"frame_width": 170,
|
||||||
|
"frame_height": 170
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"worldgen": {
|
"worldgen": {
|
||||||
|
|
|
||||||
BIN
assets/sprites/combat_active.png
Normal file
BIN
assets/sprites/combat_active.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
|
|
@ -282,10 +282,10 @@ namespace gui {
|
||||||
$systems.runPickup();
|
$systems.runPickup();
|
||||||
break;
|
break;
|
||||||
case COMBAT_START:
|
case COMBAT_START:
|
||||||
fmt::println("!!!!!!!!!!!!!! COMBAT START in IDLE");
|
$main_ui.show_combat();
|
||||||
break;
|
break;
|
||||||
case COMBAT_STOP:
|
case COMBAT_STOP:
|
||||||
fmt::println("!!!!!!!!!!!!!! COMBAT STOP in IDLE");
|
$main_ui.close_combat();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break; // ignore everything else
|
break; // ignore everything else
|
||||||
|
|
|
||||||
|
|
@ -157,4 +157,12 @@ namespace gui {
|
||||||
$window.draw(*$hand.sprite);
|
$window.draw(*$hand.sprite);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainUI::show_combat() {
|
||||||
|
$overlay_ui.show_sprite("top_right", "combat_active");
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainUI::close_combat() {
|
||||||
|
$overlay_ui.close_sprite("top_right");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,5 +51,7 @@ namespace gui {
|
||||||
void play_hands();
|
void play_hands();
|
||||||
bool hands_playing();
|
bool hands_playing();
|
||||||
void render_hands();
|
void render_hands();
|
||||||
|
void show_combat();
|
||||||
|
void close_combat();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue