* Uncommented all novice map, and added mapflags.

* Additionally; changed starting map from new_zone to new_1-1.

* Large update to the novice grounds. Fixed bugreport:1666
- Updated notice ground warps to reflect the above map-usage change.
- Additionally; NPCs now give EXP (base/job) dependant on your level.
- All prior novice ground progress will be lost, and variables cleared.
- NPCs give class specific items, but not the soulbound ones, yet.
- Fixed the mob count for the novice ground maps.
- Added all the old novice training ground vars to F_ClearGarbage

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

8 files changed, 112 insertions, 25 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index d151c5ff3..e0abb4a88 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,8 @@
 Date	Added
 
+2008/06/14
+	* Rev. 12833 Uncommented all novice map, and added mapflags. [L0ne_W0lf]
+	* Additionally; changed starting map from new_zone to new_1-1.
 2008/06/06
 	* Rev. 12761 Added mapflags in preparation for Monster Races. [L0ne_W0lf]
 2008/06/01
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 24ad0d3fc..ac9800d68 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -115,7 +115,7 @@ char_txt: save/athena.txt
 friends_txt: save/friends.txt
 
 // Start point, Map name followed by coordinates (x,y)
-start_point: new_zone01,53,111
+start_point: new_1-1,53,111
 
 // Starting weapon for new characters
 start_weapon: 1201
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 575cab05b..3772701a1 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -5,6 +5,7 @@
 //= 1.2 [Lupus]
 //= 1.3 [massdriller]
 //= 1.6a [Lupus]
+//= 1.7 Added all novice maps. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 // Cities ================>\\
@@ -35,6 +36,26 @@ new_zone01	mapflag	nobranch
 new_zone02	mapflag	nobranch
 new_zone03	mapflag	nobranch
 new_zone04	mapflag	nobranch
+new_1-1	mapflag	nobranch
+new_1-2	mapflag	nobranch
+new_1-3	mapflag	nobranch
+new_1-4	mapflag	nobranch
+new_2-1	mapflag	nobranch
+new_2-2	mapflag	nobranch
+new_2-3	mapflag	nobranch
+new_2-4	mapflag	nobranch
+new_3-1	mapflag	nobranch
+new_3-2	mapflag	nobranch
+new_3-3	mapflag	nobranch
+new_3-4	mapflag	nobranch
+new_4-1	mapflag	nobranch
+new_4-2	mapflag	nobranch
+new_4-3	mapflag	nobranch
+new_4-4	mapflag	nobranch
+new_5-1	mapflag	nobranch
+new_5-2	mapflag	nobranch
+new_5-3	mapflag	nobranch
+new_5-4	mapflag	nobranch
 nif_in	mapflag	nobranch
 payon_in01	mapflag	nobranch
 payon_in02	mapflag	nobranch
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 5323dde8a..9b2024b2d 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -4,6 +4,7 @@
 //= eAthena Dev Team
 //= 1.6a added up to Hugel maps. [Lupus]
 //= 1.6b Added job_knt map. [Samuray22]
+//= 1.7 Added all novice maps. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 
@@ -43,6 +44,26 @@ new_zone01	mapflag	nomemo
 new_zone02	mapflag	nomemo
 new_zone03	mapflag	nomemo
 new_zone04	mapflag	nomemo
+new_1-1	mapflag	nomemo
+new_1-2	mapflag	nomemo
+new_1-3	mapflag	nomemo
+new_1-4	mapflag	nomemo
+new_2-1	mapflag	nomemo
+new_2-2	mapflag	nomemo
+new_2-3	mapflag	nomemo
+new_2-4	mapflag	nomemo
+new_3-1	mapflag	nomemo
+new_3-2	mapflag	nomemo
+new_3-3	mapflag	nomemo
+new_3-4	mapflag	nomemo
+new_4-1	mapflag	nomemo
+new_4-2	mapflag	nomemo
+new_4-3	mapflag	nomemo
+new_4-4	mapflag	nomemo
+new_5-1	mapflag	nomemo
+new_5-2	mapflag	nomemo
+new_5-3	mapflag	nomemo
+new_5-4	mapflag	nomemo
 pay_arche	mapflag	nomemo
 payon_in01	mapflag	nomemo
 payon_in02	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index f158ac8c2..1745cabab 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -3,6 +3,7 @@
 //===== By: ==================================================
 //= eAthena Dev Team
 //= 1.2 [Lupus]
+//= 1.3 Added all novice maps. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 
@@ -46,6 +47,26 @@ new_zone01	mapflag	nopenalty
 new_zone02	mapflag	nopenalty
 new_zone03	mapflag	nopenalty
 new_zone04	mapflag	nopenalty
