Merge branch 'make-makefile' into 'master'

Make makefile

See merge request !45

6 files changed, 470 insertions, 508 deletions

diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 1f21d464..eb522c73 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -1,5 +1,5 @@
 // Map 001-1: Artis
-"npc/001-1/mapflags.txt",
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/001-1/_mobs.txt",
 "npc/001-1/_warps.txt",
 "npc/001-1/artaxe.txt",
@@ -7,32 +7,33 @@
 "npc/001-1/calypsan.txt",
 "npc/001-1/carmie.txt",
 "npc/001-1/chelios.txt",
-//"npc/001-1/cookiemaster.txt",
+"npc/001-1/cookiemaster.txt",
 "npc/001-1/devis.txt",
 "npc/001-1/doors.txt",
 "npc/001-1/elmo.txt",
 "npc/001-1/enora.txt",
 "npc/001-1/eugene.txt",
 "npc/001-1/fexil.txt",
+"npc/001-1/flyingpiou.txt",
 "npc/001-1/harbours.txt",
 "npc/001-1/juscare.txt",
 "npc/001-1/katja.txt",
 "npc/001-1/lucas.txt",
-"npc/001-1/merlin.txt",
 "npc/001-1/manhole.txt",
+"npc/001-1/mapflags.txt",
+"npc/001-1/merlin.txt",
 "npc/001-1/mouboo.txt",
 "npc/001-1/nalkri.txt",
 "npc/001-1/panels.txt",
+"npc/001-1/pious.txt",
 "npc/001-1/qonan.txt",
 "npc/001-1/qpid.txt",
 "npc/001-1/rumly.txt",
+"npc/001-1/salem.txt",
 "npc/001-1/shop.txt",
 "npc/001-1/sign.txt",
 "npc/001-1/taree.txt",
 "npc/001-1/treeleaf.txt",
-"npc/001-1/xilaxa.txt",
 "npc/001-1/trees.txt",
-"npc/001-1/pious.txt",
-"npc/001-1/flyingpiou.txt",
 "npc/001-1/wateranimation.txt",
-"npc/001-1/salem.txt",
+"npc/001-1/xilaxa.txt",
diff --git a/npc/001-1/_mobs.txt b/npc/001-1/_mobs.txt
index 42001525..13ff81f1 100644
--- a/npc/001-1/_mobs.txt
+++ b/npc/001-1/_mobs.txt
@@ -1,5 +1,5 @@
-// Map 001-1: Artis
-// mapID,x,y,sizex,sizey	monster Name	mobID,number,eAdeath,eAspawn,script
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-1: Artis mobs
 001-1,0,0,0,0	monster	Piou	1002,2,15000,60000
 001-1,0,0,0,0	monster	Piousse	1003,1,15000,150000
 001-1,174,34,23,30	monster	Fluffy	1022,6,18000,100000,Mobs#001-1::OnFluffyDeath
@@ -14,7 +14,7 @@
 001-1,34,130,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,41,129,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,36,77,0,0	monster	Manana Tree	1017,1,420000,240000
-001-1,35,74,0,0	monster	Manana Tree	1017,1,420000,240000
+001-1,37,79,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,39,73,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,43,70,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,48,71,0,0	monster	Manana Tree	1017,1,420000,240000
@@ -30,14 +30,3 @@
 001-1,185,65,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,191,63,0,0	monster	Manana Tree	1017,1,420000,240000
 001-1,200,66,0,0	monster	Manana Tree	1017,1,420000,240000
