Fully implemented the Thor Volcano Base quest.

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

3 files changed, 529 insertions, 19 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 932c31a92..82648b88c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2008/02/26
+	* Rev 12252 Fully implemented the Thor Volcano Base quest. [L0ne_W0lf]
+2008/02/26
 	* Rev 12244 Fixed bugreport:1057 and bugreport:1058 [L0ne_W0lf]
 2008/02/25
 	* Rev 12241 Implemented Veins Siblings quest. [L0ne_W0lf]
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 7843e975e..ed8814615 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.2a
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -47,6 +47,7 @@
 //= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.2 Maheo NPC now uses "setnpcdisplay" instead of two NPCs. [L0ne_W0lf]
 //= 2.2a Corrected a Typo error ";;". [Samuray22]
+//= 2.3 Added Zhed's portion of Thor Volcano Base Quest. (euRO) [L0ne_W0lf]
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -3711,7 +3712,7 @@ OnStart:
 	end;
 
 OnTimer2000:
-	mapannounce "ice_dun03","Who dares to extinguish the flames of Thor!?",bc_map,0xFF6633;
+	mapannounce "ice_dun03","Thor's Flame is the blaze of observation and oath, but someone has put it out!",bc_map,0xFF6633;
 	end;
 
 OnTimer8000:
@@ -3719,11 +3720,11 @@ OnTimer8000:
 	end;
 
 OnTimer10000:
-	mapannounce "ice_dun03","for I am the master of this cave of ice!",bc_map,0xFF6633;
+	mapannounce "ice_dun03","as the master of this cave!",bc_map,0xFF6633;
 	end;
 
 OnTimer13000:
-	mapannounce "ice_dun03","You foolish adventurer, who cares not for the gift of life.",bc_map,0xFF6633;
+	mapannounce "ice_dun03","You must be a foolish human who does not appreciate your life.",bc_map,0xFF6633;
 	end;
 
 OnTimer16000:
@@ -3731,7 +3732,7 @@ OnTimer16000:
 	end;
 
 OnTimer19000:
-	mapannounce "ice_dun03","you will taste inconceivable pain, a cold which can freeze even Mother Nature's breath!",bc_map,0xFF6633;
+	mapannounce "ice_dun03","you will taste inconceivable pain which can even freeze the mother nature's breath!",bc_map,0xFF6633;
 	end;
 
 OnTimer21000:
@@ -3755,8 +3756,8 @@ OnStopTimer:
 	end;
 
 OnMyMobDead:
-	mapannounce "ice_dun03","Odin! Odin I beg you! Please protect this haven from Thor's fiere fire!",bc_map,0xFF6633;
-	mapannounce "ice_dun03","Hisssss.... Hisssss...",bc_map,0x33FFFF;
+	mapannounce "ice_dun03","Oh, Odin! Please protect this place from Thor's fierce fire!",bc_map,0xFF6633;
+	mapannounce "ice_dun03","Pzzzzz...Pzzzz...",bc_map,0x33FFFF;
 	donpcevent "ice_boss#on::OnStartTimer";
 	donpcevent "#ice_sec::OnStart";
 	end;
@@ -4917,6 +4918,518 @@ que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 	cutin "ra_gman",2;
 	if (MISC_QUEST & 8192) {
+// Start Veins "Thor Volcano Base" Quest Addition
+		if (rachel_camel == 25) {
+			if (aru_vol == 0) {
+				cutin "ra_gman",2;
+				mes "[High Priest Zhed]";
+				mes "Haha, welcome, my friend! I'm honored to receive audience with";
+				mes "the peace envoy who is supposedly the busiest person in the world.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Yeah right, that's so funny.";
+				emotion 54,1;
+				next;
+				mes "[High Priest Zhed]";
+				mes "No, I'm serious.";
+				mes "You see, you've devoted yourself to secure the world's peace";
+				mes "beyond nations and religions.";
+				mes "I'm really impressed by what you've done.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "I'm pretty sure that Valkyrie have reserved";
+				mes "the best seat in Valhalla for you. ";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Hahaha, thanks.";
+				next;
+				mes "- He wore a generous smile about his eyes. -";
+				next;
+				mes "[High Priest Zhed]";
+				mes "So, how do I help you today, my friend?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "I thought you've went on a travel to the southern desert, Is there something wrong?";
+				next;
+				select("Mysterious Building in the Volcano");
+				mes "["+strcharinfo(0)+"]";
+				mes "Well, nothing's been wrong so far,";
+				mes "but I've discovered a facility inside";
+				mes "the volcano near Veins.";
+				mes "So I was wondering if you know anything about that.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Can you tell me more details about the facility?";
+				next;
+				mes "^3131FF- You told the high priest";
+				mes "that you've met a troubled kid in Veins,";
+				mes "and happened to discover the hidden building inside";
+				mes "Thor Volcano while trying to help the kid. -^000000";
+				next;
+				mes "^3131FF- In response to your desperate look,";
+				mes "he wore a worried look, and then opened his mouth. -^000000";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Well, This Arunafeltz's governing body";
+				mes "consists of our pope, the reincarnation of Goddess Freya,";
+				mes "and us, high priests.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "We, high priests fear no death";
+				mes "when it comes down to Freya's sake.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I can tell you that since Arunafeltz was built";
+				mes "based on faith in Goddess Freya.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "That's true. However, not every high priest";
+				mes "has equal depth of faith from each other.";
+				mes "Some priests strive to uplift the reputation of Arunafeltz";
+				mes "through pure adoration and devotion to our goddess,";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Some other priests ^FF0000are willing do to^000000";
+				mes "anything--^FF0000even suppressing others by force";
+				mes "if it's for Goddess Freya. ^000000";
+				next;
+				mes "[High Priest Zhed]";
+				mes "They are often called 'the hard-liners'.";
+				mes "They are the ones who established Thor Volcano's geology camp.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Camp? Do you mean a military camp?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "That's right.";
+				mes "Every creature in Arunafeltz";
+				mes "fears Thor Volcano as God's flame.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "The hard-liners hired a geologist to confirm";
+				mes "if Thor Volcano's activity has stopped,";
+				mes "and then established the military camp in that sacred place. ";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Although I haven't been inside the camp, I can guess what they would have in there.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Although I haven't been inside the camp.";
+				mes "I can guess what they would have in there: destructive machines";
+				mes "that will bring havoc to the world.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I guess they're quite well-prepared";
+				mes "in many quarters, huh?";
+				mes "Then again, why do they need to secure";
+				mes "so much military supplies?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Can't you see? ";
+				mes "It's all because of Ymir's Heart Pieces.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Speaking of which, I think I've seen";
+				mes "quite a few Ymir's Heart Pieces inside the Holy Ground, ";
+				next;
+				mes "[High Priest Zhed]";
+				mes "You know, we are faithful followers of Goddess Freya.";
+				mes "She told us, her followers settled in this deserted land,";
+				mes "that ^3131FFshe needs Ymir's Heart^000000.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "We've searched everywhere in Arunafeltz for Ymir's Heart Pieces,";
+				mes "but they weren't enough to make a complete Ymir's Heart.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "I'm sure the heart pieces are scattered all over the world.";
+				mes "I've heard Schwalitzvalt Republic has discovered";
+				mes "some from a mineral mine in a small village.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "The hard-liners believe that";
+				mes "Rune-Midgarts Kingdom must have secured";
+				mes "some of the heart pieces.";
+				mes "Leaders of Schwaltzvalt Republic";
+				mes "have established a close relationship with the hard-liners,";
+				mes "but Rune-Midgarts and Arunafeltz have been on bad terms for a long time.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "The hard-liners are preparing to cause a war against Rune-Midgarts Kingdom,";
+				mes "and take their pieces of Ymir's Heart. Can you understand it now?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "We, the moderates are against using force.";
+				mes "Instead, we decided to make Imitation Ymir's Heart,";
+				mes "and protect the world's peace.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "We even brought noted scientists from Schwaltzvalt Republic";
+				mes "to achieve our goal, but then their leader went missing";
+				mes "after intentionally breaking a complete Imitation Ymir's Heart.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "^3131FF'Imigation Ymir's Heart, scientists, missing,? '^000000";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Isn't the scientist's name...";
+				input .@input$;
+				mes "^3131FF"+.@input$+"^000000?";
+				next;
+				if (.@input$ == "Varmunt") {
+					mes "[High Priest Zhed]";
+					mes "Oh, do you know him?";
+					mes "Yes, his name is Varmunt.";
+					mes "He disappeared after deliberately";
+					mes "breaking the Imitation Ymir's Heart.";
+					next;
+				}
+				else {
+					mes "[High Priest Zhed]";
+					mes ""+.@input$+"? No, that's not his name.";
+					mes "His name is ^3131FFVarmunt ^000000,";
+					mes "and he's the creator of Imitation Ymir's Heart.";
+					next;
+				}
+				mes "[High Priest Zhed]";
+				mes "As soon as he left the research center,";
+				mes "something serious happened";
+				mes "within Schwaltzvalt Republic.";
+				mes "By the time that the issue was resolved,";
+				mes "no one knew where he left.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "The rest of scientists seemed to figure out";
+				mes "how to reproduce Imitation Ymir's Heart,";
+				mes "but unfortunately the heart is at an extremely unstable status.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Thanks to Varmunt, we, the moderates";
+				mes "have lost our power, and the hard-liners";
+				mes "became more enthusiastic in military supply requisition.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Arunafeltz is not a highly civilized country,";
+				mes "let alone having well developed weapons and armors.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Since Varmunt disappeared,";
+				mes "the hard-liners took over government,";
+				mes "and the moderates were limited in supplying";
+				mes "Imitation Ymir's Heart research fund.";
+				mes "So, we made a proposal to the hard-liners";
+				mes "to research Imitation Ymir's Heart further";
+				mes "so that we can develop it more closer to its original";
+				mes "and use the heart to manufacture weapons.";
+				mes "The hard-liners accepted our proposal.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "That's how the moderates have studied";
+				mes "Imitation Ymir's Heart at research centers in the Holy Ground";
+				mes "and Schwaltzvalt Republic,";
+				mes "and the hard-liners have reserved military supplies in Thor Volcano.";
+				next;
+				mes "^3131FF- Varmunt deliberately broke a complete Imitation Ymir's Heart,";
+				mes "and then disappeared.";
+				mes "However, if he didn't break the heart,";
+				mes "Rune-Midgarts and Arunafeltz might have been";
+				mes "fallen under the fire. -^000000";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Do you know how much the hard-liners ";
+				mes "have reserved military supplies?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Well,I'm not only at their side, ";
+				mes "but also demoted from my position.";
+				mes "So, I can't answer your question.";
+				mes "Regardless how much weapons they have,";
+				mes "it's a matter of time that they carry their plan into effect. ";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Aren't you worried what's going to happen?";
+				mes "If they cause a war, not only Rune-Midgarts Kingdom ";
+				mes "will suffer, but it will also affect Arunafeltz!";
+				next;
+				mes "[High Priest Zhed]";
+				mes "I know that, However, it's beyond my power as I'm a mere weak priest ,";
+				next;
+				mes "^3131FF- Unlike what he said,";
+				mes "he stared at you, and smiled. -^000000";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "I don't understand you. What are you so happy to smile about? ";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Well, why don't you try to guess?";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "What, are you saying you have an idea to stop them?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "No, I don't know how to stop them from";
+				mes "causing war. However, if you wish to";
+				mes "protect peace between the two countries,";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Huh?";
+				next;
+				mes "[High Priest Zhed]";
+				mes "How do you like to sneak into their camp";
+				mes "and witness what they're doing in there? ";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "But you said the camp consists of important military facilities. ";
+				mes "And last time that I took a glance at the place,";
+				mes "it was tightly guarded from intruders.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "You're right. However, where there's a will, there's a way.";
+				mes "Let's think how we can get into the place. ";
+				set aru_vol,1;
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+			else if ((aru_vol > 0) && (aru_vol < 5)) {
+				mes "[High Priest Zhed]";
+				mes "Hmm...";
+				next;
+				switch(select("How to Sneak into the Camp :The Moderates:The Hard-Liners")) {
+				case 1:
+					mes "[High Priest Zhed]";
+					mes "Unfortunately, I haven't come up with an idea to sneak into the camp.";
+					mes "Give me a little more time! I'm pretty sure we can figure it out.";
+					break;
+				case 2:
+					mes "[High Priest Zhed]";
+					mes "We, the moderates are against war,";
+					mes "and have strived to create imitation of";
+					mes "Ymir's Heart which Goddess Freya has ordered her followers.";
+					mes "We've been having a hard time to continue researching the project";
+					mes "because of the hard-liners that rather cause war against Rune-Midgarts Kingdom";
+					mes "than going through so much hassle to make Imitation Ymir's Heart.";
+					mes "Fortunately, we were able to persuade them in letting us proceed with";
+					mes "the research under an excuse of using the imitation hearts to create weapons.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "It seems that some scientists are too consumed";
+					mes "with their enthusiasm for the project, and";
+					mes "end up using forbidden methods, That's quite a shame, I must say.";
+					break;
+				case 3:
+					mes "[High Priest Zhed]";
+					mes "The hard-liners worship Goddess Freya with great ardor,";
+					mes "and their blind faith even makes me fear of them.";
+					mes "I really wish their camp's gate";
+					mes "would never open.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Who's managing the Thor Volcano camp?";
+					next;
+					mes "[High Priest Zhed]";
+					mes " High Priest Vildt. He's in charge of";
+					mes "all buildings in Arunafeltz.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "If you see his room at the other side of the building";
+					mes "is always tightly guarded by soldiers,";
+					mes "you will realize how important hard-liner he is.";
+					break;
+				}
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+			else if (aru_vol == 5) {
+				cutin "ra_gman",2;
+				if (countitem(7342) > 0) {
+					mes "["+strcharinfo(0)+"]";
+					mes "Can you check this out?";
+					next;
+					mes "- You gave him the File Folder. -";
+					next;
+					mes "[High Priest Zhed]";
+					mes "What's this?";
+					next;
+					mes "[High Priest Zhed]";
+					mes ".............";
+					next;
+					mes "[High Priest Zhed]";
+					mes ".................";
+					next;
+					mes "[High Priest Zhed]";
+					mes "....................!";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Yes, this must be it!";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "What, do you have any idea?";
+					next;
+					mes "[High Priest Zhed]";
+					mes "I think I've figured out their weakness.";
+					mes "As you see, the camp is located ";
+					mes "within a very dangerous volcano.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Even if Thor Volcano is a holy ground,";
+					mes "it is still a sleeping volcano.";
+					mes "I wonder what really made them";
+					mes "to build a camp within such dangerous volcano.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Well, what if they found some kind of special material";
+					mes "created only within the volcano?";
+					next;
+					mes "[High Priest Zhed]";
+					mes "I guess you're right.";
+					mes "You know, they have been researching";
+					mes "to create most efficient weapons.";
+					mes "They must have found out some alloys ";
+					mes "that melt only under heat created within the volcano.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "In addition to that, according to the geologist,";
+					mes "this sleeping volcano wouldn't erupt";
+					mes "at least for another few more generations.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Well, he changed his word few times, ";
+					mes "but I guess they pretty much settled with his original conclusion.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "He changed his word?";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Yes.";
+					mes "The geologist alerted the hard-liners";
+					mes "that the volcano displays disquieting movement";
+					mes "from time to time.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Then, few days later, he assured them again";
+					mes "that the volcano's movement had nothing to do with its possible eruption.";
+					mes "I found quite a few similar statements of him.";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "They shouldn't have built the camp within the volcano...";
+					next;
+					mes "[High Priest Zhed]";
+					mes "To be honest with you, the more difficult time they have, the happier I become. Hahaha.";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Anyways, this is just my intuition, ";
+					mes "but I think the geologist has hidden budget against them...";
+					next;
+					mes "["+strcharinfo(0)+"]";
+					mes "Hidden budget?";
+					next;
+					mes "[High Priest Zhed]";
+					mes "Yes. I have a good feeling";
+					mes "that he might be a great help for us.";
+					mes "Why don't you go check him out?";
+					next;
+					if (select("Yes:No") == 2) {
+						mes "[High Priest Zhed]";
+						mes "Why, did you change your mind from";
+						mes "protecting peace between the countries?";
+						next;
+						mes "[High Priest Zhed]";
+						mes "Either way, I think you should know where the geologist stays";
+						mes "so that you can go see him if you change your mind once again.";
+						next;
+					}
+					mes "[High Priest Zhed]";
+					mes "He's supposedly staying in Veins, a desert city located south from Rachel.";
+					mes "I hope you will change your mind, and go visit him.";
+					delitem 7342,1; //File01
+					set aru_vol,6;
+					close2;
+					cutin "ra_gman",255;
+					end;
+				}
+				else {
+					mes "["+strcharinfo(0)+"]";
+					mes "Err,where did I put the File Folder?";
+					close2;
+					cutin "ra_gman",255;
+					end;
+				}
+			}
+			else if (aru_vol == 6) {
+				cutin "ra_gman",2;
+				mes "[High Priest Zhed]";
+				mes "The geologist is supposedly staying in Veins, a desert city located south from Rachel.";
+				mes "I'll be expecting to hear good news from you soon.";
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+			else if ((aru_vol > 6) && (aru_vol < 26)) {
+				cutin "ra_gman",2;
+				mes "[High Priest Zhed]";
+				mes "The geologist is supposedly staying in Veins, a desert city located south from Rachel.";
+				mes "I'll be expecting to hear good news from you soon.";
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+			else if (aru_vol == 26) {
+				cutin "ra_gman",2;
+				mes "[High Priest Zhed]";
+				mes "Welcome back! I've been waiting for your return.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "They must be busy packing up their stuffs and leaving the camp by now.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "What do you mean?";
+				next;
+				mes "- You explained to him how you fooled them into moving out of the camp by using the broken thermometer. -";
+				next;
+				mes "[High Priest Zhed]";
+				mes "Wow, you're amazing! How did you come up with such great idea?";
+				mes "You did a great job to throw them into confusion this time.";
+				mes "I'm sure they will be in panic to move from here to there until they realize that they're fooled. Thank you so much.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "We must soon deliver the finishing blow to them.";
+				mes "It's about right time, but not right now though.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "I like you to stay here and relax";
+				mes "while we take care of the rest.";
+				mes "I'll be contacting you again if the time comes.";
+				next;
+				mes "[High Priest Zhed]";
+				mes "I hope you will wish us good luck to protect the world's peace from the aggressive hard-liners.";
+				mes "Once again, I thank you for your help.";
+				set aru_vol,27;
+				getexp 200000,0;
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+			else if (aru_vol > 26) {
+				mes "[High Priest Zhed]";
+				mes "I like you to stay here and relax";
+				mes "while we take care of the rest.";
+				mes "I'll be contacting you again if the time comes.";
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+			else {
+				cutin "ra_gman",2;
+				mes "[High Priest Zhed]";
+				mes "Gosh, I'm having a bad headache today, ";
+				close2;
+				cutin "ra_gman",255;
+				end;
+			}
+		}
+// End Veins "Thor Volcano Base" Quest Addition.
 		mes "[High Priest Zhed]";
 		mes "I need to rest now";
 		mes "But I thank you for";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index c32085dce..00a56f32a 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.3a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -24,7 +24,7 @@
 //= Thor Volcano Base Quest (Disabled):
 //= - Missing addition to High Priest Zhed to start quest.
 //= - Infiltrate Thor Volcano Base. What is Arunafeltz up to?
-//= - Variable in use: rachel_camel (max 26)
+//= - Variable in use: rachel_camel (max 27)
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Added Veins Stone quest. [L0ne_W0lf]
 //= 1.1 Added Veins Spy Quest. [L0ne_W0lf]
@@ -32,6 +32,7 @@
 //=	Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf]
 //=	Start NPC is missing, but will be added when I get it.
 //= 1.3 Fixed two typos small in Asbar. [L0ne_W0lf]
+//= 1.3a More fixes to some of the Base quest NPCs. [L0ne_W0lf]
 //============================================================ 
 
 // Stone Quest
@@ -5049,10 +5050,7 @@ ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
 		mes "come back later if you";
 		mes "wish to see him.";
 		next;
-		switch(select("Think of a Distraction")) {
-		case 1:
-			break;
-		}
+		select("Think of a Distraction");
 		mes "["+strcharinfo(0)+"]";
 		mes "This guy's not going to";
 		mes "let me pass. Let's see...";
@@ -5071,7 +5069,7 @@ ra_temin,87,133,1	script	Rachel Guard#vol1	934,5,2,{
 		mes "Of course! I should";
 		mes "talk to him about ^FF0000"+.@input$+"^000000 !!";
 		next;
-		if (.@input != "Lamir") {
+		if (.@input$ != "Lamir") {
 			mes "["+strcharinfo(0)+"]";
 			mes "What the...?";
 			mes "Where did I think of that?";
@@ -5186,7 +5184,6 @@ OnTouch:
 //OnTouch2:
 	warp "ra_temin",85,137;
 	close;
-	end;
 }
 
 ra_temin,82,133,7	script	Rachel Guard#vol2	934,5,2,{
@@ -5205,7 +5202,6 @@ OnTouch:
 //OnTouch2:
 	warp "ra_temin",85,137;
 	close;
-	end;
 }
 
 ra_temin,115,140,1	script	Flower Vase#vol	111,{
@@ -5253,7 +5249,7 @@ ra_temin,115,140,1	script	Flower Vase#vol	111,{
 ra_temin,85,131,0	script	path_vol1	-1,5,0,{
 OnTouch:
 //OnTouch2:
-	if ((aru_vol != 3) || (aru_vol != 4)) {
+	if ((aru_vol != 3) && (aru_vol != 4)) {
 		warp "ra_temin",85,137;
 	}
 	end;
@@ -6954,9 +6950,8 @@ thor_camp,159,74,3	script	Colonel Vito#3	946,{
 thor_camp,141,62,0	script	#vol_study1::VeinsWarp	-1,3,3,{
 OnTouch:
 //OnTouch2:
-	if ((aru_vol >= 14 && aru_vol <= 17) || (aru_vol == 19)) {
+	if ((aru_vol >= 14 && aru_vol <= 16) || (aru_vol == 19)) {
 		warp "thor_camp",156,67;
-		end;
 	}
 	end;
 }