Merge branch tmwa:master into master

20 files changed, 559 insertions, 205 deletions

diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp
index 6e8642b..240582b 100644
--- a/src/admin/ladmin.cpp
+++ b/src/admin/ladmin.cpp
@@ -2571,7 +2571,7 @@ void parse_fromlogin(Session *s)
                 }
                 else
                 {
-                    PRINTF("Variables %i of %i used.\n"_fmt, repeat.size(), ACCOUNT_REG2_NUM);
+                    PRINTF("Variables %zi of %zi used.\n"_fmt, repeat.size(), ACCOUNT_REG2_NUM);
                     auto jlim = std::min(repeat.size(), ACCOUNT_REG2_NUM);
                     for (size_t j = 0; j < jlim; ++j)
                         PRINTF("Variable %s == `%i`\n"_fmt, repeat[j].name, repeat[j].value);
@@ -2789,7 +2789,6 @@ int do_init(Slice<ZString> argv)
 
     admin::eathena_interactive_session = isatty(0);
 
-    LADMIN_LOG(""_fmt);
     LADMIN_LOG("Configuration file readed.\n"_fmt);
 
     Iprintf("EAthena login-server administration tool.\n"_fmt);
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 70ad049..7ffdd0f 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -1040,11 +1040,15 @@ int set_account_reg2(AccountId acc, Slice<GlobalReg> reg)
     {
         if (cd.key.account_id == acc)
         {
-            for (int i = 0; i < num; ++i)
-                cd.data->account_reg2[i] = reg[i];
-            cd.data->account_reg2_num = num;
-            for (int i = num; i < ACCOUNT_REG2_NUM; ++i)
-                cd.data->account_reg2[i] = GlobalReg{};
+            int i = 0;
+            for (const GlobalReg& r : reg)
+                cd.data->account_reg2[i++] = r;
+
+            cd.data->account_reg2_num = i;
+
+            while (i < ACCOUNT_REG2_NUM)
+                cd.data->account_reg2[i++] = GlobalReg{};
+
             c++;
         }
     }
@@ -2900,8 +2904,6 @@ int do_init(Slice<ZString> argv)
     if (!loaded_config_yet)
         runflag &= load_config_file("conf/tmwa-char.conf"_s, char_::char_confs);
 
-    // a newline in the log...
-    CHAR_LOG(""_fmt);
     CHAR_LOG("do_init: char-server starting...\n"_fmt);
 
     runflag &= lan_check();
diff --git a/src/login/login.cpp b/src/login/login.cpp
index 8f3aa70..e4c1197 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -3104,8 +3104,6 @@ bool display_conf_warnings(void)
 static
 void save_config_in_log(void)
 {
-    // a newline in the log...
-    LOGIN_LOG(""_fmt);
     LOGIN_LOG("The login-server starting...\n"_fmt);
 
     // save configuration in log file
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index eaefd4f..346b0ac 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1667,36 +1667,100 @@ ATCE atcommand_pvpoff(Session *s, dumb_ptr<map_session_data> sd,
     return ATCE::OKAY;
 }
 
+
+
+static int extract_rate(Session *s, ZString message)
+{
+    int rate;
+    AString output;
+
+    if (!extract(message, &rate))
+    {
+        clif_displaymessage(s, "Please enter the new rate"_s);
+        return -1;
+    }
+    if (rate <= 0 || rate > battle_config.max_rate)
+    {
+        output = STRPRINTF("Rate adjustment must be between 1 and %d%%"_fmt,
+                           battle_config.max_rate);
+        clif_displaymessage(s, output);
+        return -1;
+    }
+    return rate;
+}
+
+// Command not removed during bexprate/jexprate split
+// because serverdata calls it.
 static
 ATCE atcommand_exprate(Session *s, dumb_ptr<map_session_data>,
         ZString message)
 {
-    int rate;
+    int rate = extract_rate(s, message);
+    if (rate < 0)
+        return ATCE::USAGE;
 
-    if (!extract(message, &rate) || !rate)
-    {
-        clif_displaymessage(s,
-                "Please, enter a rate adjustement (usage: @exprate <percent>)."_s);
+    battle_config.base_exp_rate = rate;
+    battle_config.job_exp_rate = rate;
+    AString output = STRPRINTF("Base & job XP rates now at %d percent"_fmt, rate);
+    clif_displaymessage(s, output);
+    return ATCE::OKAY;
+}
+
+static
+ATCE atcommand_bexprate(Session *s, dumb_ptr<map_session_data>,
+        ZString message)
+{
+    int rate = extract_rate(s, message);
+    if (rate < 0)
         return ATCE::USAGE;
-    }
+
     battle_config.base_exp_rate = rate;
+    AString output = STRPRINTF("Base XP rate now at %d percent"_fmt, rate);
+    clif_displaymessage(s, output);
+    return ATCE::OKAY;
+}
+
+static
+ATCE atcommand_jexprate(Session *s, dumb_ptr<map_session_data>,
+        ZString message)
+{
+    int rate = extract_rate(s, message);
+    if (rate < 0)
+        return ATCE::USAGE;
+
     battle_config.job_exp_rate = rate;
-    AString output = STRPRINTF("All Xp at %d percent"_fmt, rate);
+    AString output = STRPRINTF("Job XP rate now at %d percent"_fmt, rate);
     clif_displaymessage(s, output);
     return ATCE::OKAY;
 }
 
 static
-ATCE atcommand_rates(Session *s, dumb_ptr<map_session_data>,
+ATCE atcommand_droprate(Session *s, dumb_ptr<map_session_data>,
         ZString message)
 {
-    AString output = STRPRINTF("Experience rates: Base %d%% / Job %d%%"_fmt, battle_config.base_exp_rate, battle_config.job_exp_rate);
+    int rate = extract_rate(s, message);
+    if (rate < 0)
+        return ATCE::USAGE;
+
+    battle_config.drop_rate = rate;
+    AString output = STRPRINTF("Drops rate now at %d percent"_fmt, rate);
     clif_displaymessage(s, output);
-    output = STRPRINTF("Drop rate: 100%%"_fmt);
+    return ATCE::OKAY;
+}
+
+static
+ATCE atcommand_rates(Session *s, dumb_ptr<map_session_data>,
+        ZString message)
+{
+    AString output = STRPRINTF(
+            "Experience rates: Base %d%% / Job %d%%. Drop rate: %d%%"_fmt,
+            battle_config.base_exp_rate, battle_config.job_exp_rate,
+            battle_config.drop_rate);
     clif_displaymessage(s, output);
     return ATCE::OKAY;
 }
 
+
 static
 ATCE atcommand_pvpon(Session *s, dumb_ptr<map_session_data> sd,
         ZString)
@@ -1850,22 +1914,47 @@ ATCE atcommand_mobinfo(Session *s, dumb_ptr<map_session_data> sd,
     if (mob_id == Species())
         return ATCE::EXIST;
 
-    clif_displaymessage(s, STRPRINTF("Monster ID: %i, English Name: %s, Japanese Name: %s"_fmt, mob_id, get_mob_db(mob_id).name, get_mob_db(mob_id).jname));
-    clif_displaymessage(s, STRPRINTF("Level: %i, HP: %i, SP: %i, Base EXP: %i, JEXP: %i"_fmt, get_mob_db(mob_id).lv, get_mob_db(mob_id).max_hp, get_mob_db(mob_id).max_sp, get_mob_db(mob_id).base_exp, get_mob_db(mob_id).job_exp));
-    clif_displaymessage(s, STRPRINTF("Range1: %i, ATK1: %i, ATK2: %i, DEF: %i, MDEF: %i, CRITICAL_DEF: %i"_fmt, get_mob_db(mob_id).range, get_mob_db(mob_id).atk1, get_mob_db(mob_id).atk2, get_mob_db(mob_id).def, get_mob_db(mob_id).mdef, get_mob_db(mob_id).critical_def));
-    clif_displaymessage(s, STRPRINTF("Stats: STR: %i, AGI: %i, VIT: %i, INT: %i, DEX: %i, LUK: %i"_fmt, get_mob_db(mob_id).attrs[ATTR::STR], get_mob_db(mob_id).attrs[ATTR::AGI], get_mob_db(mob_id).attrs[ATTR::VIT], get_mob_db(mob_id).attrs[ATTR::INT], get_mob_db(mob_id).attrs[ATTR::DEX], get_mob_db(mob_id).attrs[ATTR::LUK]));
-    clif_displaymessage(s, STRPRINTF("Range2: %i, Range3: %i, Scale: %i, Race: %i, Element: %i, Element Level: %i, Mode: %i"_fmt, get_mob_db(mob_id).range2, get_mob_db(mob_id).range3, get_mob_db(mob_id).size, get_mob_db(mob_id).race, get_mob_db(mob_id).element.element, get_mob_db(mob_id).element.level, get_mob_db(mob_id).mode));
-    clif_displaymessage(s, STRPRINTF("Speed: %i, Adelay: %i, Amotion: %i, Dmotion: %i"_fmt, get_mob_db(mob_id).speed.count(), get_mob_db(mob_id).adelay.count(), get_mob_db(mob_id).amotion.count(), get_mob_db(mob_id).dmotion.count()));
-    if (get_mob_db(mob_id).mutations_nr)
-        clif_displaymessage(s, STRPRINTF("May mutate %i attribute up to %i%%"_fmt, get_mob_db(mob_id).mutations_nr, get_mob_db(mob_id).mutation_power));
+    const struct mob_db_& mob = get_mob_db(mob_id);
+
+    clif_displaymessage(s, STRPRINTF(
+            "Monster ID: %i, English Name: %s, Japanese Name: %s"_fmt,
+            mob_id, mob.name, mob.jname));
+    clif_displaymessage(s, STRPRINTF(
+            "Level: %i, HP: %i, SP: %i, Base EXP: %i, JEXP: %i"_fmt,
+            mob.lv, mob.max_hp, mob.max_sp, mob.base_exp, mob.job_exp));
+    clif_displaymessage(s, STRPRINTF(
+            "Range1: %i, ATK1: %i, ATK2: %i, DEF: %i, MDEF: %i, CRITICAL_DEF: %i"_fmt,
+            mob.range, mob.atk1, mob.atk2,
+            mob.def, mob.mdef, mob.critical_def));
+    clif_displaymessage(s, STRPRINTF(
+            "Stats: STR: %i, AGI: %i, VIT: %i, INT: %i, DEX: %i, LUK: %i"_fmt,
+            mob.attrs[ATTR::STR], mob.attrs[ATTR::AGI],
+            mob.attrs[ATTR::VIT], mob.attrs[ATTR::INT],
+            mob.attrs[ATTR::DEX], mob.attrs[ATTR::LUK]));
+    clif_displaymessage(s, STRPRINTF(
+            "Range2: %i, Range3: %i, Scale: %i, Race: %i, Element: %i, Element Level: %i, Mode: %i"_fmt,
+            mob.range2, mob.range3, mob.size, static_cast<int>(mob.race),
+            static_cast<int>(mob.element.element), mob.element.level,
+            static_cast<int>(mob.mode)));
+    clif_displaymessage(s, STRPRINTF(
+            "Speed: %li, Adelay: %li, Amotion: %li, Dmotion: %li"_fmt,
+            mob.speed.count(), mob.adelay.count(),
+            mob.amotion.count(), mob.dmotion.count()));
+
+    if (mob.mutations_nr)
+    {
+        clif_displaymessage(s, STRPRINTF(
+                "May mutate %i attribute up to %i%%"_fmt,
+                mob.mutations_nr, mob.mutation_power));
+    }
 
     for (int i = 0; i < MaxDrops; ++i)
-        if (get_mob_db(mob_id).dropitem[i].nameid)
+        if (mob.dropitem[i].nameid)
         {
-            Option<P<struct item_data>> i_data = Some(itemdb_search(get_mob_db(mob_id).dropitem[i].nameid));
+            Option<P<struct item_data>> i_data = Some(itemdb_search(mob.dropitem[i].nameid));
             RString item_name = i_data.pmd_pget(&item_data::name).copy_or(stringish<ItemName>(""_s));
 
-            int drop_rate = get_mob_db(mob_id).dropitem[i].p.num;
+            int drop_rate = mob.dropitem[i].p.num;
 
             char str[6];
             char strpos = 0;
@@ -1922,33 +2011,35 @@ ATCE atcommand_mobinfo(Session *s, dumb_ptr<map_session_data> sd,
             str[strpos] = '\0';
 
             int drop_rate2 = 10000/drop_rate;
-            clif_displaymessage(s, STRPRINTF("Drop ID %i: %i, Item Name: %s, Drop Chance: %s%% (1:%i)"_fmt,i, get_mob_db(mob_id).dropitem[i].nameid, item_name, str, drop_rate2));
+            clif_displaymessage(s, STRPRINTF(
+                    "Drop ID %i: %i, Item Name: %s, Drop Chance: %s%% (1:%i)"_fmt,
+                    i, mob.dropitem[i].nameid, item_name, str, drop_rate2));
         }
         else
             break;
 
     clif_displaymessage(s, STRPRINTF("Mob Mode Info:"_fmt));
-    if (!bool(get_mob_db(mob_id).mode & MobMode::ZERO))
+    if (!bool(mob.mode & MobMode::ZERO))
     {
-        if (bool(get_mob_db(mob_id).mode & MobMode::CAN_MOVE))
+        if (bool(mob.mode & MobMode::CAN_MOVE))
             clif_displaymessage(s, STRPRINTF("Mobile"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::LOOTER))
+        if (bool(mob.mode & MobMode::LOOTER))
             clif_displaymessage(s, STRPRINTF("Picks up loot"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::AGGRESSIVE))
+        if (bool(mob.mode & MobMode::AGGRESSIVE))
             clif_displaymessage(s, STRPRINTF("Aggro"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::ASSIST))
+        if (bool(mob.mode & MobMode::ASSIST))
             clif_displaymessage(s, STRPRINTF("Assists"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::CAST_SENSOR))
+        if (bool(mob.mode & MobMode::CAST_SENSOR))
             clif_displaymessage(s, STRPRINTF("Cast Sensor"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::BOSS))
+        if (bool(mob.mode & MobMode::BOSS))
             clif_displaymessage(s, STRPRINTF("Boss"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::PLANT))
+        if (bool(mob.mode & MobMode::PLANT))
             clif_displaymessage(s, STRPRINTF("Plant"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::CAN_ATTACK))
+        if (bool(mob.mode & MobMode::CAN_ATTACK))
             clif_displaymessage(s, STRPRINTF("Can attack"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::DETECTOR))
+        if (bool(mob.mode & MobMode::DETECTOR))
             clif_displaymessage(s, STRPRINTF("Detector"_fmt));
-        if (bool(get_mob_db(mob_id).mode & MobMode::CHANGE_TARGET))
+        if (bool(mob.mode & MobMode::CHANGE_TARGET))
             clif_displaymessage(s, STRPRINTF("Change Target"_fmt));
             /*
             Not needed here i guess
@@ -2552,7 +2643,7 @@ ATCE atcommand_character_stats_full(Session *s, dumb_ptr<map_session_data>,
                     pl_sd->def2,
                     pl_sd->def2_rate);
             clif_displaymessage(s, output);
-            output = STRPRINTF("ADD_SPEED: %d | SPEED_RATE: %d | SPEED_ADDRATE: %d | ASPD: %d | ASPD_RATE: %d | ASPD_ADDRATE: %d"_fmt,
+            output = STRPRINTF("ADD_SPEED: %ld | SPEED_RATE: %d | SPEED_ADDRATE: %d | ASPD: %ld | ASPD_RATE: %d | ASPD_ADDRATE: %d"_fmt,
                     pl_sd->speed.count(),
                     pl_sd->speed_rate,
                     pl_sd->speed_add_rate,
@@ -2576,7 +2667,7 @@ ATCE atcommand_character_stats_full(Session *s, dumb_ptr<map_session_data>,
                     pl_sd->hit,
                     pl_sd->hit_rate);
             clif_displaymessage(s, output);
-            output = STRPRINTF("DEADLY_STRIKE_RATE: %d | DEADLY_STRIKE_ADD_RATE: %d | BASE_WEAPON_DELAY_ADJUST: %d"_fmt,
+            output = STRPRINTF("DEADLY_STRIKE_RATE: %d | DEADLY_STRIKE_ADD_RATE: %d | BASE_WEAPON_DELAY_ADJUST: %ld"_fmt,
                     pl_sd->deadly_strike,
                     pl_sd->deadly_strike_add_rate,
                     pl_sd->base_weapon_delay_adjust.count());
@@ -5599,10 +5690,19 @@ Map<XString, AtCommandInfo> atcommand_info =
         "Enable PvP on your map"_s}},
     {"exprate"_s, {"<percent>"_s,
         60, atcommand_exprate,
-        "Set base job/exp rate"_s}},
+        "Set base and job exp rate"_s}},
+    {"bexprate"_s, {"<percent>"_s,
+        60, atcommand_bexprate,
+        "Set base exp rate"_s}},
+    {"jexprate"_s, {"<percent>"_s,
+        60, atcommand_jexprate,
+        "Set job exp rate"_s}},
+    {"droprate"_s, {"<percent>"_s,
+        60, atcommand_droprate,
+        "Set drop rate"_s}},
     {"rates"_s, {""_s,
         0, atcommand_rates,
-        "Show base job/exp rate"_s}},
+        "Show base and job exp and drop rates"_s}},
     {"pvpon"_s, {""_s,
         60, atcommand_pvpon,
         "Disable PvP on your map"_s}},
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index b745e05..d66308d 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -2060,18 +2060,28 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
         // 攻撃対象となりうるので攻撃 | Attack because it can be attacked
         if (sd && sd->status.weapon == ItemLook::W_BOW)
         {
-            IOff0 aidx = sd->equip_index_maybe[EQUIP::ARROW];
-            if (aidx.ok())
-            {
-                if (battle_config.arrow_decrement)
-                    pc_delitem(sd, aidx, 1, 0);
-            }
-            else
+            IOff0 widx = sd->equip_index_maybe[EQUIP::WEAPON];
+
+            OMATCH_BEGIN_SOME (sdidw, sd->inventory_data[widx])
             {
-                clif_arrow_fail(sd, 0);
-                return ATK::ZERO;
+                if (!bool(sdidw->mode & ItemMode::DONT_USE_AMMO))
+                {
+                    IOff0 aidx = sd->equip_index_maybe[EQUIP::ARROW];
+                    if (aidx.ok())
+                    {
+                        if (battle_config.arrow_decrement)
+                            pc_delitem(sd, aidx, 1, 0);
+                    }
+                    else
+                    {
+                        clif_arrow_fail(sd, 0);
+                        return ATK::ZERO;
+                    }
+                }
             }
+            OMATCH_END ();
         }
+
         wd = battle_calc_weapon_attack(src, target, SkillID::ZERO, 0, 0);
 
         // significantly increase injuries for hasted characters
@@ -2081,10 +2091,10 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
         }
 
         if (wd.damage > 0
-            && t_sc_data[StatusChange::SC_PHYS_SHIELD].timer
+            && (t_sc_data[StatusChange::SC_PHYS_SHIELD].timer || t_sc_data[StatusChange::SC_PHYS_SHIELD_ITEM].timer)
             && target->bl_type == BL::PC)
         {
-            int reduction = t_sc_data[StatusChange::SC_PHYS_SHIELD].val1;
+            int reduction = std::max(t_sc_data[StatusChange::SC_PHYS_SHIELD].val1, t_sc_data[StatusChange::SC_PHYS_SHIELD_ITEM].val1); // highest value is taken here but serverdata should make sure only one of those is active
             if (reduction > wd.damage)
                 reduction = wd.damage;
 
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 9edf2af..4d36f17 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -3865,6 +3865,12 @@ RecvResult clif_parse_WalkToXY(Session *s, dumb_ptr<map_session_data> sd)
     if (bool(sd->opt1) && sd->opt1 != (Opt1::_stone6))
         return rv;
 
+    if (sd->sc_data[StatusChange::SC_CANTMOVE].timer)
+    {
+        pc_stop_walking(sd, 1); // this is a little hack since client is a bit bugged and still moves several tiles and then gets reset to the position where status was triggered with this it only moves 1 pixel or so and gets set back
+        return rv;
+    }
+
     if (sd->invincible_timer)
         pc_delinvincibletimer(sd);
 
@@ -4617,11 +4623,18 @@ RecvResult clif_parse_DropItem(Session *s, dumb_ptr<map_session_data> sd)
         clif_displaymessage(sd->sess, "Can't drop items here."_s);
         return rv;
     }
-    if (bool(itemdb_search(sd->status.inventory[fixed.ioff2.unshift()].nameid)->mode & ItemMode::NO_DROP))
+
+    OMATCH_BEGIN_SOME (sdidn, sd->inventory_data[fixed.ioff2.unshift()])
     {
-        clif_displaymessage(sd->sess, "This item can't be dropped."_s);
-        return rv;
+        GmLevel gmlvl = pc_isGM(sd);
+        if (bool(sdidn->mode & ItemMode::NO_DROP) && gmlvl.get_all_bits() < 60)
+        {
+            clif_displaymessage(sd->sess, "This item can't be dropped."_s);
+            return rv;
+        }
     }
+    OMATCH_END ();
+
     if (sd->npc_id
         || sd->opt1 != Opt1::ZERO)
     {
@@ -4901,11 +4914,17 @@ RecvResult clif_parse_TradeAddItem(Session *s, dumb_ptr<map_session_data> sd)
     if (fixed.zeny_or_ioff2.index != 0 && !fixed.zeny_or_ioff2.ok())
         return RecvResult::Error;
     if (fixed.zeny_or_ioff2.ok())
-        if (bool(itemdb_search(sd->status.inventory[fixed.zeny_or_ioff2.unshift()].nameid)->mode & ItemMode::NO_TRADE))
+        OMATCH_BEGIN_SOME (sdidn, sd->inventory_data[fixed.zeny_or_ioff2.unshift()])
         {
-            clif_displaymessage(sd->sess, "This item can't be traded."_s);
-            return rv;
+            GmLevel gmlvl = pc_isGM(sd);
+            if (bool(sdidn->mode & ItemMode::NO_TRADE) && gmlvl.get_all_bits() < 60)
+            {
+                clif_displaymessage(sd->sess, "This item can't be traded."_s);
+                return rv;
+            }
         }
+        OMATCH_END ();
+
     trade_tradeadditem(sd, fixed.zeny_or_ioff2, fixed.amount);
 
     return rv;
diff --git a/src/map/map.cpp b/src/map/map.cpp
index ff69a56..f8e8bea 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -1241,6 +1241,20 @@ int map_setipport(MapName name, IP4Address ip, int port)
 }
 
 /*==========================================
+ * creates a hash of a map name
+ *------------------------------------------
+ */
+int map_create_hash(XString str) {
+    const int k = 67;
+    const int m = 3067;
+    int hash = 0;
+    for (int i = 0; i < str.size(); i++) {
+        hash += (str[i] * (int)pow(k, i)) % m;
+    }
+    return hash;
+}
+
+/*==========================================
  * マップ1枚読み込み
  *------------------------------------------
  */
@@ -1265,6 +1279,9 @@ bool map_readmap(map_local *m, size_t num, MapName fn)
 
     m->npc_num = 0;
     m->users = 0;
+
+    m->hash = map_create_hash(fn);
+
     really_memzero_this(&m->flag);
     if (battle_config.pk_mode)
         m->flag.set(MapFlag::PVP, 1);
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 7cf43d5..8bb5aa7 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -184,7 +184,7 @@ struct map_session_data : block_list, SessionData
         None, None, None, None, None, None, None, None, None, None,
      }}; // explicit is better than implicit
     earray<IOff0, EQUIP, EQUIP::COUNT> equip_index_maybe;
-    int weight, max_weight;
+    int weight, max_weight, max_weight_override;
     MapName mapname_;
     Session *sess; // use this, you idiots!
     short to_x, to_y;
@@ -360,7 +360,11 @@ struct npc_data : block_list
     Opt0 option;
     short flag;
 
-    bool deletion_pending;
+    enum {
+        NOT_DELETING = 0,
+        DELETION_QUEUED = 1,
+        DELETION_ACTIVE = 2
+    } deletion_pending;
 
     Array<Timer, MAX_EVENTTIMER> eventtimer;
 
@@ -527,6 +531,7 @@ struct map_local : map_abstract
     Point save;
     Point resave;
     int mask;
+    int hash;
     Array<dumb_ptr<npc_data>, MAX_NPC_PER_MAP> npc;
 };
 
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 4fd9d6d..996e2bb 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -2556,10 +2556,12 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage,
 
     // activity
     if (sd)
+    {
         if (sd->activity.attacks == 2147483647)
             sd->activity.attacks = 1;
         else
             sd->activity.attacks++;
+    }
 
     if (md->hp > 0)
     {
@@ -2736,6 +2738,9 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage,
                 if (sd && md && battle_config.pk_mode == 1
                     && (get_mob_db(md->mob_class).lv - sd->status.base_level >= 20))
                     drop_rate.num *= 1.25;  // pk_mode increase drops if 20 level difference [Valaris]
+
+                // server-wide drop rate scaling
+                drop_rate.num = (drop_rate.num * battle_config.drop_rate) / 100;
                 if (!random_::chance(drop_rate))
                     continue;
 
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp
index 47b851c..df1a09a 100644
--- a/src/map/npc-parse.cpp
+++ b/src/map/npc-parse.cpp
@@ -164,7 +164,7 @@ bool npc_load_warp(ast::npc::Warp& warp)
     nd->warp.xs = xs;
     nd->warp.ys = ys;
 
-    nd->deletion_pending = false;
+    nd->deletion_pending = npc_data::NOT_DELETING;
 
     npc_warp++;
     nd->bl_type = BL::NPC;
@@ -228,7 +228,7 @@ bool npc_load_shop(ast::npc::Shop& shop)
     nd->opt2 = Opt2::ZERO;
     nd->opt3 = Opt3::ZERO;
 
-    nd->deletion_pending = false;
+    nd->deletion_pending = npc_data::NOT_DELETING;
 
     npc_shop++;
     nd->bl_type = BL::NPC;
@@ -458,7 +458,7 @@ bool npc_load_script_none(ast::script::ScriptBody& body, ast::npc::ScriptNone& s
     nd->opt2 = Opt2::ZERO;
     nd->opt3 = Opt3::ZERO;
 
-    nd->deletion_pending = false;
+    nd->deletion_pending = npc_data::NOT_DELETING;
 
     npc_script++;
     nd->bl_type = BL::NPC;
@@ -568,7 +568,7 @@ bool npc_load_script_map(ast::script::ScriptBody& body, ast::npc::ScriptMap& scr
     nd->opt2 = Opt2::ZERO;
     nd->opt3 = Opt3::ZERO;
 
-    nd->deletion_pending = false;
+    nd->deletion_pending = npc_data::NOT_DELETING;
 
     npc_script++;
     nd->bl_type = BL::NPC;
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index ee2f30c..0a7bfc2 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -357,7 +357,7 @@ void npc_eventtimer(TimerData *, tick_t, BlockId, NpcEvent data)
                     data);
         return;
     });
-    if ((nd = ev->nd) == nullptr || nd->deletion_pending == true)
+    if ((nd = ev->nd) == nullptr || nd->deletion_pending != npc_data::NOT_DELETING)
     {
         if (battle_config.error_log)
             PRINTF("npc_event: event not found [%s]\n"_fmt,
@@ -591,7 +591,7 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname,
         ev.pos = ev2->pos;
     }
 
-    if ((nd = ev.nd) == nullptr || nd->deletion_pending == true)
+    if ((nd = ev.nd) == nullptr || nd->deletion_pending != npc_data::NOT_DELETING)
     {
         if (!mob_kill && battle_config.error_log)
             PRINTF("npc_event: event not found [%s]\n"_fmt,
@@ -767,13 +767,22 @@ int npc_click(dumb_ptr<map_session_data> sd, BlockId id)
         }
     }
 
-    if (npc_checknear(sd, id)) {
+    if (npc_checknear(sd, id))
+    {
         clif_scriptclose(sd, id);
         return 1;
     }
 
     nd = map_id_is_npc(id);
 
+    // If someone clicked on an NPC that is about to no longer exist, then
+    // release them
+    if (nd->deletion_pending != npc_data::NOT_DELETING)
+    {
+        clif_scriptclose(sd, id);
+        return 1;
+    }
+
     if (nd->flag & 1)           // 無効化されている
         return 1;
 
@@ -818,18 +827,19 @@ int npc_scriptcont(dumb_ptr<map_session_data> sd, BlockId id)
 
     nd = map_id_is_npc(id);
 
-    if (!nd /* NPC was disposed? */)
+    // If the NPC is about to be deleted, release the PC
+    if (nd->deletion_pending != npc_data::NOT_DELETING)
     {
         clif_scriptclose(sd, id);
         npc_event_dequeue(sd);
-        return 0;
+        return 1;
     }
 
     if (nd->is_script()->scr.parent &&
         map_id2bl(nd->is_script()->scr.parent) == nullptr)
     {
         npc_free(nd);
-        return 0;
+        return 1;
     }
 
     sd->npc_pos = run_script(ScriptPointer(script_or_parent(nd->is_script()), sd->npc_pos), sd->bl_id, id);
@@ -993,12 +1003,19 @@ int npc_selllist(dumb_ptr<map_session_data> sd,
         if (!nameid ||
             sd->status.inventory[item_list[i].ioff2.unshift()].amount < item_list[i].count)
             return 1;
-        if (bool(itemdb_search(nameid)->mode & ItemMode::NO_SELL_TO_NPC))
+
+        OMATCH_BEGIN_SOME (sdidn, sd->inventory_data[item_list[i].ioff2.unshift()])
         {
-            //clif_displaymessage(sd->sess, "This item can't be sold to an NPC."_s);
-            // M+ already outputs "Unable to sell unsellable item." on return value 3.
-            return 3;
+            GmLevel gmlvl = pc_isGM(sd);
+            if (bool(sdidn->mode & ItemMode::NO_SELL_TO_NPC) && gmlvl.get_all_bits() < 60)
+            {
+                //clif_displaymessage(sd->sess, "This item can't be sold to an NPC."_s);
+                // M+ already outputs "Unable to sell unsellable item." on return value 3.
+                return 3;
+            }
         }
+        OMATCH_END ();
+
         if (sd->trade_partner)
             return 2;           // cant sell while trading
         z += static_cast<double>(itemdb_value_sell(nameid)) * item_list[i].count;
@@ -1050,6 +1067,23 @@ void npc_free_internal(dumb_ptr<npc_data> nd_)
         nd_->bl_m->npc[nd_->n] = nullptr;
     }
 
+    // Also clean up any events we registered to the global ev_db
+    if (auto nd = nd_->is_script())
+    {
+        std::vector<NpcEvent> to_erase;
+        for (auto& pair : ev_db)
+        {
+            if (pair.second.nd == nd)
+            {
+                to_erase.push_back(pair.first);
+            }
+        }
+        for (auto& key : to_erase)
+        {
+            ev_db.erase(key);
+        }
+    }
+
     nd_.delete_();
 }
 
@@ -1074,10 +1108,10 @@ void npc_propagate_update(dumb_ptr<npc_data> nd)
 
 void npc_free(dumb_ptr<npc_data> nd)
 {
-    if (nd == nullptr || nd->deletion_pending == true)
+    if (nd == nullptr || nd->deletion_pending == npc_data::DELETION_ACTIVE)
         return;
 
-    nd->deletion_pending = true;
+    nd->deletion_pending = npc_data::DELETION_ACTIVE;
     nd->flag |= 1;
     clif_clearchar(nd, BeingRemoveWhy::GONE);
     npc_propagate_update(nd);
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 12af48f..9ef70fe 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -870,6 +870,7 @@ int pc_authok(AccountId id, int login_id2, ClientVersion client_version,
     sd->quick_regeneration_hp.amount = 0;
     sd->quick_regeneration_sp.amount = 0;
     sd->heal_xp = 0;
+    sd->max_weight_override = 0;
     sd->canact_tick = tick;
     sd->canmove_tick = tick;
     sd->attackabletime = tick;
@@ -1121,7 +1122,7 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first)
         b_attackrange, b_matk1, b_matk2, b_mdef, b_mdef2;
     int b_base_atk;
     int bl;
-    int aspd_rate, refinedef = 0;
+    int aspd_rate, speed_rate, refinedef = 0;
     int str, dstr, dex;
     int b_pvpchannel = 0;
 
@@ -1473,6 +1474,7 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first)
     }
 
     aspd_rate = sd->aspd_rate;
+    speed_rate = sd->speed_rate;
 
     //攻撃速度増加 | Increased attack speed
 
@@ -1483,6 +1485,9 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first)
         sd->hit += skill_power(sd, SkillID::AC_OWL) / 10;   // 20 for 200
     }
 
+    if (sd->max_weight_override)
+        sd->max_weight = sd->max_weight_override;
+
     sd->max_weight += 1000;
 
     bl = sd->status.base_level;
@@ -1548,12 +1553,15 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first)
 
         /* Slow down if protected */
 
