summaryrefslogtreecommitdiff
path: root/npc/018-7-1
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-07-24 17:48:23 -0300
committerJesusaves <cpntb1@ymail.com>2021-07-24 17:48:32 -0300
commitcc561befe13af2dab5a3e292c77b587afee44364 (patch)
tree2a0789b5324a22401644d851a408800617806f3a /npc/018-7-1
parent624c39566e3d9a7c5f718e4b2ee4ba5c687ba28c (diff)
downloadserverdata-cc561befe13af2dab5a3e292c77b587afee44364.tar.gz
serverdata-cc561befe13af2dab5a3e292c77b587afee44364.tar.bz2
serverdata-cc561befe13af2dab5a3e292c77b587afee44364.tar.xz
serverdata-cc561befe13af2dab5a3e292c77b587afee44364.zip
Bugfixes. Might still be too hard and has a fair amount of issues
Diffstat (limited to 'npc/018-7-1')
-rw-r--r--npc/018-7-1/demure.txt17
1 files changed, 12 insertions, 5 deletions
diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt
index b6d666dc2..bcb08251e 100644
--- a/npc/018-7-1/demure.txt
+++ b/npc/018-7-1/demure.txt
@@ -20,7 +20,7 @@
menuint
l("Solo"), MODE_SOLO,
rif(getcharid(1), l("Party")), MODE_PARTY;
- .@mode = @menu;
+ .@mode = @menuret;
if (.@mode == MODE_PARTY) {
if (getcharid(1) < 1)
kick(getcharid(3), 3);
@@ -99,9 +99,9 @@
// Warp you and/or your party
if (.@mode == MODE_SOLO)
- warp(.@mapn$, 36, 47);
+ warp(.@mapn$, 85, 70);
else
- warpparty(.@mapn$, 176, 20, getcharid(1), "018-7-1", true);
+ warpparty(.@mapn$, 85, 70, getcharid(1), "018-7-1", true);
// Begin tracking time and metadata (blackbox needs this)
@elapsed = 0;
@@ -139,13 +139,20 @@ OnDem2:
mapannounce(getmap(), "CONGRATULATIONS - YOU WIN", bc_map | bc_pc);
Zeny += rand2(500, 1500)*max(1, @d_mode2);
// FIXME: Add a proper reward
- sleep2(100);
- instance_warpall("018-7-2", 23, 22);
+ maptimer2(.@m$, 100, strnpcinfo(NPC_NAME_UNIQUE)+"::OnBye");
+ // FIXME: @d_* might not be set
01871_Demure_BlackBox();
}
end;
+OnBye:
+ Zeny += rand2(100, 300)*max(1, @d_mode2);
+ warp "018-7-2", 23, 22;
+ deltimer strnpcinfo(NPC_NAME_UNIQUE)+"::OnBeet";
+ end;
+
// Summon second form (give 5 seconds to players to move)
+// FIXME: @d_* might not be set
OnDem1:
if (!playerattached()) {
debugmes "ERROR - PLAYER NOT ATTACHED, INVALID KILL, CANNOT RESOLVE MAP.";