- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

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

1 files changed, 527 insertions, 427 deletions

diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index a82b27e08..a325d2bf7 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -13,14 +13,14 @@
 //= 1.1 Optimized [Lupus]
 //=	TODO: Test, Add proper misceffects
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.3 Misc. updates. [L0ne_W0lf]
 //============================================================ 
 
 
 //=================================================Sign====================================================
 geffen,61,174,4	script	Sign#M	111,{
-  mes "~sign reads...~";
-  mes "Greetings!! This is the Geffen Magic Academy.  Come in if you have an interest in all things magic!";
-  close;
+	mes "- Mage Job Change -";
+	close;
 }
 
 
@@ -29,18 +29,20 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 	mes "[Mana]";
 	if(Class == Job_Novice){
 		mes "[Mana]";
-		mes "You're not";
-		mes "ready yet.";
-		mes "Come back after";
-		mes "you've trained more.";
+		mes "You're not ready for";
+		mes "any of the training I have";
+		mes "to offer. You'll have to train";
+		mes "some more and become";
+		mes "a Mage first. Alright, dear?";
 		close;
 	}
 	if(BaseClass != Job_Mage){
-		mes "Be more confident in your job.";
-		mes "Sometimes other jobs may seem";
-		mes "better but take a look back at yourself";
-		mes "a little more. You should regain confidence";
-		mes "by doing so.";
+		mes "You know, sometimes";
+		mes "other jobs might look a";
+		mes "little better in some battle";
+		mes "situations, but always have";
+		mes "pride in yourself. Not just";
+		mes "anyone can do what you do~";
 		close;
 	}
 	if(eaclass()&(EAJL_UPPER|EAJL_2) && tu_magician01 < 7){
@@ -50,60 +52,106 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 	}
 	switch(tu_magician01){
 	case 0:
-		mes "Welcome!";
-		mes "I'm Mana, a trainer in charge of those who have justed joined the Mage Guild.";
+		mes "Ah, welcome~";
+		mes "My name is Mana,";
+		mes "a trainer in charge";
+		mes "of new recruits in the";
+		mes "Mage Guild. That means";
+		mes "I'm responsible for you~";
 		next;
 		mes "[Mana]";
-		mes "I've only been doing this job for a little while, but I'm here to help you if you want to learn more about the Mage job.";
-		next;
-		if(select("Will you teach me?", "Perhaps later...")==2){
+		mes "I've only been doing";
+		mes "this for just a little while,";
+		mes "but I'm here to help you if";
+		mes "you want to learn more on";
+		mes "the basics of the Mage job.";
+		next;
+		switch(select("Will you teach me?:Perhaps later...")) {
+		case 1:
+			mes "[Mana]";
+			mes "Of course!";
+			mes "And don't worry,";
+			mes "everyone is a beginner";
+			mes "at one point or another.";
+			mes "You can only get better!";
+			next;
+			break;
+		case 2:
 			mes "[Mana]";
 			mes "Well, I guess";
-			mes "that should be fine.";
-			mes "I look forward to";
-			mes "meeting you again~";
+			mes "it'll all work out.";
+			mes "But I look forward";
+			mes "to meeting you again";
+			mes "if you decide that you";
+			mes "do want some instruction~";
 			close;
 		}
 		mes "[Mana]";
-		mes "Of course!";
-		mes "And don't worry,";
-		mes "Everyone is a beginner";
-		mes "at one point or another.";
-		mes "You can only get better!";
+		mes "Alright, let's begin with";
+		mes "a general description";
+		mes "of our job, shall we?";
+		mes "What exactly are Mages?";
 		next;
 		mes "[Mana]";
-		mes "Alright,";
-		mes "shall we start";
-		mes "with the basics then?";
+		mes "Instead of physical strength,";
+		mes "Mages use the power of the";
+		mes "elements in battle. These are";
+		mes "^ff0000Fire^000000, ^5C4033Earth^000000, ^93DB70Wind^000000, ^0000FFWater^000000.";
+		mes "We also have access to spells";
+		mes "to spells with the ^CFB53BGhost^000000 property.";
 		next;
 		mes "[Mana]";
-		mes "Instead of raw physical strength, Mages use the power of the elements: ^ff0000Fire^000000, ^5C4033Earth^000000, ^93DB70Wind^000000, ^0000FFWater^000000. Mages even have ^CFB53BGhost^000000 property spells.";
+		mes "Now, when an enemy has";
+		mes "an elemental property, it will";
+		mes "be able to resist that element, but will be susceptible to others.";
+		mes "That's why knowing elemental properties is so important to us.";
 		next;
 		mes "[Mana]";
-		mes "Now, if an enemy has an elemental property, it will be able to resist some elements and suspectible to others.";
+		mes "Listen carefully to these";
+		mes "elemental relationships.";
+		mes "^FF0000Fire^000000 is strong against Earth,";
+		mes "but is weak against Water.";
+		mes "^5C4033Earth^000000 is strong against Wind,";
+		mes "but is weak against Fire.";
 		next;
 		mes "[Mana]";
-		mes "Listen carefully.";
-		mes "^FF0000Fire^000000 is strong against Earth but weak against Water.  Now, ^5C4033Earth^000000 is strong against Wind, but weak against Fire.";
+		mes "^0000FFWater^000000 is strong against";
+		mes "Fire, but weak against Wind.";
+		mes "Finally, ^93DB70Wind^000000 is strong against";
+		mes "Water, but weak against Earth.";
 		next;
 		mes "[Mana]";
-		mes "^0000FFWater^000000 is strong against Fire but weak against Wind. And finally, ^93DB70Wind^000000 is strong against Water but weak against Earth.";
-		next;
-		mes "[Mana]";
-		mes "Was I talking too much?";
-		mes "Let's take a break and continue later. I'm still new to this, so I'm a little bushed~!";
+		mes "I can't remember";
+		mes "the last time I've";
+		mes "spoken so much in one";
+		mes "sitting! I'm bushed, so it's";
+		mes "time for a break. But we'll";
+		mes "continue this later, okay?";
 		set tu_magician01, 1;
-		getexp BaseLevel*30,BaseLevel*15;
+		getexp BaseLevel*3,BaseLevel*2;
 		//misceffect EF_HIT5;
 		close;
 		break;
 	case 1:
 		mes "Are you ready";
 		mes "to continue our";
-		mes "discussion on the elements?";
+		mes "discussion on the";
+		mes "elemental properties?";
+		next;
+		mes "[Mana]";
+		mes "You should know that";
+		mes "each monster has an";
+		mes "elemental property and that";
+		mes "there are different levels for";
+		mes "all of these elements. It's";
+		mes "important to understand this...";
 		next;
 		mes "[Mana]";
-		mes "Remember that each monster has an elemental property and that each property has a level. Understanding the elements will help you win battles.";
+		mes "Let me explain to you";
+		mes "all of the nuances of";
+		mes "each element. Just ask";
+		mes "me which specific element";
+		mes "you'd like to learn more about.";
 		next;
 		mes "[Mana]";
 		mes "In other words, even the same properties";
@@ -114,209 +162,227 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			switch(select("^ff0000Fire^000000", "^5C4033Earth^000000", "^93DB70Wind^000000", "^0000FFWater^000000", "^CFB53BGhost^000000", "Quit.")){
 			case 1:
 				mes "[Mana]";
-				mes "In general, monsters that have the '^ff0000Fire^000000'";
-				mes "property have strong attacks.";
-				mes "Therefore, Mages who are generally physically weaker.";
-				mes "Even the slightest hit can be critical.";
-				next;
-				mes "[Mana]";
-				mes "The skills with a '^ff0000fire^000000' property";
-				mes "are 'Sight', 'Fire Bolt' 'Fire Wall'";
-				mes "and 'Fire Ball'.";
+				mes "Monsters with the ^ff0000Fire^000000";
+				mes "property tend to have strong";
+				mes "attacks. Since we Mages are";
+				mes "physically weaker, even slight";
+				mes "hits from these monsters can";
+				mes "be extremely damaging to us.";
 				next;
 				mes "[Mana]";
-				mes "When fighting '^ff0000fire^000000' property monsters";
-				mes "...Usually when alone?";
-				mes "Use 'Frost Diver' to freeze the monster first.";
+				mes "So if we have to fight";
+				mes "monsters with the ^FF0000Fire^000000";
+				mes "property on our own, we";
+				mes "can use Frost Diver to";
+				mes "freeze them in their tracks.";
 				next;
 				mes "[Mana]";
-				mes "If you fight '^ff0000fire^000000' with '^ff0000fire^000000'";
-				mes "it will do little or no damage at all.";
+				mes "But if we use Fire";
+				mes "property skills on Fire";
+				mes "monsters, we'd do little to no";
+				mes "damage and that's not good.";
 				next;
 				mes "[Mana]";
-				mes "The most distinctive of the '^ff0000fire^000000' property";
-				mes "skills is 'Fire Wall'. It can be used";
-				mes "up to 3 times in one screen.";
+				mes "For reference, our Fire";
+				mes "property skills are Sight,";
+				mes "Fire Bolt, Fire Ball and Fire";
+				mes "Wall. Ooh, let me tell you";
+				mes "a little more about Fire Wall.";
 				next;
 				mes "[Mana]";
-				mes "The 'Fire Wall' remains on the ground";
-				mes "and any monster that runs into it will";
-				mes "be damaged. The monster then moves away";
-				mes "in the opposite direction from which";
-				mes "they approached.";
+				mes "Fire Wall is very distinctive";
+				mes "in that it can be used up to";
+				mes "3 times on one screen. Any";
+				mes "monsters that run into it will";
+				mes "get damaged, then move away";
+				mes "in the opposite direction.";
 				next;
 				mes "[Mana]";
-				mes "But 'Undead' monsters are only injured";
-				mes "slightly and still move in the same";
-				mes "direction so beware.";
+				mes "But if an Undead monster";
+				mes "runs into a Fire Wall, it's ";
+				mes "only slightly injured and the";
+				mes "Fire Wall won't necessarily";
+				mes "block its approach. So beware!";
 				set tu_mana,tu_mana|1;
 				next;
 				break;
 			case 2:
 				mes "[Mana]";
-				mes "Usually, '^5C4033Earth^000000' property monsters";
-				mes "have good targeting. So no matter how";
-				mes "how high your dodge rate is, even Mages";
-				mes "have a hard time avoiding the attacks.";
-				next;
-				mes "[Mana]";
-				mes "'^5C4033Earth^000000'property spells include";
-				mes "'Stone Curse' but it is hard to";
-				mes "classify it as '^5C4033Earth^000000' but for now";
-				mes "we'll leave it as is.";
-				next;
-				mes "[Mana]";
-				mes "'^5C4033Earth^000000' property monsters are";
-				mes "generally weak against 'Fire Wall'.";
+				mes "Alright, ^5C4033Earth^000000 property";
+				mes "monsters usually have";
+				mes "good targeting, so even";
+				mes "if your Dodge Rate is high,";
+				mes "you might find it hard to";
+				mes "evade all of their attacks.";
 				next;
 				mes "[Mana]";
-				mes "'^5C4033Earth^000000' is weak against '^ff0000fire^000000'";
-				mes "so 'Fire Wall' stops the monster and";
-				mes "does damage.";
+				mes "When dealing with these";
+				mes "monsters, use Fire property";
+				mes "spells. Fire Wall is usually";
+				mes "pretty effective, since it'll";
+				mes "stop the monster and also";
+				mes "cause some good damage.";
 				next;
 				mes "[Mana]";
-				mes "In the same way '^ff0000fire^000000' property spells";
-				mes "such as 'Fire Ball' or 'Fire Bolt' can";
-				mes "be used to do damage the monsters also.";
+				mes "It's also handy to know";
+				mes "that when you use Stone";
+				mes "Curse on a monster, that";
+				mes "monster becomes Earth";
+				mes "property while the spell";
+				mes "is in effect. Cool, huh?";
 				next;
 				mes "[Mana]";
-				mes "Oh..and";
-				mes "When you 'Stone Curse' a monster";
-				mes "the monster becomes of '^5C4033earth^000000' property.";
-				mes "If you use this point very well, you can do";
-				mes "much more damange when battling.";
+				mes "So if you use Stone Curse,";
+				mes "a good strategy would be to";
+				mes "use Fire property skills right";
+				mes "afterwards, like Fire Bolt and";
+				mes "Fire Ball, to take advantage of";
+				mes "the monster's Earth property.";
 				set tu_mana,tu_mana|2;
 				next;
 				break;
 			case 3:
 				mes "[Mana]";
-				mes "Generally '^93DB70wind^000000' property monsters";
-				mes "avoid attacks very well.";
+				mes "Now, don't be too surprised";
+				mes "if you keep missing when you";
+				mes "attack ^93DB70Wind^000000 property monsters.";
+				mes "Most of them can avoid physical";
+				mes "attacks really well because of";
+				mes "their high Dodge Rates.";
 				next;
 				mes "[Mana]";
-				mes "But Mages never really attack directly";
-				mes "so there is no need to worry about";
-				mes "this aspect.";
+				mes "But since we Mages";
+				mes "mostly attack with our";
+				mes "spells, we don't need to";
+				mes "worry so much about that.";
+				mes "Still, Wind monsters tend to";
+				mes "be pretty quick, so be careful.";
 				next;
 				mes "[Mana]";
-				mes "But '^93DB70wind^000000' property monsters";
-				mes "are swift, so you must be careful when attacking.";
+				mes "When it comes to attacking";
+				mes "Wind monsters, it'd be ideal";
+				mes "to use Earth property skills.";
+				mes "But since only Wizards have";
+				mes "access to Earth property attacks,";
+				mes "we should settle for Fire skills.";
 				next;
 				mes "[Mana]";
-				mes "'^93DB70Wind^000000' property skills include";
-				mes "'Lightning Bolt' and 'Thunder Storm'.";
+				mes "Fire property skills might";
+				mes "not do a whole lot of damage,";
+				mes "but they'll have a greater effect than Wind or Water property skills, which would do very little or no damage at all to Wind monsters.";
 				next;
 				mes "[Mana]";
-				mes "When attacking '^93DB70wind^000000' property monsters";
-				mes "it is good to use '^5C4033earth^000000' property skills.";
-				mes "But while Wizards do have teh ability to do quite";
-				mes "some damage, Mages do not yet have the power to";
-				mes "'attack with an ^5C4033earth^000000' property skill.";
+				mes "Just so you know,";
+				mes "the ^93DB70Wind^000000 property skills";
+				mes "that we Mages can use are";
+				mes "Lighning Bolt and Thunder Storm.";
 				next;
-				mes "[Mana]";
-				mes "So it is good to use a '^ff0000fire^000000' element";
-				mes "skill. '^93DB70Wind^000000' property or";
-				mes "'^0000FFwater^000000' property skills do little";
-				mes "or no damage to '^93DB70wind^000000' property monsters.";
 				set tu_mana,tu_mana|4;
 				next;
 				break;
 			case 4:
 				mes "[Mana]";
-				mes "'^0000FFWater^000000' property monsters have";
-				mes "strong health. When battling such monsters";
-				mes "it usually takes longer than others.";
-				next;
-				mes "[Mana]";
-				mes "But '^0000FFwater^000000' property monsters are";
-				mes "affected more by level then monsters of other";
-				mes "properties.";
-				next;
-				mes "[Mana]";
-				mes "In other words a monster that is level 2 of the '^93DB70wind^000000'";
-				mes "property gets hit '150' by a '^5C4033earth^000000' property skill,";
-				mes "a level 2 '^0000FFwater^000000' property monster";
-				mes "will receive '175' damage from a '^93DB70wind^000000' property skill.";
+				mes "^0000FFWater^000000 property monsters";
+				mes "tend to have a lot of health,";
+				mes "so they can take more damage";
+				mes "than other monsters, making";
+				mes "battles with them longer.";
 				next;
 				mes "[Mana]";
-				mes "If you use these properties well you should be";
-				mes "able to fight '^0000FFwater^000000' property monsters quickly.";
+				mes "Now, remember how I said";
+				mes "that there are differing levels";
+				mes "for properties? Water property monsters are actually a bit more";
+				mes "sensitive to damage from their opposing element at higher levels.";
 				next;
 				mes "[Mana]";
-				mes "'^0000FFWater^000000' property skills include 'Cold Bolt'";
-				mes "and 'Frost Driver'.";
-				mes "'^ff0000Fire^000000' property monsters are weak against these attacks.";
-				mes "Oh, and 'Frost Diver' has a special characteristic.";
+				mes "In other words, monsters";
+				mes "that are higher in level for";
+				mes "the Water property are going";
+				mes "to take even more damage";
+				mes "from Wind property attacks.";
 				next;
 				mes "[Mana]";
-				mes "When attacking a monster with 'Frost Driver'";
-				mes "there is a chance that the monster can be frozen.";
-				mes "At that time the monster temporarily turns into a";
-				mes "'^0000FFwater^000000' property.";
+				mes "Water property skills";
+				mes "in the Mage's repertoire";
+				mes "include Cold Bolt and Frost";
+				mes "Diver. These skills are very";
+				mes "effective against Fire monsters.";
 				next;
 				mes "[Mana]";
-				mes "If you use this idea, then it should be easier to";
-				mes "fight the monsters.";
+				mes "Frost Diver is special in";
+				mes "that it has the chance to";
+				mes "actually freeze monsters.";
+				mes "While monsters are frozen by";
+				mes "Frost Diver, they're considered Water monsters. Interesting, huh?";
 				set tu_mana,tu_mana|8;
 				next;
 				break;
 			case 5:
 				mes "[Mana]";
-				mes "Let me explain a little about the '^CFB53Bghost^000000' property.";
-				mes "There aren't many '^CFB53Bghost^000000' property monsters";
-				mes "so it is a bit tedious.";
+				mes "Now, there aren't many";
+				mes "^CFB53BGhost^000000 property monsters";
+				mes "around. But if you do run into";
+				mes "them, go ahead and use your";
+				mes "Ghost property skills, which";
+				mes "should be effective.";
 				next;
 				mes "[Mana]";
-				mes "'^CFB53BGhost^000000' property magic includes";
-				mes "'Napalm Beat' and 'Soul Strike' and also";
-				mes "the hard to classify 'Safety Wall'.";
+				mes "The Ghost property attacks";
+				mes "that we Mages can use are";
+				mes "Napalm Beat and Soul Strike.";
+				mes "These skills generally tend";
+				mes "to work pretty well, except on";
+				mes "high Holy property monsters.";
 				next;
 				mes "[Mana]";
-				mes "The first two are very useful when attacking '^CFB53Bghost^000000' property";
-				mes "monsters, but if the monster has no property, ";
-				mes "the skills may not do any damage whatsoever.";
+				mes "Now, the Safety Wall spell";
+				mes "is sort of a Ghost property";
+				mes "skill, but it's hard to classify. Casting Safety Wall creates";
+				mes "a barrier than protects against";
+				mes "close range physical attacks.";
 				next;
 				mes "[Mana]";
-				mes "So be careful when you choose to use them.";
-				mes "Mmm.. and 'Safety Wall' is a slightly different";
-				mes "skill. It makes a are surrounded by a wall where";
-				mes "one person can enter and be protected from ";
-				mes "close physical attacks.";
-				next;
-				mes "[Mana]";
-				mes "But it cannot protect you from distant";
-				mes "attacks or strong monster's property attacks";
-				mes "so be careful when using the skill.";
+				mes "However, this barrier only";
+				mes "fits one person and doesn't";
+				mes "shield against long range";
+				mes "attacks or strong property";
+				mes "attacks, so be really careful!";
 				set tu_mana,tu_mana|16;
 				next;
 				break;
 			case 6:
 				mes "[Mana]";
-				mes "Really?";
-				mes "I'm a li~~~ ttle busy too so I can't explain it several times.";
-				mes "So listen carefully until you have absorbed all the";
-				mes "information this time.";
-				next;
-				if(select("Then the explanation..", "Quit for sure.")==2){
+				mes "Are you sure that you've";
+				mes "heard enough about the";
+				mes "nuances of the elemental";
+				mes "properties? Because if you're";
+				mes "ready, we'll cover some new";
+				mes "material for you to learn.";
+				next;
+				switch(select("W-wait, not yet!:I'm ready to go on.")) {
+				case 1:
+					break;
+				case 2:
 					mes "[Mana]";
-					mes "I'll move onto the next subject then.";
-					mes "Hoho..";
-					set tu_magician01, 2;
-					//misceffect EF_HIT5;
+					mes "Alrighty, we'll";
+					mes "move on to the next";
+					mes "subject then. Ho ho ho~!";
+					set tu_magician01,2;
+					specialeffect2 EF_HIT5;
 					if(tu_mana&1){
-						getexp 150,70;
+						getexp 15,7;
 					}
 					if(tu_mana&2){
-						getexp 150,70;
+						getexp 15,7;
 					}
 					if(tu_mana&4){
-						getexp 150,70;
+						getexp 15,7;
 					}
 					if(tu_mana&8){
-						getexp 150,70;
+						getexp 15,7;
 					}
 					if(tu_mana&16){
-						getexp 150,70;
+						getexp 15,7;
 					}
 					set tu_mana,0;
 				}
@@ -326,323 +392,341 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		}
 		break;
 	case 2:
-		mes "Do you understand the concept of properties now?";
-		mes "It may be a bit confusing, but over time";
-		mes "you should be able to get the hang of it.";
-		mes "Now I will explain about magic and skills.";
-		//next;
-		//misceffect EF_SIGHT;
-		next;
-		mes "[Mana]";
-		mes "I'll first explain the basic skills.";
-		mes "'Fire Bolt' 'Cold Bolt'";
-		mes "'Lightning Bolt' 'Napalm Beat'";
-		mes "These are the four basic ones.";
-		//next;
-		//misceffect EF_NAPALMBEAT;
-		next;
-		mes "[Mana]";
-		mes "These can damage one opponent or monster.";
-		mes "Most of the other skills require the";
-		mes "knowledge of these basic skills first.";
-		//next;
-		//misceffect EF_LIGHTBOLT;
-		next;
-		mes "[Mana]";
-		mes "'Fire Bolt' has the '^ff0000fire^000000' property,";
-		mes "'Cold Bolt' has the '^0000FFwater^000000' property,";
-		mes "Lightning Bolt' has the '^93DB70wind^000000' property,";
-		mes "and 'Napalm Beat' has the '^CFB53Bghost^000000' property.";
-		//next;
-		//misceffect EF_STONECURSE;
+		mes "I know that the concept";
+		mes "of properties might be";
+		mes "confusing now, but over";
+		mes "time you'll get the hang";
+		mes "of it. Now it's time to talk";
+		mes "about magic skills in depth~";
 		next;
 		mes "[Mana]";
-		mes "The damage that these skills can do";
-		mes "grows as the level of gets higher.";
-		mes "And there are some other basic skills";
-		mes "such as 'Sight', 'Stone Curse' and";
-		mes "'Increase SP Recovery'.";
+		mes "Now, the most basic magic";
+		mes "attack spells are Fire Bolt,";
+		mes "Cold Bolt, Lightning Bolt and";
+		mes "Napalm Beat. Learning these";
+		mes "enables Mages to learn their";
+		mes "more advanced skills.";
+		specialeffect2 EF_NAPALMBEAT;
 		next;
 		mes "[Mana]";
-		mes "'Sight' reveals hidden enemies but the";
-		mes "range is not that great so be careful.";
+		mes "Increasing the levels of";
+		mes "these skills not only opens";
+		mes "access to other spells, but";
+		mes "the damage of those basic";
+		mes "attack skills is also increased.";
+		specialeffect2 EF_LIGHTBOLT;
 		next;
 		mes "[Mana]";
-		mes "'Stone Curse', as mentioned before can";
-		mes "curse a target with a certain chance.";
-		mes "But be aware that you need a 'Red Gemstone'";
-		mes "for the skill to work.";
+		mes "Other skills that are";
+		mes "basic to the Mage class";
+		mes "are Sight, Stone Curse and";
+		mes "Increase SP Recovery. They're";
+		mes "not really attack spells, but are useful in certain situations.";
 		next;
+		specialeffect2 EF_SIGHT;
 		mes "[Mana]";
-		mes "Opponents that are cursed with 'Stone Curse'";
-		mes "become '^5C4033earth^000000' properties.";
-		mes "And a cursed enemy can't move on its";
-		mes "own free will.";
+		mes "Sight is used to";
+		mes "reveal enemies that";
+		mes "are hiding. Keep in";
+		mes "mind that this skill's";
+		mes "range doesn't go too far.";
 		next;
+		specialeffect2 EF_STONECURSE;
 		mes "[Mana]";
-		mes "'Increase SP Recovery' is sort of hard";
-		mes "to call a magic skill. It increases the";
-		mes "amount of SP you recover when sitting";
-		mes "down to rest.";
+		mes "Stone Curse has the chance";
+		mes "to curse a target, temporarily";
+		mes "immobilizing it and making it";
+		mes "^5C4033Earth^000000 property. However, each";
+		mes "attempt to cast Stone Curse";
+		mes "requires 1 Red Gemstone.";
 		next;
 		mes "[Mana]";
-		mes "So it will reduce the time you need to";
-		mes "sit and rest. It doesn't help you directly";
-		mes "when battling, but makes things a lot easier.";
+		mes "Increase SP Recovery is";
+		mes "a passive skill which helps";
+		mes "you recover more SP while sitting down to rest. It doesn't directly affect battle, but having more SP is always better.";
 		next;
 		mes "[Mana]";
-		mes "Mmm....";
-		mes "This should be enough explaining about the";
-		mes "basic skills. Now before we move onto the";
-		mes "higher level skills, here is an assignment";
-		mes "for you. Hoho..";
+		mes "Well, I feel like I've";
+		mes "explained the basic spells";
+		mes "enough. Now, before I talk";
+		mes "about our advanced skills,";
+		mes "there's an assignment I want";
+		mes "you to complete for training.";
 		next;
 		mes "[Mana]";
-		mes "If you go north of here, Geffen, there is";
-		mes "a big bridge and monsters called a 'Pupa'.";
-		mes "They don't move and do not attack when";
-		mes "attacked.";
+		mes "If you head west from";
+		mes "here, you'll find a big bridge";
+		mes "bridge where you can encounter";
+		mes "these monsters called Pupa.";
+		mes "Pupa don't move and can't";
+		mes "attack to save their lives.";
 		next;
 		mes "[Mana]";
-		mes "Attack these 'Pupa' and gather 10 'Chrysalis'.";
-		mes "Be careful because these 'Pupa' may turn";
-		mes "into a 'Creamy'.";
-		next;
-		mes "[Mana]";
-		mes "It may be hard for you to fight a 'Creamy' yet";
-		mes "so if the 'Pupa' is acting weird be extra careful.";
+		mes "Hunt these Pupa";
+		mes "until you've collected";
+		mes "10 Chrysalis from them.";
+		mes "Then bring them to me, okay?";
 		set tu_magician01, 3;
-		getexp 400,200;
-		//misceffect EF_HIT5;
+		getexp 40,20;
+		specialeffect2 EF_HIT5;
+
 		close;
 		break;
 	case 3:
-		mes "Ah~ You're here?";
-		mes "Let's see if you gathered all that's needed.";
+		mes "Ah, you're back?";
+		mes "Let's see if you gathered";
+		mes "all 10 Chrysalis from hunting";
+		mes "all of those Pupa. Hmmmm...";
 		next;
-		if(countitem(915) < 10){
+		if (countitem(915) < 10) {
 			mes "[Mana]";
-			mes "Not quite enough.";
-			mes "Come back when you have gathered some more.";
-			mes "This is a bonus.";
+			mes "Aw, you don't";
+			mes "have enough of";
+			mes "them yet. Head west";
+			mes "from here and hunt Pupa";
+			mes "to get more Chrysalis, okay?";
+			mes "For now, I'll just heal you up.";
 			set tu_magician01, 4;
-			percentheal 100,0;
-			percentheal 0,100;
+			percentheal 100,100;
 			close;
 		} else {
 			mes "[Mana]";
-			mes "Oh you gathered them all.";
-			mes "Now are you more used to using these skills?";
-			mes "Once you have trained more, you can";
-			mes "combine different skills to form stronger attacks.";
-			next;
-			mes "[Mana]";
-			mes "Let's take a break now before we";
-			mes "move on to explain the other skills.";
+			mes "...Nine, ten.";
+			mes "Alright, you pass!";
+			mes "By now, you must be more";
+			mes "used to using your skills, huh?";
+			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			set tu_magician01, 5;
-			getexp 400,200;
-			//misceffect EF_HIT5;
+			getexp 40,20;
+			specialeffect2 EF_HIT5;
 			close;
 		}
 		break;
 	case 4:
-		mes "Ah~ You're here?";
-		mes "Let's see if you gathered all that's needed.";
+		mes "So...";
+		mes "Did you get";
+		mes "10 Chrysalis";
+		mes "from hunting Pupa";
+		mes "like I asked? I hope so...";
+		mes "Because I'm going to check~";
 		next;
 		if(countitem(915) < 10){
 			mes "[Mana]";
-			mes "You need a little bit more.";
-			mes "You can do it!";
-			mes "'10 ^ff0000Chrysalis^000000', ok?";
+			mes "Whoa, you need";
+			mes "more than just this.";
+			mes "I know you can do it...";
+			mes "Pupas are completely";
+			mes "defenseless monsters!";
 			close;
 		} else {
 			mes "[Mana]";
-			mes "Oh you gathered them all.";
-			mes "Now are you more used to using these skills?";
-			mes "Once you have trained more, you can";
-			mes "combine different skills to form stronger attacks.";
-			next;
-			mes "[Mana]";
-			mes "Let's take a break now before we";
-			mes "move on to explain the other skills.";
+			mes "...Nine, ten.";
+			mes "Alright, you pass!";
+			mes "By now, you must be more";
+			mes "used to using your skills, huh?";
+			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			set tu_magician01, 5;
-			getexp 400,200;
-			//misceffect EF_HIT5;
+			getexp 40,20;
+			specialeffect2 EF_HIT5;
 			close;
 		}
 		break;
 	case 5:
-		mes "Now shall we discuss the more advanced skills?";
+		mes "Now I'll tell you";
+		mes "what I know about the";
+		mes "more advanced Mage";
+		mes "skills. Which one would";
+		mes "you like me to explain?";
 		next;
 		while(1){
-			switch(select("Soul Strike", "Safety Wall", "Fire Ball", "Frost Diver", "Thunderstorm", "Fire Wall", "Energy Coat", "Quit.")){
+			switch(select("Soul Strike:Safety Wall:Fire Ball:Frost Diver:Thunderstorm:Fire Wall:Energy Coat:Quit.")) {
 			case 1:
 				mes "[Mana]";
-				mes "'Soul Strike' is a '^CFB53Bghost^000000' property";
-				mes "skill. Once you have leared a certain amount of";
-				mes "'Napalm Beat' you can learn it as well.";
-				//next;
-				//misceffect EF_SOULSTRIKE;
+				mes "Soul Strike is a ^CFB53BGhost^000000";
+				mes "property skill that you can";
+				mes "learn after increasing the";
+				mes "Napalm Beat skill up to";
+				mes "a certain level. It attacks";
+				mes "with ancient spiritual power~";
+				next;
+				specialeffect2 EF_SOULSTRIKE;
 				next;
 				mes "[Mana]";
-				mes "When you train more the power of your";
-				mes "'Soul Strike' will become stronger and ";
-				mes "you will be able to cast it faster.";
+				mes "As you train in the use";
+				mes "of Soul Strike and increase";
+				mes "that skill's level, it will grow in strength and you'll be able";
+				mes "to cast it much more quickly.";
 				set tu_mana,tu_mana|1;
 				next;
 				break;
 			case 2:
 				mes "[Mana]";
-				mes "'Safety Wall' can be learned after you have ";
-				mes "trained a certain amount of 'Napalm Beat'";
-				mes "and 'Soul Strike'. As mentioned before, it";
-				mes "blocks most close range attacks.";
-				//next;
-				//misceffect EF_GLASSWALL;
+				mes "You can learn Safety Wall";
+				mes "after training in the use of";
+				mes "Napalm Beat and Soul Strike.";
+				mes "Safety Wall protects against";
+				mes "most close range attacks.";
+				next;
+				specialeffect2 EF_GLASSWALL;
 				next;
 				mes "[Mana]";
-				mes "But it does not block infinitely.  It will only";
-				mes "provide a shield for a certain amount of";
-				mes "attacks and time. Of course this varies";
-				mes "depending on how much you train.";
+				mes "However, Safety Wall";
+				mes "has a time duration and";
+				mes "can only protect from a";
+				mes "certain number of attacks,";
+				mes "depending on the level of the";
+				mes "Safety Wall skill that you use.";
 				set tu_mana,tu_mana|2;
 				next;
 				break;
 			case 3:
 				mes "[Mana]";
-				mes "'Fire Ball' is a '^ff0000fire^000000' property skill";
-				mes "and can be learned after a certain amount of 'Fire Bolt'.";
-				//next;
-				//misceffect EF_FIREBALL;
+				mes "Fire Ball is a ^FF0000Fire^000000";
+				mes "property skill that you";
+				mes "can learn after training";
+				mes "in the use of Fire Bolt.";
+				next;
+				specialeffect2 EF_FIREBALL;
 				next;
 				mes "[Mana]";
-				mes "If 'Fire Bolt' attacks one opponent 'Fire Ball'";
-				mes "attacks several within a certain range.";
+				mes "Fire Ball can actually";
+				mes "inflict damage on multiple";
+				mes "enemies if they are within";
+				mes "the range of the skill. Make";
+				mes "good use of the destructive";
+				mes "power of the Fire Ball!";
 				next;
 				set tu_mana,tu_mana|4;
 				break;
 			case 4:
 				mes "[Mana]";
-				mes "'Frost Diver' is a '^0000FFwater^000000' property";
-				mes "skill and can learned after training with 'Cold Bolt'";
-				mes "While it can damage the opponent, the main";
-				mes "purpose is to freeze the enemy.";
-				//next;
-				//misceffect EF_FROSTDIVER;
-				//misceffect EF_FROSTDIVER2;
+				mes "Frost Diver is a ^0000FFWater^000000";
+				mes "property skill that can be";
+				mes "learned after increasing";
+				mes "the Cold Bolt skill to";
+				mes "a certain level.";
+				specialeffect2 EF_FROSTDIVER;
 				next;
+				specialeffect2 EF_FROSTDIVER2;
 				mes "[Mana]";
-				mes "Enemies hit by 'Frost Diver' will be damaged";
-				mes "and freeze at the same time by a certain";
-				mes "amount of chance.";
+				mes "Frost Diver will damage";
+				mes "enemies and has the chance";
+				mes "to freeze them as well. Once";
+				mes "frozen, the monster will be";
+				mes "considered to be a Water";
+				mes "property creature.";
 				next;
 				mes "[Mana]";
-				mes "When the enemy is frozen it will change to";
-				mes "have the '^0000FFwater^000000' property.";
-				mes "The amount of damage and chance to be";
-				mes "frozen increases the more you train.";
+				mes "Now, as you increase";
+				mes "the level of the Frost Diver";
+				mes "skill, its damage and chance";
+				mes "of freezing monsters will also";
+				mes "increase. Pretty dangerous, eh? ^FFFFFFkamenriderblack^000000";
 				set tu_mana,tu_mana|8;
 				next;
 				break;
 			case 5:
 				mes "[Mana]";
-				mes "'Thunderstorm' is a '^93DB70wind^000000' property";
-				mes "skill and can be learned after training 'Lightning Bolt'.";
-				//next;
-				//misceffect EF_THUNDERSTORM;
+				mes "Thunderstorm is a";
+				mes "^93DB70Wind^000000 property skill";
+				mes "that you can learn after";
+				mes "increasing the Lightning";
+				mes "Bolt skill to a certain level.";
 				next;
+				specialeffect2 EF_THUNDERSTORM;
 				mes "[Mana]";
-				mes "While 'Lightning Bolt' attacks one particular";
-				mes "enemy, 'Thunderstorm' attacks all enemies";
-				mes "within a certain range. It is somewhat similar";
-				mes "to how 'Fire Ball' works.";
+				mes "Thunderstorm is similar";
+				mes "to Fire Ball in that it can";
+				mes "attack multiple enemies";
+				mes "within a certain range.";
+				mes "It's an incredibly potent";
+				mes "ground targeting attack.";
 				set tu_mana,tu_mana|16;
 				next;
 				break;
 			case 6:
 				mes "[Mana]";
-				mes "'Fire Wall' is a '^ff0000fire^000000' property";
-				mes "skill that can be learned after training 'Fire Ball'";
-				mes "and 'Sight'.";
-				//next;
-				//misceffect EF_FIREWALL;
-				next;
-				mes "[Mana]";
-				mes "'Fire Wall' works differently from the";
-				mes "the other skills. While other skills attack";
-				mes "one particular opponent, 'Fire Wall'";
-				mes "targets an area.";
-				next;
-				mes "[Mana]";
-				mes "So it is like....";
-				mes "     opponent";
-				mes "     *********";
-				mes "          me";
+				mes "Fire Wall is a ^FF0000Fire^000000";
+				mes "property skill that can";
+				mes "be learned after training";
+				mes "in the use of Fire Ball and";
+				mes "Sight. Unlike other skills,";
+				mes "Fire Wall targets an area.";
 				next;
+				specialeffect2 EF_FIREWALL;
 				mes "[Mana]";
-				mes "The target is not the enemy but rather the";
-				mes "space between yourself and the enemy.";
-				mes "or the floor. You can use it to make a ";
-				mes "'Fire Wall' between yourself and the enemy";
-				mes "and block its path.";
+				mes "So you can place";
+				mes "a Fire Wall in locations";
+				mes "where you think the enemy";
+				mes "will move towards. And it's";
+				mes "especially useful when";
+				mes "monsters approach you!";
 				next;
 				mes "[Mana]";
-				mes "During that time, you can go ahead and use";
-				mes "a skill that will cause more damage safely.";
-				mes "Depending on how you use 'Fire Wall'";
-				mes "it can be very powerful.";
+				mes "So if you can use";
+				mes "Fire Well strategically";
+				mes "and effectively, it can";
+				mes "be a very powerful skill~";
 				set tu_mana,tu_mana|32;
 				next;
 				break;
 			case 7:
 				mes "[Mana]";
-				mes "'Energy Coat' is mmm.....";
-				mes "a unique skill and cannot be learned";
-				mes "in a normal way. You can only learn";
-				mes "the skill from 'Blizardis' who is at";
-				mes "the Mage Job Change Place.";
-				//next;
-				//misceffect EF_ENERGYCOAT ;
+				mes "Energy Coat is, well,";
+				mes "a unique skill that you";
+				mes "can't just learn on your own.";
+				mes "You'll have to ask Blizardis";
+				mes "inside the Mage Guild to";
+				mes "teach you how to use it.";
+				next;
+				specialeffect2 EF_ENERGYCOAT;
 				next;
 				mes "[Mana]";
-				mes "'Blizardis' will tell you the details.";
+				mes "If you do decide to";
+				mes "learn Energy Coat, I'm";
+				mes "sure Blizardis will tell";
+				mes "you all you need to know.";
 				set tu_mana,tu_mana|64;
 				next;
 				break;
 			case 8:
 				mes "[Mana]";
-				mes "Did you understand the explanation?";
-				mes "Mmm....I wanted to give you something more";
-				mes "like a mission, but we need more information";
-				mes "before we do anything else.";
-				mes "I'll let you know when we are done.";
+				mes "Did you understand";
+				mes "all of that? Good, because";
+				mes "now I have a mission to give";
+				mes "you on behalf of the Mage";
+				mes "Guild. When you're ready for";
+				mes "briefing, talk to me, okay?";
 				next;
 				mes "[Mana]";
-				mes "Oh and this is a present.";
-				mes "Become a great Wizard~";
+				mes "Oh, and please take";
+				mes "this. It's a present for";
+				mes "you to help you in your";
+				mes "training. I hope it comes";
+				mes "in handy when fighting...";
 				set tu_magician01, 6;
-				getitem 1604, 1;
-				//misceffect EF_HIT5;
+				getitem 1604,1; //Wand
+				specialeffect2 EF_HIT5;
 				if(tu_mana&1){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				if(tu_mana&2){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				if(tu_mana&4){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				if(tu_mana&8){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				if(tu_mana&16){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				if(tu_mana&32){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				if(tu_mana&64){
-					getexp 300,100;
+					getexp 30,10;
 				}
 				set tu_mana,0;
 				close;
@@ -653,96 +737,112 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		close;
 		break;
 	case 6:
-		mes "Oh good, you came.";
-		mes "There are a lot of strange things going";
-		mes "on these days and we've been short on";
-		mes "hands. Recently something happened in Morroc.";
-		next;
-		mes "[Mana]";
-		mes "So we received a couple requests from the Thief Guild.";
-		mes "But everyone is out doing work so we're having trouble.";
+		mes "Oh good, you're back.";
+		mes "Let me tell you about";
+		mes "your mission. Recently,";
+		mes "something has happened in";
+		mes "Morroc and the Thief Guild";
+		mes "is requesting our assistance.";
 		next;
 		mes "[Mana]";
-		mes "If possible, do you think you can go?";
-		mes "Of course you will be compensated when you";
-		mes "return and we will give you some things to support you.";
-		mes "What would you like to do?";
-		next;
-		if(select("Do it.", "Don't do it.")==1){
+		mes "It's not mandatory";
+		mes "for you to do this, but";
+		mes "you will be compensated";
+		mes "for your efforts and we'll";
+		mes "give you some support.";
+		mes "So what do you think?";
+		next;
+		switch(select("I'll do it.:Sorry, but...")) {
+		case 1:
 			mes "[Mana]";
-			mes "Hoho..of course...";
-			mes "I shall send you to Morroc.";
-			mes "Go meet 'Eirhan' in front of the Morroc Pyramid.";
-			mes "Thank you~";
+			mes "Great! Alright,";
+			mes "I'll send you straight";
+			mes "to Morroc, then. Once you";
+			mes "get there, go to the front";
+			mes "of the Morroc Pyramid and";
+			mes "speak to Yierhan. Thanks~";
 			next;
 			mes "[Mana]";
-			mes "Oh and when you're done, make sure you  come back.";
-			mes "Hoho..";
+			mes "Oh, and when you're";
+			mes "done with what Yierhan";
+			mes "has you do, come back";
+			mes "and report to me, okay?";
 			set tu_magician01, 7;
 			emotion e_heh;
 			warp "morocc",182,286;
 			close;
-		} else {
+		case 2:
 			mes "[Mana]";
-			mes "Mmm....";
-			mes "Oh well. If you want to help later";
-			mes "feel free to come back. We're very";
-			mes "short on hands these days.";
+			mes "Mmm...?";
+			mes "Oh, I see. Well, if";
+			mes "you happen to change";
+			mes "your mind, come back";
+			mes "and ask me later, okay?";
 			close;
 		}
 		break;
 	case 7:
-		mes "I'm not sure what it may be.";
-		mes "But keep up the good work.";
-		mes "Hoho..";
+		mes "I don't know";
+		mes "what kind of work";
+		mes "Yierhan has in store";
+		mes "for you, but hopefully";
+		mes "it won't be too difficult.";
 		close;
 		break;
 	case 27:
-		mes "I was told ahead of time that you";
-		mes "accomplished your mission very";
-		mes "well.. hoho.";
+		mes "Yierhan just sent me";
+		mes "a message, saying that";
+		mes "you've done a great job in";
+		mes "completing your mission.";
+		mes "Very nice work, "+PcName+"~";
 		next;
 		mes "[Mana]";
-		mes "It seems like a problemthe two";
-		mes "organizations that are secretly active ";
-		mes "may have caused.. ";
-		mes "I thought they were separate....";
+		mes "It seems like there are";
+		mes "two secret organizations";
+		mes "involved in all of this dirty";
+		mes "business. Why would they";
+		mes "be working together?";
 		next;
 		mes "[Mana]";
-		mes "But it seems the two may have a deeper";
-		mes "relationship than I had thought.";
-		mes "Any more is out of your range..";
-		mes "so leave the rest to the guild.";
-		mes "Thank you very much.";
+		mes "Well, in any case...";
+		mes "This is some pretty";
+		mes "major business that";
+		mes "I guess the higher-ups";
+		mes "will handle, so you don't";
+		mes "need to worry about it for now.";
 		next;
 		mes "[Mana]";
-		mes "Oh, and this is in appreciation";
-		mes "for helping the guild.";
-		mes "Hoho..";
+		mes "Please take this as";
+		mes "a little reward for helping";
+		mes "out both of our guilds. Once";
+		mes "again, thanks very much~";
 		set tu_magician01, 28;
-		getitem 2321, 1;
+		getitem 2321,1; //Silk_Robe
 		set Zeny, Zeny + 3000;
-		getexp 3000,1000;
+		getexp 300,100;
 		close;
 		break;
 	default:
 		if(tu_magician01 < 27){
-			mes "Hmm....";
-			mes "I see....";
-			mes "There is something going on in the Rune";
-			mes "Midgard kingdom for sure. That is why our";
-			mes "guild is busy as well.";
+			mes "So...";
+			mes "It looks like something is";
+			mes "going on in the Rune-Midgarts";
+			mes "Kingdom for sure. No wonder";
+			mes "all the guilds are so busy...";
 			next;
 			mes "[Mana]";
-			mes "Keep up with the good work please.";
-			mes "....";
-			mes "Ah..and 'Eirhan' is doing well also, right?";
-			mes "Hoho...";
+			mes "Anyway, please ";
+			mes "keep up the good";
+			mes "work. And, um, is";
+			mes "Yierhan doing well?";
 			close;
 		} else {
-			mes "You seemed to have trained very well.";
-			mes "There is nothing much I can teach you.";
-			mes "You must seek your own ways of training now.";
+			mes "You seem to be well";
+			mes "experienced now and there";
+			mes "isn't anything else that I can";
+			mes "really teach you. Now it's up";
+			mes "to you to find ways to master";
+			mes "the ways of magic on your own.";
 			close;
 		}
 	}