From a7c1a55bb6f3c3236ba02722e948a52c645a4918 Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 15 May 2011 05:30:25 +0000
Subject: * Merged changes from trunk [14784:14819/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14821 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/Changelog.txt    |  3 +++
 conf/battle/misc.conf | 11 +++++++++++
 conf/maps_athena.conf | 18 ++++++++++++++++++
 conf/msg_athena.conf  |  5 ++++-
 4 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index a890c1252..85428aab0 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,8 @@
 Date	Added
 
+2011/05/13
+	* Rev. 14812 Added settings 'cashshop_show_points' and 'mail_show_status', both disabled by default, as the messages they control are custom (follow up to r11548 and r12264). [Ai4rei]
+	- Moved custom cash point update messages to 'msg_athena.conf' (IDs 504~506).
 2011/03/15
 	* Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei]
 2011/03/06
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 76d18ed0f..797295aea 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -128,3 +128,14 @@ searchstore_querydelay: 10
 // Maximum amount of results a store search query may yield, before
 // it is canceled.
 searchstore_maxresults: 30
+
+// Whether or not gaining and loosing of cash points is displayed (Note 1).
+// Default: no
+cashshop_show_points: no
+
+// Whether or not mail box status is displayed upon login.
+// Default: 0
+// 0 = No
+// 1 = Yes
+// 2 = Yes, when there are unread mails
+mail_show_status: 0
diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index 514a642a7..384802628 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -679,6 +679,10 @@ map: tha_t12
 map: auction_01
 map: auction_02
 
+// ???
+// -- 2005-12-06gdata_k.gpf
+alde_tt03
+
 // --- Garden City Hugel / Kiehl ---
 // -- 2005-12-20sdata_k.gpf -- 
 map: hugel
@@ -989,6 +993,20 @@ map: iz_dun05
 // -- 2010-12-01data_x.gpf
 map: evt_mobroom
 
+// ???
+map: dic_dun03
+//map: mjolnir_04_1
+//map: evt_swar_b
+//map: evt_swar_r
+//map: evt_swar_s
+//map: evt_swar_t
+
+// Lighthalzen Dungeon F4, Wolfchev's Laboratory
+// -- 2011-03-16rdata_x.gpf
+map: 1@lhz
+map: lhz_dun04
+map: que_lhz
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
 
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 973c3b885..47417632e 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -423,7 +423,10 @@
 502: Day Mode is activated
 503: Night Mode is activated
 
-// 504~506 are not used (previously super novice's guardian angel prayer)
+// Cash point change messages
+504: Used %d kafra points and %d cash points. %d kafra and %d cash points remaining.
+505: Gained %d cash points. Total %d points.
+506: Gained %d kafra points. Total %d points.
 
 // Trade Spoof Messages
 507: This player has been banned for %d minute(s).
-- 
cgit v1.2.3-70-g09d2