Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

1 files changed, 87 insertions, 95 deletions

diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index 9f9ccec1f..7962a0544 100644
--- a/npc/re/quests/magic_books.txt
+++ b/npc/re/quests/magic_books.txt
@@ -1,21 +1,20 @@
 //===== Hercules Script ======================================
 //= Magic Book Seller
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
 //= Credits to Muad_Dib for the translation.
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= Hercules
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.1a
+//===== Description: =========================================
+//= [Official Conversion]
 //= An NPC which sells you different kinds of Magic Books.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Masao]
-//= 1.1 Optimized, 60% size reduction. [Euphy]
-//============================================================ 
-
-geffen_in,176,105,4	script	Magic Book Master Velof	64,{
+//= 1.1 Optimized. [Euphy]
+//= 1.1a Updated NPC name to "Master Velofos". [Euphy]
+//============================================================
 
+geffen_in,176,105,4	script	Master Velofos	64,{
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too many items. Please make some room in your bag first.";
 		close;
@@ -25,255 +24,251 @@ geffen_in,176,105,4	script	Magic Book Master Velof	64,{
 		close;
 	}
 	if ((Upper == 2) && (Class != Job_Baby_Warlock)) {
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "What are you, a baby?";
 		mes "I'm not here to babysit. Get lost!";
 		close;
 	}
 	if ((Class != Job_Warlock) && (Class != Job_Warlock_T) && (Class != Job_Baby_Warlock)) {
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "Ha ha, are you also seeking new knowledge?";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "I'm sorry, but my knowledge doesn't concern you.";
 		close;
 	}
 	if (getskilllv(2230) < 1) {
-		mes "[Magic Book Master Velof]";
-		mes "Well you've met all the qualifications except one: you need the Release spell.";
+		mes "[Master Velofos]";
+		mes "Well, you've met all the qualifications except one: you need the Release spell.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "Learn the spell first. I've got so many things to tell you.";
 		close;
 	}
 	if ((getskilllv(2230) > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T) || (Class == Job_Baby_Warlock)) {
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "Welcome, my friend.";
 		mes "Congratulations on entering a brand new world of magic.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "We magic practitioners are always thirsty for new knowledge and power.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "We endure great hardship and pain to achieve what we want. When we finally do, the sense of accomplishment defies description. That's why both you and I have chosen the way of magic.";
 		next;
-		mes "[Magic Book Master Velof]";
+		mes "[Master Velofos]";
 		mes "By the way, what brings you to me today?";
 		next;
 		switch (select("Nothing.:Do you know the Reading Spell Book?:What's the Freezing Spell?:Can I have a Magic Book?:Can I use the Reading Spell Book without the Freezing Spell?:About the Ultimate Magic Book")) {
 		case 1:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Hah! You're silly.";
 			close;
 		case 2:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Reading Spell Book literally means 'read a spell book.' Do you know how to use Magic Books?";
 			next;
 			switch (select("Yes, I do.:No, I don't.")) {
 			case 1:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Well then, you don't need an additional lecture.";
 				close;
 			case 2:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Magic Books are an advanced type of magic scroll. While spells on scrolls disappear after one use, the ones in Magic Books can be cast multiple times.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Let's compare a spell on a scroll to a wire. When the wire is used to open a door or do something else, it's bent and crushed, losing its original shape. A spell from a Magic Book is more like a shape memory alloy.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Huh, don't you now what shape memory alloy is? Eh, just remember this: a wire made from shape memory alloy restores its shape over time.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Like the alloy, a spell on a Magic Book remains after a use, although reusing the spell has a downtime for its restoration.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "...Oh, I didn't mean to talk for too long. Anyways, you can use Magic Books to cast spells that you've learned. Its concept is different from normal spells.";
 				next;
 				select("What's the difference?");
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Why do you have to write your existing spells in Magic Books, you asked?";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "That's a good question. It's related to Magic Binding.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "You already learned Release, which allows you to hold the energy of the four different elements before the actual casting. Magic Binding is similar to Release.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Since you've learned Release, you're capable of using Magic Binding as well. Well, let's talk about that later.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "You know how to hold an existing spell, and then cast it at a desired timing via Release.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Carrying the globes of the four elements is also related to Magic Binding.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "As you know, the four elements are Fire, Water, Wind, and Earth. Being able to employ them freely is the essential principle of magic.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "We Humans use torches to keep fire, fans to blow wind, and bowls to hold water. We also use clay to make earthenware.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Those activities may differ from magic, but both are the same in the sense of employing the four elements.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "When you use complex magic spells to summon a storm, drop lightning, or burn an area, that consumes a lot of your energy, both physically and mentally.";
 				next;
-				mes "[Magic Book Master Velof]";
-				mes "When you fail to bind such powerful magic spells or fail to control them,";
-				next;
-				mes "[Magic Book Master Velof]";
-				mes "you can receive irreparable damage to your mind and body.";
+				mes "[Master Velofos]";
+				mes "When you fail to bind such powerful magic spells or fail to control them, you can receive irreparable damage to your mind and body.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "That's why we use Magic Books to reduce that burden. It helps summon pre-cast spells while you're focusing on binding their magic power.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "There's one downside though: Magic Books cannot be used for spells that you haven't learned.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "As I said earlier, spells in Magic Books tend to go back to what they are.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "That said, as a Circler, you cannot change or create spells in Magic Books.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Even if you create one, its power will be beyond your capacity.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "In order to use the Reading Spell Book, you must learn the Freezing Spell to bind magic.";
 				close;
 			}
 		case 3:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "The Freezing Spell is used for Magic Binding. It helps you to insert a magic spell to a circle.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Circles of magic work organically with each other. When you use the Freezing Spell to bind a spell, the spell won't activate until you cast the release spell.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Of course, binding a spell continuously consumes your mana, but it consumes less mana than conventional magic spells.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Magic Binding becomes more difficult when you use more powerful magic spells.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "For weak spells, you can bind two to three of them with your circle. For more powerful spells, maybe one or two is possible.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "That all depends on your ability to control your spells. You'll have to try and experience Magic Binding after you first learn it to really understand.";
 			close;
 		case 4:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "I'm sorry, but I only have Magic Books for beginners, but they're obviously not suitable for you. Do you still want one?";
 			next;
 			switch (select("Sure thing.:Where can I find advanced books?")) {
 			case 1:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "Please go talk to [Lea] in the Archive. Tell her that you need one of the Magic Books that I've stored in there.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "For your information, she won't give it to you without anything in return. Expect her to ask you for something!";
 				if (wm_book < 1) set wm_book, 1;
 				close;
 			case 2:
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "I'm sorry, but our management has recently decided to limit the availability of Magic Books for Multi Circlers. It's because their numbers are increasing more quickly than we expected.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "You could find one if you try hard, but I don't have any with me.";
 				next;
-				mes "[Magic Book Master Velof]";
+				mes "[Master Velofos]";
 				mes "If our management releases the restriction, you'll be the first one to know. Don't worry.";
 				close;
 			}
 		case 5:
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Nothing will happen when you try to bind magic without using Magic Binding because you have nothing to hold magic.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "It's like water that needs a bowl to stay in place.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "The problem is when you try to forcefully cast a spell that you haven't learned. It'll definately backfire on you.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Of course, the damage won't be severe: you'll fall asleep or be thrown into confusion. This is all because there's a conflict between your Magic Book and the force of Magic Binding when you're trying to summon and hold a unlearned spell.";
 			next;
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Don't try it out just to see what happens for yourself! Falling asleep while casting a spell? There's nothing more humiliating than that to magic practitioners like us.";
 			close;
 		case 6:
 			if ((BaseLevel > 139) && (getskilllv(2217) > 0) || (getskilllv(2213) > 0)) {
-				if(mac_book < 1){
-					mes "[Magic Book Master Velof]";
+				if (mac_book < 1) {
+					mes "[Master Velofos]";
 					mes "I'm sorry, but could you ask someone else? I'm kind of busy right now.";
 					close;
 				}
 				if (mac_book == 1) {
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "Huh, are you looking for the Ultimate Magic Book? Who sent you?";
 					next;
 					select("Ms. Lea.");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "I'm sorry, but there's not much information left about the Ultimate Magic Book.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "A few scholars in the Midgard Continent once tried to collect ancient Magic Books and reproduce that book, but...";
 					next;
 					select("But what?");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "Oh yes, perhaps he might know something.";
 					next;
 					select("Yes, I knew this was coming!");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "My brother is just like you. He's very interested in recreating the Ultimate Magic Book.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "His name is Galfos.";
 					mes "He's been taking a great interest in the ancient Magic Books.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "I didn't support him or give him any advice for his research since I thought he'd give on it pretty quickly, but...";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "If he's discovered anything useful, maybe it can helpful to you.";
 					next;
 					select("Where's Galfos now?");
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "I've heard that he's near the Expedition Camp beyond the Dimensional Rift to seek information about the ancient Magic Books.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "If you want to see him, you should prepare for a long journey.";
 					set mac_book,2;
 					close;
 				}
 				if (mac_book > 1) {
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "Galfos is near the Expedition Camp beyond the Dimensional Rift.";
 					next;
-					mes "[Magic Book Master Velof]";
+					mes "[Master Velofos]";
 					mes "If you want to see him, you should prepare for a long journey.";
 					close;
 				}
 			}
-			mes "[Magic Book Master Velof]";
+			mes "[Master Velofos]";
 			mes "Ha ha, I'm sorry, but you should focus on strengthening your body rather than creating Magic Books.";
 			close;
 		}
 	}
-	mes "[Magic Book Master Velof]";
+	mes "[Master Velofos]";
 	mes "Ha ha, are you also seeking new knowledge?";
 	next;
-	mes "[Magic Book Master Velof]";
+	mes "[Master Velofos]";
 	mes "I'm sorry, but my knowledge doesn't concern you.";
 	close;
 }
 
 geffen_in,175,112,4	script	Lea	123,{
-
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too many items. Please make some room in your bag first.";
 		close;
@@ -282,14 +277,14 @@ geffen_in,175,112,4	script	Lea	123,{
 		mes "You're overweight with items. Please lose some item weight first.";
 		close;
 	}
-	if ((wm_book > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T) || (Class == Job_Baby_Warlock)) {
+	if (wm_book > 0 && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) {
 		mes "[Lea]";
 		mes "You can only read books here. If you'd like to borrow any books, please receive an approval from 1 manager and 1 High Mage.";
 		next;
 		mes "[Lea]";
 		mes "How may I help you?";
 		next;
-		select("Master Velof asked me to bring his Magic Book.");
+		select("Master Velofos asked me to bring his Magic Book.");
 		mes "[Lea]";
 		mes "Are you borrowing a book?";
 		next;
@@ -481,7 +476,7 @@ geffen_in,175,112,4	script	Lea	123,{
 				mes "Frankly, I've never even seen the Ultimate Magic Book.";
 				next;
 				mes "[Lea]";
-				mes "You should ask Master Velof if you want to know more about that book.";
+				mes "You should ask Master Velofos if you want to know more about that book.";
 				next;
 				mes "[Lea]";
 				mes "I'm sorry that I can't help you more than that.";
@@ -490,7 +485,7 @@ geffen_in,175,112,4	script	Lea	123,{
 			}
 			if ((BaseLevel > 139) && (mac_book > 0) && ((getskilllv(2217) > 0) || (getskilllv(2213) > 0))) {
 				mes "[Lea]";
-				mes "You should ask Master Velof for some information about that book.";
+				mes "You should ask Master Velofos for some information about that book.";
 				close;
 			}
 			mes "[Lea]";
@@ -510,7 +505,6 @@ geffen_in,175,112,4	script	Lea	123,{
 }
 
 mid_camp,255,244,4	script	Galfos	735,{
-
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too many items. Please make some room in your bag first.";
 		close;
@@ -519,7 +513,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 		mes "You're overweight with items. Please lose some item weight first.";
 		close;
 	}
-	if (Upper == 2) {
+	if ((Upper == 2) && (Class != Job_Baby_Warlock)) {
 		mes "[Galfos]";
 		mes "What are you, a baby?";
 		mes "I'm not here to babysit. Get lost!";
@@ -535,7 +529,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 		mes "Ah, I'll get myself in trouble if I stay here any longer. Maybe I'm already in...";
 		close;
 	}
-	if ((BaseLevel < 140) || (getskilllv(2217) < 1) && (getskilllv(2213) < 1)) {
+	if (BaseLevel < 140 || (getskilllv(2217) < 1 && getskilllv(2213) < 1)) {
 		mes "[Galfos]";
 		mes "I'm sorry, but I don't talk to people that aren't even ready for this.";
 		close;
@@ -556,7 +550,7 @@ mid_camp,255,244,4	script	Galfos	735,{
 		next;
 		select("You're Velof's brother, right?");
 		mes "[Galfos]";
-		mes "Yes, I'm Galfos, and Velof is my brother.";
+		mes "Yes, I'm Galfos, and Velofos is my brother.";
 		next;
 		mes "[Galfos]";
 		mes "Wait a minute,";
@@ -674,7 +668,6 @@ mid_camp,255,244,4	script	Galfos	735,{
 }
 
 dic_in01,25,190,0	script	Mysterious Documents	844,{
-
 	if (isequipped(2782) < 1) {
 		mes "I better not forget to equip my ring.";
 		close;
@@ -837,7 +830,6 @@ function	script	Magic_Book_Essence	{
 	mes "Someone already used this area.";
 	close;
 }
-
 thor_v02,163,104,0	script	Powerful Lava Energy#33	844,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; }
 thor_v01,185,91,0	script	Powerful Flame Energy#33	844,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; }
 ice_dun03,137,148,0	script	Powerful Glacier Energy	844,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; }