From 0a680a4c0ba9babb4e34ce1d892e6b10b836e422 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Fri, 20 Mar 2020 00:17:07 +0200 Subject: [PATCH] finish serpentine tower event and quest --- New Text Document.txt | 2 +- data/XML/quests.xml | 9 +- data/actions/actions.xml | 7 + data/actions/scripts/nostalrius/3.lua | 8 +- data/actions/scripts/nostalrius/4.lua | 10 +- .../serpentine_tower/behemoth_lever.lua | 22 ++ .../serpentine_tower/release_behemoth.lua | 9 + .../release_fire_elemental.lua | 9 + .../serpentine_tower/release_vampire.lua | 9 + .../serpentine_tower/vampire_lever.lua | 7 + data/lib/core/position.lua | 24 ++ data/monster/790 - Copy/apprentice sheng.xml | 60 +++++ data/monster/790 - Copy/betrayed wraith.xml | 75 ++++++ data/monster/790 - Copy/blightwalker.xml | 80 ++++++ data/monster/790 - Copy/countess sorrow.xml | 48 ++++ data/monster/790 - Copy/dark torturer.xml | 71 ++++++ data/monster/790 - Copy/defiler.xml | 75 ++++++ data/monster/790 - Copy/destroyer.xml | 74 ++++++ data/monster/790 - Copy/diabolic imp.xml | 78 ++++++ data/monster/790 - Copy/dracola.xml | 62 +++++ data/monster/790 - Copy/fury.xml | 91 +++++++ .../monster/790 - Copy/grynch clan goblin.xml | 100 ++++++++ .../790 - Copy/hand of cursed fate.xml | 84 +++++++ data/monster/790 - Copy/hellfire fighter.xml | 61 +++++ data/monster/790 - Copy/hellhound.xml | 89 +++++++ data/monster/790 - Copy/juggernaut.xml | 85 +++++++ data/monster/790 - Copy/lost soul.xml | 72 ++++++ data/monster/790 - Copy/massacre.xml | 41 +++ data/monster/790 - Copy/mr. punish.xml | 33 +++ data/monster/790 - Copy/munster.xml | 38 +++ data/monster/790 - Copy/nightmare.xml | 77 ++++++ data/monster/790 - Copy/nomad.xml | 51 ++++ data/monster/790 - Copy/phantasm summon.xml | 64 +++++ data/monster/790 - Copy/phantasm.xml | 88 +++++++ data/monster/790 - Copy/plaguesmith.xml | 88 +++++++ data/monster/790 - Copy/son of verminor.xml | 60 +++++ data/monster/790 - Copy/spectre.xml | 79 ++++++ data/monster/790 - Copy/the handmaiden.xml | 52 ++++ data/monster/790 - Copy/the imperor.xml | 85 +++++++ data/monster/790 - Copy/the plasmother.xml | 64 +++++ data/monster/790 - Copy/undead dragon.xml | 96 +++++++ data/monster/790 - Copy/wyvern.xml | 58 +++++ data/monster/790/UniqueItems.txt | 235 ++++++++++++++++++ data/monster/790/apprentice sheng.xml | 60 +++++ data/monster/790/betrayed wraith.xml | 75 ++++++ data/monster/790/blightwalker.xml | 80 ++++++ data/monster/790/countess sorrow.xml | 48 ++++ data/monster/790/dark torturer.xml | 71 ++++++ data/monster/790/defiler.xml | 75 ++++++ data/monster/790/destroyer.xml | 74 ++++++ data/monster/790/diabolic imp.xml | 78 ++++++ data/monster/790/dracola.xml | 62 +++++ data/monster/790/fury.xml | 91 +++++++ data/monster/790/grynch clan goblin.xml | 100 ++++++++ data/monster/790/hand of cursed fate.xml | 84 +++++++ data/monster/790/hellfire fighter.xml | 61 +++++ data/monster/790/hellhound.xml | 89 +++++++ data/monster/790/juggernaut.xml | 85 +++++++ data/monster/790/lost soul.xml | 72 ++++++ data/monster/790/massacre.xml | 41 +++ data/monster/790/mr. punish.xml | 33 +++ data/monster/790/munster.xml | 38 +++ data/monster/790/nightmare.xml | 77 ++++++ data/monster/790/nomad.xml | 51 ++++ data/monster/790/phantasm summon.xml | 64 +++++ data/monster/790/phantasm.xml | 88 +++++++ data/monster/790/plaguesmith.xml | 88 +++++++ data/monster/790/son of verminor.xml | 60 +++++ data/monster/790/spectre.xml | 79 ++++++ data/monster/790/the handmaiden.xml | 52 ++++ data/monster/790/the imperor.xml | 85 +++++++ data/monster/790/the plasmother.xml | 64 +++++ data/monster/790/undead dragon.xml | 96 +++++++ data/monster/790/wyvern.xml | 58 +++++ data/monster/monsters.xml | 33 +++ data/movements/movements.xml | 5 + .../scripts/serpentine_tower/final_tile.lua | 16 ++ .../serpentine_tower/humble_one_first.lua | 16 ++ .../take_waterwalking_boots.lua | 5 + data/npc/tothdral.npc | 6 +- data/talkactions/scripts/469.lua | 47 ++++ .../scripts/serpentine_tower_event.lua | 35 ++- data/talkactions/talkactions.xml | 1 + data/world792/map.otbm | Bin 79811529 -> 79811661 bytes 84 files changed, 4845 insertions(+), 28 deletions(-) create mode 100644 data/actions/scripts/serpentine_tower/behemoth_lever.lua create mode 100644 data/actions/scripts/serpentine_tower/release_behemoth.lua create mode 100644 data/actions/scripts/serpentine_tower/release_fire_elemental.lua create mode 100644 data/actions/scripts/serpentine_tower/release_vampire.lua create mode 100644 data/actions/scripts/serpentine_tower/vampire_lever.lua create mode 100644 data/monster/790 - Copy/apprentice sheng.xml create mode 100644 data/monster/790 - Copy/betrayed wraith.xml create mode 100644 data/monster/790 - Copy/blightwalker.xml create mode 100644 data/monster/790 - Copy/countess sorrow.xml create mode 100644 data/monster/790 - Copy/dark torturer.xml create mode 100644 data/monster/790 - Copy/defiler.xml create mode 100644 data/monster/790 - Copy/destroyer.xml create mode 100644 data/monster/790 - Copy/diabolic imp.xml create mode 100644 data/monster/790 - Copy/dracola.xml create mode 100644 data/monster/790 - Copy/fury.xml create mode 100644 data/monster/790 - Copy/grynch clan goblin.xml create mode 100644 data/monster/790 - Copy/hand of cursed fate.xml create mode 100644 data/monster/790 - Copy/hellfire fighter.xml create mode 100644 data/monster/790 - Copy/hellhound.xml create mode 100644 data/monster/790 - Copy/juggernaut.xml create mode 100644 data/monster/790 - Copy/lost soul.xml create mode 100644 data/monster/790 - Copy/massacre.xml create mode 100644 data/monster/790 - Copy/mr. punish.xml create mode 100644 data/monster/790 - Copy/munster.xml create mode 100644 data/monster/790 - Copy/nightmare.xml create mode 100644 data/monster/790 - Copy/nomad.xml create mode 100644 data/monster/790 - Copy/phantasm summon.xml create mode 100644 data/monster/790 - Copy/phantasm.xml create mode 100644 data/monster/790 - Copy/plaguesmith.xml create mode 100644 data/monster/790 - Copy/son of verminor.xml create mode 100644 data/monster/790 - Copy/spectre.xml create mode 100644 data/monster/790 - Copy/the handmaiden.xml create mode 100644 data/monster/790 - Copy/the imperor.xml create mode 100644 data/monster/790 - Copy/the plasmother.xml create mode 100644 data/monster/790 - Copy/undead dragon.xml create mode 100644 data/monster/790 - Copy/wyvern.xml create mode 100644 data/monster/790/UniqueItems.txt create mode 100644 data/monster/790/apprentice sheng.xml create mode 100644 data/monster/790/betrayed wraith.xml create mode 100644 data/monster/790/blightwalker.xml create mode 100644 data/monster/790/countess sorrow.xml create mode 100644 data/monster/790/dark torturer.xml create mode 100644 data/monster/790/defiler.xml create mode 100644 data/monster/790/destroyer.xml create mode 100644 data/monster/790/diabolic imp.xml create mode 100644 data/monster/790/dracola.xml create mode 100644 data/monster/790/fury.xml create mode 100644 data/monster/790/grynch clan goblin.xml create mode 100644 data/monster/790/hand of cursed fate.xml create mode 100644 data/monster/790/hellfire fighter.xml create mode 100644 data/monster/790/hellhound.xml create mode 100644 data/monster/790/juggernaut.xml create mode 100644 data/monster/790/lost soul.xml create mode 100644 data/monster/790/massacre.xml create mode 100644 data/monster/790/mr. punish.xml create mode 100644 data/monster/790/munster.xml create mode 100644 data/monster/790/nightmare.xml create mode 100644 data/monster/790/nomad.xml create mode 100644 data/monster/790/phantasm summon.xml create mode 100644 data/monster/790/phantasm.xml create mode 100644 data/monster/790/plaguesmith.xml create mode 100644 data/monster/790/son of verminor.xml create mode 100644 data/monster/790/spectre.xml create mode 100644 data/monster/790/the handmaiden.xml create mode 100644 data/monster/790/the imperor.xml create mode 100644 data/monster/790/the plasmother.xml create mode 100644 data/monster/790/undead dragon.xml create mode 100644 data/monster/790/wyvern.xml create mode 100644 data/movements/scripts/serpentine_tower/final_tile.lua create mode 100644 data/movements/scripts/serpentine_tower/humble_one_first.lua create mode 100644 data/movements/scripts/serpentine_tower/take_waterwalking_boots.lua create mode 100644 data/talkactions/scripts/469.lua diff --git a/New Text Document.txt b/New Text Document.txt index 56c6056..f4e762a 100644 --- a/New Text Document.txt +++ b/New Text Document.txt @@ -1 +1 @@ -next: 17597 \ No newline at end of file +next: 17607 \ No newline at end of file diff --git a/data/XML/quests.xml b/data/XML/quests.xml index 15cb1ac..7205564 100644 --- a/data/XML/quests.xml +++ b/data/XML/quests.xml @@ -391,9 +391,12 @@ - - - + + + + + + diff --git a/data/actions/actions.xml b/data/actions/actions.xml index 8a33376..32dc466 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -85,6 +85,13 @@ + + + + + + + diff --git a/data/actions/scripts/nostalrius/3.lua b/data/actions/scripts/nostalrius/3.lua index 66f7438..4ed7b1f 100644 --- a/data/actions/scripts/nostalrius/3.lua +++ b/data/actions/scripts/nostalrius/3.lua @@ -1,11 +1,9 @@ function onUse(player, item, fromPosition, target, toPosition) - if item:getId() == 2772 and Game.isItemThere({x = 33148, y = 32867, z = 09}, 2129) and Game.isItemThere ({x = 33149, y = 32867, z = 09}, 2129) and Game.isItemThere ({x = 33148, y = 32868, z = 09}, 2129) and Game.isItemThere ({x = 33149, y = 32868, z = 09}, 2129) then + if item:getId() == 2772 and Game.isItemThere({x = 33148, y = 32867, z = 09}, 2129) and Game.isItemThere ({x = 33149, y = 32867, z = 09}, 2129) then item:transform(2773, 1) item:decay() Game.removeItemOnMap({x = 33148, y = 32867, z = 09}, 2129) Game.removeItemOnMap({x = 33149, y = 32867, z = 09}, 2129) - Game.removeItemOnMap({x = 33148, y = 32868, z = 09}, 2129) - Game.removeItemOnMap({x = 33149, y = 32868, z = 09}, 2129) elseif item:getId() == 2772 then item:transform(2773, 1) item:decay() @@ -17,12 +15,8 @@ function onUse(player, item, fromPosition, target, toPosition) item:decay() doRelocate({x = 33148, y = 32867, z = 09}, {x = 33148, y = 32869, z = 09}) doRelocate({x = 33149, y = 32867, z = 09}, {x = 33149, y = 32869, z = 09}) - doRelocate({x = 33148, y = 32868, z = 09}, {x = 33148, y = 32869, z = 09}) - doRelocate({x = 33149, y = 32868, z = 09},{x = 33149, y = 32869, z = 09}) Game.createItem(2129, 1, {x = 33148, y = 32867, z = 09}) Game.createItem(2129, 1, {x = 33149, y = 32867, z = 09}) - Game.createItem(2129, 1, {x = 33148, y = 32868, z = 09}) - Game.createItem(2129, 1, {x = 33149, y = 32868, z = 09}) end return true end \ No newline at end of file diff --git a/data/actions/scripts/nostalrius/4.lua b/data/actions/scripts/nostalrius/4.lua index 9ca8929..2d20475 100644 --- a/data/actions/scripts/nostalrius/4.lua +++ b/data/actions/scripts/nostalrius/4.lua @@ -1,7 +1,15 @@ function onUse(player, item, fromPosition, target, toPosition) - if item:getId() == 2772 then + if item:getId() == 2772 and Game.isItemThere({x = 33147, y = 32862, z = 9}, 3246) and Game.isItemThere({x = 33144, y = 32868, z = 8}, 1653) and getGlobalStorageValue(21411) == -1 then item:transform(2773, 1) item:decay() + Game.sendMagicEffect({x = 33147, y = 32862, z = 9}, CONST_ME_SOUND_WHITE) + Game.sendMagicEffect({x = 33145, y = 32870, z = 8}, CONST_ME_SOUND_YELLOW) + doRelocate({x = 33147, y = 32862, z = 9}, {x = 33145, y = 32870, z = 8}) + Game.removeItemOnMap({x = 33144, y = 32868, z = 8}, 1653) + Game.createItem(1654, 1, {x = 33144, y = 32868, z = 8}) + setGlobalStorageValue(21411, 1) + player:setStorageValue(17605, 1) + broadcastMessage("The player " .. player:getName() .. " have solved the Serpentine Tower!", MESSAGE_STATUS_WARNING) elseif item:getId() == 2773 then item:transform(2772, 1) item:decay() diff --git a/data/actions/scripts/serpentine_tower/behemoth_lever.lua b/data/actions/scripts/serpentine_tower/behemoth_lever.lua new file mode 100644 index 0000000..876acf9 --- /dev/null +++ b/data/actions/scripts/serpentine_tower/behemoth_lever.lua @@ -0,0 +1,22 @@ +function onUse(player, item, fromPosition, target, toPosition) + if item:getId() == 2772 and Game.isItemThere ({x = 33148, y = 32868, z = 09}, 2129) and Game.isItemThere ({x = 33149, y = 32868, z = 09}, 2129) then + item:transform(2773, 1) + item:decay() + Game.removeItemOnMap({x = 33148, y = 32868, z = 09}, 2129) + Game.removeItemOnMap({x = 33149, y = 32868, z = 09}, 2129) + elseif item:getId() == 2772 then + item:transform(2773, 1) + item:decay() + elseif item:getId() == 2773 and Game.isItemThere({x = 33148, y = 32868, z = 9}, 2129) then + item:transform(2772, 1) + item:decay() + elseif item:getId() == 2773 then + item:transform(2772, 1) + item:decay() + doRelocate({x = 33148, y = 32868, z = 09}, {x = 33148, y = 32869, z = 09}) + doRelocate({x = 33149, y = 32868, z = 09},{x = 33149, y = 32869, z = 09}) + Game.createItem(2129, 1, {x = 33148, y = 32868, z = 09}) + Game.createItem(2129, 1, {x = 33149, y = 32868, z = 09}) + end + return true +end \ No newline at end of file diff --git a/data/actions/scripts/serpentine_tower/release_behemoth.lua b/data/actions/scripts/serpentine_tower/release_behemoth.lua new file mode 100644 index 0000000..ec74aa6 --- /dev/null +++ b/data/actions/scripts/serpentine_tower/release_behemoth.lua @@ -0,0 +1,9 @@ +function onUse(player, item, fromPosition, target, toPosition) + if item:getId() == 2931 and Game.isItemThere({x = 33151, y = 32864, z = 8},1345) then + Game.removeItemOnMap({x = 33151, y = 32864, z = 8}, 1345) + Game.sendMagicEffect({x = 33146, y = 32871, z = 8}, 14) + elseif item:getId() == 2931 then + Game.sendMagicEffect({x = 33146, y = 32871, z = 8}, 3) + end + return true +end \ No newline at end of file diff --git a/data/actions/scripts/serpentine_tower/release_fire_elemental.lua b/data/actions/scripts/serpentine_tower/release_fire_elemental.lua new file mode 100644 index 0000000..b517f53 --- /dev/null +++ b/data/actions/scripts/serpentine_tower/release_fire_elemental.lua @@ -0,0 +1,9 @@ +function onUse(player, item, fromPosition, target, toPosition) + if item:getId() == 2929 and Game.isItemThere({x = 33151, y = 32866, z = 08},1345) then + Game.removeItemOnMap({x = 33151, y = 32866, z = 08}, 1345) + Game.sendMagicEffect({x = 33148, y = 32861, z = 8}, 14) + elseif item:getId() == 2929 then + Game.sendMagicEffect({x = 33148, y = 32861, z = 8}, 3) + end + return true +end \ No newline at end of file diff --git a/data/actions/scripts/serpentine_tower/release_vampire.lua b/data/actions/scripts/serpentine_tower/release_vampire.lua new file mode 100644 index 0000000..e73ea5c --- /dev/null +++ b/data/actions/scripts/serpentine_tower/release_vampire.lua @@ -0,0 +1,9 @@ +function onUse(player, item, fromPosition, target, toPosition) + if item:getId() == 2931 and Game.isItemThere({x = 33151, y = 32868, z = 8}, 1345) then + Game.removeItemOnMap({x = 33151, y = 32868, z = 8}, 1345) + Game.sendMagicEffect({x = 33145, y = 32865, z = 8}, 14) + elseif item:getId() == 2931 then + Game.sendMagicEffect({x = 33145, y = 32865, z = 8}, 3) + end + return true +end \ No newline at end of file diff --git a/data/actions/scripts/serpentine_tower/vampire_lever.lua b/data/actions/scripts/serpentine_tower/vampire_lever.lua new file mode 100644 index 0000000..4d6948e --- /dev/null +++ b/data/actions/scripts/serpentine_tower/vampire_lever.lua @@ -0,0 +1,7 @@ +function onUse(player, item, fromPosition, target, toPosition) + if item:getId() == 2772 and Game.isItemThere({x = 33145, y = 32863, z = 8}, 1650) then + Game.removeItemOnMap({x = 33145, y = 32863, z = 8}, 1650) + Game.createItem(1651, 1, {x = 33145, y = 32863, z = 8}) + end + return true +end \ No newline at end of file diff --git a/data/lib/core/position.lua b/data/lib/core/position.lua index 9350d4d..d5d3a92 100644 --- a/data/lib/core/position.lua +++ b/data/lib/core/position.lua @@ -72,4 +72,28 @@ function Position:moveRel(x, y, z) self.y = self.y + y self.z = self.z + z return self +end + +function Position:isInRange(from, to) + -- No matter what corner from and to is, we want to make + -- life easier by calculating north-west and south-east + local zone = { + nW = { + x = (from.x < to.x and from.x or to.x), + y = (from.y < to.y and from.y or to.y), + z = (from.z < to.z and from.z or to.z) + }, + sE = { + x = (to.x > from.x and to.x or from.x), + y = (to.y > from.y and to.y or from.y), + z = (to.z > from.z and to.z or from.z) + } + } + + if self.x >= zone.nW.x and self.x <= zone.sE.x + and self.y >= zone.nW.y and self.y <= zone.sE.y + and self.z >= zone.nW.z and self.z <= zone.sE.z then + return true + end + return false end \ No newline at end of file diff --git a/data/monster/790 - Copy/apprentice sheng.xml b/data/monster/790 - Copy/apprentice sheng.xml new file mode 100644 index 0000000..f65af9c --- /dev/null +++ b/data/monster/790 - Copy/apprentice sheng.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/betrayed wraith.xml b/data/monster/790 - Copy/betrayed wraith.xml new file mode 100644 index 0000000..dafa867 --- /dev/null +++ b/data/monster/790 - Copy/betrayed wraith.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/blightwalker.xml b/data/monster/790 - Copy/blightwalker.xml new file mode 100644 index 0000000..69acd99 --- /dev/null +++ b/data/monster/790 - Copy/blightwalker.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/countess sorrow.xml b/data/monster/790 - Copy/countess sorrow.xml new file mode 100644 index 0000000..3b6011d --- /dev/null +++ b/data/monster/790 - Copy/countess sorrow.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/dark torturer.xml b/data/monster/790 - Copy/dark torturer.xml new file mode 100644 index 0000000..500684f --- /dev/null +++ b/data/monster/790 - Copy/dark torturer.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/defiler.xml b/data/monster/790 - Copy/defiler.xml new file mode 100644 index 0000000..f05fe4e --- /dev/null +++ b/data/monster/790 - Copy/defiler.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/destroyer.xml b/data/monster/790 - Copy/destroyer.xml new file mode 100644 index 0000000..0baadcb --- /dev/null +++ b/data/monster/790 - Copy/destroyer.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/diabolic imp.xml b/data/monster/790 - Copy/diabolic imp.xml new file mode 100644 index 0000000..4fb15e3 --- /dev/null +++ b/data/monster/790 - Copy/diabolic imp.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/dracola.xml b/data/monster/790 - Copy/dracola.xml new file mode 100644 index 0000000..dd7a14e --- /dev/null +++ b/data/monster/790 - Copy/dracola.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/fury.xml b/data/monster/790 - Copy/fury.xml new file mode 100644 index 0000000..3c18342 --- /dev/null +++ b/data/monster/790 - Copy/fury.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/grynch clan goblin.xml b/data/monster/790 - Copy/grynch clan goblin.xml new file mode 100644 index 0000000..fe14a4d --- /dev/null +++ b/data/monster/790 - Copy/grynch clan goblin.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/hand of cursed fate.xml b/data/monster/790 - Copy/hand of cursed fate.xml new file mode 100644 index 0000000..b31cf8b --- /dev/null +++ b/data/monster/790 - Copy/hand of cursed fate.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/hellfire fighter.xml b/data/monster/790 - Copy/hellfire fighter.xml new file mode 100644 index 0000000..72d8a00 --- /dev/null +++ b/data/monster/790 - Copy/hellfire fighter.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/hellhound.xml b/data/monster/790 - Copy/hellhound.xml new file mode 100644 index 0000000..e360553 --- /dev/null +++ b/data/monster/790 - Copy/hellhound.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/juggernaut.xml b/data/monster/790 - Copy/juggernaut.xml new file mode 100644 index 0000000..2338894 --- /dev/null +++ b/data/monster/790 - Copy/juggernaut.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/lost soul.xml b/data/monster/790 - Copy/lost soul.xml new file mode 100644 index 0000000..be30476 --- /dev/null +++ b/data/monster/790 - Copy/lost soul.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/massacre.xml b/data/monster/790 - Copy/massacre.xml new file mode 100644 index 0000000..0ca4892 --- /dev/null +++ b/data/monster/790 - Copy/massacre.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/mr. punish.xml b/data/monster/790 - Copy/mr. punish.xml new file mode 100644 index 0000000..0238e88 --- /dev/null +++ b/data/monster/790 - Copy/mr. punish.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/munster.xml b/data/monster/790 - Copy/munster.xml new file mode 100644 index 0000000..6dea759 --- /dev/null +++ b/data/monster/790 - Copy/munster.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/nightmare.xml b/data/monster/790 - Copy/nightmare.xml new file mode 100644 index 0000000..549b3cc --- /dev/null +++ b/data/monster/790 - Copy/nightmare.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/nomad.xml b/data/monster/790 - Copy/nomad.xml new file mode 100644 index 0000000..4939b28 --- /dev/null +++ b/data/monster/790 - Copy/nomad.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/phantasm summon.xml b/data/monster/790 - Copy/phantasm summon.xml new file mode 100644 index 0000000..65237bc --- /dev/null +++ b/data/monster/790 - Copy/phantasm summon.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/phantasm.xml b/data/monster/790 - Copy/phantasm.xml new file mode 100644 index 0000000..aecd1ed --- /dev/null +++ b/data/monster/790 - Copy/phantasm.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/plaguesmith.xml b/data/monster/790 - Copy/plaguesmith.xml new file mode 100644 index 0000000..623e8ff --- /dev/null +++ b/data/monster/790 - Copy/plaguesmith.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/son of verminor.xml b/data/monster/790 - Copy/son of verminor.xml new file mode 100644 index 0000000..0222a50 --- /dev/null +++ b/data/monster/790 - Copy/son of verminor.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/spectre.xml b/data/monster/790 - Copy/spectre.xml new file mode 100644 index 0000000..2dd8227 --- /dev/null +++ b/data/monster/790 - Copy/spectre.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/the handmaiden.xml b/data/monster/790 - Copy/the handmaiden.xml new file mode 100644 index 0000000..335493f --- /dev/null +++ b/data/monster/790 - Copy/the handmaiden.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/the imperor.xml b/data/monster/790 - Copy/the imperor.xml new file mode 100644 index 0000000..b7482e2 --- /dev/null +++ b/data/monster/790 - Copy/the imperor.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/the plasmother.xml b/data/monster/790 - Copy/the plasmother.xml new file mode 100644 index 0000000..cc35111 --- /dev/null +++ b/data/monster/790 - Copy/the plasmother.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/undead dragon.xml b/data/monster/790 - Copy/undead dragon.xml new file mode 100644 index 0000000..98786d5 --- /dev/null +++ b/data/monster/790 - Copy/undead dragon.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790 - Copy/wyvern.xml b/data/monster/790 - Copy/wyvern.xml new file mode 100644 index 0000000..6bc0d49 --- /dev/null +++ b/data/monster/790 - Copy/wyvern.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/UniqueItems.txt b/data/monster/790/UniqueItems.txt new file mode 100644 index 0000000..13502d8 --- /dev/null +++ b/data/monster/790/UniqueItems.txt @@ -0,0 +1,235 @@ +{5878, 5878}, +{2162, 3046}, +{2148, 3031}, +{2050, 2920}, +{2649, 3559}, +{2403, 3291}, +{2461, 3355}, +{2152, 3035}, +{6558, 6558}, +{2547, 3450}, +{6500, 0000}, +{11233, 0000}, +{7590, 0000}, +{8473, 0000}, +{2145, 3028}, +{7368, 0000}, +{5944, 5944}, +{5022, 5021}, +{7386, 0000}, +{6300, 6299}, +{5741, 5741}, +{5799, 5799}, +{7416, 0000}, +{2694, 3605}, +{2260, 3147}, +{10605, 0000}, +{2183, 3067}, +// TODO NUO CIA +{9971, 0000}, +{7632, 0000}, +{7633, 0000}, +{7732, 0000}, +{2550, 0000}, +{7885, 0000}, +{2199, 0000}, +{2179, 0000}, +{2436, 0000}, +{7884, 0000}, +{2418, 0000}, +{2173, 0000}, +{6536, 0000}, +{2671, 0000}, +{7591, 0000}, +{2645, 0000}, +{2558, 0000}, +{5480, 0000}, +{7412, 0000}, +{5801, 0000}, +{7388, 0000}, +{2470, 0000}, +{9967, 0000}, +{9968, 0000}, +{2151, 0000}, +{2158, 0000}, +{2149, 0000}, +{2147, 0000}, +{2156, 0000}, +{2154, 0000}, +{2155, 0000}, +{2666, 0000}, +{2416, 0000}, +{2546, 0000}, +{2489, 0000}, +{2150, 0000}, +{11215, 0000}, +{2553, 0000}, +{2463, 0000}, +{2393, 0000}, +{7427, 0000}, +{7419, 0000}, +{2125, 0000}, +{2178, 0000}, +{2548, 0000}, +{2515, 0000}, +{2568, 0000}, +{2419, 0000}, +{2165, 0000}, +{2387, 0000}, +{7899, 0000}, +{7900, 0000}, +{2185, 0000}, +{6546, 0000}, +{7456, 0000}, +{5911, 0000}, +{9813, 0000}, +{2120, 0000}, +{2181, 0000}, +{7404, 0000}, +{2124, 0000}, +{8844, 0000}, +{6301, 0000}, +{6497, 0000}, +{2111, 0000}, +{6277, 0000}, +{2675, 0000}, +{2687, 0000}, +{2679, 0000}, +{2674, 0000}, +{2328, 0000}, +{2688, 0000}, +{2072, 0000}, +{2163, 0000}, +{1852, 0000}, +{2172, 0000}, +{1949, 0000}, +{6501, 0000}, +{2661, 0000}, +{5890, 0000}, +{5894, 0000}, +{5902, 0000}, +{4873, 0000}, +{7909, 0000}, +{7910, 0000}, +{6393, 0000}, +{6091, 0000}, +{2551, 0000}, +{2114, 0000}, +{5792, 0000}, +{2560, 0000}, +{1686, 0000}, +{1687, 0000}, +{1688, 0000}, +{1689, 0000}, +{2102, 0000}, +{4839, 0000}, +{2159, 0000}, +{2160, 0000}, +{7731, 0000}, +{2534, 0000}, +{2146, 0000}, +{7365, 0000}, +{2127, 0000}, +{2200, 0000}, +{2187, 0000}, +{2476, 0000}, +{2487, 0000}, +{2167, 0000}, +{2171, 0000}, +{7414, 0000}, +{2153, 0000}, +{2195, 0000}, +{5669, 0000}, +{2268, 0000}, +{2239, 0000}, +{10553, 0000}, +{10581, 0000}, +{2392, 0000}, +{7894, 0000}, +{13757, 0000}, +{2432, 0000}, +{2136, 0000}, +{2144, 0000}, +{2231, 0000}, +{9810, 0000}, +{2430, 0000}, +{2383, 0000}, +{6553, 0000}, +{10554, 0000}, +{7452, 0000}, +{2466, 0000}, +{2578, 0000}, +{2514, 0000}, +{2434, 0000}, +{7413, 0000}, +{2228, 0000}, +{8889, 0000}, +{2452, 0000}, +{2454, 0000}, +{2143, 0000}, +{5806, 0000}, +{9809, 0000}, +{2197, 0000}, +{2133, 0000}, +{6526, 0000}, +{7407, 0000}, +{2528, 0000}, +{6540, 0000}, +{6537, 0000}, +{2449, 0000}, +{2696, 0000}, +{3976, 0000}, +{11223, 0000}, +{11229, 0000}, +{2532, 0000}, +{2477, 0000}, +{12448, 0000}, +{8838, 0000}, +{2386, 0000}, +{2465, 0000}, +{2398, 0000}, +{12412, 0000}, +{2509, 0000}, +{2459, 0000}, +{8267, 0000}, +{2804, 0000}, +{7451, 0000}, +{9970, 0000}, +{2237, 0000}, +{2235, 0000}, +{2394, 0000}, +{2377, 0000}, +{2225, 0000}, +{2417, 0000}, +{2209, 0000}, +{2208, 0000}, +{2391, 0000}, +{2134, 0000}, +{5887, 0000}, +{5889, 0000}, +{5888, 0000}, +{2444, 0000}, +{3957, 0000}, +{2189, 0000}, +{2071, 0000}, +{7383, 0000}, +{5909, 0000}, +{11227, 0000}, +{6539, 0000}, +{6534, 0000}, +{6529, 0000}, +{2464, 0000}, +{7891, 0000}, +{6535, 0000}, +{2033, 0000}, +{7430, 0000}, +{2177, 0000}, +{5925, 0000}, +{2498, 0000}, +{8885, 0000}, +{7402, 0000}, +{11355, 0000}, +{2672, 0000}, +{7588, 0000}, +{7408, 0000}, +{10561, 0000}, diff --git a/data/monster/790/apprentice sheng.xml b/data/monster/790/apprentice sheng.xml new file mode 100644 index 0000000..f65af9c --- /dev/null +++ b/data/monster/790/apprentice sheng.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/betrayed wraith.xml b/data/monster/790/betrayed wraith.xml new file mode 100644 index 0000000..dafa867 --- /dev/null +++ b/data/monster/790/betrayed wraith.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/blightwalker.xml b/data/monster/790/blightwalker.xml new file mode 100644 index 0000000..69acd99 --- /dev/null +++ b/data/monster/790/blightwalker.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/countess sorrow.xml b/data/monster/790/countess sorrow.xml new file mode 100644 index 0000000..3b6011d --- /dev/null +++ b/data/monster/790/countess sorrow.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/dark torturer.xml b/data/monster/790/dark torturer.xml new file mode 100644 index 0000000..500684f --- /dev/null +++ b/data/monster/790/dark torturer.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/defiler.xml b/data/monster/790/defiler.xml new file mode 100644 index 0000000..f05fe4e --- /dev/null +++ b/data/monster/790/defiler.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/destroyer.xml b/data/monster/790/destroyer.xml new file mode 100644 index 0000000..0baadcb --- /dev/null +++ b/data/monster/790/destroyer.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/diabolic imp.xml b/data/monster/790/diabolic imp.xml new file mode 100644 index 0000000..4fb15e3 --- /dev/null +++ b/data/monster/790/diabolic imp.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/dracola.xml b/data/monster/790/dracola.xml new file mode 100644 index 0000000..dd7a14e --- /dev/null +++ b/data/monster/790/dracola.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/fury.xml b/data/monster/790/fury.xml new file mode 100644 index 0000000..3c18342 --- /dev/null +++ b/data/monster/790/fury.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/grynch clan goblin.xml b/data/monster/790/grynch clan goblin.xml new file mode 100644 index 0000000..fe14a4d --- /dev/null +++ b/data/monster/790/grynch clan goblin.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/hand of cursed fate.xml b/data/monster/790/hand of cursed fate.xml new file mode 100644 index 0000000..b31cf8b --- /dev/null +++ b/data/monster/790/hand of cursed fate.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/hellfire fighter.xml b/data/monster/790/hellfire fighter.xml new file mode 100644 index 0000000..72d8a00 --- /dev/null +++ b/data/monster/790/hellfire fighter.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/hellhound.xml b/data/monster/790/hellhound.xml new file mode 100644 index 0000000..e360553 --- /dev/null +++ b/data/monster/790/hellhound.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/juggernaut.xml b/data/monster/790/juggernaut.xml new file mode 100644 index 0000000..2338894 --- /dev/null +++ b/data/monster/790/juggernaut.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/lost soul.xml b/data/monster/790/lost soul.xml new file mode 100644 index 0000000..be30476 --- /dev/null +++ b/data/monster/790/lost soul.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/massacre.xml b/data/monster/790/massacre.xml new file mode 100644 index 0000000..0ca4892 --- /dev/null +++ b/data/monster/790/massacre.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/mr. punish.xml b/data/monster/790/mr. punish.xml new file mode 100644 index 0000000..0238e88 --- /dev/null +++ b/data/monster/790/mr. punish.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/munster.xml b/data/monster/790/munster.xml new file mode 100644 index 0000000..6dea759 --- /dev/null +++ b/data/monster/790/munster.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/nightmare.xml b/data/monster/790/nightmare.xml new file mode 100644 index 0000000..549b3cc --- /dev/null +++ b/data/monster/790/nightmare.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/nomad.xml b/data/monster/790/nomad.xml new file mode 100644 index 0000000..4939b28 --- /dev/null +++ b/data/monster/790/nomad.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/phantasm summon.xml b/data/monster/790/phantasm summon.xml new file mode 100644 index 0000000..65237bc --- /dev/null +++ b/data/monster/790/phantasm summon.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/phantasm.xml b/data/monster/790/phantasm.xml new file mode 100644 index 0000000..aecd1ed --- /dev/null +++ b/data/monster/790/phantasm.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/plaguesmith.xml b/data/monster/790/plaguesmith.xml new file mode 100644 index 0000000..623e8ff --- /dev/null +++ b/data/monster/790/plaguesmith.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/son of verminor.xml b/data/monster/790/son of verminor.xml new file mode 100644 index 0000000..0222a50 --- /dev/null +++ b/data/monster/790/son of verminor.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/spectre.xml b/data/monster/790/spectre.xml new file mode 100644 index 0000000..2dd8227 --- /dev/null +++ b/data/monster/790/spectre.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/the handmaiden.xml b/data/monster/790/the handmaiden.xml new file mode 100644 index 0000000..335493f --- /dev/null +++ b/data/monster/790/the handmaiden.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/the imperor.xml b/data/monster/790/the imperor.xml new file mode 100644 index 0000000..b7482e2 --- /dev/null +++ b/data/monster/790/the imperor.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/the plasmother.xml b/data/monster/790/the plasmother.xml new file mode 100644 index 0000000..cc35111 --- /dev/null +++ b/data/monster/790/the plasmother.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/undead dragon.xml b/data/monster/790/undead dragon.xml new file mode 100644 index 0000000..98786d5 --- /dev/null +++ b/data/monster/790/undead dragon.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/790/wyvern.xml b/data/monster/790/wyvern.xml new file mode 100644 index 0000000..6bc0d49 --- /dev/null +++ b/data/monster/790/wyvern.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml index 7debe5d..05442f0 100644 --- a/data/monster/monsters.xml +++ b/data/monster/monsters.xml @@ -208,4 +208,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/movements/movements.xml b/data/movements/movements.xml index b757a35..675fac7 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -395,6 +395,11 @@ + + + + + diff --git a/data/movements/scripts/serpentine_tower/final_tile.lua b/data/movements/scripts/serpentine_tower/final_tile.lua new file mode 100644 index 0000000..a64af08 --- /dev/null +++ b/data/movements/scripts/serpentine_tower/final_tile.lua @@ -0,0 +1,16 @@ +function onStepIn(creature, item, position, fromPosition) + local player = creature:getPlayer() + if not player then + return true + end + + if player:getOutfit().lookType ~= 17 then + position.y = position.y + 1 + player:teleportTo(position) + Game.sendMagicEffect(player:getPosition(), CONST_ME_ENERGYHIT) + player:addHealth(-20) + return true + end + + return true +end diff --git a/data/movements/scripts/serpentine_tower/humble_one_first.lua b/data/movements/scripts/serpentine_tower/humble_one_first.lua new file mode 100644 index 0000000..f5b5cb9 --- /dev/null +++ b/data/movements/scripts/serpentine_tower/humble_one_first.lua @@ -0,0 +1,16 @@ +function onStepIn(creature, item, position, fromPosition) + local player = creature:getPlayer() + if not player then + return true + end + + if player:getStorageValue(17605) ~= 1 and Game.isItemThere({x = 33145, y = 32870, z = 8}, 3246) then + position.y = position.y - 5 + player:teleportTo(position) + Game.sendMagicEffect(player:getPosition(), CONST_ME_HITAREA) + Position(33145, 32870, 8):sendMonsterSay("Only the humble can touch the boots!") + return true + end + + return true +end diff --git a/data/movements/scripts/serpentine_tower/take_waterwalking_boots.lua b/data/movements/scripts/serpentine_tower/take_waterwalking_boots.lua new file mode 100644 index 0000000..d96e0a8 --- /dev/null +++ b/data/movements/scripts/serpentine_tower/take_waterwalking_boots.lua @@ -0,0 +1,5 @@ +function onRemoveItem(item, tileitem, position) + if item:getId() == 3246 then + Position(33145, 32870, 8):sendMonsterSay("Ancient Eye: Be Greeted The Humble One!") + end +end \ No newline at end of file diff --git a/data/npc/tothdral.npc b/data/npc/tothdral.npc index 060c3b0..0bb4771 100644 --- a/data/npc/tothdral.npc +++ b/data/npc/tothdral.npc @@ -7,9 +7,9 @@ Home = [33148,32867,6] Radius = 2 Behaviour = { -ADDRESS,"hello$",! -> "Be mourned, pilgrim in flesh." -ADDRESS,"hi$",! -> "Be mourned, pilgrim in flesh." -ADDRESS,"be","mourned","pilgrim","flesh",! -> "Be mourned pilgrim in flesh." +ADDRESS,"hello$",! -> "I knew this day will come. True Gods are here soon!",Idle +ADDRESS,"hi$",! -> "I knew this day will come. True Gods are here soon!",Idle +ADDRESS,"be","mourned","pilgrim","flesh",! -> "Piligrim in flesh. False Gods were nothing but minor servants!",Idle ADDRESS,! -> Idle BUSY,"hello$",! -> "Mourned %N, know that I am busy.", Queue diff --git a/data/talkactions/scripts/469.lua b/data/talkactions/scripts/469.lua new file mode 100644 index 0000000..a3fdb57 --- /dev/null +++ b/data/talkactions/scripts/469.lua @@ -0,0 +1,47 @@ +local area = { + fromPos = {x = 33144, y = 32863, z = 7}, + toPos = {x = 33154, y = 32873, z = 7} +} + +function onSay(player, words, param) + if player:getPosition():isInRange(area.fromPos, area.toPos) then + local tile1 = Tile(Position(33147, 32868, 7)) + if tile1 then + local stoneRailing = tile1:getItemById(2212) + if stoneRailing ~= nil then + stoneRailing:getPosition():sendMagicEffect(CONST_ME_TELEPORT) + stoneRailing:remove() + broadcastMessage("The player " .. player:getName() .. " have opened The Serpentine Tower!", MESSAGE_STATUS_WARNING) + end + end + + local tile2 = Tile(Position(33149, 32866, 7)) + if tile2 then + local stoneRailing = tile2:getItemById(2210) + if stoneRailing ~= nil then + stoneRailing:getPosition():sendMagicEffect(CONST_ME_TELEPORT) + stoneRailing:remove() + end + end + + local tile3 = Tile(Position(33151, 32868, 7)) + if tile3 then + local stoneRailing = tile3:getItemById(2211) + if stoneRailing ~= nil then + stoneRailing:getPosition():sendMagicEffect(CONST_ME_TELEPORT) + stoneRailing:remove() + end + end + + local tile4 = Tile(Position(33149, 32870, 7)) + if tile4 then + local stoneRailing = tile4:getItemById(2209) + if stoneRailing ~= nil then + stoneRailing:getPosition():sendMagicEffect(CONST_ME_TELEPORT) + stoneRailing:remove() + end + end + end + + return true +end \ No newline at end of file diff --git a/data/talkactions/scripts/serpentine_tower_event.lua b/data/talkactions/scripts/serpentine_tower_event.lua index 5d0734e..fed0e92 100644 --- a/data/talkactions/scripts/serpentine_tower_event.lua +++ b/data/talkactions/scripts/serpentine_tower_event.lua @@ -62,24 +62,25 @@ function onSay(player, words, param) return false end - -- TODO: Implement that all people are teleported near serpentine tower and after event finish all teleported to temple and then server save teleportPlayersToSerpentineTower() - addEvent(wave1, 10000) - addEvent(wave2, 30000) - addEvent(wave3, 90000) - addEvent(wave4, 150000) - addEvent(wave5, 160000) - addEvent(wave6, 165000) - addEvent(wave7, 170000) - addEvent(wave8, 175000) + addEvent(wave1, 20000) + addEvent(wave2, 40000) + addEvent(wave3, 100000) + addEvent(wave4, 160000) + addEvent(wave5, 170000) + addEvent(wave6, 175000) + addEvent(wave7, 180000) + addEvent(wave8, 195000) + addEvent(wave9, 205000) return false end function teleportPlayersToSerpentineTower() for _, player in ipairs(Game.getPlayers()) do + player:setStorageValue(17596, 1) local teleportPosition = availablePlayerTeleportPositions[math.random(#availablePlayerTeleportPositions)] - doRelocate(player:getPosition(), teleportPosition) + player:teleportTo(teleportPosition) player:getPosition():sendMonsterSay("accersi " .. player:getName()) end end @@ -174,6 +175,14 @@ function wave8() Position(33145, 32866, 7):sendMagicEffect(CONST_ME_TELEPORT) end +function wave9() + broadcastMessage("Ankrahmun: PROTEGO MAXIMA!", MESSAGE_STATUS_WARNING) + + for _, player in ipairs(Game.getPlayers()) do + player:teleportTo(player:getTown():getTemplePosition()) + end +end + function earthquakeTower(frompos, topos) for zz = frompos.z, topos.z, -1 do if zz == 6 then @@ -203,12 +212,12 @@ function removeFloorItems(position) local creature = tile:getTopCreature() if creature then local teleportPosition = availablePlayerTeleportPositions[math.random(#availablePlayerTeleportPositions)] - doRelocate(creature:getPosition(), teleportPosition) + creature:teleportTo(teleportPosition) creature:getPosition():sendMonsterSay("The Gods Protecting You!") Game.sendMagicEffect(teleportPosition, 11) if creature:isPlayer() then - if creature:getStorageValue(17596) ~= 1 then - creature:setStorageValue(17596, 1) + if creature:getStorageValue(17596) ~= 2 then + creature:setStorageValue(17596, 2) end end end diff --git a/data/talkactions/talkactions.xml b/data/talkactions/talkactions.xml index aace9c2..ea39625 100644 --- a/data/talkactions/talkactions.xml +++ b/data/talkactions/talkactions.xml @@ -55,6 +55,7 @@ + diff --git a/data/world792/map.otbm b/data/world792/map.otbm index 3fb20445f97cd8f3cedfb680bfd933bc711030fd..66a23b80badf30fd1d260b8cdb6d90703b342acc 100644 GIT binary patch delta 3657 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