Skip to content

Commit

Permalink
update : opentibiabr/canary@4af13ee
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattyx14
mattyx14 committed Jun 5, 2024
1 parent ada9762 commit f430b9c
Show file tree
Hide file tree
Showing 30 changed files with 429 additions and 63 deletions.
1 change: 1 addition & 0 deletions config.lua.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ bossDefaultTimeToFightAgain = 20 * 60 * 60 -- 20 hours
bossDefaultTimeToDefeat = 20 * 60 -- 20 minutes

-- Monsters
defaultRespawnTime = 60
deSpawnRange = 2
deSpawnRadius = 50

Expand Down
1 change: 0 additions & 1 deletion data-otxserver/lib/others/load.lua
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
dofile(DATA_DIRECTORY .. "/lib/others/dawnport.lua")
dofile(DATA_DIRECTORY .. "/lib/others/vip_system.lua")
20 changes: 0 additions & 20 deletions data-otxserver/scripts/creaturescripts/customs/vip.lua
View file

This file was deleted.

24 changes: 24 additions & 0 deletions ...rver/scripts/game_migrations/20241715984279_move_wheel_scrolls_from_storagename_to_kv.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
local promotionScrolls = {
{ oldScroll = "wheel.scroll.abridged", newScroll = "abridged" },
{ oldScroll = "wheel.scroll.basic", newScroll = "basic" },
{ oldScroll = "wheel.scroll.revised", newScroll = "revised" },
{ oldScroll = "wheel.scroll.extended", newScroll = "extended" },
{ oldScroll = "wheel.scroll.advanced", newScroll = "advanced" },
}

local function migrate(player)
for _, scrollTable in ipairs(promotionScrolls) do
local oldStorage = player:getStorageValueByName(scrollTable.oldScroll)
if oldStorage > 0 then
player:kv():scoped("wheel-of-destiny"):scoped("scrolls"):set(scrollTable.newScroll, true)
end
end
end

local migration = Migration("20241715984279_move_wheel_scrolls_from_storagename_to_kv")

function migration:onExecute()
self:forEachPlayer(migrate)
end