-
-001-1,0,0,0	script	Mobs#001-1	NPC_HIDDEN,{
-    end;
-
-OnFluffyDeath:
-    if (playerattached())
-    {
-        set ArtisFluffyKilled, ArtisFluffyKilled + 1;
-    }
-    end;
-}
diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt
index 84db2ecd..34a715ad 100644
--- a/npc/001-1/_warps.txt
+++ b/npc/001-1/_warps.txt
@@ -1,5 +1,444 @@
-// Map 001-1: Artis
-001-1,194,109,0	warp	ToShip#001-1	0,0,001-2-21,20,28
-001-1,100,37,0	warp	ToMerchantHall#001-1	0,0,001-2-19,32,39
-001-1,104,43,0	warp	ToMerchantBottom#001-1	0,0,001-2-19,41,49
-001-1,134,83,0	warp	ToRedPlushINN#001-1	0,0,001-2-28,60,31
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-1: Artis warps
+001-1,51,80,0	script	#001-1_51_80_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-4", 48, 40;
+close;
+
+OnUnTouch:
+    doevent "#001-1_51_80::OnUnTouch";
+}
+001-1,51,80,0	script	#001-1_51_80	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,70,77,0	script	#001-1_70_77_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-2", 38, 38;
+close;
+
+OnUnTouch:
+    doevent "#001-1_70_77::OnUnTouch";
+}
+001-1,70,77,0	script	#001-1_70_77	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,51,65,0	script	#001-1_51_65_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-0", 30, 34;
+close;
+
+OnUnTouch:
+    doevent "#001-1_51_65::OnUnTouch";
+}
+001-1,51,65,0	script	#001-1_51_65	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,55,71,0	script	#001-1_55_71_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-0", 37, 45;
+close;
+
+OnUnTouch:
+    doevent "#001-1_55_71::OnUnTouch";
+}
+001-1,55,71,0	script	#001-1_55_71	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,168,98,0	script	#001-1_168_98_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-16", 32, 35;
+close;
+
+OnUnTouch:
+    doevent "#001-1_168_98::OnUnTouch";
+}
+001-1,168,98,0	script	#001-1_168_98	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,194,109,0	warp	#001-1_194_109	0,0,001-2-21,20,28
+001-1,100,37,0	warp	#001-1_100_37	0,0,001-2-19,32,39
+001-1,104,43,0	warp	#001-1_104_43	0,0,001-2-19,41,49
+001-1,134,83,0	warp	#001-1_134_83	0,0,001-2-28,60,31
+001-1,118,88,0	script	#001-1_118_88_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-28", 29, 39;
+close;
+
+OnUnTouch:
+    doevent "#001-1_118_88::OnUnTouch";
+}
+001-1,118,88,0	script	#001-1_118_88	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,182,74,0	script	#001-1_182_74_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-18", 39, 35;
+close;
+
+OnUnTouch:
+    doevent "#001-1_182_74::OnUnTouch";
+}
+001-1,182,74,0	script	#001-1_182_74	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,163,70,0	script	#001-1_163_70_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-26", 28, 42;
+close;
+
+OnUnTouch:
+    doevent "#001-1_163_70::OnUnTouch";
+}
+001-1,163,70,0	script	#001-1_163_70	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,132,67,0	script	#001-1_132_67_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-15", 34, 45;
+close;
+
+OnUnTouch:
+    doevent "#001-1_132_67::OnUnTouch";
+}
+001-1,132,67,0	script	#001-1_132_67	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,101,107,0	script	#001-1_101_107_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-27", 35, 34;
+close;
+
+OnUnTouch:
+    doevent "#001-1_101_107::OnUnTouch";
+}
+001-1,101,107,0	script	#001-1_101_107	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,89,65,0	script	#001-1_89_65_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-7", 36, 45;
+close;
+
+OnUnTouch:
+    doevent "#001-1_89_65::OnUnTouch";
+}
+001-1,89,65,0	script	#001-1_89_65	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,57,41,0	warp	#001-1_57_41	0,0,001-2-33,34,45
+001-1,142,30,0	script	#001-1_142_30_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-12", 34, 35;
+close;
+
+OnUnTouch:
+    doevent "#001-1_142_30::OnUnTouch";
+}
+001-1,142,30,0	script	#001-1_142_30	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,128,30,0	script	#001-1_128_30_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-1", 37, 40;
+close;
+
+OnUnTouch:
+    doevent "#001-1_128_30::OnUnTouch";
+}
+001-1,128,30,0	script	#001-1_128_30	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,104,32,0	script	#001-1_104_32_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-19", 41, 30;
+close;
+
+OnUnTouch:
+    doevent "#001-1_104_32::OnUnTouch";
+}
+001-1,104,32,0	script	#001-1_104_32	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,107,49,0	script	#001-1_107_49_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-20", 33, 34;
+close;
+
+OnUnTouch:
+    doevent "#001-1_107_49::OnUnTouch";
+}
+001-1,107,49,0	script	#001-1_107_49	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,148,54,0	script	#001-1_148_54_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-11", 46, 45;
+close;
+
+OnUnTouch:
+    doevent "#001-1_148_54::OnUnTouch";
+}
+001-1,148,54,0	script	#001-1_148_54	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,135,49,0	script	#001-1_135_49_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-10", 51, 44;
+close;
+
+OnUnTouch:
+    doevent "#001-1_135_49::OnUnTouch";
+}
+001-1,135,49,0	script	#001-1_135_49	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,118,49,0	script	#001-1_118_49_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-10", 27, 44;
+close;
+
+OnUnTouch:
+    doevent "#001-1_118_49::OnUnTouch";
+}
+001-1,118,49,0	script	#001-1_118_49	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
+001-1,49,96,0	script	#001-1_49_96_h	NPC_HIDDEN,0,0,{
+OnTouch:
+    warp "001-2-31", 32, 39;
+close;
+
+OnUnTouch:
+    doevent "#001-1_49_96::OnUnTouch";
+}
+001-1,49,96,0	script	#001-1_49_96	NPC_ARTIS_DOOR,2,3,{
+    close;
+OnTouch:
+    doorTouch;
+
+OnUnTouch:
+    doorUnTouch;
+
+OnTimer340:
+    doorTimer;
+
+OnInit:
+    doorInit;
+}
+
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 23ad615d..d88413f0 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -5,483 +5,6 @@
 //    Doors warp and animations in map 001-1
 //
 
