From 8396666245bc0bb805009f049cde6bec401dd071 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Wed, 21 Dec 2011 17:36:02 +0100 Subject: Replace dummy monsters in barbarian quests with wolvern. --- world/map/npc/033-1/kimarr.txt | 15 +++++------ world/map/npc/034-1/ambushs.txt | 60 ++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 38 deletions(-) (limited to 'world/map/npc') diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index fa7d6a47..f6a22423 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -263,9 +263,8 @@ L_BeginHunting: set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 12 * ($@Fluffy_Alive + $@Fluffy_Spawn) + 7 * BaseLevel; if ((BaseLevel > 40) && (rand($@Fluffy_Extra) > 500)) // Ice Goblin areamonster "033-1.gat", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; - if ((BaseLevel > 60) && (rand($@Fluffy_Extra) > 550)) // Santa Slime - areamonster "033-1.gat", 79, 29, 88, 42, "", 1015, 1, "Kimarr::OnSantaSlimeDeath"; - // TODO: add the wolvern as well when it has been added + if ((BaseLevel > 60) && (rand($@Fluffy_Extra) > 550)) // Wolvern + areamonster "033-1.gat", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; if ((BaseLevel > 70) && (rand($@Fluffy_Extra) > 600)) // Yeti areamonster "033-1.gat", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; @@ -284,8 +283,8 @@ OnIceGoblinDeath: set @MobID, 0; end; -OnSantaSlimeDeath: - set @MobID, 1015; +OnWolvernDeath: + set @MobID, 1090; if (getcharid(3) != $@Fluffy_FighterID) goto L_Punish; set @MobID, 0; @@ -322,8 +321,8 @@ L_Punish: areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, 1, "Kimarr::OnFluffyDeath"; if (@MobID == 1058) areamonster "033-1.gat", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; - if (@MobID == 1015) - areamonster "033-1.gat", 79, 29, 88, 42, "", 1015, 1, "Kimarr::OnSantaSlimeDeath"; + if (@MobID == 1090) + areamonster "033-1.gat", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; if (@MobID == 1072) areamonster "033-1.gat", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; @@ -347,7 +346,7 @@ S_Clean: set $@Fluffy_Spawn, 0; set $@Fluffy_Alive, 0; killmonster "033-1.gat", "Kimarr::OnIceGoblinDeath"; - killmonster "033-1.gat", "Kimarr::OnSantaSlimeDeath"; + killmonster "033-1.gat", "Kimarr::OnWolvernDeath"; killmonster "033-1.gat", "Kimarr::OnYetiDeath"; killmonster "033-1.gat", "Kimarr::OnFluffyDeath"; return; diff --git a/world/map/npc/034-1/ambushs.txt b/world/map/npc/034-1/ambushs.txt index b5fb9dd2..6412e105 100644 --- a/world/map/npc/034-1/ambushs.txt +++ b/world/map/npc/034-1/ambushs.txt @@ -29,7 +29,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush0_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 113, 55, 122, 63, "", 1089, $@Ambush0_Spawn, "#Ambush0::OnWolvernDeath"; + areamonster "034-1.gat", 113, 55, 122, 63, "", 1090, $@Ambush0_Spawn, "#Ambush0::OnWolvernDeath"; set $@Ambush0VictimID, 0; end; @@ -39,7 +39,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -83,7 +83,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush1_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 91, 89, 98, 94, "", 1089, $@Ambush1_Spawn, "#Ambush1::OnWolvernDeath"; + areamonster "034-1.gat", 91, 89, 98, 94, "", 1090, $@Ambush1_Spawn, "#Ambush1::OnWolvernDeath"; set $@Ambush1VictimID, 0; end; @@ -93,7 +93,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -137,7 +137,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush2_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 118, 32, 126, 39, "", 1089, $@Ambush2_Spawn, "#Ambush2::OnWolvernDeath"; + areamonster "034-1.gat", 118, 32, 126, 39, "", 1090, $@Ambush2_Spawn, "#Ambush2::OnWolvernDeath"; set $@Ambush2VictimID, 0; end; @@ -147,7 +147,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -191,7 +191,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush3_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 79, 41, 86, 47, "", 1089, $@Ambush3_Spawn, "#Ambush3::OnWolvernDeath"; + areamonster "034-1.gat", 79, 41, 86, 47, "", 1090, $@Ambush3_Spawn, "#Ambush3::OnWolvernDeath"; set $@Ambush3VictimID, 0; end; @@ -201,7 +201,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -245,7 +245,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush4_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 69, 25, 77, 31, "", 1089, $@Ambush4_Spawn, "#Ambush4::OnWolvernDeath"; + areamonster "034-1.gat", 69, 25, 77, 31, "", 1090, $@Ambush4_Spawn, "#Ambush4::OnWolvernDeath"; set $@Ambush4VictimID, 0; end; @@ -255,7 +255,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -299,7 +299,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush5_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 22, 40, 30, 48, "", 1089, $@Ambush5_Spawn, "#Ambush5::OnWolvernDeath"; + areamonster "034-1.gat", 22, 40, 30, 48, "", 1090, $@Ambush5_Spawn, "#Ambush5::OnWolvernDeath"; set $@Ambush5VictimID, 0; end; @@ -309,7 +309,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -353,7 +353,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush6_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 46, 45, 54, 50, "", 1089, $@Ambush6_Spawn, "#Ambush6::OnWolvernDeath"; + areamonster "034-1.gat", 46, 45, 54, 50, "", 1090, $@Ambush6_Spawn, "#Ambush6::OnWolvernDeath"; set $@Ambush6VictimID, 0; end; @@ -363,7 +363,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -407,7 +407,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush7_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 31, 59, 39, 65, "", 1089, $@Ambush7_Spawn, "#Ambush7::OnWolvernDeath"; + areamonster "034-1.gat", 31, 59, 39, 65, "", 1090, $@Ambush7_Spawn, "#Ambush7::OnWolvernDeath"; set $@Ambush7VictimID, 0; end; @@ -417,7 +417,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -461,7 +461,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush8_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 21, 90, 32, 100, "", 1089, $@Ambush8_Spawn, "#Ambush8::OnWolvernDeath"; + areamonster "034-1.gat", 21, 90, 32, 100, "", 1090, $@Ambush8_Spawn, "#Ambush8::OnWolvernDeath"; set $@Ambush8VictimID, 0; end; @@ -471,7 +471,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -515,7 +515,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush9_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 52, 88, 61, 96, "", 1089, $@Ambush9_Spawn, "#Ambush9::OnWolvernDeath"; + areamonster "034-1.gat", 52, 88, 61, 96, "", 1090, $@Ambush9_Spawn, "#Ambush9::OnWolvernDeath"; set $@Ambush9VictimID, 0; end; @@ -525,7 +525,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -569,7 +569,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush10_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 60, 63, 69, 69, "", 1089, $@Ambush10_Spawn, "#Ambush10::OnWolvernDeath"; + areamonster "034-1.gat", 60, 63, 69, 69, "", 1090, $@Ambush10_Spawn, "#Ambush10::OnWolvernDeath"; set $@Ambush10VictimID, 0; end; @@ -579,7 +579,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -623,7 +623,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush11_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 82, 65, 90, 72, "", 1089, $@Ambush11_Spawn, "#Ambush11::OnWolvernDeath"; + areamonster "034-1.gat", 82, 65, 90, 72, "", 1090, $@Ambush11_Spawn, "#Ambush11::OnWolvernDeath"; set $@Ambush11VictimID, 0; end; @@ -633,7 +633,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -677,7 +677,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush12_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 98, 76, 104, 81, "", 1089, $@Ambush12_Spawn, "#Ambush12::OnWolvernDeath"; + areamonster "034-1.gat", 98, 76, 104, 81, "", 1090, $@Ambush12_Spawn, "#Ambush12::OnWolvernDeath"; set $@Ambush12VictimID, 0; end; @@ -687,7 +687,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -731,7 +731,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush13_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 120, 86, 127, 90, "", 1089, $@Ambush13_Spawn, "#Ambush13::OnWolvernDeath"; + areamonster "034-1.gat", 120, 86, 127, 90, "", 1090, $@Ambush13_Spawn, "#Ambush13::OnWolvernDeath"; set $@Ambush13VictimID, 0; end; @@ -741,7 +741,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; @@ -785,7 +785,7 @@ OnAmbush: set @wolvern_amount, 10; // has to be same value as in birrod.txt set $@Ambush14_Spawn, 4 + rand(3); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 114, 100, 120, 106, "", 1089, $@Ambush14_Spawn, "#Ambush14::OnWolvernDeath"; + areamonster "034-1.gat", 114, 100, 120, 106, "", 1090, $@Ambush14_Spawn, "#Ambush14::OnWolvernDeath"; set $@Ambush14VictimID, 0; end; @@ -795,7 +795,7 @@ L_Abort: end; OnWolvernDeath: - set @MobID, 1089; // TODO: adapt + set @MobID, 1090; set @Q_Barbarians_MASK, NIBBLE_0_MASK; set @Q_Barbarians_SHIFT, NIBBLE_0_SHIFT; -- cgit v1.2.3-60-g2f50