From c96b7af52b67f4999b0c776a379422af275da323 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Fri, 22 Nov 2019 18:27:42 +0200 Subject: [PATCH] implement few new 781 items --- data/actions/actions.xml | 64 +++++++ data/actions/scripts/misc/doors.lua | 56 +++++- data/actions/scripts/misc/fire_bug.lua | 26 +++ data/actions/scripts/misc/scythe.lua | 5 + data/items/items.srv | 198 ++++++++++---------- data/movements/movements.xml | 16 ++ data/movements/scripts/misc/doors.lua | 12 ++ data/movements/scripts/misc/floorchange.lua | 2 + data/npc/livielle.npc | 2 + 9 files changed, 281 insertions(+), 100 deletions(-) create mode 100644 data/actions/scripts/misc/fire_bug.lua diff --git a/data/actions/actions.xml b/data/actions/actions.xml index dd87fff..58ee5a9 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -170,6 +170,7 @@ + @@ -280,6 +281,15 @@ + + + + + + + + + @@ -290,6 +300,12 @@ + + + + + + @@ -300,6 +316,12 @@ + + + + + + @@ -322,6 +344,21 @@ + + + + + + + + + + + + + + + @@ -342,6 +379,20 @@ + + + + + + + + + + + + + + @@ -363,4 +414,17 @@ + + + + + + + + + + + + + diff --git a/data/actions/scripts/misc/doors.lua b/data/actions/scripts/misc/doors.lua index 4fc7496..a2c118c 100644 --- a/data/actions/scripts/misc/doors.lua +++ b/data/actions/scripts/misc/doors.lua @@ -1,5 +1,5 @@ local lockedDoors = { - 1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007, 5097 + 1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007, 5097, 5106, 5115, 5124, 5133, 5136, 5139, 5142, 5277, 5280 } local closedNormalDoors = { @@ -24,6 +24,21 @@ local closedNormalDoors = { [2177] = 2178, [2179] = 2180, [5098] = 5099, + [5100] = 5101, + [5107] = 5108, + [5109] = 5110, + [5116] = 5117, + [5118] = 5119, + [5125] = 5126, + [5127] = 5128, + [5134] = 5135, + [5137] = 5138, + [5140] = 5141, + [5143] = 5144, + [5278] = 5279, + [5281] = 5282, + [5283] = 5284, + [5285] = 5286, } local openVerticalDoors = { @@ -45,6 +60,20 @@ local openVerticalDoors = { [4914] = 4913, [5083] = 5082, [2178] = 2177, + [5108] = 5107, + [5110] = 5109, + [5112] = 5111, + [5114] = 5113, + [5126] = 5125, + [5128] = 5127, + [5130] = 5129, + [5132] = 5131, + [5141] = 5140, + [5144] = 5143, + [5282] = 5281, + [5284] = 5283, + [5288] = 5287, + [5292] = 5291, } local openHorizontalDoors = { @@ -67,6 +96,19 @@ local openHorizontalDoors = { [5085] = 5084, [2180] = 2179, [5099] = 5098, + [5101] = 5100, + [5103] = 5102, + [5105] = 5104, + [5117] = 5116, + [5119] = 5118, + [5121] = 5120, + [5123] = 5122, + [5135] = 5134, + [5138] = 5137, + [5279] = 5278, + [5286] = 5285, + [5290] = 5289, + [5294] = 5293, } local levelDoors = { @@ -78,6 +120,13 @@ local levelDoors = { [1680] = 1681, [1687] = 1688, [1696] = 1697, + [5102] = 5103, + [5104] = 5105, + [5111] = 5112, + [5120] = 5121, + [5129] = 5130, + [5291] = 5292, + [5293] = 5294, } local questDoors = { @@ -89,6 +138,11 @@ local questDoors = { [1676] = 1677, [1689] = 1690, [1698] = 1699, + [5113] = 5114, + [5122] = 5123, + [5131] = 5132, + [5287] = 5288, + [5289] = 5290, } local passthrough = { diff --git a/data/actions/scripts/misc/fire_bug.lua b/data/actions/scripts/misc/fire_bug.lua new file mode 100644 index 0000000..b9708a4 --- /dev/null +++ b/data/actions/scripts/misc/fire_bug.lua @@ -0,0 +1,26 @@ +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + local random = math.random(10) + if random >= 4 then --success 6% chance + if target.itemid == 5465 then --Burn Sugar Cane + toPosition:sendMagicEffect(CONST_ME_FIREAREA) + target:transform(5464) + target:decay() + elseif target.itemid == 3514 then --Light Up empty coal basins + toPosition:sendMagicEffect(CONST_ME_HITBYFIRE) + target:transform(3513) + elseif target.itemid == 2114 then --Light Up empty coal basins + toPosition:sendMagicEffect(CONST_ME_HITBYFIRE) + target:transform(2113) + end + elseif random == 2 then --it remove the fire bug 2% chance + item:remove(1) + toPosition:sendMagicEffect(CONST_ME_POFF) + elseif random == 1 then --it explode on the user 1% chance + doTargetCombatHealth(0, player, COMBAT_FIREDAMAGE, -5, -5, CONST_ME_HITBYFIRE) + player:say('OUCH!', TALKTYPE_MONSTER_SAY) + item:remove(1) + else + toPosition:sendMagicEffect(CONST_ME_POFF) --it fails, but dont get removed 3% chance + end + return true +end diff --git a/data/actions/scripts/misc/scythe.lua b/data/actions/scripts/misc/scythe.lua index 0fccda3..27e07a7 100644 --- a/data/actions/scripts/misc/scythe.lua +++ b/data/actions/scripts/misc/scythe.lua @@ -11,6 +11,11 @@ function onUse(player, item, fromPosition, target, toPosition) target:decay() Game.createItem(3605, 1, target:getPosition()) return true + elseif target:getId() == 5463 then + target:transform(5462, 1) + target:decay() + Game.createItem(5466, 1, target:getPosition()) + return true end return doDestroyItem(target) end diff --git a/data/items/items.srv b/data/items/items.srv index 2bf70d9..4ebf110 100644 --- a/data/items/items.srv +++ b/data/items/items.srv @@ -7189,11 +7189,11 @@ Flags = {Top,Unmove} TypeID = 1628 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1629 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1630 Name = "an open door" @@ -7202,11 +7202,11 @@ Flags = {Top,Door,Unmove} TypeID = 1631 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1632 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1633 Name = "an open door" @@ -7230,7 +7230,7 @@ Flags = {Top,Unmove} TypeID = 1638 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1639 Name = "an open door" @@ -7238,7 +7238,7 @@ Flags = {Top,Door,Unmove} TypeID = 1640 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1641 Name = "an open door" @@ -7247,7 +7247,7 @@ Flags = {Top,Door,Unmove} TypeID = 1642 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1643 Name = "an open door" @@ -7256,7 +7256,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1644 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1645 Name = "an open door" @@ -7265,7 +7265,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1646 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1647 Name = "a gate of expertise" @@ -7274,7 +7274,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1648 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1649 Name = "a gate of expertise" @@ -7283,11 +7283,11 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1650 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1651 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1652 Name = "an open door" @@ -7296,11 +7296,11 @@ Flags = {Top,Door,Unmove} TypeID = 1653 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1654 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1655 Name = "an open door" @@ -7308,7 +7308,7 @@ Flags = {Top,Door,Unmove} TypeID = 1656 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1657 Name = "an open door" @@ -7316,7 +7316,7 @@ Flags = {Top,Door,Unmove} TypeID = 1658 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1659 Name = "an open door" @@ -7325,7 +7325,7 @@ Flags = {Top,Door,Unmove} TypeID = 1660 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1661 Name = "an open door" @@ -7334,7 +7334,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1662 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1663 Name = "an open door" @@ -7343,7 +7343,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1664 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1665 Name = "a gate of expertise" @@ -7352,7 +7352,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1666 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1667 Name = "a gate of expertise" @@ -7361,11 +7361,11 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1668 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1669 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1670 Name = "an open door" @@ -7374,11 +7374,11 @@ Flags = {Top,Door,Unmove} TypeID = 1671 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1672 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1673 Name = "an open door" @@ -7387,7 +7387,7 @@ Flags = {Top,Door,Unmove} TypeID = 1674 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1675 Name = "an open door" @@ -7396,7 +7396,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1676 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1677 Name = "an open door" @@ -7405,7 +7405,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1678 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1679 Name = "a gate of expertise" @@ -7414,7 +7414,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1680 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1681 Name = "a gate of expertise" @@ -7422,12 +7422,12 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1682 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1683 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1684 Name = "an open door" @@ -7435,7 +7435,7 @@ Flags = {Top,Door,Unmove} TypeID = 1685 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1686 Name = "an open door" @@ -7444,7 +7444,7 @@ Flags = {Top,Door,Unmove} TypeID = 1687 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1688 Name = "a gate of expertise" @@ -7453,7 +7453,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1689 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1690 Name = "an open door" @@ -7461,12 +7461,12 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 1691 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1692 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1693 Name = "an open door" @@ -7474,7 +7474,7 @@ Flags = {Top,Door,Unmove} TypeID = 1694 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1695 Name = "an open door" @@ -7483,7 +7483,7 @@ Flags = {Top,Door,Unmove} TypeID = 1696 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1697 Name = "a gate of expertise" @@ -7492,7 +7492,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 1698 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 1699 Name = "an open door" @@ -10226,19 +10226,19 @@ Flags = {Bottom,Door,Unmove} TypeID = 2338 Name = "a passthrough" -Flags = {Bottom,Door,Unpass,Unmove,Height} +Flags = {Door,Unpass,Unmove,Height} TypeID = 2339 Name = "an open passthrough" -Flags = {Bottom,Door,Unmove} +Flags = {Door,Unmove} TypeID = 2340 Name = "a passthrough" -Flags = {Bottom,Door,Unpass,Unmove,Height} +Flags = {Door,Unpass,Unmove,Height} TypeID = 2341 Name = "an open passthrough" -Flags = {Bottom,Door,Unmove} +Flags = {Door,Unmove} TypeID = 2342 Name = "a counter" @@ -22359,11 +22359,11 @@ Flags = {Top,Door,Unmove} TypeID = 4912 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 4913 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 4914 Name = "an open door" @@ -22751,12 +22751,12 @@ Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} TypeID = 5006 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5007 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5008 Name = "a sandstone wall" @@ -23114,7 +23114,7 @@ Attributes = {Waypoints=160} TypeID = 5082 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5083 Name = "an open door" @@ -23122,7 +23122,7 @@ Flags = {Top,Door,Unmove} TypeID = 5084 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5085 Name = "an open door" @@ -23185,19 +23185,19 @@ Attributes = {Nutrition=4,Weight=180} TypeID = 5097 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5098 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5099 Name = "an open door" Flags = {Top,Door,Unmove} -# pradeti nuo cia: 5100 + TypeID = 5100 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5101 Name = "an open door" @@ -23206,7 +23206,7 @@ Flags = {Top,Door,Unmove} TypeID = 5102 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5103 Name = "a gate of expertise" @@ -23215,7 +23215,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 5104 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5105 Name = "an open door" @@ -23224,11 +23224,11 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5106 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5107 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5108 Name = "an open door" @@ -23236,7 +23236,7 @@ Flags = {Top,Door,Unmove} TypeID = 5109 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5110 Name = "an open door" @@ -23245,7 +23245,7 @@ Flags = {Top,Door,Unmove} TypeID = 5111 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5112 Name = "a gate of expertise" @@ -23254,7 +23254,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 5113 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5114 Name = "an open door" @@ -23263,11 +23263,11 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5115 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5116 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5117 Name = "an open door" @@ -23275,7 +23275,7 @@ Flags = {Top,Door,Unmove} TypeID = 5118 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5119 Name = "an open door" @@ -23284,7 +23284,7 @@ Flags = {Top,Door,Unmove} TypeID = 5120 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5121 Name = "a gate of expertise" @@ -23293,7 +23293,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 5122 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5123 Name = "an open door" @@ -23302,11 +23302,11 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5124 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5125 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5126 Name = "an open door" @@ -23314,7 +23314,7 @@ Flags = {Top,Door,Unmove} TypeID = 5127 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5128 Name = "an open door" @@ -23323,7 +23323,7 @@ Flags = {Top,Door,Unmove} TypeID = 5129 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5130 Name = "a gate of expertise" @@ -23332,7 +23332,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 5131 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5132 Name = "an open door" @@ -23341,11 +23341,11 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5133 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5134 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5135 Name = "an open door" @@ -23354,11 +23354,11 @@ Flags = {Top,Door,Unmove} TypeID = 5136 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5137 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5138 Name = "an open door" @@ -23367,11 +23367,11 @@ Flags = {Top,Door,Unmove} TypeID = 5139 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5140 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5141 Name = "an open door" @@ -23380,11 +23380,11 @@ Flags = {Top,Door,Unmove} TypeID = 5142 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5143 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5144 Name = "an open door" @@ -23432,7 +23432,7 @@ Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} TypeID = 5155 Name = "a mango tree" -Flags = {Bottom,Unpass,Unmove,Unlay} # TODO: Mango Tree should be harvestable? +Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5156 Name = "a mango tree" @@ -23917,11 +23917,11 @@ Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} TypeID = 5277 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5278 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5279 Name = "an open door" @@ -23930,11 +23930,11 @@ Flags = {Top,Door,Unmove} TypeID = 5280 Name = "a closed door" Description = "It is locked" -Flags = {UseEvent,Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5281 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5282 Name = "an open door" @@ -23942,7 +23942,7 @@ Flags = {Top,Door,Unmove} TypeID = 5283 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5284 Name = "an open door" @@ -23950,7 +23950,7 @@ Flags = {Top,Door,Unmove} TypeID = 5285 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5286 Name = "an open door" @@ -23959,7 +23959,7 @@ Flags = {Top,Door,Unmove} TypeID = 5287 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5288 Name = "an open door" @@ -23968,7 +23968,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5289 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5290 Name = "an open door" @@ -23977,7 +23977,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5291 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5292 Name = "a gate of expertise" @@ -23986,7 +23986,7 @@ Flags = {Door,Top,SeparationEvent,Unmove} TypeID = 5293 Name = "a gate of expertise" Description = "Only the worthy may pass" -Flags = {Door,Bottom,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5294 Name = "a gate of expertise" @@ -24370,7 +24370,7 @@ Flags = {Unmove,Unlay,AllowDistRead} TypeID = 5389 Name = "a pawpaw tree" -Flags = {Bottom,Unpass,Unmove,Unlay} # TODO: Should be harvestable? +Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5390 Name = "a pawpaw tree" @@ -24701,8 +24701,8 @@ TypeID = 5467 Name = "a fire bug" Description = "This strange creature has the tendency to set certain things on fire" Flags = {UseEvent,MultiUse,Take} -Attributes = {Weight=3050,Brightness=3,LightColor=206} # TODO: Use action to harvest - +Attributes = {Weight=3050,Brightness=3,LightColor=206} +# pradeti nuo cia jau padariau, kad iseitu harvestinti sugar cane ir nepamirsti pridedineti naujus daiktus prie npc ir monstru, kurie jau egzistuoja TypeID = 5468 Name = "a distilling machine" Flags = {Bottom,Unpass,Unmove,Unlay} @@ -24901,7 +24901,7 @@ Attributes = {FluidSource=WINE,ExpireTarget=5469,TotalExpireTime=15} # TODO: Fl TypeID = 5514 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5515 Name = "an open door" @@ -24909,7 +24909,7 @@ Flags = {Top,Door,Unmove} TypeID = 5516 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5517 Name = "an open door" @@ -25869,11 +25869,11 @@ Attributes = {Waypoints=130} TypeID = 5732 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5733 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5734 Name = "an open door" @@ -25882,11 +25882,11 @@ Flags = {Top,Door,Unmove} TypeID = 5735 Name = "a closed door" Description = "It is locked" -Flags = {Bottom,UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5736 Name = "a closed door" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5737 Name = "an open door" @@ -25927,7 +25927,7 @@ Attributes = {Waypoints=500} TypeID = 5745 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5746 Name = "an open door" @@ -25944,7 +25944,7 @@ Flags = {Top,SeparationEvent,Door,Unmove} TypeID = 5749 Name = "a closed door" Description = "The door seems to be sealed against unwanted intruders" -Flags = {Bottom,Door,Unpass,Unmove,Unthrow,Unlay} +Flags = {Door,Unpass,Unmove,Unthrow,Unlay} TypeID = 5750 Name = "an earth pile" diff --git a/data/movements/movements.xml b/data/movements/movements.xml index 78104e2..15fb8e2 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -532,8 +532,12 @@ + + + + @@ -585,6 +589,18 @@ + + + + + + + + + + + + diff --git a/data/movements/scripts/misc/doors.lua b/data/movements/scripts/misc/doors.lua index 9667f42..ae24dc1 100644 --- a/data/movements/scripts/misc/doors.lua +++ b/data/movements/scripts/misc/doors.lua @@ -7,6 +7,12 @@ local verticalDoors = { [1679] = 1678, [1697] = 1696, [1699] = 1698, + [5112] = 5111, + [5114] = 5113, + [5130] = 5129, + [5132] = 5131, + [5288] = 5287, + [5292] = 5291, } local horizontalDoors = { @@ -18,6 +24,12 @@ local horizontalDoors = { [1681] = 1680, [1688] = 1687, [1690] = 1689, + [5103] = 5102, + [5105] = 5104, + [5121] = 5120, + [5123] = 5122, + [5290] = 5289, + [5294] = 5293, } function onStepOut(creature, item, fromPosition, toPosition) diff --git a/data/movements/scripts/misc/floorchange.lua b/data/movements/scripts/misc/floorchange.lua index 9312ee8..de0e8fc 100644 --- a/data/movements/scripts/misc/floorchange.lua +++ b/data/movements/scripts/misc/floorchange.lua @@ -70,7 +70,9 @@ local list = { [2194] = {x = 1, y = -1, z = -1}, [2196] = {x = 1, y = 1, z = -1}, [2198] = {x = -1, y = 1, z = -1}, + [5257] = {x = -1, y = 0, z = -1}, [5258] = {x = 0, y = -1, z = -1}, + [5259] = {x = -1, y = 0, z = -1}, } function onStepIn(creature, item, position, fromPosition) diff --git a/data/npc/livielle.npc b/data/npc/livielle.npc index 303d4cf..b241e7f 100644 --- a/data/npc/livielle.npc +++ b/data/npc/livielle.npc @@ -44,6 +44,7 @@ VANISH,! -> "Aww, I don't even deserve a farewell?" "melon" -> Type=3593, Amount=1, Price=10, "Do you want to buy a melon for %P gold?", Topic=1 "pumpkin" -> Type=3594, Amount=1, Price=10, "Do you want to buy a pumpkin for %P gold?", Topic=1 "blueberr" -> Type=3588, Amount=1, Price=1, "Do you want to buy a blueberry for %P gold?", Topic=1 +"mango" -> Type=5096, Amount=1, Price=10, "Do you want to buy a mango for %P gold?", Topic=1 %1,1<%1,"banana" -> Type=3587, Amount=%1, Price=5*%1, "Do you want to buy %A bananas for %P gold?", Topic=1 %1,1<%1,"white","mushroom" -> Type=3723, Amount=%1, Price=10*%1, "Do you want to buy %A of the white mushrooms for %P gold?", Topic=1 @@ -52,6 +53,7 @@ VANISH,! -> "Aww, I don't even deserve a farewell?" %1,1<%1,"melon" -> Type=3593, Amount=%1, Price=10*%1, "Do you want to buy %A melons for %P gold?", Topic=1 %1,1<%1,"pumpkin" -> Type=3594, Amount=%1, Price=10*%1, "Do you want to buy %A pumpkins for %P gold?", Topic=1 %1,1<%1,"blueberr" -> Type=3588, Amount=%1, Price=1*%1, "Do you want to buy %A blueberries for %P gold?", Topic=1 +%1,1<%1,"mango" -> Type=5096, Amount=%1, Price=10*%1, "Do you want to buy %A mangos for %P gold?", Topic=1 Topic=1,"yes",CountMoney>=Price -> "Merci, 'ere you go.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Sorry, but that's not enough money, please count again."