Skip to content

Commit

Permalink
extras from otservbr Ty all :D
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattyx14
mattyx14 committed Dec 28, 2020
1 parent 6169f07 commit f48ddcc
Show file tree
Hide file tree
Showing 1,384 changed files with 3,313 additions and 2,710 deletions.
37 changes: 24 additions & 13 deletions data/items/items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24683,7 +24683,7 @@
<attribute key="weaponType" value="club" />
<attribute key="loottype" value="club" />
</item>
<item id="14333" article="a" name="demonbone amulet">
<item id="14333" article="a" name="v-belt">
<attribute key="weight" value="690" />
<attribute key="slotType" value="necklace" />
<attribute key="loottype" value="amulet" />
Expand Down Expand Up @@ -25936,6 +25936,7 @@
<attribute key="description" value="The drum is still vibrating and not ready for use." />
<attribute key="weight" value="3200" />
</item>
<!-- decoration ? -->
<item id="15651" article="a" name="depth galea">
<attribute key="description" value="Enables underwater exploration." />
<attribute key="absorbPercentDrown" value="100" />
Expand Down Expand Up @@ -46523,12 +46524,7 @@
<attribute key="weight" value="2000" />
<attribute key="pickupable" value="1" />
</item>
<item id="35964" article="a" name="wooden ladder">
<attribute key="floorchange" value="north" />
</item>
<item id="35965" article="a" name="wooden ladder">
<attribute key="floorchange" value="west" />
</item>
<item fromid="35964" toid="35965" article="a" name="wooden ladder"/>
<item fromid="35966" toid="35968" article="a" name="obelisk"/>
<item fromid="35969" toid="35973" name="reserved sprite"/>
<item id="35974" article="a" name="sandstone"/>
Expand Down Expand Up @@ -49963,7 +49959,7 @@
<attribute key="floorchange" value="south" />
</item>
<item id="38075" article="a" name="cornerstone"/>
<item fromid="38076" toid="38184" article="a" name="wall" />
<item fromid="38076" toid="38084" article="a" name="wall" />
<item fromid="38085" toid="38089" article="a" name="buttress" />
<item id="38090" article="a" name="ramp" />
<item id="38091" article="a" name="ramp">
Expand Down Expand Up @@ -50014,7 +50010,8 @@
</item>
<item fromid="38166" toid="38167" article="a" name="unkow doll"/>
<item fromid="38168" toid="38169" article="a" name="unkow doll"/>
<item fromid="38171" toid="38172" article="a" name="closed door">
<!-- it's probably door of a quest -->
<item fromid="38170" toid="38171" article="a" name="closed door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
</item>
Expand All @@ -50025,7 +50022,21 @@
<item fromid="38463" toid="38466" article="a" name="wall window">
<attribute key="type" value="door" />
</item>
<item fromid="38467" toid="38470" article="a" name="closed door">
<item id="38467" article="a" name="closed door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
<attribute key="description" value="It is locked." />
</item>
<item id="38468" article="a" name="closed door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
</item>
<item id="38469" article="a" name="closed door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
<attribute key="description" value="It is locked." />
</item>
<item id="38470" article="a" name="closed door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
</item>
Expand Down Expand Up @@ -51617,12 +51628,12 @@
<item id="39057" article="an" name="open door">
<attribute key="type" value="door" />
</item>
<item id="39058" article="an" name="open door">
<item id="39058" article="a" name="closed door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
</item>
<item id="39059" article="a" name="closed door">
<item id="39059" article="an" name="open door">
<attribute key="type" value="door" />
<attribute key="blockprojectile" value="1" />
</item>
<item id="39062" article="a" name="blood pagoda" />
<item fromid="39063" toid="39066" article="a" name="statue">
Expand Down
21 changes: 18 additions & 3 deletions data/lib/core/position.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,24 @@ function Position:compare(position)
return self.x == position.x and self.y == position.y and self.z == position.z
end

