* 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://svn.code.sf.net/p/rathena/svn/trunk@12833 54d463be-8e91-2dee-dedb-b68131a5f0ec

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

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

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

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

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

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

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

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

npc/Changelog.txt

@@ -1,6 +1,15 @@
 Date		Added
 ======
-
+2008/06/14
+	* Rev. 12833 Large update to the novice grounds. Fixed bugreport:1666 [L0ne_W0lf]
+	- 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.
+	- Added all the old novice training ground vars to F_ClearGarbage
+	- Fixed the mob count for the novice ground maps.
+	* Fixed a bug in some Gunslinger skills, when weapon ids changed [Zephiris]
+	* Little cleanup in and a bug fix in guild2 scripts.
 2008/06/13
 	* Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jA
 	* Converted getskilllv and skill commands integers to strings. Follow up on r12814

npc/other/Global_Functions.txt

@@ -36,6 +36,7 @@
 //= 2.11 Updated function Job_Change to jobchange based on Upper value. [Paradox924X]
 //= 2.12 Added more unused vars to F_ClearGarbage [Lupus]
 //= 2.13 Added more unused vars to F_ClearGarbage [Lupus]
+//= 2,14 Added old novice variables to F_ClearGarbage. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -98,6 +99,18 @@ function	script	F_ClearGarbage	{
 
 	//due to bugs in BS quest:
 	set wizard_m2,0;
+
+	// Old Novice Ground Variables.
+	set NEW_MES_FLAG0,0;
+	set NEW_MES_FLAG1,0;
+	set NEW_MES_FLAG2,0;
+	set NEW_MES_FLAG3,0;
+	set NEW_MES_FLAG4,0;
+	set NEW_MES_FLAG5,0;
+	set NEW_LVUP0,0;
+	set NEW_LVUP1,0;
+	set NEW_JOBLVUP,0;
+
 	return;
 }
 

npc/warps/other/jobquests.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.8
+//= 2.0
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Version Ep4+
 //===== Description: =========================================
@@ -21,19 +21,20 @@
 //= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf]
 //= 1.7 Updated some 2-2 job quest related warps. [L0ne_W0lf]
 //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 1.9 Added Jungslinger and NInja warps. [L0ne_W0lf]
+//= 1.9 Added Gungslinger and NInja warps. [L0ne_W0lf]
+//= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf]
 //============================================================
 
 
 //==============================================================================
 //Novice
 //==============================================================================
-new_zone01,148,112,0	warp	newwarp6001	2,2,new_zone02,100,9
-new_zone02,100,6,0	warp	newwarp6002	2,2,new_zone01,144,112
-new_zone02,126,106,0	warp	newwarp6003	2,2,new_zone02,160,171
-new_zone02,156,171,0	warp	newwarp6004	2,2,new_zone02,123,106
-new_zone02,73,106,0	warp	newwarp6005	2,2,new_zone02,41,172
-new_zone02,46,172,0	warp	newwarp6006	2,2,new_zone02,78,106
+new_1-1,148,112,0	warp	newwarp6001	2,2,new_1-2,100,9
+new_1-2,100,6,0	warp	newwarp6002	2,2,new_1-1,144,112
+new_1-2,126,106,0	warp	newwarp6003	2,2,new_1-2,160,171
+new_1-2,156,171,0	warp	newwarp6004	2,2,new_1-2,123,106
+new_1-2,73,106,0	warp	newwarp6005	2,2,new_1-2,41,172
+new_1-2,46,172,0	warp	newwarp6006	2,2,new_1-2,78,106
 
 //==============================================================================
 //Thief