summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/map/battle/items.conf4
-rw-r--r--conf/map/battle/player.conf9
-rw-r--r--conf/map/battle/skill.conf2
-rw-r--r--conf/messages.conf6
4 files changed, 18 insertions, 3 deletions
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index 3c9ba71e9..c7aa99245 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -118,3 +118,7 @@ unequip_restricted_equipment: 0
// When unequip a bow with arrow equipped, it also unequip the arrow?
// Default: true (Official behavior, applies only in Renewal)
bow_unequip_arrow: true
+
+// How much should rental mounts increase a player's movement speed? (Note 2)
+// Official: 25 (Default)
+boarding_halter_speed: 25
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf
index 39e1d9287..de8ef6f69 100644
--- a/conf/map/battle/player.conf
+++ b/conf/map/battle/player.conf
@@ -140,6 +140,15 @@ max_cart_weight: 8000
// Prevent logout of players after being hit for how long (in ms, 0 disables)?
prevent_logout: 10000
+// When should the server prevent a player from logging out? Have no effect if prevent_logout is disabled. (Note 3)
+// Official servers prevent players from logging out after attacking, casting skills, and taking damage.
+// 0 = Players can always logout
+// 1 = Prevent logout on login
+// 2 = Prevent logout after attacking
+// 4 = Prevent logout after casting skill
+// 8 = Prevent logout after being hit
+prevent_logout_trigger: 14
+
// Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)
show_hp_sp_drain: false
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index 8d7c9df44..b88c5d141 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -284,7 +284,7 @@ sg_miracle_skill_duration: 3600000
sg_angel_skill_ratio: 10
// Skills that bHealPower has effect on
-// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun
+// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun, 32: Highness Heal
skill_add_heal_rate: 7
// Whether the damage of EarthQuake with a single target on screen is able to be reflected.
diff --git a/conf/messages.conf b/conf/messages.conf
index efc8d8a36..768bee777 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -51,7 +51,8 @@
23: Job level can't go any higher.
24: Job level raised.
25: Job level lowered.
-//26-27 FREE
+26: [%d] seconds left until you can use
+//27 FREE
28: No player found.
29: 1 player found.
30: %d players found.
@@ -72,7 +73,8 @@
45: Guild level change failed.
46: %s recalled!
47: Base level can't go any higher.
-//48-52 FREE
+48: Any work in progress (NPC dialog, manufacturing ...) quit and try again.
+//49-52 FREE
53: '%s' stats:
54: No player found in map '%s'.
55: 1 player found in map '%s'.