summaryrefslogtreecommitdiff
path: root/world/map/npc/027-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/027-2')
-rw-r--r--world/map/npc/027-2/crying_child.txt9
-rw-r--r--world/map/npc/027-2/headless_man.txt8
-rw-r--r--world/map/npc/027-2/husband.txt20
-rw-r--r--world/map/npc/027-2/innkeeper.txt19
4 files changed, 13 insertions, 43 deletions
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index 4a1254ec..0a7b2396 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -21,8 +21,6 @@
set @minLevel, 85;
- if (Sex == 0) set @madamsir$, "Madam";
- if (Sex == 1) set @madamsir$, "Sir";
if (@state == 7) goto L_return5;
if (@state == 6) goto L_return4;
if (@state == 4 || @state == 5) goto L_return3;
@@ -50,13 +48,13 @@ L_intro:
L_WhatHappen:
mes "[Crying Child]";
- mes "\"Oh, what? Who are you "+@madamsir$+", what are you doing here?\"";
+ mes "\"Oh, what? Who are you, what are you doing here?\"";
next;
menu
"My name is "+strcharinfo(0)+". I heard you cry and decided to check if you needed any help.",L_MyNameIs;
L_MyNameIs:
- mes "The child looks at you from head to toe and says: \"" +@madamsir$+ ", aren't you scared of me?\"";
+ mes "The child looks at you from head to toe and says: aren't you scared of me?\"";
next;
menu
"No... Why would I be scared of you?",L_NotScaredOf;
@@ -101,7 +99,7 @@ L_DontWorryFind:
L_return:
mes "[Aldred]";
- mes "\"Please, help me " +@madamsir$+ ". If you find that ring, I think things will be a little better between me and my parents.\"";
+ mes "\"Please, help me. If you find that ring, I think things will be a little better between me and my parents.\"";
goto L_Close;
@@ -207,7 +205,6 @@ L_full:
goto L_Close;
L_Close:
- set @madamsir$, "";
set @Graveyard_Inn_MASK, 0;
set @Graveyard_Inn_SHIFT, 0;
set @state, 0;
diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt
index 7345b535..fafa17ef 100644
--- a/world/map/npc/027-2/headless_man.txt
+++ b/world/map/npc/027-2/headless_man.txt
@@ -7,9 +7,6 @@
027-2,22,76,0|script|Thurstan|318
{
- if (Sex == 0) set @madamsir$, "Madam";
- if (Sex == 1) set @madamsir$, "Sir";
-
set @Graveyard_Inn_MASK, NIBBLE_6_MASK;
set @Graveyard_Inn_SHIFT, NIBBLE_6_SHIFT;
@@ -39,14 +36,14 @@
if (BaseLevel < 85)
goto L_greet;
mes "[Headless Man]";
- mes "\"Hello " + @madamsir$ + ". My name is Thurstan. Could I ask your assistance with something? I seem to be in a spot of difficulty.\"";
+ mes "\"Hello. My name is Thurstan. Could I ask your assistance with something? I seem to be in a spot of difficulty.\"";
menu
"I'll listen, just keep that thing from dripping on me.", L_Quest_ask,
"Ack, a bloody talking head! Gross, no way!", L_Close;
L_greet:
mes "[Headless Man]";
- mes "\"Greetings " + @madamsir$ + "! Do you have any duck tape?\"";
+ mes "\"Greetings! Do you have any duck tape?\"";
goto L_Close;
L_Quest_ask:
@@ -189,7 +186,6 @@ L_Final:
L_Close:
- set @madamsir$, "";
set @Graveyard_Inn_MASK, 0;
set @Graveyard_Inn_SHIFT, 0;
set @state, 0;
diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt
index e62b5097..8897e697 100644
--- a/world/map/npc/027-2/husband.txt
+++ b/world/map/npc/027-2/husband.txt
@@ -194,12 +194,8 @@ L_Savaric:
mes "\"That cheeky egomaniac - \"";
next;
- if ((Sex == 0)
- && (@kidstate < 7))
- goto L_Woman;
- if ((Sex == 1)
- && (@kidstate < 7))
- goto L_Man;
+ if (@kidstate < 7)
+ goto L_Problem;
mes "\"Well, I have been thinking about you. You seem to be a very helpful and wise person. Even my son told me good things about you, making a long speech about how great you are and your ability to comprehend and deal with delicate matters. I wonder how he reached that conclusion... But anyway, I'll tell you about Savaric.\"";
next;
goto L_Jealousy;
@@ -223,17 +219,9 @@ L_Jealousy:
callsub S_Update_Mask;
goto L_Close;
-L_Man:
+L_Problem:
mes "[Hamond]";
- mes "\"You're a man - I think you would understand what is happening to me.\"";
- mes "\"But, to be honest, I think I'd only be able to talk about such a complicated matter if I am sure I am sharing my feelings with a good, wise and understanding person. No offense, it is just that I barely know you...\"";
- goto L_Close;
-
-L_Woman:
- mes "[Hamond]";
- mes "\"Hrm - I don't think you'll understand. It is a problem between men.\"";
- next;
- mes "\"And, to be honest, I'd only be able to talk about such a complicated matter if I am sure I am sharing my feelings with a good, wise and understanding person. No offense, it is just that I barely know you...\"";
+ mes "\"To be honest, I think I'd only be able to talk about such a complicated matter if I am sure I am sharing my feelings with a good, wise and understanding person. No offense, it is just that I barely know you...\"";
goto L_Close;
L_Ring:
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index adc4a75d..ac4e867a 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -235,12 +235,8 @@ L_Check_Kid:
menu
"Hi. I found this in the main hall. Do you know to whom it belongs?", L_Ring;
- if ((Sex == 1)
- && (@kidstate < 7))
- goto L_Man;
- if ((Sex == 0)
- && (@kidstate < 7))
- goto L_Woman;
+ if (@kidstate < 7)
+ goto L_Problem;
mes "\"What I'm going to tell you is very personal, but your acts have shown me that you're a person I can trust. You kindly asked me about that ring you have found... and also, even my son, who is always so reserved with strangers, came to me and spent a long time telling me a lot of nice things about you. So I will tell you about my sad love.\"";
next;
@@ -405,16 +401,9 @@ L_Not_Enough_Tears:
mes "\"This is beautiful! But " + @tears + " of them aren't enough to represent my sadness.\"";
goto L_Close;
-L_Man:
+L_Problem:
mes "[Reid's Ghost]";
- mes "\"What I have to tell is very personal. You're a man - I'm not sure if I want to tell you. I know you helped me already and showed me you are a sensitive man, but I barely know you. I am sorry, but I have to think a little bit more. Maybe later, when I know you better, I can tell you more about it. \"";
- goto L_Close;
-
-L_Woman:
- mes "[Reid's Ghost]";
- mes "\"What I have to tell you is something very personal. You are a woman like me - I'm sure you would understand.\"";
- next;
- mes "\"But I'm not sure if I want to tell you. I know you helped me already and showed me you are a sensitive woman, but I barely know you. I am sorry, but I have to think a little bit more. Maybe later, when I know you better, I can tell you more about it. \"";
+ mes "\"What I have to tell is very personal. I'm not sure if I want to tell you. I know you helped me already and showed me you are a sensitive, but I barely know you. I am sorry, but I have to think a little bit more. Maybe later, when I know you better, I can tell you more about it. \"";
goto L_Close;
L_Ring:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 08:43:29 +0000