-        if (sd->sc_data[StatusChange::SC_PHYS_SHIELD].timer)
-            aspd_rate += sd->sc_data[StatusChange::SC_PHYS_SHIELD].val1;
+        if (sd->sc_data[StatusChange::SC_PHYS_SHIELD].timer || sd->sc_data[StatusChange::SC_PHYS_SHIELD_ITEM].timer)
+            aspd_rate += std::max(sd->sc_data[StatusChange::SC_PHYS_SHIELD].val1, sd->sc_data[StatusChange::SC_PHYS_SHIELD_ITEM].val1); // highest value is taken here but serverdata should make sure only one of those is active
+
+        if (sd->sc_data[StatusChange::SC_SLOWMOVE].timer)
+            speed_rate += sd->sc_data[StatusChange::SC_SLOWMOVE].val1;
     }
 
-    if (sd->speed_rate != 100)
-        sd->speed = sd->speed * sd->speed_rate / 100;
+    if (speed_rate != 100)
+        sd->speed = sd->speed * speed_rate / 100;
     sd->speed = std::max(sd->speed, 1_ms);
     if (sd->speed_cap < interval_t::zero())
         sd->speed_cap = interval_t::zero();
@@ -1894,6 +1902,14 @@ int pc_bonus(dumb_ptr<map_session_data> sd, SP type, int val)
             if (!sd->state.lr_flag_is_arrow_2)
                 sd->base_weapon_delay_adjust += interval_t(val);
             break;
