summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-12-31 18:38:03 -0200
committerJesusaves <cpntb1@ymail.com>2018-12-31 18:38:03 -0200
commitb8c2958a658c172ccb93bf90988f747735324e35 (patch)
tree55c5a68f7f0c83c4f05c5bc979c7035627691727 /npc
parentcc6e06d3e75205ad56f6894694a4de06c49d15e4 (diff)
downloadserverdata-b8c2958a658c172ccb93bf90988f747735324e35.tar.gz
serverdata-b8c2958a658c172ccb93bf90988f747735324e35.tar.bz2
serverdata-b8c2958a658c172ccb93bf90988f747735324e35.tar.xz
serverdata-b8c2958a658c172ccb93bf90988f747735324e35.zip
Rebuild map cache. Minor improvement.
Diffstat (limited to 'npc')
-rw-r--r--npc/002-1/peter.txt5
-rw-r--r--npc/017-2-2/_import.txt4
-rw-r--r--npc/017-2-2/_mobs.txt3
-rw-r--r--npc/017-2-2/_warps.txt3
-rw-r--r--npc/_import.txt2
5 files changed, 16 insertions, 1 deletions
diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt
index 22c6cc797..3f3cbe6ad 100644
--- a/npc/002-1/peter.txt
+++ b/npc/002-1/peter.txt
@@ -100,6 +100,8 @@ OnStop:
OnReturnFail:
L_ReturnFail:
instance_destroy(.@q3);
+ setq2 ShipQuests_Peter, 0;
+ setq3 ShipQuests_Peter, -1;
mesn;
mesq l("I see it's not so easy to get rid of the monsters. Do you want to try again?");
next;
@@ -124,14 +126,17 @@ L_BonusTask:
if (!(.@q & 2)) {
mes l("- I currently need your help with @@.", getmonsterlink(Piousse)); // 400 HP, 80 DMG, 1872 dps, 150 ms, ASS
mes l("I'll give you @@ GP for this job.", 350);
+ mes "";
}
if (!(.@q & 4)) {
mes l("- I currently need your help with @@.", getmonsterlink(Ratto)); // 500 HP, 80 DMG, 1572 dps, 120 ms
mes l("I'll give you @@ GP for this job.", 550);
+ mes "";
}
if (!(.@q & 8)) {
mes l("- I currently need your help with @@.", getmonsterlink(Croc)); // 1900 HP, 145 DMG, 1872 dps, 600 ms
mes l("I'll give you @@ GP for this job.", 1000);
+ mes "";
}
if (.@q == 15) {
mes l("- I currently need your help with @@, but there's no reward.", getmonsterlink(Ratto));
diff --git a/npc/017-2-2/_import.txt b/npc/017-2-2/_import.txt
new file mode 100644
index 000000000..1f63289bd
--- /dev/null
+++ b/npc/017-2-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 017-2-2: Skull Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/017-2-2/_mobs.txt",
+"npc/017-2-2/_warps.txt",
diff --git a/npc/017-2-2/_mobs.txt b/npc/017-2-2/_mobs.txt
new file mode 100644
index 000000000..65296d888
--- /dev/null
+++ b/npc/017-2-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-2-2: Skull Cave mobs
+017-2-2,70,57,16,20 monster Shadow Plant 1189,4,60000,10000
diff --git a/npc/017-2-2/_warps.txt b/npc/017-2-2/_warps.txt
new file mode 100644
index 000000000..04f0685aa
--- /dev/null
+++ b/npc/017-2-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-2-2: Skull Cave warps
+017-2-2,71,78,0 warp #017-2-2_71_78 1,0,018-3,0,0
diff --git a/npc/_import.txt b/npc/_import.txt
index e08b5b56b..6597f076c 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -86,6 +86,7 @@
@include "npc/016-7/_import.txt"
@include "npc/017-1/_import.txt"
@include "npc/017-2-1/_import.txt"
+@include "npc/017-2-2/_import.txt"
@include "npc/017-2/_import.txt"
@include "npc/017-3/_import.txt"
@include "npc/017-4/_import.txt"
@@ -98,7 +99,6 @@
@include "npc/018-2-3/_import.txt"
@include "npc/018-2-4/_import.txt"
@include "npc/018-2/_import.txt"
-@include "npc/018-3-1/_import.txt"
@include "npc/018-3/_import.txt"
@include "npc/018-4-1/_import.txt"
@include "npc/018-4-2/_import.txt"