summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-01-23 22:42:56 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-01-23 22:42:56 +0100
commit446c7dae4c5a37ccb23b22a103a1f28a6b67fdc0 (patch)
tree5d35b9dd549fdfa6f95ac4e31123759ccef4c0ce /npc
parentc16ece966333713a9cfd6688b992bc1873dfa224 (diff)
downloadserverdata-446c7dae4c5a37ccb23b22a103a1f28a6b67fdc0.tar.gz
serverdata-446c7dae4c5a37ccb23b22a103a1f28a6b67fdc0.tar.bz2
serverdata-446c7dae4c5a37ccb23b22a103a1f28a6b67fdc0.tar.xz
serverdata-446c7dae4c5a37ccb23b22a103a1f28a6b67fdc0.zip
gy inn:
Fixing some errors in innkeeper. enabling debug again
Diffstat (limited to 'npc')
-rw-r--r--npc/027-2_Caretakers_House/innkeeper.txt57
-rwxr-xr-xnpc/027-2_Caretakers_House/testnpcs.txt29
2 files changed, 53 insertions, 33 deletions
diff --git a/npc/027-2_Caretakers_House/innkeeper.txt b/npc/027-2_Caretakers_House/innkeeper.txt
index 51bbf296..4afe1074 100644
--- a/npc/027-2_Caretakers_House/innkeeper.txt
+++ b/npc/027-2_Caretakers_House/innkeeper.txt
@@ -1,4 +1,4 @@
-027-2.gat,104,39,0 script Reid's Ghost 315,{
+027-2.gat,104,39,0 script Reids Ghost 315,{
set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
@@ -29,7 +29,7 @@
mes "The womens ghost seems to be confused.";
next;
mes "[Ghost]";
- mes "Oh, I'm sorry. Welcome to Reid's Inn. My name is Reid, I am the innkeeper of this wonderful place of leisure. Please enjoy your visit here!";
+ mes "Oh, I'm sorry. Welcome to Reids Inn. My name is Reid, I am the innkeeper of this wonderful place of leisure. Please enjoy your visit here!";
next;
set @state, 1;
@@ -38,17 +38,17 @@
goto L_Ask_Dead;
L_After_Welcome:
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"Please enjoy yourself!\"";
if (baselevel < 85) goto L_Close;
L_Ask_Dead:
if (baselevel < 85) goto L_Close;
menu
- "What happened to you?", - ,
+ "What happened to you?", - ,
"Thank you, I'll surely enjoy my visit.", L_Close;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"What happened to me? What do you mean?\"";
//TODO: add more possible answers
menu
@@ -56,9 +56,9 @@ L_Ask_Dead:
"You don't seem to be in the best condition.",-,
"You are dead!",-;
- mes "Reid looks down at her body and turns even more pale, if this is possible.";
+ mes "Reid looks down at her body and turns even more pale, if this is possible.";
next;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"OH?\"";
next;
@@ -67,7 +67,7 @@ L_Ask_Dead:
"Yes - do you understand my question now?",-,
"Shall I help you to find out what happened with you?", L_Offer_Help1;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"I'm dead? But why? And why am I still here?\"";
next;
mes "She stares into space and doesn't seem to notice you anymore.";
@@ -76,7 +76,7 @@ L_Ask_Dead:
close;
L_Offer_Help2:
- mes "Reid's Ghost is still staring into space.";
+ mes "Reids Ghost is still staring into space.";
menu
"Shall I help you to find out what happened with you?", -,
"I don't want to bother you.", L_Close;
@@ -91,7 +91,7 @@ L_Offer_Help1:
close;
L_Bring_Tears:
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"Did you find something, which can represent my sadness?\"";
next;
@@ -111,11 +111,11 @@ L_Check_Tears:
set @state, 4;
callsub S_Update_Mask;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"This tears.. how they shimmer in the candle light. Yes, it seems you are serious with your offer.\"";
next;
L_Ask_Life:
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"How do you plan to help me?\"";
next;
@@ -123,7 +123,7 @@ L_Ask_Life:
"Please tell me about your life. Maybe this gives a clue what happened.",-,
"I need to think about that.", L_Close;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"About my life? Well ok.\"";
next;
mes "\"I'm the owner of this inn. I inherited it from my parents, who ran it while I was a child.\"";
@@ -166,12 +166,12 @@ L_Ask_Life:
mes "\"What I'm going to tell you is very personal, but you showed me you're a sensitive person with helping my child.\"";
L_Lovestory:
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"It began as a completely normal day. We were taking care of our overnight guests and prepared the inn for the evenings rush.\"";
next;
mes "\"But that day, a very special patron checked in. His name was Savaric, and he was a student of magic. He came from far away to check some rumours about a legendary mana seed.\"";
next;
- mes "Reid's ghost has a completely enchanted look on her face.";
+ mes "Reids ghost has a completely enchanted look on her face.";
next;
mes "\"He really made me feel alive - when he was near, I was feeling like I never felt before. I started to search for reasons to be near him - I told myself that I just like him because he was interesting, coming from so far away and being a mage.\"";
next;
@@ -181,11 +181,11 @@ L_Lovestory:
next;
mes "She pulls a key out of her pocket as transparent as she is herself. As you try to grab it, your fingers go just through it.";
next;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"I keep forgetting! Please take the key out of my pocket.\"";
mes "She is pointing at her dead body with a sad look on her face. You take the key.";
next;
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"Me and my husbands rooms are at the very end of the corridor upstairs. You will find my dairy in the bookshelf, hidden behind a book with poems. Hamond didn't like poems.\"";
next;
mes "\"Please go and read it.\"";
@@ -199,24 +199,33 @@ L_Read_Diary:
close;
L_Not_Enough_Tears:
- mes "[Reid's Ghost]";
- mes "\"This is beautiful! But this are not enough to represent my sadness.\"";
+ mes "[Reids Ghost]";
+ set @tears, countitem("FrozenYetiTear");
+ if (@tears == 1)
+ mes "\"This is beautiful! But one of them isn't enough to represent my sadness.\"";
+ if (@tears > 1)
+ mes "\"This is beautiful! But " + @tears + " of them aren't enough to represent my sadness.\"";
close;
L_Man:
- mes "[Reid's Ghost]";
+ mes "[Reids Ghost]";
mes "\"What I am about to tell is very personal. You're a man - I'm not sure, if I want to tell you. Maybe you kann show me you are sensitive someway.\"";
+ //TODO: REMOVE!!!
+ mes "Skip that for debugging?";
+ menu
+ "yes",L_Helped_Kid,
+ "no",-;
close;
L_Woman:
- mes "[Reid's Ghost]";
- mes "\"I'm going to tell you something very personal. But you are a woman like me - I'm sure you will understand.\"";
+ mes "[Reids Ghost]";
+ mes "\"I'm going to tell you something very personal. But you are a woman like me - I'm sure you will understand.\"";
next;
goto L_Lovestory;
L_Helped_Kid:
- mes "[Reid's Ghost]";
- mes "\"You showed me you're a sensitive person with helping my child.\"";
+ mes "[Reids Ghost]";
+ mes "\"You showed me you're a sensitive person with helping my child.\"";
next;
goto L_Lovestory;
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index a64e80b9..9cd452c6 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -22,7 +22,26 @@
}
027-2.gat,118,23,0 script Werewolf 305,{
- end;
+ mes "debug for the lovetriangle quest";
+ menu
+ "reset reid", -,
+ "leave", L_Close;
+
+ set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
+ set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;
+
+ set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
+ set @state, 0;
+ callsub S_Update_Mask;
+
+L_Close:
+ close;
+
+S_Update_Mask:
+ set QUEST_Graveyard_Inn,
+ (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))
+ | (@state << @Graveyard_Inn_SHIFT);
+ return;
}
027-2.gat,75,29,0 script Archibald 306,{
@@ -72,14 +91,6 @@ L_3:
end;
}
-027-2.gat,50,92,0 script Crying Child 314,{
- end;
-}
-
-027-2.gat,104,39,0 script Innkeeper's Ghost 315,{
- end;
-}
-
027-2.gat,100,43,0 script Evil Guard 316,{
end;
}