Deadmere - Undead Town

world/map/data/resnametable.txt

@@ -61,6 +61,7 @@
 025-3#025-3.wlk#
 025-4#025-4.wlk#
 026-1#026-1.wlk#
+026-2#026-2.wlk#
 027-1#027-1.wlk#
 027-2#027-2.wlk#
 027-3#027-3.wlk#

world/map/npc/001-2/_nodes.txt

@@ -6,8 +6,8 @@
     end;
 OnInit:
     setarray .m$, "_N-Alchemy", "001-2", "001-2", "001-2", "001-2";
-    setarray .x1, "_N-Alchemy", 98, 92, 98, 92;
-    setarray .y1, "_N-Alchemy", 76, 76, 89, 89;
+    setarray .x1, "_N-Alchemy", 92, 98, 92, 98;
+    setarray .y1, "_N-Alchemy", 76, 89, 89, 76;
     setarray .x2, "_N-Alchemy", 0, 0, 0, 0;
     setarray .y2, "_N-Alchemy", 0, 0, 0, 0;
     setarray .id, "_N-Alchemy", 0, 0, 0, 0;

world/map/npc/002-2/_import.txt

@@ -9,7 +9,6 @@ npc: npc/002-2/barber.txt
 npc: npc/002-2/bleacher.txt
 npc: npc/002-2/casino.txt
 npc: npc/002-2/dedication.txt
-npc: npc/002-2/eurni.txt
 npc: npc/002-2/hetchel.txt
 npc: npc/002-2/imec.txt
 npc: npc/002-2/inya.txt

world/map/npc/002-2/_warps.txt

@@ -11,8 +11,6 @@
 002-2,37,20|warp|-1,-1,002-2,72,31
 002-2,72,32|warp|-1,-1,002-2,37,21
 002-2,79,70|warp|-1,-1,002-2,34,21
-002-2,40,20|warp|-1,-1,002-2,126,35
-002-2,126,36|warp|-1,-1,002-2,40,21
 002-2,75,101|warp|-1,-1,002-1,109,46
 002-2,83,101|warp|-1,-1,002-1,115,46
 002-2,78,132|warp|-1,-1,002-1,114,36

world/map/npc/002-2/barber.txt

@@ -1,5 +1,5 @@
 // A barber (later we can make it so certain styles need to come from him, for a price)
