diff options
Diffstat (limited to 'world')
| -rw-r--r-- | world/conf/char_athena.conf | 2 | ||||
| -rw-r--r-- | world/map/db/item_db_use.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/items/rubber_bat.txt | 11 | ||||
| -rw-r--r-- | world/map/npc/scripts.conf | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/world/conf/char_athena.conf b/world/conf/char_athena.conf index c82ba476..64f8b082 100644 --- a/world/conf/char_athena.conf +++ b/world/conf/char_athena.conf @@ -29,7 +29,7 @@ char_log_filename: log/char.log // : is used as a separator in script menus // I'm not sure why []{} are not included though //char_name_letters: "#:[]{} -char_name_letters: $&'()*+,-. +char_name_letters: $ &'()*+,-. char_name_letters: 0123456789 char_name_letters: ;<=>? char_name_letters: ABCDEFGHIJKLMNOPRSTQUVWXYZ 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 |