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

Introduce a spell enum, and use it everywhere for PC spellcasting

Browse Source 
- Monster spellcasting is untouched
- Also updated the spells documentation, which had some old information from Exile III and omitted a lot of ranges.
This commit is contained in:
Celtic Minstrel
2014-12-14 02:00:25 -05:00
parent 1fbf8939b2
commit 0344cf2525
17 changed files with 1185 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osx/boe.infodlg.cpp
View File

@@ -25,18 +25,15 @@
#include "restypes.hpp"
#include <boost/lexical_cast.hpp>
#include "prefs.hpp"
#include "spell.hpp"
short mage_spell_pos = 0,priest_spell_pos = 0,skill_pos = 0;
extern std::map<eSkill,std::array<short,62>> spell_w_cast;
extern short spell_level[62];
extern short skill_cost[20];
extern short skill_max[20];
extern short skill_g_cost[20];
extern const char* skill_ids[19];
//extern party_record_type party;
extern short mage_range[66],priest_range[66];
extern std::map<eSkill,std::array<short,62>> spell_cost;
extern short cur_town_talk_loaded;
//extern current_town_type univ.town;
extern bool give_intro_hint;
@@ -77,13 +74,14 @@ static void put_spell_info(cDialog& me, eSkill display_mode) {
pos = display_mode == eSkill::MAGE_SPELLS ? mage_spell_pos : priest_spell_pos;
res = display_mode == eSkill::MAGE_SPELLS ? "mage-spells" : "priest-spells";
ran = display_mode == eSkill::MAGE_SPELLS ? mage_range[pos] : priest_range[pos];
eSpell spell = cSpell::fromNum(display_mode, pos);
ran = (*spell).range;
me["name"].setText(get_str(res, pos * 2 + 1));
if (spell_cost[eSkill::MAGE_SPELLS][pos] > 0)
store_text << spell_level[pos] << "/" << spell_cost[eSkill::MAGE_SPELLS][pos];
else store_text << spell_level[pos] << "/?";
if((*spell).cost >= 0)
store_text << (*spell).level << "/" << (*spell).cost;
else store_text << (*spell).level << "/?";
me["cost"].setText(store_text.str());
if (ran == 0) {
@@ -92,7 +90,7 @@ static void put_spell_info(cDialog& me, eSkill display_mode) {
else me["range"].setTextToNum(ran);
me["desc"].setText(get_str(res, pos * 2 + 2));
me["when"].setText(get_str("spell-times", 1 + spell_w_cast[display_mode][pos]));
me["when"].setText(get_str("spell-times", (*spell).when_cast));
}