summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/merchants/alchemist.txt10
-rw-r--r--npc/merchants/ammo_boxes.txt4
-rw-r--r--npc/quests/2008_newhat_mir.txt38
3 files changed, 26 insertions, 26 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index d2e55c918..b99f7bf25 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -39,8 +39,8 @@ alde_alche,31,186,3 script Craft Book Salesman#alde 883,{
mes "I specialize in the sale of these special books and";
mes "I ^FF0000don't sell other items^000000.";
next;
- mes "[Craft Book Salesman]"
- mes "Okay then, here's the list of available craft books."
+ mes "[Craft Book Salesman]";
+ mes "Okay then, here's the list of available craft books.";
next;
switch(select("[Apple Bomb Craft Book] 100,000 zeny:[Pineapple Bomb Craft Book] 100,000 zeny:[Coconut Bomb Craft Book] 100,000 zeny:[Melon Bomb Craft Book] 100,000 zeny:[Banana Bomb Craft Book] 100,000 zeny:[Plant Gene Cultivation Method] 100,000 zeny:[Superior Potion Craft Manual] 100,000 zeny:[Mix Cooking Book] 100,000 zeny:[Health Improvement Research Book] 100,000 zeny:[Vigor Drink Recipe] 100,000 zeny:Close")){
case 1:
@@ -97,10 +97,10 @@ S_SellManual:
mes "You cannot purchase more than 100 at a time.";
close;
}
- mes "[Craft Book Salesman]"
+ mes "[Craft Book Salesman]";
mes "You've entered "+.@amount+"x "+getitemname(getarg(0))+".";
mes "That'll be "+getarg(1) * .@amount+" Zeny.";
- mes "Would you like to continue?"
+ mes "Would you like to continue?";
next;
if (select("Yes:No") == 1) {
if (Zeny < getarg(1) * .@amount) {
@@ -131,7 +131,7 @@ S_SellManual:
alde_alche,24,188,3 script Guild Dealer 740,{
if (checkweight(1201,1) == 0) {
- mes "- next; a minute! -";
+ mes "- Wait a minute! -";
mes "- Currently you are carrying -";
mes "- too many items with you. -";
mes "- Please come back again -";
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index f3fed67e6..fcad5a0ea 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -17,7 +17,7 @@
//= 1.4 Updated to match AEGIS script again. [Masao]
//============================================================
-izlude,171,127,3 script Magazine Dealer Kenny#iz::mdk 83,{
+izlude,171,127,3 script Magazine Dealer Kenny::mdk 83,{
if(BaseJob == Job_Gunslinger) {
mes "[Kenny]";
mes "Welcome to my Magazine Shop.";
@@ -135,4 +135,4 @@ function script Func_Casing {
}
}
-alberta,118,157,3 duplicate(mdk) Magazine Dealer Tonny#alb 83
+alberta,118,157,3 duplicate(mdk) Magazine Dealer Tonny 83
diff --git a/npc/quests/2008_newhat_mir.txt b/npc/quests/2008_newhat_mir.txt
index bc01d65b2..40426e972 100644
--- a/npc/quests/2008_newhat_mir.txt
+++ b/npc/quests/2008_newhat_mir.txt
@@ -20,7 +20,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "Meow...";
emotion 23;
next;
- if (2008_hat_cat == 0){
+ if (hatcat2008 == 0){
mes "[Myu]";
mes "Oh? Aren't you an adventurer?";
mes "What brings you here? Ho, you are not here to harm Wild Roses, are you?";
@@ -84,7 +84,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
next;
mes "As she says that, Myu slides her neck mocking like she's slitting her throat.";
next;
- switch(select( "Isn't that too much?" "That's easy")){
+ switch(select("Isn't that too much?:That's easy")){
case 1:
mes "[Myu]";
mes "..But they won't give up if we dont really teach them a lesson.";
@@ -99,13 +99,13 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "If you do, it's all over for you.";
mes "So you better be careful.. ";
mes "Meow Meow Meow..";
- set 2008_hat_cat,1;
+ set hatcat2008,1;
setquest 7054;
setquest 7055;
close;
}
}
- } else if (2008_hat_cat == 1){
+ } else if (hatcat2008 == 1){
if (checkquest(7055,2) == 1){
mes "[Myu]";
mes "Did you think I didn't know what you have done?";
@@ -119,7 +119,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "Our business is over!!!";
mes " ";
mes "(Meow..)";
- set 2008_hat_cat,0;
+ set hatcat2008,0;
erasequest 7054;
erasequest 7055;
close;
@@ -139,7 +139,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "What more did you expect?";
mes "That Pow is really a valuable thing!";
mes "Now, just take it and leave. Wild Roses feel uncomfortable with an adventurer around them.";
- set 2008_hat_cat,2;
+ set hatcat2008,2;
getitem 5446,1;
erasequest 7054;
erasequest 7055;
@@ -150,7 +150,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "ONE THOUSAND TIMES! -chuckles-";
mes "(Meow Meow Meow~)";
next;
- mes "["+strcharinfo(0)+"]"
+ mes "["+strcharinfo(0)+"]";
mes "(What a weirdo.. Anyways..what's with that meow meow sound?)";
mes "Just keep your promises.";
mes "after the work is done...Ok?";
@@ -158,7 +158,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
mes "[Myu]";
mes "Of course! Don't worry about that~";
close;
- } else if (2008_hat_cat == 2){
+ } else if (hatcat2008 == 2){
mes "[Myu]";
mes "This place is the village of Deserted people.";
mes "Homeland of those who walk in the shadows and lay low.";
@@ -177,18 +177,18 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
next;
switch(select("NO!:Sure.")){
case 1:
- mes "[Myu]"
- mes "...!..."
- mes ".. Ah.. that's too bad."
- mes "Well, looks like a bait has spoiled.... "
- mes "It's ok. That's how it is. Meow."
+ mes "[Myu]";
+ mes "...!...";
+ mes ".. Ah.. that's too bad.";
+ mes "Well, looks like a bait has spoiled.... ";
+ mes "It's ok. That's how it is. Meow.";
close;
case 2:
- mes "[Myu]"
- mes "You know the drill right?"
- mes "Never ever touch the Wild Roses, Only hunt down the Kobold Archers."
- mes "Give them 1,000 times despair!"
- set 2008_hat_cat,1;
+ mes "[Myu]";
+ mes "You know the drill right?";
+ mes "Never ever touch the Wild Roses, Only hunt down the Kobold Archers.";
+ mes "Give them 1,000 times despair!";
+ set hatcat2008,1;
setquest 7054;
setquest 7055;
close;
@@ -419,7 +419,7 @@ morocc_in,137,102,5 script Trainee#2008hat01 82,{
mes ".. Hmm..";
mes "This should do it.";
mes "What do you think?";
- mes "Did this color came out nicely?"
+ mes "Did this color came out nicely?";
delitem 5441,1;
delitem 979,1;
getitem 5438,1;