summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/magic.conf.template5
-rw-r--r--npc/001-1_Tulimshar/bard.txt4
-rw-r--r--npc/001-1_Tulimshar/elanore.txt2
-rw-r--r--npc/009-2_Hurnscald/wyara.txt10
-rw-r--r--npc/011-1_Woodland/auldsbel.txt3
-rw-r--r--npc/013-1_Woodland_hills/sagatha.txt5
-rw-r--r--npc/functions/magic.txt9
7 files changed, 24 insertions, 14 deletions
diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index 5b86e021..646b412e 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -908,6 +908,11 @@ SPELL debug-reset : "debug-reset" =
set_script_variable(caster, "MAGIC_FLAGS", 0);
set_script_variable(caster, "MAGIC_EXP", 0);
+SPELL debug-gotonpc (name : STRING) : "warpnpc" =
+ REQUIRE DEBUG
+ => EFFECT warp(caster, location(npc(name)));
+
+
#--------------------------------------------------------------------------------
# Special-purpose quasispells
#--------------------------------------------------------------------------------
diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index 9420d9fb..8b416ec5 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -26,7 +26,7 @@ L_News:
mes "[" + @name$ + "]";
mes "\"Rumor has it that an ancient source of magic, a Mana Seed, has been sighted in the west, beyond the fair town of Hurnscald.\"";
next;
- set MFLAG, MFLAG | MFLAG_MANASEED_RUMOUR;
+ set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_MANASEED_RUMOUR;
mes "[" + @name$ + "]";
mes "\"Whence it came, nobody knows... but they say that sometimes such Mana Seeds may choose a powerful individual to impart some of its mystic power to!\"";
next;
@@ -38,7 +38,7 @@ L_News:
L_Question:
callfunc "MagicTalkOptionsSetup";
set @ignore, 0;
- callfunc "MagictalkMenu";
+ callfunc "MagicTalkMenu";
if (@c == 0) goto L_Main;
if (@c == @QQ_ELANORE) goto L_Q_elanore;
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index 3f18c80c..729a41bf 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -362,7 +362,7 @@ L_NoMagicNoTeach:
L_Question:
callfunc "MagicTalkOptionsSetup";
set @ignore, @QQ_ELANORE;
- callfunc "MagictalkMenu";
+ callfunc "MagicTalkMenu";
if (@c == 0) goto L_Main;
if (@c == @QQ_MANASEED) goto L_Q_manaseed;
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index d38bf04d..1666643d 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -58,10 +58,10 @@ L_correct:
set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_WYARA;
L_Main:
- menu "No. What do you know about...", L_Question,
+ menu "What do you know about...", L_Question,
"Can you help me learn magic?", L_Magic,
- "Yes, I would like to buy potions.", L_Shop,
- "Bye", -;
+ "I would like to buy potions.", L_Shop,
+ "Bye!", -;
close;
L_Shop:
@@ -73,7 +73,7 @@ L_Shop:
L_Question:
callfunc "MagicTalkOptionsSetup";
set @ignore, @QQ_WYARA;
- callfunc "MagictalkMenu";
+ callfunc "MagicTalkMenu";
if (@c == 0) goto L_Main;
if (@c == @QQ_ELANORE) goto L_Q_elanore;
@@ -103,7 +103,7 @@ L_Q_old_wizard:
L_Q_elanore:
mes "[Wyara the Witch]";
- mes "\"FIXME\"";
+ mes "\"Elanore is the Tulimshar healer. She is a very nice person and was very helpful when I first moved here.\"";
next;
goto L_Main;
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index c71694ca..688fd690 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -516,7 +516,7 @@ L_learn_magic:
L_question:
callfunc "MagicTalkOptionsSetup";
set @ignore, @QQ_AULDSBEL;
- callfunc "MagictalkMenu";
+ callfunc "MagicTalkMenu";
if (@c == 0) goto L_main_menu;
if (@c == @QQ_ELANORE) goto L_Q_elanore;
@@ -569,7 +569,6 @@ L_Q_sagatha:
goto L_main_menu;
L_Q_manaseed_rumour:
- mes "[Auldsbel the Wizard]";
mes "\"A mana seed? Around here? Nah, they've been pulling your leg. Those things are extremely rare, after all.\"";
next;
goto L_main_menu;
diff --git a/npc/013-1_Woodland_hills/sagatha.txt b/npc/013-1_Woodland_hills/sagatha.txt
index 51de9191..ed2a20b6 100644
--- a/npc/013-1_Woodland_hills/sagatha.txt
+++ b/npc/013-1_Woodland_hills/sagatha.txt
@@ -14,6 +14,7 @@ L_zero:
L_write:
set QUEST_MAGIC, (QUEST_MAGIC & ~NIBBLE_3_MASK) | (@unhappiness << NIBBLE_3_SHIFT);
+ return;
}
//----------------------------------------
@@ -30,6 +31,7 @@ L_max:
L_write:
set QUEST_MAGIC, (QUEST_MAGIC & ~NIBBLE_3_MASK) | (@unhappiness << NIBBLE_3_SHIFT);
+ return;
}
function script SagathaStatus {
@@ -53,6 +55,7 @@ function script SagathaStatus {
set @druid, (((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 12) >> 2;
if (@druid == 3)
set @good, @good + 1;
+ return;
}
//----------------------------------------
@@ -290,7 +293,7 @@ L_teach_noexp:
L_Question:
callfunc "MagicTalkOptionsSetup";
set @ignore, @QQ_SAGATHA;
- callfunc "MagictalkMenu";
+ callfunc "MagicTalkMenu";
if (@c == 0) goto L_main;
if (@c == @QQ_ELANORE) goto L_Q_elanore;
diff --git a/npc/functions/magic.txt b/npc/functions/magic.txt
index 470323c2..0094e94a 100644
--- a/npc/functions/magic.txt
+++ b/npc/functions/magic.txt
@@ -20,7 +20,7 @@ function script MagicGainBasic {
// ------------------------------------------------------------
// Initialise Menu for selecting a choice of things to ask about
// ------------------------------------------------------------
-function script MagicTalkOptionsSetup {
+function script MagicTalkOptionsSetup {
set @QQ_ELANORE, 1;
set @QQ_MANASEED, 2;
set @QQ_MANAPOTION, 3;
@@ -29,15 +29,17 @@ function script MagicTalkOptionsSetup {
set @QQ_AULDSBEL, 6;
set @QQ_IMP, 7;
set @QQ_OLDWIZ, 8;
+ return;
}
// ------------------------------------------------------------
// Print and run menu for choice of things to ask about
// Ignores the entry in @ignore
-// Returns the result in `@c, or `0'
+// Returns the result in @c, or returns 0 if there is no result
// ------------------------------------------------------------
-function script MagicTalkMenu {
+
+function script MagicTalkMenu {
setarray @choice$, "", "", "", "", "", "", "", "", "";
set @choices_nr, 0;
setarray @choice_idx, 0, 0, 0, 0, 0, 0, 0, 0, 0;
@@ -132,4 +134,5 @@ L_Q_post_imp:
set @menu, 0;
set @c, @choice_idx[@menu];
+ return @c;
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-28 02:37:21 +0000