summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-04 22:24:19 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-04 22:24:19 -0200
commitb30b4f5f1bd8c8559fe1d7422e9811f123d69c82 (patch)
tree1e0732c74d163a6905adb58a5d3273d2b582848c
parentf85f4f1e308452f99981d22b546c905998cf354e (diff)
downloadserverdata-b30b4f5f1bd8c8559fe1d7422e9811f123d69c82.tar.gz
serverdata-b30b4f5f1bd8c8559fe1d7422e9811f123d69c82.tar.bz2
serverdata-b30b4f5f1bd8c8559fe1d7422e9811f123d69c82.tar.xz
serverdata-b30b4f5f1bd8c8559fe1d7422e9811f123d69c82.zip
Consistency when killing House Maggots. Use a true killmonster() function on 005-3
This means buggy house maggots won't be killed by bug bomb.
-rw-r--r--npc/005-3/barrel.txt2
-rw-r--r--npc/005-7/trainer.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt
index d01200f3f..7330129de 100644
--- a/npc/005-3/barrel.txt
+++ b/npc/005-3/barrel.txt
@@ -37,7 +37,7 @@ L_BarrelTally:
message strcharinfo(0), "You found the bug bomb.";
specialeffect(14);
specialeffect(51);
- killmonsterall("005-3");
+ killmonster("005-3", "Trainer::OnKillHouseMaggot");
setq CandorQuest_Barrel, 3;
}
@rand = rand(7);
diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index ca8a8b24d..c7005eb4c 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -98,7 +98,7 @@ L_Trainment:
} else if (.@q == 3) {
mesq l("Less maggots means more food to the town. So, this time the monsters will be a little stronger.");
next;
- mesq l("In the storehouse, kill 5 @@. They keep respawning and are annoying.", getmonsterlink(HouseMaggot));
+ mesq l("In the storehouse, kill 4 @@. They keep respawning and are annoying.", getmonsterlink(HouseMaggot));
setq CandorQuest_Trainer, 4, 0;
} else if (.@q == 4) {
mesq l("You are killing @@ at the storehouse.", getmonsterlink(HouseMaggot));
@@ -514,12 +514,12 @@ OnKillHouseMaggot:
.@q=getq(CandorQuest_Trainer);
.@k=getq2(CandorQuest_Trainer); // Get number of kills (via getq2)
if (.@q == 4) {
- if (.@k+1 >= 5) {
+ if (.@k+1 >= 4) {
trainer_max_kills();
message strcharinfo(0), l("All house maggots are dead!");
} else {
trainer_add_kills();
- message strcharinfo(0), l("@@/5 House Maggots", .@k+1);
+ message strcharinfo(0), l("@@/4 House Maggots", .@k+1);
}
} else {
if (is_staff())