* Merged changes from trunk [14688:14739/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec

10 files changed, 74 insertions, 7 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index e726d3f61..3a1121934 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,16 @@
 Date	Added
 
+2011/03/06
+	* Rev. 14732 Added search store info related settings. [Ai4rei]
+2011/02/23
+	* Rev. 14724 Made autotrade error message store type-neutral, as it is used for buying stores now as well. [Ai4rei]
+2011/02/19
+	* Rev. 14713 Added map-server feature settings file 'battle/feature.conf'. [Ai4rei]
+	- Added setting 'feature.buying_store' to enable/disable the buying store system.
+2011/02/15
+	* Rev. 14707 Added map-server battle setting 'gm_check_minlevel'. [Ai4rei]
+2011/02/06
+	* Rev. 14700 Added char-server setting 'char_del_delay'. [Ai4rei]
 2011/01/13
 	* Rev. 14667 Removed ladmin settings (ladmin_athena.conf) and login-server settings for ladmin (login_athena.conf) (topic:262934). [Ai4rei]
 2010/12/30
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
new file mode 100644
index 000000000..ae1c00b33
--- /dev/null
+++ b/conf/battle/feature.conf
@@ -0,0 +1,28 @@
+//      ______  __    __                                 

+//     /\  _  \/\ \__/\ \                                

+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

+//  _   _   _   _   _   _   _     _   _   _   _   _   _

+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

+//

+//--------------------------------------------------------------

+// eAthena Feature Configuration File

+//--------------------------------------------------------------

+// Note 1: Value is a config switch (on/off, yes/no or 1/0)

+// Note 2: Value is in percents (100 means 100%)

+// Note 3: Value is a bit field. If no description is given,

+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)

+//--------------------------------------------------------------

+

+// Buying store (Note 1)

+// Requires: 2010-04-27aRagexeRE or later

+feature.buying_store: on

+

+// Search stores (Note 1)

+// Requires: 2010-08-03aRagexeRE or later

+feature.search_stores: on

diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
index 5f15d2321..21b54f386 100644
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -116,3 +116,7 @@ title_lvl5: 50
 title_lvl6: 60
 title_lvl7: 80
 title_lvl8: 99
+
+// Minimum GM level required for client command /check (display character status) to work.
+// Default: 60
+gm_check_minlevel: 60
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 8aa8b7c67..76d18ed0f 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -121,3 +121,10 @@ auction_feeperhour: 12000
 
 // Auction maximum sell price
 auction_maximumprice: 500000000
+
+// Minimum delay between each store search query in seconds.
+searchstore_querydelay: 10
+
+// Maximum amount of results a store search query may yield, before
+// it is canceled.
+searchstore_maxresults: 30
diff --git a/conf/battle/party.conf b/conf/battle/party.conf
index f0b2c8de2..42a9d2285 100644
--- a/conf/battle/party.conf
+++ b/conf/battle/party.conf
@@ -59,3 +59,7 @@ idle_no_share: no
 // Give additional experience bonus per party-member involved on even-share parties?
 // (eg: If set to 10, a even-share party of 5 people will receive +40% exp)
 party_even_share_bonus: 0
+
+// Display party name regardless if player is in a guild.
+// Official servers do not display party name unless the user is in a guild. (Note 1)
+display_party_name: no
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 7cf56ce1b..a867382a7 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -62,6 +62,9 @@ import: conf/battle/skill.conf
 //Status change related settings
 import: conf/battle/status.conf
 
+//Feature control (on/off) settings
+import: conf/battle/feature.conf
+
 // Anything else that didn't fit anywhere else.
 // Includes duel, day/night, mute/manner, log settings.
 import: conf/battle/misc.conf
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index af0da9976..8e109f4da 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -166,6 +166,11 @@ chars_per_account: 0
 // e.g. char_del_level: 80 (players can't delete characters with 80+ BaseLevel)
 char_del_level: 0
 
+// Amount of time in seconds by which the character deletion is delayed.
+// Default: 86400 (24 hours)
+// NOTE: Requires client 2010-08-03aragexeRE or newer.
+char_del_delay: 86400
+
 // What folder the DB files are in (item_db.txt, etc.)
 db_path: db
 
diff --git a/conf/log_athena.conf b/conf/log_athena.conf
index 2f8effd18..0d5378a8f 100644
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -16,6 +16,7 @@
 // 2048 - (R) Log items placed/retrieved from storage.
 // 4096 - (G) Log items placed/retrieved from guild storage.
 // 8192 - (E) Log mail system transactions.
+// 16384 - (B) Log buying store transactions
 // Example: Log trades+vending+script items+created items: 2+4+64+1024 = 1094
 enable_logs: 1
 
diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
index 94920d422..6de962dff 100644
--- a/conf/mapflag/restricted.txt
+++ b/conf/mapflag/restricted.txt
@@ -5,6 +5,7 @@
 //= eAthena Dev Team
 //= 1.0 [Komurka]
 //= 1.1 Added WoE:SE Map restrictions. [L0ne_W0lf]
+//= 1.2 Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf]
 //===== Current Version: =====================================
 
 //Aldebaran Turbo Track
@@ -45,3 +46,11 @@ arug_cas05	mapflag	restricted	4
 //Sealed Shrine ==================
 1@cata	mapflag	restricted	5
 2@cata	mapflag	restricted	5
+
+//Endless Tower ==================
+1@tower	mapflag	restricted	6
+2@tower	mapflag	restricted	6
+3@tower	mapflag	restricted	6
+4@tower	mapflag	restricted	6
+5@tower	mapflag	restricted	6
+6@tower	mapflag	restricted	6
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 1c9b994c0..1d88c076a 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -423,12 +423,7 @@
 502: Day Mode is activated
 503: Night Mode is activated
 
-//Supernovice's Guardian Angel
-//actually.. new client msgtxt file contains these 3 lines... [Lupus]
-//----------------------------
-504: Guardian Angel, can you hear my voice? ^^;
-505: My name is %s, and I'm a Super Novice~
-506: Please help me~ T.T
+// 504~506 are not used (previously super novice's guardian angel prayer)
 
 // Trade Spoof Messages
 507: This player has been banned for %d minute(s).
@@ -455,7 +450,7 @@
 //542: %.0s%.0sSomeone stole %s
 // 543~548 are not used (previously @away messages)
 // @Autotrade
-549: You should be vending to use @autotrade.
+549: You should have a shop open to use @autotrade.
 
 //550 -> 650: Job Names
 550: Novice