Merge evol-server-data with TMW2.

Unexpected bugs may show up, beware.

Conversion scripts were NOT used

4 files changed, 23 insertions, 2 deletions

diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
index e01c7f93d..fc6b49ede 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -70,4 +70,12 @@ features: {
 	// true:  enable (Default)
 	// false: disable
 	enable_homun_autofeed: true
+
+	// Enable Attendance System for clients >= 2018-03-07bRagexeRE or 2018-04-04bRagexe
+	// true:  enable (Default)
+	// false: disable (NYI on TMW2)
+	enable_attendance_system: false
+
+	// Attendance End time in the format YearMonthDay
+	feature_attendance_endtime: 20180331
 }
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index f7ffd3f32..135df7107 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -119,3 +119,7 @@ bow_unequip_arrow: true
 // How much should rental mounts increase a player's movement speed? (Note 2)
 // Official: 25 (Default)
 boarding_halter_speed: 25
+
+// Allow to use items when the storage is open?
+// Official: false (Default)
+storage_use_item: false
diff --git a/conf/map/battle/monster.conf b/conf/map/battle/monster.conf
index beffda982..be18ae5fd 100644
--- a/conf/map/battle/monster.conf
+++ b/conf/map/battle/monster.conf
@@ -234,6 +234,10 @@ mob_slave_keep_target: true
 // See http://irowiki.org/wiki/MVP#Gravestone
 mvp_tomb_enabled: true
 
+// Delay before a tomb is spawned, in milliseconds.
+// Default: 10000 (10 seconds)
+mvp_tomb_spawn_delay: 10000
+
 // Show hp bar on monsters? (Default: yes)
 // NOTE: only works on client 2012-04-04aRagexeRE onwards
 show_monster_hp_bar: true
diff --git a/conf/messages.conf b/conf/messages.conf
index e5b2528eb..4359b080e 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -74,7 +74,10 @@
 46: %s recalled!
 47: Base level can't go any higher.
 48: Any work in progress (NPC dialog, manufacturing ...) quit and try again.
-//49-52 FREE
+49: Unable to Teleport in this area
+50: This skill cannot be used within this area.
+51: This item cannot be used within this area.
+//52 FREE
 53: '%s' stats:
 54: No player found in map '%s'.
 55: 1 player found in map '%s'.
@@ -474,7 +477,9 @@
 538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
 539: This player has %d of a kind of item (id: %d), and tried to trade %d of them.
 540: This player has been definitively blocked.
-//541-545 FREE
+//541-543 FREE
+544: <MSG>3455</MSG>
+545: <MSG>3456,%d</MSG>
 // @showmobs
 546: Please enter a mob name/id (usage: @showmobs <mob name/id>)
 547: Invalid mob name %s!