summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf1
-rw-r--r--npc/025-2-3/_mobs.txt4
-rw-r--r--npc/025-2-4/_mobs.txt6
-rw-r--r--npc/items/rand_mp_heal.txt13
4 files changed, 16 insertions, 8 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 40e66e07d..baf219ca5 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2283,6 +2283,7 @@ item_db: (
Delay: 500
UseEffect: "EFFECT_HEAL"
Script: <"
+ callfunc "MPHeal", 3, 320, 992;
@type = 4;
@rarity=6;
doevent "rand_sc_heal::OnUse";
diff --git a/npc/025-2-3/_mobs.txt b/npc/025-2-3/_mobs.txt
index a7aa3323c..557abb3a7 100644
--- a/npc/025-2-3/_mobs.txt
+++ b/npc/025-2-3/_mobs.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 025-2-3: Pinkie Cave mobs
025-2-3,55,39,13,14 monster Pinkie 1132,18,4000,8000
-025-2-3,54,41,15,12 monster Pinkie Suseran 1419,11,4000,8000
-025-2-3,56,41,17,10 monster Pinkie Maximus 1249,10,20000,2500
+025-2-3,54,41,15,12 monster Pinkie Suseran 1419,10,4000,8000
+025-2-3,56,41,17,10 monster Pinkie Maximus 1249,9,20000,2500
025-2-3,48,40,26,6 monster Cave Maggot 1027,9,2000,20000
diff --git a/npc/025-2-4/_mobs.txt b/npc/025-2-4/_mobs.txt
index 378075eb4..71942eb2c 100644
--- a/npc/025-2-4/_mobs.txt
+++ b/npc/025-2-4/_mobs.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 025-2-4: Mana Tree Cave mobs
-025-2-4,40,28,13,3 monster Red Skull Slime 1404,4,20000,75000
+025-2-4,40,28,13,3 monster Red Skull Slime 1404,3,20000,75000
025-2-4,41,53,15,31 monster Crafty 1018,7,25000,35000
-025-2-4,36,35,9,7 monster Azul Slime Mother 1243,5,40000,10000
+025-2-4,36,35,9,7 monster Azul Slime Mother 1243,4,40000,10000
025-2-4,42,39,8,12 monster Moubi 1038,5,300000,6000
-025-2-4,40,36,13,3 monster Yellow Skull Slime 1403,4,20000,75000
+025-2-4,40,36,13,3 monster Yellow Skull Slime 1403,3,20000,75000
025-2-4,44,30,9,7 monster Great Mouboo Slime 1247,3,80000,10000
diff --git a/npc/items/rand_mp_heal.txt b/npc/items/rand_mp_heal.txt
index 918e02dc3..4b6a5ca11 100644
--- a/npc/items/rand_mp_heal.txt
+++ b/npc/items/rand_mp_heal.txt
@@ -8,10 +8,11 @@
// @max
// @delay
+function script MPHeal {
+ @delay = getarg(0);
+ @min = getarg(1);
+ @max = getarg(2);
-- script rand_mp_heal -1,{
-
-OnUse:
if (@delay <= 0) {
Exception("Invalid healing item, deleting without healing effect.");
end;
@@ -40,6 +41,12 @@ OnUse:
@delay=0;
@min=0;
@max=0;
+}
+
+- script rand_mp_heal -1,{
+
+OnUse:
+ MPHeal(@delay, @min, @max);
end;
// Script Heart