Purged gender from quest dialogue

Changed Eurni to new genders

18 files changed, 66 insertions, 109 deletions

diff --git a/world/map/npc/002-1/bard.txt b/world/map/npc/002-1/bard.txt
index 22c3b113..c8e67582 100644
--- a/world/map/npc/002-1/bard.txt
+++ b/world/map/npc/002-1/bard.txt
@@ -7,10 +7,7 @@
         "\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
     set @name$, "Bill Ballshaker the Bard";
     mes "[" + @name$ + "]";
-    if (Sex)
-        mes "\"Greetings, traveler!  Have you come to listen to my stories?\"";
-    if (!Sex)
-        mes "\"Greetings, fair lady!  Well met, on such a lovely day!  Might I entertain you with a tale or two?\"";
+    mes "\"Greetings, traveler!  Have you come to listen to my stories?\"";
     next;
     goto L_Main;
 
diff --git a/world/map/npc/002-2/eurni.txt b/world/map/npc/002-2/eurni.txt
index f965b84b..c9735ad0 100644
--- a/world/map/npc/002-2/eurni.txt
+++ b/world/map/npc/002-2/eurni.txt
@@ -18,14 +18,39 @@
     next;
 
     menu
-        "Please do.", L_Change,
+        "Please do.", L_Change_Menu,
         "Leave my family treasures alone!", L_Close;
 
+L_Change_Menu:
+    menu
+        "Female.", L_Female,
+        "Male.", L_Male,
+        "Non-binary.", L_NonBinary;
+
+L_Female:
+    set @sex, 0;
+    goto L_Change;
+
+L_Male:
+    set @sex, 1;
+    goto L_Change;
+
+L_NonBinary:
+    set @sex, 3;
+    goto L_Change;
+
 L_Change:
+    if (Sex == @sex)
+        goto L_Already_Change;
     if (Zeny < @SERVICES_ZENY)
         goto L_NoMoney;
     set Zeny, Zeny - @SERVICES_ZENY;
-    set Sex, !Sex;
+    set Sex, @sex;
+    close;
+
+L_Already_Change:
+    mes "[Eurni the Surgeon]";
+    mes "\"Umm, you are that gender already.\"";
     close;
 
 L_TooYoung:
diff --git a/world/map/npc/006-1/spirit.txt b/world/map/npc/006-1/spirit.txt
index ecf3a4b1..8c7155fa 100644
--- a/world/map/npc/006-1/spirit.txt
+++ b/world/map/npc/006-1/spirit.txt
@@ -21,9 +21,6 @@ L_message:
     set @Q_STATUS_STUDENT2, 4;
     set @Q_STATUS_STUDENT3, 5;
 
-    set @s$, "girl";
-    if (Sex) set @s$, "boy";
-
     if (MAGIC_FLAGS & MFLAG_KNOWS_IMP) goto L_wb;
 
     mes "[Well]";
@@ -261,7 +258,7 @@ L_silly_close:
         mes "[Earth Spirit]";
     if (!(MAGIC_FLAGS & MFLAG_KNOWS_IMP))
         mes "[Well]";
-    mes "\"Silly " + @s$ + ".\"";
+    mes "\"Fool.\"";
     goto L_Close;
 
 L_Close:
@@ -278,7 +275,6 @@ L_Close:
     set @Q_STATUS_STUDENT1, 0;
     set @Q_STATUS_STUDENT2, 0;
     set @Q_STATUS_STUDENT3, 0;
-    set @s$, "";
     return;
 
 S_update_var:
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 05c9f8c5..7a4f6573 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -149,13 +149,8 @@ L_Shield_state_0:
     set @Q_Woodenshield, 1;
     callsub S_Update_Mask;
 
-    if (Sex == 0)
-        set @child_of_jack$, "daughter";
-    if (Sex == 1)
-        set @child_of_jack$, "son";
-
     mes "[Jack Lumber]";
-    mes "\"You no doubt remember how I struggled with those beasts, fighting for my life. Scared me, those seven-branched little stumps did!  Never since that day have I strayed near them, and yet there you are, cutting them down one by one. I'm proud of you – to dare to fight those trunks is admirable indeed. You're as strong as if you were my own " + @child_of_jack$ + "!\"";
+    mes "\"You no doubt remember how I struggled with those beasts, fighting for my life. Scared me, those seven-branched little stumps did!  Never since that day have I strayed near them, and yet there you are, cutting them down one by one. I'm proud of you – to dare to fight those trunks is admirable indeed. You're as strong as if you were my own child!\"";
     next;
     goto L_Shield_state_1;
 
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index 17f6bc61..153373f7 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -31,10 +31,7 @@
     if (@Q_status == @STATUS_PURIFY_TWICE) goto L_M_purify_done;
 
     mes "[Wyara the witch]";
-    if (!Sex)
-        mes "\"Greetings, fair traveller! What can I do for you?\"";
-    if (Sex)
-        mes "\"Hello! What brings you here?\"";
+    mes "\"Greetings, fair traveller! What can I do for you?\"";
     next;
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_WYARA;
     goto L_Main;
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 83c1ba78..9598ecaa 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -2,20 +2,13 @@
 
 009-4,99,33,0|script|#WizardTrap|32767,2,1
 {
-    set @gender$, "They're";
-    if (Sex == 0)
-        set @gender$, "She's";
-    if (Sex == 1)
-        set @gender$, "He's";
-
     mes "As you explore further into the cave you see a figure looking at you who appears angry. But as you begin to speak, he quickly chants some words and you start to lose conciousness!";
     next;
     warp "009-4", 117, 40;
     mes "When you awake you find yourself unable to move. You seem to be held in place by something. As your eyes regain focus you see Orum talking with the figure you saw earlier. Orum looks over at you and mumbles.";
     mes "";
     mes "[Orum]";
-    mes "\"Be quiet Waric... " + @gender$ + " awake...\"";
-    set @gender$, "";
+    mes "\"Be quiet Waric... They're awake...\"";
     close;
 }
 
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 23e3f84a..8547fd95 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -31,10 +31,6 @@
 
     set @has_magic, getskilllv(SKILL_MAGIC);
 
-    set @address$, "chap";
-    if (Sex == 0)
-        set @address$, "girl";
-
     if (@Q_main_status >= @Q_STATUS_POSTINTRO)
         goto L_short_intro;
 
@@ -70,8 +66,6 @@ L_intro_nopowder:
 L_intro_identity:
     mes "[Robed Man]";
     mes "He eyes you more carefully.";
-    if (Sex == 0)
-        mes "\"How odd. I could have sworn that you were a man the last time we met. Not that I mind...\"";
     mes "\"Wait. You're not Padric.\"";
     next;
     set @xmsg$, "Right... my name is " + strcharinfo(0) + ".";
@@ -783,11 +777,11 @@ L_c_quest_1:
     mes "\"Good, good... I am trying to come up with a way to best use the Mauve leaves you brought me, but it seems that I will need further components. I am not sure about the exact composition yet, but I will need a few potions.\"";
     next;
     mes "[Auldsbel the Wizard]";
-    mes "\"Please be a good " + @address$ + " and get me an iron potion, a concentration potion, and three small and three medium healing potions.\"";
+    mes "\"Please be a good helper and get me an iron potion, a concentration potion, and three small and three medium healing potions.\"";
     next;
     menu
         "Here you are.", L_Next4,
-        "I'm not your 'good " + @address$ + "'!", L_main_menu,
+        "I'm not your 'good helper'!", L_main_menu,
         "I'll see what I can do.", L_main_menu;
 
 L_Next4:
@@ -859,7 +853,7 @@ L_Next6:
     delitem "MaggotSlime", 25;
     set Zeny, Zeny + 5000;
     mes "[Auldsbel the Wizard]";
-    mes "\"Good " + @address$ + "!  Another 5,000 GP for you.\"";
+    mes "\"Good helper!  Another 5,000 GP for you.\"";
     mes "\"I believe that I have figured out one possible way to integrate the tincture into the spell... I will let you know how that goes.\"";
     mes "[You gain 10,000 experience points]";
     getexp 10000, 0;
diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt
index 456b184b..558e9b70 100644
--- a/world/map/npc/013-1/sagatha.txt
+++ b/world/map/npc/013-1/sagatha.txt
@@ -106,10 +106,7 @@ L_next:
 
     mes "Before you stands a beautiful woman, dressed in dark purple robes and wearing a witch's hat.";
 
-    if (Sex)
-        mes "She looks at you suspiciously.";
-    if (!Sex)
-        mes "She looks at you impassively.";
+    mes "She looks at you suspiciously.";
     next;
     menu
         "Who are you?", L_Next,
diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index 7f32bf60..239de752 100644
--- a/world/map/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
@@ -190,10 +190,7 @@ L_Next1:
     mes "\"Lords of Thunder, Fire, Rage!\"";
     mes "\"Grant thy powers to this mage,\"";
     mes "\"Rising with thy dreadful roar,\"";
