summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-01-28 23:59:55 -0300
committerJesusaves <cpntb1@ymail.com>2020-01-28 23:59:55 -0300
commita6d9db808f65200908bcdb7f478a5ed519954c70 (patch)
tree282f47dd6ea0936b626c37e29a343da62a101626
parente040094361af9ccadbe7c90f9634cfe4df9fde31 (diff)
downloadserverdata-a6d9db808f65200908bcdb7f478a5ed519954c70.tar.gz
serverdata-a6d9db808f65200908bcdb7f478a5ed519954c70.tar.bz2
serverdata-a6d9db808f65200908bcdb7f478a5ed519954c70.tar.xz
serverdata-a6d9db808f65200908bcdb7f478a5ed519954c70.zip
GMs cannot send nor pick chocolate sent to them.
Use player chars instead.
-rw-r--r--npc/001-11/Demure.txt4
-rw-r--r--npc/001-11/_mobs.txt6
2 files changed, 5 insertions, 5 deletions
diff --git a/npc/001-11/Demure.txt b/npc/001-11/Demure.txt
index 13892421c..9f457ded3 100644
--- a/npc/001-11/Demure.txt
+++ b/npc/001-11/Demure.txt
@@ -165,8 +165,8 @@ L_Main:
select
l("Information"),
l("Scoreboards"),
- rif(@maximus >= 0, l("Send Chocolate")),
- l("Receive Chocolate"),
+ rif(!is_gm() && @maximus >= 0, l("Send Chocolate")),
+ rif(!is_gm() && l("Receive Chocolate")),
l("Okay, bye");
mes "";
diff --git a/npc/001-11/_mobs.txt b/npc/001-11/_mobs.txt
index 6125af184..dc8a91342 100644
--- a/npc/001-11/_mobs.txt
+++ b/npc/001-11/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-11: Valentine Highlands mobs
-001-11,47,34,29,14 monster Lovely Fluffy 1050,6,15000,1500
-001-11,48,34,32,16 monster Red Mushroom 1042,2,75000,150000
-001-11,74,48,1,2 monster Chocolate Slime 1180,1,120000,150000
+001-11,47,34,29,14 monster Lovely Fluffy 1050,6,16000,0
+001-11,48,34,32,16 monster Red Mushroom 1042,2,175000,50000
+001-11,74,48,1,2 monster Chocolate Slime 1180,1,220000,50000