diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-13 01:43:11 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-13 05:17:57 +0200 |
| commit | 6042366ec5432c6672974e476c23e41dbaffe5fb (patch) | |
| tree | 4d3a4932460a9ccba35bf2a5fc9795f20a9c3e8b /src | |
| parent | a271110b6c53cf268747ab74d1471452909c5272 (diff) | |
| download | hercules-6042366ec5432c6672974e476c23e41dbaffe5fb.tar.gz hercules-6042366ec5432c6672974e476c23e41dbaffe5fb.tar.bz2 hercules-6042366ec5432c6672974e476c23e41dbaffe5fb.tar.xz hercules-6042366ec5432c6672974e476c23e41dbaffe5fb.zip | |
Add optional parameter <flag> to enable_items() and disable_items() script commands
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/script.c | 67 |
1 files changed, 58 insertions, 9 deletions
diff --git a/src/map/script.c b/src/map/script.c index 46b7ef8f5..bda461d5d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -8764,22 +8764,71 @@ static BUILDIN(delitemidx) return true; } -/*========================================== - * Enables/Disables use of items while in an NPC [Skotlex] - *------------------------------------------*/ +/** + * Enable item actions while interacting with NPC. + * + * @code{.herc} + * enableitemuse({<flag>}); + * enable_items({<flag>}); + * @endcode + * + **/ static BUILDIN(enableitemuse) { + int flag = battle_config.item_enabled_npc; + + if (script_hasdata(st, 2)) { + if (!script_isinttype(st, 2)) + return true; + + flag = script_getnum(st, 2); + } + + if (flag < 0) + return true; + struct map_session_data *sd = script->rid2sd(st); - if (sd != NULL) - st->npc_item_flag = sd->npc_item_flag = 1; + + if (sd == NULL) + return true; + + st->npc_item_flag |= flag; + sd->npc_item_flag |= flag; + return true; } +/** + * Disable item actions while interacting with NPC. + * + * @code{.herc} + * disableitemuse({<flag>}); + * disable_items({<flag>}); + * @endcode + * + **/ static BUILDIN(disableitemuse) { + int flag = battle_config.item_enabled_npc; + + if (script_hasdata(st, 2)) { + if (!script_isinttype(st, 2)) + return true; + + flag = script_getnum(st, 2); + } + + if (flag < 0) + return true; + struct map_session_data *sd = script->rid2sd(st); - if (sd != NULL) - st->npc_item_flag = sd->npc_item_flag = 0; + + if (sd == NULL) + return true; + + st->npc_item_flag &= ~flag; + sd->npc_item_flag &= ~flag; + return true; } @@ -26818,8 +26867,8 @@ static void script_parse_builtin(void) BUILDIN_DEF(delitem,"vi?"), BUILDIN_DEF(delitem2,"viiiiiiii?"), BUILDIN_DEF(delitemidx, "i??"), - BUILDIN_DEF2(enableitemuse,"enable_items",""), - BUILDIN_DEF2(disableitemuse,"disable_items",""), + BUILDIN_DEF2(enableitemuse, "enable_items", "?"), + BUILDIN_DEF2(disableitemuse, "disable_items", "?"), BUILDIN_DEF(cutin,"si"), BUILDIN_DEF(viewpoint,"iiiii"), BUILDIN_DEF(heal,"ii"), |