summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/007-1/treasure.txt2
-rw-r--r--npc/012-4/wyara.txt1
-rw-r--r--npc/014-5-1/objects.txt13
-rw-r--r--npc/014-5/sagratha.txt2
-rw-r--r--npc/015-8/_import.txt3
-rw-r--r--npc/015-8/_mobs.txt8
-rw-r--r--npc/_import.txt1
7 files changed, 28 insertions, 2 deletions
diff --git a/npc/007-1/treasure.txt b/npc/007-1/treasure.txt
index fdc985da3..9a3bc273f 100644
--- a/npc/007-1/treasure.txt
+++ b/npc/007-1/treasure.txt
@@ -8,7 +8,7 @@
.@regen_time=200;
fishing(2, CommonCarp, RustyKnife,
- ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing (AlchemyBlueprintA)
+ ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing (AlchemyBlueprintA, EquipmentBlueprintA) TODO
close;
OnInit:
diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt
index 0c371ee91..478b236dc 100644
--- a/npc/012-4/wyara.txt
+++ b/npc/012-4/wyara.txt
@@ -241,6 +241,7 @@ L_SaggyMain:
next;
mesn;
mesq l("Good, this must mean that Sagratha managed to flee in time.");
+ // mesc l("She must have hidden to the secret cave nearby....");
// TODO
//setq1 HurnscaldQuest_Sagratha, 3;
//setq3 HurnscaldQuest_Sagratha, 0;
diff --git a/npc/014-5-1/objects.txt b/npc/014-5-1/objects.txt
index 55d7d395f..ed3520924 100644
--- a/npc/014-5-1/objects.txt
+++ b/npc/014-5-1/objects.txt
@@ -24,8 +24,19 @@ OnInit:
next;
mesn;
mesc l("Thinking well... There's something behind it! A secret window!");
- if (getq(HurnscaldQuest_Sagratha) <= 2)
+ if (getq(HurnscaldQuest_Sagratha) <= 2) {
setq3 HurnscaldQuest_Sagratha, 1;
+ } else {
+ next;
+ mesn l("Secret Window");
+ mesc l("Enter though the window to the secret caves?");
+ next;
+ if (askyesno() == ASK_YES) {
+ warp "015-8", 99, 178;
+ closeclientdialog;
+ end;
+ }
+ }
next;
mesn l("Secret Window");
mesc l("The window appears to be unlocked. It might have been open some time ago.");
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index defaa2959..d28f19a1f 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -131,6 +131,8 @@ L_Open:
} else {
.@inst = instance_create("Sagratha House "+getcharid(0), getcharid(3), IOT_CHAR);
instance_attachmap("014-5-1", .@inst, false, .@mapn$);
+ //instance_attachmap("015-8", .@inst, false, .@mapn$);
+ //instance_attachmap("015-8-1", .@inst, false, .@mapn$);
// 20 minutes (1200s) inside, or 5 minutes (300s) outside
instance_set_timeout(1200, 30, .@inst);
instance_init(.@inst);
diff --git a/npc/015-8/_import.txt b/npc/015-8/_import.txt
new file mode 100644
index 000000000..f2d5e9e92
--- /dev/null
+++ b/npc/015-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 015-8: Ancient Hideout
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-8/_mobs.txt",
diff --git a/npc/015-8/_mobs.txt b/npc/015-8/_mobs.txt
new file mode 100644
index 000000000..a7e57ad05
--- /dev/null
+++ b/npc/015-8/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-8: Ancient Hideout mobs
+015-8,99,99,69,81 monster Mouboo 1023,32,20000,20000
+015-8,114,95,51,69 monster Robin Bandit 1153,16,20000,20000
+015-8,89,140,62,30 monster Angry Yellow Slime 1198,12,20000,20000
+015-8,97,57,62,46 monster Old Snake 1199,12,20000,20000
+015-8,67,94,34,79 monster Red Slime 1092,16,20000,20000
+015-8,100,56,48,36 monster Vampire Bat 1063,14,30000,22000
diff --git a/npc/_import.txt b/npc/_import.txt
index 959b7a3a3..938dd2f5d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -91,6 +91,7 @@
@include "npc/015-5/_import.txt"
@include "npc/015-6/_import.txt"
@include "npc/015-7/_import.txt"
+@include "npc/015-8/_import.txt"
@include "npc/016-1/_import.txt"
@include "npc/016-6/_import.txt"
@include "npc/016-7/_import.txt"