+        case SP::MAXWEIGHT:
+            if (!sd->state.lr_flag_is_arrow_2)
+                sd->max_weight = val;
+            break;
+        case SP::MAXWEIGHT_ADD:
+            if (!sd->state.lr_flag_is_arrow_2)
+                sd->max_weight += val;
+            break;
         default:
             if (battle_config.error_log)
                 PRINTF("pc_bonus: unknown type %d %d !\n"_fmt,
@@ -2404,8 +2420,12 @@ int pc_useitem(dumb_ptr<map_session_data> sd, IOff0 n)
         }
 
         P<const ScriptBuffer> script = borrow(*sdidn->use_script);
-        clif_useitemack(sd, n, amount - 1, 1);
-        pc_delitem(sd, n, 1, 1);
+
+        if (!bool(sdidn->mode & ItemMode::KEEP_AFTER_USE))
+        {
+            clif_useitemack(sd, n, amount - 1, 1);
+            pc_delitem(sd, n, 1, 1);
+        }
 
         // activity
         if (sd)
@@ -3717,6 +3737,9 @@ int pc_readparam(dumb_ptr<block_list> bl, SP type)
         case SP::MAXWEIGHT:
             val = sd ? sd->max_weight : 0;
             break;
+        case SP::MAXWEIGHT_OVERRIDE:
+            val = sd ? sd->max_weight_override : 0;
+            break;
         case SP::BASEEXP:
             val = sd ? sd->status.base_exp : 0;
             break;
