Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Mechanics from12.72 #143

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
31dcbcf
Add support for 12.72 tibia protocol
dudantas Oct 17, 2021
8120650
Remove unused code and improve perfect shoot range
dudantas Oct 17, 2021
65db4a1
Remove unused byte
dudantas Oct 17, 2021
7b0aa72
Add items.otb for 12.72
dudantas Oct 18, 2021
d0a8439
Add creature icons
dudantas Oct 18, 2021
620bfdf
Refacor items modifiers code
dudantas Oct 18, 2021
207bc7c
Remove writeToOutputBuffer
dudantas Oct 18, 2021
fdf84f6
Register missing items
dudantas Oct 23, 2021
db8abea
Merge branch 'master' into protocol-12.72
dudantas Oct 27, 2021
7217421
12.72 with mechanic
dudantas Oct 27, 2021
e7751bb
Fix attribute name
dudantas Oct 29, 2021
078a9ed
Fix items.xml
dudantas Oct 29, 2021
18be1c3
Register new weapons
dudantas Oct 29, 2021
e233259
Fix somes wrong items.xml tags
dudantas Oct 29, 2021
228f72c
Register movements
dudantas Oct 29, 2021
1a01fe1
Fix bug in the reflectDamage description and set from "reflectMelee" …
dudantas Oct 29, 2021
2ee03fb
Remove whitespaces
dudantas Oct 29, 2021
5014b28
Fix tags bug and wrong id
dudantas Oct 29, 2021
a68a47b
Fix market description items bug
dudantas Oct 29, 2021
50be5ed
Change protocol version for 12.72 in config.lua.dist
dudantas Nov 3, 2021
e292b79
Fix value of range and hit chance
dudantas Nov 4, 2021
943f557
Add missing bytes from sendMarketDetail
dudantas Nov 24, 2021
a907bc4
Fix int size
dudantas Nov 24, 2021
c1ab9ba
Reworked some mechanics
hyresu Nov 25, 2021
7e7f692
COMBAT_NONE crash fix & crash on combat without attacker
hyresu Nov 25, 2021
59acb0e
Fix duplicate "(" for cleave damage in server log
hyresu Nov 25, 2021
4bb82ec
Fix for compiling
hyresu Nov 25, 2021
0c50b5b
Fix for compiling 2
hyresu Nov 25, 2021
09e86e2
Using charges on apply and charm parry moved & fixed minor details
hyresu Nov 25, 2021
9bc0f4b
Update weapons.cpp
hyresu Nov 25, 2021
d5e813d
Fix increase working as resist
hyresu Nov 26, 2021
2427e7b
Yup, another fix
hyresu Nov 26, 2021
5b59b89
Fix damage calculation
hyresu Nov 27, 2021
21cdfb9
Merge branch 'master' into protocol-12.72
dudantas Dec 6, 2021
6ee4e92
Somes fixes on item parse
dudantas Dec 6, 2021
92493d5
Fix function names
dudantas Dec 6, 2021
1bf8b8b
Update item_parse.hpp
hyresu Dec 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified data/items/items.otb
Binary file not shown.
2,139 changes: 1,702 additions & 437 deletions data/items/items.xml

Large diffs are not rendered by default.

1,227 changes: 1,227 additions & 0 deletions data/scripts/movements/unscripted_movements.lua

Large diffs are not rendered by default.

