summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf23
-rw-r--r--npc/scripts.conf4
2 files changed, 21 insertions, 6 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6c055988f..d8dbb799f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2227,11 +2227,26 @@ item_db: (
dispbottom l("You must reach level 5 to open this gift.");
getitembound FriendGift, 1, 1;
}
- getitem any(ScorpionStinger, BugLeg, MaggotSlime), rand(1,3);
- getitem any(ScorpionStinger, BugLeg, MaggotSlime), rand(1,3);
+ getitem ScorpionStinger, rand(1,3);
+ getitem BugLeg, rand(1,3);
+ getitem MaggotSlime, rand(1,3);
Zeny=Zeny+50;
- getitem any(Beer, CottonCloth), 1;
- getitem any(PiouLegs, Piberries, Cheese), rand(2,3);
+
+ if (rand(1,2) == 1)
+ getitem Beer, 1;
+ else
+ getitem CottonCloth, 1;
+
+ .@it=PiouLegs;
+ switch(rand(1,3)) {
+ case 1:
+ .@it=PiouLegs;break;
+ case 2:
+ .@it=Piberries;break;
+ case 3:
+ .@it=Cheese;break;
+ }
+ getitem .@it, rand(2,3);
dispbottom l("Dear @@, I send you this gift in hopes you do well in TMW2.", strcharinfo(0));
">
},
diff --git a/npc/scripts.conf b/npc/scripts.conf
index b8e33014e..d6f4b0003 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -4,8 +4,6 @@
"npc/functions/permissions.txt",
"npc/functions/main.txt",
"npc/functions/util.txt",
-"npc/functions/asklanguage.txt",
-"npc/functions/clientversion.txt",
// General-purpose Framework functions
"npc/functions/array.txt",
@@ -23,6 +21,8 @@
"npc/functions/openbook.txt",
// Important functions
+"npc/functions/asklanguage.txt",
+"npc/functions/clientversion.txt",
"npc/functions/game-rules.txt",
"npc/functions/inventoryplace.txt",
"npc/functions/scoreboards.txt",