summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-01-15 23:59:00 -0500
committermekolat <mekolat@users.noreply.github.com>2016-01-15 23:59:00 -0500
commitd8963f20f870102068b39c7fd31cabc410208dc3 (patch)
tree6b5d5af3ca94eef767e7c25767298a73e1544d81
parentf31063b9c032d248fd6a326b2591c294c6d2cbb7 (diff)
parent580598d709ff37353ff0ce87e7366058afc7d117 (diff)
downloadserverdata-d8963f20f870102068b39c7fd31cabc410208dc3.tar.gz
serverdata-d8963f20f870102068b39c7fd31cabc410208dc3.tar.bz2
serverdata-d8963f20f870102068b39c7fd31cabc410208dc3.tar.xz
serverdata-d8963f20f870102068b39c7fd31cabc410208dc3.zip
Merge pull request #441 from themanaworld/rubber
add 2s delay to rubber bat
-rw-r--r--world/map/db/item_db_use.txt2
-rw-r--r--world/map/npc/items/rubber_bat.txt11
-rw-r--r--world/map/npc/scripts.conf1
3 files changed, 13 insertions, 1 deletions
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt
index 4f69c2f5..8015786d 100644
--- a/world/map/db/item_db_use.txt
+++ b/world/map/db/item_db_use.txt
@@ -85,7 +85,7 @@
1258, Honey, 0, 100, 80, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 45, 0, 1;}, {}
1280, Scissors, 0, 1000, 500, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useScissors";}, {}
1281, ShockSweet, 0, 1000, 500, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useShockSweet";}, {}
-3001, RubberBat, 0, 200, 100, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {misceffect 403;getitem 3001,1;}, {}
+3001, RubberBat, 0, 200, 100, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "rubberBat";}, {}
3006, TonoriDelight, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 2, 1;}, {}
3007, Marshmallow, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
3009, JellySkull, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
diff --git a/world/map/npc/items/rubber_bat.txt b/world/map/npc/items/rubber_bat.txt
new file mode 100644
index 00000000..edf12416
--- /dev/null
+++ b/world/map/npc/items/rubber_bat.txt
@@ -0,0 +1,11 @@
+function|script|rubberBat
+{
+ if (gettimetick(2) - @lastbat < 2) goto L_Return;
+ misceffect 403;
+ set @lastbat, gettimetick(2);
+ goto L_Return;
+
+L_Return:
+ getitem "RubberBat", 1;
+ return;
+}
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index e2603c8e..f9251214 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -46,6 +46,7 @@ npc: npc/items/unequipcb.txt
npc: npc/items/launcher_ammo.txt
npc: npc/items/check_wand.txt
npc: npc/items/mirror.txt
+npc: npc/items/rubber_bat.txt
import: npc/_import.txt
// GM Events