diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.cpp | 2 | ||||
| -rw-r--r-- | src/map/script-fun.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 63b1497..6057278 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -3435,6 +3435,8 @@ int pc_readparam(dumb_ptr<block_list> bl, SP type) val = sd ? pc_nextjobexp(sd) : 0; break; case SP::HP: + if (sd && pc_isdead(sd)) + break; // val = 0 val = battle_get_hp(bl); break; case SP::MAXHP: diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index a5e49da..898eec0 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -584,6 +584,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)); + pc_setpos(sd, str, x, y, BeingRemoveWhy::GONE); } @@ -4571,7 +4572,12 @@ void builtin_getdir(ScriptState *st) static void builtin_getmap(ScriptState *st) { - dumb_ptr<map_session_data> sd = script_rid2sd(st); + dumb_ptr<map_session_data> sd; + + if (HARG(0)) //指定したキャラを状態異常にする + sd = map_id_is_player(wrap<BlockId>(conv_num(st, &AARG(0)))); + else + sd = script_rid2sd(st); push_str<ScriptDataStr>(st->stack, sd->bl_m->name_); } @@ -4840,7 +4846,7 @@ BuiltinFunction builtin_functions[] = BUILTIN(getnpcx, "?"_s, 'i'), BUILTIN(getnpcy, "?"_s, 'i'), BUILTIN(strnpcinfo, "i?"_s, 's'), - BUILTIN(getmap, ""_s, 's'), + BUILTIN(getmap, "?"_s, 's'), BUILTIN(mapexit, ""_s, '\0'), BUILTIN(freeloop, "i"_s, '\0'), BUILTIN(if_then_else, "iii"_s, '.'), |