optimized novice grounds. optimized 1 card

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

4 files changed, 28 insertions, 29 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 723b91cae..ebcae7a91 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -19,6 +19,8 @@
 	-----
 
 ========================
+03/22
+	* Optimized Aliza Card [Lupus]
 03/21
 	* Increased Improve Concentration's hide-revealing range to 3 (7x7)
 	  [Skotlex]
diff --git a/db/item_db.txt b/db/item_db.txt
index d3ab78362..6ce598064 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1570,7 +1570,7 @@
 4397,Tha_Despero_Card,Thanatos Despero Card,6,,10,10,,,,,,,,32,,,,,{ bonus bInt,getrefine()-6; },{},{}
 4398,Tha_Dolor_Card,Thanatos Dolor Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Angel,10; },{},{}
 4399,Thanatos_Card,Thanatos Card,6,,10,10,,,,,,,,2,,,,,{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; bonus bSPDrainValue,-1; bonus bDef,-30; bonus bFlee,-30; },{},{}
-4400,Aliza_Card,Aliza Card,6,,10,10,,,,,,,,16,,,,,{ if(BaseJob == Job_Dancer) { bonus4 bAutoSpellWhenHit,1011,1,100,1; } else  { bonus4 bAutoSpellWhenHit,1011,1,50,1; } },{},{}
+4400,Aliza_Card,Aliza Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,1011,1,50+50*(BaseJob == Job_Dancer),1; } },{},{}
 4401,Alicel_Card,Alicel Card,6,,10,10,,,,,,,,16,,,,,{ bonus bFlee,10; bonus bDef,-5; },{},{}
 4402,Aliot_Card,Aliot Card,6,,10,10,,,,,,,,4,,,,,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) { bonus bStr, 2; bonus bMaxHPrate, 5; } if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) { bonus bInt, 2; bonus bMaxSPrate, 5; } },{},{}
 4403,Kiel_Card,Kiel Card,6,,10,10,,,,,,,,769,,,,,{ bonus bDelayRate,-30; },{},{}
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d28f7e37e..af1ecccba 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,6 +26,8 @@ KarLaeda
 
 Date		Added
 ======
+2007/03/22
+	* Retouch of Novice Grounds [Lupus]
 2007/03/20
 	* Added npc/sample/npc_live_dialogues.txt how to use Global_Functions.txt [Lupus]
 	* Removed duplicate Noyee npc (skipped in r9943 ?)
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 3de5eabff..34111186e 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Dr.Evil & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.7a
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.5 Fixed warps, removed map duplicates, typos [Lupus]
 //= 1.6 Changed clone maps new_1-? -> new_zone0? [Lupus]
 //= 1.7 Now Kafra Tickets are given at correct NPC/Actions [Lupus]
+//= 1.7a a bit of optimization [Lupus]
 //============================================================ 
 
 //====================================================================
