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

Implement a picker for selecting an item class, using the editable string picker.

Browse Source 
Used in special node editing and also item editing.
This commit is contained in:
Celtic Minstrel
2025-02-23 11:32:26 -05:00
committed by Celtic Minstrel
parent 62267261f3
commit 0ccdd38cb1
10 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileio/fileio_scen.cpp
View File

@@ -953,6 +953,12 @@ void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
if(evtnum > scenario.evt_names.size())
scenario.evt_names.resize(evtnum);
edit->GetText(&scenario.evt_names[evtnum - 1], false);
} else if(type == "item-class") {
int icnum = 0;
edit->GetAttribute("id", &icnum);
if(icnum > scenario.ic_names.size())
scenario.ic_names.resize(icnum);
edit->GetText(&scenario.ic_names[icnum - 1], false);
} else if(type == "graphics") {
static const std::set<ePicType> valid_pictypes = {
PIC_TER, PIC_TER_ANIM, PIC_TER_MAP,

1
src/scenario/scenario.cpp
View File

@@ -203,6 +203,7 @@ void swap(cScenario& lhs, cScenario& rhs) {
swap(lhs.outdoors, rhs.outdoors);
swap(lhs.towns, rhs.towns);
swap(lhs.evt_names, rhs.evt_names);
swap(lhs.ic_names, rhs.ic_names);
}
cScenario::cItemStorage::cItemStorage() : ter_type(-1), property(0) {

1
src/scenario/scenario.hpp
View File

@@ -101,6 +101,7 @@ public:
std::vector<std::string> spec_strs;
std::vector<std::string> snd_names;
std::vector<std::string> evt_names;
std::vector<std::string> ic_names;
bool adjust_diff;
bool is_legacy;
fs::path scen_file; // transient

6
src/scenedit/scen.core.cpp
View File

@@ -1723,6 +1723,10 @@ static bool edit_item_type_event_filter(cDialog& me, std::string hit, cItem& ite
});
put_item_info(itemInfo, temp_item, scenario);
itemInfo.run();
} else if(hit == "edit-ic") {
int value = me["class"].getTextAsNum();
value = choose_text_editable(scenario.ic_names, value, &me, "Select item class:");
me["class"].setTextToNum(value);
}
return true;
}
@@ -1776,7 +1780,7 @@ bool edit_item_type(short which) {
item_dlg["weight"].attachFocusHandler(std::bind(check_range, _1, _2, _3, 0, 250, "Weight"));
item_dlg["class"].attachFocusHandler(std::bind(check_range, _1, _2, _3, 0, 100, "Special Class"));
item_dlg["variety"].attachFocusHandler(std::bind(change_item_variety, _1, _2, std::ref(item)));
item_dlg.attachClickHandlers(std::bind(edit_item_type_event_filter, _1, _2, std::ref(item), std::ref(which)), {"okay", "cancel", "abils", "choosepic", "choosetp", "choosemiss", "desc", "preview"});
item_dlg.attachClickHandlers(std::bind(edit_item_type_event_filter, _1, _2, std::ref(item), std::ref(which)), {"okay", "cancel", "abils", "choosepic", "choosetp", "choosemiss", "desc", "preview", "edit-ic"});
if(scenario.scen_items.size() == 1) {
item_dlg["prev"].hide();

7
src/scenedit/scen.fileio.cpp
View File

@@ -401,6 +401,13 @@ void writeScenarioToXml(ticpp::Printer&& data, cScenario& scenario) {
data.PushText(scenario.evt_names[i]);
data.CloseElement("event");
}
for(int i = 0; i < scenario.ic_names.size(); i++) {
if(scenario.ic_names[i].empty()) continue;
data.OpenElement("item-class");
data.PushAttribute("id", i + 1);
data.PushText(scenario.ic_names[i]);
data.CloseElement("item-class");
}
data.CloseElement("editor");
data.CloseElement("scenario");
}

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

@@ -1042,6 +1042,7 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
case eSpecPicker::STATUS_PARTY: store = choose_status_effect(val, true, &me); break;
case eSpecPicker::SOUND: store = choose_sound(val, &me); break;
case eSpecPicker::EVENT: store = choose_text_editable(scenario.evt_names, val, &me, "Select an event:"); break;
case eSpecPicker::ITEM_CLASS: store = choose_text_editable(scenario.ic_names, val, &me, "Select item class:"); break;
case eSpecPicker::NONE: return false;
}
me[field].setTextToNum(store);