* Merged changes from trunk [14895:14966/trunk].

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

4 files changed, 93 insertions, 0 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 26351612c..43c92fc74 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2011/08/21
+	* Rev. 14938 Added setting 'client_limit_unit_lv' to control the unit types which are affected by 'max_lv' and 'aura_lv' settings. [Ai4rei]
 2011/08/10
 	* Rev. 14931 Upped max_lv and max_aura to 150, and max_aspd to 193.
 2011/07/09
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index 11bb215a2..c6a5159d5 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -17,6 +17,8 @@
 //--------------------------------------------------------------
 // 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, 16: Mercenary)
 //--------------------------------------------------------------
 
 // Set here which client version do you accept. Add all values of clients:
@@ -86,6 +88,12 @@ max_lv: 150
 //          150 or more will be reported as having level 99 and show an aura.
 aura_lv: 150
 
+// Units types affected by max_lv and aura_lv settings. (Note 3)
+// Note: If an unit type, which normally does not show an aura, is
+//       set it will obtain an aura when it meets the level requirement.
+// Default: 0 (none)
+client_limit_unit_lv: 0
+
 // Will tuxedo and wedding dresses be shown when worn? (Note 1)
 wedding_modifydisplay: no
 
diff --git a/conf/mapflag/reset.txt b/conf/mapflag/reset.txt
new file mode 100644
index 000000000..b6693eaf2
--- /dev/null
+++ b/conf/mapflag/reset.txt
@@ -0,0 +1,42 @@
+//===== eAthena Script =======================================

+//= Map flags that enable the use of Neuralizer

+//===== By: ==================================================

+//= Daegaladh

+//===== Current Version: =====================================

+//= 1.0 [Daegaladh]

+//===== Compatible With: =====================================

+//=

+//===== Description: =========================================

+//=

+//============================================================

+

+alberta	mapflag	reset

+aldebaran	mapflag	reset

+amatsu	mapflag	reset

+ayothaya	mapflag	reset

+brasilis	mapflag	reset

+comodo	mapflag	reset

+einbroch	mapflag	reset

+einbech	mapflag	reset

+geffen	mapflag	reset

+gonryun	mapflag	reset

+izlude	mapflag	reset

+jawaii	mapflag	reset

+hugel	mapflag	reset

+lighthalzen	mapflag	reset

+louyang	mapflag	reset

+manuk	mapflag	reset

+mid_camp	mapflag	reset

+moc_ruins	mapflag	reset

+morocc	mapflag	reset

+moscovia	mapflag	reset

+niflheim	mapflag	reset

+prontera	mapflag	reset

+payon	mapflag	reset

+pay_arche	mapflag	reset

+rachel	mapflag	reset

+splendide	mapflag	reset

+umbala	mapflag	reset

+veins	mapflag	reset

+xmas	mapflag	reset

+yuno	mapflag	reset

diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
index 6de962dff..908ea4476 100644
--- a/conf/mapflag/restricted.txt
+++ b/conf/mapflag/restricted.txt
@@ -6,6 +6,7 @@
 //= 1.0 [Komurka]
 //= 1.1 Added WoE:SE Map restrictions. [L0ne_W0lf]
 //= 1.2 Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf]
+//= 1.3 Added Orc's Memory, Nidhoggur's Nest and towns restrictions [Daegaladh]
 //===== Current Version: =====================================
 
 //Aldebaran Turbo Track
@@ -54,3 +55,43 @@ arug_cas05	mapflag	restricted	4
 4@tower	mapflag	restricted	6
 5@tower	mapflag	restricted	6
 6@tower	mapflag	restricted	6
+
+//Orc's Memory ===================
+1@orcs	mapflag	restricted	6
+2@orcs	mapflag	restricted	6
+
+// Nidhoggr's Instance ===========
+1@nyd	mapflag	restricted	6
+2@nyd	mapflag	restricted	6
+
+//Towns
+alberta	mapflag	restricted	7
+aldebaran	mapflag	restricted	7
+amatsu	mapflag	restricted	7
+ayothaya	mapflag	restricted	7
+brasilis	mapflag	restricted	7
+comodo	mapflag	restricted	7
+einbroch	mapflag	restricted	7
+einbech	mapflag	restricted	7
+geffen	mapflag	restricted	7
+gonryun	mapflag	restricted	7
+izlude	mapflag	restricted	7
+jawaii	mapflag	restricted	7
+hugel	mapflag	restricted	7
+lighthalzen	mapflag	restricted	7
+louyang	mapflag	restricted	7
+manuk	mapflag	restricted	7
+mid_camp	mapflag	restricted	7
+moc_ruins	mapflag	restricted	7
+morocc	mapflag	restricted	7
+moscovia	mapflag	restricted	7
+niflheim	mapflag	restricted	7
+prontera	mapflag	restricted	7
+payon	mapflag	restricted	7
+pay_arche	mapflag	restricted	7
+rachel	mapflag	restricted	7
+splendide	mapflag	restricted	7
+umbala	mapflag	restricted	7
+veins	mapflag	restricted	7
+xmas	mapflag	restricted	7
+yuno	mapflag	restricted	7