Skip to content

Y
ygopro
Commit dabb83eb authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 7877a105 17e749a4
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 64 deletions
gframe/deck_con.cpp
View file @ dabb83eb
...@@ -817,42 +817,78 @@ void DeckBuilder::StartFilter() { ...@@ -817,42 +817,78 @@ void DeckBuilder::StartFilter() {
} }
void DeckBuilder::FilterCards() { void DeckBuilder::FilterCards() {
results.clear(); results.clear();
struct element_t {
std::wstring keyword;
int setcode;
enum class type_t {
all,
name,
setcode
} type;
bool exclude;
element_t(): setcode(0), type(type_t::all), exclude(false) {}
};
const wchar_t* pstr = mainGame->ebCardName->getText(); const wchar_t* pstr = mainGame->ebCardName->getText();
std::wstring str = std::wstring(pstr); std::wstring str = std::wstring(pstr);
std::vector<std::wstring> query_elements; std::vector<element_t> query_elements;
std::vector<std::vector<std::wstring>::iterator> query_elements_track; if(mainGame->gameConf.search_multiple_keywords) {
size_t element_start = 0; const wchar_t separator = mainGame->gameConf.search_multiple_keywords == 1 ? L' ' : L'+';
while(mainGame->gameConf.search_multiple_keywords) { const wchar_t minussign = L'-';
size_t element_end = str.find_first_of(mainGame->gameConf.search_multiple_keywords == 1 ? L' ' : L'+', element_start); const wchar_t quotation = L'\"';
if(element_end == std::wstring::npos) size_t element_start = 0;
break; for(;;) {
size_t length = element_end - element_start; element_start = str.find_first_not_of(separator, element_start);
if(length > 0) { if(element_start == std::wstring::npos)
query_elements.push_back(str.substr(element_start, length)); break;
element_t element;
if(str[element_start] == minussign) {
element.exclude = true;
element_start++;
}
if(element_start >= str.size())
break;
if(str[element_start] == L'$') {
element.type = element_t::type_t::name;
element_start++;
} else if(str[element_start] == L'@') {
element.type = element_t::type_t::setcode;
element_start++;
}
if(element_start >= str.size())
break;
wchar_t delimiter = separator;
if(str[element_start] == quotation) {
delimiter = quotation;
element_start++;
}
size_t element_end = str.find_first_of(delimiter, element_start);
if(element_end != std::wstring::npos) {
size_t length = element_end - element_start;
element.keyword = str.substr(element_start, length);
} else
element.keyword = str.substr(element_start);
element.setcode = dataManager.GetSetCode(element.keyword.c_str());
query_elements.push_back(element);
if(element_end == std::wstring::npos)
break;
element_start = element_end + 1; element_start = element_end + 1;
} else }
} else {
element_t element;
size_t element_start = 0;
if(str[element_start] == L'$') {
element.type = element_t::type_t::name;
element_start++; element_start++;
} else if(str[element_start] == L'@') {
element.type = element_t::type_t::setcode;
element_start++;
}
if(element_start < str.size()) {
element.keyword = str.substr(element_start);
element.setcode = dataManager.GetSetCode(element.keyword.c_str());
query_elements.push_back(element);
}
} }
query_elements.push_back(str.substr(element_start));
std::unordered_map<std::wstring, unsigned int> set_code_map;
for(auto elements_iterator = query_elements.begin(); elements_iterator != query_elements.end(); elements_iterator++) {
const wchar_t* element_pointer = elements_iterator->c_str();
if(element_pointer[0] == L'@')
set_code_map[*elements_iterator] = dataManager.GetSetCode(&element_pointer[1]);
else
set_code_map[*elements_iterator] = dataManager.GetSetCode(&element_pointer[0]);
if(element_pointer[0] == 0 || (element_pointer[0] == L'$' && element_pointer[1] == 0) || (element_pointer[0] == L'@' && element_pointer[1] == 0))
query_elements_track.push_back(elements_iterator);
}
for(auto elements_track_iterator = query_elements_track.begin(); elements_track_iterator != query_elements_track.end(); elements_track_iterator++)
query_elements.erase(*elements_track_iterator);
unsigned int set_code = 0;
if(pstr[0] == L'@')
set_code = dataManager.GetSetCode(&pstr[1]);
else
set_code = dataManager.GetSetCode(&pstr[0]);
if(pstr[0] == 0 || (pstr[0] == L'$' && pstr[1] == 0) || (pstr[0] == L'@' && pstr[1] == 0))
pstr = 0;
auto strpointer = dataManager._strings.begin(); auto strpointer = dataManager._strings.begin();
for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) { for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) {
const CardDataC& data = ptr->second; const CardDataC& data = ptr->second;
...@@ -927,34 +963,30 @@ void DeckBuilder::FilterCards() { ...@@ -927,34 +963,30 @@ void DeckBuilder::FilterCards() {
continue; continue;
} }
bool is_target = true; bool is_target = true;
for (auto elements_iterator = query_elements.begin(); elements_iterator != query_elements.end(); elements_iterator++) { for (auto elements_iterator = query_elements.begin(); elements_iterator != query_elements.end(); ++elements_iterator) {
const wchar_t* element_pointer = elements_iterator->c_str(); bool match = false;
if (element_pointer[0] == L'$') { if (elements_iterator->type == element_t::type_t::name) {
if(!CardNameContains(text.name.c_str(), &element_pointer[1])){ match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str());
is_target = false; } else if (elements_iterator->type == element_t::type_t::setcode) {
break; match = elements_iterator->setcode && check_set_code(data, elements_iterator->setcode);
}
}
else if (element_pointer[0] == L'@' && set_code_map[*elements_iterator]) {
if(!check_set_code(data, set_code_map[*elements_iterator])) {
is_target = false;
break;
}
} else { } else {
int trycode = BufferIO::GetVal(elements_iterator->c_str()); int trycode = BufferIO::GetVal(elements_iterator->keyword.c_str());
bool tryresult = dataManager.GetData(trycode, 0); bool tryresult = dataManager.GetData(trycode, 0);
if(!tryresult && !CardNameContains(text.name.c_str(), elements_iterator->c_str()) && text.text.find(elements_iterator->c_str()) == std::wstring::npos if(!tryresult) {
&& !mainGame->CheckRegEx(text.text, *elements_iterator) match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str())
&& (!set_code_map[*elements_iterator] || !check_set_code(data, set_code_map[*elements_iterator]))) { || text.text.find(elements_iterator->keyword) != std::wstring::npos
is_target = false; || mainGame->CheckRegEx(text.text, elements_iterator->keyword)
break; || (elements_iterator->setcode && check_set_code(data, elements_iterator->setcode));
} } else {
if(tryresult && data.code != trycode match = data.code == trycode || data.alias == trycode;
&& !(data.alias == trycode && (data.alias - data.code < CARD_ARTWORK_VERSIONS_OFFSET || data.code - data.alias < CARD_ARTWORK_VERSIONS_OFFSET))) {
is_target = false;
break;
} }
} }
if(elements_iterator->exclude)
match = !match;
if(!match) {
is_target = false;
break;
}
} }
if(is_target) if(is_target)
results.push_back(ptr); results.push_back(ptr);
......
gframe/deck_manager.cpp
View file @ dabb83eb
...@@ -58,7 +58,7 @@ void DeckManager::LoadLFListSingle(const char* path) { ...@@ -58,7 +58,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
void DeckManager::LoadLFList() { void DeckManager::LoadLFList() {
LoadLFListSingle("expansions/lflist.conf"); LoadLFListSingle("expansions/lflist.conf");
FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
if(isdir && strcmp(name, ".") && strcmp(name, "..")) { if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char fpath[1024]; char fpath[1024];
sprintf(fpath, "./expansions/%s/lflist.conf", name); sprintf(fpath, "./expansions/%s/lflist.conf", name);
LoadLFListSingle(fpath); LoadLFListSingle(fpath);
......
gframe/game.cpp
View file @ dabb83eb
...@@ -1050,7 +1050,7 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu ...@@ -1050,7 +1050,7 @@ void Game::SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gu
void Game::LoadExpansionDB() { void Game::LoadExpansionDB() {
LoadExpansionDBDirectry("./expansions"); LoadExpansionDBDirectry("./expansions");
FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [this](const char* name, bool isdir) {
if(isdir && strcmp(name, ".") && strcmp(name, "..")) { if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
LoadExpansionDBDirectry(subdir); LoadExpansionDBDirectry(subdir);
...@@ -1070,7 +1070,7 @@ void Game::LoadExpansionDBDirectry(const char* path) { ...@@ -1070,7 +1070,7 @@ void Game::LoadExpansionDBDirectry(const char* path) {
void Game::LoadExpansionStrings() { void Game::LoadExpansionStrings() {
dataManager.LoadStrings("./expansions/strings.conf"); dataManager.LoadStrings("./expansions/strings.conf");
FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [](const char* name, bool isdir) {
if(isdir && strcmp(name, ".") && strcmp(name, "..")) { if(isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char fpath[1024]; char fpath[1024];
sprintf(fpath, "./expansions/%s/strings.conf", name); sprintf(fpath, "./expansions/%s/strings.conf", name);
dataManager.LoadStrings(fpath); dataManager.LoadStrings(fpath);
......
gframe/image_manager.cpp
View file @ dabb83eb
...@@ -308,7 +308,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width, ...@@ -308,7 +308,7 @@ irr::video::ITexture* ImageManager::GetTextureExpansions(char* file, s32 width,
return img; return img;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [this, file, width, height, &img, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [this, file, width, height, &img, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
img = GetTextureExpansionsDirectry(subdir, file, width, height); img = GetTextureExpansionsDirectry(subdir, file, width, height);
......
gframe/replay_mode.cpp
View file @ dabb83eb
...@@ -951,7 +951,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -951,7 +951,7 @@ byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
gframe/single_duel.cpp
View file @ dabb83eb
...@@ -2133,7 +2133,7 @@ byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -2133,7 +2133,7 @@ byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
gframe/single_mode.cpp
View file @ dabb83eb
...@@ -868,7 +868,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -868,7 +868,7 @@ byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
gframe/tag_duel.cpp
View file @ dabb83eb
...@@ -2293,7 +2293,7 @@ byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -2293,7 +2293,7 @@ byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
return buffer; return buffer;
bool find = false; bool find = false;
FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) { FileSystem::TraversalDir("./expansions", [script_name, slen, &buffer, &find](const char* name, bool isdir) {
if(!find && isdir && strcmp(name, ".") && strcmp(name, "..")) { if(!find && isdir && strcmp(name, ".") && strcmp(name, "..") && strcmp(name, "pics") && strcmp(name, "script")) {
char subdir[1024]; char subdir[1024];
sprintf(subdir, "./expansions/%s", name); sprintf(subdir, "./expansions/%s", name);
buffer = ScriptReaderExDirectry(subdir, script_name, slen); buffer = ScriptReaderExDirectry(subdir, script_name, slen);
......
script @ 34342ebf
Subproject commit 759965b1fe8674f58e7dbb5d415da0f1a8d3fd84 Subproject commit 34342ebf0b543b13a80cafd00986cd8160d3665e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment