summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/cities/alberta.txt293
-rw-r--r--npc/cities/comodo.txt28
-rw-r--r--npc/cities/izlude.txt687
-rw-r--r--npc/cities/niflheim.txt9
-rw-r--r--npc/jobs/1-1e/gunslinger.txt33
-rw-r--r--npc/merchants/grandpa_pharmacist.txt14
7 files changed, 444 insertions, 624 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b11a9d0b0..a783d2e4d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
======
2007/05/07
+ * Revised 2/3 of the cities scripts. Thanks to CAHTEHHuK [Lupus]
+ - Fixed wrong usage (not a bug, but stil bad) | -> ||
* Fixed a bug in Hugel field spawns [Playtester]
* Rev. 10487 Kiel Hyre bug squashage.
- Lots of fixes (4ish) from Valandi. [L0ne_W0lf]
@@ -15,7 +17,7 @@ Date Added
* Updated Facing of NPCs from Crusader Quest [Samuray22]
* Updated Food Seller to official [Playtester]
* Small Veins field spawn and warp adjustments [Playtester]
- * Revised 1/3 of the cities scripts. Thanks to CAHTEXNIK [Lupus]
+ * Revised 1/3 of the cities scripts. Thanks to CAHTEXHuK [Lupus]
2007/05/05
* Updated Crusader Job quest to the official one [Samuray22]
- Added Folder "old" for old quest of jobs.
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 844c9d5f0..c6c60354f 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= DZeroX
//===== Current Version: =====================================
-//= 1.0
+//= 1.01
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
//= Town-specific Alberta NPCs
//===== Additional Comments: =================================
//= 1.0 Converted from Aegis 10.4 [DZeroX]
+//= 1.01 Optimized, missing next, etc [Lupus]
//============================================================
alberta,97,51,0 script Fabian 84,{
@@ -89,8 +90,8 @@ alberta,189,151,5 script Fisk 100,{
next;
if (Zeny < 250) {
mes "[Fisk]";
- mes "Hey now, don't try to cheat me! I";
- mes "said 250 zeny!";
+ mes "Hey now, don't try to cheat me!";
+ mes "I said 250 zeny!";
close;
}
set Zeny,Zeny - 250;
@@ -120,12 +121,9 @@ alb2trea,39,50,6 script Fisk#a2t 100,{
mes "[Fisk]";
mes "So you wanna head back to the";
mes "mainland in Alberta, eh?";
- switch(select("Yes please.","I changed my mind.")) {
- case 1:
+ if(select("Yes please.","I changed my mind.")==1)
warp "alberta.gat",192,169;
- case 2:
- close;
- }
+ close;
}
alberta,131,139,2 script Drunken Old Man 54,{
@@ -199,9 +197,8 @@ alberta,131,139,2 script Drunken Old Man 54,{
}
alberta,58,80,2 script Shakir 99,{
- set .@random,rand(1,2);
- if (.@random == 1) {
- mes "[Shakir]";
+ mes "[Shakir]";
+ if (rand(2)) {
mes "We Merchants have our own";
mes "negotiating skill when we sell";
mes "goods. This skill can get us more";
@@ -219,9 +216,7 @@ alberta,58,80,2 script Shakir 99,{
mes "with this incredible skill. But";
mes "remember to train hard to acquire";
mes "it!";
- close;
} else {
- mes "[Shakir]";
mes "We Merchants can";
mes "open roadside stands";
mes "to do business.";
@@ -242,14 +237,14 @@ alberta,58,80,2 script Shakir 99,{
mes "convenient and safe. Don't fall";
mes "asleep, although it's too easy to";
mes "do that.";
- close;
}
+ close;
}
alberta,62,156,2 script Sonya 102,{
- set .@random,rand(1,3);
- if (.@random == 1) {
- mes "[Sonya]";
+ mes "[Sonya]";
+ switch(rand(3)){
+ case 0:
mes "You know those lazy looking bears";
mes "that live in the forest on the way";
mes "to Payon?";
@@ -266,9 +261,7 @@ alberta,62,156,2 script Sonya 102,{
mes "never provoke an animal for fun";
mes "again!";
close;
- }
- if (.@random == 2) {
- mes "[Sonya]";
+ case 1:
mes "Hey, you know, this one time I was";
mes "walking through the forest and I";
mes "saw this little green stem moving";
@@ -289,9 +282,7 @@ alberta,62,156,2 script Sonya 102,{
mes "the smallest animal can be";
mes "dangerous if angered.";
close;
- }
- if (.@random == 3) {
- mes "[Sonya]";
+ case 2:
mes "I once saw a pack of wolves take on";
mes "one of those huge, lazy bears!";
next;
@@ -392,17 +383,16 @@ alberta,195,151,2 script Paul 86,{
alberta,190,173,4 script Phelix 85,{
set .@weight,MaxWeight-Weight;
+ mes "[Phelix]";
if ((.@weight) < 10000) {
- mes "[Phelix]";
mes "Wait a moment!!";
mes "You have brought too many things!";
mes "You cannot accept any more items!";
mes "Please reduce the amount of items,";
- mes "then come see me again";
+ mes "then come see me again.";
close;
}
if (@event_zelopy == 0) {
- mes "[Phelix]";
mes "The hell are you doing here?";
mes "There is nothing you can get for";
mes "free on this ship, if you want";
@@ -419,153 +409,146 @@ alberta,190,173,4 script Phelix 85,{
mes "[Phelix]";
mes "If you're interested in my offer,";
mes "get me the stuff I mentioned.";
- set @event_zelopy,1;;
+ set @event_zelopy,1;
close;
} else {
- mes "[Phelix]";
mes "Hmm... you want to exchange";
mes "jellopies for Red Potions or some";
mes "Carrots eh? Well... which one?";
switch(select("Red Potions please.","Carrots please.")) {
- case 1:
- next;
- mes "[Phelix]";
- mes "Alright...";
- mes "Let's see";
- mes "what'cha got...";
- next;
- if (countitem(909) < 10) {
+ case 1:
+ next;
+ mes "[Phelix]";
+ mes "Alright...";
+ mes "Let's see";
+ mes "what'cha got...";
+ next;
+ mes "[Phelix]";
+ if (countitem(909) < 10) {
+ mes "Hey! Weren't you listening? I said";
+ mes "10 jellopies for 1 Red Potion.. are";
+ mes "ya deaf?";
+ close;
+ } else {
+ set .@max,countitem(909)/10;
+ mes "Hmm, not bad...";
+ mes "How many potions";
+ mes "do you want to get?";
+ switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
+ case 1:
+ delitem 909,.@max*10;
+ next;
+ getitem 501,.@max;
mes "[Phelix]";
- mes "Hey! Weren't you listening? I said";
- mes "10 jellopies for 1 Red Potion.. are";
- mes "ya deaf?";
+ mes "There you go! As I promised. Don't";
+ mes "go suckin' them all down at once.";
close;
- } else {
- set .@max,countitem(909)/10;
+ case 2:
+ next;
+ mes "[Phelix]";
+ mes "I'm not giving you more than 100";
+ mes "at a time so don't bother, OK? If";
+ mes "you don't want any, just say '0'.";
+ mes "Right now, the most you can get is";
+ mes ""+.@max+" but remember, 100 at most,";
+ mes "you want to break my back?";
+ input .@amount;
+ next;
mes "[Phelix]";
- mes "Hmm, not bad...";
- mes "How many potions";
- mes "do you want to get?";
- switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
- case 1:
- next;
- delitem 909,.@max*10;
- getitem 501,.@max;
- mes "[Phelix]";
- mes "There you go! As I promised. Don't";
- mes "go suckin' them all down at once.";
- close;
- case 2:
- next;
- mes "[Phelix]";
- mes "I'm not giving you more than 100";
- mes "at a time so don't bother, OK? If";
- mes "you don't want any, just say '0'.";
- mes "Right now, the most you can get is";
- mes ""+.@max+" but remember, 100 at most,";
- mes "you want to break my back?";
- input .@amount;
- if (.@amount <= 0) {
- mes "[Phelix]";
- mes "Much obliged, come again anytime.";
- close;
- }
- if (.@amount > 100) {
- mes "[Phelix]";
- mes "Hey, what'd I say? 100 at a time at";
- mes "most, you're trying to kill me";
- mes "aren't you!";
- close;
- }
- if (countitem(909) < .@amount*10) {
- mes "[Phelix]";
- mes "Hmmm, it looks like you don't have";
- mes "enough. Go get more jellopies if";
- mes "you want anything else from me.";
- close;
- }
- delitem 909,.@amount*10;
- getitem 501,.@amount;
- next;
- mes "[Phelix]";
- mes "There you go! As I promised. Don't";
- mes "go suckin' them all down at once.";
- close;
- case 3:
- next;
- mes "[Phelix]";
- mes "No problem,";
- mes "see you next time.";
- close;
+ if (.@amount <= 0) {
+ mes "Much obliged, come again anytime.";
+ close;
+ }
+ if (.@amount > 100) {
+ mes "Hey, what'd I say? 100 at a time at";
+ mes "most, you're trying to kill me";
+ mes "aren't you!";
+ close;
+ }
+ if (countitem(909) < .@amount*10) {
+ mes "Hmmm, it looks like you don't have";
+ mes "enough. Go get more jellopies if";
+ mes "you want anything else from me.";
+ close;
}
+ delitem 909,.@amount*10;
+ next;
+ getitem 501,.@amount;
+ mes "[Phelix]";
+ mes "There you go! As I promised. Don't";
+ mes "go suckin' them all down at once.";
+ close;
+ case 3:
+ next;
+ mes "[Phelix]";
+ mes "No problem,";
+ mes "see you next time.";
+ close;
}
- case 2:
- next;
- mes "[Phelix]";
- mes "Alright, let's see what ya got...";
- next;
- if (countitem(909) < 3) {
+ }
+ case 2:
+ next;
+ mes "[Phelix]";
+ mes "Alright, let's see what ya got...";
+ next;
+ mes "[Phelix]";
+ if (countitem(909) < 3) {
+ mes "Hmm, look pansy ass, I said 3";
+ mes "jellopies for 1 Carrot.. got it?";
+ close;
+ } else {
+ set .@max,countitem(909)/3;
+ mes "Not too bad pansy...";
+ mes "How many do you want?";
+ switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
+ case 1:
+ delitem 909,.@max*3;
+ next;
+ getitem 515,.@max;
mes "[Phelix]";
- mes "Hmm, look pansy ass, I said 3";
- mes "jellopies for 1 Carrot.. got it?";
+ mes "There you go~! As I promised. Try";
+ mes "not to stuff yer face.";
close;
- } else {
- set .@max,countitem(909)/3;
+ case 2:
+ next;
+ mes "[Phelix]";
+ mes "Right I'm not giving you more than";
+ mes "100 at a time so don't bother,";
+ mes "okay? If you don't want any, just";
+ mes "say '0'.";
+ input .@amount;
+ next;
mes "[Phelix]";
- mes "Not too bad pansy...";
- mes "How many do you want?";
- switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
- case 1:
- next;
- delitem 909,.@max*3;
- getitem 515,.@max;
- mes "[Phelix]";
- mes "There you go~! As I promised. Try";
- mes "not to stuff yer face.";
+ if (.@amount == 0) {
+ mes "Alright then, see you next time.";
close;
- case 2:
- next;
- mes "[Phelix]";
- mes "Right I'm not giving you more than";
- mes "100 at a time so don't bother,";
- mes "okay? If you don't want any, just";
- mes "say '0'.";
- input .@amount;
- next;
- if (.@amount == 0) {
- mes "[Phelix]";
- mes "Alright then, see you next time.";
- close;
- }
- if (.@amount > 100) {
- mes "[Phelix]";
- mes "Hey pansy ass, I said 100 at most,";
- mes "no more than that! I'm not going to";
- mes "break my back for the likes of";
- mes "you!";
- close;
- }
- if (countitem(909) < .@amount*10) {
- mes "[Phelix]";
- mes "Seems you don't have enough. Go get";
- mes "some more if you want anything";
- mes "else.";
- close;
- }
- delitem 909,.@amount*3;
- getitem 515,.@amount;
- next;
- mes "[Phelix]";
- mes "There you go~! As I promised. Try";
- mes "not to stuff yer face.";
+ }
+ if (.@amount > 100) {
+ mes "Hey pansy ass, I said 100 at most,";
+ mes "no more than that! I'm not going to";
+ mes "break my back for the likes of you!";
close;
- case 3:
- next;
- mes "[Phelix]";
- mes "Catch'ya later.";
+ }
+ if (countitem(909) < .@amount*10) {
+ mes "Seems you don't have enough. Go get";
+ mes "some more if you want anything";
+ mes "else.";
close;
}
+ delitem 909,.@amount*3;
+ next;
+ getitem 515,.@amount;
+ mes "[Phelix]";
+ mes "There you go~! As I promised. Try";
+ mes "not to stuff yer face.";
+ close;
+ case 3:
+ next;
+ mes "[Phelix]";
+ mes "Catch'ya later.";
+ close;
}
+ }
}
}
}
@@ -587,7 +570,7 @@ alberta,43,49,5 script Poor-looking Merchant 89,{
close;
}
-alberta,43,244,8 script Tourist 99,{
+alberta,43,244,8 script Tourist#al 99,{
mes "[Tourist]";
mes "Where am I...?";
mes "...Who am I?";
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 69e426519..65db80dc9 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -146,7 +146,6 @@ cmd_in02,178,86,4 script Stonae 98,{
//=============================================================
cmd_in02,174,126,4 script Loyar 83,{
- set @TEMP,0;
mes "[Loyar]";
mes "The Comodo Casino has a very pleasing decor... It's quite clean and simple!";
mes "The atmosphere is perfect and makes you really want to play more!";
@@ -167,7 +166,6 @@ cmd_in02,174,126,4 script Loyar 83,{
//=============================================================
cmd_in02,73,81,4 script Martine 48,{
- set @temp, 2;
mes "[Martine]";
mes "Gambling? Oh no, it's NOT gambling! Don't say that the Comodo 'CASINO' houses gambling.....";
emotion e_gasp;
@@ -267,9 +265,8 @@ cmd_fild07,192,58,4 script Light House Guard#01 100,{
mes "^3355FF`lighthouses'^000000";
mes "Do you wish to learn more about these lighthouses?";
next;
- menu "Learn more about these Lighthouses..",M0,"Cancel",MEnd;
+ menu "Learn more about these Lighthouses..",-,"Cancel",M_End;
- M0:
mes "[Rahasu]";
mes "As you probably have noticed, there are two huge lighthouses located in this area.";
mes "Both of these lighthouses were used to signal nearby fortresses of incoming invasions many years ago.";
@@ -278,7 +275,7 @@ cmd_fild07,192,58,4 script Light House Guard#01 100,{
mes "Too bad tourists can not enter these lighthouses yet, because they are still under heavy restrictions.";
mes "There are many, many beautiful paintings inside.";
close;
- MEnd:
+ M_End:
mes "[Rahasu]";
mes "That's too bad, hope you could find some time to learn more about these ancient structures.";
close;
@@ -301,14 +298,13 @@ cmd_fild07,299,83,4 script Sailor#01 100,{
mes "[Zain]";
mes "Hello my friend, where do you wish to go?";
next;
- menu "Alberta = 600 Zeny",M0,"Izlude = 800 Zeny",M1,"Cancel",MEnd;
+ menu "Alberta = 600 Zeny",-,"Izlude = 800 Zeny",M_1,"Cancel",M_End;
- M0:
if(Zeny < 600) goto NoZeny;
set Zeny, Zeny - 600;
warp "alberta",192,169;
close;
- M1:
+ M_1:
if(Zeny < 800) goto NoZeny;
set Zeny, Zeny - 800;
warp "izlude",176,182;
@@ -318,7 +314,7 @@ cmd_fild07,299,83,4 script Sailor#01 100,{
mes "[Zain]";
mes "Umm, you do not have enough zeny.";
close;
- MEnd:
+ M_End:
mes "[Zain]";
mes "Thank you, come again";
close;
@@ -329,14 +325,13 @@ cmd_fild07,94,134,4 script Sailor#02 100,{
mes "[Sarumane]";
mes "Hello my friend, where do you wish to go?";
next;
- menu "Alberta = 600 Zeny",M0,"Izlude = 800 Zeny",M1,"Cancel",MEnd;
+ menu "Alberta = 600 Zeny",-,"Izlude = 800 Zeny",M_1,"Cancel",M_End;
- M0:
if(Zeny < 600) goto NoZeny;
set Zeny, Zeny - 600;
warp "alberta",192,169;
close;
- M1:
+ M_1:
if(Zeny < 800) goto NoZeny;
set Zeny, Zeny - 800;
warp "izlude",176,182;
@@ -346,7 +341,7 @@ cmd_fild07,94,134,4 script Sailor#02 100,{
mes "[Sarumane]";
mes "Umm, you do not have enough zeny.";
close;
- MEnd:
+ M_End:
mes "[Sarumane]";
mes "Thank you, come again.";
close;
@@ -396,15 +391,14 @@ moc_fild12,35,303,4 script Saint Darmain Gatekeeper 59,{
mes "Good day, my name is Sertutero and I am the Gatekeeper for the road to Saint Darmain.";
mes "Do wish to proceed to Saint Darmain?";
next;
- menu "Proceed to Saint Darmain",M0,"Learn more about Saint Darmain",M1,"Cancel",MEnd;
+ menu "Proceed to Saint Darmain",-,"Learn more about Saint Darmain",M_1,"Cancel",M_End;
- M0:
mes "[Serutero]";
mes "Good luck out there, things could get rough, so be extra careful.";
mes ". . . . .";
warp "cmd_fild08",331,319;
close;
- M1:
+ M_1:
mes "[Serutero]";
mes "Long time ago, due to many waves of invasion by monsters in Saint Darmain, many defensive structures were constructed to keep the peace.";
mes "And slowly, Saint Darmain became a natural fortress.";
@@ -417,7 +411,7 @@ moc_fild12,35,303,4 script Saint Darmain Gatekeeper 59,{
mes "[Serutero]";
mes "If you are looking for the lighthouse, proceed in the direction of south-west.";
close;
- MEnd:
+ M_End:
mes "[Serutero]";
mes "If you ever become exhausted on your journey, you should stop by the nearby island of";
mes "^3355FF`Comodo'^000000 City.";
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 562b7066b..f09c1cd53 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -3,9 +3,9 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.7
+//= 1.71
//===== Compatible With: =====================================
-//= eAthena 7.15 +
+//= eAthena 1.0
//===== Description: =========================================
//=
//===== Additional Comments: =================================
@@ -18,6 +18,7 @@
//= 1.5 Replaced iz_move_alberta with MISC_QUEST & 16 [Lupus]
//= 1.6 Removed Duplicates [Silent]
//= 1.7 Split quest to quests/quests_izlude.txt [Evera]
+//= 1.71 Optimized. Also thanks to CAHTEXHuK [Lupus]
//============================================================
@@ -84,26 +85,8 @@ izlude,55,74,2 script Bonne 90,{
//Cuskoal-------------------------------------------------------------------------------------
izlude,119,121,1 script Cuskoal 124,{
- set @TEMP, rand(2);
mes "[Cuskoal]";
- if(@TEMP != 0) goto L_R0;
- mes "The Arena here is THE place for";
- mes "capable young people from all over";
- mes "the Rune-Midgarts Kingdom to";
- mes "challenge themsleves and test their";
- mes "skills.";
- next;
- mes "[Cuskoal]";
- mes "You can battle with monsters of";
- mes "different levels. So, the number of";
- mes "stages you survive will be a";
- mes "testiment to you battle powers.";
- next;
- mes "[Cuskoal]";
- mes "So, whaddya say?";
- close;
-
- L_R0:
+ if(rand(2)) {
mes "The pubs in Prontera are always";
mes "full of people from local areas and";
mes "from out-of-town. It can get pretty";
@@ -120,31 +103,28 @@ izlude,119,121,1 script Cuskoal 124,{
mes "very useful information for";
mes "yourself.";
close;
+ }
+ mes "The Arena here is THE place for";
+ mes "capable young people from all over";
+ mes "the Rune-Midgarts Kingdom to";
+ mes "challenge themsleves and test their";
+ mes "skills.";
+ next;
+ mes "[Cuskoal]";
+ mes "You can battle with monsters of";
+ mes "different levels. So, the number of";
+ mes "stages you survive will be a";
+ mes "testiment to you battle powers.";
+ next;
+ mes "[Cuskoal]";
+ mes "So, whaddya say?";
+ close;
}
//Charfri-------------------------------------------------------------------------------------
izlude,135,78,2 script Charfri 91,{
- set @TEMP,rand(2);
- mes "[Charfri]";
- if(@TEMP != 0) goto L_R0;
- mes "Some people may think Izlude is";
- mes "just a satelite city of Prontera,";
- mes "and not really that important...";
- next;
mes "[Charfri]";
- mes "But Izlude is a beautiful town";
- mes "right next to the ocean, as well as";
- mes "beautiful Byalan Island.";
- next;
- mes "[Charfri]";
- mes "You'll have to board on a ship at";
- mes "the port to get to Byalan Island.";
- mes "There are dangerous dungeons on";
- mes "that island, so don't go snooping";
- mes "around just anywhere.";
- close;
-
- L_R0:
+ if(rand(2)) {
mes "Though it is very beautiful, Byalan";
mes "Island has a mysterious dungeon";
mes "that extends deep under the sea.";
@@ -175,13 +155,128 @@ izlude,135,78,2 script Charfri 91,{
mes "Still, just once, I'd like to go";
mes "down there...";
close;
+ }
+ mes "Some people may think Izlude is";
+ mes "just a satelite city of Prontera,";
+ mes "and not really that important...";
+ next;
+ mes "[Charfri]";
+ mes "But Izlude is a beautiful town";
+ mes "right next to the ocean, as well as";
+ mes "beautiful Byalan Island.";
+ next;
+ mes "[Charfri]";
+ mes "You'll have to board on a ship at";
+ mes "the port to get to Byalan Island.";
+ mes "There are dangerous dungeons on";
+ mes "that island, so don't go snooping";
+ mes "around just anywhere.";
+ close;
}
//Dega-------------------------------------------------------------------------------------
izlude,150,118,3 script Dega 84,{
- set @TEMP,rand(3);
+ set @TEMP,;
mes "[Dega]";
- if(@TEMP != 0) goto L_R0;
+ if(rand(2)) {
+ if(rand(2)) {
+ mes "There's a very delightful place";
+ mes "where you can find every";
+ mes "type of Poring.";
+ next;
+ mes "[Dega]";
+ mes "It's somewhere near the bridge";
+ mes "connecting the forest and the";
+ mes "desert, on the way to the city of";
+ mes "Payon which is Southeast from";
+ mes "here.";
+ next;
+ mes "[Dega]";
+ mes "There are not only pink Porings but";
+ mes "also Drops, which can be found at";
+ mes "the desert, and the green";
+ mes "Poporing.";
+ next;
+ mes "[Dega]";
+ mes "But be careful, before you realize";
+ mes "it, you may come face to face with";
+ mes "Ghostring, a deadly Poring that";
+ mes "floats around the air like a";
+ mes "ghost.";
+ next;
+ mes "[Dega]";
+ mes "Well, of course, they are all very";
+ mes "cute, but Ghostring is an";
+ mes "EXCEPTION. It is very very";
+ mes "dangerous.";
+ next;
+ mes "[Dega]";
+ mes "If you are lucky enough, you might";
+ mes "even bump into Angeling, the";
+ mes "Poring with Angel wings.";
+ next;
+ menu "Ghostring?",-,"Angeling?",M_1,"End Conversation.",M_End;
+
+ mes "[Dega]";
+ mes "Ghostring is a grayish Poring that";
+ mes "floats around in the air like a";
+ mes "ghost. Just like other ghosts,";
+ mes "physical attacks can't do any";
+ mes "damage to it.";
+ next;
+ mes "[Dega]";
+ mes "Those whose main attack methods are";
+ mes "physical like Swordman and Archer";
+ mes "might have to run for their lives";
+ mes "when facing Ghostrings.";
+ next;
+ mes "[Dega]";
+ mes "But don't leave just yet~! There is";
+ mes "great news for people with those";
+ mes "jobs. Making a weapon of some";
+ mes "elemental property is the key.";
+ next;
+ mes "[Dega]";
+ mes "This way, even a Swordman or an";
+ mes "Archer can inflict damage, the way";
+ mes "Magic does, on Ghostrings.";
+ close;
+ M_1:
+ mes "[Dega]";
+ mes "Angelings are immune to Magic";
+ mes "attacks. If people who can only";
+ mes "attack with Magic face an";
+ mes "Angeling, then it's time for";
+ mes "them to run.";
+ next;
+ mes "[Dega]";
+ mes "If you've got an extra knife or";
+ mes "sword, you could give it a shot.";
+ mes "But it will be very difficult";
+ mes "alone, don't you think?";
+ close;
+ M_End:
+ mes "[Dega]";
+ mes "Good Luck~";
+ close;
+ }
+ mes "Some monsters in the world have the.";
+ mes "unique ability to sense mystical";
+ mes "energy, and can detect Magic spells";
+ mes "before they are cast.";
+ next;
+ mes "[Dega]";
+ mes "Golem of the desert is one of them.";
+ mes "Don't underestimate it due to it's";
+ mes "sluggishness...";
+ next;
+ mes "[Dega]";
+ mes "If you try to cast magic near it,";
+ mes "it will notice and saunter over to";
+ mes "smash you. So you better watch out";
+ mes "for Golem.";
+ close;
+ }
mes "Mt. Mjolnir, located north of";
mes "Prontera, is a tough";
mes "and steep climb.";
@@ -199,113 +294,29 @@ izlude,150,118,3 script Dega 84,{
mes "your self for the challenge. Or you";
mes "could walk around it.";
close;
-
- L_R0:
- if(@TEMP != 1) goto L_R1;
- mes "Some monsters in the world have the.";
- mes "unique ability to sense mystical";
- mes "energy, and can detect Magic spells";
- mes "before they are cast.";
- next;
- mes "[Dega]";
- mes "Golem of the desert is one of them.";
- mes "Don't underestimate it due to it's";
- mes "sluggishness...";
- next;
- mes "[Dega]";
- mes "If you try to cast magic near it,";
- mes "it will notice and saunter over to";
- mes "smash you. So you better watch out";
- mes "for Golem.";
- close;
- L_R1:
- mes "There's a very delightful place";
- mes "where you can find every";
- mes "type of Poring.";
- next;
- mes "[Dega]";
- mes "It's somewhere near the bridge";
- mes "connecting the forest and the";
- mes "desert, on the way to the city of";
- mes "Payon which is Southeast from";
- mes "here.";
- next;
- mes "[Dega]";
- mes "There are not only pink Porings but";
- mes "also Drops, which can be found at";
- mes "the desert, and the green";
- mes "Poporing.";
- next;
- mes "[Dega]";
- mes "But be careful, before you realize";
- mes "it, you may come face to face with";
- mes "Ghostring, a deadly Poring that";
- mes "floats around the air like a";
- mes "ghost.";
- next;
- mes "[Dega]";
- mes "Well, of course, they are all very";
- mes "cute, but Ghostring is an";
- mes "EXCEPTION. It is very very";
- mes "dangerous.";
- next;
- mes "[Dega]";
- mes "If you are lucky enough, you might";
- mes "even bump into Angeling, the";
- mes "Poring with Angel wings.";
- next;
- menu "Ghostring?",-,"Angeling?",M1,"End Conversation.",MEnd;
-
- mes "[Dega]";
- mes "Ghostring is a grayish Poring that";
- mes "floats around in the air like a";
- mes "ghost. Just like other ghosts,";
- mes "physical attacks can't do any";
- mes "damage to it.";
- next;
- mes "[Dega]";
- mes "Those whose main attack methods are";
- mes "physical like Swordman and Archer";
- mes "might have to run for their lives";
- mes "when facing Ghostrings.";
- next;
- mes "[Dega]";
- mes "But don't leave just yet~! There is";
- mes "great news for people with those";
- mes "jobs. Making a weapon of some";
- mes "elemental property is the key.";
- next;
- mes "[Dega]";
- mes "This way, even a Swordman or an";
- mes "Archer can inflict damage, the way";
- mes "Magic does, on Ghostrings.";
- close;
- M1:
- mes "[Dega]";
- mes "Angelings are immune to Magic";
- mes "attacks. If people who can only";
- mes "attack with Magic face an";
- mes "Angeling, then it's time for";
- mes "them to run.";
- next;
- mes "[Dega]";
- mes "If you've got an extra knife or";
- mes "sword, you could give it a shot.";
- mes "But it will be very difficult";
- mes "alone, don't you think?";
- close;
- MEnd:
- mes "[Dega]";
- mes "Good Luck~";
- close;
}
//Kylick-------------------------------------------------------------------------------------
izlude,150,143,4 script Kylick 97,{
- set @TEMP,rand(2);
mes "[Kylick]";
- if (@TEMP != 0) goto L_R0;
-
+ if (rand(2)) {
+ mes "I was thinking, even though the";
+ mes "people of Izlude live so close to";
+ mes "the ocean...";
+ next;
+ mes "[Kylick]";
+ mes "There are other cultures that have";
+ mes "completely developed by living off";
+ mes "of the sea. Of course, I'm talking";
+ mes "about Amatsu.";
+ next;
+ mes "[Kylick]";
+ mes "I hear the cuisine there is really";
+ mes "good! Although the idea of eating";
+ mes "raw fish is new to me, I would love";
+ mes "to go there, and try it just once!";
+ close;
+ }
mes "Don't you think Binoculars";
mes "are really COOL?! You can";
mes "see all sorts of places...!";
@@ -326,24 +337,6 @@ izlude,150,143,4 script Kylick 97,{
mes "a pound of cure";
mes "after all, right?";
close;
-
- L_R0:
- mes "I was thinking, even though the";
- mes "people of Izlude live so close to";
- mes "the ocean...";
- next;
- mes "[Kylick]";
- mes "There are other cultures that have";
- mes "completely developed by living off";
- mes "of the sea. Of course, I'm talking";
- mes "about Amatsu.";
- next;
- mes "[Kylick]";
- mes "I hear the cuisine there is really";
- mes "good! Although the idea of eating";
- mes "raw fish is new to me, I would love";
- mes "to go there, and try it just once!";
- close;
}
// Soldier ------------------------------------------------------------------------------
@@ -361,9 +354,8 @@ izlude,124,178,4 script Soldier 105,{
mes "items dropped by monsters. But you";
mes "knew that, right?";
next;
- menu "Of course",sM_0, "Eh? Really?",sM_1;
+ menu "Of course",-, "Eh? Really?",sM_1;
- sM_0:
mes "[Soldier]";
mes "Haha, in fact, that used to be part";
mes "of our job. But there were more and";
@@ -454,138 +446,8 @@ izlude,124,178,4 script Soldier 105,{
close;
}
-//Red-------------------------------------------------------------------------------------
-izlude,58,126,1 script Red 98,{
-
- mes "[Red]";
- mes "The only skill that's needed for a";
- mes "Swordman is ^FF0000Bash^000000! Bash, Bash and";
- mes "ONLY ^FF0000BASH^000000! No need to waste time";
- mes "and effort for smaller skills!";
- mes "Everything else is for cowards and";
- mes "wusses!";
- next;
- mes "[Cebalis]";
- mes "What are you talking about!? The";
- mes "ideal Swordman resolutely stands";
- mes "alone, surrounded by countless";
- mes "enemies and smashing them all with";
- mes "one awesome attack.";
- next;
- mes "[Cebalis]";
- mes "^FF0000MAGNUM BREAK^000000";
- mes "That's right, Magnum Break";
- mes "is the skill that does";
- mes "the job right~!!";
- next;
- mes "[Cebalis]";
- mes "Well... Sometimes the explosive";
- mes "damage might accidentally hit some";
- mes "wandering monsters, and those guys";
- mes "end up coming after you, but that's";
- mes "a risk a Swordman should be willing";
- mes "to take!!";
- next;
- mes "[Red]";
- mes "That's exactly why you're dumb, you";
- mes "idiot! And what's this about the";
- mes "'the ideal Swordman?' I still";
- mes "remember the last time you used";
- mes "Magnum Break...";
- next;
- mes "[Red]";
- mes "You ended up running away from all";
- mes "those monsters you hit with that";
- mes "stupid skill! Weakling! All those";
- mes "Porings around you got hit and they";
- mes "all tried to kill you.";
- next;
- mes "[Cebalis]";
- mes "Hmpf. As I recall, you were running";
- mes "away too, apparently too busy to";
- mes "use your precious bash. In any";
- mes "case, Magnum Break is THE skill for";
- mes "a Swordman~!!";
- next;
- mes "[Cebalis]";
- mes "Something simplistic like Bash";
- mes "is just one of the little steps";
- mes "towards Magnum Break.";
- next;
- mes "[Red]";
- mes "Oh man~";
- mes "Hey, I know you just";
- mes "heard everything.";
- mes "So what do you think?";
- next;
- mes "[Red]";
- mes "Which one do you think is better?";
- mes "The critical damage skill, ^FF0000Bash^000000, or";
- mes "the Splash damage skill, ^FF0000Magnum^000000";
- mes "^FF0000Break^000000?";
- next;
- menu "Bash",-,"Magnum Break",L1;
-
- mes "[Red]";
- if( baseClass == Job_Swordman ) goto L00;
- mes "Hahahaha!! See!? Someone who";
- mes "pursues a different job agrees with";
- mes "me~! You really are a great guy!";
- mes "Hahaha!! Undoubtedly, only ^FF0000Bash^000000";
- mes "suits a Swordman. Please tell that";
- mes "to this NIMROD over here~ Hahaha!";
- close;
-
- L00:
- mes "Hahahaha!!! I knew you'd see things";
- mes "my way! You ARE a great guy!!";
- mes "Undoubtedly, only ^FF0000Bash^000000 suits a";
- mes "Swordman. Please tell that to this";
- mes "BONEHEAD over here~ Hahaha!";
- next;
- mes "[Red]";
- mes "Hmm, let me give you a bit of";
- mes "advice. After you achieve level 5";
- mes "Bash', the amount of SP consumed";
- mes "by the skill increased greatly, so";
- mes "watch out for your SP.";
- close;
- L1:
- mes "[Cebalis]";
- if( baseClass == Job_Swordman ) goto L01;
- mes "Right?! ^FF0000Magnum Break^000000 is THE BEST!!!";
- mes "You know what you're talking about,";
- mes "eh? I don't know why this jerk face";
- mes "is being sooooo stubborn.";
- close;
-
- L01:
- mes "Alright!! ^FF0000Magnum Break^000000 is the";
- mes "BEST!! Now you're talking~!! You";
- mes "know the stuff~Hahaha!";
- next;
- mes "[Cebalis]";
- mes "You wanna know some useful";
- mes "information? Okay, lemme tell";
- mes "ya! Magnum Break has Fire";
- mes "Property.";
- next;
- mes "[Cebalis]";
- mes "So it won't be too effective";
- mes "against monsters with the Water";
- mes "property, but this is THE skill to";
- mes "use against Undead and Earth";
- mes "property monsters!";
- next;
- mes "[Cebalis]";
- mes "And most importantly, look around";
- mes "before you use it. Otherwise you'll";
- mes "be in BIG trouble~";
- close;
-}
-
//Cebalis-------------------------------------------------------------------------------------
-izlude,56,126,7 script Cebalis 85,{
+izlude,56,126,7 script Cebalis::RedCebalis 85,{
mes "[Red]";
mes "The only slill that's needed for a";
@@ -654,65 +516,65 @@ izlude,56,126,7 script Cebalis 85,{
mes "the Splash damage skill, ^FF0000Magnum^000000";
mes "^FF0000Break^000000?";
next;
- menu "Bash",-,"Magnum Break",L1;
+ menu "Bash",-,"Magnum Break",M_1;
mes "[Red]";
- if( baseClass == Job_Swordman ) goto L00;
- mes "Hahahaha!! See!? Someone who";
- mes "pursues a different job agrees with";
- mes "me~! You really are a great guy!";
- mes "Hahaha!! Undoubtedly, only ^FF0000Bash^000000";
- mes "suits a Swordman. Please tell that";
- mes "to this NIMROD over here~ Hahaha!";
+ if( baseClass != Job_Swordman ){
+ mes "Hahahaha!! See!? Someone who";
+ mes "pursues a different job agrees with";
+ mes "me~! You really are a great guy!";
+ mes "Hahaha!! Undoubtedly, only ^FF0000Bash^000000";
+ mes "suits a Swordman. Please tell that";
+ mes "to this NIMROD over here~ Hahaha!";
+ close;
+ }
+ mes "Hahahaha!!! I knew you'd see things";
+ mes "my way! You ARE a great guy!!";
+ mes "Undoubtedly, only ^FF0000Bash^000000 suits a";
+ mes "Swordman. Please tell that to this";
+ mes "BONEHEAD over here~ Hahaha!";
+ next;
+ mes "[Red]";
+ mes "Hmm, let me give you a bit of";
+ mes "advice. After you achieve level 5";
+ mes "Bash', the amount of SP consumed";
+ mes "by the skill increased greatly, so";
+ mes "watch out for your SP.";
close;
-
- L00:
- mes "Hahahaha!!! I knew you'd see things";
- mes "my way! You ARE a great guy!!";
- mes "Undoubtedly, only ^FF0000Bash^000000 suits a";
- mes "Swordman. Please tell that to this";
- mes "BONEHEAD over here~ Hahaha!";
- next;
- mes "[Red]";
- mes "Hmm, let me give you a bit of";
- mes "advice. After you achieve level 5";
- mes "Bash', the amount of SP consumed";
- mes "by the skill increased greatly, so";
- mes "watch out for your SP.";
+ M_1:
+ mes "[Cebalis]";
+ if( baseClass != Job_Swordman ){
+ mes "Right?! ^FF0000Magnum Break^000000 is THE BEST!!!";
+ mes "You know what you're talking about,";
+ mes "eh? I don't know why this jerk face";
+ mes "is being sooooo stubborn.";
close;
- L1:
+ }
+ mes "Alright!! ^FF0000Magnum Break^000000 is the";
+ mes "BEST!! Now you're talking~!! You";
+ mes "know the stuff~HaHaHa!";
+ next;
mes "[Cebalis]";
- if( baseClass == Job_Swordman ) goto L01;
- mes "Right?! ^FF0000Magnum Break^000000 is THE BEST!!!";
- mes "You know what you're talking about,";
- mes "eh? I don't know why this jerk face";
- mes "is being sooooo stubborn.";
+ mes "You wanna know some useful";
+ mes "information? Okay, lemme tell";
+ mes "ya! Magnum Break has Fire";
+ mes "Property.";
+ next;
+ mes "[Cebalis]";
+ mes "So it won't be too effective";
+ mes "against monsters with the Water";
+ mes "property, but this is THE skill to";
+ mes "use against Undead and Earth";
+ mes "property monsters!";
+ next;
+ mes "[Cebalis]";
+ mes "And most importantly, look around";
+ mes "before you use it. Otherwise you'll";
+ mes "be in BIG trouble~";
close;
-
- L01:
- mes "Alright!! ^FF0000Magnum Break^000000 is the";
- mes "BEST!! Now you're talking~!! You";
- mes "know the stuff~HaHaHa!";
- next;
- mes "[Cebalis]";
- mes "You wanna know some useful";
- mes "information? Okay, lemme tell";
- mes "ya! Magnum Break has Fire";
- mes "Property.";
- next;
- mes "[Cebalis]";
- mes "So it won't be too effective";
- mes "against monsters with the Water";
- mes "property, but this is THE skill to";
- mes "use against Undead and Earth";
- mes "property monsters!";
- next;
- mes "[Cebalis]";
- mes "And most importantly, look around";
- mes "before you use it. Otherwise you'll";
- mes "be in BIG trouble~";
- close;
}
+//Cebalis-------------------------------------------------------------------------------------------------------------------------------------------
+izlude,58,126,1 duplicate(RedCebalis) Cebalis 98
//Aaron-------------------------------------------------------------------------------------
izlude_in,125,164,5 script Aaron 65,{
@@ -760,7 +622,7 @@ izlude_in,125,164,5 script Aaron 65,{
mes "Are you bored by all this talk? Or";
mes "do you want me to go on?";
next;
- menu "Tell me more please.",-,"End conversation",LEnd;
+ menu "Tell me more please.",-,"End conversation",M_End;
mes "[Aaron]";
mes "Hmm...";
@@ -778,7 +640,7 @@ izlude_in,125,164,5 script Aaron 65,{
mes "various skills... but it's really";
mes "up to you.";
close;
- LEnd:
+ M_End:
mes "[Aaron]";
mes "Okay then,";
mes "train hard~~";
@@ -794,27 +656,27 @@ izlude,201,181,2 script Sailor#06 100,{
mes "on a Fantastic Ship!";
mes "Hurry, hurry";
next;
- menu "Byalan Island -> 150 Zeny.",-,"Alberta Marina -> 500 Zeny.",L1,"Cancel",LEnd;
+ menu "Byalan Island -> 150 Zeny.",-,"Alberta Marina -> 500 Zeny.",L_Alb,"Cancel",M_End;
- if(Zeny < 150) goto sl_NoZenyBya;
+ if(Zeny < 150){
+ mes "[Sailor]";
+ mes "150 Zeny!";
+ mes "Only 150 Zeny to ride!";
+ close;
+ }
set Zeny, Zeny - 150;
warp "izlu2dun",107,50;
close;
- L1:
- if(Zeny < 500) goto sl_NoZenyMar;
+ L_Alb:
+ if(Zeny < 500){
+ mes "[Sailor]";
+ mes "500 Zeny!";
+ mes "Only 500 Zeny to ride!";
+ close;
+ }
set Zeny, Zeny - 500;
warp "alberta",188,169;
- LEnd:
- close;
- sl_NoZenyBya:
- mes "[Sailor]";
- mes "150 Zeny!";
- mes "Only 150 Zeny to ride!";
- close;
- sl_NoZenyMar:
- mes "[Sailor]";
- mes "500 Zeny!";
- mes "Only 500 Zeny to ride!";
+ M_End:
close;
}
@@ -824,10 +686,10 @@ izlu2dun,108,27,4 script Sailor#07 100,{
mes "Wanna";
mes "head back?";
next;
- menu "Yeah, I am Tired to Death.",-,"Nope I love this place.",L1;
+ menu "Yeah, I am Tired to Death.",-,"Nope I love this place.",M_1;
warp "izlude",176,182;
- L1:
+ M_1:
close;
}
@@ -838,55 +700,52 @@ izlude,171,185,3 script Honeymoon Helper#Izlude I 71,{
mes "You can go to the imaginary recreational area anytime.";
mes "Welcome to Jawaii!";
next;
- menu "'Jawaii'?",-,"Let's go to 'Jawaii'~",s_Go,"Cancel",s_Cancel;
+ menu "'Jawaii'?",-,"Let's go to 'Jawaii'~",M_Go,"Cancel",M_End;
+ mes "[Marry Happy]";
+ mes "A distant island from the continent of Rune Midgard... ";
+ mes "there is a peaceful and charming recreational area,";
+ mes "that can't be easily reached by people.";
+ mes "Since it is a famous spot for honeymoon,";
+ mes "only married couples are allowed to go there.";
+ next;
+ mes "[Marry Happy]";
+ mes "Since it's a special journey,";
+ mes "the payment will be a bit expensive than normal. It will cost you 10,000z !!";
+ mes "And that's what lets you enjoy";
+ mes "a peaceful and fascinating";
+ mes "honey moon trip...?";
+ close;
+
+ M_Go:
+ if(!getpartnerid()){
mes "[Marry Happy]";
- mes "A distant island from the continent of Rune Midgard... ";
- mes "there is a peaceful and charming recreational area,";
- mes "that can't be easily reached by people.";
- mes "Since it is a famous spot for honeymoon,";
- mes "only married couples are allowed to go there.";
- next;
- mes "[Marry Happy]";
- mes "Since it's a special journey,";
- mes "the payment will be a bit expensive than normal. It will cost you 10,000z !!";
- mes "And that's what lets you enjoy";
- mes "a peaceful and fascinating";
- mes "honey moon trip...?";
+ mes "UhOh, I'm sorry.";
+ mes "You can't go there if you're not married...";
+ mes "Why don't you go to the Prontera Inn,";
+ mes "and cheer yourself up?";
close;
-
-s_Go:
- if(getpartnerid() == 0)
-{
- mes "[Marry Happy]";
- mes "UhOh, I'm sorry.";
- mes "You can't go there if you're not married...";
- mes "Why don't you go to the Prontera Inn,";
- mes "and cheer yourself up?";
- close;
-}
- else if(Zeny < 10000)
-{
- mes "[Marry Happy]";
- mes "I've explained about the trip to 'Jawaii'.";
- mes "You'll need 10,000 z.";
- mes "If you do not have enough zeny,";
- mes "why don't you seek help from your partner...?";
- close;
-}
- set Zeny,Zeny - 10000;
- mes "[Marry Happy]";
- mes "Enjoy your trip...!!";
- mes "Let's go to 'Jawaii'...!!";
- close2;
- warp "jawaii",241,115;
- end;
-
-s_Cancel:
+ } else if(Zeny < 10000){
mes "[Marry Happy]";
- mes "There's nothing that is as exciting as";
- mes "travelling together, especially when";
- mes "you're travelling with your loved ones.";
- mes "You must be very happy, aren't you?";
+ mes "I've explained about the trip to 'Jawaii'.";
+ mes "You'll need 10,000 z.";
+ mes "If you do not have enough zeny,";
+ mes "why don't you seek help from your partner...?";
close;
-}
+ }
+ set Zeny,Zeny - 10000;
+ mes "[Marry Happy]";
+ mes "Enjoy your trip...!!";
+ mes "Let's go to 'Jawaii'...!!";
+ close2;
+ warp "jawaii",241,115;
+ end;
+
+ M_End:
+ mes "[Marry Happy]";
+ mes "There's nothing that is as exciting as";
+ mes "travelling together, especially when";
+ mes "you're travelling with your loved ones.";
+ mes "You must be very happy, aren't you?";
+ close;
+} \ No newline at end of file
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index a44d22cbb..57c202ac9 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -91,9 +91,8 @@ nif_in,156,93,5 script Child 793,{
mes "have you seen my mommy, hmm? ... sob...";
mes "I want to go home...";
next;
- menu "About the witch...",L_Wizzard,"About the curse...",L_Curse,"Stop conversation",L_end;
+ menu "About the witch...",-,"About the curse...",L_Curse,"Stop conversation",L_end;
-L_Wizzard:
mes "[Alakina Ann]";
mes "A witch? I don't know any witches...";
mes "although I read about them in storybooks,";
@@ -102,8 +101,10 @@ L_Wizzard:
next;
mes "[Alakina Ann]";
mes "But why is it so cold?";
- if (sex == 1) mes "Aren't you cold, brother? Wierd... Hu~";
- if (sex == 0) mes "Aren't you cold, sister? Wierd... Hu~";
+ if (sex == 1)
+ mes "Aren't you cold, brother? Wierd... Hu~";
+ else
+ mes "Aren't you cold, sister? Wierd... Hu~";
mes "I miss my warm home,";
mes "Can you help me please? Hmmm? Hmmm?";
close;
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index fecd3f61b..fdaa58995 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -7,7 +7,7 @@
//= DON'T REMOVE THIS! (by request of him, he provided all
//= the info regarding the quests and shops.)
//===== Current Version: =====================================
-//= 1.10
+//= 1.10a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -29,12 +29,12 @@
que_ng.gat,152,167,3 script Master Miller 901,{
+ mes "[Master Miller]";
if(Class == Job_Novice && JobLevel > 9)
{
switch(GUNS_Q)
{
case 0:
- mes "[Master Miller]";
mes "I'm a Security Chief and also";
mes "a Gunslinger Instructor, you may call me";
mes "Master Miller.";
@@ -101,14 +101,12 @@ que_ng.gat,152,167,3 script Master Miller 901,{
}
case 1:
- mes "[Master Miller]";
mes "Hurry up and get moving.";
mes "'The Wise Bull Horn' is";
mes "currently in Payon.";
close;
case 2:
- mes "[Master Miller]";
mes "I guess he gave you";
mes "some errands to run.";
next;
@@ -118,7 +116,6 @@ que_ng.gat,152,167,3 script Master Miller 901,{
close;
case 3:
- mes "[Master Miller]";
mes "That's a lot of errands";
mes "I already told you, the";
mes "old man is pretty serious.";
@@ -126,20 +123,16 @@ que_ng.gat,152,167,3 script Master Miller 901,{
close;
case 4:
- mes "[Master Miller]";
mes "Mm~ I'll be waiting for your news.";
mes "I hope you'll become one of us.";
mes "We'll be practically family..";
close;
case 5:
- if (skillpoint > 0)
- {
- mes "[Master Miller]";
+ if (skillpoint > 0) {
mes "Learn all your Basic Skills first!!";
close;
}
- mes "[Master Miller]";
mes "Ohh, I see you got something from the old man";
mes "This is rare.";
mes "Under normal circumstances...";
@@ -202,29 +195,20 @@ que_ng.gat,152,167,3 script Master Miller 901,{
if(@gun_ex == 1) getitem 13100,1; else getitem 13150,1;
close;
}
- }
- else if(Class == Job_Novice && JobLevel < 10)
- {
- mes "[Master Miller]";
+ } else if(Class == Job_Novice && JobLevel < 10) {
mes "Hmm, I think you";
mes "have the potential";
mes "but you're not yet strong enough.";
mes "Keep getting stronger and";
mes "come back later.";
close;
- }
- else if(Class == Job_Gunslinger)
- {
- mes "[Master Miller]";
+ } else if(Class == Job_Gunslinger) {
mes "Oh~ It's been a long time~";
mes "So, how have your travels been?";
mes "Remember, always take care";
mes "of your gun.";
close;
- }
- else if(Class == Job_Baby)
- {
- mes "[Master Miller]";
+ } else if(Class == Job_Baby) {
mes "Ouch~";
mes "How did a baby come here~";
mes "Peekaboo~";
@@ -235,10 +219,7 @@ que_ng.gat,152,167,3 script Master Miller 901,{
mes "It's a dangerous place here.";
mes "Go play somewhere else.";
close;
- }
- else
- {
- mes "[Master Miller]";
+ } else {
mes "Don't get distracted with me.";
mes "Get on with your traveling.";
close;
diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt
index 68ac39130..3f51171f2 100644
--- a/npc/merchants/grandpa_pharmacist.txt
+++ b/npc/merchants/grandpa_pharmacist.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= DZeroX
//===== Current Version: =====================================
-//= 1.0
+//= 1.0a
//===== Compatible With: =====================================
//= eAthena SVN Trunk
//===== Description: =========================================
@@ -50,7 +50,7 @@ alberta_in.gat,16,28,4 script Grandpa Pharmacist 61,{
} else {
set .@max,countitem(713);
}
- if ((countitem(507) < 1) | (countitem(508) < 1) | (countitem(713) == 0)) {
+ if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) {
mes "You are silly! How can you make a potion if you don't even have ingredients?!";
mes "Go away!";
close;
@@ -64,7 +64,7 @@ alberta_in.gat,16,28,4 script Grandpa Pharmacist 61,{
switch(select("As many as I can","I will set the amounts.","Nah, forget about it.")) {
case 1:
next;
- if ((countitem(507) < .@max) | (countitem(508) < .@max) | (countitem(713) < .@max) | (Zeny < .@max*3)) {
+ if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
mes "[Grandpa Pharmacist]";
mes "You punk! Do you want me to make stuff from insufficient ingredients?";
close;
@@ -95,7 +95,7 @@ alberta_in.gat,16,28,4 script Grandpa Pharmacist 61,{
mes "Are you a deaf of something? I can't make more than 100.";
close;
}
- if ((countitem(507) < .@amount) | (countitem(508) < .@amount) | (countitem(713) < .@amount) | (Zeny < .@amount*3)) {
+ if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
next;
mes "[Grandpa Pharmacist]";
mes "You punk! Do you want me to make stuff from insufficient ingredients?";
@@ -173,7 +173,7 @@ L_making:
} else {
set .@max,countitem(713);
}
- if ((countitem(getarg(0)) < 2) | (countitem(713) == 0)) {
+ if ((countitem(getarg(0)) < 2) || (countitem(713) == 0)) {
mes "You are silly! How can you make a potion if you don't even have ingredients?!";
mes "Go away!";
close;
@@ -187,7 +187,7 @@ L_making:
switch(select("As many as I can","I will set the amounts.","Nah, forget about it.")) {
case 1:
next;
- if ((countitem(getarg(0)) < .@max*2) | (countitem(713) < .@max) | (Zeny < .@max*getarg(1))) {
+ if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) {
mes "[Grandpa Pharmacist]";
mes "You punk! Do you want me to make stuff from insufficient ingredients?";
close;
@@ -218,7 +218,7 @@ L_making:
mes "Are you a deaf of something? I can't make more than 100.";
close;
}
- if ((countitem(getarg(0)) < .@amount*2) | (countitem(713) < .@amount) | (Zeny < .@amount*getarg(1))) {
+ if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) {
next;
mes "[Grandpa Pharmacist]";
mes "You punk! Do you want me to make stuff from insufficient ingredients?";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-14 10:44:41 +0000