Skip to content

Commit

Permalink
feat: new augments and update item description (amber items) (opentib…
Browse files Browse the repository at this point in the history 
…iabr#2900)

This updates the augments to be able to handle the substitution of
the Increase Damage, Strong Impact and Powerful Impact into Base Damage
and Base Healing. It also adds the new item description to handle the
new Amber Items with elemental attack greater than 0 and physical attack
value equal 0.
  • Loading branch information
@phacUFPE
phacUFPE authored Oct 31, 2024
1 parent cba2abe commit ff57174
Show file tree
Hide file tree
Showing 6 changed files with 158 additions and 56 deletions.
118 changes: 88 additions & 30 deletions data/items/items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75139,7 +75139,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost sword" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="strong impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75165,9 +75167,11 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost sword" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="powerful impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="8"/>
</attribute>
<attribute key="intense wound cleansing" value="cooldown">
<attribute key="value" value="120000" />
<attribute key="value" value="120000"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
Expand All @@ -75194,7 +75198,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost club" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="strong impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75220,7 +75226,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost club" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="powerful impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75246,7 +75254,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost axe" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="strong impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75272,7 +75282,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost axe" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="powerful impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75300,7 +75312,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost sword" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="strong impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75327,7 +75341,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost sword" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="powerful impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75354,7 +75370,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost club" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="strong impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75381,7 +75399,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost club" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="powerful impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75408,7 +75428,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost axe" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="strong impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand All @@ -75435,7 +75457,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost axe" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="fierce berserk" value="powerful impact" />
<attribute key="fierce berserk" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75488,7 +75512,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost distance" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine caldera" value="strong impact" />
<attribute key="divine caldera" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75518,7 +75544,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost distance" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine caldera" value="powerful impact" />
<attribute key="divine caldera" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75548,7 +75576,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost distance" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine caldera" value="strong impact" />
<attribute key="divine caldera" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75578,7 +75608,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost distance" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine caldera" value="powerful impact" />
<attribute key="divine caldera" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75627,8 +75659,12 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost magic level" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="hell's core" value="strong impact" />
<attribute key="energy wave" value="strong impact" />
<attribute key="hell's core" value="base">
<attribute key="value" value="3"/>
</attribute>
<attribute key="energy wave" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75660,8 +75696,12 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost magic level" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="hell's core" value="powerful impact" />
<attribute key="energy wave" value="powerful impact" />
<attribute key="hell's core" value="base">
<attribute key="value" value="6"/>
</attribute>
<attribute key="energy wave" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75722,8 +75762,12 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost magic level" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="eternal winter" value="strong impact" />
<attribute key="terra wave" value="strong impact" />
<attribute key="eternal winter" value="base">
<attribute key="value" value="3"/>
</attribute>
<attribute key="terra wave" value="base">
<attribute key="value" value="4"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75755,8 +75799,12 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost magic level" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="eternal winter" value="powerful impact" />
<attribute key="terra wave" value="powerful impact" />
<attribute key="eternal winter" value="base">
<attribute key="value" value="6"/>
</attribute>
<attribute key="terra wave" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent;weapon">
<attribute key="level" value="600"/>
Expand Down Expand Up @@ -75953,7 +76001,9 @@ Granted by TibiaGoals.com"/>
<attribute key="elemental protection holy" value="3"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="wrath of nature" value="strong impact" />
<attribute key="wrath of nature" value="base">
<attribute key="value" value="8"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
Expand Down Expand Up @@ -76116,7 +76166,9 @@ Granted by TibiaGoals.com"/>
<attribute key="skillboost magic level" value="2"/>
</attribute>
<attribute key="augments" value="1">
<attribute key="divine missile" value="strong impact" />
<attribute key="divine missile" value="base">
<attribute key="value" value="6"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
Expand Down Expand Up @@ -76160,7 +76212,9 @@ Granted by TibiaGoals.com"/>
<attribute key="absorbpercentenergy" value="2"/>
<attribute key="weight" value="5100"/>
<attribute key="augments" value="1">
<attribute key="intense wound cleansing" value="strong impact" />
<attribute key="intense wound cleansing" value="base">
<attribute key="value" value="50"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
Expand All @@ -76175,8 +76229,12 @@ Granted by TibiaGoals.com"/>
<attribute key="absorbpercentfire" value="6"/>
<attribute key="weight" value="3400"/>
<attribute key="augments" value="1">
<attribute key="great energy beam" value="increased damage" />
<attribute key="great death beam" value="increased damage" />
<attribute key="great energy beam" value="base">
<attribute key="value" value="7"/>
</attribute>
<attribute key="great death beam" value="base">
<attribute key="value" value="7"/>
</attribute>
</attribute>
<attribute key="script" value="moveevent">
<attribute key="level" value="250"/>
Expand Down
4 changes: 3 additions & 1 deletion src/creatures/combat/spells.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,9 @@ void Spell::getCombatDataAugment(const std::shared_ptr<Player> &player, CombatDa
if (augment->value == 0) {
continue;
}
if (augment->type == Augment_t::IncreasedDamage || augment->type == Augment_t::PowerfulImpact || augment->type == Augment_t::StrongImpact) {
if (
augment->type == Augment_t::IncreasedDamage || augment->type == Augment_t::PowerfulImpact || augment->type == Augment_t::StrongImpact || augment->type == Augment_t::Base
) {
const float augmentPercent = augment->value / 100.0;
damage.primary.value += static_cast<int32_t>(damage.primary.value * augmentPercent);
damage.secondary.value += static_cast<int32_t>(damage.secondary.value * augmentPercent);
Expand Down
Loading

0 comments on commit ff57174

Please sign in to comment.