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.

Sign up for GitHub

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

feat: new augments and update item description (amber items) #2900

Merged
merged 16 commits into from
Oct 31, 2024
Merged

feat: new augments and update item description (amber items) #2900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ba748d0
feat: new augments and update item description (amber items)
phacUFPE Sep 18, 2024
e79e5df
Code format - (Clang-format)
github-actions[bot] Sep 18, 2024
885921c
feat: new augments and update item description (amber items)
phacUFPE Sep 18, 2024
b11d39d
Merge branch 'main' into phacUFPE/new_augments
phacUFPE Sep 20, 2024
bbc48f9
Merge branch 'phacUFPE/new_augments' of https://github.com/opentibiab…
phacUFPE Sep 22, 2024
9f9eae9
fix: items description
phacUFPE Sep 23, 2024
8d8c450
fix: incorrect item augment value
phacUFPE Sep 23, 2024
cd534af
fix: items with only attack bug
phacUFPE Sep 24, 2024
4ad267f
feat: add faster regeneration to items on look
phacUFPE Sep 24, 2024
9ff1b0e
Merge branch 'main' into phacUFPE/new_augments
phacUFPE Sep 24, 2024
e9bd37d
Merge branch 'main' into phacUFPE/new_augments
dudantas Oct 14, 2024
52fbf5c
fix: compilation
dudantas Oct 14, 2024
8890910
fix: const ref removal and always true conditional
phacUFPE Oct 30, 2024
ad847c2
Merge branch 'main' into phacUFPE/new_augments
phacUFPE Oct 30, 2024
fed6be2
fix: remove skillboost decimal percentage from market details
phacUFPE Oct 30, 2024
308b9bc
Merge branch 'main' into phacUFPE/new_augments
dudantas Oct 31, 2024
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
118 changes: 88 additions & 30 deletions data/items/items.xml
View file
Open in desktop
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
Open in desktop
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
Loading