@@ -3866,19 +3889,19 @@ int pc_readparam(dumb_ptr<block_list> bl, SP type)
             val = sd ? sd->mute.guild : 0;
             break;
         case SP::KILLS:
-            val = sd->activity.kills;
+            val = sd ? sd->activity.kills : 0;
             break;
         case SP::CASTS:
-            val = sd->activity.casts;
+            val = sd ? sd->activity.casts : 0;
             break;
         case SP::ITEMS_USED:
-            val = sd->activity.items_used;
+            val = sd ? sd->activity.items_used : 0;
             break;
         case SP::TILES_WALKED:
-            val = sd->activity.tiles_walked;
+            val = sd ? sd->activity.tiles_walked : 0;
             break;
         case SP::ATTACKS:
-            val = sd->activity.attacks;
+            val = sd ? sd->activity.attacks : 0;
             break;
         case SP::AUTOMOD:
             val = sd ? static_cast<int>(sd->automod) : 0;
@@ -4044,6 +4067,11 @@ int pc_setparam(dumb_ptr<block_list> bl, SP type, int val)
             sd->max_weight = val;
             clif_updatestatus(sd, type);
             break;
+        case SP::MAXWEIGHT_OVERRIDE:
+            nullpo_retz(sd);
+            sd->max_weight_override = val;
+            pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC);
+            break;
         case SP::HP:
             nullpo_retz(sd);
             // TODO: mob mutation
@@ -4131,18 +4159,23 @@ int pc_setparam(dumb_ptr<block_list> bl, SP type, int val)
             break;
         // atm only setting of casts is needed since magic is handled in serverdata but I let the others here as well for whatever reason
         case SP::KILLS:
+            nullpo_retz(sd);
             sd->activity.kills = val;
             break;
         case SP::CASTS:
+            nullpo_retz(sd);
             sd->activity.casts = val;
             break;
         case SP::ITEMS_USED:
+            nullpo_retz(sd);
             sd->activity.items_used = val;
             break;
         case SP::TILES_WALKED:
+            nullpo_retz(sd);
             sd->activity.tiles_walked = val;
             break;
         case SP::ATTACKS:
