diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/common/inter-server.conf | 1 | ||||
-rw-r--r-- | conf/map/battle/misc.conf | 2 | ||||
-rw-r--r-- | conf/messages.conf | 18 |
3 files changed, 15 insertions, 6 deletions
diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf index 5bec34d44..7696774d6 100644 --- a/conf/common/inter-server.conf +++ b/conf/common/inter-server.conf @@ -118,6 +118,7 @@ inter_configuration: { autotrade_data_db: "autotrade_data" npc_market_data_db: "npc_market_data" npc_barter_data_db: "npc_barter_data" + npc_expanded_barter_data_db: "npc_expanded_barter_data" } } diff --git a/conf/map/battle/misc.conf b/conf/map/battle/misc.conf index cc2abc16c..8cc1d0171 100644 --- a/conf/map/battle/misc.conf +++ b/conf/map/battle/misc.conf @@ -101,7 +101,7 @@ duel_allow_teleport: false // Autoleave duel when die duel_autoleave_when_die: true -// Delay between using @duel in minutes +// Delay between using @duel in seconds duel_time_interval: 60 // Restrict duel usage to same map diff --git a/conf/messages.conf b/conf/messages.conf index bb96b7ebc..98b0e0a9d 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -368,7 +368,7 @@ 353: Duel: The Player is in the duel already. 354: Duel: Invitation has been sent. 355: Duel: You can't use @duel without @reject. -356: Duel: You can take part in duel once per %d minutes. +356: Duel: You can take part in duel again after %d seconds. 357: Duel: Invalid value. 358: Duel: You can't use @leave. You aren't a duelist. 359: Duel: You've left the duel. @@ -1016,8 +1016,8 @@ // @loadnpc 1132: Please enter a script file name (usage: @loadnpc <file name>). -// @npcoff -1133: Please enter a NPC name (usage: @npcoff <NPC_name>). +// @unloadnpc +1133: Please enter a NPC name (Usage: @unloadnpc <NPC_name> {<flag>}). // @jail 1134: Please enter a player name (usage: @jail <char_name>). @@ -1455,8 +1455,8 @@ 1384: User '%s' permissions updated successfully. The changes are temporary. // @unloadnpcfile -1385: Usage: @unloadnpcfile <file name> -1386: File unloaded. Be aware that mapflags and monsters spawned directly are not removed. +1385: Usage: @unloadnpcfile <path> {<flag>} +1386: File unloaded. Be aware that some changes made by NPC are not reverted on unload. See doc/atcommands.txt for details. 1387: File not found. // General command messages @@ -1636,5 +1636,13 @@ 1514: %d: Refine All Equip (Costume) 1515: %d: Refine All Equip (Shadow) +// @reloadnpc +1516: Usage: @reloadnpc <path> {<flag>} +1517: Script could not be unloaded. + +// File name validation +1518: Not a file. +1519: Can't open file. + //Custom translations import: conf/import/msg_conf.txt |