Capturing attack clicks so now just have to make my own FSM for the minigame.
This commit is contained in:
parent
231adb6335
commit
fdc0bcdb3b
4 changed files with 13 additions and 7 deletions
12
gui/fsm.cpp
12
gui/fsm.cpp
|
|
@ -37,7 +37,7 @@ namespace gui {
|
|||
FSM_STATE(State, IDLE, ev, data);
|
||||
FSM_STATE(State, IN_COMBAT, ev);
|
||||
FSM_STATE(State, COMBAT_ROTATE, ev);
|
||||
FSM_STATE(State, BOSS_FIGHT, ev);
|
||||
FSM_STATE(State, BOSS_FIGHT, ev, data);
|
||||
FSM_STATE(State, END, ev);
|
||||
FSM_STATE(State, LOOTING, ev, data);
|
||||
}
|
||||
|
|
@ -206,9 +206,10 @@ namespace gui {
|
|||
}
|
||||
}
|
||||
|
||||
void FSM::BOSS_FIGHT(Event ev) {
|
||||
void FSM::BOSS_FIGHT(Event ev, std::any data) {
|
||||
dbc::check($boss_fight_ui != nullptr, "$boss_fight_ui not initialized");
|
||||
using enum Event;
|
||||
(void)data; ///// !!!!!!!!!!!!!!!!!!!!!!! DIE this sucks
|
||||
|
||||
switch(ev) {
|
||||
// this is only if using the debug X key to skip it
|
||||
|
|
@ -226,9 +227,10 @@ namespace gui {
|
|||
event(Event::BOSS_END);
|
||||
}
|
||||
} break;
|
||||
case ATTACK:
|
||||
fmt::println("ATTACK THE BOSS!");
|
||||
break;
|
||||
case ATTACK: {
|
||||
// BUG: get rid of temp attack id and pass the data
|
||||
$boss_fight_ui->attack($temp_attack_id);
|
||||
} break;
|
||||
case MOUSE_MOVE: {
|
||||
sf::Vector2f pos = mouse_position();
|
||||
$boss_fight_ui->mouse(pos.x, pos.y, {1 << guecs::ModBit::hover});
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ namespace gui {
|
|||
void IDLE(Event ev, std::any data);
|
||||
void IN_COMBAT(Event ev);
|
||||
void COMBAT_ROTATE(Event ev);
|
||||
void BOSS_FIGHT(Event ev);
|
||||
void BOSS_FIGHT(Event ev, std::any data);
|
||||
void LOOTING(Event ev, std::any data);
|
||||
void END(Event ev);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue