Merge branch 'master' into jesusalva/innsjesusalva/inns

1 files changed, 10 insertions, 3 deletions

diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt
index f93d2042..2a3fd4cc 100644
--- a/npc/001-2-41/edouard.txt
+++ b/npc/001-2-41/edouard.txt
@@ -131,6 +131,7 @@ OnChair:
             l("What is my current hairstyle and hair color?"),
             l("I'd like to get a different style."),
             l("Can you do something with my color?"),
+            l("How about changing my gender?"),
             l("What's your story again?"),
             l("I'm fine for now, thank you.");
 
@@ -142,19 +143,25 @@ OnChair:
             case 2:
                 BarberChangeStyle;
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("Enjoy your new style.");
+                    l("Enjoy your new style."),
                     l("Anything else?");
                 break;
             case 3:
                 BarberChangeColor;
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("I hope you like this color.");
+                    l("I hope you like this color."),
                     l("Anything else?");
                 break;
             case 4:
-                tellStory;
+                BarberChangeGender();
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("You look fantastic."),
+                    l("Anything else?");
                 break;
             case 5:
+                tellStory;
+                break;
+            case 6:
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Feel free to come visit me another time.");