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

Confirm keep changes before train next PC

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-16 17:28:24 -05:00
parent bd54d2e753
commit 77fe44c514
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rsrc/dialogs/confirm-spend-xp.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='keep' escbtn='cancel'>
<pict type='dlog' num='7' top='6' left='6'/>
<text name='keep-msg' top='6' left='49' width='256' height='32'>
Keep changes to {{PC}} before training someone else?
</text>
<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
<button name='revert' type='regular' top='43' left='175'>Discard</button>
<button name='keep' type='regular' top='43' left='240'>Keep</button>
</dialog>

31
src/pcedit/pc.editors.cpp
View File

@@ -249,6 +249,7 @@ struct xp_dlog_state {
std::map<eSkill,short> skills;
int who, mode;
int hp, sp, g, skp;
int start_skp;
};
static void do_xp_keep(xp_dlog_state& save) {
@@ -401,6 +402,20 @@ static void do_xp_draw(cDialog& me,xp_dlog_state& save) {
update_gold_skills(me, save);
}
static bool confirm_switch_pc(cDialog& me, xp_dlog_state& save) {
cChoiceDlog dlog("confirm-spend-xp", {"keep","revert","cancel"}, &me);
dlog->getControl("keep-msg").replaceText("{{PC}}", univ.party[save.who].name);
std::string choice = dlog.show();
if(choice == "keep"){
do_xp_keep(save);
return true;
}else if(choice == "revert"){
return true;
}else{
return false;
}
}
static bool spend_xp_navigate_filter(cDialog& me, std::string item_hit,xp_dlog_state& save) {
if(item_hit == "cancel") {
// TODO: Um, I'm pretty sure this can never happen.
@@ -415,25 +430,22 @@ static bool spend_xp_navigate_filter(cDialog& me, std::string item_hit,xp_dlog_s
me.setResult(true);
me.toast(true);
} else if(item_hit == "left") {
// TODO: Try not forcing a commit when using the arrows?
if(save.mode != 0) {
do_xp_keep(save);
if(save.skp == save.start_skp || confirm_switch_pc(me, save)){
do {
save.who = (save.who == 0) ? 5 : save.who - 1;
} while(univ.party[save.who].main_status != eMainStatus::ALIVE);
do_xp_draw(me,save);
} else
play_sound(1);
save.start_skp = save.skp;
}
} else if(item_hit == "right") {
// TODO: If they don't work in mode 0, why are they visible?
if(save.mode != 0) {
do_xp_keep(save);
if(save.skp == save.start_skp || confirm_switch_pc(me, save)){
do {
save.who = (save.who == 5) ? 0 : save.who + 1;
} while(univ.party[save.who].main_status != eMainStatus::ALIVE);
do_xp_draw(me,save);
} else
play_sound(1);
save.start_skp = save.skp;
}
}
return true;
}
@@ -592,6 +604,7 @@ bool spend_xp(short pc_num, short mode, cDialog* parent) {
xpDlog[id + plus].attachClickHandler(spend_xp_filter);
}
do_xp_draw(xpDlog,save);
save.start_skp = save.skp;
xpDlog.attachClickHandlers(std::bind(spend_xp_navigate_filter,_1,_2,std::ref(save)),{"keep","cancel","left","right","help"});
xpDlog.attachClickHandlers(spend_xp_filter,{"sp-m","sp-p","hp-m","hp-p"});