summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/map/battle/party.conf6
-rw-r--r--conf/messages.conf10
2 files changed, 11 insertions, 5 deletions
diff --git a/conf/map/battle/party.conf b/conf/map/battle/party.conf
index 07a0bdaea..a38321806 100644
--- a/conf/map/battle/party.conf
+++ b/conf/map/battle/party.conf
@@ -41,6 +41,12 @@ party_update_interval: 1000
// 1: Athena - bar is updated with the party map dots (up to 1 second delay)
party_hp_mode: 0
+// When changing party leader, should the new leader be in the same map
+// as the current leader. (Note 1)
+// true: Aegis - They must be in the same map
+// false: Athena - They can be in different maps
+party_change_leader_same_map: true
+
// When 'Party Share' item sharing is enabled in a party,
// announce in the party which party-member received the item and what's he received? (Note 1)
show_party_share_picker: true
diff --git a/conf/messages.conf b/conf/messages.conf
index abf1f5042..155cfd881 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -17,7 +17,7 @@
// 550-699: reserved for job names (also loaded by char server)
// 900-1500: @atcommand
-// To disable a string (%s) field, make it's max length 0:
+// To disable a string (%s) field, make its max length 0:
// eg:
// 270: *%s %s* (@me format)
// 270: *%.0s%s* (remove the character's name from it)
@@ -178,8 +178,8 @@
166: No item has been refined.
167: 1 item has been refined.
168: %d items have been refined.
-169: The item (%d: '%s') is not equipable.
-170: The item is not equipable.
+169: The item (%d: '%s') is not equippable.
+170: The item is not equippable.
171: %d - void
172: Speed returned to normal.
//173 FREE
@@ -733,7 +733,7 @@
//995 FREE
// @refine
-996: Please enter a position and an amount (usage: @refine <equip position> <+/- amount>).
+996: Please enter a position bitmask and an amount (usage: @refine <equip position> <+/- amount>).
997: %d: Lower Headgear
998: %d: Right Hand
999: %d: Garment
@@ -1448,7 +1448,7 @@
1427: -- %s bindto <channel name>
1428: - binds your global chat to <channel name>, making anything you type in global be sent to the channel
1429: -- %s unbind
-1430: - unbinds your global chat from its attached channel (if binded)
+1430: - unbinds your global chat from its attached channel (if bound)
1431: Your global chat is now bound to the '%s' channel
1432: Your global chat is not bound to any channel
1433: Your global chat is no longer bound to the '#%s' channel