From f0cb5b3f84b53676439afce61f28b2ecbe9bc1d8 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Mon, 30 Dec 2019 22:40:18 +0200 Subject: [PATCH] finish beta gifts and finish very import mistake done with the chests without distinguesting --- New Text Document.txt | 2 +- data/actions/actions.xml | 9 +++------ data/actions/scripts/misc/rookgard_skip.lua | 11 +++++++++++ .../scripts/port_hope/hydra_egg_quest.lua | 11 ----------- data/items/items.srv | 18 +++++++++++++----- data/world/map.otbm | Bin 79809064 -> 79813161 bytes 6 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 data/actions/scripts/misc/rookgard_skip.lua delete mode 100644 data/actions/scripts/port_hope/hydra_egg_quest.lua diff --git a/New Text Document.txt b/New Text Document.txt index 1b95b37..c4e32a0 100644 --- a/New Text Document.txt +++ b/New Text Document.txt @@ -1 +1 @@ -next: 17572 \ No newline at end of file +next: 17574 \ No newline at end of file diff --git a/data/actions/actions.xml b/data/actions/actions.xml index 1df7120..a249405 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -89,9 +89,6 @@ - - - @@ -130,6 +127,7 @@ + @@ -198,10 +196,7 @@ - - - @@ -227,6 +222,8 @@ + + diff --git a/data/actions/scripts/misc/rookgard_skip.lua b/data/actions/scripts/misc/rookgard_skip.lua new file mode 100644 index 0000000..366fdb3 --- /dev/null +++ b/data/actions/scripts/misc/rookgard_skip.lua @@ -0,0 +1,11 @@ +function onUse(player, item, fromPosition, target, toPosition, isHotkey) + if player:getStorageValue(17572) ~= 1 and player:getLevel() <= 7 then + player:setStorageValue(17572, 1) + player:addHealth(-math.random(player:getHealth()-20, player:getHealth()-1)) + item:getPosition():sendMagicEffect(CONST_ME_HITBYFIRE) + player:say('OUCH!', TALKTYPE_MONSTER_SAY) + player:addExperience(4200 - player:getExperience()) + end + + return true +end \ No newline at end of file diff --git a/data/actions/scripts/port_hope/hydra_egg_quest.lua b/data/actions/scripts/port_hope/hydra_egg_quest.lua deleted file mode 100644 index 258e1da..0000000 --- a/data/actions/scripts/port_hope/hydra_egg_quest.lua +++ /dev/null @@ -1,11 +0,0 @@ -function onUse(player, item, fromPosition, target, toPosition, isHotkey) - if player:getStorageValue(17569) ~= 1 then - player:setStorageValue(17569, 1) - player:sendTextMessage(MESSAGE_INFO_DESCR, "You have found a hydra egg.") - player:addItem(4839, 1) - else - player:sendTextMessage(MESSAGE_INFO_DESCR, "The " .. item:getName() .. " is empty.") - end - - return true -end \ No newline at end of file diff --git a/data/items/items.srv b/data/items/items.srv index 705bf3b..5b7233d 100644 --- a/data/items/items.srv +++ b/data/items/items.srv @@ -13896,7 +13896,8 @@ Attributes = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=1,ManaTicks=2 TypeID = 3101 Name = "a spellbook" -Flags = {Text,Take} +Description = "To humble, or not to humble, that is the question" +Flags = {Unmove,Unlay,Unthrow,Unpass,UseEvent} Attributes = {Weight=5800} TypeID = 3102 @@ -22212,7 +22213,8 @@ Attributes = {Weight=7000} TypeID = 4873 Name = "a hydra's nest" -Flags = {Bottom,Chest,Unpass,Unmove,Unlay} +Flags = {Bottom,Chest,Unpass,Unmove,Unlay,Disguise} +Attributes = {DisguiseTarget=5676} TypeID = 4874 Name = "swamp" @@ -25868,7 +25870,9 @@ Flags = {Take,Corpse,Expire} Attributes = {Weight=500,ExpireTarget=0,TotalExpireTime=600} TypeID = 5730 -Name = "" # this is nothing in client +Name = "a chest" +Flags = {Chest,Unpass,Unmove,Height,Disguise} +Attributes = {DisguiseTarget=2480} TypeID = 5731 Name = "a hole" @@ -25921,7 +25925,9 @@ Flags = {Take,Armor} Attributes = {Weight=4200,SlotType=HEAD,ArmorValue=9} TypeID = 5742 -Name = "" # this is nothing in client +Name = "a chest" +Flags = {Chest,Unpass,Unmove,Height,Disguise} +Attributes = {DisguiseTarget=2482} TypeID = 5743 Name = "wooden floor" @@ -26067,7 +26073,9 @@ Name = "metal fittings" Flags = {Clip,Unmove} TypeID = 5775 -Name = "" # this is nothing in client +Name = "a chest" +Flags = {Chest,Unpass,Unmove,Height,Disguise} +Attributes = {DisguiseTarget=2481} TypeID = 5776 Name = "" # this is nothing in client diff --git a/data/world/map.otbm b/data/world/map.otbm index 5fd7605186f6110438d3627e82ba1f8640821c59..69a36a719ff0151ff95358325695c29347a4f459 100644 GIT binary patch delta 9725 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 F{|0agYLx&0 delta 5569 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 Y8tjApZ~)TbAXwp$*=mi*Fo%Wz2mC>ZwEzGB