summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-19 20:26:31 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-19 20:26:31 +0000
commita0c70ea7f1fcd5bdd696a0e6f6268b9c5f2b6347 (patch)
tree6180c37dc76116386e98b467990e85afc00ef23a
parent9016664e8b07f0e30c178efc4a1fbd8453219c97 (diff)
parentb3e01b79234b7cced182531ccb7ca2e3618da907 (diff)
downloadserverdata-a0c70ea7f1fcd5bdd696a0e6f6268b9c5f2b6347.tar.gz
serverdata-a0c70ea7f1fcd5bdd696a0e6f6268b9c5f2b6347.tar.bz2
serverdata-a0c70ea7f1fcd5bdd696a0e6f6268b9c5f2b6347.tar.xz
serverdata-a0c70ea7f1fcd5bdd696a0e6f6268b9c5f2b6347.zip
Merge branch 'flower_spots' into 'master'
flower spots See merge request legacy/serverdata!646
-rw-r--r--world/map/npc/008-1/_mobs.txt2
-rw-r--r--world/map/npc/012-1/_mobs.txt2
-rw-r--r--world/map/npc/017-1/_mobs.txt1
3 files changed, 5 insertions, 0 deletions
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 6c077242..f4c18403 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -10,3 +10,5 @@
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/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index 4f85e2ff..be05b580 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -12,3 +12,5 @@
012-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
012-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms
012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms
+012-1,66,145,11,5|monster|PinkFlower|1014,2,0ms,250ms
+012-1,24,54,6,8|monster|PinkFlower|1014,2,0ms,250ms
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index d4e5955a..79b8ff0d 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -19,3 +19,4 @@
017-1,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms
017-1,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms
017-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms
+017-1,23,27,7,8|monster|PinkFlower|1014,2,0ms,250ms