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

try to make do alchemy more user friendly...

Browse Source
This commit is contained in:
ALONSO Laurent
2021-10-04 12:05:43 +02:00
committed by Celtic Minstrel
parent 94b65859cc
commit 896e6c699b
4 changed files with 108 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rsrc/dialogs/pick-potion.xml
View File

@@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='cancel'>
<button name='left' type='left' def-key='left' top='303' left='287'/>
<button name='right' type='right' def-key='right' top='303' left='350'/>
<button name='cancel' type='regular' def-key='esc' top='303' left='415'>Cancel</button>
<text size='large' top='8' left='53' width='71' height='16'>Alchemy:</text>
<text size='large' top='29' left='53' width='32' height='16'>For:</text>

4
rsrc/dialogs/pick-race-abil.xml
View File

@@ -4,8 +4,8 @@
<text size='large' top='9' left='55' width='181' height='16'>Special Characteristics:</text>
<text name='name' size='large' top='9' left='240' width='174' height='16'/>
<pict type='dlog' num='7' top='6' left='6'/>
<button name='left' type='left' def-key='left' top='349' left='360'/>
<button name='right' type='right' def-key='right' top='349' left='423'/>
<button name='left' type='left' def-key='left' top='344' left='360'/>
<button name='right' type='right' def-key='right' top='344' left='423'/>
<button name='cancel' type='regular' def-key='esc' top='370' left='360'>Cancel</button>
<button name='done' type='done' top='370' left='423'/>
<text size='large' top='30' left='55' width='65' height='18'>Species:</text>

195
src/game/boe.party.cpp
View File