-001-1,55,71,0	script	#Warp1	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-0", 37, 45;
-    close;
-
-OnUnTouch:
-    doevent "#Door1::OnUnTouch";
-}
-
-001-1,55,71,0	script	#Door1	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,51,65,0	script	#Warp2	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-0", 30, 34;
-    close;
-
-OnUnTouch:
-    doevent "#Door2::OnUnTouch";
-}
-
-001-1,51,65,0	script	#Door2	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,70,77,0	script	#Warp3	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-2", 38, 38;
-    close;
-
-OnUnTouch:
-    doevent "#Door3::OnUnTouch";
-}
-
-001-1,70,77,0	script	#Door3	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,51,80,0	script	#Warp4	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-4", 48, 40;
-    close;
-
-OnUnTouch:
-    doevent "#Door4::OnUnTouch";
-}
-
-001-1,51,80,0	script	#Door4	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,89,65,0	script	#Warp5	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-7", 36, 45;
-    close;
-
-OnUnTouch:
-    doevent "#Door5::OnUnTouch";
-}
-
-001-1,89,65,0	script	#Door5	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,142,30,0	script	#Warp6	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-12", 34, 35;
-    close;
-
-OnUnTouch:
-    doevent "#Door6::OnUnTouch";
-}
-
-001-1,142,30,0	script	#Door6	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,132,67,0	script	#Warp7	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-15", 34, 45;
-    close;
-
-OnUnTouch:
-    doevent "#Door7::OnUnTouch";
-}
-
-001-1,132,67,0	script	#Door7	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,128,30,0	script	#Warp8	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-1", 37, 40;
-    close;
-
-OnUnTouch:
-    doevent "#Door8::OnUnTouch";
-}
-
-001-1,128,30,0	script	#Door8	NPC_ARTIS_DOOR,3,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,168,98,0	script	#Warp9	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-16", 32, 35;
-    close;
-
-OnUnTouch:
-    doevent "#Door9::OnUnTouch";
-}
-
-001-1,168,98,0	script	#Door9	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,118,49,0	script	#Warp10	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-10", 27, 44;
-    close;
-
-OnUnTouch:
-    doevent "#Door10::OnUnTouch";
-}
-
-001-1,118,49,0	script	#Door10	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,135,49,0	script	#Warp11	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-10", 51, 44;
-    close;
-
-OnUnTouch:
-    doevent "#Door11::OnUnTouch";
-}
-
-001-1,135,49,0	script	#Door11	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    .sex = G_MALE;
-    .distance = 5;
-    end;
-}
-
-001-1,148,54,0	script	#Warp12	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-11", 46, 45;
-    close;
-
-OnUnTouch:
-    doevent "#Door12::OnUnTouch";
-}
-
-001-1,148,54,0	script	#Door12	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,163,70,0	script	#Warp13	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-26", 28, 42;
-    close;
-
-OnUnTouch:
-    doevent "#Door13::OnUnTouch";
-}
-
-001-1,163,70,0	script	#Door13	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,101,107,0	script	#Warp14	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-27", 35, 35;
-    close;
-
-OnUnTouch:
-    doevent "#Door14::OnUnTouch";
-}
-
-001-1,101,107,0	script	#Door14	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,107,49,0	script	#Warp15	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-20", 33, 34;
-    close;
-
-OnUnTouch:
-    doevent "#Door15::OnUnTouch";
-}
-
-001-1,107,49,0	script	#Door15	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,104,32,0	script	#Warp16	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-19", 41, 30;
-    close;
-
-OnUnTouch:
-    doevent "#Door16::OnUnTouch";
-}
-
-001-1,104,32,0	script	#Door16	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,182,74,0	script	#Warp17	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-18", 39, 35;
-    close;
-
-OnUnTouch:
-    doevent "#Door17::OnUnTouch";
-}
-
-001-1,182,74,0	script	#Door17	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,118,88,0	script	#Warp18	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-28", 29, 42;
-    close;
-
-OnUnTouch:
-    doevent "#Door18::OnUnTouch";
-}
-
-001-1,118,88,0	script	#Door18	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
-001-1,49,96,0	script	#Warp19	NPC_HIDDEN,0,0,{
-OnTouch:
-    warp "001-2-31", 32, 39;
-    close;
-
-OnUnTouch:
-    doevent "#Door19::OnUnTouch";
-}
-
-001-1,49,96,0	script	#Door19	NPC_ARTIS_DOOR,2,3,{
-    close;
-
-OnTouch:
-    doorTouch;
-
-OnUnTouch:
-    doorUnTouch;
-
-OnTimer340:
-    doorTimer;
-
-OnInit:
-    doorInit;
-}
-
 001-1,57,41,0	script	#Warp20	NPC_HIDDEN,0,0,{
 OnTouch:
     .@enora = getq(ArtisQuests_Enora);
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 231ad613..339372d0 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -439,3 +439,13 @@ OnInit:
     end;
 }
 
