Skip to content

[Items] Parse mana enchants #11637

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

Open
Lucasmingus wants to merge 1 commit into
base: midnight
Choose a base branch
from
+13 −2
Open

[Items] Parse mana enchants #11637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions engine/item/enchants.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,11 @@ bool enchant::passive_enchant( item_t& item, unsigned spell_id )
item.player->base.stacking_movement_speed_modifier += effect.percent();
ret = true;
break;
case A_MOD_MAX_MANA_PCT:
item.player->resources.initial_multiplier[ RESOURCE_MANA ] *= 1.0 + effect.percent();
item.parsed.enchant_notes.push_back( fmt::format( "+{}% Mana", (int)value ) );
ret = true;
break;
default:
break;
}
Expand Down
7 changes: 6 additions & 1 deletion engine/item/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ std::string item_t::gem_stats_str() const

std::string item_t::enchant_stats_str() const
{
if ( parsed.enchant_stats.empty() )
if ( parsed.enchant_stats.empty() && parsed.enchant_notes.empty() )
{
return {};
}
Expand All @@ -375,6 +375,11 @@ std::string item_t::enchant_stats_str() const
<< " " << util::stat_type_abbrev( enchant_stat.stat ) << ", ";
}

for ( const auto& note : parsed.enchant_notes )
{
s << note << ", ";
}

std::string str = s.str();
str.erase( str.end() - 2, str.end() );

Expand Down
1 change: 1 addition & 0 deletions engine/item/item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ struct item_t
std::vector<stat_pair_t> gem_stats, socket_bonus_stats;
std::string encoded_enchant;
std::vector<stat_pair_t> enchant_stats;
std::vector<std::string> enchant_notes;
std::vector<stat_pair_t> temp_enchant_stats;
std::string encoded_addon;
std::vector<stat_pair_t> addon_stats;
Expand Down
2 changes: 1 addition & 1 deletion engine/report/report_html_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ void print_html_gear( report::sc_html_stream& os, const player_t& p )
item_sim_desc += " }";
}

if ( !item.parsed.enchant_stats.empty() )
if ( !item.parsed.enchant_stats.empty() || !item.parsed.enchant_notes.empty() )
{
item_sim_desc += ", enchant: { ";
item_sim_desc += item.enchant_stats_str();
Expand Down
Loading