migration:register()
290 changes: 290 additions & 0 deletions data/items/items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75820,5 +75820,295 @@ Granted by TibiaGoals.com"/>
<attribute key="primarytype" value="valuables" />
<attribute key="weight" value="120" />
</item>
<item id="44619" name="stoic iks cuirass">
<attribute key="primarytype" value="armors"/>
<attribute key="armor" value="15"/>
<attribute key="magiclevelpoints" value="4"/>
<attribute key="absorbpercentdeath" value="5"/>
<attribute key="weight" value="4400"/>
<attribute key="imbuementslot" value="2">
<attribute key="life leech" value="3"/>
<attribute key="elemental protection death" value="3"/>
<attribute key="elemental protection earth" value="3"/>
<attribute key="elemental protection fire" value="3"/>
<attribute key="elemental protection ice" value="3"/>
<attribute key="elemental protection energy" value="3"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="wrath of nature" value="strong impact" />
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="armor"/>
<attribute key="vocation" value="Druid;true, Elder Druid"/>
</attribute>
</item>
<item id="44620" name="stoic iks chestplate">
<attribute key="primarytype" value="armors"/>
<attribute key="armor" value="16"/>
<attribute key="skillshield" value="3"/>
<attribute key="absorbpercentphysical" value="8"/>
<attribute key="weight" value="14200"/>
<attribute key="imbuementslot" value="2">
<attribute key="life leech" value="3"/>
<attribute key="elemental protection death" value="3"/>
<attribute key="elemental protection earth" value="3"/>
<attribute key="elemental protection fire" value="3"/>
<attribute key="elemental protection ice" value="3"/>
<attribute key="elemental protection energy" value="3"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="intense wound cleansing" value="cooldown">
<attribute key="value" value="120000" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="armor"/>
<attribute key="vocation" value="Knight;true, Elite Knight"/>
</attribute>
</item>
<item id="44621" article="a" name="dauntless dragon scale armor">
<attribute key="primarytype" value="armors"/>
<attribute key="armor" value="18"/>
<attribute key="skillaxe" value="3"/>
<attribute key="skillsword" value="3"/>
<attribute key="skillclub" value="3"/>
<attribute key="absorbpercentphysical" value="8"/>
<attribute key="weight" value="15200"/>
<attribute key="imbuementslot" value="2">
<attribute key="life leech" value="3"/>
<attribute key="elemental protection death" value="3"/>
<attribute key="elemental protection earth" value="3"/>
<attribute key="elemental protection fire" value="3"/>
<attribute key="elemental protection ice" value="3"/>
<attribute key="elemental protection energy" value="3"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="front sweep" value="life leech">
<attribute key="value" value="4" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="300"/>
<attribute key="slot" value="armor"/>
<attribute key="vocation" value="Knight;true, Elite Knight"/>
</attribute>
</item>
<item id="44622" article="an" name="unerring dragon scale armor">
<attribute key="primarytype" value="armors"/>
<attribute key="armor" value="17"/>
<attribute key="skilldist" value="3"/>
<attribute key="holymagiclevelpoints" value="1"/>
<attribute key="absorbpercentenergy" value="10"/>
<attribute key="absorbpercentearth" value="-5"/>
<attribute key="weight" value="13500"/>
<attribute key="imbuementslot" value="2">
<attribute key="life leech" value="3"/>
<attribute key="elemental protection death" value="3"/>
<attribute key="elemental protection earth" value="3"/>
<attribute key="elemental protection fire" value="3"/>
<attribute key="elemental protection ice" value="3"/>
<attribute key="elemental protection energy" value="3"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="strong ethereal spear" value="life leech">
<attribute key="value" value="4" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="300"/>
<attribute key="slot" value="armor"/>
<attribute key="vocation" value="Paladin;true, Royal Paladin"/>
</attribute>
</item>
<item id="44623" article="an" name="arcane dragon robe">
<attribute key="primarytype" value="armors"/>
<attribute key="armor" value="15"/>
<attribute key="magiclevelpoints" value="3"/>
<attribute key="energymagiclevelpoints" value="1"/>
<attribute key="absorbpercentfire" value="-6"/>
<attribute key="absorbpercentice" value="12"/>
<attribute key="weight" value="4300"/>
<attribute key="imbuementslot" value="1">
<attribute key="life leech" value="3"/>
<attribute key="elemental protection death" value="3"/>
<attribute key="elemental protection earth" value="3"/>
<attribute key="elemental protection fire" value="3"/>
<attribute key="elemental protection ice" value="3"/>
<attribute key="elemental protection energy" value="3"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="energy wave" value="life leech">
<attribute key="value" value="5" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="300"/>
<attribute key="slot" value="armor"/>
<attribute key="vocation" value="Sorcerer;true, Master Sorcerer"/>
</attribute>
</item>
<item id="44624" article="an" name="mystical dragon robe">
<attribute key="primarytype" value="armors"/>
<attribute key="armor" value="15"/>
<attribute key="magiclevelpoints" value="3"/>
<attribute key="earthmagiclevelpoints" value="1"/>
<attribute key="absorbpercentice" value="-6"/>
<attribute key="absorbpercentfire" value="12"/>
<attribute key="weight" value="3800"/>
<attribute key="imbuementslot" value="1">
<attribute key="life leech" value="3"/>
<attribute key="elemental protection death" value="3"/>
<attribute key="elemental protection earth" value="3"/>
<attribute key="elemental protection fire" value="3"/>
<attribute key="elemental protection ice" value="3"/>
<attribute key="elemental protection energy" value="3"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="terra wave" value="life leech">
<attribute key="value" value="3" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="300"/>
<attribute key="slot" value="armor"/>
<attribute key="vocation" value="Druid;true, Elder Druid"/>
</attribute>
</item>
<item id="44636" name="stoic iks casque">
<attribute key="primarytype" value="helmets"/>
<attribute key="armor" value="8"/>
<attribute key="skilldist" value="2"/>
<attribute key="absorbpercentphysical" value="3"/>
<attribute key="absorbpercentenergy" value="6"/>
<attribute key="weight" value="3500"/>
<attribute key="imbuementslot" value="2">
<attribute key="mana leech" value="3"/>
<attribute key="skillboost axe" value="3"/>
<attribute key="skillboost sword" value="3"/>
<attribute key="skillboost club" value="3"/>
<attribute key="skillboost shielding" value="3"/>
<attribute key="skillboost distance" value="3"/>
<attribute key="skillboost magic level" value="2"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine missile" value="strong impact" />
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="feet"/>
<attribute key="vocation" value="Paladin;true, Royal Paladin"/>
</attribute>
</item>
<item id="44637" name="stoic iks headpiece">
<attribute key="primarytype" value="helmets"/>
<attribute key="armor" value="8"/>
<attribute key="magiclevelpoints" value="2"/>
<attribute key="absorbpercentdeath" value="3"/>
<attribute key="weight" value="2100"/>
<attribute key="imbuementslot" value="2">
<attribute key="mana leech" value="3"/>
<attribute key="skillboost axe" value="3"/>
<attribute key="skillboost sword" value="3"/>
<attribute key="skillboost club" value="3"/>
<attribute key="skillboost shielding" value="3"/>
<attribute key="skillboost distance" value="3"/>
<attribute key="skillboost magic level" value="2"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="wrath of nature" value="critical extra damage">
<attribute key="value" value="5" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="head"/>
<attribute key="vocation" value="Druid;true, Elder Druid"/>
</attribute>
</item>
<item id="44642" name="stoic iks culet">
<attribute key="primarytype" value="legs"/>
<attribute key="armor" value="9"/>
<attribute key="skillaxe" value="2"/>
<attribute key="skillsword" value="2"/>
<attribute key="skillclub" value="2"/>
<attribute key="absorbpercentphysical" value="4"/>
<attribute key="absorbpercentenergy" value="2"/>
<attribute key="weight" value="5100"/>
<attribute key="augments" value="1">
<attribute key="intense wound cleansing" value="strong impact" />
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="legs"/>
<attribute key="vocation" value="Knight;true, Elite Knight"/>
</attribute>
</item>
<item id="44643" name="stoic iks faulds">
<attribute key="primarytype" value="legs"/>
<attribute key="armor" value="8"/>
<attribute key="magiclevelpoints" value="2"/>
<attribute key="absorbpercentfire" value="6"/>
<attribute key="weight" value="3400"/>
<attribute key="augments" value="1">
<attribute key="great energy beam" value="increased damage" />
<attribute key="great death beam" value="increased damage" />
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="legs"/>
<attribute key="vocation" value="Sorcerer;true, Master Sorcerer"/>
</attribute>
</item>
<item id="44648" name="stoic iks boots">
<attribute key="primarytype" value="boots"/>
<attribute key="speed" value="15"/>
<attribute key="armor" value="2"/>
<attribute key="skilldist" value="1"/>
<attribute key="weight" value="1500"/>
<attribute key="imbuementslot" value="1">
<attribute key="increase speed" value="10"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine missile" value="critical extra damage">
<attribute key="value" value="5" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="feet"/>
<attribute key="vocation" value="Paladin;true, Royal Paladin"/>
</attribute>
</item>
<item id="44649" name="stoic iks sandals">
<attribute key="primarytype" value="boots"/>
<attribute key="armor" value="2"/>
<attribute key="magiclevelpoints" value="1"/>
<attribute key="absorbpercentice" value="6"/>
<attribute key="weight" value="900"/>
<attribute key="imbuementslot" value="1">
<attribute key="increase speed" value="10"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="great energy beam" value="critical extra damage">
<attribute key="value" value="5" />
</attribute>
<attribute key="great death beam" value="critical extra damage">
<attribute key="value" value="5" />
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
<attribute key="slot" value="feet"/>
<attribute key="vocation" value="Sorcerer;true, Master Sorcerer"/>
</attribute>
</item>
</items>

