diff options
| author | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2022-12-22 22:31:23 +0000 |
|---|---|---|
| committer | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2022-12-22 22:31:23 +0000 |
| commit | a6eeda410b4f27b5c6f065ee8a0d7c48420748d9 (patch) | |
| tree | 09dd88b4c9d8f72196748b12302495411e746200 /src/map/script-fun.cpp | |
| parent | 3f9bfc2f611f4c775c3f1ead7a6c48d2f287e187 (diff) | |
| parent | 67bf4970c20f18a55cab7adde58ef346f3d2ad1e (diff) | |
| download | tmwa-a6eeda410b4f27b5c6f065ee8a0d7c48420748d9.tar.gz tmwa-a6eeda410b4f27b5c6f065ee8a0d7c48420748d9.tar.bz2 tmwa-a6eeda410b4f27b5c6f065ee8a0d7c48420748d9.tar.xz tmwa-a6eeda410b4f27b5c6f065ee8a0d7c48420748d9.zip | |
Merge branch 'mobs_and_drops' into 'master'
mobs critical_def + 10 drops + storage 500
See merge request legacy/tmwa!242
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index e42dcd2..9ee76a2 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -2700,6 +2700,9 @@ void builtin_mobinfo(ScriptState *st) case MobInfo::MDEF: info = get_mob_db(mob_id).mdef; break; + case MobInfo::CRITICAL_DEF: + info = get_mob_db(mob_id).critical_def; + break; case MobInfo::STR: info = get_mob_db(mob_id).attrs[ATTR::STR]; break; @@ -2757,6 +2760,19 @@ void builtin_mobinfo(ScriptState *st) case MobInfo::MUTATION_POWER: info = get_mob_db(mob_id).mutation_power; break; + case MobInfo::DROPID0: + info = unwrap<ItemNameId>(get_mob_db(mob_id).dropitem[0].nameid); + break; + case MobInfo::DROPNAME0: + { + Option<P<struct item_data>> i_data = Some(itemdb_search(get_mob_db(mob_id).dropitem[0].nameid)); + info_str = i_data.pmd_pget(&item_data::name).copy_or(stringish<ItemName>(""_s)); + mode = 1; + } + break; + case MobInfo::DROPPERCENT0: + info = get_mob_db(mob_id).dropitem[0].p.num; + break; case MobInfo::DROPID1: info = unwrap<ItemNameId>(get_mob_db(mob_id).dropitem[0].nameid); break; @@ -2861,6 +2877,19 @@ void builtin_mobinfo(ScriptState *st) case MobInfo::DROPPERCENT8: info = get_mob_db(mob_id).dropitem[7].p.num; break; + case MobInfo::DROPID9: + info = unwrap<ItemNameId>(get_mob_db(mob_id).dropitem[7].nameid); + break; + case MobInfo::DROPNAME9: + { + Option<P<struct item_data>> i_data = Some(itemdb_search(get_mob_db(mob_id).dropitem[7].nameid)); + info_str = i_data.pmd_pget(&item_data::name).copy_or(stringish<ItemName>(""_s)); + mode = 1; + } + break; + case MobInfo::DROPPERCENT9: + info = get_mob_db(mob_id).dropitem[7].p.num; + break; default: PRINTF("builtin_mobinfo: unknown request\n"_fmt); push_int<ScriptDataInt>(st->stack, -1); |