diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/common/inter-server.conf | 4 | ||||
-rw-r--r-- | conf/map/battle/items.conf | 12 | ||||
-rw-r--r-- | conf/map/battle/player.conf | 2 | ||||
-rw-r--r-- | conf/map/battle/skill.conf | 8 | ||||
-rw-r--r-- | conf/map/script.conf | 10 |
5 files changed, 29 insertions, 7 deletions
diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf index 7696774d6..9960c46d6 100644 --- a/conf/common/inter-server.conf +++ b/conf/common/inter-server.conf @@ -76,9 +76,10 @@ inter_configuration: { acc_reg_str_db: "acc_reg_str_db" char_reg_str_db: "char_reg_str_db" char_reg_num_db: "char_reg_num_db" - global_acc_reg_num_db: "global_acc_reg_num_db" global_acc_reg_str_db: "global_acc_reg_str_db" + map_reg_num_db: "map_reg_num_db" + map_reg_str_db: "map_reg_str_db" } pc: { hotkey_db: "hotkey" @@ -113,7 +114,6 @@ inter_configuration: { position_db: "guild_position" storage_db: "guild_storage" } - mapreg_db: "mapreg" autotrade_merchants_db: "autotrade_merchants" autotrade_data_db: "autotrade_data" npc_market_data_db: "npc_market_data" 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/player.conf b/conf/map/battle/player.conf index 4658b1296..e30c3c134 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -225,7 +225,7 @@ shadow_refine_atk: true // Keep player facing direction after warping? // Default: false (on official servers players always faces north) -player_warp_keep_direction: true +player_warp_keep_direction: false // Can dead players do actions like trading, open a chat room, etc.? // 0x0 - Don't allow trading and open chat rooms. 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 diff --git a/conf/map/script.conf b/conf/map/script.conf index fc4f26965..4eb84edf4 100644 --- a/conf/map/script.conf +++ b/conf/map/script.conf @@ -59,6 +59,16 @@ script_configuration: { // Defaults to INT_MAX. //input_max_value: 2147483647 input_max_value: 10000000 + + // Specifies whether functions not explicitly marked with a "private" or + // "public" keyword should be treated as "private" by default. + // Default: true + functions_private_by_default: true + + // Specifies whether public functions can be invoked as NPC events. This + // allows, for example, to use a `public function OnDeath { ... }` instead + // of a `OnDeath:` label for mob death events. + functions_as_events: false } import: "conf/import/script.conf" |