0 data/libs/functions/bosslever.lua → data/libs/functions/boss_lever.lua
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions data/libs/functions/load.lua
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
-- Load core functions
dofile(CORE_DIRECTORY .. "/libs/functions/bit.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/bitwise_flags.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/boss_lever.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/combat.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/constants.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/container.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/creature.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/functions.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/gematelier.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/fs.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/functions.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/game.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/gematelier.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/item.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/itemtype.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/lever.lua")
Expand All @@ -20,14 +21,13 @@ dofile(CORE_DIRECTORY .. "/libs/functions/player.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/position.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/pronouns.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/quests.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/queue.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/revscriptsys.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/set.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/spawn.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/spectators.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/bosslever.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/string.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/tables.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/teleport.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/tile.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/vocation.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/set.lua")
dofile(CORE_DIRECTORY .. "/libs/functions/queue.lua")
1 change: 1 addition & 0 deletions data/libs/systems/load.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ dofile(CORE_DIRECTORY .. "/libs/systems/hazard.lua")
dofile(CORE_DIRECTORY .. "/libs/systems/hireling.lua")
dofile(CORE_DIRECTORY .. "/libs/systems/raids.lua")
dofile(CORE_DIRECTORY .. "/libs/systems/reward_boss.lua")
dofile(CORE_DIRECTORY .. "/libs/systems/vip.lua")
dofile(CORE_DIRECTORY .. "/libs/systems/zones.lua")
Loading

0 comments on commit f430b9c

Please sign in to comment.