summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <aligetmw@hotmail.fr>2012-12-24 18:00:56 +0400
committerAlige <aligetmw@hotmail.fr>2012-12-24 18:00:56 +0400
commit17975296c914b7bb48f1707a26ad8a6d71870299 (patch)
tree250abf08530d7c1194ae998f5be60f1f0d752411
parentc37b247eafd2a8816fcea496d80a901ea2bf135f (diff)
downloadserverdata-17975296c914b7bb48f1707a26ad8a6d71870299.tar.gz
serverdata-17975296c914b7bb48f1707a26ad8a6d71870299.tar.bz2
serverdata-17975296c914b7bb48f1707a26ad8a6d71870299.tar.xz
serverdata-17975296c914b7bb48f1707a26ad8a6d71870299.zip
Fixed several things in the script of alige.
Added the missing script for the headache created by the pumpkin seeds. Differenciated the scripts of the blobime and the seeds.
-rw-r--r--db/item_db.txt6
-rw-r--r--npc/000-2-1/alige.txt12
-rw-r--r--npc/items/poisonedblobime.txt4
-rw-r--r--npc/items/poisonedseeds.txt17
4 files changed, 29 insertions, 10 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index eb27fd92..b756d6c1 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -15,10 +15,10 @@
513, Croconut, Croconut, 0, 0, 30, 8, 30, , , , , , 2, , , 0, , 0, {doevent "Croconut::OnUse";}, {} {}
514, OldBook, Old Book, 0, 2, 300, 75, 150, , , , , , 2, , , 0, , 0, {doevent "OldBook::OnUse";}, {} {}
515, Plushroom, Plushroom, 0, 0, 20, 4, 55, , , , , , 2, , , 0, , 0, {itemheal 25, 0;}, {} {}
-516, PumpkinSeeds, Pumpkin Seeds, 0, 0, 8, 2, 1, , , , , , 2, , , 0, , 0, {itemheal 1, 0;}, {} {}
+516, PumpkinSeeds, Pumpkin Seeds, 0, 0, 8, 2, 1, , , , , , 2, , , 0, , 0, {callfunc "usePoisonedSeeds";}, {} {}
700, SmallTentacles, Small Tentacles, 0, 3, 80, 20, 5, , , , , , , , , , , 0, {}, {} {}
701, PiouFeathers, Piou Feathers, 0, 3, 32, 8, 1, , , , , , , , , , , 0, {}, {} {}
-702, TortugaShellFragment, Tortuga Shell Fragment, 0, 3, 40, 8, 15, , , , , , , , , , , 0, {}, {} {}
+702, TortugaShellFragment, Tortuga Shell Fragment, 0, 3, 40, 8, 15, , , , , , , , , , , 0, {}, {} {}
703, HalfEggshell, Half Eggshell, 0, 3, 60, 15, 5, , , , , , , , , , , 0, {}, {} {}
704, RattoTail, Ratto Tail, 0, 3, 48, 12, 5, , , , , , , , , , , 0, {}, {} {}
705, RattoTeeth, Ratto Teeth, 0, 3, 40, 10, 3, , , , , , , , , , , 0, {}, {} {}
@@ -26,7 +26,7 @@
707, SquichyClaws, Squichy Claws, 0, 3, 120, 30, 10, , , , , , , , , , , 0, {}, {} {}
708, TortugaShell, Tortuga Shell, 0, 3, 200, 50, 35, , , , , , , , , , , 0, {}, {} {}
709, TortugaTongue, Tortuga Tongue, 0, 3, 40, 10, 5, , , , , , , , , , , 0, {}, {} {}
-710, Pearl, Pearl, 0, 3, 3000, 750, 2, , , , , , , , , , , 0, {}, {} {}
+710, Pearl, Pearl, 0, 3, 3000, 750, 2, , , , , , , , , , , 0, {}, {} {}
711, Coral, Coral, 0, 3, 300, 75, 10, , , , , , , , , , , 0, {}, {} {}
712, BlueCoral, Blue Coral, 0, 3, 360, 85, 10, , , , , , , , , , , 0, {}, {} {}
713, FishBox, Fish Box, 519, 3, 4, 1, 2000, , , , , , , , , , , 0, {}, {} {}
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 99c00411..e544795f 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -1,6 +1,7 @@
// Evol scripts.
// Authors:
// Ablu
+// Alige
// Reid
// Vasily_Makarov
// Description:
@@ -164,18 +165,19 @@ l_GiveFood:
rif(countitem(508, 1), l(getitemname("SeaDrops"))), 1,
rif(countitem(509, 1), l(getitemname("Aquada"))), 509,
rif(countitem(510, 1), l(getitemname("PinkBlobime"))), 1,
- rif(countitem(511, 1), l(getitemname("PurpleBlobime"))), 1,
rif(countitem(512, 1), l(getitemname("HalfCroconut"))), 512,
- rif(countitem(513, 1), l(getitemname("Croconut"))), 513,
+ rif(countitem(512, 1), l(getitemname("Croconut"))), 0,
rif(countitem(515, 1), l(getitemname("Plushroom"))), 515,
+ rif(countitem(515, 1), l(getitemname("PumpkinSeeds"))), 1,
l("I don't have anything good for you today."), -1;
set @id, @menuret;
if (@id == -1) goto l_Quit; // Quit message.
if (@id == 0) goto l_NoReward; // In case of wrong food.
- if (@id == 1) goto l_Poison; // In case of Poisonned food.
+ if (@id == 1) goto l_Poison; // In case of poisoned food.
if (@id == 2) goto l_NoMore; // In case of Piberries.
-// Continue if the food is correct.
+// if (@id == item's ID) then food is correct.
+// Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion.
l_GiveReward:
mes "";
@@ -197,7 +199,7 @@ l_NoReward:
setcamnpc;
mes "";
mesn;
- mesq l("I don't want this, give me something else.");
+ mesq l("You don't expect me to eat that, do you? Give me something else!");
restorecam;
goto l_GiveFood;
diff --git a/npc/items/poisonedblobime.txt b/npc/items/poisonedblobime.txt
index 2cb4ea64..4b1213d9 100644
--- a/npc/items/poisonedblobime.txt
+++ b/npc/items/poisonedblobime.txt
@@ -5,12 +5,12 @@
// Vasily_Makarov
// Description:
// 1/2 chances to get poisoned.
-// 1/2 chances to get healed (1 HP).
+// 1/2 chances to get healed (4 HP).
function script usePoisonedBlobime {
set @temp, rand(2);
if (!@temp) sc_start sc_poison, 1, 50;
- if (@temp) itemheal 1, 0;
+ if (@temp) itemheal 4, 0;
set @temp, 0;
return;
}
diff --git a/npc/items/poisonedseeds.txt b/npc/items/poisonedseeds.txt
new file mode 100644
index 00000000..864104eb
--- /dev/null
+++ b/npc/items/poisonedseeds.txt
@@ -0,0 +1,17 @@
+// Evol scripts.
+// Authors:
+// Alige
+// Alastrim
+// Reid
+// Vasily_Makarov
+// Description:
+// 3/4 chances to get poisoned.
+// 1/4 chances to get healed (1 HP).
+
+function script usePoisonedSeeds {
+ set @temp, rand(4);
+ if (!@temp) itemheal 1, 0;
+ if (@temp) sc_start sc_poison, 1, 50;
+ set @temp, 0;
+ return;
+}