From d1de48ff1f8e3f9b30cc1fa6e785c4883e6884f1 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 24 Jul 2021 17:50:17 -0300
Subject: Make maps, and use some duct tape on the FIXME's warnings

---
 npc/006-2-1/_import.txt | 2 +-
 npc/006-2/_mobs.txt     | 1 -
 npc/018-7-1/demure.txt  | 9 +++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'npc')

diff --git a/npc/006-2-1/_import.txt b/npc/006-2-1/_import.txt
index 7a60f1202..d5dc0758e 100644
--- a/npc/006-2-1/_import.txt
+++ b/npc/006-2-1/_import.txt
@@ -3,7 +3,7 @@
 "npc/006-2-1/_mobs.txt",
 "npc/006-2-1/_warps.txt",
 "npc/006-2-1/chirp.txt",
-"npc/006-2-1/server.txt",
 "npc/006-2-1/lune.txt",
 "npc/006-2-1/miltaco.txt",
 "npc/006-2-1/plum.txt",
+"npc/006-2-1/server.txt",
diff --git a/npc/006-2/_mobs.txt b/npc/006-2/_mobs.txt
index 56a83d86b..ea4136dd7 100644
--- a/npc/006-2/_mobs.txt
+++ b/npc/006-2/_mobs.txt
@@ -1,7 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-2: The Piou Islands mobs
 006-2,68,72,9,6	monster	Forest Piou	1202,5,30000,30000
-006-2,68,72,6,5 	monster	Shrewboo	1435,4,30000,30000
 006-2,92,100,9,6	monster	Piousse	1003,12,30000,30000
 006-2,68,101,9,6	monster	Mana Piou	1155,8,30000,30000
 006-2,44,100,9,6	monster	Piou	1002,18,30000,30000
diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt
index bcb08251e..869b68c30 100644
--- a/npc/018-7-1/demure.txt
+++ b/npc/018-7-1/demure.txt
@@ -140,7 +140,6 @@ OnDem2:
         Zeny += rand2(500, 1500)*max(1, @d_mode2);
         // FIXME: Add a proper reward
         maptimer2(.@m$, 100, strnpcinfo(NPC_NAME_UNIQUE)+"::OnBye");
-        // FIXME: @d_* might not be set
         01871_Demure_BlackBox();
     }
     end;
@@ -177,9 +176,11 @@ OnDem1:
 
     // And finally, change form (ressurect)
     .@m=monster(.@m$, 87, 57, strmobinfo(1, DemureSecondForm), DemureSecondForm, 1, strnpcinfo(NPC_NAME_UNIQUE)+"::OnDem2");
-    .@p=getunitdata(.@m, UDT_MAXHP);
-    setunitdata(.@m, UDT_MAXHP, .@p*@d_count*@d_mode3);
-    setunitdata(.@m, UDT_HP,    .@p*@d_count*@d_mode3);
+    if (@d_count) {
+        .@p=getunitdata(.@m, UDT_MAXHP);
+        setunitdata(.@m, UDT_MAXHP, .@p*@d_count*@d_mode3);
+        setunitdata(.@m, UDT_HP,    .@p*@d_count*@d_mode3);
+    }
     mapannounce(getmap(), .@n$+"I'll leave a 2x2 black square where you used to be!", bc_map | bc_pc);
     end;
 
-- 
cgit v1.2.3-70-g09d2