function Position:isInRange(fromPosition, toPosition)
return (self.x >= fromPosition.x and self.y >= fromPosition.y and self.z >= fromPosition.z
and self.x <= toPosition.x and self.y <= toPosition.y and self.z <= toPosition.z)
function Position.hasPlayer(centerPosition, rangeX, rangeY)
local spectators = Game.getSpectators(centerPosition, false, true, rangeX, rangeX, rangeY, rangeY)
if #spectators ~= 0 then
return true
end
return false
end

function Position.removeMonster(centerPosition, rangeX, rangeY)
local spectators = Game.getSpectators(centerPosition, false, false, rangeX, rangeX, rangeY, rangeY)
local spectators,
spectator = Game.getSpectators(centerPosition, false, false, rangeX, rangeX, rangeY, rangeY)
for i = 1, #spectators do
spectator = spectators[i]
if spectator:isMonster() then
spectator:remove()
end
end
end

function Position.getFreePosition(from, to)
Expand Down
13 changes: 7 additions & 6 deletions data/lib/core/storages.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,10 +1368,6 @@ Storage = {
-- Reserved storage from 51680 - 51689
DeeperBanutaShortcut = 51680,
},
TheAnnihilator = {
-- Reserved storage from 51690 - 51699
AnnihilatorDone = 51690
},
DemonOak = {
-- Reserved storage from 51700 - 51709
Done = 51700,
Expand Down Expand Up @@ -1902,8 +1898,13 @@ Storage = {
Hat = 10098,
StoneSkinAmulet = 10099
},
SkullOfRatha = {},
TheAnnihilator = {},
SkullOfRatha = {
Bag1 = 10100,
Bag2 = 10101
},
TheAnnihilator = {
Reward = 10102
},
TheParadoxTower = {},
ThePostmanMissions = {},
TheWhiteRavenMonastery = {},
Expand Down
12 changes: 11 additions & 1 deletion data/lib/tables/door.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ KeyDoorTable = {
{ lockedDoor = 33117, closedDoor = 33118, openDoor = 32582 },
{ lockedDoor = 33119, closedDoor = 33120, openDoor = 32583 },
{ lockedDoor = 35607, closedDoor = 35608, openDoor = 35611 },
{ lockedDoor = 35609, closedDoor = 35610, openDoor = 35612 },
{ lockedDoor = 35609, closedDoor = 35610, openDoor = 35612 }
}

-- These are the common doors, the ones that just open and close without any special requirements.
Expand Down Expand Up @@ -145,6 +145,16 @@ CustomDoorTable = {
{ closedDoor = 36330, openDoor = 36332 },
{ closedDoor = 36498, openDoor = 36499 },
{ closedDoor = 36500, openDoor = 36501 },
{ closedDoor = 38106, openDoor = 38107 },
{ closedDoor = 38108, openDoor = 38109 },
--{ closedDoor = 38170}, -- it's probably door of a quest
--{ closedDoor = 38171}, -- it's probably door of a quest
--{ closedDoor = 38467}, -- it's probably door of a quest
--{ closedDoor = 38469}, -- it's probably door of a quest
{ closedDoor = 38468, openDoor = 38471 },
{ closedDoor = 38470, openDoor = 38472 },
{ closedDoor = 39056, openDoor = 39057 },
{ closedDoor = 39058, openDoor = 39059 },
}

-- These are the doors for missions, they need access from some mission (storage) to be able to enter. Put the storage value in the action id of the door and it will open only to the player who has the storage value.
Expand Down
1 change: 1 addition & 0 deletions data/lib/tables/table.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dofile('data/lib/tables/door.lua')
dofile('data/lib/tables/hireling_items.lua')
dofile('data/lib/tables/teleport_item_destinations.lua')
dofile('data/lib/tables/town.lua')
dofile('data/lib/tables/window.lua')
94 changes: 94 additions & 0 deletions data/lib/tables/window.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
windowTable = {
{closedWindow = 5303, openWindow = 6448},
{closedWindow = 5304, openWindow = 6449},
{closedWindow = 6438, openWindow = 6436},
{closedWindow = 6436, openWindow = 6438},
{closedWindow = 6439, openWindow = 6437},
{closedWindow = 6437, openWindow = 6439},
{closedWindow = 6442, openWindow = 6440},
{closedWindow = 6440, openWindow = 6442},
{closedWindow = 6443, openWindow = 6441},
{closedWindow = 6441, openWindow = 6443},
{closedWindow = 6446, openWindow = 6444},
{closedWindow = 6444, openWindow = 6446},
{closedWindow = 6447, openWindow = 6445},
{closedWindow = 6445, openWindow = 6447},
{closedWindow = 6448, openWindow = 5303},
{closedWindow = 6449, openWindow = 5304},
{closedWindow = 6452, openWindow = 6450},
{closedWindow = 6450, openWindow = 6452},
{closedWindow = 6453, openWindow = 6451},
{closedWindow = 6451, openWindow = 6453},
{closedWindow = 6456, openWindow = 6454},
{closedWindow = 6454, openWindow = 6456},
{closedWindow = 6457, openWindow = 6455},
{closedWindow = 6455, openWindow = 6457},
{closedWindow = 6460, openWindow = 6458},
{closedWindow = 6458, openWindow = 6460},
{closedWindow = 6461, openWindow = 6459},
{closedWindow = 6459, openWindow = 6461},
{closedWindow = 6464, openWindow = 6462},
{closedWindow = 6462, openWindow = 6464},
{closedWindow = 6465, openWindow = 6463},
{closedWindow = 6463, openWindow = 6465},
{closedWindow = 6468, openWindow = 6466},
{closedWindow = 6466, openWindow = 6468},
{closedWindow = 6469, openWindow = 6467},
{closedWindow = 6467, openWindow = 6469},
{closedWindow = 6472, openWindow = 6470},
{closedWindow = 6470, openWindow = 6472},
{closedWindow = 6473, openWindow = 6471},
{closedWindow = 6471, openWindow = 6473},
{closedWindow = 6790, openWindow = 6788},
{closedWindow = 6788, openWindow = 6790},
{closedWindow = 6791, openWindow = 6789},
{closedWindow = 6789, openWindow = 6791},
{closedWindow = 7027, openWindow = 7025},
{closedWindow = 7025, openWindow = 7027},
{closedWindow = 7028, openWindow = 7026},
{closedWindow = 7026, openWindow = 7028},
{closedWindow = 7031, openWindow = 7029},
{closedWindow = 7029, openWindow = 7031},
{closedWindow = 7032, openWindow = 7030},
{closedWindow = 7030, openWindow = 7032},
{closedWindow = 10264, openWindow = 10266},
{closedWindow = 10266, openWindow = 10264},
{closedWindow = 10265, openWindow = 10267},
{closedWindow = 10267, openWindow = 10265},
{closedWindow = 10488, openWindow = 10490},
{closedWindow = 10490, openWindow = 10488},
{closedWindow = 10489, openWindow = 10491},
{closedWindow = 10491, openWindow = 10489},
{closedWindow = 19427, openWindow = 19447},
{closedWindow = 19428, openWindow = 19448},
{closedWindow = 19441, openWindow = 19450},
{closedWindow = 19440, openWindow = 19449},
{closedWindow = 19443, openWindow = 20180},
{closedWindow = 19444, openWindow = 20181},
{closedWindow = 19445, openWindow = 20183},
{closedWindow = 19446, openWindow = 20184},
{closedWindow = 19447, openWindow = 19427},
{closedWindow = 19448, openWindow = 19428},
{closedWindow = 19449, openWindow = 19440},
{closedWindow = 19450, openWindow = 19441},
{closedWindow = 19974, openWindow = 20182},
{closedWindow = 19975, openWindow = 20185},
{closedWindow = 20180, openWindow = 19443},
{closedWindow = 20181, openWindow = 19444},
{closedWindow = 20182, openWindow = 19974},
{closedWindow = 20183, openWindow = 19445},
{closedWindow = 20184, openWindow = 19446},
{closedWindow = 20185, openWindow = 19975},
{closedWindow = 22838, openWindow = 22812},
{closedWindow = 22839, openWindow = 22813},
{closedWindow = 35652, openWindow = 35708},
{closedWindow = 35653, openWindow = 35711},
{closedWindow = 35709, openWindow = 35710},
{closedWindow = 35712, openWindow = 35713},
{closedWindow = 38465, openWindow = 38463},
{closedWindow = 38466, openWindow = 38464},
{closedWindow = 38475, openWindow = 38473},
{closedWindow = 38476, openWindow = 38474},
{closedWindow = 38479, openWindow = 38477},
{closedWindow = 38480, openWindow = 38478}
}
4 changes: 2 additions & 2 deletions data/monster/amphibics/azure_frog.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 2,
Occurrence = 0,
Locations = "Meriana, Laguna Islands, and other Shattered Isles."
}
}

