diff options
| -rw-r--r-- | world/map/db/mob_db_over_100.txt | 1 | ||||
| -rw-r--r-- | world/map/db/mob_skill_db.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/annuals/halloween/debug.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/annuals/halloween/munro.txt | 71 |
4 files changed, 86 insertions, 0 deletions
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt index 7c84757c..11a5d1dd 100644 --- a/world/map/db/mob_db_over_100.txt +++ b/world/map/db/mob_db_over_100.txt @@ -39,3 +39,4 @@ 1134, SUSAN, SUSAN, 255, 696969, 0, 9000, 1400, 1, 0, 0, 69, 69, 69, 69, 69, 69, 69, 69, 1, 1, 1, 0, 29, 161, 1500, 1872, 672, 480, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1135, LovelyMaggot, LovelyMaggot, 1, 50, 0, 1, 1, 1, 69, 6969, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 200, 1872, 672, 480, 505, 400, 501, 70, 518, 200, 533, 75, 502, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1136, LesserGhost, LesserGhost, 1, 1, 0, 1, 1, 0, 150, 300, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 1, 29, 131, 340, 1800, 672, 950, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 +1137, Tormenta, Tormenta, 150, 200000, 60, 500000, 5000, 5, 360, 374, 48, 90, 1, 32, 60, 255, 255, 255, 31, 30, 1, 0, 69, 181, 210, 1200, 672, 50, 1279, 40, 1277, 40, 1276, 40, 1218, 40, 769, 50, 634, 40, 1221, 40, 2271, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/world/map/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt index 78c1d1c5..2461de70 100644 --- a/world/map/db/mob_skill_db.txt +++ b/world/map/db/mob_skill_db.txt @@ -79,3 +79,11 @@ 1134,SUSAN@NPC_EMOTION,idle,199,1,200,0,5000,yes,self,always,0,118,0,0,0,0, //1134,SUSAN@NPC_EMOTION,idle,199,1,200,0,5000,yes,target,always,0,104,0,0,0,0, <= FIXME! 1134,SUSAN@NPC_SUMMONSLAVE,any,198,9,1000,1000,5000,no,self,slavelt,69,1135,0,0,0,0, + +// Tormenta skills +// 7-8 permanent demonic spirits + 1 jack O every 70s + 1 witch guard every 150s + 1 demonic spirit every 30s + Poison +1137,Tormenta@NPC_SUMMONSLAVE_jackoX1,any,198,1,10000,1000,70000,no,self,slavelt,32,1022,0,0,0,0, +1137,Tormenta@NPC_SUMMONSLAVE_witchguardX1,any,198,1,10000,1000,150000,no,self,slavelt,32,1103,0,0,0,0, +1137,Tormenta@NPC_SUMMONSLAVE_demonicspiritX2,any,198,2,10000,10,5000,no,self,slavelt,7,1101,0,0,0,0, +1137,Tormenta@NPC_SUMMONSLAVE_demonicspiritX1,any,198,1,10000,10,30000,no,self,slavelt,64,1101,0,0,0,0, +1137,Tormenta@NPC_POISON,attack,178,10,100,0,500,yes,target,always,0,0,10,0,0,0, diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt index 8f3d066e..b9ca8ac3 100644 --- a/world/map/npc/annuals/halloween/debug.txt +++ b/world/map/npc/annuals/halloween/debug.txt @@ -13,6 +13,7 @@ L_Live: "Set Old Event Flag.", L_LastReset, "Halloween Time Key Change.", L_HalloweenTimeKey, "Reset NPC's mask memory", L_ResetMask, + "Summon Tormenta", L_Tormenta, "Nothing.", L_Close; L_Debug: @@ -24,6 +25,7 @@ L_Debug: "Set NPC trick or treat flag", L_SetTrickOrTreats, "Reset my quest state", L_ResetMe, "Reset NPC's mask memory", L_ResetMask, + "Summon Tormenta", L_Tormenta, "Nothing.", L_Close; L_DebugTime: @@ -129,6 +131,10 @@ L_ResetMask: set $@halloween_maskmemory[8 * @halloween_npc_id], 0; goto L_Debug; +L_Tormenta: + donpcevent "Munro::OnTormenta"; + goto L_Close; + L_Close: set @tmp, 0; set @mask, 0; diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt index feb71aea..03c81477 100644 --- a/world/map/npc/annuals/halloween/munro.txt +++ b/world/map/npc/annuals/halloween/munro.txt @@ -29,6 +29,77 @@ L_Halloween: L_Exit: close; + +OnTormentaDie: + // FIXME: This announce is not working (but is it important?) + announce "Tormenta was pushed back to the Abyss, but at Halloween, she's sure to be back soon.", 0; + end; + +// Spawn Tormenta if not alive and HW +OnClock0000: + goto L_Tormenta; +OnClock0100: + goto L_Tormenta; +OnClock0200: + goto L_Tormenta; +OnClock0300: + goto L_Tormenta; +OnClock0400: + goto L_Tormenta; +OnClock0500: + goto L_Tormenta; +OnClock0600: + goto L_Tormenta; +OnClock0700: + goto L_Tormenta; +OnClock0800: + goto L_Tormenta; +OnClock0900: + goto L_Tormenta; +OnClock1000: + goto L_Tormenta; +OnClock1100: + goto L_Tormenta; +OnClock1200: + goto L_Tormenta; +OnClock1300: + goto L_Tormenta; +OnClock1400: + goto L_Tormenta; +OnClock1500: + goto L_Tormenta; +OnClock1600: + goto L_Tormenta; +OnClock1700: + goto L_Tormenta; +OnClock1800: + goto L_Tormenta; +OnClock1900: + goto L_Tormenta; +OnClock2000: + goto L_Tormenta; +OnClock2100: + goto L_Tormenta; +OnClock2200: + goto L_Tormenta; +OnClock2300: + goto L_Tormenta; + +// Debug +OnTormenta: + goto L_Tormenta; + +L_Tormenta: + // Do not summon Tormenta outside Halloween, or while they're alive + if (!$@halloween_time) + end; + if (mobcount("057-1", "Munro::OnTormentaDie") >= 0) + end; + + // Spawn Tormenta and finish + monster "057-1", 126, 64, "Tormenta", 1137, 1, "Munro::OnTormentaDie"; + end; + } function|script|SpawnMunro { |