@@ -2038,124 +2038,137 @@ void start_town_targeting(eSpell s_num,short who_c,bool freebie,eSpellPat pat) {
}
}
//
// do alchemy
//
extern const short alch_difficulty[20];
extern const eItemAbil alch_ingred1[20];
extern const eItemAbil alch_ingred2[20];
void do_alchemy() {
static void display_alchemy_graphics(cDialog& me, short &pc_num);
static bool alch_potion_event_filter(cDialog&me, short &pc_num, std::string item_hit, eKeyMod) {
int potion_id = boost::lexical_cast<int>(item_hit.substr(6));
if(!univ.party[pc_num].has_space()) {
add_string_to_buf("Alchemy: Can't carry another item.");
return false;
}
cInvenSlot which_item = univ.party[pc_num].has_abil(alch_ingred1[potion_id]);
if(alch_ingred2[potion_id] != eItemAbil::NONE) {
cInvenSlot which_item2 = univ.party[pc_num].has_abil(alch_ingred2[potion_id]);
// Take care with the order of removal so that remove_charge does not change the index of the second item removed
if(which_item.slot < which_item2.slot) {
univ.party[pc_num].remove_charge(which_item2.slot);
univ.party[pc_num].remove_charge(which_item.slot);
} else {
univ.party[pc_num].remove_charge(which_item.slot);
univ.party[pc_num].remove_charge(which_item2.slot);
}
} else univ.party[pc_num].remove_charge(which_item.slot);
play_sound(8);
static const short fail_chance[20] = {
50,40,30,20,10,
8,6,4,2,0,
0,0,0,0,0,
0,0,0,0,0
};
short r1;
short pc_num;
pc_num = select_pc(0);
if(pc_num == 6)
return;
eAlchemy potion = alch_choice(pc_num);
// TODO: Remove need for this cast by changing the above data to either std::maps or an unary operator*
int which_p = int(potion);
if(potion != eAlchemy::NONE) {
if(!univ.party[pc_num].has_space()) {
add_string_to_buf("Alchemy: Can't carry another item.");
return;
}
cInvenSlot which_item = univ.party[pc_num].has_abil(alch_ingred1[which_p]);
if(!which_item) {
add_string_to_buf("Alchemy: Don't have ingredients.");
return;
}
if(alch_ingred2[which_p] != eItemAbil::NONE) {
cInvenSlot which_item2 = univ.party[pc_num].has_abil(alch_ingred2[which_p]);
if(!which_item2) {
add_string_to_buf("Alchemy: Don't have ingredients.");
return;
}
// Take care with the order of removal so that remove_charge does not change the index of the second item removed
if(which_item.slot < which_item2.slot) {
univ.party[pc_num].remove_charge(which_item2.slot);
univ.party[pc_num].remove_charge(which_item.slot);
} else {
univ.party[pc_num].remove_charge(which_item.slot);
univ.party[pc_num].remove_charge(which_item2.slot);
}
} else univ.party[pc_num].remove_charge(which_item.slot);
play_sound(8);
r1 = get_ran(1,1,100);
if(r1 < fail_chance[univ.party[pc_num].skill(eSkill::ALCHEMY) - alch_difficulty[which_p]]) {
add_string_to_buf("Alchemy: Failed.");
r1 = get_ran(1,0,1);
play_sound(41 );
}
else {
cItem store_i(potion);
if(univ.party[pc_num].skill(eSkill::ALCHEMY) - alch_difficulty[which_p] >= 5)
store_i.charges++;
if(univ.party[pc_num].skill(eSkill::ALCHEMY) - alch_difficulty[which_p] >= 11)
store_i.charges++;
store_i.graphic_num += get_ran(1,0,2);
if(!univ.party[pc_num].give_item(store_i,false)) {
add_string_to_buf("No room in inventory. Potion placed on floor.", 2);
place_item(store_i,univ.party.town_loc);
}
else add_string_to_buf("Alchemy: Successful.");
}
put_item_screen(stat_window);
int r1 = get_ran(1,1,100);
if(r1 < fail_chance[univ.party[pc_num].skill(eSkill::ALCHEMY) - alch_difficulty[potion_id]]) {
add_string_to_buf("Alchemy: Failed.");
r1 = get_ran(1,0,1);
play_sound(41 );
}
}
static bool alch_choice_event_filter(cDialog& me, std::string item_hit, eKeyMod) {
if(item_hit == "help") {
give_help(220,21,me);
return true;
}
if(item_hit == "cancel")
me.setResult<eAlchemy>(eAlchemy::NONE);
else {
int potion_id = boost::lexical_cast<int>(item_hit.substr(6));
me.setResult<eAlchemy>(eAlchemy(potion_id));
cItem store_i((eAlchemy)potion_id);
if(univ.party[pc_num].skill(eSkill::ALCHEMY) - alch_difficulty[potion_id] >= 5)
store_i.charges++;
if(univ.party[pc_num].skill(eSkill::ALCHEMY) - alch_difficulty[potion_id] >= 11)
store_i.charges++;
store_i.graphic_num += get_ran(1,0,2);
if(!univ.party[pc_num].give_item(store_i,false)) {
add_string_to_buf("No room in inventory. Potion placed on floor.", 2);
place_item(store_i,univ.party.town_loc);
// checkme: redraw terrain here?
}
else
add_string_to_buf("Alchemy: Successful.");
}
me.toast(true);
put_item_screen(stat_window);
display_alchemy_graphics(me, pc_num);
return true;
}
eAlchemy alch_choice(short pc_num) {
short difficulty[20] = {1,1,1,3,3, 4,5,5,7,9, 9,10,12,12,9, 14,19,10,16,20};
short store_alchemy_pc;
set_cursor(sword_curs);
store_alchemy_pc = pc_num;
cDialog chooseAlchemy("pick-potion");
chooseAlchemy.attachClickHandlers(alch_choice_event_filter, {"cancel", "help"});
void display_alchemy_graphics(cDialog& me, short &pc_num) {
using namespace std::placeholders;
short const difficulty[20] = {1,1,1,3,3, 4,5,5,7,9, 9,10,12,12,9, 14,19,10,16,20};
for(short i = 0; i < 20; i++) {
std::string n = std::to_string(i + 1);
chooseAlchemy["label" + n].setText(get_str("magic-names", i + 200));
chooseAlchemy["potion" + n].attachClickHandler(alch_choice_event_filter);
if(univ.party[pc_num].skill(eSkill::ALCHEMY) < difficulty[i] || !univ.party.alchemy[i])
chooseAlchemy["potion" + n].hide();
me["label" + n].setText(get_str("magic-names", i + 200));
if(univ.party[pc_num].skill(eSkill::ALCHEMY) < difficulty[i] || !univ.party.alchemy[i] ||
!univ.party[pc_num].has_abil(alch_ingred1[i]) ||
(alch_ingred2[i] != eItemAbil::NONE && !univ.party[pc_num].has_abil(alch_ingred2[i])))
me["potion" + n].hide();
else {
me["potion" + n].attachClickHandler(std::bind(alch_potion_event_filter, _1, std::ref(pc_num), _2, _3));
me["potion" + n].show();
}
}
std::ostringstream sout;
sout << univ.party[pc_num].name;
sout << " (skill " << univ.party[pc_num].skill(eSkill::ALCHEMY) << ")";
chooseAlchemy["mixer"].setText(sout.str());
me["mixer"].setText(sout.str());
}
static bool alch_choice_event_filter(cDialog& me, short &pc_num, std::string item_hit, eKeyMod) {
if(item_hit == "help") {
give_help(220,21,me);
return true;
}
if (item_hit == "left") {
do {
pc_num = (pc_num + 5) % 6;
} while(univ.party[pc_num].main_status != eMainStatus::ALIVE);
display_alchemy_graphics(me, pc_num);
return true;
} else if (item_hit == "right") {
do {
pc_num = (pc_num + 1) % 6;
} while(univ.party[pc_num].main_status != eMainStatus::ALIVE);
display_alchemy_graphics(me, pc_num);
return true;
}
// cancel
me.toast(true);
return true;
}
void do_alchemy() {
using namespace std::placeholders;
if(univ.cur_pc == 6) {
add_string_to_buf("Alchemy: No pc selected.");
return;
}
set_cursor(sword_curs);
short pc_num = univ.cur_pc;
cDialog chooseAlchemy("pick-potion");
chooseAlchemy.attachClickHandlers(std::bind(alch_choice_event_filter, _1, std::ref(pc_num), _2, _3), {"cancel", "left", "right", "help"});
display_alchemy_graphics(chooseAlchemy, pc_num);
void (*give_help)(short,short,cDialog&) = ::give_help;
chooseAlchemy.run(std::bind(give_help, 20, 21, std::ref(chooseAlchemy)));
return chooseAlchemy.getResult<eAlchemy>();
}
//
// pick pc, ...
//
// mode ... 0 - create 1 - created
bool pick_pc_graphic(short pc_num,short mode,cDialog* parent) {
store_graphic_pc_num = pc_num;

1
src/game/boe.party.hpp
View File

@@ -30,7 +30,6 @@ bool pc_can_cast_spell(const cPlayer& pc,eSkill spell_num);
eSpell pick_spell(short pc_num,eSkill type);
void start_town_targeting(eSpell s_num,short who_c,bool freebie,eSpellPat pat = PAT_SINGLE);
void do_alchemy();
eAlchemy alch_choice(short pc_num);
bool pick_pc_graphic(short pc_num,short mode,cDialog* parent_num);
bool pick_pc_name(short pc_num,cDialog* parent) ;
mon_num_t pick_trapped_monst();