+            nullpo_retz(sd);
             sd->activity.attacks = val;
             break;
         case SP::AUTOMOD:
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp
index 76bae8d..f551ec4 100644
--- a/src/map/script-call.cpp
+++ b/src/map/script-call.cpp
@@ -1004,12 +1004,12 @@ int run_script_l(ScriptPointer sp, BlockId rid, BlockId oid,
     st.freeloop = 0;
     st.is_true = 0;
 
-    for (i = 0; i < args.size(); i++)
+    for (const argrec_t& arg : args)
     {
-        if (args[i].name.back() == '$')
-            pc_setregstr(sd, SIR::from(variable_names.intern(args[i].name)), args[i].v.s);
+        if (arg.name.back() == '$')
+            pc_setregstr(sd, SIR::from(variable_names.intern(arg.name)), arg.v.s);
         else
-            pc_setreg(sd, SIR::from(variable_names.intern(args[i].name)), args[i].v.i);
+            pc_setreg(sd, SIR::from(variable_names.intern(arg.name)), arg.v.i);
     }
     run_script_main(&st, rootscript);
 
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 8dc1989..fee39d6 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -80,14 +80,14 @@ namespace map
         if (st->oid) {                                                                          \
             dumb_ptr<npc_data> nullpo_nd = map_id_is_npc(st->oid);                              \
             if (nullpo_nd && nullpo_nd->name) {                                                 \
-                PRINTF("script:%s: " #error " @ %s\n"_fmt, BUILTIN_NAME(), nullpo_nd->name);    \
+                PRINTF("script:%s: %s @ %s\n"_fmt, BUILTIN_NAME(), error, nullpo_nd->name);     \
             } else if (nullpo_nd) {                                                             \
-                PRINTF("script:%s: " #error " (unnamed npc)\n"_fmt, BUILTIN_NAME());            \
+                PRINTF("script:%s: %s (unnamed npc)\n"_fmt, BUILTIN_NAME(), error);             \
             } else {                                                                            \
-                PRINTF("script:%s: " #error " (no npc)\n"_fmt, BUILTIN_NAME());                 \
+                PRINTF("script:%s: %s (no npc)\n"_fmt, BUILTIN_NAME(), error);                  \
             }                                                                                   \
         } else {                                                                                \
-            PRINTF("script:%s: " #error " (no npc)\n"_fmt, BUILTIN_NAME());                     \
+            PRINTF("script:%s: %s (no npc)\n"_fmt, BUILTIN_NAME(), error);                      \
         }                                                                                       \
         st->state = ScriptEndState::END;                                                        \
         return;                                                                                 \
@@ -111,7 +111,7 @@ static
 void builtin_mes(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     sd->state.npc_dialog_mes = 1;
     RString mes = HARG(0) ? conv_str(st, &AARG(0)) : ""_s;
     clif_scriptmes(sd, st->oid, mes);
@@ -125,7 +125,7 @@ static
 void builtin_mesq(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     sd->state.npc_dialog_mes = 1;
     RString mes = HARG(0) ? conv_str(st, &AARG(0)) : ""_s;
     MString mesq;
@@ -145,8 +145,8 @@ void builtin_mesn(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     dumb_ptr<npc_data> nd;
     nd = map_id_is_npc(st->oid);
-    script_nullpo_end(nd, "npc not found");
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(nd, "npc not found"_s);
+    script_nullpo_end(sd, "player not found"_s);
     sd->state.npc_dialog_mes = 1;
     RString mes = HARG(0) ? conv_str(st, &AARG(0)) : RString(nd->name.xislice_h(std::find(nd->name.begin(), nd->name.end(), '#'))); // strnpcinf
     MString mesq;
@@ -164,7 +164,7 @@ static
 void builtin_clear(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     clif_npc_action(sd, st->oid, 9, 0, 0, 0);
 }
 
@@ -389,7 +389,7 @@ static
 void builtin_next(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     st->state = ScriptEndState::STOP;
     clif_scriptnext(sd, st->oid);
 }
@@ -411,7 +411,7 @@ void builtin_close(ScriptState *st)
     }
     st->state = ScriptEndState::END;
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (sd->state.npc_dialog_mes)
         clif_scriptclose(sd, st->oid);
@@ -428,7 +428,7 @@ void builtin_close2(ScriptState *st)
 {
     st->state = ScriptEndState::STOP;
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     if (sd->state.npc_dialog_mes)
         clif_scriptclose(sd, st->oid);
     else
@@ -443,7 +443,7 @@ static
 void builtin_menu(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (sd->state.menu_or_input == 0)
     {
@@ -676,7 +676,7 @@ void builtin_isat(ScriptState *st)
     x = conv_num(st, &AARG(1));
     y = conv_num(st, &AARG(2));
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     push_int<ScriptDataInt>(st->stack,
             (x == sd->bl_x) && (y == sd->bl_y)
@@ -695,7 +695,7 @@ void builtin_warp(ScriptState *st)
     MapName str = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
     x = conv_num(st, &AARG(1));
     y = conv_num(st, &AARG(2));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     pc_setpos(sd, str, x, y, BeingRemoveWhy::GONE);
 }
@@ -748,7 +748,7 @@ void builtin_heal(ScriptState *st)
 
     hp = conv_num(st, &AARG(0));
     sp = conv_num(st, &AARG(1));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if(sd != nullptr && (sd->status.hp < 1 && hp > 0)){
         pc_setstand(sd);
@@ -901,7 +901,7 @@ void builtin_input(ScriptState *st)
     char postfix = name.back();
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     if (sd->state.menu_or_input)
     {
         // Second time (rerun)
@@ -962,7 +962,7 @@ void builtin_requestitem(ScriptState *st)
     }
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     if (sd->state.menu_or_input)
     {
         // Second time (rerunline)
@@ -1055,7 +1055,7 @@ void builtin_requestlang(ScriptState *st)
     ZString name = variable_names.outtern(reg.base());
     char postfix = name.back();
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (postfix != '$')
     {
@@ -1247,7 +1247,7 @@ void builtin_foreach(ScriptState *st)
     else if (st->rid)
         sd = script_rid2sd(st);
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     map_foreachinarea(std::bind(builtin_foreach_sub, ph::_1, event, sd->bl_id),
             m,
@@ -1279,12 +1279,23 @@ void builtin_destroy(ScriptState *st)
     /* Not safe to call destroy if others may also be paused on this NPC! */
     if (st->rid) {
         sd = script_rid2sd(st);
-        script_nullpo_end(sd, "player not found");
+        script_nullpo_end(sd, "player not found"_s);
         npc_event_dequeue(sd);
     }
 
+    // Cancel all existing timers on the NPC.
+    // They "would" never fire, and we don't want race conditions here.
+    for (int i = 0; i < MAX_EVENTTIMER; i++)
+    {
+        nd->eventtimer[i].cancel();
+    }
+    // Schedule the NPC to be freed on the next available tick.
+    // Scripts can be invoked under iteration of the ev_db global event
+    // database, and we don't want to invalidate active iterators.
+    nd->deletion_pending = npc_data::DELETION_QUEUED;
+    nd->eventtimer[0] = Timer(gettick(), std::bind(npc_free, nd));
+
     nd = nd->is_script();
-    npc_free(nd);
     st->oid = BlockId();
 
     if (!HARG(0))
@@ -1350,7 +1361,7 @@ void builtin_puppet(ScriptState *st)
     nd->npc_subtype = NpcSubtype::SCRIPT;
     npc_script++;
 
-    nd->deletion_pending = false;
+    nd->deletion_pending = npc_data::NOT_DELETING;
 
     nd->n = map_addnpc(nd->bl_m, nd);
 
@@ -1453,7 +1464,7 @@ void builtin_set(ScriptState *st)
         else
         {
             bl = script_rid2sd(st);
-            script_nullpo_end(bl, "player not found");
+            script_nullpo_end(bl, "player not found"_s);
         }
 
         int val = conv_num(st, &AARG(1));
@@ -1628,14 +1639,14 @@ void builtin_setarray(ScriptState *st)
             else
                bl = map_id_is_npc(wrap<BlockId>(tid));
         }
-        script_nullpo_end(bl, "npc not found");
+        script_nullpo_end(bl, "npc not found"_s);
         if (st->oid && bl->bl_id != st->oid)
             j = getarraysize2(reg, bl);
     }
     else if (prefix != '$' && !name.startswith(".@"_s))
     {
         bl = map_id_is_player(st->rid);
-        script_nullpo_end(bl, "player not found");
+        script_nullpo_end(bl, "player not found"_s);
     }
 
     for (; i < st->end - st->start - 2 && j < 256; i++, j++)
@@ -1674,7 +1685,7 @@ void builtin_cleararray(ScriptState *st)
     else if (prefix != '$' && !name.startswith(".@"_s))
     {
         bl = map_id_is_player(st->rid);
-        script_nullpo_end(bl, "player not found");
+        script_nullpo_end(bl, "player not found"_s);
     }
 
     for (int i = 0; i < sz; i++)
@@ -1847,7 +1858,7 @@ void builtin_gmlog(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     ZString message = ZString(conv_str(st, &AARG(0)));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     log_atcommand(sd, STRPRINTF("{SCRIPT} %s"_fmt, message));
 }
 
@@ -1861,7 +1872,7 @@ void builtin_setlook(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     LOOK type = LOOK(conv_num(st, &AARG(0)));
     int val = conv_num(st, &AARG(1));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     pc_changelook(sd, type, val);
 
@@ -1881,7 +1892,7 @@ void builtin_countitem(ScriptState *st)
     struct script_data *data;
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     data = &AARG(0);
     get_val(st, data);
@@ -1929,7 +1940,7 @@ void builtin_checkweight(ScriptState *st)
     struct script_data *data;
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     data = &AARG(0);
     get_val(st, data);
@@ -1978,7 +1989,7 @@ void builtin_getitem(ScriptState *st)
     struct script_data *data;
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     data = &AARG(0);
     get_val(st, data);
@@ -2082,7 +2093,7 @@ void builtin_delitem(ScriptState *st)
     struct script_data *data;
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     data = &AARG(0);
     get_val(st, data);
@@ -2133,7 +2144,7 @@ static
 void builtin_getversion(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     push_int<ScriptDataInt>(st->stack, unwrap<ClientVersion>(sd->client_version));
 }
 
@@ -2220,7 +2231,7 @@ void builtin_strcharinfo(ScriptState *st)
     else
         sd = script_rid2sd(st);
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     num = conv_num(st, &AARG(0));
     if (num == 0)
@@ -2277,7 +2288,7 @@ void builtin_getequipid(ScriptState *st)
     else
         sd = script_rid2sd(st);
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     num = conv_num(st, &AARG(0));
     IOff0 i = pc_checkequip(sd, equip[num - 1]);
     if (i.ok())
@@ -2336,7 +2347,7 @@ void builtin_bonus(ScriptState *st)
         type = SP(conv_num(st, &AARG(0)));
     int val = conv_num(st, &AARG(1));
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     pc_bonus(sd, type, val);
 
 }
@@ -2357,7 +2368,7 @@ void builtin_bonus2(ScriptState *st)
     int type2 = conv_num(st, &AARG(1));
     int val = conv_num(st, &AARG(2));
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     pc_bonus2(sd, type, type2, val);
 
 }
@@ -2378,7 +2389,7 @@ void builtin_skill(ScriptState *st)
     if (HARG(2))
         flag = conv_num(st, &AARG(2));
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     pc_skill(sd, id, level, flag);
     clif_skillinfoblock(sd);
 
@@ -2397,7 +2408,7 @@ void builtin_setskill(ScriptState *st)
     SkillID id = static_cast<SkillID>(conv_num(st, &AARG(0)));
     level = conv_num(st, &AARG(1));
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     level = std::min(level, MAX_SKILL_LEVEL);
     level = std::max(level, 0);
@@ -2415,7 +2426,7 @@ void builtin_getskilllv(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     SkillID id = SkillID(conv_num(st, &AARG(0)));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     push_int<ScriptDataInt>(st->stack, pc_checkskill(sd, id));
 }
 
@@ -2427,7 +2438,7 @@ static
 void builtin_overrideattack(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (HARG(0))
     {
@@ -2464,7 +2475,7 @@ static
 void builtin_getgmlevel(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     push_int<ScriptDataInt>(st->stack, pc_isGM(sd).get_all_bits());
 }
@@ -2497,7 +2508,7 @@ void builtin_getopt2(ScriptState *st)
     dumb_ptr<map_session_data> sd;
 
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     push_int<ScriptDataInt>(st->stack, static_cast<uint16_t>(sd->opt2));
 
@@ -2514,7 +2525,7 @@ void builtin_setopt2(ScriptState *st)
 
     Opt2 new_opt2 = Opt2(conv_num(st, &AARG(0)));
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (new_opt2 == sd->opt2)
         return;
@@ -2535,7 +2546,7 @@ void builtin_savepoint(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     int x, y;
     MapName str = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     x = conv_num(st, &AARG(1));
     y = conv_num(st, &AARG(2));
@@ -2635,7 +2646,7 @@ void builtin_openstorage(ScriptState *st)
 //  int sync = 0;
 //  if (st->end >= 3) sync = conv_num(st,& (st->stack->stack_data[st->start+2]));
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
 //  if (sync) {
     st->state = ScriptEndState::STOP;
@@ -2655,7 +2666,7 @@ void builtin_getexp(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     int base = 0, job = 0;
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     base = conv_num(st, &AARG(0));
     job = conv_num(st, &AARG(1));
@@ -2968,7 +2979,7 @@ void builtin_mobinfo_droparrays(ScriptState *st)
     else if (prefix != '$' && !name.startswith(".@"_s))
     {
         bl = map_id_is_player(st->rid);
-        script_nullpo_end(bl, "player not found");
+        script_nullpo_end(bl, "player not found"_s);
     }
 
     switch (request)
@@ -3177,8 +3188,8 @@ void builtin_summon(ScriptState *st)
         }
 
         mob->mode |=
-            MobMode::SUMMONED | MobMode::TURNS_AGAINST_BAD_MASTER;
-
+            MobMode::SUMMONED;  // | MobMode::TURNS_AGAINST_BAD_MASTER; <- its fun but bugged.
+                                //   This flag identified to be source of AFK PK city exploits, etc.
         mob->deletetimer = Timer(gettick() + lifespan,
                 std::bind(mob_timer_delete, ph::_1, ph::_2,
                     mob_id));
@@ -3321,7 +3332,7 @@ void builtin_addtimer(ScriptState *st)
     else if (st->rid)
         sd = script_rid2sd(st);
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     pc_addeventtimer(sd, tick, event);
 }
@@ -3354,7 +3365,7 @@ void builtin_initnpctimer(ScriptState *st)
         nd_ = npc_name2id(stringish<NpcName>(ZString(conv_str(st, &AARG(0)))));
     else
         nd_ = map_id_is_npc(st->oid);
-    script_nullpo_end(nd_, "no npc");
+    script_nullpo_end(nd_, "no npc"_s);
     assert (nd_ && nd_->npc_subtype == NpcSubtype::SCRIPT);
     dumb_ptr<npc_data_script> nd = nd_->is_script();
 
@@ -3375,7 +3386,7 @@ void builtin_startnpctimer(ScriptState *st)
         nd_ = npc_name2id(stringish<NpcName>(ZString(conv_str(st, &AARG(0)))));
     else
         nd_ = map_id_is_npc(st->oid);
-    script_nullpo_end(nd_, "no npc");
+    script_nullpo_end(nd_, "no npc"_s);
     assert (nd_ && nd_->npc_subtype == NpcSubtype::SCRIPT);
     dumb_ptr<npc_data_script> nd = nd_->is_script();
 
@@ -3395,7 +3406,7 @@ void builtin_stopnpctimer(ScriptState *st)
         nd_ = npc_name2id(stringish<NpcName>(ZString(conv_str(st, &AARG(0)))));
     else
         nd_ = map_id_is_npc(st->oid);
-    script_nullpo_end(nd_, "no npc");
+    script_nullpo_end(nd_, "no npc"_s);
     assert (nd_ && nd_->npc_subtype == NpcSubtype::SCRIPT);
     dumb_ptr<npc_data_script> nd = nd_->is_script();
 
@@ -3417,7 +3428,7 @@ void builtin_getnpctimer(ScriptState *st)
         nd_ = npc_name2id(stringish<NpcName>(ZString(conv_str(st, &AARG(1)))));
     else
         nd_ = map_id_is_npc(st->oid);
-    script_nullpo_end(nd_, "no npc");
+    script_nullpo_end(nd_, "no npc"_s);
     assert (nd_ && nd_->npc_subtype == NpcSubtype::SCRIPT);
     dumb_ptr<npc_data_script> nd = nd_->is_script();
 
@@ -3450,7 +3461,7 @@ void builtin_setnpctimer(ScriptState *st)
         nd_ = npc_name2id(stringish<NpcName>(ZString(conv_str(st, &AARG(1)))));
     else
         nd_ = map_id_is_npc(st->oid);
-    script_nullpo_end(nd_, "no npc");
+    script_nullpo_end(nd_, "no npc"_s);
     assert (nd_ && nd_->npc_subtype == NpcSubtype::SCRIPT);
     dumb_ptr<npc_data_script> nd = nd_->is_script();
 
@@ -3469,7 +3480,7 @@ void builtin_npcaction(ScriptState *st)
     int id = 0;
     short x = HARG(2) ? conv_num(st, &AARG(2)) : 0;
     short y = HARG(3) ? conv_num(st, &AARG(3)) : 0;
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if(HARG(1))
     {
@@ -3494,7 +3505,7 @@ static
 void builtin_camera(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (HARG(0))
     {
@@ -3551,7 +3562,7 @@ void builtin_setnpcdirection(ScriptState *st)
     else
         nd_ = map_id_is_npc(st->oid);
 
-    script_nullpo_end(nd_, "no npc");
+    script_nullpo_end(nd_, "no npc"_s);
 
     if (bool(conv_num(st, &AARG(1))))
         action = DamageType::SIT;
@@ -3567,7 +3578,7 @@ void builtin_setnpcdirection(ScriptState *st)
     if (st->rid)
     {
         dumb_ptr<map_session_data> sd = script_rid2sd(st);
-        script_nullpo_end(sd, "player not found");
+        script_nullpo_end(sd, "player not found"_s);
         clif_sitnpc_towards(sd, nd_, action);
         clif_setnpcdirection_towards(sd, nd_, dir);
     }
@@ -3597,7 +3608,7 @@ void builtin_announce(ScriptState *st)
             bl = map_id2bl(st->oid);
         else
             bl = script_rid2sd(st);
-        script_nullpo_end(bl, "player not found");
+        script_nullpo_end(bl, "player not found"_s);
         clif_GMmessage(bl, str, flag);
     }
     else
@@ -3716,6 +3727,23 @@ void builtin_aggravate(ScriptState *st)
 }
 
 /*==========================================
+ *  Check for summoned creature
+ *------------------------------------------
+ */
+static
+void builtin_issummon(ScriptState *st)
+{
+    dumb_ptr<mob_data> md = map_id_is_mob(wrap<BlockId>(conv_num(st, &AARG(0))));
+    int val = 0;
+    if (md)
+    {
+        val = bool(md->mode & MobMode::SUMMONED); 
+    }
+    
+    push_int<ScriptDataInt>(st->stack, val);
+}
+
+/*==========================================
  * エリア指定ユーザー数所得
  * Area Designated User Income
  *------------------------------------------
@@ -3892,6 +3920,7 @@ void builtin_sc_start(ScriptState *st)
             // all those use ms so this checks for < 1s are not needed on those
             // and it would break the cooldown symbol since many spells have cooldowns less than 1s
             case StatusChange::SC_PHYS_SHIELD:
+            case StatusChange::SC_PHYS_SHIELD_ITEM:
             case StatusChange::SC_MBARRIER:
             case StatusChange::SC_COOLDOWN:
             case StatusChange::SC_COOLDOWN_MG:
@@ -3901,7 +3930,10 @@ void builtin_sc_start(ScriptState *st)
             case StatusChange::SC_COOLDOWN_ENCH:
             case StatusChange::SC_COOLDOWN_KOY:
             case StatusChange::SC_COOLDOWN_UPMARMU:
-            break;
+            case StatusChange::SC_COOLDOWN_SG:
+            case StatusChange::SC_SLOWMOVE:
+            case StatusChange::SC_CANTMOVE:
+           break;
 
             default:
             // work around old behaviour of:
@@ -3979,7 +4011,7 @@ void builtin_resetstatus(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd;
     sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     pc_resetstate(sd);
 }
 
@@ -4161,7 +4193,7 @@ void builtin_setpvpchannel(ScriptState *st)
     if (flag < 1)
         flag = 0;
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     sd->state.pvpchannel = flag;
 }
 
@@ -4178,7 +4210,7 @@ void builtin_getpvpflag(ScriptState *st)
     else
         sd = script_rid2sd(st);
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     int num = conv_num(st, &AARG(0));
     int flag = 0;
@@ -4360,7 +4392,7 @@ static
 void builtin_getpartnerid2(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     push_int<ScriptDataInt>(st->stack, unwrap<CharId>(sd->status.partner_id));
 }
 
@@ -4425,7 +4457,7 @@ void builtin_explode(ScriptState *st)
     else if (prefix != '$' && prefix != '.')
     {
         bl = map_id2bl(st->rid)->is_player();
-        script_nullpo_end(bl, "target player not found");
+        script_nullpo_end(bl, "target player not found"_s);
     }
 
 
@@ -4476,7 +4508,7 @@ void builtin_getinventorylist(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     int j = 0;
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     for (IOff0 i : IOff0::iter())
     {
@@ -4507,7 +4539,7 @@ void builtin_getactivatedpoolskilllist(ScriptState *st)
     int skill_pool_size = skill_pool(sd, pool_skills);
     int i, count = 0;
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     for (i = 0; i < skill_pool_size; i++)
     {
@@ -4540,7 +4572,7 @@ void builtin_getunactivatedpoolskilllist(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     int i, count = 0;
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     for (i = 0; i < skill_pool_skills.size(); i++)
     {
@@ -4572,7 +4604,7 @@ void builtin_poolskill(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     SkillID skill_id = SkillID(conv_num(st, &AARG(0)));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     skill_pool_activate(sd, skill_id);
     clif_skillinfoblock(sd);
 
@@ -4587,7 +4619,7 @@ void builtin_unpoolskill(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     SkillID skill_id = SkillID(conv_num(st, &AARG(0)));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     skill_pool_deactivate(sd, skill_id);
     clif_skillinfoblock(sd);
 
@@ -4831,7 +4863,7 @@ void builtin_nude(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     for (EQUIP i : EQUIPs)
     {
@@ -4851,7 +4883,7 @@ static
 void builtin_unequipbyid(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     EQUIP slot_id = EQUIP(conv_num(st, &AARG(0)));
 
@@ -4992,7 +5024,7 @@ void builtin_title(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     ZString msg = ZString(conv_str(st, &AARG(0)));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     clif_npc_send_title(sd->sess, st->oid, msg);
 }
 
@@ -5013,7 +5045,7 @@ void builtin_smsg(ScriptState *st)
 
     int type = HARG(1) ? conv_num(st, &AARG(0)) : 0;
     ZString msg = ZString(conv_str(st, (HARG(1) ? &AARG(1) : &AARG(0))));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     if (type < 0 || type > 0xFF)
         type = 0;
 
@@ -5028,7 +5060,7 @@ static
 void builtin_remotecmd(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (HARG(1))
     {
@@ -5055,7 +5087,7 @@ void builtin_sendcollision(ScriptState *st)
     short x1, y1, x2, y2;
     x1 = x2 = conv_num(st, &AARG(2));
     y1 = y2 = conv_num(st, &AARG(3));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     if (HARG(5))
     {
@@ -5088,7 +5120,7 @@ void builtin_music(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     ZString msg = ZString(conv_str(st, &AARG(0)));
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     clif_change_music(sd, msg);
 }
 
@@ -5113,7 +5145,7 @@ void builtin_mapmask(ScriptState *st)
     else if(HARG(1) && nd)
         nd->bl_m->mask = map_mask;
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     clif_send_mask(sd, map_mask);
 }
 
@@ -5195,7 +5227,7 @@ void builtin_getlook(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     LOOK type = LOOK(conv_num(st, &AARG(0)));
     int val = -1;
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     switch (type)
     {
@@ -5239,7 +5271,7 @@ void builtin_getsavepoint(ScriptState *st)
 {
     int x, y, type;
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     type = conv_num(st, &AARG(0));
 
@@ -5333,7 +5365,7 @@ void builtin_isin(ScriptState *st)
     x2 = conv_num(st, &AARG(3));
     y2 = conv_num(st, &AARG(4));
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     push_int<ScriptDataInt>(st->stack,
               (sd->bl_x >= x1 && sd->bl_x <= x2)
@@ -5369,7 +5401,7 @@ void builtin_shop(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     dumb_ptr<npc_data> nd;
 
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     NpcName name = stringish<NpcName>(ZString(conv_str(st, &AARG(0))));
     nd = npc_name2id(name);
@@ -5387,7 +5419,7 @@ static
 void builtin_isdead(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
 
     push_int<ScriptDataInt>(st->stack, pc_isdead(sd));
 }
@@ -5421,7 +5453,7 @@ static
 void builtin_getx(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     push_int<ScriptDataInt>(st->stack, sd->bl_x);
 }
 
@@ -5433,7 +5465,7 @@ static
 void builtin_gety(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     push_int<ScriptDataInt>(st->stack, sd->bl_y);
 }
 
@@ -5445,7 +5477,7 @@ static
 void builtin_getdir(ScriptState *st)
 {
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
-    script_nullpo_end(sd, "player not found");
+    script_nullpo_end(sd, "player not found"_s);
     push_int<ScriptDataInt>(st->stack, static_cast<uint8_t>(sd->dir));
 }
 
@@ -5472,6 +5504,63 @@ void builtin_getmap(ScriptState *st)
 }
 
 /*==========================================
+ * Get the maximum x coordinate of a map
+ *------------------------------------------
+ */
+static
+void builtin_getmapmaxx(ScriptState *st)
+{
+    MapName mapname = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
+    P<map_local> m = TRY_UNWRAP(map_mapname2mapid(mapname), return);
+    push_int<ScriptDataInt>(st->stack, m->xs-1);
+}
+
+/*==========================================
+ * Get the maximum y coordinate of a map
+ *------------------------------------------
+ */
+static
+void builtin_getmapmaxy(ScriptState *st)
+{
+    MapName mapname = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
+    P<map_local> m = TRY_UNWRAP(map_mapname2mapid(mapname), return);
+    push_int<ScriptDataInt>(st->stack, m->ys-1);
+}
+
+/*==========================================
+ * Get the hash of a map
+ *------------------------------------------
+ */
+static
+void builtin_getmaphash(ScriptState *st)
+{
+    MapName mapname = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
+    P<map_local> m = TRY_UNWRAP(map_mapname2mapid(mapname), return);
+    push_int<ScriptDataInt>(st->stack, m->hash);
+}
+
+/*==========================================
+ * Get the map name from a hash
+ *------------------------------------------
+ */
+static
+void builtin_getmapnamefromhash(ScriptState *st)
+{
+    int hash = conv_num(st, &AARG(0));
+    MapName mapname;
+    for (auto& mit : maps_db)
+    {
+        map_local *ml = static_cast<map_local *>(mit.second.get());
+        if (ml->hash == hash)
+        {
+            mapname = ml->name_;
+            break;
+        }
+    }
+    push_str<ScriptDataStr>(st->stack, mapname);
+}
+
+/*==========================================
  * Get the NPC's info
  *------------------------------------------
  */
@@ -5500,7 +5589,7 @@ void builtin_strnpcinfo(ScriptState *st)
         nd = map_id_is_npc(st->oid);
     }
 
-    script_nullpo_end(nd, "npc not found");
+    script_nullpo_end(nd, "npc not found"_s);
 
     switch(num)
     {
@@ -5538,7 +5627,7 @@ void builtin_getnpcx(ScriptState *st)
         nd = map_id_is_npc(st->oid);
     }
 
-    script_nullpo_end(nd, "no npc");
+    script_nullpo_end(nd, "no npc"_s);
 
     push_int<ScriptDataInt>(st->stack, nd->bl_x);
 }
@@ -5560,7 +5649,7 @@ void builtin_getnpcy(ScriptState *st)
         nd = map_id_is_npc(st->oid);
     }
 
-    script_nullpo_end(nd, "no npc");
+    script_nullpo_end(nd, "no npc"_s);
 
     push_int<ScriptDataInt>(st->stack, nd->bl_y);
 }
@@ -5722,6 +5811,7 @@ BuiltinFunction builtin_functions[] =
     BUILTIN(shop, "s"_s, '\0'),
     BUILTIN(isdead, ""_s, 'i'),
     BUILTIN(aggravate, "i?"_s, '\0'),
+    BUILTIN(issummon, "i"_s, 'i'),
     BUILTIN(fakenpcname, "ssi"_s, '\0'),
     BUILTIN(puppet, "mxysi??"_s, 'i'),
     BUILTIN(destroy, "?"_s, '\0'),
@@ -5732,6 +5822,10 @@ BuiltinFunction builtin_functions[] =
     BUILTIN(getnpcy, "?"_s, 'i'),
     BUILTIN(strnpcinfo, "i?"_s, 's'),
     BUILTIN(getmap, "?"_s, 's'),
+    BUILTIN(getmapmaxx, "M"_s, 'i'),
+    BUILTIN(getmapmaxy, "M"_s, 'i'),
+    BUILTIN(getmaphash, "M"_s, 'i'),
+    BUILTIN(getmapnamefromhash, "i"_s, 's'),
     BUILTIN(mapexit, ""_s, '\0'),
     BUILTIN(freeloop, "i"_s, '\0'),
     BUILTIN(if_then_else, "iii"_s, 'v'),
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 87bbbda..7454cc3 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -201,9 +201,9 @@ int skill_additional_effect(dumb_ptr<block_list> src, dumb_ptr<block_list> bl,
     }
 
     sc_def_phys_shield_spell = 0;
-    if (battle_get_sc_data(bl)[StatusChange::SC_PHYS_SHIELD].timer)
+    if (battle_get_sc_data(bl)[StatusChange::SC_PHYS_SHIELD].timer || battle_get_sc_data(bl)[StatusChange::SC_PHYS_SHIELD_ITEM].timer)
         sc_def_phys_shield_spell =
-            battle_get_sc_data(bl)[StatusChange::SC_PHYS_SHIELD].val1;
+            std::max(battle_get_sc_data(bl)[StatusChange::SC_PHYS_SHIELD].val1, battle_get_sc_data(bl)[StatusChange::SC_PHYS_SHIELD_ITEM].val1); // highest value is taken here but serverdata should make sure only one of those is active
 
     // 対象の耐性 | Target resistance
     luk = battle_get_luk(bl);
@@ -753,7 +753,9 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
         case StatusChange::SC_ATKPOT:    /* attack potion [Valaris] */
         case StatusChange::SC_MATKPOT:   /* magic attack potion [Valaris] */
         case StatusChange::SC_PHYS_SHIELD:
+        case StatusChange::SC_PHYS_SHIELD_ITEM:
         case StatusChange::SC_HASTE:
+        case StatusChange::SC_SLOWMOVE:
             calc_flag = 1;
             break;
 
@@ -765,6 +767,8 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
         case StatusChange::SC_COOLDOWN_ENCH:
         case StatusChange::SC_COOLDOWN_KOY:
         case StatusChange::SC_COOLDOWN_UPMARMU:
+        case StatusChange::SC_COOLDOWN_SG:
+        case StatusChange::SC_CANTMOVE:
             break;
 
             /* option2 */
@@ -1030,7 +1034,9 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
 
         case StatusChange::SC_HASTE:
         case StatusChange::SC_PHYS_SHIELD:
+        case StatusChange::SC_PHYS_SHIELD_ITEM:
         case StatusChange::SC_MBARRIER:
+        case StatusChange::SC_SLOWMOVE:
             calc_flag = 1;
             break;
         case StatusChange::SC_HALT_REGENERATE:
@@ -1043,6 +1049,8 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
         case StatusChange::SC_COOLDOWN_ENCH:
         case StatusChange::SC_COOLDOWN_KOY:
         case StatusChange::SC_COOLDOWN_UPMARMU:
+        case StatusChange::SC_COOLDOWN_SG:
+        case StatusChange::SC_CANTMOVE:
             break;
         case StatusChange::SC_FLYING_BACKPACK:
             updateflag = SP::WEIGHT;
diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 54398f3..dc1fe62 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -186,11 +186,16 @@ int storage_storageadd(dumb_ptr<map_session_data> sd, IOff0 index, int amount)
     if (amount < 1 || amount > sd->status.inventory[index].amount)
         return 0;
 
-    if (bool(itemdb_search(sd->status.inventory[index].nameid)->mode & ItemMode::NO_STORAGE))
+    OMATCH_BEGIN_SOME (sdidn, sd->inventory_data[index])
     {
-        clif_displaymessage(sd->sess, "This item can't be stored."_s);
-        return 0;
+        GmLevel gmlvl = pc_isGM(sd);
+        if (bool(sdidn->mode & ItemMode::NO_STORAGE) && gmlvl.get_all_bits() < 60)
+        {
+            clif_displaymessage(sd->sess, "This item can't be stored."_s);
+            return 0;
+        }
     }
+    OMATCH_END ();
 
 //  log_tostorage(sd, index, 0);
     if (storage_additem(sd, stor, &sd->status.inventory[index], amount) == 0)
diff --git a/src/mmo/clif.t.hpp b/src/mmo/clif.t.hpp
index f8350a7..c1f7ed3 100644
--- a/src/mmo/clif.t.hpp
+++ b/src/mmo/clif.t.hpp
@@ -265,6 +265,8 @@ enum class SP : uint16_t
     WEIGHT                      = 24,
     // sent to client
     MAXWEIGHT                   = 25,
+    MAXWEIGHT_ADD               = 26,
+    MAXWEIGHT_OVERRIDE          = 27,
 
     // sent to client
     USTR                        = 32,
diff --git a/src/mmo/enums.hpp b/src/mmo/enums.hpp
index c4a1b17..377f7d7 100644
--- a/src/mmo/enums.hpp
+++ b/src/mmo/enums.hpp
@@ -135,6 +135,8 @@ enum class ItemMode : uint8_t
     NO_TRADE       = 2,
     NO_SELL_TO_NPC = 4,
     NO_STORAGE     = 8,
+    KEEP_AFTER_USE = 16,
+    DONT_USE_AMMO  = 32,
 };
 ENUM_BITWISE_OPERATORS(ItemMode)
 }
diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp
index 782980c..b0b6b8d 100644
--- a/src/mmo/skill.t.hpp
+++ b/src/mmo/skill.t.hpp
@@ -60,11 +60,16 @@ enum class StatusChange : uint16_t
     SC_COOLDOWN_ENCH    = 76,   // Enchanter cooldown
     SC_COOLDOWN_KOY     = 77,   // Koyntety cooldown
     SC_COOLDOWN_UPMARMU = 78,   // Upmarmu cooldown
+    SC_COOLDOWN_SG      = 79,   // Stone Golem cooldown
 
     SC_POISON           = 132,  // bad; actually used
+    SC_SLOWMOVE         = 133,  // slows down movement
+    SC_CANTMOVE         = 134,  // stops all movement
 
     SC_ATKPOT           = 185,  // item script
-    SC_MATKPOT          = 186,  // unused, but kept for parallel
+    SC_MATKPOT          = 186,  // `Matk' spell from items (val1 : power)
+
+    SC_PHYS_SHIELD_ITEM = 193,  // `Protect' spell from items, reduce damage (val1: power) can't be chancelled with detsanc
 
 // Added for Fate's spells
     SC_HIDE             = 194,  // Hide from `detect' magic (PCs only)
diff --git a/src/shared/lib.cpp b/src/shared/lib.cpp
index 0eebf17..c0a4371 100644
--- a/src/shared/lib.cpp
+++ b/src/shared/lib.cpp
@@ -35,25 +35,37 @@
 namespace tmwa
 {
     static
-    void try_read(const io::DirFd& dirfd, ZString filename)
+    void try_read(const io::DirFd& dirfd, LString dir_path, ZString filename)
     {
         io::ReadFile rf(dirfd, filename);
         if (!rf.is_open())
+        {
+            FPRINTF(stderr, "Could not open %s/%s\n"_fmt, dir_path, filename);
             abort();
+        }
         AString line;
         if (!rf.getline(line))
+        {
+            FPRINTF(stderr, "Could not read from %s/%s\n"_fmt, dir_path, filename);
             abort();
+        }
     }
 
     static
-    void try_write(const io::DirFd& dirfd, ZString filename)
+    void try_write(const io::DirFd& dirfd, LString dir_path, ZString filename)
     {
         io::WriteFile wf(dirfd, filename);
         if (!wf.is_open())
+        {
+            FPRINTF(stderr, "Could not open %s/%s\n"_fmt, dir_path, filename);
             abort();
+        }
         wf.put_line("Hello, World!"_s);
         if (!wf.close())
+        {
+            FPRINTF(stderr, "Could not write to %s/%s\n"_fmt, dir_path, filename);
             abort();
+        }
     }
 
     void check_paths()
@@ -65,13 +77,17 @@ namespace tmwa
 
         io::DirFd root(portable_root);
 
-        io::DirFd etc(root, PACKAGESYSCONFDIR.xslice_t(portable));
-        io::DirFd var(root, PACKAGELOCALSTATEDIR.xslice_t(portable));
-        io::DirFd share(root, PACKAGEDATADIR.xslice_t(portable));
+        LString etc_path = PACKAGESYSCONFDIR.xslice_t(portable);
+        LString var_path = PACKAGELOCALSTATEDIR.xslice_t(portable);
+        LString share_path = PACKAGEDATADIR.xslice_t(portable);
 
-        try_read(etc, "shared.conf"_s);
-        try_read(share, "shared.data"_s);
-        try_write(var, "shared.test"_s);
+        io::DirFd etc(root, etc_path);
+        io::DirFd var(root, var_path);
+        io::DirFd share(root, share_path);
+
+        try_read(etc, etc_path, "shared.conf"_s);
+        try_read(share, share_path, "shared.data"_s);
+        try_write(var, var_path, "shared.test"_s);
 
         // io::FD::open();
     }