@@ -2606,8 +2607,8 @@ L_loop:
 }
 
 new_zone04,100,29,4	script	Final Instructor	46,{
+	mes "[Hanson]";
 	if (!(NEW_MES_FLAG6)) {
-		mes "[Hanson]";
 		mes "Nice to meet you.";
 		mes "My name is 'Hanson'";
 		mes "I am in charge of the third course,";
@@ -2622,7 +2623,6 @@ new_zone04,100,29,4	script	Final Instructor	46,{
 		close;
 	}
 	if (NEW_GETITEM) {
-		mes "[Hanson]";
 		mes "I understand.";
 		mes "I will now move you directly into the world of Ragnarok Online.";
 		next;
@@ -2638,7 +2638,6 @@ new_zone04,100,29,4	script	Final Instructor	46,{
 		next;
 		goto L_cancel;
 	}
-	mes "[Hanson]";
 	mes "You have made an effort to come";
 	mes "here. You have just finished";
 	mes "learning about job classes.";
@@ -2792,7 +2791,7 @@ L_cancel:
 	next;
 	switch ( select("Yes","No") ) {
 	case 1:	set NOV_3_MERCHANT,NOV_3_MERCHANT+1;break;
-	case 2:set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;
+	case 2: set NOV_3_ACOLYTE,NOV_3_ACOLYTE+1;
 	}
 	mes "[Hanson]";
 	mes "You don't mind exploring dangerous";
@@ -2946,14 +2945,13 @@ L_cancel:
 		mes "one. She asks you to buy a";
 		mes "souvenir that's not particularly";
 		mes "needed.";
-		mes "What would you do?";
 		break;
 	case 1:	mes "You're on a trip with your beloved";
 		mes "one. He asks you to buy a";
 		mes "souvenir that's not particularly";
 		mes "needed.";
-		mes "What would you do?";
 	}
+	mes "What would you do?";
 	next;
 	switch ( select("Buy the item for her/him.","Say 'no'.","Promise to buy it next time.") ) {
 	case 1:	set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;
@@ -3150,19 +3148,20 @@ L_loop2:
 		mes "about these items.";
 		next;
 		mes "[Hanson]";
+		mes "After you change your job,";
 		switch( @JOB_NUMBER_CHK ) {
-		case 0:	mes "After you change your job,";
+		case 0:
 			mes "you can use the 'Falchion'"; break;
-		case 1:	mes "After you change your job,";
+		case 1:
 			mes "you can use the 'Composite Bow'"; break;
-		case 2:	mes "After you change your job,";
+		case 2:
 			mes "you can use the 'Main Gauche'"; break;
-		case 3:	mes "After you change your job,";
-			mes "you can use the 'Rod'"; break;
-		case 4:	mes "After you change your job,";
+		case 3:
+			mes "you can use either 'Rod' or 'Cutter'"; break;
+		case 4:
 			mes "you can use the 'Mace'"; break;
-		case 5:	mes "After you change your job,";
-			mes "you can use the 'Battle Axe'";break;
+		case 5:	
+			mes "you can use the 'Battle Axe'";
 		}
 		mes "instead of the Novice Knife";
 		mes "which I offered you before.";
@@ -3321,7 +3320,7 @@ L_loop2:
 	mes "within Ragnarok Online.";
 	mes "Later, you can use the";
 	mes "'Adventurer's Suit'";
-	mes "instead of the Novice Plate";
+	mes "instead of the 'Novice Plate'";
 	mes "which I offered you before.";
 	next;
 L_warp:
@@ -3351,48 +3350,44 @@ L_warp:
 	}
 	end;
 L_place:
+	mes "The town you will be sent to";
 	switch( @JOB_NUMBER_CHK ) {
-	case 0:	mes "The town you will be sent to";
+	case 0:
 		mes "is 'Izlude'. The Swordsman";
 		mes "association is located in the";
 		mes "west side of the city.";
-		mes "Please remember this.";
 		break;
-	case 1:	mes "The town you will be sent to";
+	case 1:
 		mes "is named 'Payon'.";
 		mes "The Archer association can be";
 		mes "found in the small village";
 		mes "to the north-east.";
-		mes "Please remember this.";
 		break;
-	case 2:	mes "The town you will be sent to";
+	case 2:
 		mes "is called 'Morroc'.";
 		mes "The thief guild is in the";
 		mes "underground 1st floor of the";
 		mes "pyramid, which is North-west";
 		mes "of 'Morroc'.";
-		mes "Please remember this.";
 		break;
-	case 3:	mes "The town you will be sent to";
+	case 3:
 		mes "is called 'Geffen'.";
 		mes "The Mage association is located";
 		mes "to the north-west of the city.";
-		mes "Please remember this.";
 		break;
-	case 4:	mes "The town you will be sent to";
+	case 4:
 		mes "is called 'Prontera'.";
 		mes "The good father can be found";
 		mes "in the church located in the";
 		mes "north-east corner of 'Prontera'.";
-		mes "Please remember this.";
 		break;
-	case 5:	mes "The town you will be sent to";
+	case 5:
 		mes "is called 'Alberta'.";
 		mes "The Merchant association is";
 		mes "located in the south-western";
 		mes "section of the city.";
-		mes "Please remember this.";
 	}
+	mes "Please remember this.";
 	mes "You'll now be teleported.";
 	return;
 L_cleararg: