Update conf and db from hercules.

4 files changed, 43 insertions, 21 deletions

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index bf6fa40f..a28804d4 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -159,3 +159,8 @@ client_accept_chatdori: 0
 // A value of 100 (allowing 100% blank pixels) disables this check.
 // NOTE: Enabling this option slightly degrades performance.
 client_emblem_max_blank_percent: 100
+
+// Show the MVP EXP reward message for clients 2013-12-23cRagexe and newer? (Note 1)
+// kRO removed the packet and this re-enables the message.
+// Official: false.
+mvp_exp_reward_message: false
diff --git a/conf/map/logs.conf b/conf/map/logs.conf
index aa4e16e9..4f3a8a4d 100644
--- a/conf/map/logs.conf
+++ b/conf/map/logs.conf
@@ -34,29 +34,38 @@
 
 map_log: {
 	// Enable Logs? (Note 3)
-	// 0x00000 - Don't log at all
-	// 0x00001 - (T) Log trades
-	// 0x00002 - (V) Log vending transactions
-	// 0x00004 - (P) Log items drop/picked by players
-	// 0x00008 - (L) Log items drop/looted by monsters
-	// 0x00010 - (S) Log NPC transactions (buy/sell)
-	// 0x00020 - (N) Log Script transactions (items deleted/acquired through quests)
-	// 0x00040 - (D) Log items stolen from mobs (Steal/Gank)
-	// 0x00080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
-	// 0x00100 - (O) Log produced/ingredient items
-	// 0x00200 - (U) Log MVP prize items
-	// 0x00400 - (A) Log player created/deleted items (through @/# commands)
-	// 0x00800 - (R) Log items placed/retrieved from storage.
-	// 0x01000 - (G) Log items placed/retrieved from guild storage.
-	// 0x02000 - (E) Log mail system transactions.
-	// 0x04000 - (I) Log auction system transactions.
-	// 0x08000 - (B) Log buying store transactions
-	// 0x20000 - (K) Log account bank transactions
-	// 0x10000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
-	//           rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill)
+	// 0x0000000 - Don't log at all
+	// 0x0000001 - (T) Log trades
+	// 0x0000002 - (V) Log vending transactions
+	// 0x0000004 - (P) Log items drop/picked by players
+	// 0x0000008 - (L) Log items drop/looted by monsters
+	// 0x0000010 - (S) Log NPC transactions (buy/sell)
+	// 0x0000020 - (N) Log Script transactions (items deleted/acquired through quests)
+	// 0x0000040 - (D) Log items stolen from mobs (Steal/Gank)
+	// 0x0000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
+	// 0x0000100 - (O) Log produced/ingredient items
+	// 0x0000200 - (U) Log MVP prize items
+	// 0x0000400 - (A) Log player created/deleted items (through @/# commands)
+	// 0x0000800 - (R) Log items placed/retrieved from storage.
+	// 0x0001000 - (G) Log items placed/retrieved from guild storage.
+	// 0x0002000 - (E) Log mail system transactions.
+	// 0x0004000 - (I) Log auction system transactions.
+	// 0x0008000 - (B) Log buying store transactions
+	// 0x0010000 - (X) Log other transactions
+	// 0x0020000 - (K) Log account bank transactions
+	// 0x0040000 - (Y) Divorce
+	// 0x0080000 - (Z) Roulette
+	// 0x0100000 - (W) Rental
+	// 0x0200000 - (Q) Card
+	// 0x0400000 - (J) Invalid in inventory
+	// 0x0800000 - (H) Invalid in cart
+	// 0x1000000 - (@) Egg
+	// 0x2000000 - (0) Quest
+	// 0x4000000 - (1) Skill
+	// 0x8000000 - (2) Refine
 	// Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
 	// Please note that moving items from inventory to cart and back is not logged by design.
-	enable: 0xFFFFF
+	enable: 0xFFFFFFF
 
 	// Logging files/tables
 	// Following settings specify where to log to. If 'use_sql' is
diff --git a/conf/messages.conf b/conf/messages.conf
index 383394d4..58662157 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -611,6 +611,9 @@
 
 //670-855 FREE (please start using from the top if you need, leave the 670+ range for new jobs)
 
+// MVP exp message issue clients 2013-12-23cRagexe and newer.
+855: Congratulations! You are the MVP! Your reward EXP Points are %u !!
+
 // MvP Tomb
 856: Tomb
 857: [ ^EE0000%s^000000 ]
diff --git a/db/constants.conf b/db/constants.conf
index 0ef5f1cf..b29c488c 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3626,6 +3626,11 @@ constants_db: {
 	GETTIME_YEAR:       7
 	GETTIME_DAYOFYEAR:  8
 
+	comment__: "gettimer"
+	TIMER_COUNT:        0
+	TIMER_TICK_NEXT:    1
+	TIMER_TICK_LAST:    2
+
 	comment__: "unit types"
 	UNITTYPE_PC:   0
 	UNITTYPE_NPC:  1