openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Allow switching to an arbitrary PC in combat, provided it has action points

Browse Source 
(This is no different than pressing 'w' until you get to that PC, but perhaps more convenient.)
This commit is contained in:
Celtic Minstrel
2015-01-26 01:41:31 -05:00
parent 7c67ad9909
commit 29eb6ace25
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/boe.actions.cpp
View File

@@ -638,10 +638,15 @@ static void handle_bash_pick(location destination, bool& did_something, bool& ne
static void handle_switch_pc(short which_pc, bool& need_redraw) {
if(!prime_time() && overall_mode != MODE_SHOPPING && overall_mode != MODE_TALKING)
add_string_to_buf("Set active: Finish what you're doing first.");
else if(is_combat())
// TODO: Allow this, provided the chosen PC has APs; it would be equivalent to pressing space until reaching that PC
add_string_to_buf("Set active: Can't set this in combat.");
else if(univ.party[which_pc].main_status != eMainStatus::ALIVE && (overall_mode != MODE_SHOPPING || active_shop.getType() != eShopType::HEALING))
else if(is_combat()) {
if(univ.party[which_pc].ap > 0) {
draw_terrain();
current_pc = which_pc;
combat_next_step();
set_stat_window(current_pc);
put_pc_screen();
} else add_string_to_buf("Set active: PC has no APs.");
} else if(univ.party[which_pc].main_status != eMainStatus::ALIVE && (overall_mode != MODE_SHOPPING || active_shop.getType() != eShopType::HEALING))
add_string_to_buf("Set active: PC must be here & active.");
else {
current_pc = which_pc;