-002-2,117,30,0|script|Issay|156
+002-2,22,77,0|script|Issay|156
 {
     mes "[Issay the Barber]";
     mes "\"Want to change your hairstyle?\"";

world/map/npc/002-2/mapflags.txt

@@ -1 +1,2 @@
 002-2|mapflag|resave|001-1,60,105
+002-2|mapflag|town

world/map/npc/015-1/mapflags.txt

@@ -1 +1,2 @@
 015-1|mapflag|resave|010-1,27,97
+015-1|mapflag|outside

world/map/npc/016-1/_import.txt

@@ -6,3 +6,4 @@ npc: npc/016-1/_nodes.txt
 npc: npc/016-1/_warps.txt
 npc: npc/016-1/gwendolyn.txt
 npc: npc/016-1/mapflags.txt
+npc: npc/016-1/rossy.txt

world/map/npc/016-1/_mobs.txt

@@ -5,7 +5,6 @@
 016-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms
 016-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms
 016-1,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms
-016-1,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms
 016-1,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms
 016-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms
 016-1,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms

world/map/npc/016-1/gwendolyn.txt

@@ -21,7 +21,7 @@
 // 5, state5: you are ready to do the targeting minigame
 // 6, state6: you did the minigame
 
-016-1,33,45,0|script|Gwendolyn|182
+016-1,91,54,0|script|Gwendolyn|182
 {
     // schoolfee in gp
     set @SCHOOLFEE, 25000;

world/map/npc/016-1/mapflags.txt

@@ -1 +1,2 @@
 016-1|mapflag|resave|010-1,27,97
+016-1|mapflag|outside

world/map/npc/025-1/rossy.txt → world/map/npc/016-1/rossy.txt

@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-025-1,80,88,0|script|Rossy|114
+016-1,32,44,0|script|Rossy|114
 {
     set @child_number, 6;
     callfunc "XmasList";

world/map/npc/025-1/_import.txt

@@ -7,4 +7,3 @@ npc: npc/025-1/_warps.txt
 npc: npc/025-1/barrier.txt
 npc: npc/025-1/mapflags.txt
 npc: npc/025-1/reset.txt
-npc: npc/025-1/rossy.txt

world/map/npc/025-1/_mobs.txt

@@ -4,10 +4,10 @@
 025-1,100,60,56,79|monster|CloverPatch|1037,3,30000ms,10000ms
 025-1,56,96,13,5|monster|CloverPatch|1037,1,1200000ms,10000ms
 025-1,56,35,77,33|monster|AlizarinPlant|1032,2,240000ms,12000ms
-025-1,55,62,24,13|monster|Snail|1041,7,30000ms,12000ms
 025-1,38,84,37,31|monster|Silkworm|1035,18,40000ms,300ms
 025-1,96,47,63,55|monster|LogHead|1025,14,18000ms,3000ms
 025-1,0,0,0,0|monster|PinkFlower|1014,34,20000ms,5000ms
-025-1,0,0,0,0|monster|SpikyMushroom|1019,40,90000ms,500ms
-025-1,101,53,55,65|monster|Squirrel|1038,18,60000ms,9000ms
-025-1,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms
+025-1,41,86,35,26|monster|GrassSnake|1034,3,100000ms,50000ms
+025-1,78,46,23,28|monster|GrassSnake|1034,3,100000ms,50000ms
+025-1,73,84,38,16|monster|GrassSnake|1034,3,100000ms,50000ms
+025-1,53,33,59,17|monster|GrassSnake|1034,4,100000ms,50000ms

world/map/npc/025-1/mapflags.txt

@@ -1 +1,2 @@
-025-1|mapflag|resave|025-1,33,50
+025-1|mapflag|resave|016-1,94,30
+025-1|mapflag|outside

world/map/npc/026-1/_import.txt

@@ -1,8 +1,13 @@
-// Map 026-1: Swamp
+// Map 026-1: Deadmere
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 026-1
 npc: npc/026-1/_mobs.txt
 npc: npc/026-1/_nodes.txt
 npc: npc/026-1/_warps.txt
+npc: npc/026-1/evil_guard.txt
+npc: npc/026-1/headless_man.txt
+npc: npc/026-1/husband.txt
 npc: npc/026-1/mapflags.txt
 npc: npc/026-1/sign.txt
+npc: npc/026-1/soul-menhir.txt
+npc: npc/026-1/traveler.txt

world/map/npc/026-1/_mobs.txt

@@ -1,14 +1,17 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Swamp mobs
+// Deadmere mobs
 
 026-1,0,0,0,0|monster|Wisp|1040,34,120000ms,40000ms
 026-1,0,0,0,0|monster|Spectre|1042,34,120000ms,40000ms
 026-1,0,0,0,0|monster|Poltergeist|1047,34,120000ms,40000ms
 026-1,0,0,0,0|monster|Silkworm|1035,10,300000ms,60000ms
-026-1,0,0,0,0|monster|Scorpion|1003,15,300000ms,30000ms
 026-1,0,0,0,0|monster|LogHead|1025,8,300000ms,40000ms
-026-1,46,74,35,26|monster|GrassSnake|1034,2,100000ms,50000ms
-026-1,88,36,35,26|monster|GrassSnake|1034,2,100000ms,50000ms
-026-1,35,36,18,16|monster|GrassSnake|1034,2,100000ms,50000ms
-026-1,66,33,73,17|monster|GrassSnake|1034,4,100000ms,50000ms
-026-1,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms
+026-1,49,31,56,14|monster|DrunkenSkeleton|1077,4,100000ms,30000ms
+026-1,50,31,52,11|monster|TipsySkeleton|1078,4,100000ms,30000ms
+026-1,56,77,66,30|monster|DrunkenSkeleton|1077,4,100000ms,30000ms
+026-1,57,77,59,23|monster|TipsySkeleton|1078,4,100000ms,30000ms
+026-1,110,59,31,74|monster|DrunkenSkeleton|1077,4,100000ms,30000ms
+026-1,110,59,28,71|monster|TipsySkeleton|1078,4,100000ms,30000ms
+026-1,110,59,31,74|monster|DrunkenLadySkeleton|1079,4,100000ms,30000ms
+026-1,57,79,69,32|monster|DrunkenLadySkeleton|1079,4,100000ms,30000ms
+026-1,48,31,54,12|monster|DrunkenLadySkeleton|1079,4,100000ms,30000ms

world/map/npc/026-1/_nodes.txt

@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Swamp nodes
+// Deadmere nodes
 
 // (no nodes)

world/map/npc/026-1/_warps.txt

@@ -1,5 +1,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Swamp warps
+// Deadmere warps
 
 026-1,63,16|warp|-1,-1,027-1,63,105
 026-1,129,66|warp|-1,-1,025-1,20,66
+026-1,48,39|warp|-1,-1,026-2,29,33
+026-1,43,24|warp|-1,-1,026-2,31,128
+026-1,25,20|warp|-1,-1,026-2,22,95

world/map/npc/027-2/evil_guard.txt → world/map/npc/026-1/evil_guard.txt

@@ -1,4 +1,4 @@
-027-2,100,43,0|script|Blackwin|316
+026-1,50,32,0|script|Blackwin|316
 {
     mes "...";
     next;
@@ -12,7 +12,7 @@
     close;
 }
 
-027-2,112,37,0|script|Forwin|316
+026-1,29,28,0|script|Forwin|316
 {
     mes "[Evil Guard]";
     mes "\"" + strcharinfo(0) + "...\"";

world/map/npc/027-2/headless_man.txt → world/map/npc/026-1/headless_man.txt

@@ -5,7 +5,7 @@
 // state 2: items delivered, return for reward and followup story
 // state 3: quest completed
 
-027-2,22,76,0|script|Thurstan|318
+026-1,34,30,0|script|Thurstan|318
 {
     set @Graveyard_Inn_MASK, NIBBLE_6_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_6_SHIFT;
@@ -27,7 +27,7 @@
     if (@state == 2) goto L_Quest_finished;
     if (@state == 1) goto L_Quest_progress;
 
-    mes "You see a man, propped up against the foot of the bed.";
+    mes "You see a man, propped up against the foot of the tree.";
     mes "In his hand, he is holding what you assume to be his own head.";
     next;
     mes "You jump back a bit, startled, as the head starts talking to you!";

world/map/npc/027-2/husband.txt → world/map/npc/026-1/husband.txt

@@ -9,7 +9,7 @@
 // state 6: is set in reid, gives as reward a special bowler hat
 // state 7: done
 
-027-2,22,84,0|script|Hamond|319
+026-1,40,41,0|script|Hamond|319
 {
     set @Graveyard_Inn_MASK, NIBBLE_3_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT;
@@ -48,7 +48,7 @@
     if (@state == 1) goto L_Ice_Cube;
 
     mes "[Pale Man]";
-    mes "\"Hello, I hope you're enjoying your time in Reid's Inn. My name is Hamond, and I'm running this inn together with my beautiful wife Reid. If there is anything I can do for you, please let me know.\"";
+    mes "\"Hello, My name is Hamond. I run the inn together with my beautiful wife Reid. If there is anything I can do for you, please let me know.\"";
     if (BaseLevel < @minLevel)
         goto L_Close;
     next;
@@ -72,7 +72,7 @@ L_Next:
     next;
     mes "\"How can I be dead if I am walking around and talking? This is very strange. \"";
     next;
-    mes "\"But nevertheless, I will continue to run this inn and do my best to make all our patrons happy and satisfied - be they alive or dead.\"";
+    mes "\"But nevertheless, I will continue to run the inn and do my best to make all our patrons happy and satisfied - be they alive or dead.\"";
     next;
     menu
         "Can I help with that?", L_Continue;
@@ -121,7 +121,7 @@ L_Check_Ice:
     mes "[Hamond]";
     mes "\"Yes, wonderful! That's exactly what I need.\"";
     next;
-    mes "\"I put all my effort in making this inn a well running place for my beloved Reid.\"";
+    mes "\"I put all my effort in making the inn a run well for my beloved Reid.\"";
     next;
     mes "\"You know, she had a very hard childhood.\"";
     next;

world/map/npc/026-1/mapflags.txt

@@ -1 +1,2 @@
-026-1|mapflag|resave|025-1,33,50
+026-1|mapflag|resave|026-1,28,35
+026-1|mapflag|outside

world/map/npc/026-1/soul-menhir.txt

@@ -0,0 +1,17 @@
+//
+
+026-1,29,34,0|script|Soul Menhir#deadmire|351
+{
+    set @map$, "026-1";
+    setarray @Xs, 28, 29, 30, 28, 30, 28, 30;
+    setarray @Ys, 32, 33, 34, 32, 34, 32, 34;
+    set @x, 0;
+    set @y, 0;
+    callfunc "SoulMenhir";
+    set @map$, "";
+    cleararray @Xs[0], 0, 7;
+    cleararray @Ys[0], 0, 7;
+    set @x, 0;
+    set @y, 0;
+    close;
+}

world/map/npc/027-1/traveler.txt → world/map/npc/026-1/traveler.txt

@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-027-1,83,84,0|script|Styx the Traveler|103
+026-1,49,46,0|script|Styx the Traveler|103
 {
     set @npcname$, "Styx";
     set @NpcTravelBit, $@graveyard_bit;

world/map/npc/026-2/_import.txt

@@ -0,0 +1,19 @@
+// Map 026-2: Swamp Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 026-2
+npc: npc/026-2/_mobs.txt
+npc: npc/026-2/_nodes.txt
+npc: npc/026-2/_warps.txt
+npc: npc/026-2/barman.txt
+npc: npc/026-2/cerhan.txt
+npc: npc/026-2/crying_child.txt
+npc: npc/026-2/diary.txt
+npc: npc/026-2/door.txt
+npc: npc/026-2/eurni.txt
+npc: npc/026-2/golbenez.txt
+npc: npc/026-2/gy_inn_shops.txt
+npc: npc/026-2/innkeeper.txt
+npc: npc/026-2/lover.txt
+npc: npc/026-2/mapflags.txt
+npc: npc/026-2/testnpcs.txt
+npc: npc/026-2/werewolf.txt

world/map/npc/026-2/_mobs.txt

@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Swamp Indoors mobs
+

world/map/npc/026-2/_nodes.txt

@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Swamp Indoors nodes
+
+// (no nodes)

world/map/npc/026-2/_warps.txt

@@ -0,0 +1,14 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Swamp Indoors warps
+
+026-2,30,35|warp|2,-1,026-1,48,40
+026-2,23,25|warp|0,-1,026-2,66,25
+026-2,66,26|warp|0,-1,026-2,23,27
+026-2,26,55|warp|0,-1,026-2,23,31
+026-2,23,33|warp|0,-1,026-2,26,56
+026-2,22,96|warp|-1,-1,026-1,25,21
+026-2,41,82|warp|0,-1,026-2,83,95
+026-2,84,96|warp|0,-1,026-2,41,83
+026-2,23,58|warp|-1,-1,026-2,81,57
+026-2,82,57|warp|-1,-1,026-2,24,58
+026-2,31,129|warp|-1,-1,026-1,43,25

world/map/npc/027-2/barman.txt → world/map/npc/026-2/barman.txt

@@ -1,4 +1,4 @@
-027-2,103,22,0|script|Bennet|310
+026-2,37,24,0|script|Bennet|310
 {
     mes "[Bennet]";
     mes "\"Hi there, stranger!  My name is Bennet, the bartender here.\"";

world/map/npc/027-2/cerhan.txt → world/map/npc/026-2/cerhan.txt

@@ -1,6 +1,6 @@
 // Author: Jenalya
 
-027-2,70,77,0|script|Cerhan|311
+026-2,38,118,0|script|Cerhan|311
 {
     mes "[Cerhan]";
     mes "\"Ah, hello! It's good to see another normal human at this strange place!\"";

world/map/npc/027-2/crying_child.txt → world/map/npc/026-2/crying_child.txt

@@ -2,7 +2,7 @@
 // love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez
 // Jenalya: some changes about variables (setting to zero if only used locally, naming)
 
-027-2,50,92,0|script|Aldred|314
+026-2,67,86,0|script|Aldred|314
 {
 // Crying Child subquest
 // Variable states:

world/map/npc/027-2/diary.txt → world/map/npc/026-2/diary.txt

@@ -1,7 +1,11 @@
 // Author: Jenalya
 
-027-2,26,97,0|script|#Diary|400
+026-2,76,85,0|script|#Diary|400
 {
+    set @npc_distance, 3;
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+
     set @Graveyard_Inn_MASK, NIBBLE_0_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;