diff options
| author | Haru <haru@dotalux.com> | 2020-06-01 04:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 04:18:52 +0200 |
| commit | 530af7e587899f66854447e2b8251cbf12c481c3 (patch) | |
| tree | 74453a3f8e6fdeaa3349132b820e29ec8fee8d7b /conf | |
| parent | 8a4667a265227587dcc288f75dfe948f5df46034 (diff) | |
| parent | 9a64eca5235da46655ca64ba5916c6fd4d90208a (diff) | |
| download | hercules-530af7e587899f66854447e2b8251cbf12c481c3.tar.gz hercules-530af7e587899f66854447e2b8251cbf12c481c3.tar.bz2 hercules-530af7e587899f66854447e2b8251cbf12c481c3.tar.xz hercules-530af7e587899f66854447e2b8251cbf12c481c3.zip | |
Merge pull request #2718 from Kenpachi2k13/prere_use_items_skills_in_npc
Add/extend battle flags to enable item/skill usage while interacting with NPC
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/map/battle/items.conf | 12 | ||||
| -rw-r--r-- | conf/map/battle/skill.conf | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf index 4788d7b30..ef383e19b 100644 --- a/conf/map/battle/items.conf +++ b/conf/map/battle/items.conf @@ -100,10 +100,14 @@ autospell_stacking: false // Default: true (official) item_restricted_consumption_type: true -// Enable all NPC to allow changing of equipments while interacting? (Note 1) -// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt) -// Default: true (official) -item_enabled_npc: true +// Which item actions are allowed while interacting with NPC? (Note 3) +// Script commands 'enable_items/disable_items' will not be overridden. (See doc/script_commands.txt.) +// 0x0 (ITEMENABLEDNPC_NONE) - Don't allow any item actions. +// 0x1 (ITEMENABLEDNPC_EQUIP) - Allow changing equipment. +// 0x2 (ITEMENABLEDNPC_CONSUME) - Allow consuming usable items. +// Official RE: 0x1 (Default value.) +// Official Pre-RE: 0x3 +item_enabled_npc: 0x1 // Unequip the equipments that has disabled by map_zone_db.conf ? // 0 : disabled equipments and cards are nullify (official) diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf index a40b52124..fe9ca638a 100644 --- a/conf/map/battle/skill.conf +++ b/conf/map/battle/skill.conf @@ -347,3 +347,11 @@ stormgust_knockback: true // 0 : (official) Magic Rod's animation occurs every time it is used. // 1 : Magic Rod's animation would not occur unless a spell was absorbed. (old behavior) magicrod_type: 0 + +// Which skills are allowed to use while interacting with NPC? +// 0 (SKILLENABLEDNPC_NONE) - Don't allow using skills. +// 1 (SKILLENABLEDNPC_SELF) - Allow using non-damaging self skills. +// 2 (SKILLENABLEDNPC_ALL) - Allow using all skills. +// Official RE: 0 (Default value.) +// Official Pre-RE: 1 +skill_enabled_npc: 0 |