+001-1,0,0,0	script	Mobs#001-1	NPC_HIDDEN,{
+    end;
+
+OnFluffyDeath:
+    if (playerattached())
+    {
+        set ArtisFluffyKilled, ArtisFluffyKilled + 1;
+    }
+    end;
+}
diff --git a/npc/001-1/juscare.txt b/npc/001-1/juscare.txt
index 2dabc630..0456a532 100644
--- a/npc/001-1/juscare.txt
+++ b/npc/001-1/juscare.txt
@@ -70,13 +70,13 @@ OnInit:
 
     // this is not very obvious stuff
     setmovegraphcmd
-        "inn_front",    "inn_door",  1, 0x1,    "flags_0 2; dir 4; call open_door #Door18",
+        "inn_front",    "inn_door",  1, 0x1,    "flags_0 2; dir 4; call open_door #001-1_118_88",
         "inn_front",    "inn_tree",  2,         "dir 2; wait 1; sit; wait 1; emote 106; wait 20; stand; wait 1",
         "inn_front",    "river_bank",1,         "flags_0 8; flags_1 4",
         "river_bank",   "eugene",    1, 0x4,    "moveon",
         "eugene",       "fishing_spot", 1, 0x4, "wait 7",
         "fishing_spot", "chelios",   1, 0x4,    "dir 6; wait 1; emote 103; wait 10",
-        "inn_tree",     "inn_door",  1,         "flags_1 1; flags_0 2; dir 4; call open_door #Door18",
+        "inn_tree",     "inn_door",  1,         "flags_1 1; flags_0 2; dir 4; call open_door #001-1_118_88",
         "inn_tree",     "fountain",  2,         "dir 4; wait 1; emote 122; wait 10; dir 0; wait 1",
         "fountain",     "chelios_road",         "moveon",
         "chelios_road", "chelios",              "dir 6; wait 1; emote 103; wait 7",
@@ -88,12 +88,12 @@ OnInit:
         "fishing_spot", "eugene",    1, 0x8,    "moveon",
         "eugene",       "river_bank",1, 0x8,    "moveon",
         "river_bank",   "inn_front", 1, 0x8,    "dir 0; wait 5",
-        "inn_door",     "inn_doorstep",1, 0x1,  "warp 001-2-28 inter_inn_doorstep; call close_door #Door18",
+        "inn_door",     "inn_doorstep",1, 0x1,  "warp 001-2-28 inter_inn_doorstep; call close_door #001-1_118_88",
         "inter_inn_doorstep",  "inter_inn_2tables",   1, 0x1, "moveon",
         "inter_inn_2tables",   "inter_inn_fav_table", 1, 0x1, "flags_1 2; flags_0 1; dir 6; wait 1; sit; wait 15; stand; wait 1",
         "inter_inn_fav_table", "inter_inn_2tables",   1, 0x2, "moveon",
-        "inter_inn_2tables",   "inter_inn_doorstep",  1, 0x2, "call open_door #Door18; warp 001-1 inn_doorstep",
-        "inn_doorstep",        "inn_door",            1, 0x2, "call close_door #Door18",
+        "inter_inn_2tables",   "inter_inn_doorstep",  1, 0x2, "call open_door #001-1_118_88; warp 001-1 inn_doorstep",
+        "inn_doorstep",        "inn_door",            1, 0x2, "call close_door #001-1_118_88",
         "inn_door",            "inn_front",           1, 0x2, "flags_1 1; flags_0 2; wait 10";
 
     firstmove "wait 4", "inn_front";