summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-09 11:33:50 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-09 11:33:50 -0300
commit43ff326623144dc74d04c1d0dc6deebdafc5af7d (patch)
treecbc471c30770aeeb8f310db98c07f9b8ae8c3968
parent2593113bb29838985dc3895b21b860d6a3c347b6 (diff)
downloadserverdata-43ff326623144dc74d04c1d0dc6deebdafc5af7d.tar.gz
serverdata-43ff326623144dc74d04c1d0dc6deebdafc5af7d.tar.bz2
serverdata-43ff326623144dc74d04c1d0dc6deebdafc5af7d.tar.xz
serverdata-43ff326623144dc74d04c1d0dc6deebdafc5af7d.zip
Fix several scripted mob death with fix_mobkill(Pinkie)
-rw-r--r--npc/005-7/trainer.txt5
-rw-r--r--npc/007-1/tycoon.txt5
-rw-r--r--npc/012-1/hinnak.txt3
-rw-r--r--npc/014-3/oscar.txt2
-rw-r--r--npc/018-4-2/susanne.txt1
-rw-r--r--npc/018-5-3/shaabty.txt3
-rw-r--r--npc/functions/mobpoint.txt7
7 files changed, 21 insertions, 5 deletions
diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index efdcc1491..85e31d717 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -554,6 +554,7 @@ OnKillMaggot:
message strcharinfo(0), l("@@/10 Maggots", .@k+1);
}
}
+ fix_mobkill(Maggot);
end;
OnKillHouseMaggot:
.@q=getq(CandorQuest_Trainer);
@@ -570,6 +571,7 @@ OnKillHouseMaggot:
if (is_staff())
dispbottom "It's working. (T:OKHM)";
}
+ fix_mobkill(HouseMaggot);
end;
OnKillCandorScorpion:
.@q=getq(CandorQuest_Trainer);
@@ -583,6 +585,7 @@ OnKillCandorScorpion:
message strcharinfo(0), l("@@/3 Candor Scorpions", .@k+1);
}
}
+ fix_mobkill(CandorScorpion);
end;
OnKillScorpion:
.@q=getq(CandorQuest_Trainer);
@@ -596,6 +599,7 @@ OnKillScorpion:
message strcharinfo(0), l("@@/2 Scorpion", .@k+1);
}
}
+ fix_mobkill(Scorpion);
end;
OnKillManaBug:
.@q=getq(CandorQuest_Trainer);
@@ -609,6 +613,7 @@ OnKillManaBug:
message strcharinfo(0), l("@@/1 Mana Bug", .@k+1);
}
}
+ fix_mobkill(ManaBug);
end;
OnInit:
diff --git a/npc/007-1/tycoon.txt b/npc/007-1/tycoon.txt
index 4166ff704..38874d9aa 100644
--- a/npc/007-1/tycoon.txt
+++ b/npc/007-1/tycoon.txt
@@ -236,6 +236,7 @@ OnKillRatto:
message strcharinfo(0), l("@@/10 Rattos", .@k+1);
}
}
+ fix_mobkill(Ratto);
end;
OnKillCaveMaggot:
@@ -250,6 +251,7 @@ OnKillCaveMaggot:
message strcharinfo(0), l("@@/25 Cave Maggots", .@k+1);
}
}
+ fix_mobkill(CaveMaggot);
end;
OnKillCaveSnake:
.@q=getq(MineQuest_Tycoon);
@@ -263,6 +265,7 @@ OnKillCaveSnake:
message strcharinfo(0), l("@@/50 Cave Snakes", .@k+1);
}
}
+ fix_mobkill(CaveSnake);
end;
OnKillRedScorpion:
.@q=getq(MineQuest_Tycoon);
@@ -276,6 +279,7 @@ OnKillRedScorpion:
message strcharinfo(0), l("@@/100 Red Scorpions", .@k+1);
}
}
+ fix_mobkill(RedScorpion);
end;
OnKillBlackScorpion:
.@q=getq(MineQuest_Tycoon);
@@ -289,6 +293,7 @@ OnKillBlackScorpion:
message strcharinfo(0), l("@@/200 Black Scorpions", .@k+1);
}
}
+ fix_mobkill(BlackScorpion);
end;
OnInit:
diff --git a/npc/012-1/hinnak.txt b/npc/012-1/hinnak.txt
index 931027e55..6b8b64d8c 100644
--- a/npc/012-1/hinnak.txt
+++ b/npc/012-1/hinnak.txt
@@ -48,8 +48,7 @@ OnKillPinkie:
if (! (.@q2+1) % 10)
dispbottom l("@@ pinkies killed on @@'s field.", .@q2+1, l("Oscar"));
}
- killedrid=Pinkie;
- doevent "#mobptsys::OnNPCKillEvent";
+ fix_mobkill(Pinkie);
end;
L_Slow:
diff --git a/npc/014-3/oscar.txt b/npc/014-3/oscar.txt
index 15c2383da..5e981af0b 100644
--- a/npc/014-3/oscar.txt
+++ b/npc/014-3/oscar.txt
@@ -136,7 +136,7 @@ OnKillPinkie:
if (! (.@q2+1) % 10)
dispbottom l("@@ pinkies killed on @@'s field.", .@q2+1, l("Oscar"));
}
- doevent "#mobptsys::OnNPCKillEvent";
+ fix_mobkill(Pinkie);
end;
OnInit:
diff --git a/npc/018-4-2/susanne.txt b/npc/018-4-2/susanne.txt
index 391bf3b25..2d2678e44 100644
--- a/npc/018-4-2/susanne.txt
+++ b/npc/018-4-2/susanne.txt
@@ -58,6 +58,7 @@ OnKillFafi:
mapannounce "017-1", "" +strcharinfo(0)+ " has killed the Fafi Dragon!", 0;
message strcharinfo(0), "Cheers are being heard throughout the land!";
}
+ fix_mobkill(FafiDragon);
end;
L_Complete:
diff --git a/npc/018-5-3/shaabty.txt b/npc/018-5-3/shaabty.txt
index f35db6fc9..3defb5de2 100644
--- a/npc/018-5-3/shaabty.txt
+++ b/npc/018-5-3/shaabty.txt
@@ -141,8 +141,7 @@ OnKillSnake:
if (! (.@q2+1) % 10)
dispbottom l("@@ @@ killed.", .@q2+1, getmonsterlink(MountainSnake));
}
- killedrid=MountainSnake;
- doevent "#mobptsys::OnNPCKillEvent";
+ fix_mobkill(MountainSnake);
end;
OnInit:
diff --git a/npc/functions/mobpoint.txt b/npc/functions/mobpoint.txt
index eec6166a1..d7a438d07 100644
--- a/npc/functions/mobpoint.txt
+++ b/npc/functions/mobpoint.txt
@@ -3,6 +3,13 @@
// Jesusalva
// Desc: Mob Points for Aidan & Ishi. You will gain MONSTER-LEVEL mob points.
+// fix_mobkill(mobID) → Manual fix for scripted mobs
+function script fix_mobkill {
+ killedrid=getarg(0);
+ doevent "#mobptsys::OnNPCKillEvent";
+ return;
+}
+
function script mobpoint {
if (!MPQUEST)
return;