summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-20 21:37:31 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-20 21:37:31 +0000
commit146ded143c5f4a5f0c43e965dd097b2a26416c51 (patch)
treea3d470543bcc679a32759d87081bfdea2c3a1cb0
parent3ab679c2c3f91ddfa1e2704b7ae1ca31a0f7836b (diff)
parent604875959a26911707aa22263e3338a979fa7851 (diff)
downloadserverdata-146ded143c5f4a5f0c43e965dd097b2a26416c51.tar.gz
serverdata-146ded143c5f4a5f0c43e965dd097b2a26416c51.tar.bz2
serverdata-146ded143c5f4a5f0c43e965dd097b2a26416c51.tar.xz
serverdata-146ded143c5f4a5f0c43e965dd097b2a26416c51.zip
Merge branch 'mapfix' into 'master'
moved object to right location See merge request legacy/serverdata!649
-rw-r--r--world/map/npc/008-1/_mobs.txt1
-rw-r--r--world/map/npc/018-1/_mobs.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index f4c18403..5104239e 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -10,5 +10,4 @@
008-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
008-1,0,0,0,0|monster|Squirrel|1038,10,30ms,20ms
008-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms
-008-1,26,16,20,3|monster|PinkFlower|1014,2,0ms,250ms
008-1,124,34,10,12|monster|PinkFlower|1014,2,0ms,250ms
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index ced34aa9..f9538b52 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -28,3 +28,4 @@
018-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
018-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms
018-1,134,80,14,39|monster|Maggot|1002,15,30ms,0ms
+018-1,31,95,10,7|monster|PinkFlower|1014,2,0ms,250ms