Merge branch '27-implement-open-beta-features-to-skip-rookgard-and-reward-chests' into 'master'

Resolve "Implement OPEN-BETA features to skip rookgard and reward chests"

Closes #27

See merge request ErikasKontenis/Sabrehaven!23
This commit is contained in:
Erikas Kontenis 2019-12-30 20:40:47 +00:00
commit aec5fa5072
6 changed files with 28 additions and 23 deletions

View File

@ -1 +1 @@
next: 17572 next: 17574

View File

@ -89,9 +89,6 @@
<action actionid="17525" script="meriana_quest/tortoise_egg.lua" /> <action actionid="17525" script="meriana_quest/tortoise_egg.lua" />
<action fromaid="17528" toaid="17530" script="meriana_quest/pirate_map.lua" /> <action fromaid="17528" toaid="17530" script="meriana_quest/pirate_map.lua" />
<!-- Port Hope -->
<action actionid="17569" script="port_hope/hydra_egg_quest.lua"/>
<!-- Liberty Bay --> <!-- Liberty Bay -->
<action fromid="6087" toid="6090" script="liberty_bay/cult_hymn.lua"/> <action fromid="6087" toid="6090" script="liberty_bay/cult_hymn.lua"/>
<action actionid="33216" script="liberty_bay/cult_piano_teleport.lua"/> <action actionid="33216" script="liberty_bay/cult_piano_teleport.lua"/>
@ -130,6 +127,7 @@
<action itemid="3702" script="misc/special_rights.lua" /> <action itemid="3702" script="misc/special_rights.lua" />
<!-- Fun --> <!-- Fun -->
<action actionid="17572" script="misc/rookgard_skip.lua" />
<action itemid="611" script="misc/snowheap.lua" /> <action itemid="611" script="misc/snowheap.lua" />
<action itemid="2974" script="misc/water_pipe.lua" /> <action itemid="2974" script="misc/water_pipe.lua" />
<action itemid="2976" script="misc/birdcage.lua" /> <action itemid="2976" script="misc/birdcage.lua" />
@ -198,10 +196,7 @@
<action itemid="5938" script="misc/ceirons_waterskin.lua" /> <action itemid="5938" script="misc/ceirons_waterskin.lua" />
<!-- Chests --> <!-- Chests -->
<action itemid="2472" script="misc/chests.lua" />
<action itemid="2479" script="misc/chests.lua" /> <action itemid="2479" script="misc/chests.lua" />
<action itemid="2480" script="misc/chests.lua" />
<action itemid="2482" script="misc/chests.lua" />
<action itemid="2543" script="misc/chests.lua" /> <action itemid="2543" script="misc/chests.lua" />
<action itemid="2544" script="misc/chests.lua" /> <action itemid="2544" script="misc/chests.lua" />
<action itemid="2545" script="misc/chests.lua" /> <action itemid="2545" script="misc/chests.lua" />
@ -227,6 +222,8 @@
<action itemid="4830" script="misc/chests.lua" /> <action itemid="4830" script="misc/chests.lua" />
<action itemid="4833" script="misc/chests.lua" /> <action itemid="4833" script="misc/chests.lua" />
<action itemid="4873" script="misc/chests.lua" /> <action itemid="4873" script="misc/chests.lua" />
<action itemid="5730" script="misc/chests.lua" />
<action itemid="5742" script="misc/chests.lua" />
<!-- Fluids --> <!-- Fluids -->
<action itemid="2524" script="misc/fluids.lua" /> <action itemid="2524" script="misc/fluids.lua" />

View File

@ -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

View File

@ -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

View File

@ -13896,7 +13896,8 @@ Attributes = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=1,ManaTicks=2
TypeID = 3101 TypeID = 3101
Name = "a spellbook" 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} Attributes = {Weight=5800}
TypeID = 3102 TypeID = 3102
@ -22212,7 +22213,8 @@ Attributes = {Weight=7000}
TypeID = 4873 TypeID = 4873
Name = "a hydra's nest" Name = "a hydra's nest"
Flags = {Bottom,Chest,Unpass,Unmove,Unlay} Flags = {Bottom,Chest,Unpass,Unmove,Unlay,Disguise}
Attributes = {DisguiseTarget=5676}
TypeID = 4874 TypeID = 4874
Name = "swamp" Name = "swamp"
@ -25868,7 +25870,9 @@ Flags = {Take,Corpse,Expire}
Attributes = {Weight=500,ExpireTarget=0,TotalExpireTime=600} Attributes = {Weight=500,ExpireTarget=0,TotalExpireTime=600}
TypeID = 5730 TypeID = 5730
Name = "" # this is nothing in client Name = "a chest"
Flags = {Chest,Unpass,Unmove,Height,Disguise}
Attributes = {DisguiseTarget=2480}
TypeID = 5731 TypeID = 5731
Name = "a hole" Name = "a hole"
@ -25921,7 +25925,9 @@ Flags = {Take,Armor}
Attributes = {Weight=4200,SlotType=HEAD,ArmorValue=9} Attributes = {Weight=4200,SlotType=HEAD,ArmorValue=9}
TypeID = 5742 TypeID = 5742
Name = "" # this is nothing in client Name = "a chest"
Flags = {Chest,Unpass,Unmove,Height,Disguise}
Attributes = {DisguiseTarget=2482}
TypeID = 5743 TypeID = 5743
Name = "wooden floor" Name = "wooden floor"
@ -26067,7 +26073,9 @@ Name = "metal fittings"
Flags = {Clip,Unmove} Flags = {Clip,Unmove}
TypeID = 5775 TypeID = 5775
Name = "" # this is nothing in client Name = "a chest"
Flags = {Chest,Unpass,Unmove,Height,Disguise}
Attributes = {DisguiseTarget=2481}
TypeID = 5776 TypeID = 5776
Name = "" # this is nothing in client Name = "" # this is nothing in client

Binary file not shown.