diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
| commit | 6967b9e0b63d19141d4f59b7933a960ac81916d0 (patch) | |
| tree | 8ecd9cd2461f3598cb7faece71eb77162aa4ef2a /npc/041-1 | |
| parent | 9877fd4ad81120af8e63e96d5d429092014dc017 (diff) | |
| parent | 046c659193e1ca8bd13478678d1277df8bf9395c (diff) | |
| download | serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.gz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.bz2 serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.xz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.zip | |
Merge branch 'master' into legacy
Override all files with 'master' version.
This version is meant to preserve git history as requested by bjorn.
Diffstat (limited to 'npc/041-1')
| -rw-r--r-- | npc/041-1/_import.txt | 4 | ||||
| -rw-r--r-- | npc/041-1/_mobs.txt | 13 | ||||
| -rw-r--r-- | npc/041-1/_warps.txt | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/npc/041-1/_import.txt b/npc/041-1/_import.txt new file mode 100644 index 00000000..e4df5104 --- /dev/null +++ b/npc/041-1/_import.txt @@ -0,0 +1,4 @@ +// Map 041-1: Beach +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/041-1/_mobs.txt", +"npc/041-1/_warps.txt", diff --git a/npc/041-1/_mobs.txt b/npc/041-1/_mobs.txt new file mode 100644 index 00000000..94a1a672 --- /dev/null +++ b/npc/041-1/_mobs.txt @@ -0,0 +1,13 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 041-1: Beach mobs +041-1,88,76,1,1 monster Scorpion 1003,3,100000,30000 +041-1,101,85,9,4 monster Scorpion 1003,3,100000,30000 +041-1,100,102,9,4 monster Scorpion 1003,3,100000,30000 +041-1,61,52,6,10 monster Scorpion 1003,3,100000,30000 +041-1,55,48,5,24 monster Sea Slime 1033,3,100000,30000 +041-1,59,31,5,4 monster Scorpion 1003,3,100000,30000 +041-1,60,25,1,1 monster Tame Scorpion 1046,1,100000,30000 +041-1,56,84,1,1 monster Tame Scorpion 1046,1,100000,30000 +041-1,95,93,10,4 monster Tame Scorpion 1046,1,100000,30000 +041-1,100,75,9,4 monster Red Scorpion 1004,3,100000,30000 +041-1,83,82,8,4 monster Red Scorpion 1004,3,100000,30000 diff --git a/npc/041-1/_warps.txt b/npc/041-1/_warps.txt new file mode 100644 index 00000000..55f023ad --- /dev/null +++ b/npc/041-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 041-1: Beach warps +041-1,101,113,0 warp #041-1_101_113 2,0,004-1,68,20 +041-1,58,22,0 warp #041-1_58_22 2,0,042-1,44,113 |