diff options
| -rw-r--r-- | world/map/db/item_db.conf | 3 | ||||
| -rw-r--r-- | world/map/db/item_db_use.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/items/rubber_bat.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/items/silver_bell.txt | 12 | ||||
| -rw-r--r-- | world/map/npc/scripts.conf | 1 |
5 files changed, 16 insertions, 4 deletions
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 30726bdb..c2f1accd 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -15309,9 +15309,8 @@ item_db: ( Refine: false ViewSprite: 1226 Script: <" - getitem SilverBell, 1; + callfunc "SilverBellSound"; "> - // TODO: Make a quieter version of the ship's bell }, { Id: 1229 diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index 4b17663b..902eb25f 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -76,7 +76,7 @@ 839, GrapeLollipop, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 750, 0, 1;}, {} 840, OrangeLollipop, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 750, 0, 1;}, {} 1189, PollettEgg, 0, 250, 25, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 75, 10, 1;}, {} -1226, SilverBell, 0, 6000, 3000, 25, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {getitem SilverBell, 1;}, {} +1226, SilverBell, 0, 6000, 3000, 25, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "SilverBellSound";}, {} 1229, CaramelApple, 0, 500, 75, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 1000, 0, 1;}, {} 1230, LollipopColor1, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 800, 0, 1;}, {} 1231, LollipopColor2, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 800, 0, 1;}, {} diff --git a/world/map/npc/items/rubber_bat.txt b/world/map/npc/items/rubber_bat.txt index 9eb3725d..0bf80ede 100644 --- a/world/map/npc/items/rubber_bat.txt +++ b/world/map/npc/items/rubber_bat.txt @@ -7,7 +7,7 @@ function|script|rubberBat L_Return: getitem "RubberBat", 1; - debugmes "Check"; +// debugmes "Check"; if ($DOOMSDAY == 3) addtimer 10, "#TMWFinalExam::OnRubberBat"; return; diff --git a/world/map/npc/items/silver_bell.txt b/world/map/npc/items/silver_bell.txt new file mode 100644 index 00000000..69efca61 --- /dev/null +++ b/world/map/npc/items/silver_bell.txt @@ -0,0 +1,12 @@ +function|script|SilverBellSound +{ + if (gettimetick(2) - @lastsilverbell < 20) goto L_Return; + misceffect 402; // TODO: Make a quieter version of the ship's bell + set @lastsilverbell, gettimetick(2); + goto L_Return; + +L_Return: + getitem "SilverBell", 1; +// debugmes "Check"; + return; +} diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index 46dad1e0..47a79415 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -60,6 +60,7 @@ npc: npc/items/nobow_item.txt npc: npc/items/love_potion.txt npc: npc/items/manapearl_item.txt npc: npc/items/underworld_troll.txt +npc: npc/items/silver_bell.txt // Mob Functions npc: npc/mobs/mob_points.txt |