From d3cc47c463a70a0601d53caadaaa8aa7cb3d641a Mon Sep 17 00:00:00 2001
From: Majesty <32709570+majestyotbr@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:11:51 -0300
Subject: [PATCH] fix: dawnport vocation trial and npc plunderpurse
---
data-otservbr-global/npc/plunderpurse.lua | 6 +--
.../globalevents/dawnport_magic_effect.lua | 14 +++---
.../others/dawnport_vocation_trial.lua | 12 ++---
data-otservbr-global/startup/tables/tile.lua | 48 ++++++++-----------
data-otservbr-global/world/otservbr-npc.xml | 13 ++---
data/items/items.xml | 18 +++++++
6 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/data-otservbr-global/npc/plunderpurse.lua b/data-otservbr-global/npc/plunderpurse.lua
index 4e1d5bd1b10..033c8071836 100644
--- a/data-otservbr-global/npc/plunderpurse.lua
+++ b/data-otservbr-global/npc/plunderpurse.lua
@@ -7,15 +7,15 @@ npcConfig.description = internalNpcName
npcConfig.health = 100
npcConfig.maxHealth = npcConfig.health
-npcConfig.walkInterval = 0
+npcConfig.walkInterval = 2000
npcConfig.walkRadius = 2
npcConfig.outfit = {
lookType = 151,
lookHead = 114,
- lookBody = 131,
+ lookBody = 132,
lookLegs = 0,
- lookFeet = 20,
+ lookFeet = 78,
lookAddons = 1,
}
diff --git a/data-otservbr-global/scripts/globalevents/dawnport_magic_effect.lua b/data-otservbr-global/scripts/globalevents/dawnport_magic_effect.lua
index d2cafef85ff..3f758cef987 100644
--- a/data-otservbr-global/scripts/globalevents/dawnport_magic_effect.lua
+++ b/data-otservbr-global/scripts/globalevents/dawnport_magic_effect.lua
@@ -1,12 +1,12 @@
local positions = {
+ { x = 32054, y = 31889, z = 5 },
{ x = 32056, y = 31889, z = 5 },
- { x = 32056, y = 31892, z = 5 },
- { x = 32063, y = 31900, z = 5 },
- { x = 32066, y = 31900, z = 5 },
- { x = 32074, y = 31892, z = 5 },
- { x = 32074, y = 31889, z = 5 },
- { x = 32063, y = 31881, z = 5 },
- { x = 32066, y = 31881, z = 5 },
+ { x = 32063, y = 31880, z = 5 },
+ { x = 32063, y = 31882, z = 5 },
+ { x = 32073, y = 31889, z = 5 },
+ { x = 32075, y = 31889, z = 5 },
+ { x = 32063, y = 31899, z = 5 },
+ { x = 32063, y = 31901, z = 5 },
}
local dawnportMagicEffect = GlobalEvent("DawnportMagicEffect")
diff --git a/data-otservbr-global/scripts/movements/others/dawnport_vocation_trial.lua b/data-otservbr-global/scripts/movements/others/dawnport_vocation_trial.lua
index faf2c2caee9..9713df78614 100644
--- a/data-otservbr-global/scripts/movements/others/dawnport_vocation_trial.lua
+++ b/data-otservbr-global/scripts/movements/others/dawnport_vocation_trial.lua
@@ -7,7 +7,7 @@ local vocationTrials = {
-- Sorcerer trial
[25005] = {
tutorialId = 5,
- effectPosition = { x = 32050, y = 31891, z = 5 },
+ effectPosition = { x = 32064, y = 31905, z = 5 },
storage = Storage.Dawnport.Sorcerer,
message = "As a sorcerer, you can use the following spells: Magic Patch, Buzz, Scorch.",
vocation = {
@@ -37,7 +37,7 @@ local vocationTrials = {
-- Druid trial
[25006] = {
tutorialId = 6,
- effectPosition = { x = 32064, y = 31905, z = 5 },
+ effectPosition = { x = 32064, y = 31876, z = 5 },
storage = Storage.Dawnport.Druid,
message = "As a druid, you can use these spells: Mud Attack, Chill Out, Magic Patch.",
vocation = {
@@ -67,7 +67,7 @@ local vocationTrials = {
-- Paladin trial
[25007] = {
tutorialId = 4,
- effectPosition = { x = 32078, y = 31891, z = 5 },
+ effectPosition = { x = 32050, y = 31891, z = 5 },
storage = Storage.Dawnport.Paladin,
message = "As a paladin, you can use the following spells: Magic Patch, Arrow Call.",
vocation = {
@@ -98,7 +98,7 @@ local vocationTrials = {
-- Knight trial
[25008] = {
tutorialId = 3,
- effectPosition = { x = 32064, y = 31876, z = 5 },
+ effectPosition = { x = 32078, y = 31891, z = 5 },
storage = Storage.Dawnport.Knight,
message = "As a knight, you can use the following spells: Bruise Bane.",
vocation = {
@@ -259,8 +259,8 @@ function dawnportVocationTrial.onStepIn(creature, item, position, fromPosition)
local trial = vocationTrials[item.actionid]
if trial then
-- Center room position
- local centerPosition = Position(32065, 31891, 5)
- if centerPosition:getDistance(fromPosition) < centerPosition:getDistance(position) then
+ local centerPosition = Position(32063, 31889, 5)
+ if centerPosition:getDistance(fromPosition) >= centerPosition:getDistance(position) then
-- Blocks the vocation trial if same vocation or after level 20
if player:getVocation():getId() == trial.vocation.id or player:getLevel() >= 20 then
return true
diff --git a/data-otservbr-global/startup/tables/tile.lua b/data-otservbr-global/startup/tables/tile.lua
index 5246b290c37..4a80a8f1335 100644
--- a/data-otservbr-global/startup/tables/tile.lua
+++ b/data-otservbr-global/startup/tables/tile.lua
@@ -13,14 +13,18 @@ TileAction = {
[20001] = {
itemId = 416,
itemPos = {
- { x = 32064, y = 31881, z = 5 },
- { x = 32065, y = 31881, z = 5 },
- { x = 32074, y = 31890, z = 5 },
- { x = 32074, y = 31891, z = 5 },
- { x = 32064, y = 31900, z = 5 },
- { x = 32065, y = 31900, z = 5 },
- { x = 32056, y = 31890, z = 5 },
- { x = 32056, y = 31891, z = 5 },
+ { x = 32064, y = 31880, z = 5 },
+ { x = 32065, y = 31880, z = 5 },
+ { x = 32066, y = 31880, z = 5 },
+ { x = 32075, y = 31890, z = 5 },
+ { x = 32075, y = 31891, z = 5 },
+ { x = 32075, y = 31892, z = 5 },
+ { x = 32064, y = 31901, z = 5 },
+ { x = 32065, y = 31901, z = 5 },
+ { x = 32066, y = 31901, z = 5 },
+ { x = 32054, y = 31890, z = 5 },
+ { x = 32054, y = 31891, z = 5 },
+ { x = 32054, y = 31892, z = 5 },
},
},
-- Dark trails quest tile
@@ -61,42 +65,30 @@ TileAction = {
--Sorcerer vocation tile
--Vocation trial: data\scripts\movements\others\dawnport_vocation_trial.lua
[25005] = {
- itemId = 416,
+ itemId = 44640,
itemPos = {
- { x = 32055, y = 31889, z = 5 },
- { x = 32055, y = 31890, z = 5 },
- { x = 32055, y = 31891, z = 5 },
- { x = 32055, y = 31892, z = 5 },
+ { x = 32063, y = 31900, z = 5 },
},
},
--Druid vocation tile
[25006] = {
- itemId = 416,
+ itemId = 44641,
itemPos = {
- { x = 32063, y = 31901, z = 5 },
- { x = 32064, y = 31901, z = 5 },
- { x = 32065, y = 31901, z = 5 },
- { x = 32066, y = 31901, z = 5 },
+ { x = 32063, y = 31881, z = 5 },
},
},
--Paladin vocation tile
[25007] = {
- itemId = 416,
+ itemId = 44639,
itemPos = {
- { x = 32075, y = 31889, z = 5 },
- { x = 32075, y = 31890, z = 5 },
- { x = 32075, y = 31891, z = 5 },
- { x = 32075, y = 31892, z = 5 },
+ { x = 32055, y = 31889, z = 5 },
},
},
--Knight vocation tile
[25008] = {
- itemId = 416,
+ itemId = 44638,
itemPos = {
- { x = 32063, y = 31880, z = 5 },
- { x = 32064, y = 31880, z = 5 },
- { x = 32065, y = 31880, z = 5 },
- { x = 32066, y = 31880, z = 5 },
+ { x = 32074, y = 31889, z = 5 },
},
},
-- Tiles data\scripts\movements\others\dawnport_tiles.lua
diff --git a/data-otservbr-global/world/otservbr-npc.xml b/data-otservbr-global/world/otservbr-npc.xml
index 6d9ed07557e..2166b890643 100644
--- a/data-otservbr-global/world/otservbr-npc.xml
+++ b/data-otservbr-global/world/otservbr-npc.xml
@@ -171,9 +171,6 @@
-
-
-
@@ -282,8 +279,8 @@
-
-
+
+
@@ -1897,7 +1894,7 @@
-
+
@@ -2458,7 +2455,7 @@
-
+
@@ -2879,7 +2876,7 @@
-
+
diff --git a/data/items/items.xml b/data/items/items.xml
index 552f0cb85c8..44476042d8b 100644
--- a/data/items/items.xml
+++ b/data/items/items.xml
@@ -76639,6 +76639,18 @@ Granted by TibiaGoals.com"/>
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
-
@@ -76854,6 +76866,12 @@ Granted by TibiaGoals.com"/>
+ -
+
+
+ -
+
+
-