summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rwxr-xr-xnpc/027-2_Caretakers_House/alacrius.txt2
-rw-r--r--npc/027-2_Caretakers_House/barman.txt4
-rw-r--r--npc/027-2_Caretakers_House/evil_guard.txt4
-rwxr-xr-xnpc/027-2_Caretakers_House/gy_inn_shops.txt2
-rwxr-xr-xnpc/027-2_Caretakers_House/testnpcs.txt18
-rw-r--r--npc/027-2_Caretakers_House/werewolf.txt20
6 files changed, 25 insertions, 25 deletions
diff --git a/npc/027-2_Caretakers_House/alacrius.txt b/npc/027-2_Caretakers_House/alacrius.txt
index e94bd053..99714ebc 100755
--- a/npc/027-2_Caretakers_House/alacrius.txt
+++ b/npc/027-2_Caretakers_House/alacrius.txt
@@ -1,6 +1,6 @@
// Starts the reaper quest
-027-2.gat,107,29,0 script Alacrius 313,{
+//027-2.gat,107,29,0 script Alacrius 313,{
// if started, go to started
// if fail go to failed
// if complete go to complete
diff --git a/npc/027-2_Caretakers_House/barman.txt b/npc/027-2_Caretakers_House/barman.txt
index 709750c5..616b761a 100644
--- a/npc/027-2_Caretakers_House/barman.txt
+++ b/npc/027-2_Caretakers_House/barman.txt
@@ -1,5 +1,5 @@
-027-2.gat,103,22,0 script Barman 310,{
- mes "[Barman]";
+027-2.gat,103,22,0 script Bennet 310,{
+ mes "[Bennet]";
mes "\"Hi there stranger! My name is Bennet, the bartender here.\"";
next;
mes "[Bennet]";
diff --git a/npc/027-2_Caretakers_House/evil_guard.txt b/npc/027-2_Caretakers_House/evil_guard.txt
index dfd7f70b..0ee91cfa 100644
--- a/npc/027-2_Caretakers_House/evil_guard.txt
+++ b/npc/027-2_Caretakers_House/evil_guard.txt
@@ -1,4 +1,4 @@
-027-2.gat,100,43,0 script Evil Guard 316,{
+027-2.gat,100,43,0 script Blackwin 316,{
mes "...";
next;
mes "The guard glares at you, silently daring you to try something.";
@@ -11,7 +11,7 @@
close;
}
-027-2.gat,112,37,0 script Evil Guard 316,{
+027-2.gat,112,37,0 script Forwin 316,{
mes "[Evil Guard]";
mes "\"" + strcharinfo(0) + "...\"";
next;
diff --git a/npc/027-2_Caretakers_House/gy_inn_shops.txt b/npc/027-2_Caretakers_House/gy_inn_shops.txt
index 1936bd59..a90d4301 100755
--- a/npc/027-2_Caretakers_House/gy_inn_shops.txt
+++ b/npc/027-2_Caretakers_House/gy_inn_shops.txt
@@ -10,7 +10,7 @@
027-2.gat,75,22,0 shop Chef 300,784:-1,785:-1,786:-1,787:-1
027-2.gat,90,36,0 shop Estrilda 301,788:-1,789:-1,790:-1
027-2.gat,93,22,0 shop Umfrey 302,1282:-1,1281:-1
-027-2.gat,56,99,0 shop Savaric 304,501:-1,502:-1,518:100,566:2000,567:-1,568:-1,613:500,631:1000,740:-1,772:-1,773:-1,774:-1
+027-2.gat,56,99,0 shop Leofwin 304,501:-1,502:-1,518:100,566:2000,567:-1,568:-1,613:500,631:1000,740:-1,772:-1,773:-1,774:-1
027-2.gat,106,22,0 shop Edwin 309,784:-1,785:-1,786:-1,787:-1,788:-1,789:-1,790:-1
// Inn
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index 1f957b33..57dc1f7b 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -1,4 +1,4 @@
-027-2.gat,80,34,0 script Drunk Lover 303,{
+027-2.gat,80,34,0 script Lovers 303,{
mes "You see a man and a woman holding each other very tight.";
next;
mes "They are kissing and whispering things to each other you can't hear.";
@@ -9,7 +9,7 @@
close;
}
-027-2.gat,110,30,0 script Debug 305,{
+//027-2.gat,110,30,0 script Debug 305,{
set @Graveyard_Inn_Woman_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_Woman_SHIFT, NIBBLE_0_SHIFT;
@@ -110,7 +110,7 @@ S_Update_Mask_Woman:
close;
}
-027-2.gat,77,40,0 script Drunker 308,{
+027-2.gat,77,40,0 script Darnel 308,{
set @drunker, rand(4);
if (@drunker == 0) goto L_0;
if (@drunker == 1) goto L_1;
@@ -118,25 +118,25 @@ S_Update_Mask_Woman:
if (@drunker == 3) goto L_3;
end;
L_0:
- mes "[Ghost Drunker]";
+ mes "[Darnel]";
mes "\"zzzZZZzzz...\"";
close;
L_1:
- mes "[Ghost Drunker]";
+ mes "[Darnel]";
mes "\"Ish that a Zzombee?...\"";
close;
L_2:
- mes "[Ghost Drunker]";
+ mes "[Darnel]";
mes "\"Auuu... Hiccup... Don't byte mee... \"";
close;
L_3:
- mes "[Ghost Drunker]";
+ mes "[Darnel]";
mes "\"Moar Bearr...Pleash!\"";
close;
}
-027-2.gat,110,23,0 script Ghost Drunker 312,{
- mes "[Ghost Drunker]";
+027-2.gat,110,23,0 script Nigel 312,{
+ mes "[Nigel]";
mes "\"Ohh... My head is killing me! I have to stop "
+ "drinking too much or I will lose my job... But "
+ "being a waiter... oh I can't resist a drink or two!\"";
diff --git a/npc/027-2_Caretakers_House/werewolf.txt b/npc/027-2_Caretakers_House/werewolf.txt
index fcce057b..20794433 100644
--- a/npc/027-2_Caretakers_House/werewolf.txt
+++ b/npc/027-2_Caretakers_House/werewolf.txt
@@ -1,4 +1,4 @@
-027-2.gat,118,23,0 script Werewolf 305,{
+027-2.gat,118,23,0 script Wolfgang 305,{
set @Graveyard_Inn_MASK, NIBBLE_5_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_5_SHIFT;
@@ -11,7 +11,7 @@
if (@state > 1) goto L_Happy;
if (@state == 1) goto L_Bones;
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"What a nice place here, isn't it?\"";
next;
mes "\"Just the stuff they call 'food' in here is awful, bah.\"";
@@ -25,7 +25,7 @@
close;
L_Bones:
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"Do you have " + @ANIMALBONES_AMOUNT + " bones of an animal for me?\"";
next;
if ((countitem("Bone") > 0) && (countitem("AnimalBones") >= @ANIMALBONES_AMOUNT))
@@ -50,33 +50,33 @@ L_Bring:
goto L_Not_Enough;
delitem "AnimalBones", @ANIMALBONES_AMOUNT;
getexp @ANIMALBONES_EXP, 0;
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"Ah! Wonderful! Thank you.\"";
set @state, 2;
callsub S_Update_Mask;
close;
L_Human:
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"What?! That's a humans bone! I don't eat humans. That brings only trouble.\"";
next;
mes "\"Besides, from that I heard, they taste bad.\"";
close;
L_Not_Enough:
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"Are you trying to kid me? I can count.\"";
close;
L_Happy:
mes "You see the werewolf happily crunching the bones you brought him.";
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"Delicious. Thanks again.\"";
next;
mes "\"By the way... would you be interested in a little round of black jack?\"";
mes "He pulls a deck of cards out of his pocket.";
next;
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"You will need " + @money + " GP.\"";
menu
"Sure, why not?",L_Game,
@@ -86,7 +86,7 @@ L_Happy:
//The game mechanics is copied from casino.txt
L_Game:
if(zeny < @money) goto L_No_Money;
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"Very nice. Let's start.\"";
mes "He shuffles the cards.";
next;
@@ -127,7 +127,7 @@ L_No_Money:
close;
L_Lost:
- mes "[Werewolf]";
+ mes "[Wolfgang]";
mes "\"Fine! I won!";
mes "You got " + @player + " with your cards.";
mes "I had " + @croupier + ".\"";