-    if (Sex)
-        mes "\"Answer to his call to War!\"";
-    if (!Sex)
-        mes "\"Answer to her call to War!\"";
+    mes "\"Answer to their call to War!\"";
     next;
     mes "[Mystic Sword]";
     mes "Your heart starts pounding, and suddenly you can hear the sound of drums in your head.";
diff --git a/world/map/npc/018-2/angus.txt b/world/map/npc/018-2/angus.txt
index e49d91ae..3c53862d 100644
--- a/world/map/npc/018-2/angus.txt
+++ b/world/map/npc/018-2/angus.txt
@@ -2,9 +2,6 @@
 
 018-2,31,39,0|script|Angus|147
 {
-    set @honorific$, "lad";
-    if (Sex == 0) set @honorific$, "lass";
-
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     if (@inspector == 10) goto L_NohMask;
@@ -16,7 +13,7 @@
 
 L_NohMask:
     mes "[Angus]";
-    mes "\"I'm sorry, " + @honorific$ + ", I truely am, but I stay in the town. One o' the miners might have heard something.\"";
+    mes "\"I'm sorry, I truely am, but I stay in the town. One o' the miners might have heard something.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt
index 893ddce4..98b749df 100644
--- a/world/map/npc/019-1/snowman.txt
+++ b/world/map/npc/019-1/snowman.txt
@@ -11,16 +11,12 @@
     goto L_Close;
 
 L_Quest:
-    if (Sex == 0)
-        set @sex$, "lady";
-    if (Sex == 1)
-        set @sex$, "man";
     set @candy_amount, 15;
     set @chocolate_amount, 10;
     set @cactus_amount, 5;
 
     mes "[Snowman]";
-    mes "\"Hello there young " + @sex$ + ".";
+    mes "\"Hello there.";
     mes "Would you like a Christmas hat?\"";
     next;
     goto L_Menu;
@@ -84,7 +80,6 @@ L_TooMany:
     goto L_Close;
 
 L_Close:
-    set @sex$, "";
     set @candy_amount, 0;
     set @chocolate_amount, 0;
     set @cactus_amount, 0;
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index b769e1e9..9d1f658b 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -69,14 +69,10 @@ L_Delivery:
     goto L_Close;
 
 L_Start:
-    if(Sex)
-        set @type$, "man";
-    if(!Sex)
-        set @type$, "woman";
 
     if(QL_BAKTAR & (1<<@BIT_KNOWHIM)) goto L_KnowAlready;
         mes @npcname$;
-        mes "\"Hello, " +  @type$ + ", did you come from Tulimshar? Because you have a nice tan. \"";
+        mes "\"Hello, did you come from Tulimshar? Because you have a nice tan. \"";
     menu
         "Yes, I'm from Tulimshar", L_exotic,
         "Well, I just like sunbathing", L_Close,
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:
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 377a6b06..33c3a16f 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -11,9 +11,6 @@
     set @KEYS_AMOUNT, 10;
     set @minlevel, 70;
 
-    if (Sex == 0) set @title$, "Misses";
-    if (Sex == 1) set @title$, "Mister";
-
     if (QL_CINDY == 4) goto L_Please_Visit;
     if (QL_CINDY == 2) goto L_Reward;
     if (QL_CINDY == 1) goto L_Please_Help;
@@ -33,7 +30,7 @@ L_Next:
     mes "Cindy doesn't look so scared anymore.";
     next;
     mes "[Cindy]";
-    mes "\"Hello, dear " + @title$ + " adventurer. Did my mother send you?\"";
+    mes "\"Hello, adventurer. Did my mother send you?\"";
     next;
     mes "\"It's so cold in here! Can you please open the cage?\"";
     next;
@@ -119,7 +116,6 @@ L_Full_Inv:
 
 L_Close:
     set @KEYS_AMOUNT, 0;
-    set @title$, "";
     set @minlevel, 0;
     set @inventorylist_count, 0;
     cleararray @wizardhats, 0, 10;
diff --git a/world/map/npc/commands/_atcommand_local.txt b/world/map/npc/commands/_atcommand_local.txt
new file mode 100644
index 00000000..a195d580
--- /dev/null
+++ b/world/map/npc/commands/_atcommand_local.txt
@@ -0,0 +1,12 @@
+-|script|GM|32767
+{
+    end;
+
+OnInit:
+    // define permissions here
+    set .zeny, G_ADMIN;
+
+    // permissions for events
+    set .killthegm, G_EVENT;
+    end;
+}