summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/029-0/sakar.txt2
-rw-r--r--npc/029-0/warps.txt2
-rw-r--r--npc/029-8/_import.txt1
-rw-r--r--npc/029-8/_mobs.txt33
4 files changed, 1 insertions, 37 deletions
diff --git a/npc/029-0/sakar.txt b/npc/029-0/sakar.txt
index 17be8e3d1..9c8ac24a7 100644
--- a/npc/029-0/sakar.txt
+++ b/npc/029-0/sakar.txt
@@ -29,7 +29,7 @@ OnInit:
end;
}
-029-8,50,173,0 script Andrei Sakar#FoS298 NPC_ANDREI,{
+029-0,88,33,0 script Andrei Sakar#FoS298 NPC_ANDREI,{
mesn;
mesq l("Do you want to advance?");
next;
diff --git a/npc/029-0/warps.txt b/npc/029-0/warps.txt
index 4a559437b..deda3f8ae 100644
--- a/npc/029-0/warps.txt
+++ b/npc/029-0/warps.txt
@@ -92,8 +92,6 @@ OnInit:
}
029-7,80,49,0 script Dead Tree#297to298 NPC_NO_SPRITE,{
- end;
-OnTouch:
if (FiresOfSteam_Warp(8)) goto L_Warp;
// Additional conditions here (TODO)
// Fallthrough
diff --git a/npc/029-8/_import.txt b/npc/029-8/_import.txt
index 4e9ac800f..02bf49b9f 100644
--- a/npc/029-8/_import.txt
+++ b/npc/029-8/_import.txt
@@ -1,3 +1,2 @@
// Map 029-8: Asphodel Moors
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/029-8/_mobs.txt",
diff --git a/npc/029-8/_mobs.txt b/npc/029-8/_mobs.txt
deleted file mode 100644
index 7552c135b..000000000
--- a/npc/029-8/_mobs.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 029-8: Asphodel Moors mobs
-029-8,190,74,53,40 monster Silkworm 1040,12,4500,6000
-029-8,152,116,48,43 monster Forest Maggot 1028,20,3600,12000
-029-8,89,116,43,31 monster Grass Snake 1042,5,6000,24000
-029-8,192,155,43,31 monster Grass Snake 1042,7,3000,12000
-029-8,228,64,17,32 monster Log Head 1031,4,5000,30000
-029-8,168,95,14,9 monster Bandit 1063,2,9000,18000
-029-8,115,150,45,26 monster Thief Slime 1105,5,11500,45000
-029-8,185,179,45,20 monster Blub 1008,4,60000,120000
-029-8,128,144,77,47 monster Green Slime 1024,10,10000,30000
-029-8,63,175,30,15 monster Little Green Slime 1025,5,10000,30000
-029-8,84,111,30,15 monster Little Green Slime 1025,5,10000,50000
-029-8,228,139,13,12 monster Mana Ghost 1101,2,10000,30000
-029-8,45,182,13,12 monster Mana Ghost 1101,4,10000,60000
-029-8,69,185,31,9 monster Skeleton 1084,4,6000,24000
-029-8,142,159,84,20 monster Swampling 1109,10,30000,60000
-029-8,162,99,17,15 monster Robin Bandit 1064,2,9000,18000
-029-8,184,48,38,13 monster Spiky Mushroom 1049,4,3000,12000
-029-8,103,86,31,27 monster Big Frog 1087,3,6000,60000
-029-8,85,118,49,43 monster Small Frog 1086,8,3000,30000
-029-8,152,165,44,40 monster Big Frog 1087,5,6000,75000
-029-8,188,188,49,18 monster Small Frog 1086,7,3000,30000
-029-8,228,65,16,8 monster Spider 1044,2,4000,8000
-029-8,209,58,16,28 monster Grass Snake 1042,4,3000,12000
-029-8,232,79,3,12 monster Wicked Mushroom 1050,3,6000,12000
-029-8,124,64,3,12 monster Wicked Mushroom 1050,7,3000,12000
-029-8,214,173,13,12 monster Zombie 1118,1,48000,120000
-029-8,37,181,13,12 monster Water Wisp 1116,3,10000,60000
-029-8,66,182,13,12 monster Fire Wisp 1115,1,10000,60000
-029-8,131,193,13,12 monster Green Slime Progenitor 1097,1,48000,120000
-029-8,149,174,84,19 monster Mud Slime 1096,4,30000,60000
-029-8,61,109,16,32 monster Serqet 1119,2,12000,60000