Skip to content

Commit ee91733

Browse files
majestyotbrmajestyotbr
authored
fix: dawnport vocation trial and npc plunderpurse (opentibiabr#3292)
1 parent 35f93ee commit ee91733

File tree

6 files changed

+59
-52
lines changed

6 files changed

+59
-52
lines changed

‎data-otservbr-global/npc/plunderpurse.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ npcConfig.description = internalNpcName
77

88
npcConfig.health = 100
99
npcConfig.maxHealth = npcConfig.health
10-
npcConfig.walkInterval = 0
10+
npcConfig.walkInterval = 2000
1111
npcConfig.walkRadius = 2
1212

1313
npcConfig.outfit = {
1414
lookType = 151,
1515
lookHead = 114,
16-
lookBody = 131,
16+
lookBody = 132,
1717
lookLegs = 0,
18-
lookFeet = 20,
18+
lookFeet = 78,
1919
lookAddons = 1,
2020
}
2121

‎data-otservbr-global/scripts/globalevents/dawnport_magic_effect.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
local positions = {
2+
{ x = 32054, y = 31889, z = 5 },
23
{ x = 32056, y = 31889, z = 5 },
3-
{ x = 32056, y = 31892, z = 5 },
4-
{ x = 32063, y = 31900, z = 5 },
5-
{ x = 32066, y = 31900, z = 5 },
6-
{ x = 32074, y = 31892, z = 5 },
7-
{ x = 32074, y = 31889, z = 5 },
8-
{ x = 32063, y = 31881, z = 5 },
9-
{ x = 32066, y = 31881, z = 5 },
4+
{ x = 32063, y = 31880, z = 5 },
5+
{ x = 32063, y = 31882, z = 5 },
6+
{ x = 32073, y = 31889, z = 5 },
7+
{ x = 32075, y = 31889, z = 5 },
8+
{ x = 32063, y = 31899, z = 5 },
9+
{ x = 32063, y = 31901, z = 5 },
1010
}
1111
local dawnportMagicEffect = GlobalEvent("DawnportMagicEffect")
1212

‎data-otservbr-global/scripts/movements/others/dawnport_vocation_trial.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local vocationTrials = {
77
-- Sorcerer trial
88
[25005] = {
99
tutorialId = 5,
10-
effectPosition = { x = 32050, y = 31891, z = 5 },
10+
effectPosition = { x = 32064, y = 31905, z = 5 },
1111
storage = Storage.Dawnport.Sorcerer,
1212
message = "As a sorcerer, you can use the following spells: Magic Patch, Buzz, Scorch.",
1313
vocation = {
@@ -37,7 +37,7 @@ local vocationTrials = {
3737
-- Druid trial
3838
[25006] = {
3939
tutorialId = 6,
40-
effectPosition = { x = 32064, y = 31905, z = 5 },
40+
effectPosition = { x = 32064, y = 31876, z = 5 },
4141
storage = Storage.Dawnport.Druid,
4242
message = "As a druid, you can use these spells: Mud Attack, Chill Out, Magic Patch.",
4343
vocation = {
@@ -67,7 +67,7 @@ local vocationTrials = {
6767
-- Paladin trial
6868
[25007] = {
6969
tutorialId = 4,
70-
effectPosition = { x = 32078, y = 31891, z = 5 },
70+
effectPosition = { x = 32050, y = 31891, z = 5 },
7171
storage = Storage.Dawnport.Paladin,
7272
message = "As a paladin, you can use the following spells: Magic Patch, Arrow Call.",
7373
vocation = {
@@ -98,7 +98,7 @@ local vocationTrials = {
9898
-- Knight trial
9999
[25008] = {
100100
tutorialId = 3,
101-
effectPosition = { x = 32064, y = 31876, z = 5 },
101+
effectPosition = { x = 32078, y = 31891, z = 5 },
102102
storage = Storage.Dawnport.Knight,
103103
message = "As a knight, you can use the following spells: Bruise Bane.",
104104
vocation = {
@@ -259,8 +259,8 @@ function dawnportVocationTrial.onStepIn(creature, item, position, fromPosition)
259259
local trial = vocationTrials[item.actionid]
260260
if trial then
261261
-- Center room position
262-
local centerPosition = Position(32065, 31891, 5)
263-
if centerPosition:getDistance(fromPosition) < centerPosition:getDistance(position) then
262+
local centerPosition = Position(32063, 31889, 5)
263+
if centerPosition:getDistance(fromPosition) >= centerPosition:getDistance(position) then
264264
-- Blocks the vocation trial if same vocation or after level 20
265265
if player:getVocation():getId() == trial.vocation.id or player:getLevel() >= 20 then
266266
return true

‎data-otservbr-global/startup/tables/tile.lua

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ TileAction = {
1313
[20001] = {
1414
itemId = 416,
1515
itemPos = {
16-
{ x = 32064, y = 31881, z = 5 },
17-
{ x = 32065, y = 31881, z = 5 },
18-
{ x = 32074, y = 31890, z = 5 },
19-
{ x = 32074, y = 31891, z = 5 },
20-
{ x = 32064, y = 31900, z = 5 },
21-
{ x = 32065, y = 31900, z = 5 },
22-
{ x = 32056, y = 31890, z = 5 },
23-
{ x = 32056, y = 31891, z = 5 },
16+
{ x = 32064, y = 31880, z = 5 },
17+
{ x = 32065, y = 31880, z = 5 },
18+
{ x = 32066, y = 31880, z = 5 },
19+
{ x = 32075, y = 31890, z = 5 },
20+
{ x = 32075, y = 31891, z = 5 },
21+
{ x = 32075, y = 31892, z = 5 },
22+
{ x = 32064, y = 31901, z = 5 },
23+
{ x = 32065, y = 31901, z = 5 },
24+
{ x = 32066, y = 31901, z = 5 },
25+
{ x = 32054, y = 31890, z = 5 },
26+
{ x = 32054, y = 31891, z = 5 },
27+
{ x = 32054, y = 31892, z = 5 },
2428
},
2529
},
2630
-- Dark trails quest tile
@@ -61,42 +65,30 @@ TileAction = {
6165
--Sorcerer vocation tile
6266
--Vocation trial: data\scripts\movements\others\dawnport_vocation_trial.lua
6367
[25005] = {
64-
itemId = 416,
68+
itemId = 44640,
6569
itemPos = {
66-
{ x = 32055, y = 31889, z = 5 },
67-
{ x = 32055, y = 31890, z = 5 },
68-
{ x = 32055, y = 31891, z = 5 },
69-
{ x = 32055, y = 31892, z = 5 },
70+
{ x = 32063, y = 31900, z = 5 },
7071
},
7172
},
7273
--Druid vocation tile
7374
[25006] = {
74-
itemId = 416,
75+
itemId = 44641,
7576
itemPos = {
76-
{ x = 32063, y = 31901, z = 5 },
77-
{ x = 32064, y = 31901, z = 5 },
78-
{ x = 32065, y = 31901, z = 5 },
79-
{ x = 32066, y = 31901, z = 5 },
77+
{ x = 32063, y = 31881, z = 5 },
8078
},
8179
},
8280
--Paladin vocation tile
8381
[25007] = {
84-
itemId = 416,
82+
itemId = 44639,
8583
itemPos = {
86-
{ x = 32075, y = 31889, z = 5 },
87-
{ x = 32075, y = 31890, z = 5 },
88-
{ x = 32075, y = 31891, z = 5 },
89-
{ x = 32075, y = 31892, z = 5 },
84+
{ x = 32055, y = 31889, z = 5 },
9085
},
9186
},
9287
--Knight vocation tile
9388
[25008] = {
94-
itemId = 416,
89+
itemId = 44638,
9590
itemPos = {
96-
{ x = 32063, y = 31880, z = 5 },
97-
{ x = 32064, y = 31880, z = 5 },
98-
{ x = 32065, y = 31880, z = 5 },
99-
{ x = 32066, y = 31880, z = 5 },
91+
{ x = 32074, y = 31889, z = 5 },
10092
},
10193
},
10294
-- Tiles data\scripts\movements\others\dawnport_tiles.lua

‎data-otservbr-global/world/otservbr-npc.xml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@
171171
<npc centerx="33640" centery="31898" centerz="4" radius="1">
172172
<npc name="Fayla" x="0" y="0" z="4" spawntime="60" />
173173
</npc>
174-
<npc centerx="32055" centery="31900" centerz="4" radius="1">
175-
<npc name="Plunderpurse" x="0" y="0" z="4" spawntime="60" />
176-
</npc>
177174
<npc centerx="33608" centery="31974" centerz="4" radius="1">
178175
<npc name="Zeronex" x="0" y="0" z="4" spawntime="60" />
179176
</npc>
@@ -282,8 +279,8 @@
282279
<npc centerx="32056" centery="31881" centerz="5" radius="1">
283280
<npc name="Richard" x="0" y="0" z="5" spawntime="60" />
284281
</npc>
285-
<npc centerx="32072" centery="31881" centerz="5" radius="1">
286-
<npc name="Coltrayne" x="0" y="0" z="5" spawntime="60" />
282+
<npc centerx="32071" centery="31882" centerz="5" radius="1">
283+
<npc name="Plunderpurse" x="0" y="0" z="5" spawntime="60" />
287284
</npc>
288285
<npc centerx="33634" centery="31883" centerz="5" radius="1">
289286
<npc name="Silas" x="0" y="0" z="5" spawntime="60" />
@@ -1897,7 +1894,7 @@
18971894
<npc name="Ishina" x="0" y="0" z="7" spawntime="60" />
18981895
</npc>
18991896
<npc centerx="33033" centery="32425" centerz="7" radius="2">
1900-
<npc name="Torkada" x="0" y="0" z="7" spawntime="60" direction="2"/>
1897+
<npc name="Torkada" x="0" y="0" z="7" spawntime="60" direction="2" />
19011898
</npc>
19021899
<npc centerx="32168" centery="32428" centerz="7" radius="1">
19031900
<npc name="Eddy" x="0" y="0" z="7" spawntime="60" />
@@ -2458,7 +2455,7 @@
24582455
<npc name="Mazarius" x="0" y="0" z="9" spawntime="60" />
24592456
</npc>
24602457
<npc centerx="32956" centery="32397" centerz="9" radius="1">
2461-
<npc name="Bloodshade Sacrifice" x="0" y="0" z="9" spawntime="60"/>
2458+
<npc name="Bloodshade Sacrifice" x="0" y="0" z="9" spawntime="60" />
24622459
</npc>
24632460
<npc centerx="33020" centery="32454" centerz="9" radius="1">
24642461
<npc name="Omrabas" x="0" y="0" z="9" spawntime="60" />
@@ -2879,7 +2876,7 @@
28792876
<npc name="Strange Pipe" x="0" y="0" z="14" spawntime="60" />
28802877
</npc>
28812878
<npc centerx="34069" centery="31981" centerz="14" radius="3">
2882-
<npc name="Bloodshade Rotten" x="0" y="1" z="14" spawntime="60"/>
2879+
<npc name="Bloodshade Rotten" x="0" y="1" z="14" spawntime="60" />
28832880
</npc>
28842881
<npc centerx="32683" centery="31987" centerz="14" radius="1">
28852882
<npc name="Rapanaio" x="0" y="0" z="14" spawntime="60" />

‎data/items/items.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76639,6 +76639,18 @@ Granted by TibiaGoals.com"/>
7663976639
<attribute key="vocation" value="Druid;true, Elder Druid"/>
7664076640
</attribute>
7664176641
</item>
76642+
<item id="44638" article="a" name="knight pedestal">
76643+
<attribute key="primarytype" value="artificial tiles"/>
76644+
</item>
76645+
<item id="44639" article="a" name="paladin pedestal">
76646+
<attribute key="primarytype" value="artificial tiles"/>
76647+
</item>
76648+
<item id="44640" article="a" name="sorcerer pedestal">
76649+
<attribute key="primarytype" value="artificial tiles"/>
76650+
</item>
76651+
<item id="44641" article="a" name="druid pedestal">
76652+
<attribute key="primarytype" value="artificial tiles"/>
76653+
</item>
7664276654
<item id="44642" name="stoic iks culet">
7664376655
<attribute key="primarytype" value="legs"/>
7664476656
<attribute key="armor" value="9"/>
@@ -76854,6 +76866,12 @@ Granted by TibiaGoals.com"/>
7685476866
<attribute key="containersize" value="10"/>
7685576867
<attribute key="decayTo" value="0"/>
7685676868
</item>
76869+
<item id="44763" article="an" name="arrow pointing left">
76870+
<attribute key="primarytype" value="artificial tiles"/>
76871+
</item>
76872+
<item id="44764" article="an" name="arrow pointing up">
76873+
<attribute key="primarytype" value="artificial tiles"/>
76874+
</item>
7685776875
<item id="44895" article="a" name="ramp"/>
7685876876
<item id="44896" article="a" name="ramp">
7685976877
<attribute key="floorchange" value="north"/>

0 commit comments

Comments
 (0)