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

Update special node and talking node strings/data for the new quest stuff

Browse Source 
- Also, Update Quest node now uses the mess1/2 fields.
This commit is contained in:
Celtic Minstrel
2015-02-01 13:24:32 -05:00
parent a41468eea8
commit 4f93e8ea5a
9 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scenedit/scen.keydlgs.cpp
View File

@@ -198,6 +198,11 @@ short choose_text(eStrType list, unsigned short cur_choice, cDialog* parent, con
strings.push_back(item.name);
}
break;
case STRT_QUEST:
for(cQuest& quest : scenario.quests) {
strings.push_back(quest.name);
}
break;
case STRT_TER:
for(cTerrain& ter : scenario.ter_types) {
strings.push_back(ter.name);
@@ -319,6 +324,9 @@ short choose_text(eStrType list, unsigned short cur_choice, cDialog* parent, con
case STRT_DIR:
strings = {"North", "Northease", "East", "Southeast", "South", "Southwest", "West", "Northwest", "None"};
break;
case STRT_QUEST_STATUS:
strings = {"Available", "Started", "Completed", "Failed"};
break;
}
if(cur_choice < 0 || cur_choice >= strings.size())
cur_choice = -1;
@@ -800,6 +808,8 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
case '*': strt = STRT_CONTEXT; title = "What context?"; break;
case ':': strt = STRT_STAIR_MODE; title = "Select trigger limitations:"; break;
case 'w': strt = STRT_STATUS; title = "Select status:"; str_adj = 1; break;
case 'j': strt = STRT_QUEST; title = "Select a quest:"; break;
case 'J': strt = STRT_QUEST_STATUS; title = "Select the quest's status:"; break;
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
choose_string = false;

2
src/scenedit/scen.keydlgs.h
View File

@@ -11,7 +11,7 @@ enum eStrType {
STRT_ATTITUDE, STRT_STAIR, STRT_LIGHT, STRT_CONTEXT,
STRT_SHOP, STRT_COST_ADJ, STRT_STAIR_MODE, STRT_TALK_NODE,
STRT_STATUS, STRT_SPELL_PAT, STRT_SUMMON, STRT_TALK,
STRT_ENCHANT, STRT_DIR,
STRT_ENCHANT, STRT_DIR, STRT_QUEST, STRT_QUEST_STATUS,
};
bool cre(short val,short min,short max,std::string text1,std::string text2,cDialog* parent) ;