Skip to content

fix enchanting #631

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

Merged
AngeloTadeucci merged 2 commits into from
Feb 9, 2026
Merged

fix enchanting #631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8625ada
fix #610
AngeloTadeucci Feb 9, 2026
fc0380f
Merge branch 'master' into enchanting
AngeloTadeucci Feb 9, 2026
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
31 changes: 15 additions & 16 deletions Maple2.Server.Game/Manager/ItemEnchantManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,19 @@ public bool Enchant(long itemUid) {
return false;
}

void ApplyEnchantStats() {
// GetBasicOptions() again to ensure rates match those in table.
// This *MUST* be called before incrementing Enchants.
foreach ((BasicAttribute attribute, BasicOption option) in GetEnchant(session, upgradeItem).BasicOptions) {
if (upgradeItem.Enchant.BasicOptions.TryGetValue(attribute, out BasicOption existing)) {
upgradeItem.Enchant.BasicOptions[attribute] = option + existing;
} else {
upgradeItem.Enchant.BasicOptions[attribute] = option;
}
}
upgradeItem.Enchant.Enchants++;
}

switch (Type) {
case EnchantType.Ophelia:
float roll = Random.Shared.NextSingle() * MaxRate;
Expand All @@ -236,16 +249,7 @@ public bool Enchant(long itemUid) {
logger.Debug("Enchant result: {Roll} / {Total} = {Result}", roll, totalRate, enchantResult.ToString());

if (enchantResult == EnchantResult.Success) {
// GetBasicOptions() again to ensure rates match those in table.
// This *MUST* be called before incrementing Enchants.
foreach ((BasicAttribute attribute, BasicOption option) in GetEnchant(session, upgradeItem).BasicOptions) {
if (upgradeItem.Enchant.BasicOptions.TryGetValue(attribute, out BasicOption existing)) {
upgradeItem.Enchant.BasicOptions[attribute] = option + existing;
} else {
upgradeItem.Enchant.BasicOptions[attribute] = option;
}
}
upgradeItem.Enchant.Enchants++;
ApplyEnchantStats();

session.ConditionUpdate(ConditionType.enchant_result, codeLong: (int) EnchantResult.Success, targetLong: upgradeItem.Enchant.Enchants);
session.Send(ItemEnchantPacket.Success(upgradeItem, attributeDeltas));
Expand All @@ -261,12 +265,7 @@ public bool Enchant(long itemUid) {
upgradeItem.Enchant.EnchantExp += GainExp[enchants];
if (upgradeItem.Enchant.EnchantExp >= MaxExp) {
upgradeItem.Enchant.EnchantExp = 0;
// GetBasicOptions() again to ensure rates match those in table.
// This *MUST* be called before incrementing Enchants.
foreach ((BasicAttribute attribute, BasicOption option) in GetEnchant(session, upgradeItem).BasicOptions) {
upgradeItem.Enchant.BasicOptions[attribute] = option;
}
upgradeItem.Enchant.Enchants++;
ApplyEnchantStats();

session.ConditionUpdate(ConditionType.enchant_result, codeLong: (int) EnchantResult.Success, targetLong: upgradeItem.Enchant.Enchants);
session.Send(ItemEnchantPacket.Success(upgradeItem, attributeDeltas));
Expand Down
Loading