383 changes: 383 additions & 0 deletions data/scripts/weapons/unscripted_weapons.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,387 @@
local weapons = {
{
-- gilded eldritch rod
itemId = 36675,
type = WEAPON_WAND,
level = 250,
unproperly = true,
vocation = {
{"Druid", true},
{"Elder Druid"}
}
},
{
-- eldritch rod
itemId = 36674,
type = WEAPON_WAND,
level = 250,
unproperly = true,
vocation = {
{"Druid", true},
{"Elder Druid"}
}
},
{
-- gilded eldritch wand
itemId = 36669,
type = WEAPON_WAND,
level = 250,
unproperly = true,
vocation = {
{"Sorcerer", true},
{"Master Sorcerer"}
}
},
{
-- eldritch wand
itemId = 36668,
type = WEAPON_WAND,
level = 250,
unproperly = true,
vocation = {
{"Sorcerer", true},
{"Master Sorcerer"}
}
},
{
-- gilded eldritch bow
itemId = 36665,
type = WEAPON_DISTANCE,
level = 250,
unproperly = true,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- eldritch bow
itemId = 36664,
type = WEAPON_DISTANCE,
level = 250,
unproperly = true,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- gilded eldritch greataxe
itemId = 36662,
type = WEAPON_AXE,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- eldritch greataxe
itemId = 36661,
type = WEAPON_AXE,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- gilded eldritch warmace
itemId = 36660,
type = WEAPON_CLUB,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- eldritch warmace
itemId = 36659,
type = WEAPON_CLUB,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- gilded eldritch claymore
itemId = 36658,
type = WEAPON_SWORD,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- eldritch claymore
itemId = 36657,
type = WEAPON_SWORD,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- spectral bolt (no decay)
itemId = 35902,
type = WEAPON_AMMO,
level = 150,
unproperly = true,
action = "removecount"
},
{
-- jungle wand
itemId = 35522,
type = WEAPON_WAND,
wandType = "earth",
level = 150,
mana = 19,
damage = {80, 100},
vocation = {
{"Sorcerer", true},
{"Master Sorcerer"}
}
},
{
-- jungle rod
itemId = 35521,
type = WEAPON_WAND,
wandType = "ice",
level = 150,
mana = 19,
damage = {80, 100},
vocation = {
{"Druid", true},
{"Elder Druid"}
}
},
{
-- jungle bow
itemId = 35518,
type = WEAPON_DISTANCE,
level = 150,
unproperly = true,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- throwing axe
itemId = 35515,
type = WEAPON_AXE,
level = 150,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- jungle flail
itemId = 35514,
type = WEAPON_CLUB,
level = 150,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- lion longsword
itemId = 34155,
type = WEAPON_SWORD,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- lion hammer
itemId = 34254,
type = WEAPON_CLUB,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- lion axe
itemId = 34253,
type = WEAPON_AXE,
level = 270,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- lion wand
itemId = 34152,
type = WEAPON_WAND,
wandType = "ice",
level = 220,
mana = 21,
damage = {89, 109},
vocation = {
{"Sorcerer", true},
{"Master Sorcerer"}
}
},
{
-- lion rod
itemId = 34151,
type = WEAPON_WAND,
wandType = "ice",
level = 270,
mana = 20,
damage = {85, 105},
vocation = {
{"Druid", true},
{"Elder Druid"}
}
},
{
-- lion longbow
itemId = 34150,
type = WEAPON_DISTANCE,
level = 270,
unproperly = true,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- soulhexer rod
itemId = 34091,
type = WEAPON_WAND,
wandType = "ice",
level = 400,
mana = 21,
damage = {98, 118},
vocation = {
{"Druid", true},
{"Elder Druid"}
}
},
{
-- soultainter wand
itemId = 34090,
type = WEAPON_WAND,
wandType = "death",
level = 400,
mana = 21,
damage = {100, 120},
vocation = {
{"Sorcerer", true},
{"Master Sorcerer"}
}
},
{
-- soulpiercer crossbow
itemId = 34089,
type = WEAPON_DISTANCE,
level = 400,
unproperly = true,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- soulbleeder bow
itemId = 34088,
type = WEAPON_DISTANCE,
level = 400,
unproperly = true,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- soulmaimer club
itemId = 34087,
type = WEAPON_CLUB,
level = 400,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- soulcrusher club
itemId = 34086,
type = WEAPON_CLUB,
level = 400,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- souleater axe
itemId = 34085,
type = WEAPON_AXE,
level = 400,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- soulbiter axe
itemId = 34084,
type = WEAPON_AXE,
level = 400,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- soulshredder sword
itemId = 34083,
type = WEAPON_SWORD,
level = 400,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- soulcutter sword
itemId = 34082,
type = WEAPON_SWORD,
level = 400,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- phantasmal axe
itemid = 32616,
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ target_sources(${PROJECT_NAME}
items/cylinder.cpp
items/item.cpp
items/items.cpp
items/functions/item_parse.cpp
items/thing.cpp
items/tile.cpp
items/trashholder.cpp
Expand Down
Loading