+new_1-1	mapflag	nopenalty
+new_1-2	mapflag	nopenalty
+new_1-3	mapflag	nopenalty
+new_1-4	mapflag	nopenalty
+new_2-1	mapflag	nopenalty
+new_2-2	mapflag	nopenalty
+new_2-3	mapflag	nopenalty
+new_2-4	mapflag	nopenalty
+new_3-1	mapflag	nopenalty
+new_3-2	mapflag	nopenalty
+new_3-3	mapflag	nopenalty
+new_3-4	mapflag	nopenalty
+new_4-1	mapflag	nopenalty
+new_4-2	mapflag	nopenalty
+new_4-3	mapflag	nopenalty
+new_4-4	mapflag	nopenalty
+new_5-1	mapflag	nopenalty
+new_5-2	mapflag	nopenalty
+new_5-3	mapflag	nopenalty
+new_5-4	mapflag	nopenalty
 nif_in	mapflag	nopenalty
 pay_arche	mapflag	nopenalty
 payon	mapflag	nopenalty
diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt
index 5a3bd788f..77d0e8675 100644
--- a/conf/mapflag/noreturn.txt
+++ b/conf/mapflag/noreturn.txt
@@ -8,6 +8,7 @@
 //= 1.3 According to the patch, enabled Butterfly wings in the Castles [Lupus]
 //= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
 //= 1.4a Added job_knt. [Samuray22]
+//= 1.5 Commented out new_zone entries. [L0ne_W0lf]
 //===== Current Version: =====================================
 
 // Cities ========================
@@ -34,10 +35,10 @@ lou_in02	mapflag	noreturn
 moc_castle	mapflag	noreturn
 morocc_in	mapflag	noreturn
 mosk_in	mapflag	noreturn
-new_zone01	mapflag	noreturn
-new_zone02	mapflag	noreturn
-new_zone03	mapflag	noreturn
-new_zone04	mapflag	noreturn
+//new_zone01	mapflag	noreturn
+//new_zone02	mapflag	noreturn
+//new_zone03	mapflag	noreturn
+//new_zone04	mapflag	noreturn
 nif_in	mapflag	noreturn
 payon_in01	mapflag	noreturn
 payon_in02	mapflag	noreturn
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index 20dc1a1ee..ef59ae2d8 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -36,6 +36,26 @@ new_zone01	mapflag	noteleport
 new_zone02	mapflag	noteleport
 new_zone03	mapflag	noteleport
 new_zone04	mapflag	noteleport
+new_1-1	mapflag	noteleport
+new_1-2	mapflag	noteleport
+new_1-3	mapflag	noteleport
+new_1-4	mapflag	noteleport
+new_2-1	mapflag	noteleport
+new_2-2	mapflag	noteleport
+new_2-3	mapflag	noteleport
+new_2-4	mapflag	noteleport
+new_3-1	mapflag	noteleport
+new_3-2	mapflag	noteleport
+new_3-3	mapflag	noteleport
+new_3-4	mapflag	noteleport
+new_4-1	mapflag	noteleport
+new_4-2	mapflag	noteleport
+new_4-3	mapflag	noteleport
+new_4-4	mapflag	noteleport
+new_5-1	mapflag	noteleport
+new_5-2	mapflag	noteleport
+new_5-3	mapflag	noteleport
+new_5-4	mapflag	noteleport
 nif_in	mapflag	noteleport
 payon_in01	mapflag	noteleport
 payon_in02	mapflag	noteleport
diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index e28605ca8..64920d8be 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -142,26 +142,26 @@ map: new_zone01
 map: new_zone02
 map: new_zone03
 map: new_zone04
-//map: new_1-1
-//map: new_1-2
-//map: new_1-3
-//map: new_1-4
-//map: new_2-1
-//map: new_2-2
-//map: new_2-3
-//map: new_2-4
-//map: new_3-1
-//map: new_3-2
-//map: new_3-3
-//map: new_3-4
-//map: new_4-1
-//map: new_4-2
-//map: new_4-3
-//map: new_4-4
-//map: new_5-1
-//map: new_5-2
-//map: new_5-3
-//map: new_5-4
+map: new_1-1
+map: new_1-2
+map: new_1-3
+map: new_1-4
+map: new_2-1
+map: new_2-2
+map: new_2-3
+map: new_2-4
+map: new_3-1
+map: new_3-2
+map: new_3-3
+map: new_3-4
+map: new_4-1
+map: new_4-2
+map: new_4-3
+map: new_4-4
+map: new_5-1
+map: new_5-2
+map: new_5-3
+map: new_5-4
 map: orcsdun01
 map: orcsdun02
 //map: ordeal_a00