Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-05-02 18:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

implement absorbDrown damage properly on items

Browse Source
This commit is contained in:
ErikasKontenis 2019-12-05 17:15:19 +02:00
parent 6fff6a868a
commit 9eca23b2e1
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/items/items.srv
View File

@ -24674,7 +24674,7 @@ TypeID = 5460
Name = "a helmet of the deep" Name = "a helmet of the deep"
Description = "Enables underwater exploration" Description = "Enables underwater exploration"
Flags = {Take,Armor} Flags = {Take,Armor}
Attributes = {Weight=21000,SlotType=HEAD,ArmorValue=2} # TODO: Drown protection! Attributes = {Weight=21000,SlotType=HEAD,ArmorValue=2,AbsorbDrown=100}
TypeID = 5461 TypeID = 5461
Name = "pirate boots" Name = "pirate boots"

2
data/movements/movements.xml
View File

@ -671,7 +671,7 @@
<movevent event="AddItem" itemid="2151" function="onAddField" /> <movevent event="AddItem" itemid="2151" function="onAddField" />
<!-- Helmets --> <!-- Helmets -->
<movevent event="Equip" itemid="5460" slot="head" function="onEquipItem" script="misc/helmet_of_the_deep.lua" /> <movevent event="Equip" itemid="5460" slot="head" function="onEquipItem" />
<movevent event="DeEquip" itemid="5460" slot="head" function="onDeEquipItem" /> <movevent event="DeEquip" itemid="5460" slot="head" function="onDeEquipItem" />
<!-- Boots --> <!-- Boots -->

4
data/movements/scripts/misc/helmet_of_the_deep.lua
View File

@ -1,4 +0,0 @@
function onEquip(player, item, slot)
player:removeCondition(CONDITION_DROWN)
return true
end

2
src/items.cpp
View File

@ -402,6 +402,8 @@ bool Items::loadItems()
items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += script.readNumber(); items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += script.readNumber();
} else if (identifier == "absorbpoison") { } else if (identifier == "absorbpoison") {
items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += script.readNumber(); items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += script.readNumber();
} else if (identifier == "absorbdrown") {
items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_DROWNDAMAGE)] += script.readNumber();
} else if (identifier == "absorblifedrain") { } else if (identifier == "absorblifedrain") {
items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_LIFEDRAIN)] += script.readNumber(); items[id].getAbilities().absorbPercent[combatTypeToIndex(COMBAT_LIFEDRAIN)] += script.readNumber();
} else if (identifier == "absorbmanadrain") { } else if (identifier == "absorbmanadrain") {

4
src/movement.cpp
View File

@ -646,6 +646,10 @@ uint32_t MoveEvent::EquipItem(MoveEvent* moveEvent, Player* player, Item* item,
player->sendIcons(); player->sendIcons();
} }
if (it.abilities->absorbPercent[combatTypeToIndex(COMBAT_DROWNDAMAGE)] == 100) {
player->removeCondition(CONDITION_DROWN);
}
if (it.abilities->regeneration) { if (it.abilities->regeneration) {
Condition* condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_REGENERATION, -1, 0); Condition* condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_REGENERATION, -1, 0);