summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/mob_db.conf6
-rw-r--r--npc/018-7-1/demure.txt17
2 files changed, 16 insertions, 7 deletions
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 95d66111b..d5a18743a 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -11465,7 +11465,7 @@ mob_db: (
Exp: 3500
JExp: 100
AttackRange: 1
- Attack: [413, 413]
+ Attack: [180, 220]
Def: 36
Mdef: 26
WalkMask: "WALK_AIR"
@@ -11490,6 +11490,7 @@ mob_db: (
CastSensorChase: true
Detector: true
NoKnockback: true
+ Aggressive: true
}
MoveSpeed: 123
AttackDelay: 124
@@ -11541,6 +11542,7 @@ mob_db: (
CastSensorChase: true
Detector: true
NoKnockback: true
+ Aggressive: true
}
MoveSpeed: 420
AttackDelay: 1600
@@ -11558,7 +11560,7 @@ mob_db: (
}
// Good defense against all type of weapons
WeaponAttacks: {
- All: 7500
+ All: 2500
}
// Most powerful attack skills are almost entirely nullified
EleResist: {
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.";