monster.health = 60
monster.maxHealth = 60
monster.race = "blood"
monster.corpse = 6079
monster.speed = 320
monster.summonCost = 305
monster.manaCost = 305
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
4 changes: 2 additions & 2 deletions data/monster/amphibics/bog_frog.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 1,
Occurrence = 0,
Locations = "Shadowthorn in the bog god's temple, Drefia, around Lake Equivocolao when it's dirty."
}
}

monster.health = 25
monster.maxHealth = 25
monster.race = "blood"
monster.corpse = 6079
monster.speed = 320
monster.summonCost = 305
monster.manaCost = 305
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
4 changes: 2 additions & 2 deletions data/monster/amphibics/coral_frog.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 2,
Occurrence = 0,
Locations = "Meriana, Laguna Islands, and other Shattered Isles."
}
}

monster.health = 60
monster.maxHealth = 60
monster.race = "blood"
monster.corpse = 6079
monster.speed = 320
monster.summonCost = 305
monster.manaCost = 305
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
4 changes: 2 additions & 2 deletions data/monster/amphibics/crimson_frog.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 2,
Occurrence = 0,
Locations = "Meriana, Laguna Islands, and other Shattered Isles."
}
}

monster.health = 60
monster.maxHealth = 60
monster.race = "blood"
monster.corpse = 6079
monster.speed = 320
monster.summonCost = 305
monster.manaCost = 305
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
2 changes: 1 addition & 1 deletion data/monster/amphibics/deathspawn.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ monster.maxHealth = 225
monster.race = "blood"
monster.corpse = 2220
monster.speed = 102
monster.summonCost = 305
monster.manaCost = 305
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
4 changes: 2 additions & 2 deletions data/monster/amphibics/filth_toad.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 2,
Occurrence = 0,
Locations = "Tiquanda, around Lake Equivocolao."
}
}

monster.health = 185
monster.maxHealth = 185
monster.race = "blood"
monster.corpse = 6077
monster.speed = 210
monster.summonCost = 0
monster.manaCost = 0
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
4 changes: 2 additions & 2 deletions data/monster/amphibics/green_frog.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 1,
Occurrence = 0,
Locations = "Meriana and other Shattered Isles, Port Hope caves, The Witches Cliff (only accessible during a quest)."
}
}

monster.health = 25
monster.maxHealth = 25
monster.race = "venom"
monster.corpse = 6079
monster.speed = 320
monster.summonCost = 250
monster.manaCost = 250
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
4 changes: 2 additions & 2 deletions data/monster/amphibics/infernal_frog.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ monster.Bestiary = {
Stars = 2,
Occurrence = 0,
Locations = "Isle of Evil, Drefia."
}
}

monster.health = 655
monster.maxHealth = 655
monster.race = "blood"
monster.corpse = 6079
monster.speed = 200
monster.summonCost = 0
monster.manaCost = 0
monster.maxSummons = 0

monster.changeTarget = {
Expand Down
Loading

0 comments on commit f48ddcc

Please sign in to comment.