summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-07-14 13:36:39 -0300
committerJesusaves <cpntb1@ymail.com>2018-07-14 13:36:39 -0300
commitb7f2b3b077247d5ef80fb48e423448685eb7630b (patch)
treedd51e88f80e860b4a9a6b2b50e0e5bf6d8e4a923 /npc
parent1407fbcff03827adc507cf1f1ef28ab6e34eb437 (diff)
downloadserverdata-b7f2b3b077247d5ef80fb48e423448685eb7630b.tar.gz
serverdata-b7f2b3b077247d5ef80fb48e423448685eb7630b.tar.bz2
serverdata-b7f2b3b077247d5ef80fb48e423448685eb7630b.tar.xz
serverdata-b7f2b3b077247d5ef80fb48e423448685eb7630b.zip
[skip ci] fix bugs. Cooldown is broken
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/eventmaster.txt12
-rw-r--r--npc/magic/parum.txt3
2 files changed, 14 insertions, 1 deletions
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 71d83f011..42860584e 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -893,7 +893,17 @@ OnCall:
end;
}
- areamonster("001-1", 171, 0, 339, 158, strmobinfo(1, atoi(.@atcmd_parameters$[0])), atoi(.@atcmd_parameters$[0]), atoi(.@atcmd_parameters$[1]), "Mana Being#001-1::OnAerosMobDeath");
+ switch($@AEROS_SPWN) {
+ case 1:
+ areamonster("001-1", 20, 20, 140, 140, strmobinfo(1, atoi(.@atcmd_parameters$[0])), atoi(.@atcmd_parameters$[0]), atoi(.@atcmd_parameters$[1]), "Mana Being#001-1::OnAerosMobDeath");
+ break;
+ case 2:
+ areamonster("001-1", 20, 20, 340, 160, strmobinfo(1, atoi(.@atcmd_parameters$[0])), atoi(.@atcmd_parameters$[0]), atoi(.@atcmd_parameters$[1]), "Mana Being#001-1::OnAerosMobDeath");
+ break;
+ default:
+ areamonster("001-1", 171, 320, 158, 340, strmobinfo(1, atoi(.@atcmd_parameters$[0])), atoi(.@atcmd_parameters$[0]), atoi(.@atcmd_parameters$[1]), "Mana Being#001-1::OnAerosMobDeath");
+ break;
+ }
logmes "@aeros "+strmobinfo(1, atoi(.@atcmd_parameters$[0])) + " " + .@atcmd_parameters$[1], LOGMES_ATCOMMAND;
dispbottom "All monsters summoned.";
diff --git a/npc/magic/parum.txt b/npc/magic/parum.txt
index 19a16bdd5..e51adec82 100644
--- a/npc/magic/parum.txt
+++ b/npc/magic/parum.txt
@@ -39,6 +39,9 @@ OnCall:
if (!MagicCheck(TMW2_PARUM, 50))
end;
+ // Consume items
+ delitem RawLog, 1;
+
// Create the stuff based on MAGIC_EXP
.@r=rand(1,41);
if (.@r < 42-(MAGIC_EXP/2)) {