diff --git a/config.lua b/config.lua index 0383f6a..e354f60 100644 --- a/config.lua +++ b/config.lua @@ -52,7 +52,7 @@ timeBetweenExActions = 1000 -- Map -- NOTE: set mapName WITHOUT .otbm at the end -mapName = "mymap" +mapName = "map" mapAuthor = "CipSoft" -- MySQL diff --git a/data/actions/actions.xml b/data/actions/actions.xml index d8fe992..c6379a7 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -94,6 +94,7 @@ + @@ -103,6 +104,7 @@ + @@ -118,7 +120,6 @@ - @@ -135,6 +136,7 @@ + @@ -144,6 +146,13 @@ + + + + + + + @@ -165,11 +174,14 @@ + + + @@ -203,6 +215,7 @@ + @@ -222,6 +235,7 @@ + @@ -263,6 +277,8 @@ + + @@ -278,6 +294,18 @@ + + + + + + + + + + + + @@ -288,6 +316,12 @@ + + + + + + @@ -298,6 +332,14 @@ + + + + + + + + @@ -319,7 +361,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -340,6 +401,23 @@ + + + + + + + + + + + + + + + + + @@ -360,4 +438,21 @@ + + + + + + + + + + + + + + + + + diff --git a/data/actions/scripts/misc/dice.lua b/data/actions/scripts/misc/dice.lua new file mode 100644 index 0000000..0dcc278 --- /dev/null +++ b/data/actions/scripts/misc/dice.lua @@ -0,0 +1,31 @@ +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + local playerPosition = player:getPosition() + local afrompos = {x=playerPosition.x - 1, y=playerPosition.y - 1, z=playerPosition.z} + local atopos = {x=playerPosition.x + 1, y=playerPosition.y + 1, z=playerPosition.z} + for xa = afrompos.x,atopos.x do + for ya = afrompos.y,atopos.y do + for za = afrompos.z,atopos.z do + local npos = {x = xa,y = ya,z = za} + local depotItem = Tile(npos):getItemByType(ITEM_TYPE_DEPOT) + if depotItem ~= nil then + player:sendCancelMessage("You cannot use this object.") + return true + end + end + end + end + + local dicePosition = item:getPosition() + local value = math.random(6) + local isInGhostMode = player:isInGhostMode() + + dicePosition:sendMagicEffect(CONST_ME_CRAPS, isInGhostMode and player) + + local spectators = Game.getSpectators(dicePosition, false, true, 3, 3) + for i = 1, #spectators do + player:say(player:getName() .. " rolled a " .. value .. ".", TALKTYPE_MONSTER_SAY, isInGhostMode, spectators[i], dicePosition) + end + + item:transform(5791 + value) + return true +end diff --git a/data/actions/scripts/misc/distilling_rum.lua b/data/actions/scripts/misc/distilling_rum.lua new file mode 100644 index 0000000..55f6437 --- /dev/null +++ b/data/actions/scripts/misc/distilling_rum.lua @@ -0,0 +1,20 @@ +local distillingMachines = { + [5468] = 5512, + [5469] = 5513 +} + +function onUse(player, item, fromPosition, target, toPosition) + if not target:isItem() then + return false + end + + local machine = distillingMachines[target:getId()] + if machine then + target:transform(machine, 1) + target:decay() + item:remove(1) + return true + end + + return false +end diff --git a/data/actions/scripts/misc/dolls.lua b/data/actions/scripts/misc/dolls.lua new file mode 100644 index 0000000..2219349 --- /dev/null +++ b/data/actions/scripts/misc/dolls.lua @@ -0,0 +1,53 @@ +local dolls = { + [5080] = {"Hug me."}, + [5668] = { + "It's not winning that matters, but winning in style.", + "Today's your lucky day. Probably.", + "Do not meddle in the affairs of dragons, for you are crunchy and taste good with ketchup.", + "That is one stupid question.", + "You'll need more rum for that.", + "Do or do not. There is no try.", + "You should do something you always wanted to.", + "If you walk under a ladder and it falls down on you it probably means bad luck.", + "Never say 'oops'. Always say 'Ah, interesting!'", + "Five steps east, fourteen steps south, two steps north and seventeen steps west!" + }, + [5791] = { + "Fchhhhhh!", + "Zchhhhhh!", + "Grooaaaaar*cough*", + "Aaa... CHOO!", + "You... will.... burn!!" + } +} + +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + local sounds = dolls[item.itemid] + if not sounds then + return false + end + + if fromPosition.x == CONTAINER_POSITION then + fromPosition = player:getPosition() + end + + local random = math.random(#sounds) + local sound = sounds[random] + if item.itemid == 5791 then + if random == 3 then + fromPosition:sendMagicEffect(CONST_ME_POFF) + elseif random == 4 then + fromPosition:sendMagicEffect(CONST_ME_FIREAREA) + elseif random == 5 then + doTargetCombatHealth(0, player, COMBAT_PHYSICALDAMAGE, -1, -1, CONST_ME_EXPLOSIONHIT) + end + elseif item.itemid == 5668 then + fromPosition:sendMagicEffect(CONST_ME_MAGIC_RED) + item:transform(item.itemid + 1) + item:decay() + end + + sound = sound:gsub('|PLAYERNAME|', player:getName()) + player:say(sound, TALKTYPE_MONSTER_SAY, false, 0, fromPosition) + return true +end diff --git a/data/actions/scripts/misc/doors.lua b/data/actions/scripts/misc/doors.lua index e9b9cc6..1d0cd4d 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 + 1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007, 5097, 5106, 5115, 5124, 5133, 5136, 5139, 5142, 5277, 5280, 5732, 5735 } local closedNormalDoors = { @@ -23,6 +23,26 @@ local closedNormalDoors = { [5084] = 5085, [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, + [5514] = 5515, + [5516] = 5517, + [5733] = 5734, + [5736] = 5737, } local openVerticalDoors = { @@ -44,6 +64,23 @@ 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, + [5515] = 5514, + [5737] = 5736, + [5748] = 5749, } local openHorizontalDoors = { @@ -65,6 +102,23 @@ local openHorizontalDoors = { [4911] = 4912, [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, + [5517] = 5516, + [5734] = 5733, + [5746] = 5745, } local levelDoors = { @@ -76,6 +130,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 = { @@ -87,6 +148,13 @@ local questDoors = { [1676] = 1677, [1689] = 1690, [1698] = 1699, + [5113] = 5114, + [5122] = 5123, + [5131] = 5132, + [5287] = 5288, + [5289] = 5290, + [5745] = 5746, + [5749] = 5748, } 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/fluids.lua b/data/actions/scripts/misc/fluids.lua index e300dcb..4d8160f 100644 --- a/data/actions/scripts/misc/fluids.lua +++ b/data/actions/scripts/misc/fluids.lua @@ -21,7 +21,10 @@ local messages = { [FLUID_MILK] = "Mmmh.", [FLUID_MANAFLUID] = "Aaaah...", [FLUID_LIFEFLUID] = "Aaaah...", - [FLUID_LEMONADE] = "Mmmh." + [FLUID_LEMONADE] = "Mmmh.", + [FLUID_RUM] = "Aah...", + [FLUID_COCONUTMILK] = "Mmmh.", + [FLUID_FRUITJUICE] = "Mmmh." } function onUse(player, item, fromPosition, target, toPosition) @@ -32,8 +35,7 @@ function onUse(player, item, fromPosition, target, toPosition) item:transform(item:getId(), 0) return true elseif target:getFluidType() ~= 0 and item:getFluidType() == 0 then - target:transform(target:getId(), 0) - item:transform(item:getId(), target:getFluidType()) + player:sendCancelMessage("You cannot use this object.") return true end end @@ -43,7 +45,7 @@ function onUse(player, item, fromPosition, target, toPosition) player:sendCancelMessage("It is empty.") else local self = target == player - if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE then + if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE or item:getFluidType() == FLUID_RUM then player:addCondition(drunk) elseif self and item:getFluidType() == FLUID_SLIME then player:addCondition(slime) diff --git a/data/actions/scripts/misc/instruments.lua b/data/actions/scripts/misc/instruments.lua index 21ba16f..2a69514 100644 --- a/data/actions/scripts/misc/instruments.lua +++ b/data/actions/scripts/misc/instruments.lua @@ -8,6 +8,15 @@ function onUse(player, item, fromPosition, target, toPosition) item:getPosition():sendMagicEffect(CONST_ME_SOUND_PURPLE) elseif item:getId() == 3219 then item:getPosition():sendMagicEffect(19) + elseif item:getId() == 5786 then + Game.createMonster("wolf", player:getPosition()) + local random = math.random(1,10) + if random > 3 then -- destroy 70% chance + item:getPosition():sendMagicEffect(CONST_ME_SOUND_RED) + item:remove(1) + else + item:getPosition():sendMagicEffect(CONST_ME_SOUND_YELLOW) + end end return true diff --git a/data/actions/scripts/misc/juice_squeezer.lua b/data/actions/scripts/misc/juice_squeezer.lua new file mode 100644 index 0000000..9827692 --- /dev/null +++ b/data/actions/scripts/misc/juice_squeezer.lua @@ -0,0 +1,9 @@ +local fruits = {3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3595, 3596, 5096} + +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + if isInArray(fruits, target.itemid) and player:removeItem(2874, 1, 0) then + target:remove(1) + player:addItem(2874, target.itemid == 3589 and 14 or 15) + return true + end +end \ No newline at end of file diff --git a/data/actions/scripts/misc/panda_teddy.lua b/data/actions/scripts/misc/panda_teddy.lua deleted file mode 100644 index 30b4acf..0000000 --- a/data/actions/scripts/misc/panda_teddy.lua +++ /dev/null @@ -1,4 +0,0 @@ -function onUse(player, item, fromPosition, target, toPosition) - player:sendCancelMessage("Hug me ^^") - 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/actions/scripts/misc/skull_candle.lua b/data/actions/scripts/misc/skull_candle.lua new file mode 100644 index 0000000..ef0f284 --- /dev/null +++ b/data/actions/scripts/misc/skull_candle.lua @@ -0,0 +1,14 @@ +function onUse(player, item, fromPosition, target, toPosition) + if not target:isItem() then + return false + end + + if target:getId() == 2917 then + player:addItem(5813, 1) + item:remove(1) + target:remove(1) + return true + end + + return false +end diff --git a/data/actions/scripts/misc/teleporters.lua b/data/actions/scripts/misc/teleporters.lua index 03a74b9..c48fc69 100644 --- a/data/actions/scripts/misc/teleporters.lua +++ b/data/actions/scripts/misc/teleporters.lua @@ -3,7 +3,7 @@ local downstairs = { } local upstairs = { - 1948, 1968 + 1948, 1968, 5542 } function onUse(player, item, fromPosition, target, toPosition) diff --git a/data/items/items.srv b/data/items/items.srv index 1d7ad5a..41bc61b 100644 --- a/data/items/items.srv +++ b/data/items/items.srv @@ -37,6 +37,15 @@ Name = "lifefluid" TypeID = 12 Name = "lemonade" +TypeID = 13 +Name = "rum" + +TypeID = 14 +Name = "coconut milk" + +TypeID = 15 +Name = "fruit juice" + # --- end of server specific object types --- TypeID = 100 @@ -7189,11 +7198,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 +7211,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 +7239,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 +7247,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 +7256,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 +7265,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 +7274,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 +7283,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 +7292,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 +7305,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 +7317,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 +7325,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 +7334,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 +7343,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 +7352,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 +7361,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 +7370,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 +7383,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 +7396,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 +7405,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 +7414,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 +7423,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 +7431,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 +7444,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 +7453,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 +7462,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 +7470,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 +7483,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 +7492,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 +7501,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" @@ -10126,17 +10135,17 @@ Flags = {Bottom,Unpass,Unmove,Height} TypeID = 2314 Name = "a big table" -Flags = {Destroy,Unpass,Height} +Flags = {Destroy,Height,Avoid} Attributes = {DestroyTarget=3138} TypeID = 2315 Name = "a square table" -Flags = {Destroy,Unpass,Height} +Flags = {Destroy,Height,Avoid} Attributes = {DestroyTarget=3138} TypeID = 2316 Name = "a small round table" -Flags = {Destroy,Unpass,Height} +Flags = {Destroy,Height,Avoid} Attributes = {DestroyTarget=3138} TypeID = 2317 @@ -10149,7 +10158,7 @@ Flags = {Bottom,Unpass,Unmove,Height} TypeID = 2319 Name = "a small table" -Flags = {Destroy,Unpass,Height} +Flags = {Destroy,Height,Avoid} Attributes = {DestroyTarget=3140} TypeID = 2320 @@ -10226,19 +10235,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" @@ -10655,22 +10664,22 @@ Attributes = {Capacity=6} TypeID = 2431 Name = "drawers" -Flags = {Container,Rotate,Unpass,Destroy,Height} +Flags = {Container,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=10,RotateTarget=2434,DestroyTarget=3136} TypeID = 2432 Name = "drawers" -Flags = {Container,Rotate,Unpass,Destroy,Height} +Flags = {Container,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=10,RotateTarget=2431,DestroyTarget=3136} TypeID = 2433 Name = "drawers" -Flags = {Container,Rotate,Unpass,Destroy,Height} +Flags = {Container,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=10,RotateTarget=2432,DestroyTarget=3136} TypeID = 2434 Name = "drawers" -Flags = {Container,Rotate,Unpass,Destroy,Height} +Flags = {Container,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=10,RotateTarget=2433,DestroyTarget=3136} TypeID = 2435 @@ -10860,7 +10869,7 @@ Attributes = {Capacity=15,Weight=8000,DestroyTarget=3135} TypeID = 2472 Name = "a chest" -Flags = {Container,Unpass,Take,Rotate,Destroy,Height} +Flags = {Container,Take,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=15,Weight=12000,RotateTarget=2482,DestroyTarget=3137} TypeID = 2473 @@ -10896,17 +10905,17 @@ Attributes = {DisguiseTarget=2472} TypeID = 2480 Name = "a chest" -Flags = {Container,Unpass,Take,Rotate,Destroy,Height} +Flags = {Container,Take,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=15,Weight=12000,RotateTarget=2481,DestroyTarget=3137} TypeID = 2481 Name = "a chest" -Flags = {Container,Unpass,Take,Rotate,Destroy,Height} +Flags = {Container,Take,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=15,Weight=12000,RotateTarget=2472,DestroyTarget=3137} TypeID = 2482 Name = "a chest" -Flags = {Container,Unpass,Take,Rotate,Destroy,Height} +Flags = {Container,Take,Rotate,Destroy,Height,Avoid} Attributes = {Capacity=15,Weight=12000,RotateTarget=2480,DestroyTarget=3137} TypeID = 2483 @@ -11089,7 +11098,7 @@ Flags = {Unmove} TypeID = 2519 Name = "a barrel" -Flags = {Container,Unpass,Destroy,Height} +Flags = {Container,Destroy,Height,Avoid} Attributes = {Capacity=25,DestroyTarget=3138} TypeID = 2520 @@ -11109,7 +11118,7 @@ Attributes = {FluidSource=WINE} TypeID = 2523 Name = "a barrel" -Flags = {Container,Unpass,Destroy,Height} +Flags = {Container,Destroy,Height,Avoid} Attributes = {Capacity=25,DestroyTarget=3135} TypeID = 2524 @@ -22359,11 +22368,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 +22760,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 +23123,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 +23131,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" @@ -23158,7 +23167,7 @@ Flags = {Text,Take} Attributes = {Weight=830} TypeID = 5091 -Name = "a banana tree" # TODO: Banana tree should be harvestable? +Name = "a banana tree" Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5092 @@ -23180,16 +23189,16 @@ Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5096 Name = "a mango" Flags = {Cumulative,Take} -Attributes = {Nutrition=5,Weight=180} +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" @@ -23197,7 +23206,7 @@ Flags = {Top,Door,Unmove} 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 +23215,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 +23224,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 +23233,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 +23245,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 +23254,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 +23263,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 +23272,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 +23284,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 +23293,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 +23302,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 +23311,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 +23323,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 +23332,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 +23341,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 +23350,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 +23363,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 +23376,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 +23389,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 +23441,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 +23926,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 +23939,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 +23951,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 +23959,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 +23968,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 +23977,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 +23986,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 +23995,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 +24379,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,7 +24710,7 @@ 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} TypeID = 5468 Name = "a distilling machine" @@ -24892,16 +24901,16 @@ Flags = {Unpass,Unmove,Unlay} TypeID = 5512 Name = "a distilling machine" Flags = {Bottom,Unpass,Unmove,Unlay,Expire} -Attributes = {FluidSource=WINE,ExpireTarget=5468,TotalExpireTime=15} # TODO: FluidSource should be RUM +Attributes = {FluidSource=RUM,ExpireTarget=5468,TotalExpireTime=10} TypeID = 5513 Name = "a distilling machine" Flags = {Bottom,Unpass,Unmove,Unlay,Expire} -Attributes = {FluidSource=WINE,ExpireTarget=5469,TotalExpireTime=15} # TODO: FluidSource should be RUM +Attributes = {FluidSource=RUM,ExpireTarget=5469,TotalExpireTime=10} 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 +24918,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" @@ -25015,7 +25024,7 @@ Attributes = {ExpireTarget=0,TotalExpireTime=600} TypeID = 5538 Name = "a rum cask" Flags = {Unpass,Unmove,Unlay} -Attributes = {FluidSource=WINE} # TODO: FluidSource should be RUM +Attributes = {FluidSource=RUM} TypeID = 5539 Name = "a dead carrion worm" @@ -25075,7 +25084,7 @@ Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5552 Name = "a rum flask" -Flags = {MultiUse,FluidContainer,Take} # TODO: make it useable +Flags = {MultiUse,FluidContainer,Take} Attributes = {Weight=280} TypeID = 5553 @@ -25399,122 +25408,122 @@ Attributes = {Weight=6000,ExpireTarget=0,TotalExpireTime=600} TypeID = 5630 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5631 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5632 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5633 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5634 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5635 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5636 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5637 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5638 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5639 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5640 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5641 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5642 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5643 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5644 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5645 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5646 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5647 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5648 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5649 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5650 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5651 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5652 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5653 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5654 @@ -25578,14 +25587,14 @@ Attributes = {ExpireTarget=0,TotalExpireTime=600} TypeID = 5668 Name = "a mysterious voodoo skull" -Flags = {Take} +Flags = {UseEvent,Take} Attributes = {Weight=1400} TypeID = 5669 Name = "a enigmatic voodoo skull" Description = "It is not time yet" Flags = {Take,Expire} -Attributes = {Weight=1400,ExpireTarget=5668,TotalExpireTime=72000} # TODO: make it useable like in wiki +Attributes = {Weight=1400,ExpireTarget=5668,TotalExpireTime=72000} TypeID = 5670 Name = "a pirate statue" @@ -25622,7 +25631,7 @@ Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5678 Name = "a tortoise egg" Flags = {Cumulative,Take} -Attributes = {Nutrition=6,Weight=30} # TODO: make it eatable +Attributes = {Nutrition=8,Weight=30} TypeID = 5679 Name = "a shell" @@ -25642,22 +25651,22 @@ Flags = {Unmove} TypeID = 5683 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5684 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5685 Name = "a dirt wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5686 Name = "a stone wall" -Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Flags = {Unpass,Unmove,Unthrow,Unlay} Attributes = {Waypoints=0} TypeID = 5687 @@ -25760,7 +25769,7 @@ Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 5710 Name = "a light shovel" -Flags = {MultiUse,UseEvent,Take} # TODO: make to work as shovel +Flags = {MultiUse,UseEvent,Take} Attributes = {Weight=1500} TypeID = 5711 @@ -25869,11 +25878,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 +25891,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 +25936,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 +25953,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" @@ -26103,7 +26112,7 @@ Attributes = {MaxLength=99,Weight=1000} TypeID = 5786 Name = "a wooden whistle" Flags = {Take} -Attributes = {Weight=100} # TODO: implement music like in tibia wiki says +Attributes = {Weight=100} TypeID = 5787 Name = "a training dummy" @@ -26123,37 +26132,37 @@ Flags = {Unmove} TypeID = 5791 Name = "a stuffed dragon" -Flags = {Take} -Attributes = {Weight=850} # TODO: implement like in tibia wiki says +Flags = {UseEvent,Take} +Attributes = {Weight=850} TypeID = 5792 -Name = "a die" -Flags = {Take} -Attributes = {Weight=200} # TODO: implement like in tibia wiki says +Name = "a dice" +Flags = {UseEvent,Take} +Attributes = {Weight=200} TypeID = 5793 -Name = "a die" -Flags = {Take} +Name = "a dice" +Flags = {UseEvent,Take} Attributes = {Weight=200} TypeID = 5794 -Name = "a die" -Flags = {Take} +Name = "a dice" +Flags = {UseEvent,Take} Attributes = {Weight=200} TypeID = 5795 -Name = "a die" -Flags = {Take} +Name = "a dice" +Flags = {UseEvent,Take} Attributes = {Weight=200} TypeID = 5796 -Name = "a die" -Flags = {Take} +Name = "a dice" +Flags = {UseEvent,Take} Attributes = {Weight=200} TypeID = 5797 -Name = "a die" -Flags = {Take} +Name = "a dice" +Flags = {UseEvent,Take} Attributes = {Weight=200} TypeID = 5798 @@ -26220,7 +26229,8 @@ Flags = {Take} Attributes = {Weight=30} TypeID = 5810 -Name = "a pirate voodoo doll" +Name = "a voodoo doll" +Description = "It looks like a small pirate" Flags = {Take} Attributes = {Weight=650} @@ -26236,7 +26246,7 @@ Attributes = {ChangeTarget=5813,Weight=2200,Brightness=3,LightColor=206,ExpireT TypeID = 5813 Name = "a skull candle" Flags = {ChangeUse,Take,ExpireStop} -Attributes = {ChangeTarget=5812,Weight=2200,Brightness=0,LightColor=215} # TODO: implement like in tibia wiki +Attributes = {ChangeTarget=5812,Weight=2200,Brightness=0,LightColor=215} TypeID = 5814 Name = "small lava cracks" @@ -26471,7 +26481,7 @@ Name = "" # this is nothing in client TypeID = 5865 Name = "a juice squeezer" Flags = {Take} -Attributes = {Weight=1500} # TODO: Implement like in tibia wiki +Attributes = {Weight=1500} TypeID = 5866 Name = "rubble" diff --git a/data/monster/bat.xml b/data/monster/bat.xml index 678c212..0d9b952 100644 --- a/data/monster/bat.xml +++ b/data/monster/bat.xml @@ -23,4 +23,7 @@ + + + \ No newline at end of file diff --git a/data/monster/bear.xml b/data/monster/bear.xml index 0b3c5b8..a7e6a38 100644 --- a/data/monster/bear.xml +++ b/data/monster/bear.xml @@ -28,5 +28,7 @@ + + \ No newline at end of file diff --git a/data/monster/behemoth.xml b/data/monster/behemoth.xml index f5426d0..20a427c 100644 --- a/data/monster/behemoth.xml +++ b/data/monster/behemoth.xml @@ -56,5 +56,7 @@ + + \ No newline at end of file diff --git a/data/monster/beholder.xml b/data/monster/beholder.xml index 6e7e6b8..3beafa4 100644 --- a/data/monster/beholder.xml +++ b/data/monster/beholder.xml @@ -65,5 +65,6 @@ + \ No newline at end of file diff --git a/data/monster/bluedjinn.xml b/data/monster/bluedjinn.xml index e03ab24..f5c16a7 100644 --- a/data/monster/bluedjinn.xml +++ b/data/monster/bluedjinn.xml @@ -59,5 +59,6 @@ + \ No newline at end of file diff --git a/data/monster/bonebeast.xml b/data/monster/bonebeast.xml index 5c23e4d..6eab7c4 100644 --- a/data/monster/bonebeast.xml +++ b/data/monster/bonebeast.xml @@ -53,5 +53,6 @@ + \ No newline at end of file diff --git a/data/monster/chicken.xml b/data/monster/chicken.xml index 47107e1..9d6b9af 100644 --- a/data/monster/chicken.xml +++ b/data/monster/chicken.xml @@ -28,5 +28,6 @@ + \ No newline at end of file diff --git a/data/monster/demodras.xml b/data/monster/demodras.xml index 15b8fa0..059bc84 100644 --- a/data/monster/demodras.xml +++ b/data/monster/demodras.xml @@ -65,5 +65,7 @@ + + \ No newline at end of file diff --git a/data/monster/demon.xml b/data/monster/demon.xml index 9dbd7b3..d746cc6 100644 --- a/data/monster/demon.xml +++ b/data/monster/demon.xml @@ -78,5 +78,6 @@ + \ No newline at end of file diff --git a/data/monster/dharalion.xml b/data/monster/dharalion.xml index 5a9719d..e70dd5f 100644 --- a/data/monster/dharalion.xml +++ b/data/monster/dharalion.xml @@ -65,5 +65,7 @@ + + \ No newline at end of file diff --git a/data/monster/dragon.xml b/data/monster/dragon.xml index 460d906..9d3ea28 100644 --- a/data/monster/dragon.xml +++ b/data/monster/dragon.xml @@ -60,5 +60,7 @@ + + \ No newline at end of file diff --git a/data/monster/dragonlord.xml b/data/monster/dragonlord.xml index b4b9d12..73b2126 100644 --- a/data/monster/dragonlord.xml +++ b/data/monster/dragonlord.xml @@ -61,5 +61,7 @@ + + \ No newline at end of file diff --git a/data/monster/dwarf.xml b/data/monster/dwarf.xml index 76a934a..bf04a40 100644 --- a/data/monster/dwarf.xml +++ b/data/monster/dwarf.xml @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarfgeomancer.xml b/data/monster/dwarfgeomancer.xml index a1ed5ef..9d2fc7a 100644 --- a/data/monster/dwarfgeomancer.xml +++ b/data/monster/dwarfgeomancer.xml @@ -51,5 +51,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarfguard.xml b/data/monster/dwarfguard.xml index 7f03955..fb294f2 100644 --- a/data/monster/dwarfguard.xml +++ b/data/monster/dwarfguard.xml @@ -38,5 +38,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarfsoldier.xml b/data/monster/dwarfsoldier.xml index c3e5c66..94171a5 100644 --- a/data/monster/dwarfsoldier.xml +++ b/data/monster/dwarfsoldier.xml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/data/monster/efreet.xml b/data/monster/efreet.xml index 3237c55..792fbf3 100644 --- a/data/monster/efreet.xml +++ b/data/monster/efreet.xml @@ -75,5 +75,6 @@ + \ No newline at end of file diff --git a/data/monster/elderbeholder.xml b/data/monster/elderbeholder.xml index 1b28383..992f66a 100644 --- a/data/monster/elderbeholder.xml +++ b/data/monster/elderbeholder.xml @@ -71,5 +71,6 @@ + \ No newline at end of file diff --git a/data/monster/elf.xml b/data/monster/elf.xml index bb015c4..2c66ef0 100644 --- a/data/monster/elf.xml +++ b/data/monster/elf.xml @@ -41,5 +41,6 @@ + \ No newline at end of file diff --git a/data/monster/elfarcanist.xml b/data/monster/elfarcanist.xml index 7751d89..f13c928 100644 --- a/data/monster/elfarcanist.xml +++ b/data/monster/elfarcanist.xml @@ -65,5 +65,6 @@ + \ No newline at end of file diff --git a/data/monster/elfscout.xml b/data/monster/elfscout.xml index 8106d4d..6ca1c18 100644 --- a/data/monster/elfscout.xml +++ b/data/monster/elfscout.xml @@ -44,5 +44,6 @@ + \ No newline at end of file diff --git a/data/monster/evileye.xml b/data/monster/evileye.xml index 8d57d80..eed1a2c 100644 --- a/data/monster/evileye.xml +++ b/data/monster/evileye.xml @@ -79,5 +79,6 @@ + \ No newline at end of file diff --git a/data/monster/fernfang.xml b/data/monster/fernfang.xml index 51cc8de..17ce892 100644 --- a/data/monster/fernfang.xml +++ b/data/monster/fernfang.xml @@ -71,5 +71,6 @@ + \ No newline at end of file diff --git a/data/monster/ferumbras.xml b/data/monster/ferumbras.xml index a79136a..22a64cd 100644 --- a/data/monster/ferumbras.xml +++ b/data/monster/ferumbras.xml @@ -132,5 +132,7 @@ + + \ No newline at end of file diff --git a/data/monster/ghost.xml b/data/monster/ghost.xml index 5f5c49b..4573e1f 100644 --- a/data/monster/ghost.xml +++ b/data/monster/ghost.xml @@ -41,5 +41,6 @@ + \ No newline at end of file diff --git a/data/monster/ghoul.xml b/data/monster/ghoul.xml index f6d8bb9..f365d50 100644 --- a/data/monster/ghoul.xml +++ b/data/monster/ghoul.xml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/data/monster/giantspider.xml b/data/monster/giantspider.xml index 74261a8..8f598f7 100644 --- a/data/monster/giantspider.xml +++ b/data/monster/giantspider.xml @@ -47,5 +47,6 @@ + \ No newline at end of file diff --git a/data/monster/greendjinn.xml b/data/monster/greendjinn.xml index 5c0c7e5..ac33dd8 100644 --- a/data/monster/greendjinn.xml +++ b/data/monster/greendjinn.xml @@ -60,5 +60,6 @@ + \ No newline at end of file diff --git a/data/monster/grorlam.xml b/data/monster/grorlam.xml index 3b6cc9d..8a4b60a 100644 --- a/data/monster/grorlam.xml +++ b/data/monster/grorlam.xml @@ -46,5 +46,6 @@ + \ No newline at end of file diff --git a/data/monster/hero.xml b/data/monster/hero.xml index 87a3952..e5fd612 100644 --- a/data/monster/hero.xml +++ b/data/monster/hero.xml @@ -61,5 +61,6 @@ + \ No newline at end of file diff --git a/data/monster/hornedfox.xml b/data/monster/hornedfox.xml index cab2dfb..e6d8269 100644 --- a/data/monster/hornedfox.xml +++ b/data/monster/hornedfox.xml @@ -56,5 +56,7 @@ + + \ No newline at end of file diff --git a/data/monster/hunter.xml b/data/monster/hunter.xml index 47ea885..ebe821b 100644 --- a/data/monster/hunter.xml +++ b/data/monster/hunter.xml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/data/monster/kongra.xml b/data/monster/kongra.xml index 3f42dd3..37c13c0 100644 --- a/data/monster/kongra.xml +++ b/data/monster/kongra.xml @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/data/monster/lizardsentinel.xml b/data/monster/lizardsentinel.xml index 5b7f0e6..61f0163 100644 --- a/data/monster/lizardsentinel.xml +++ b/data/monster/lizardsentinel.xml @@ -39,5 +39,7 @@ + + \ No newline at end of file diff --git a/data/monster/lizardsnakecharmer.xml b/data/monster/lizardsnakecharmer.xml index e52f4f8..c33f84d 100644 --- a/data/monster/lizardsnakecharmer.xml +++ b/data/monster/lizardsnakecharmer.xml @@ -54,5 +54,7 @@ + + \ No newline at end of file diff --git a/data/monster/lizardtemplar.xml b/data/monster/lizardtemplar.xml index 191d5a0..b54fed4 100644 --- a/data/monster/lizardtemplar.xml +++ b/data/monster/lizardtemplar.xml @@ -36,5 +36,7 @@ + + \ No newline at end of file diff --git a/data/monster/marid.xml b/data/monster/marid.xml index f46361d..4bc26c9 100644 --- a/data/monster/marid.xml +++ b/data/monster/marid.xml @@ -75,5 +75,6 @@ + \ No newline at end of file diff --git a/data/monster/merlkin.xml b/data/monster/merlkin.xml index a5bf7a3..13389f7 100644 --- a/data/monster/merlkin.xml +++ b/data/monster/merlkin.xml @@ -52,5 +52,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaur.xml b/data/monster/minotaur.xml index b0bd3de..3d69955 100644 --- a/data/monster/minotaur.xml +++ b/data/monster/minotaur.xml @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaurarcher.xml b/data/monster/minotaurarcher.xml index c6dca5a..523948d 100644 --- a/data/monster/minotaurarcher.xml +++ b/data/monster/minotaurarcher.xml @@ -39,5 +39,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaurguard.xml b/data/monster/minotaurguard.xml index 1825c5d..52ea09d 100644 --- a/data/monster/minotaurguard.xml +++ b/data/monster/minotaurguard.xml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaurmage.xml b/data/monster/minotaurmage.xml index 32652f9..208e2b8 100644 --- a/data/monster/minotaurmage.xml +++ b/data/monster/minotaurmage.xml @@ -51,5 +51,6 @@ + \ No newline at end of file diff --git a/data/monster/morgaroth.xml b/data/monster/morgaroth.xml index f4d5df7..0475508 100644 --- a/data/monster/morgaroth.xml +++ b/data/monster/morgaroth.xml @@ -125,5 +125,7 @@ + + \ No newline at end of file diff --git a/data/monster/mummy.xml b/data/monster/mummy.xml index 65cfa6d..c221770 100644 --- a/data/monster/mummy.xml +++ b/data/monster/mummy.xml @@ -50,5 +50,6 @@ + \ No newline at end of file diff --git a/data/monster/murius.xml b/data/monster/murius.xml index 5bbf84e..5b5cc51 100644 --- a/data/monster/murius.xml +++ b/data/monster/murius.xml @@ -52,5 +52,6 @@ + \ No newline at end of file diff --git a/data/monster/necropharus.xml b/data/monster/necropharus.xml index a45e4bb..070a972 100644 --- a/data/monster/necropharus.xml +++ b/data/monster/necropharus.xml @@ -60,5 +60,6 @@ + \ No newline at end of file diff --git a/data/monster/oldwidow.xml b/data/monster/oldwidow.xml index 087b508..2eb1394 100644 --- a/data/monster/oldwidow.xml +++ b/data/monster/oldwidow.xml @@ -58,5 +58,7 @@ + + \ No newline at end of file diff --git a/data/monster/orshabaal.xml b/data/monster/orshabaal.xml index 364d9a4..b9c4d4f 100644 --- a/data/monster/orshabaal.xml +++ b/data/monster/orshabaal.xml @@ -119,5 +119,7 @@ + + \ No newline at end of file diff --git a/data/monster/sibang.xml b/data/monster/sibang.xml index f9870b4..1398723 100644 --- a/data/monster/sibang.xml +++ b/data/monster/sibang.xml @@ -43,5 +43,6 @@ + \ No newline at end of file diff --git a/data/monster/stonegolem.xml b/data/monster/stonegolem.xml index 195fa52..847f3ff 100644 --- a/data/monster/stonegolem.xml +++ b/data/monster/stonegolem.xml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/data/monster/warwolf.xml b/data/monster/warwolf.xml index e4bbdfd..ed447df 100644 --- a/data/monster/warwolf.xml +++ b/data/monster/warwolf.xml @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/data/monster/wasp.xml b/data/monster/wasp.xml index 885fffc..ed404ad 100644 --- a/data/monster/wasp.xml +++ b/data/monster/wasp.xml @@ -26,4 +26,7 @@ + + + \ No newline at end of file diff --git a/data/monster/wolf.xml b/data/monster/wolf.xml index 1f1af43..42101bf 100644 --- a/data/monster/wolf.xml +++ b/data/monster/wolf.xml @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/data/movements/movements.xml b/data/movements/movements.xml index 41b6aa3..420dbab 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -532,6 +532,20 @@ + + + + + + + + + + + + + + @@ -583,6 +597,20 @@ + + + + + + + + + + + + + + diff --git a/data/movements/scripts/misc/doors.lua b/data/movements/scripts/misc/doors.lua index 9667f42..6b64a9b 100644 --- a/data/movements/scripts/misc/doors.lua +++ b/data/movements/scripts/misc/doors.lua @@ -7,6 +7,13 @@ local verticalDoors = { [1679] = 1678, [1697] = 1696, [1699] = 1698, + [5112] = 5111, + [5114] = 5113, + [5130] = 5129, + [5132] = 5131, + [5288] = 5287, + [5292] = 5291, + [5748] = 5749, } local horizontalDoors = { @@ -18,6 +25,13 @@ local horizontalDoors = { [1681] = 1680, [1688] = 1687, [1690] = 1689, + [5103] = 5102, + [5105] = 5104, + [5121] = 5120, + [5123] = 5122, + [5290] = 5289, + [5294] = 5293, + [5746] = 5745, } function onStepOut(creature, item, fromPosition, toPosition) diff --git a/data/movements/scripts/misc/floorchange.lua b/data/movements/scripts/misc/floorchange.lua index 6e1f365..d579515 100644 --- a/data/movements/scripts/misc/floorchange.lua +++ b/data/movements/scripts/misc/floorchange.lua @@ -70,6 +70,13 @@ 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}, + [5544] = {x = 0, y = 0, z = 1}, + [5691] = {x = 0, y = 0, z = 1}, + [5731] = {x = 0, y = 0, z = 1}, + [5763] = {x = 0, y = 0, z = 1}, } function onStepIn(creature, item, position, fromPosition) diff --git a/data/npc/amber.npc b/data/npc/amber.npc index 35ae0d6..0ebf472 100644 --- a/data/npc/amber.npc +++ b/data/npc/amber.npc @@ -2,7 +2,7 @@ # amber.npc: Datenbank für die Abenteurerin Amber Name = "Amber" -Outfit = (137,59-113-132-76) +Outfit = (136,59-113-132-76-1) Home = [32103,32182,8] Radius = 4 diff --git a/data/npc/bigben.npc b/data/npc/bigben.npc index 86868ff..9e9057c 100644 --- a/data/npc/bigben.npc +++ b/data/npc/bigben.npc @@ -50,14 +50,35 @@ VANISH,! -> "Hum Humm." "cyclops" -> "Me people not live here much. Most are far away." "excalibug" -> "Me wish I could make weapon like it." -"fire","sword" -> "Do lil' one want to trade a fire sword?", topic=1 -"bright","word" -> "Do lil' one want to trade a bright sword?", topic=1 -"warlord","sword" -> "Do lil' one want to trade a warlord sword?", topic=1 -"sword","of","valor" -> "Do lil' one want to trade a sword of valor?", topic=1 -"serpent","sword" -> "Do lil' one want to trade a serpent sword?", topic=1 -"enchanted","plate" -> "Do lil' one want to trade an enchanted plate armor?", topic=1 -"dragon","shield" -> "Do lil' one want to trade a dragon shield?", topic=1 +"uth'kean" -> Type=3381, Amount=1, "Very noble. Shiny. Me like. But breaks so fast. Me can make from shiny armour. Lil' one want to trade?", Topic=1 +Topic=1,"yes",QuestValue(17500)<2,! -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2 +Topic=1,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5887, Amount=1, Create(Type) +Topic=1,"yes" -> "You not have stuff me want for." +Topic=1 -> "Silly lil' one you are." + +"uth'lokr" -> Type=3416, Amount=1, "Firy steel it is. Need green ones' breath to melt. Or red even better. Me can make from shield. Lil' one want to trade?", Topic=4 +Topic=4,"yes",QuestValue(17500)<2,! -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2 +Topic=4,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5889, Amount=1, Create(Type) +Topic=4,"yes" -> "You not have stuff me want for." +Topic=4 -> "Silly lil' one you are." + +"za'ralator" -> Type=3356, Amount=1, "Hellsteel is. Cursed and evil. Dangerous to work with. Me can make from evil helmet. Lil' one want to trade?", Topic=5 +Topic=5,"yes",QuestValue(17500)<2,! -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2 +Topic=5,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5888, Amount=1, Create(Type) +Topic=5,"yes" -> "You not have stuff me want for." +Topic=5 -> "Silly lil' one you are." + +"uth'prta" -> Type=3281, Amount=1, "Good iron is. Me friends use it much for fight. Me can make from weapon. Lil' one want to trade?", Topic=6 +Topic=6,"yes",QuestValue(17500)<2,! -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2 +Topic=6,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5892, Amount=1, Create(Type) +Topic=6,"yes" -> "You not have stuff me want for." +Topic=6 -> "Silly lil' one you are." + +Topic=2,"yes" -> "Me need gift for woman. We dance, so me want to give her bast skirt. But she big is. So I need many to make big one. Bring three okay? Me wait.", SetQuestValue(17500,1) + +"bast skirt",QuestValue(17500)=1 -> Type=3560, Amount=3, "Lil' one bring three bast skirts?", Topic=3 +Topic=3,"yes",Count(Type)>=Amount -> "Good good! Woman happy will be. Now me happy too and help you.", Delete(Type), SetQuestValue(17500,2) +Topic=3,"yes" -> "You not have stuff me want for." +Topic=3 -> "Silly lil' one you are." -Topic=1,"yes" -> "You not have stuff me want for." -Topic=1 -> "Silly lil' one you are." } diff --git a/data/npc/brasith.npc b/data/npc/brasith.npc index 02637c0..c217374 100644 --- a/data/npc/brasith.npc +++ b/data/npc/brasith.npc @@ -59,6 +59,7 @@ VANISH,! -> "Asha Thrazi." "strawberry" -> Type=3591, Amount=1, Price=1, "Do you want to buy a strawberry for %P gold?", Topic=1 "carrot" -> Type=3595, Amount=1, Price=3, "Do you want to buy a carrot for %P gold?", Topic=1 "pumpkin" -> Type=3594, Amount=1, Price=10, "Do you want to buy a pumpkin for %P gold?", Topic=1 +"juice squeezer" -> Type=5865, Amount=1, Price=100, "Do you want to buy a juice squeezer for %P gold?", Topic=1 %1,1<%1,"corncob" -> Type=3597, Amount=%1, Price=3*%1, "Do you want to buy %A corncobs for %P gold?", Topic=1 %1,1<%1,"cherr" -> Type=3590, Amount=%1, Price=1*%1, "Do you want to buy %A cherries for %P gold?", Topic=1 @@ -68,6 +69,7 @@ VANISH,! -> "Asha Thrazi." %1,1<%1,"strawberries" -> Type=3591, Amount=%1, Price=1*%1, "Do you want to buy %A strawberries for %P gold?", Topic=1 %1,1<%1,"carrot" -> Type=3595, Amount=%1, Price=3*%1, "Do you want to buy %A carrots 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,"juice squeezer" -> Type=5865, Amount=%1, Price=100*%1, "Do you want to buy %A juice squeezers for %P gold?", Topic=1 "bugmilk" -> Type=2875, Data=9, Amount=1, Price=15, "Do you want to buy a bottle of bugmilk for %P gold?", Topic=1 diff --git a/data/npc/elane.npc b/data/npc/elane.npc index 90834f1..92cf4df 100644 --- a/data/npc/elane.npc +++ b/data/npc/elane.npc @@ -2,7 +2,7 @@ # elane.npc: Datenbank für die Paladinin Elane Name = "Elane" -Outfit = (137,113-63-120-119) +Outfit = (137,113-63-120-119-2) Home = [32343,32239,7] Radius = 4 @@ -47,6 +47,7 @@ VANISH,! -> "Bye." "lugri" -> "A follower of evil that will get what he deserves one day." "excalibug" -> "A weapon of myth. I don't believe that this weapon exists." "news" -> "I am a paladin, not a storyteller." +"Sniper gloves" -> "We are always looking for sniper gloves. They are supposed to raise accuracy. If you find a pair, bring them here. Maybe I can offer you a nice trade." "member" -> "Every paladin profits from his vocation. It has many advantages to be a paladin." "profit" -> "We will help you to improve your skills. Besides I offer spells for paladins." diff --git a/data/npc/haroun.npc b/data/npc/haroun.npc index 7ff69ba..ebdf9c4 100644 --- a/data/npc/haroun.npc +++ b/data/npc/haroun.npc @@ -173,4 +173,32 @@ Topic=11,"yes" -> "You do not have one." Topic=11,"yes",Amount>1 -> "You do not have that many." Topic=11 -> "I understand. Perhaps another time then." +"fighting","spirit" -> Type=3392, Amount=2, "Do you want to trade %A royal helmets for fighting spirit?", Topic=12 +Topic=12,QuestValue(283)<3,! -> "I'm sorry, human. But you need Gabel's permission to trade with me." +Topic=12,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5884, Amount=1, Create(Type) +Topic=12,"yes" -> "You do not have one." +Topic=12,"yes",Amount>1 -> "You do not have that many." +Topic=12 -> "I understand. Perhaps another time then." + +"magic","sulphur" -> Type=3280, Amount=3, "Do you want to trade %A fire swords for magic sulphur?", Topic=13 +Topic=13,QuestValue(283)<3,! -> "I'm sorry, human. But you need Gabel's permission to trade with me." +Topic=13,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5904, Amount=1, Create(Type) +Topic=13,"yes" -> "You do not have one." +Topic=13,"yes",Amount>1 -> "You do not have that many." +Topic=13 -> "I understand. Perhaps another time then." + +"warrior","sweat" -> Type=3369, Amount=4, "Do you want to trade %A warrior helmets for flask of warrior's sweat?", Topic=14 +Topic=14,QuestValue(283)<3,! -> "I'm sorry, human. But you need Gabel's permission to trade with me." +Topic=14,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5885, Amount=1, Create(Type) +Topic=14,"yes" -> "You do not have one." +Topic=14,"yes",Amount>1 -> "You do not have that many." +Topic=14 -> "I understand. Perhaps another time then." + +"chicken","wing" -> Type=3079, Amount=1, "Do you want to trade %A boots of haste for enchanted chicken wing?", Topic=15 +Topic=15,QuestValue(283)<3,! -> "I'm sorry, human. But you need Gabel's permission to trade with me." +Topic=15,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5891, Amount=1, Create(Type) +Topic=15,"yes" -> "You do not have one." +Topic=15,"yes",Amount>1 -> "You do not have that many." +Topic=15 -> "I understand. Perhaps another time then." + } diff --git a/data/npc/livielle.npc b/data/npc/livielle.npc index 303d4cf..e967651 100644 --- a/data/npc/livielle.npc +++ b/data/npc/livielle.npc @@ -44,6 +44,8 @@ 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 +"juice squeezer" -> Type=5865, Amount=1, Price=100, "Do you want to buy a juice squeezer 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 +54,8 @@ 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 +%1,1<%1,"juice squeezer" -> Type=5865, Amount=%1, Price=100*%1, "Do you want to buy %A juice squeezers 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." diff --git a/data/npc/tom.npc b/data/npc/tom.npc index 5e3f0c2..a397d1a 100644 --- a/data/npc/tom.npc +++ b/data/npc/tom.npc @@ -40,9 +40,10 @@ VANISH,! -> "Doh?" "rat",Questvalue(224)=0 -> Type=3994, Amount=1, Price=2, "I'll give you %P gold for a dead rat. Do you accept?", Topic=2 "rabbit",Questvalue(224)=0 -> Type=4173, Amount=1, Price=2, "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=2 -"rat" -> Type=3994, Amount=1, Price=2, "I'll give you %P gold for a dead rat. Do you accept?", Topic=1 -"rabbit" -> Type=4173, Amount=1, Price=2, "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=1 -"wolf" -> Type=4007, Amount=1, Price=5, "Do you want to sell a dead wolf for %P gold?", Topic=1 +"rat" -> Type=3994, Amount=1, Price=2, "I'll give you %P gold for a dead rat. Do you accept?", Topic=1 +"rabbit" -> Type=4173, Amount=1, Price=2, "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=1 +"wolf" -> Type=4007, Amount=1, Price=5, "Do you want to sell a dead wolf for %P gold?", Topic=1 +"minotaur leather" -> Type=5878, Amount=1, Price=12, "Do you want to sell a minotaur leather for %P gold?", Topic=1 %1,1<%1,"rat",Questvalue(224)=0 -> Type=3994, Amount=%1, Price=2*%1, "I'll give you %P gold for %A dead rats. Do you accept?", Topic=2 %1,1<%1,"rabbit",Questvalue(224)=0 -> Type=4173, Amount=%1, Price=2*%1, "I'll give you %P gold for %A dead rabbits. Do you accept?", Topic=2 @@ -50,6 +51,7 @@ VANISH,! -> "Doh?" %1,1<%1,"rabbit" -> Type=4173, Amount=%1, Price=2*%1, "I'll give you %P gold for %A dead rabbits. Do you accept?", Topic=1 %1,1<%1,"wolf" -> Type=4007, Amount=%1, Price=5*%1, "Do you want to sell %A dead wolves for %P gold?", Topic=1 %1,1<%1,"wolves" -> Type=4007, Amount=%1, Price=5*%1, "Do you want to sell %A dead wolves for %P gold?", Topic=1 +%1,1<%1,"minotaur leather" -> Type=5878, Amount=%1, Price=12*%1, "Do you want to sell %A minotaur leathers for %P gold?", Topic=1 Topic=1,"yes",Count(Type)>=Amount -> "Ok. Corpse for me, gold for you.", Delete(Type), CreateMoney Topic=1,"yes" -> "Sorry, you do not have a fresh one." diff --git a/data/npc/yaman.npc b/data/npc/yaman.npc index 82e4602..be714cd 100644 --- a/data/npc/yaman.npc +++ b/data/npc/yaman.npc @@ -158,4 +158,32 @@ Topic=11,"yes",Count(Type)>=Amount -> "Good. Here is your money.", Delete(Type), Topic=11,"yes" -> "You do not have one, human!" Topic=11,"yes",Amount>1 -> "You do not have that many, human!" Topic=11 -> "As you wish." + +"fighting","spirit" -> Type=3392, Amount=2, "Do you want to trade %A royal helmets for fighting spirit?", Topic=12 +Topic=12,QuestValue(288)<3,! -> "I'm sorry, but you don't have Malor's permission to trade with me." +Topic=12,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5884, Amount=1, Create(Type) +Topic=12,"yes" -> "You do not have one, human!" +Topic=12,"yes",Amount>1 -> "You do not have that many, human!" +Topic=12 -> "As you wish." + +"magic","sulphur" -> Type=3280, Amount=3, "Do you want to trade %A fire swords for magic sulphur?", Topic=13 +Topic=13,QuestValue(288)<3,! -> "I'm sorry, but you don't have Malor's permission to trade with me." +Topic=13,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5904, Amount=1, Create(Type) +Topic=13,"yes" -> "You do not have one, human!" +Topic=13,"yes",Amount>1 -> "You do not have that many, human!" +Topic=13 -> "As you wish." + +"warrior","sweat" -> Type=3369, Amount=4, "Do you want to trade %A warrior helmets for flask of warrior's sweat?", Topic=14 +Topic=14,QuestValue(288)<3,! -> "I'm sorry, but you don't have Malor's permission to trade with me." +Topic=14,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5885, Amount=1, Create(Type) +Topic=14,"yes" -> "You do not have one, human!" +Topic=14,"yes",Amount>1 -> "You do not have that many, human!" +Topic=14 -> "As you wish." + +"chicken","wing" -> Type=3079, Amount=1, "Do you want to trade %A boots of haste for enchanted chicken wing?", Topic=15 +Topic=15,QuestValue(288)<3,! -> "I'm sorry, but you don't have Malor's permission to trade with me." +Topic=15,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5891, Amount=1, Create(Type) +Topic=15,"yes" -> "You do not have one, human!" +Topic=15,"yes",Amount>1 -> "You do not have that many, human!" +Topic=15 -> "As you wish." } diff --git a/data/npc/zebron.npc b/data/npc/zebron.npc index d92417b..e5a98e4 100644 --- a/data/npc/zebron.npc +++ b/data/npc/zebron.npc @@ -40,11 +40,22 @@ VANISH,! -> "Hey, you can't leave. Luck is smiling on you. I can feel "game" -> * "dice" -> * -Topic=1,"yes" -> "I will roll a dice. If it shows 6, you will get five times your bet. How much do you want to bet?", Amount=Random(1,6), Topic=2 +Topic=1,"yes" -> "Hmmm, would you like to play for money or for a chance to win your own dice?", Topic=3 Topic=1,"no" -> "Oh come on, don't be a child." -Topic=2,%1,0<%1,100>%1,CountMoney>=%1,Amount=6 -> Price=%1*5, "Ok, here we go ... 6! You have won %P, congratulations. One more game?", CreateMoney, Topic=1 -Topic=2,%1,0<%1,100>%1,CountMoney>=%1 -> Price=%1, "Ok, here we go ... %A! You have lost. Bad luck. One more game?", DeleteMoney, Topic=1 +Topic=3,"money" -> "I thought so. Okay, I will roll a dice. If it shows 6, you will get five times your bet. How much do you want to bet?", Amount=Random(1,6), Topic=2 +Topic=3,"dice" -> "Hehe, good choice. Okay, the price for this game is 100 gold pieces. I will roll a dice. If I roll a 6, you can have my dice. Agreed?", Amount=Random(1,6), Topic=4 + +Topic=6,"yes" -> "Okay, I will roll a dice. If it shows 6, you will get five times your bet. How much do you want to bet?", Amount=Random(1,6), Topic=2 +Topic=6,"no" -> "Oh come on, don't be a child." +Topic=2,%1,0<%1,100>%1,CountMoney>=%1,Amount=6 -> Price=%1*5, "Ok, here we go ... 6! You have won %P, congratulations. One more game?", CreateMoney, EffectMe(27), Topic=6 +Topic=2,%1,0<%1,100>%1,CountMoney>=%1 -> Price=%1, "Ok, here we go ... %A! You have lost. Bad luck. One more game?", DeleteMoney, EffectMe(27), Topic=6 Topic=2,%1,0<%1,100>%1 -> "I am sorry, but you don't have so much money. How much do you want to bet?", Topic=2 Topic=2,%1 -> "I am sorry, but I accept only bets between 1 and 99 gold. I don't want to ruin you after all. How much do you want to bet?", Topic=2 + +Topic=5,"yes" -> "Okay, the price for this game is 100 gold pieces. I will roll a dice. If I roll a 6, you can have my dice. Agreed?", Amount=Random(1,6), Topic=4 +Topic=5,"no" -> "Oh come on, don't be a child." +Topic=4,"yes",CountMoney>=100,Amount=6 -> Price=100, Type=5792, Amount=1, "Ok, here we go ... 6! You have won a dice, congratulations. One more game?", DeleteMoney, Create(Type), EffectMe(27), Topic=5 +Topic=4,"yes",CountMoney>=100 -> Price=100, "Ok, here we go ... %A! You have lost. Bad luck. One more game?", DeleteMoney, EffectMe(27), Topic=5 +Topic=4,"yes" -> "I am sorry, but you don't have so much money." } diff --git a/data/world/houses.xml b/data/world/houses.xml index e7161eb..0ff95e2 100644 --- a/data/world/houses.xml +++ b/data/world/houses.xml @@ -861,4 +861,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/world/map.otbm b/data/world/map.otbm index 701d9dc..b16103e 100644 Binary files a/data/world/map.otbm and b/data/world/map.otbm differ diff --git a/data/world/spawns.xml b/data/world/spawns.xml index cfb8db5..4e5a29a 100644 --- a/data/world/spawns.xml +++ b/data/world/spawns.xml @@ -139,6 +139,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -303,11 +383,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -621,6 +812,20 @@ + + + + + + + + + + + + + + @@ -636,6 +841,9 @@ + + + @@ -663,6 +871,13 @@ + + + + + + + @@ -690,6 +905,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1217,14 +1605,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1234,6 +1654,15 @@ + + + + + + + + + @@ -1246,21 +1675,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1270,11 +1728,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2290,6 +2945,9 @@ + + + @@ -2397,14 +3055,32 @@ + + + + + + + + + + + + + + + + + + @@ -2418,6 +3094,19 @@ + + + + + + + + + + + + + @@ -2433,11 +3122,21 @@ + + + + + + + + + + @@ -2452,17 +3151,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2470,9 +3219,20 @@ + + + + + + + + + + + @@ -2484,10 +3244,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2495,6 +3399,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2659,9 +3693,11 @@ + + @@ -2722,6 +3758,9 @@ + + + @@ -2758,6 +3797,9 @@ + + + @@ -2780,6 +3822,9 @@ + + + @@ -2788,11 +3833,17 @@ + + + + + + @@ -2854,6 +3905,9 @@ + + + @@ -2879,6 +3933,9 @@ + + + @@ -3005,6 +4062,9 @@ + + + @@ -3147,6 +4207,9 @@ + + + @@ -3201,6 +4264,9 @@ + + + @@ -3385,11 +4451,17 @@ + + + + + + @@ -3766,6 +4838,7 @@ + @@ -3917,6 +4990,9 @@ + + + @@ -3945,6 +5021,9 @@ + + + @@ -4014,6 +5093,9 @@ + + + @@ -4700,6 +5782,9 @@ + + + @@ -5719,6 +6804,7 @@ + @@ -5962,6 +7048,9 @@ + + + @@ -6276,6 +7365,9 @@ + + + @@ -7233,6 +8325,9 @@ + + + @@ -7446,6 +8541,9 @@ + + + @@ -7549,6 +8647,17 @@ + + + + + + + + + + + @@ -7560,6 +8669,12 @@ + + + + + + @@ -7586,6 +8701,13 @@ + + + + + + + @@ -7600,6 +8722,12 @@ + + + + + + @@ -7639,6 +8767,16 @@ + + + + + + + + + + @@ -7647,6 +8785,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7657,6 +8824,12 @@ + + + + + + @@ -7664,6 +8837,12 @@ + + + + + + @@ -7684,6 +8863,12 @@ + + + + + + @@ -7698,6 +8883,9 @@ + + + @@ -7707,6 +8895,12 @@ + + + + + + @@ -7715,6 +8909,24 @@ + + + + + + + + + + + + + + + + + + @@ -7730,6 +8942,18 @@ + + + + + + + + + + + + @@ -7753,6 +8977,17 @@ + + + + + + + + + + + @@ -7761,6 +8996,22 @@ + + + + + + + + + + + + + + + + @@ -7774,9 +9025,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7788,14 +9069,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7803,6 +9124,9 @@ + + + @@ -7816,6 +9140,18 @@ + + + + + + + + + + + + @@ -7824,6 +9160,23 @@ + + + + + + + + + + + + + + + + + @@ -7834,6 +9187,18 @@ + + + + + + + + + + + + @@ -7855,6 +9220,12 @@ + + + + + + @@ -7862,6 +9233,12 @@ + + + + + + @@ -7871,6 +9248,15 @@ + + + + + + + + + @@ -7893,6 +9279,10 @@ + + + + @@ -7905,6 +9295,24 @@ + + + + + + + + + + + + + + + + + + @@ -7920,6 +9328,15 @@ + + + + + + + + + @@ -7938,6 +9355,13 @@ + + + + + + + @@ -7947,6 +9371,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7965,6 +9420,9 @@ + + + @@ -7977,6 +9435,15 @@ + + + + + + + + + @@ -7993,6 +9460,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8010,12 +9504,27 @@ + + + + + + + + + + + + + + + @@ -8025,6 +9534,13 @@ + + + + + + + @@ -8038,10 +9554,20 @@ + + + + + + + + + + @@ -8057,6 +9583,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -8068,6 +9614,16 @@ + + + + + + + + + + @@ -8077,6 +9633,14 @@ + + + + + + + + @@ -8111,6 +9675,10 @@ + + + + @@ -8136,12 +9704,26 @@ + + + + + + + + + + + + + + @@ -8161,6 +9743,12 @@ + + + + + + @@ -8180,6 +9768,16 @@ + + + + + + + + + + @@ -8192,9 +9790,28 @@ + + + + + + + + + + + + + + + + + + + @@ -8204,9 +9821,21 @@ + + + + + + + + + + + + @@ -8222,6 +9851,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -8231,11 +9884,26 @@ + + + + + + + + + + + + + + + @@ -8259,6 +9927,12 @@ + + + + + + @@ -8284,6 +9958,12 @@ + + + + + + @@ -8301,6 +9981,16 @@ + + + + + + + + + + @@ -8315,6 +10005,9 @@ + + + @@ -8333,9 +10026,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8355,6 +10076,12 @@ + + + + + + @@ -8374,6 +10101,22 @@ + + + + + + + + + + + + + + + + @@ -8382,6 +10125,11 @@ + + + + + @@ -8401,6 +10149,12 @@ + + + + + + @@ -8414,6 +10168,12 @@ + + + + + + @@ -8431,9 +10191,25 @@ + + + + + + + + + + + + + + + + @@ -8457,14 +10233,29 @@ + + + + + + + + + + + + + + + @@ -8473,6 +10264,12 @@ + + + + + + @@ -8522,6 +10319,18 @@ + + + + + + + + + + + + @@ -8531,6 +10340,10 @@ + + + + @@ -8550,6 +10363,9 @@ + + + @@ -8573,6 +10389,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -8584,6 +10420,9 @@ + + + @@ -8673,6 +10512,12 @@ + + + + + + @@ -8680,6 +10525,12 @@ + + + + + + @@ -8690,6 +10541,13 @@ + + + + + + + @@ -8698,10 +10556,21 @@ + + + + + + + + + + + @@ -8724,9 +10593,20 @@ + + + + + + + + + + + @@ -8746,6 +10626,10 @@ + + + + @@ -8761,6 +10645,23 @@ + + + + + + + + + + + + + + + + + @@ -8771,12 +10672,33 @@ + + + + + + + + + + + + + + + + + + + + + @@ -8787,6 +10709,11 @@ + + + + + @@ -8816,6 +10743,11 @@ + + + + + @@ -8824,6 +10756,9 @@ + + + @@ -8840,6 +10775,13 @@ + + + + + + + @@ -8855,6 +10797,10 @@ + + + + @@ -8879,6 +10825,13 @@ + + + + + + + @@ -8910,6 +10863,11 @@ + + + + + @@ -8951,6 +10909,11 @@ + + + + + @@ -8970,6 +10933,11 @@ + + + + + @@ -8981,10 +10949,16 @@ + + + + + + @@ -9029,6 +11003,11 @@ + + + + + @@ -9052,6 +11031,9 @@ + + + @@ -9059,10 +11041,20 @@ + + + + + + + + + + @@ -9082,6 +11074,12 @@ + + + + + + @@ -9098,6 +11096,15 @@ + + + + + + + + + @@ -9116,6 +11123,14 @@ + + + + + + + + @@ -9154,6 +11169,12 @@ + + + + + + @@ -9188,6 +11209,9 @@ + + + @@ -9219,6 +11243,24 @@ + + + + + + + + + + + + + + + + + + @@ -9228,6 +11270,10 @@ + + + + @@ -9255,6 +11301,9 @@ + + + @@ -9307,6 +11356,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9353,6 +11432,9 @@ + + + @@ -9385,6 +11467,14 @@ + + + + + + + + @@ -9396,6 +11486,19 @@ + + + + + + + + + + + + + @@ -9408,6 +11511,11 @@ + + + + + @@ -9421,6 +11529,14 @@ + + + + + + + + @@ -9432,6 +11548,9 @@ + + + @@ -9478,6 +11597,10 @@ + + + + @@ -9489,6 +11612,10 @@ + + + + @@ -9500,6 +11627,9 @@ + + + @@ -9516,6 +11646,9 @@ + + + @@ -9540,6 +11673,14 @@ + + + + + + + + @@ -9552,6 +11693,9 @@ + + + @@ -9577,6 +11721,9 @@ + + + @@ -9587,6 +11734,9 @@ + + + @@ -9599,6 +11749,17 @@ + + + + + + + + + + + @@ -9659,6 +11820,13 @@ + + + + + + + @@ -9668,6 +11836,17 @@ + + + + + + + + + + + @@ -9707,6 +11886,10 @@ + + + + @@ -9741,6 +11924,9 @@ + + + @@ -9760,6 +11946,10 @@ + + + + @@ -9770,6 +11960,9 @@ + + + @@ -9780,6 +11973,9 @@ + + + @@ -9806,6 +12002,10 @@ + + + + @@ -9975,6 +12175,9 @@ + + + @@ -10011,6 +12214,11 @@ + + + + + @@ -10053,6 +12261,13 @@ + + + + + + + @@ -10075,6 +12290,12 @@ + + + + + + @@ -10097,6 +12318,9 @@ + + + @@ -10233,6 +12457,11 @@ + + + + + @@ -10331,6 +12560,12 @@ + + + + + + @@ -10356,6 +12591,9 @@ + + + @@ -10379,9 +12617,16 @@ + + + + + + + @@ -10407,6 +12652,12 @@ + + + + + + @@ -10447,6 +12698,9 @@ + + + @@ -10470,6 +12724,9 @@ + + + @@ -10478,6 +12735,12 @@ + + + + + + @@ -10513,6 +12776,9 @@ + + + @@ -10535,6 +12801,9 @@ + + + @@ -10567,6 +12836,9 @@ + + + @@ -10629,6 +12901,9 @@ + + + @@ -10650,6 +12925,9 @@ + + + @@ -10719,6 +12997,10 @@ + + + + @@ -10726,9 +13008,18 @@ + + + + + + + + + @@ -10770,6 +13061,9 @@ + + + @@ -10792,6 +13086,9 @@ + + + @@ -10828,6 +13125,13 @@ + + + + + + + @@ -10845,6 +13149,12 @@ + + + + + + @@ -10871,6 +13181,12 @@ + + + + + + @@ -11011,6 +13327,9 @@ + + + @@ -11051,6 +13370,9 @@ + + + @@ -11120,6 +13442,10 @@ + + + + @@ -11140,6 +13466,21 @@ + + + + + + + + + + + + + + + @@ -11160,6 +13501,11 @@ + + + + + @@ -11188,11 +13534,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11200,6 +13571,12 @@ + + + + + + @@ -11212,6 +13589,10 @@ + + + + @@ -11222,6 +13603,17 @@ + + + + + + + + + + + @@ -11277,6 +13669,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -11306,6 +13719,22 @@ + + + + + + + + + + + + + + + + @@ -11331,6 +13760,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11348,7 +13812,18 @@ + + + + + + + + + + + @@ -11361,6 +13836,9 @@ + + + @@ -11372,9 +13850,19 @@ + + + + + + + + + + @@ -11386,10 +13874,21 @@ + + + + + + + + + + + @@ -11414,15 +13913,28 @@ + + + + + + + + + + + + + @@ -11436,10 +13948,31 @@ + + + + + + + + + + + + + + + + + + + + + @@ -11450,6 +13983,11 @@ + + + + + @@ -11458,25 +13996,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11499,6 +14076,11 @@ + + + + + @@ -11506,9 +14088,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11518,12 +14126,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12647,6 +15458,7 @@ + @@ -12681,6 +15493,9 @@ + + + @@ -12728,6 +15543,7 @@ + @@ -12805,6 +15621,7 @@ + @@ -15434,6 +18251,12 @@ + + + + + + @@ -15503,6 +18326,20 @@ + + + + + + + + + + + + + + @@ -15594,6 +18431,11 @@ + + + + + @@ -15602,6 +18444,13 @@ + + + + + + + @@ -15622,11 +18471,32 @@ + + + + + + + + + + + + + + + + + + + + + @@ -15636,6 +18506,12 @@ + + + + + + @@ -15659,6 +18535,10 @@ + + + + @@ -15688,6 +18568,16 @@ + + + + + + + + + + @@ -15697,6 +18587,11 @@ + + + + + @@ -15716,6 +18611,9 @@ + + + @@ -15750,6 +18648,9 @@ + + + @@ -15767,6 +18668,9 @@ + + + @@ -15789,6 +18693,11 @@ + + + + + @@ -15803,6 +18712,16 @@ + + + + + + + + + + @@ -15811,6 +18730,11 @@ + + + + + @@ -15837,6 +18761,10 @@ + + + + @@ -15849,6 +18777,9 @@ + + + @@ -15860,6 +18791,9 @@ + + + @@ -15891,6 +18825,12 @@ + + + + + + @@ -15898,6 +18838,14 @@ + + + + + + + + @@ -15942,6 +18890,10 @@ + + + + @@ -15949,6 +18901,12 @@ + + + + + + @@ -15964,6 +18922,11 @@ + + + + + @@ -16000,6 +18963,10 @@ + + + + @@ -16019,6 +18986,9 @@ + + + @@ -16026,6 +18996,10 @@ + + + + @@ -16038,6 +19012,11 @@ + + + + + @@ -16051,6 +19030,13 @@ + + + + + + + @@ -16063,6 +19049,21 @@ + + + + + + + + + + + + + + + @@ -16076,6 +19077,17 @@ + + + + + + + + + + + @@ -16089,10 +19101,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16111,9 +19152,16 @@ + + + + + + + @@ -16121,9 +19169,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16141,6 +19223,9 @@ + + + @@ -16153,6 +19238,21 @@ + + + + + + + + + + + + + + + @@ -16162,6 +19262,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -16175,6 +19295,10 @@ + + + + @@ -16182,6 +19306,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16194,6 +19344,9 @@ + + + @@ -16202,13 +19355,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16217,6 +19413,21 @@ + + + + + + + + + + + + + + + @@ -16227,6 +19438,13 @@ + + + + + + + @@ -16243,6 +19461,17 @@ + + + + + + + + + + + @@ -16256,13 +19485,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16278,6 +19532,14 @@ + + + + + + + + @@ -16297,11 +19559,29 @@ + + + + + + + + + + + + + + + + + + @@ -16311,16 +19591,28 @@ + + + + + + + + + + + + @@ -16341,6 +19633,14 @@ + + + + + + + + @@ -16350,6 +19650,13 @@ + + + + + + + @@ -16368,6 +19675,14 @@ + + + + + + + + @@ -16376,10 +19691,27 @@ + + + + + + + + + + + + + + + + + @@ -16394,6 +19726,15 @@ + + + + + + + + + @@ -16405,24 +19746,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16430,6 +19806,12 @@ + + + + + + @@ -16444,6 +19826,13 @@ + + + + + + + @@ -16458,14 +19847,34 @@ + + + + + + + + + + + + + + + + + + + + @@ -16474,6 +19883,9 @@ + + + @@ -16482,6 +19894,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -16495,13 +19928,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16514,6 +20126,15 @@ + + + + + + + + + @@ -16529,6 +20150,9 @@ + + + @@ -16537,6 +20161,13 @@ + + + + + + + @@ -16546,15 +20177,28 @@ + + + + + + + + + + + + + @@ -16563,6 +20207,9 @@ + + + @@ -16574,6 +20221,15 @@ + + + + + + + + + @@ -16646,6 +20302,13 @@ + + + + + + + @@ -16659,6 +20322,9 @@ + + + @@ -16670,6 +20336,13 @@ + + + + + + + @@ -16710,6 +20383,9 @@ + + + @@ -16725,6 +20401,16 @@ + + + + + + + + + + @@ -16771,6 +20457,19 @@ + + + + + + + + + + + + + @@ -16799,6 +20498,11 @@ + + + + + @@ -16808,10 +20512,21 @@ + + + + + + + + + + + @@ -16832,6 +20547,10 @@ + + + + @@ -16844,6 +20563,16 @@ + + + + + + + + + + @@ -16857,6 +20586,14 @@ + + + + + + + + @@ -16875,6 +20612,15 @@ + + + + + + + + + @@ -16892,12 +20638,32 @@ + + + + + + + + + + + + + + + + + + + + @@ -16963,6 +20729,10 @@ + + + + @@ -16986,6 +20756,11 @@ + + + + + @@ -17022,9 +20797,24 @@ + + + + + + + + + + + + + + + @@ -17061,12 +20851,23 @@ + + + + + + + + + + + @@ -17075,6 +20876,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17901,6 +21851,9 @@ + + + @@ -17943,6 +21896,7 @@ + @@ -17983,6 +21937,7 @@ + @@ -18136,6 +22091,7 @@ + @@ -18187,6 +22143,7 @@ + @@ -18200,6 +22157,7 @@ + @@ -18217,6 +22175,9 @@ + + + @@ -18239,13 +22200,18 @@ + + + + + @@ -19113,6 +23079,7 @@ + @@ -19126,6 +23093,7 @@ + @@ -19158,6 +23126,7 @@ + @@ -19175,6 +23144,9 @@ + + + @@ -19192,6 +23164,9 @@ + + + @@ -19210,6 +23185,9 @@ + + + @@ -19251,6 +23229,7 @@ + @@ -19260,8 +23239,10 @@ + + @@ -19276,7 +23257,9 @@ + + @@ -19310,6 +23293,7 @@ + @@ -19329,6 +23313,9 @@ + + + @@ -19837,6 +23824,7 @@ + @@ -19859,6 +23847,7 @@ + @@ -19893,10 +23882,12 @@ + + @@ -19934,6 +23925,7 @@ + @@ -19971,6 +23963,9 @@ + + + @@ -19985,6 +23980,9 @@ + + + @@ -20004,6 +24002,7 @@ + @@ -20013,6 +24012,7 @@ + @@ -20020,6 +24020,7 @@ + @@ -20044,17 +24045,25 @@ + + + + + + + + @@ -20072,7 +24081,12 @@ + + + + + @@ -20084,6 +24098,7 @@ + @@ -20097,9 +24112,11 @@ + + @@ -20109,16 +24126,21 @@ + + + + + @@ -20127,12 +24149,19 @@ + + + + + + + @@ -20143,11 +24172,13 @@ + + @@ -20235,6 +24266,8 @@ + + @@ -20242,6 +24275,7 @@ + @@ -20301,6 +24335,7 @@ + @@ -20310,6 +24345,7 @@ + @@ -20471,6 +24507,9 @@ + + + @@ -21084,11 +25123,20 @@ + + + + + + + + + @@ -21121,11 +25169,25 @@ + + + + + + + + + + + + + + @@ -21153,6 +25215,13 @@ + + + + + + + @@ -21170,6 +25239,13 @@ + + + + + + + @@ -21181,10 +25257,27 @@ + + + + + + + + + + + + + + + + + @@ -21194,9 +25287,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21210,10 +25338,18 @@ + + + + + + + + @@ -21298,6 +25434,9 @@ + + + @@ -21314,6 +25453,23 @@ + + + + + + + + + + + + + + + + + @@ -21347,6 +25503,10 @@ + + + + @@ -21365,6 +25525,9 @@ + + + @@ -21380,6 +25543,15 @@ + + + + + + + + + @@ -21390,6 +25562,9 @@ + + + @@ -21411,6 +25586,12 @@ + + + + + + @@ -21419,10 +25600,18 @@ + + + + + + + + @@ -21435,13 +25624,30 @@ + + + + + + + + + + + + + + + + + @@ -21456,12 +25662,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21472,6 +25710,24 @@ + + + + + + + + + + + + + + + + + + @@ -21503,6 +25759,9 @@ + + + @@ -21512,6 +25771,13 @@ + + + + + + + @@ -21523,6 +25789,9 @@ + + + @@ -21531,6 +25800,17 @@ + + + + + + + + + + + @@ -21542,13 +25822,29 @@ + + + + + + + + + + + + + + + + @@ -21559,6 +25855,12 @@ + + + + + + @@ -21571,6 +25873,9 @@ + + + @@ -21588,6 +25893,14 @@ + + + + + + + + @@ -21621,6 +25934,20 @@ + + + + + + + + + + + + + + @@ -21629,6 +25956,9 @@ + + + @@ -21645,12 +25975,19 @@ + + + + + + + @@ -21680,6 +26017,13 @@ + + + + + + + @@ -21688,9 +26032,15 @@ + + + + + + @@ -21705,10 +26055,20 @@ + + + + + + + + + + @@ -21718,6 +26078,9 @@ + + + @@ -21729,6 +26092,14 @@ + + + + + + + + @@ -21765,6 +26136,12 @@ + + + + + + @@ -21780,6 +26157,10 @@ + + + + @@ -21809,6 +26190,9 @@ + + + @@ -21829,13 +26213,30 @@ + + + + + + + + + + + + + + + + + @@ -21883,6 +26284,15 @@ + + + + + + + + + @@ -21911,14 +26321,31 @@ + + + + + + + + + + + + + + + + + @@ -21961,6 +26388,10 @@ + + + + @@ -21973,6 +26404,9 @@ + + + @@ -21983,6 +26417,9 @@ + + + @@ -22016,6 +26453,17 @@ + + + + + + + + + + + @@ -22034,6 +26482,9 @@ + + + @@ -22045,6 +26496,19 @@ + + + + + + + + + + + + + @@ -22054,6 +26518,17 @@ + + + + + + + + + + + @@ -22066,19 +26541,38 @@ + + + + + + + + + + + + + + + + + + + @@ -22093,6 +26587,12 @@ + + + + + + @@ -22103,6 +26603,23 @@ + + + + + + + + + + + + + + + + + @@ -22118,19 +26635,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22152,10 +26705,23 @@ + + + + + + + + + + + + + @@ -22166,6 +26732,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22173,6 +26765,13 @@ + + + + + + + @@ -22216,6 +26815,11 @@ + + + + + @@ -22226,12 +26830,28 @@ + + + + + + + + + + + + + + + + @@ -22240,10 +26860,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22265,6 +26926,13 @@ + + + + + + + @@ -22272,6 +26940,12 @@ + + + + + + @@ -22292,6 +26966,10 @@ + + + + @@ -22300,6 +26978,13 @@ + + + + + + + @@ -22308,6 +26993,13 @@ + + + + + + + @@ -22321,9 +27013,18 @@ + + + + + + + + + @@ -22334,11 +27035,18 @@ + + + + + + + @@ -22346,6 +27054,10 @@ + + + + @@ -22356,11 +27068,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -22370,6 +27106,14 @@ + + + + + + + + @@ -22384,6 +27128,9 @@ + + + @@ -22393,6 +27140,15 @@ + + + + + + + + + @@ -22408,6 +27164,12 @@ + + + + + + @@ -22418,9 +27180,16 @@ + + + + + + + @@ -22434,6 +27203,13 @@ + + + + + + + @@ -22465,30 +27241,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22498,12 +27311,25 @@ + + + + + + + + + + + + + @@ -22532,6 +27358,14 @@ + + + + + + + + @@ -22555,6 +27389,16 @@ + + + + + + + + + + @@ -22569,9 +27413,16 @@ + + + + + + + @@ -22582,7 +27433,28 @@ + + + + + + + + + + + + + + + + + + + + + @@ -22599,6 +27471,13 @@ + + + + + + + @@ -22606,9 +27485,24 @@ + + + + + + + + + + + + + + + @@ -22619,6 +27513,10 @@ + + + + @@ -22647,6 +27545,11 @@ + + + + + @@ -22654,6 +27557,9 @@ + + + @@ -22663,6 +27569,14 @@ + + + + + + + + @@ -22672,6 +27586,9 @@ + + + @@ -22680,6 +27597,17 @@ + + + + + + + + + + + @@ -22703,13 +27631,30 @@ + + + + + + + + + + + + + + + + + @@ -22720,12 +27665,34 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -22747,6 +27714,17 @@ + + + + + + + + + + + @@ -22757,25 +27735,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22786,14 +27799,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22801,13 +27840,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22816,14 +27901,34 @@ + + + + + + + + + + + + + + + + + + + + @@ -22864,6 +27969,12 @@ + + + + + + @@ -22873,11 +27984,21 @@ + + + + + + + + + + @@ -22931,6 +28052,11 @@ + + + + + @@ -22950,6 +28076,17 @@ + + + + + + + + + + + @@ -22957,10 +28094,24 @@ + + + + + + + + + + + + + + @@ -23011,12 +28162,33 @@ + + + + + + + + + + + + + + + + + + + + + @@ -23033,6 +28205,12 @@ + + + + + + @@ -23041,6 +28219,9 @@ + + + @@ -23060,10 +28241,24 @@ + + + + + + + + + + + + + + @@ -23073,15 +28268,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23096,7 +28346,20 @@ + + + + + + + + + + + + + @@ -23106,15 +28369,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23123,6 +28417,15 @@ + + + + + + + + + @@ -23133,16 +28436,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23196,6 +28683,9 @@ + + + @@ -23204,6 +28694,9 @@ + + + @@ -23222,6 +28715,7 @@ + @@ -23256,6 +28750,7 @@ + @@ -23315,6 +28810,9 @@ + + + @@ -23685,6 +29183,7 @@ + @@ -23721,6 +29220,7 @@ + @@ -23845,6 +29345,9 @@ + + + @@ -23867,6 +29370,7 @@ + @@ -23883,6 +29387,7 @@ + @@ -23908,6 +29413,7 @@ + @@ -23916,6 +29422,9 @@ + + + @@ -23941,6 +29450,9 @@ + + + @@ -24015,6 +29527,7 @@ + @@ -24617,6 +30130,7 @@ + @@ -24699,6 +30213,7 @@ + @@ -25816,12 +31331,24 @@ + + + + + + + + + + + + @@ -25863,6 +31390,9 @@ + + + @@ -25876,6 +31406,9 @@ + + + @@ -25891,6 +31424,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25900,6 +31462,22 @@ + + + + + + + + + + + + + + + + @@ -25907,10 +31485,23 @@ + + + + + + + + + + + + + @@ -25920,6 +31511,10 @@ + + + + @@ -25935,9 +31530,27 @@ + + + + + + + + + + + + + + + + + + @@ -25986,6 +31599,9 @@ + + + @@ -26003,6 +31619,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -26016,6 +31655,16 @@ + + + + + + + + + + @@ -26048,10 +31697,22 @@ + + + + + + + + + + + + @@ -26075,6 +31736,14 @@ + + + + + + + + @@ -26087,16 +31756,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26133,6 +31834,9 @@ + + + @@ -26157,13 +31861,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26171,6 +31901,13 @@ + + + + + + + @@ -26202,6 +31939,10 @@ + + + + @@ -26210,6 +31951,9 @@ + + + @@ -26221,6 +31965,12 @@ + + + + + + @@ -26278,13 +32028,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26309,6 +32093,9 @@ + + + @@ -26410,6 +32197,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26418,6 +32237,19 @@ + + + + + + + + + + + + + @@ -26493,11 +32325,27 @@ + + + + + + + + + + + + + + + + @@ -26505,6 +32353,21 @@ + + + + + + + + + + + + + + + @@ -26568,6 +32431,23 @@ + + + + + + + + + + + + + + + + + @@ -26580,6 +32460,12 @@ + + + + + + @@ -26594,10 +32480,22 @@ + + + + + + + + + + + + @@ -26622,6 +32520,10 @@ + + + + @@ -26629,10 +32531,19 @@ + + + + + + + + + @@ -26645,12 +32556,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26662,6 +32601,16 @@ + + + + + + + + + + @@ -26694,6 +32643,11 @@ + + + + + @@ -26714,6 +32668,17 @@ + + + + + + + + + + + @@ -26735,6 +32700,20 @@ + + + + + + + + + + + + + + @@ -26750,6 +32729,12 @@ + + + + + + @@ -26770,11 +32755,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26782,6 +32792,17 @@ + + + + + + + + + + + @@ -26797,6 +32818,18 @@ + + + + + + + + + + + + @@ -26850,7 +32883,21 @@ + + + + + + + + + + + + + + @@ -26873,16 +32920,34 @@ + + + + + + + + + + + + + + + + + + @@ -26895,6 +32960,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -26941,6 +33028,13 @@ + + + + + + + @@ -26958,11 +33052,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26986,6 +33108,14 @@ + + + + + + + + @@ -27007,11 +33137,22 @@ + + + + + + + + + + + @@ -27020,12 +33161,20 @@ + + + + + + + + @@ -27036,6 +33185,9 @@ + + + @@ -27052,6 +33204,15 @@ + + + + + + + + + @@ -27065,7 +33226,16 @@ + + + + + + + + + @@ -27080,6 +33250,9 @@ + + + @@ -27105,16 +33278,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27123,7 +33331,26 @@ + + + + + + + + + + + + + + + + + + + @@ -27132,6 +33359,11 @@ + + + + + @@ -27142,7 +33374,29 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -27165,10 +33419,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27180,6 +33486,9 @@ + + + @@ -27200,6 +33509,9 @@ + + + @@ -27380,6 +33692,12 @@ + + + + + + @@ -27430,6 +33748,16 @@ + + + + + + + + + + @@ -27437,6 +33765,14 @@ + + + + + + + + @@ -27448,11 +33784,30 @@ + + + + + + + + + + + + + + + + + + + @@ -27481,6 +33836,15 @@ + + + + + + + + + @@ -27495,12 +33859,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27819,6 +34305,7 @@ + @@ -27914,7 +34401,9 @@ + + @@ -27926,6 +34415,9 @@ + + + @@ -29124,6 +35616,21 @@ + + + + + + + + + + + + + + + @@ -29181,6 +35688,16 @@ + + + + + + + + + + @@ -29232,6 +35749,15 @@ + + + + + + + + + @@ -29241,10 +35767,17 @@ + + + + + + + @@ -29262,6 +35795,14 @@ + + + + + + + + @@ -29276,11 +35817,26 @@ + + + + + + + + + + + + + + + @@ -29305,6 +35861,10 @@ + + + + @@ -29331,6 +35891,10 @@ + + + + @@ -29382,6 +35946,15 @@ + + + + + + + + + @@ -29401,6 +35974,12 @@ + + + + + + @@ -29412,6 +35991,12 @@ + + + + + + @@ -29424,6 +36009,9 @@ + + + @@ -29434,6 +36022,9 @@ + + + @@ -29481,6 +36072,15 @@ + + + + + + + + + @@ -29881,6 +36481,15 @@ + + + + + + + + + @@ -29909,6 +36518,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29936,6 +36571,11 @@ + + + + + @@ -29943,6 +36583,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -29974,8 +36637,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30034,10 +36727,27 @@ + + + + + + + + + + + + + + + + + @@ -30053,6 +36763,13 @@ + + + + + + + @@ -30071,6 +36788,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -30332,6 +37072,9 @@ + + + @@ -30427,6 +37170,10 @@ + + + + @@ -30475,6 +37222,9 @@ + + + @@ -30486,6 +37236,14 @@ + + + + + + + + @@ -30495,6 +37253,15 @@ + + + + + + + + + @@ -30510,6 +37277,11 @@ + + + + + @@ -30562,6 +37334,10 @@ + + + + @@ -30570,6 +37346,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30829,6 +37656,7 @@ + @@ -31886,6 +38714,11 @@ + + + + + @@ -31897,6 +38730,10 @@ + + + + @@ -31906,6 +38743,9 @@ + + + @@ -31922,6 +38762,17 @@ + + + + + + + + + + + @@ -31972,6 +38823,20 @@ + + + + + + + + + + + + + + @@ -31989,13 +38854,28 @@ + + + + + + + + + + + + + + + @@ -32018,6 +38898,10 @@ + + + + @@ -32025,6 +38909,22 @@ + + + + + + + + + + + + + + + + @@ -32044,6 +38944,9 @@ + + + @@ -32052,6 +38955,11 @@ + + + + + @@ -32343,6 +39251,10 @@ + + + + @@ -32372,6 +39284,21 @@ + + + + + + + + + + + + + + + @@ -32383,11 +39310,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -32397,63 +39348,499 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32463,6 +39850,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -33282,6 +40699,7 @@ + @@ -33293,6 +40711,7 @@ + @@ -33362,7 +40781,9 @@ - + + + @@ -33405,6 +40826,9 @@ + + + @@ -33678,6 +41102,9 @@ + + + @@ -34065,6 +41492,9 @@ + + + @@ -34074,6 +41504,11 @@ + + + + + @@ -34139,6 +41574,10 @@ + + + + @@ -34148,6 +41587,11 @@ + + + + + @@ -34181,6 +41625,9 @@ + + + @@ -34206,6 +41653,12 @@ + + + + + + @@ -34227,6 +41680,16 @@ + + + + + + + + + + @@ -34242,6 +41705,19 @@ + + + + + + + + + + + + + @@ -34273,6 +41749,14 @@ + + + + + + + + @@ -34903,6 +42387,10 @@ + + + + @@ -34936,11 +42424,20 @@ + + + + + + + + + @@ -34970,6 +42467,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -34991,6 +42509,11 @@ + + + + + @@ -35035,6 +42558,11 @@ + + + + + @@ -35097,6 +42625,9 @@ + + + @@ -35183,6 +42714,16 @@ + + + + + + + + + + @@ -35196,6 +42737,13 @@ + + + + + + + @@ -35218,12 +42766,22 @@ + + + + + + + + + + @@ -35311,6 +42869,12 @@ + + + + + + @@ -35386,6 +42950,11 @@ + + + + + @@ -35407,6 +42976,11 @@ + + + + + @@ -35426,6 +43000,14 @@ + + + + + + + + @@ -37541,6 +45123,24 @@ + + + + + + + + + + + + + + + + + + @@ -37788,6 +45388,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -39953,6 +47579,7 @@ + @@ -39961,6 +47588,7 @@ + @@ -39968,6 +47596,7 @@ + @@ -39991,6 +47620,7 @@ + @@ -40072,6 +47702,7 @@ + @@ -40153,6 +47784,7 @@ + @@ -40213,6 +47845,7 @@ + @@ -40239,6 +47872,7 @@ + @@ -40273,6 +47907,9 @@ + + + @@ -40320,6 +47957,7 @@ + diff --git a/src/const.h b/src/const.h index 4a8caf6..fd9107c 100644 --- a/src/const.h +++ b/src/const.h @@ -50,6 +50,8 @@ enum MagicEffectClasses : uint8_t { CONST_ME_SOUND_PURPLE = 23, CONST_ME_SOUND_BLUE = 24, CONST_ME_SOUND_WHITE = 25, + CONST_ME_BUBBLES = 26, + CONST_ME_CRAPS = 27, }; enum ShootType_t : uint8_t { @@ -122,6 +124,9 @@ enum FluidTypes_t : uint8_t FLUID_MANAFLUID, FLUID_LIFEFLUID, FLUID_LEMONADE, + FLUID_RUM, + FLUID_COCONUTMILK, + FLUID_FRUITJUICE, }; enum FluidColor_t : uint8_t @@ -130,10 +135,12 @@ enum FluidColor_t : uint8_t FLUID_COLOR_BLUE = 1, FLUID_COLOR_PURPLE = 2, FLUID_COLOR_BROWN = 3, - FLUID_COLOR_RED = 4, - FLUID_COLOR_GREEN = 5, - FLUID_COLOR_YELLOW = 6, - FLUID_COLOR_WHITE = 7, + FLUID_COLOR_BROWN1 = 4, + FLUID_COLOR_RED = 5, + FLUID_COLOR_GREEN = 6, + FLUID_COLOR_BROWN2 = 7, + FLUID_COLOR_YELLOW = 8, + FLUID_COLOR_WHITE = 9, }; enum SquareColor_t : uint8_t { diff --git a/src/luascript.cpp b/src/luascript.cpp index 7519da5..4338a6b 100644 --- a/src/luascript.cpp +++ b/src/luascript.cpp @@ -1189,6 +1189,8 @@ void LuaScriptInterface::registerFunctions() registerEnum(CONST_ME_SOUND_PURPLE) registerEnum(CONST_ME_SOUND_BLUE) registerEnum(CONST_ME_SOUND_WHITE) + registerEnum(CONST_ME_BUBBLES) + registerEnum(CONST_ME_CRAPS) registerEnum(CONST_ANI_NONE) registerEnum(CONST_ANI_SPEAR) registerEnum(CONST_ANI_BOLT) @@ -1407,6 +1409,9 @@ void LuaScriptInterface::registerFunctions() registerEnum(FLUID_MANAFLUID) registerEnum(FLUID_LIFEFLUID) registerEnum(FLUID_LEMONADE) + registerEnum(FLUID_RUM) + registerEnum(FLUID_COCONUTMILK) + registerEnum(FLUID_FRUITJUICE) registerEnum(TALKTYPE_SAY) registerEnum(TALKTYPE_WHISPER) diff --git a/src/npc.cpp b/src/npc.cpp index ab92d7b..4d811e7 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -143,6 +143,7 @@ bool Npc::load() currentOutfit.lookBody = c[1]; currentOutfit.lookLegs = c[2]; currentOutfit.lookFeet = c[3]; + currentOutfit.lookAddons = c[4]; } else { currentOutfit.lookTypeEx = script.readNumber(); } diff --git a/src/tools.cpp b/src/tools.cpp index c6f68b7..84560bc 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -188,40 +188,43 @@ std::string transformToSHA1(const std::string& input) uint8_t getLiquidColor(uint8_t type) { - uint8_t result = 0; + uint8_t result = FLUID_COLOR_NONE; switch (type) { - case 1: - result = 1; + case FLUID_WATER: + result = FLUID_COLOR_BLUE; break; - case 0: - result = 0; + case FLUID_NONE: + result = FLUID_COLOR_NONE; break; - case 6: - result = 4; + case FLUID_SLIME: + result = FLUID_COLOR_GREEN; break; - case 3: - case 4: - case 7: - result = 3; + case FLUID_BEER: + case FLUID_MUD: + case FLUID_OIL: + case FLUID_RUM: + result = FLUID_COLOR_BROWN; break; - case 9: - result = 6; + case FLUID_MILK: + case FLUID_COCONUTMILK: + result = FLUID_COLOR_WHITE; break; - case 2: - case 10: - result = 7; + case FLUID_WINE: + case FLUID_MANAFLUID: + result = FLUID_COLOR_PURPLE; break; - case 5: - case 11: - result = 2; + case FLUID_BLOOD: + case FLUID_LIFEFLUID: + result = FLUID_COLOR_RED; break; - case 8: - case 12: - result = 5; + case FLUID_URINE: + case FLUID_LEMONADE: + case FLUID_FRUITJUICE: + result = FLUID_COLOR_YELLOW; break; default: - result = 0; + result = FLUID_COLOR_NONE; break; } return result; @@ -644,6 +647,8 @@ MagicEffectNames magicEffectNames[] = { {"purplenote", CONST_ME_SOUND_PURPLE}, {"bluenote", CONST_ME_SOUND_BLUE}, {"whitenote", CONST_ME_SOUND_WHITE}, + {"bubbles", CONST_ME_BUBBLES}, + {"dice", CONST_ME_CRAPS}, }; ShootTypeNames shootTypeNames[] = { @@ -717,7 +722,10 @@ FluidNames fluidNames[] = { {"milk", FLUID_MILK}, {"manafluid", FLUID_MANAFLUID}, {"lifefluid", FLUID_LIFEFLUID}, - {"lemonade", FLUID_LEMONADE} + {"lemonade", FLUID_LEMONADE}, + {"rum", FLUID_RUM}, + {"coconutmilk", FLUID_COCONUTMILK}, + {"fruitjuice", FLUID_FRUITJUICE} }; MagicEffectClasses getMagicEffect(const std::string& strValue)