diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.cpp | 12 | ||||
| -rw-r--r-- | src/map/itemdb.cpp | 1 | ||||
| -rw-r--r-- | src/map/itemdb.hpp | 2 | ||||
| -rw-r--r-- | src/map/script-fun.cpp | 69 |
4 files changed, 7 insertions, 77 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 71db4a3..63a1159 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -3037,10 +3037,10 @@ ATCE atcommand_idsearch(Session *s, dumb_ptr<map_session_data>, for (ItemNameId i = wrap<ItemNameId>(0); i < wrap<ItemNameId>(-1); i = next(i)) { P<struct item_data> item = TRY_UNWRAP(itemdb_exists(i), continue); - if (item->jname.contains_seq(item_name)) + if (item->name.contains_seq(item_name)) { match++; - output = STRPRINTF("%s: %d"_fmt, item->jname, item->nameid); + output = STRPRINTF("%s: %d"_fmt, item->name, item->nameid); clif_displaymessage(s, output); } } @@ -3975,9 +3975,9 @@ ATCE atcommand_character_item_list(Session *s, dumb_ptr<map_session_data> sd, AString output; if (true) - output = STRPRINTF("%d %s (%s, id: %d) %s"_fmt, + output = STRPRINTF("%d %s (id: %d) %s"_fmt, pl_sd->status.inventory[i].amount, - item_data->name, item_data->jname, + item_data->name, pl_sd->status.inventory[i].nameid, AString(equipstr)); clif_displaymessage(s, output); @@ -4051,9 +4051,9 @@ ATCE atcommand_character_storage_list(Session *s, dumb_ptr<map_session_data> sd, } AString output; if (true) - output = STRPRINTF("%d %s (%s, id: %d)"_fmt, + output = STRPRINTF("%d %s (id: %d)"_fmt, stor->storage_[i].amount, - item_data->name, item_data->jname, + item_data->name, stor->storage_[i].nameid); clif_displaymessage(s, output); } diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 7dd725e..7b23503 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -188,7 +188,6 @@ bool itemdb_readdb(ZString filename) item_data idv {}; idv.nameid = item.id.data; idv.name = item.name.data; - idv.jname = item.jname.data; idv.type = item.type.data; idv.value_buy = item.buy_price.data ?: item.sell_price.data * 2; idv.value_sell = item.sell_price.data ?: item.buy_price.data / 2; diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 5e19c0b..19f40a8 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -36,7 +36,7 @@ namespace map struct item_data { ItemNameId nameid; - ItemName name, jname; + ItemName name; int value_buy; int value_sell; ItemType type; diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 4c20555..744f2c3 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -1124,45 +1124,6 @@ void builtin_freeloop(ScriptState *st) } /*========================================== - * 装備名文字列（精錬メニュー用） - *------------------------------------------ - */ -static -void builtin_getequipname(ScriptState *st) -{ - int num; - dumb_ptr<map_session_data> sd; - - AString buf; - - sd = script_rid2sd(st); - num = conv_num(st, &AARG(0)); - IOff0 i = pc_checkequip(sd, equip[num - 1]); - if (i.ok()) - { - Option<P<struct item_data>> item_ = sd->inventory_data[i]; - OMATCH_BEGIN (item_) - { - OMATCH_CASE_SOME (item) - { - buf = STRPRINTF("%s-[%s]"_fmt, pos_str[num - 1], item->jname); - } - OMATCH_CASE_NONE () - { - buf = STRPRINTF("%s-[%s]"_fmt, pos_str[num - 1], pos_str[10]); - } - } - OMATCH_END (); - } - else - { - buf = STRPRINTF("%s-[%s]"_fmt, pos_str[num - 1], pos_str[10]); - } - push_str<ScriptDataStr>(st->stack, buf); - -} - -/*========================================== * 装備品による能力値ボーナス *------------------------------------------ */ @@ -2258,34 +2219,6 @@ void builtin_divorce(ScriptState *st) push_int<ScriptDataInt>(st->stack, 1); } -/*========================================== - * IDからItem名 - *------------------------------------------ - */ -static -void builtin_getitemname(ScriptState *st) -{ - Option<P<struct item_data>> i_data = None; - struct script_data *data; - - data = &AARG(0); - get_val(st, data); - if (data->is<ScriptDataStr>()) - { - ZString name = ZString(conv_str(st, data)); - i_data = itemdb_searchname(name); - } - else - { - ItemNameId item_id = wrap<ItemNameId>(conv_num(st, data)); - i_data = Some(itemdb_search(item_id)); - } - - RString item_name = i_data.pmd_pget(&item_data::jname).copy_or(stringish<ItemName>("Unknown Item"_s)); - - push_str<ScriptDataStr>(st->stack, item_name); -} - static void builtin_getitemlink(ScriptState *st) { @@ -3097,7 +3030,6 @@ BuiltinFunction builtin_functions[] = BUILTIN(getcharid, "i?"_s, 'i'), BUILTIN(strcharinfo, "i"_s, 's'), BUILTIN(getequipid, "i"_s, 'i'), - BUILTIN(getequipname, "i"_s, 's'), BUILTIN(bonus, "ii"_s, '\0'), BUILTIN(bonus2, "iii"_s, '\0'), BUILTIN(skill, "ii?"_s, '\0'), @@ -3152,7 +3084,6 @@ BuiltinFunction builtin_functions[] = BUILTIN(mobcount, "ME"_s, 'i'), BUILTIN(marriage, "P"_s, 'i'), BUILTIN(divorce, ""_s, 'i'), - BUILTIN(getitemname, "I"_s, 's'), BUILTIN(getitemlink, "I"_s, 's'), BUILTIN(getspellinvocation, "s"_s, 's'), BUILTIN(getpartnerid2, ""_s, 'i'), |