summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-1/mariusthebard.txt27
-rw-r--r--npc/018-6-1/main.txt2
2 files changed, 21 insertions, 8 deletions
diff --git a/npc/003-1/mariusthebard.txt b/npc/003-1/mariusthebard.txt
index 8f8dcdf90..db26133da 100644
--- a/npc/003-1/mariusthebard.txt
+++ b/npc/003-1/mariusthebard.txt
@@ -45,14 +45,12 @@ L_Where:
L_Music:
mesc l("But do you want to hear a song about the world, or about grinding?");
- select
- l("Sing me about the world!"),
- l("Sing me about grinding!");
+ menu
+ l("Sing me about the world!"), L_Music_World,
+ l("Sing me about grinding!"), L_Music_Grind,
+ l("Sing me about slaying Pinkies!"), L_Music_Pinkie;
+ // ???
mes "";
- if (@menu == 1)
- goto L_Music_World;
- else if (@menu == 2)
- goto L_Music_Grind;
goto L_Music;
// NOTE: Rewriting this song is always OK.
@@ -118,6 +116,21 @@ L_Music_Grind:
next;
goto L_Main;
+L_Music_Pinkie:
+ mes l("Pinkie, pinkie,pinkie, oh how i luvs thee;");
+ mes l("So fine and pink, tasty too!");
+ next;
+ mes l("♪ Pinkie,pinkie,pinkie, you're so fine.");
+ mes l("Pinkie,pinkie,pinkie, your blood runs like wine. ♪");
+ next;
+ mes l("There I was knee deep in pinkie pattie,");
+ mes l("Lost without an acorn.");
+ next;
+ mesc l("Authorship: Former_Cordo (Cordo)");
+ mesc l("Date: 2020-03-27, 01:30 UTC");
+ next;
+ goto L_Main;
+
L_Bye:
mes "";
mesn;
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index 9807398ba..9eaa3e34e 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -212,7 +212,7 @@ OnInit:
close;
OnMain:
- slide 82, 70; // Safety
+ slide 84, 71; // Safety
showavatar NPC_INJURIED_GIRL; // this is handled by avatars.xml
.@q=getq(LoFQuest_Barbara);