diff options
author | Jesusaves <cpntb1@ymail.com> | 2019-10-26 10:24:58 +0000 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2019-10-26 10:24:58 +0000 |
commit | 11ca261bc8d40eda92572acc0b02fce378c9a5d7 (patch) | |
tree | 7b874430e4c393ceaad716ba8671a0a81fa62dcd /npc | |
parent | b388df1b517200d1cfdac18f42e2594d3deb5967 (diff) | |
parent | 9a0ed22f94fae65e183d206b9bc544cef08a8e3a (diff) | |
download | serverdata-11ca261bc8d40eda92572acc0b02fce378c9a5d7.tar.gz serverdata-11ca261bc8d40eda92572acc0b02fce378c9a5d7.tar.bz2 serverdata-11ca261bc8d40eda92572acc0b02fce378c9a5d7.tar.xz serverdata-11ca261bc8d40eda92572acc0b02fce378c9a5d7.zip |
Merge branch 'items' into 'master'
Items and stuff for Galimatia quest
See merge request evol/serverdata!208
Diffstat (limited to 'npc')
-rw-r--r-- | npc/008-1-1/_mobs.txt | 11 | ||||
-rw-r--r-- | npc/008-1/_mobs.txt | 6 | ||||
-rw-r--r-- | npc/008-1/shop.txt | 4 |
3 files changed, 8 insertions, 13 deletions
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt index 4bb14ace..35a0bc0f 100644 --- a/npc/008-1-1/_mobs.txt +++ b/npc/008-1-1/_mobs.txt @@ -20,11 +20,6 @@ 008-1-1,68,29,7,7 monster Mouboo 1023,3,30000,60000 008-1-1,126,45,0,0 monster Beehive 1056,1,30000,100000 008-1-1,121,45,0,0 monster Beehive 1056,1,30000,100000 -008-1-1,94,39,0,0 monster Blue Rose 1061,1,250000,100000 -008-1-1,98,42,0,0 monster Yellow Tulip 1059,1,180000,85000 -008-1-1,95,45,0,0 monster Red Rose 1062,1,210000,95000 -008-1-1,98,48,0,0 monster Yellow Rose 1060,1,195000,65000 -008-1-1,95,43,0,0 monster Yellow Tulip 1059,1,180000,85000 -008-1-1,97,46,0,0 monster Red Rose 1062,1,210000,95000 -008-1-1,96,49,0,0 monster Yellow Rose 1060,1,195000,65000 -008-1-1,93,48,0,0 monster Yellow Rose 1060,1,195000,65000 +008-1-1,163,178,2,1 monster Red Rose 1062,1,50000,10000 +008-1-1,158,191,3,1 monster Yellow Rose 1060,1,20000,5000 +008-1-1,166,184,1,1 monster Blue Rose 1061,1,100000,20000 diff --git a/npc/008-1/_mobs.txt b/npc/008-1/_mobs.txt index 4a08a718..d4e6a597 100644 --- a/npc/008-1/_mobs.txt +++ b/npc/008-1/_mobs.txt @@ -81,7 +81,7 @@ 008-1,68,167,14,9 monster Silkworm 1040,3,3000,6000 008-1,46,193,16,28 monster Grass Snake 1042,7,3000,12000 008-1,166,114,14,5 monster Spiky Mushroom 1049,2,3000,6000 -008-1,118,97,14,5 monster Spiky Mushroom 1049,2,3000,6000 +008-1,128,48,4,5 monster Bandit 1063,1,4000,11000 008-1,186,33,6,7 monster Spiky Mushroom 1049,4,3000,6000 008-1,84,77,4,2 monster Scorpion 1043,1,6000,12000 008-1,106,62,7,4 monster Mouboo 1023,1,30000,120000 @@ -99,3 +99,7 @@ 008-1,140,144,2,6 monster Mauve Plant 1036,3,1000,2000 008-1,192,147,3,2 monster Gamboge Plant 1038,2,1000,10000 008-1,197,136,2,5 monster Cobalt Plant 1039,2,1000,30000 +008-1,109,93,14,5 monster Spiky Mushroom 1049,2,3000,6000 +008-1,111,68,8,3 monster Robin Bandit 1064,2,8000,12000 +008-1,126,80,8,3 monster Bandit 1063,2,5500,8000 +008-1,122,44,4,7 monster Robin Bandit 1064,1,3000,8000 diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt index f50912f2..a0b825ec 100644 --- a/npc/008-1/shop.txt +++ b/npc/008-1/shop.txt @@ -19,7 +19,6 @@ OnInit: sellitem ARedTulip, -1, 50; sellitem AWhiteTulip, -1, 50; sellitem AYellowTulip, -1, 50; - sellitem ABlueTulip, -1, 20; .sex = G_OTHER; .distance = 10; @@ -33,7 +32,6 @@ OnClock0000: restoreshopitem ARedTulip, 10; restoreshopitem AWhiteTulip, 10; restoreshopitem AYellowTulip, 10; - restoreshopitem ABlueTulip, 5; OnClock0800: restoreshopitem ARedRose, 10; restoreshopitem AWhiteRose, 10; @@ -42,7 +40,6 @@ OnClock0800: restoreshopitem ARedTulip, 10; restoreshopitem AWhiteTulip, 10; restoreshopitem AYellowTulip, 10; - restoreshopitem ABlueTulip, 5; OnClock1600: restoreshopitem ARedRose, 10; restoreshopitem AWhiteRose, 10; @@ -51,5 +48,4 @@ OnClock1600: restoreshopitem ARedTulip, 10; restoreshopitem AWhiteTulip, 10; restoreshopitem AYellowTulip, 10; - restoreshopitem ABlueTulip, 5; } |