summaryrefslogtreecommitdiff
path: root/world/map/npc/005-1
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-04-16 13:09:51 -0500
committerwushin <pasekei@gmail.com>2014-04-16 13:09:51 -0500
commite04e9eb0065caa6adf12ef36efbd3c5a3c5c3652 (patch)
treec57506b8665c9acc305bc6c85064bb4a7ab1fbc5 /world/map/npc/005-1
parent566297bd2b1467cf23e88bb2c0ad210b7d5a2ffa (diff)
parentc84e27e10b0f6ed56ae0ee1b0ec4fe7e9d0fd507 (diff)
downloadserverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.tar.gz
serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.tar.bz2
serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.tar.xz
serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.zip
Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16
Tile map fixes sprite travel
Diffstat (limited to 'world/map/npc/005-1')
-rw-r--r--world/map/npc/005-1/_import.txt2
-rw-r--r--world/map/npc/005-1/_mobs.txt8
-rw-r--r--world/map/npc/005-1/_warps.txt2
-rw-r--r--world/map/npc/005-1/mapflags.txt1
-rw-r--r--world/map/npc/005-1/npcs.txt15
-rw-r--r--world/map/npc/005-1/traveler.txt11
6 files changed, 27 insertions, 12 deletions
diff --git a/world/map/npc/005-1/_import.txt b/world/map/npc/005-1/_import.txt
index 74d23708..1b386a11 100644
--- a/world/map/npc/005-1/_import.txt
+++ b/world/map/npc/005-1/_import.txt
@@ -3,6 +3,8 @@
map: 005-1.gat
npc: npc/005-1/_mobs.txt
npc: npc/005-1/_warps.txt
+npc: npc/005-1/mapflags.txt
npc: npc/005-1/npcs.txt
npc: npc/005-1/spirit.txt
+npc: npc/005-1/traveler.txt
npc: npc/005-1/tree.txt
diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
index 5e77612c..d20f1eec 100644
--- a/world/map/npc/005-1/_mobs.txt
+++ b/world/map/npc/005-1/_mobs.txt
@@ -5,13 +5,13 @@
005-1.gat,0,0,0,0|monster|Snake|1010,1,100000,30000,Mob005-1::On1010
005-1.gat,71,77,9,6|monster|Snake|1010,2,40000,50000,Mob005-1::On1010
005-1.gat,92,25,8,5|monster|Snake|1010,3,40000,50000,Mob005-1::On1010
-005-1.gat,98,54,95,52|monster|GiantMaggot|1006,20,100000,30000,Mob005-1::On1006
-005-1.gat,91,18,66,23|monster|BlackScorpion|1009,7,100000,30000,Mob005-1::On1009
+005-1.gat,99,68,95,52|monster|GiantMaggot|1006,20,100000,30000,Mob005-1::On1006
+005-1.gat,91,15,66,23|monster|BlackScorpion|1009,7,100000,30000,Mob005-1::On1009
005-1.gat,99,87,85,32|monster|BlackScorpion|1009,8,100000,30000,Mob005-1::On1009
-005-1.gat,30,42,20,23|monster|GreenSlime|1005,3,100000,30000,Mob005-1::On1005
+005-1.gat,30,43,21,25|monster|GreenSlime|1005,3,100000,30000,Mob005-1::On1005
005-1.gat,118,70,3,2|monster|GreenSlime|1005,2,100000,30000,Mob005-1::On1005
005-1.gat,163,71,32,65|monster|Snake|1010,8,100000,30000,Mob005-1::On1010
-005-1.gat,96,49,103,48|monster|Maggot|1002,20,100000,30000,Mob005-1::On1002
+005-1.gat,122,52,77,84|monster|Maggot|1002,20,100000,30000,Mob005-1::On1002
005-1.gat,0,0,0|script|Mob005-1|-1,
diff --git a/world/map/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt
index 774178c7..a4622df6 100644
--- a/world/map/npc/005-1/_warps.txt
+++ b/world/map/npc/005-1/_warps.txt
@@ -17,3 +17,5 @@
005-1.gat,177,98|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
005-1.gat,178,97|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
005-1.gat,179,96|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,74,48|warp|To Druid Tree|-1,-1,005-1.gat,74,39
+005-1.gat,74,40|warp|To Druid Tree|-1,-1,005-1.gat,74,49
diff --git a/world/map/npc/005-1/mapflags.txt b/world/map/npc/005-1/mapflags.txt
new file mode 100644
index 00000000..3ede3802
--- /dev/null
+++ b/world/map/npc/005-1/mapflags.txt
@@ -0,0 +1 @@
+005-1.gat|mapflag|resave|005-1,80,30
diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt
index fda22da2..8189a4a4 100644
--- a/world/map/npc/005-1/npcs.txt
+++ b/world/map/npc/005-1/npcs.txt
@@ -1,14 +1,13 @@
//
-005-1.gat,69,76,0|shop|George#sandstorm|115,ShortBow :-1,Arrow :1,IronArrow :-1,Beer :-1,ChickenLeg :-2
-005-1.gat,66,75,0|script|Kieron|132,
-{
- mes "[Kieron]";
- mes "\"Be careful if you're going in that cave,";
- mes "it's packed full of monsters.\"";
- close;
-}
+//005-1.gat,66,75,0|script|Kieron|132,
+//{
+// mes "[Kieron]";
+// mes "\"Be careful if you're going in that cave,";
+// mes "it's packed full of monsters.\"";
+// close;
+//}
005-1.gat,91,23,0|script|William|131,
{
diff --git a/world/map/npc/005-1/traveler.txt b/world/map/npc/005-1/traveler.txt
new file mode 100644
index 00000000..f4c38bb4
--- /dev/null
+++ b/world/map/npc/005-1/traveler.txt
@@ -0,0 +1,11 @@
+// This is a teleportation (warp) NPC. Its purpose is to offer expensive, fast trips throughout the world.
+// Author: Wombat, wushin
+// cost depending on level and adapted to new scripting guidelines: Jenalya
+
+005-1.gat,73,36,0|script|Kieron the Traveler|103,
+{
+ set @NpcName$, "Kieron";
+ set @NpcTravelBit, $@druid_tree_bit;
+ callfunc "Traveler";
+ end;
+}