summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-10-19 17:53:10 -0300
committerJesusaves <cpntb1@ymail.com>2021-10-19 17:53:10 -0300
commit59d152046bc6444d182b4950baaa80e9b8e797e1 (patch)
tree16d56273034b97af71992a4c621e697ac962d326
parentcc4993552570ed1a06d3a9c3b8b5ed8222ff7d81 (diff)
downloadserverdata-59d152046bc6444d182b4950baaa80e9b8e797e1.tar.gz
serverdata-59d152046bc6444d182b4950baaa80e9b8e797e1.tar.bz2
serverdata-59d152046bc6444d182b4950baaa80e9b8e797e1.tar.xz
serverdata-59d152046bc6444d182b4950baaa80e9b8e797e1.zip
Actually, this askyesno() will cause bugs, so fix them before testing
-rw-r--r--npc/031-7/tametomo.txt17
1 files changed, 12 insertions, 5 deletions
diff --git a/npc/031-7/tametomo.txt b/npc/031-7/tametomo.txt
index d55b85260..8089dc6cd 100644
--- a/npc/031-7/tametomo.txt
+++ b/npc/031-7/tametomo.txt
@@ -14,7 +14,7 @@
.@lp = (.@q & 2);
// Generate the dialog
- .@m$="";
+ .@m$=" ";
if (!.@bt)
.@m$+="unless you have a "+getitemlink(Butterfly)+","
if (!.@q)
@@ -23,7 +23,7 @@
.@m$+="unless you have a "+getitemlink(LavaManaPearl)+","
mesn;
- mesq l("Go away, %s can't you see I'm busy?", .@m$);
+ mesq l("Go away,%s can't you see I'm busy?", .@m$);
// Generate the menu
if (!.@bt && countitem(Butterfly))
@@ -33,11 +33,14 @@
if (!.@showbt && !.@showlp)
close;
+ // Display the menu if pertinent
+ next;
select
l("Sure, sure, I'm going..."),
rif(.@showbt, l("I have a butterfly.")),
rif(.@showlp, l("I have a lava mana pearl."));
mes "";
+ .@opt = @menu;
switch (@menu) {
case 2:
case 3:
@@ -46,19 +49,23 @@
next;
inventoryplace EquipmentBlueprintE, 1;
mesc l("Accept offer?");
- if (askyesno() == ASK_NO) close;
- if (@menu == 2 && !.@bt) {
+
+ if (askyesno() == ASK_NO) break;
+
+ if (.@opt == 2 && !.@bt) {
delitem Butterfly, 1;
setq AethyrQuest_Tametomo, .@q | 1;
Mobpt+=35000;
getitem EquipmentBlueprintE, 1;
}
- if (@menu == 3 && !.@lp) {
+
+ if (.@opt == 3 && !.@lp) {
delitem LavaManaPearl, 1;
setq AethyrQuest_Tametomo, .@q | 2;
Mobpt+=35000;
getitem EquipmentBlueprintE, 1;
}
+
mesn;
mesq l("Hmpf. A pleasure doing business with you.");
}