Skip to content

Bugfix: Implement missing Lahap jewel combine/dismantle tax #794

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
eduardosmaniotto wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −4
Open

Bugfix: Implement missing Lahap jewel combine/dismantle tax #794

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
29 changes: 25 additions & 4 deletions src/GameLogic/PlayerActions/Items/ItemStackAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ namespace MUnique.OpenMU.GameLogic.PlayerActions.Items;
/// </summary>
public class ItemStackAction
{
private const int CombineFeePerTen = 500_000;
private const int DismantleFee = 1_000_000;

/// <summary>
/// Stacks several items to one stacked item.
/// </summary>
/// <param name="player">The player which is stacking.</param>
/// <param name="player">The player that is stacking.</param>
/// <param name="stackId">The id of the stacking.</param>
/// <param name="stackSize">The size of the requested stack.</param>
public async ValueTask StackItemsAsync(Player player, byte stackId, byte stackSize)
Expand All @@ -39,6 +42,13 @@ public async ValueTask StackItemsAsync(Player player, byte stackId, byte stackSi
var jewels = player.Inventory.Items.Where(item => item.Definition == mix.SingleJewel).Take(stackSize).ToList();
if (jewels.Count == stackSize)
{
var fee = GetCombineFee(stackSize);
if (!player.TryRemoveMoney(fee))
{
await player.ShowLocalizedBlueMessageAsync(nameof(PlayerMessage.NotEnoughMoney)).ConfigureAwait(false);
return;
}
Comment thread
eduardosmaniotto marked this conversation as resolved.

foreach (var jewel in jewels)
{
await player.Inventory.RemoveItemAsync(jewel).ConfigureAwait(false);
Expand All @@ -51,6 +61,7 @@ public async ValueTask StackItemsAsync(Player player, byte stackId, byte stackSi
stacked.Durability = 1;
await player.Inventory.AddItemAsync(stacked).ConfigureAwait(false);
await player.InvokeViewPlugInAsync<IItemAppearPlugIn>(p => p.ItemAppearAsync(stacked)).ConfigureAwait(false);
await player.InvokeViewPlugInAsync<IUpdateMoneyPlugIn>(p => p.UpdateMoneyAsync()).ConfigureAwait(false);
}
else
{
Expand All @@ -59,7 +70,7 @@ public async ValueTask StackItemsAsync(Player player, byte stackId, byte stackSi
}

/// <summary>
/// Unstacks the stacked item from the specified slot.
/// Unstack the stacked item from the specified slot.
/// </summary>
/// <param name="player">The player.</param>
/// <param name="stackId">The stack identifier.</param>
Expand Down Expand Up @@ -91,6 +102,12 @@ public async ValueTask UnstackItemsAsync(Player player, byte stackId, byte slot)
return;
}

if (!player.TryRemoveMoney(DismantleFee))
{
await player.ShowLocalizedBlueMessageAsync(nameof(PlayerMessage.NotEnoughMoney)).ConfigureAwait(false);
return;
}

byte pieces = (byte)((stacked.Level + 1) * 10);

var freeSlots = player.Inventory!.FreeSlots.Take(pieces).ToList();
Expand All @@ -111,13 +128,17 @@ public async ValueTask UnstackItemsAsync(Player player, byte stackId, byte slot)
await player.Inventory.AddItemAsync(freeSlot, jewel).ConfigureAwait(false);
await player.InvokeViewPlugInAsync<IItemAppearPlugIn>(p => p.ItemAppearAsync(jewel)).ConfigureAwait(false);
}

await player.InvokeViewPlugInAsync<IUpdateMoneyPlugIn>(p => p.UpdateMoneyAsync()).ConfigureAwait(false);
}

private static int GetCombineFee(byte stackSize) => (stackSize / 10) * CombineFeePerTen;

private bool IsCorrectNpcOpened(Player player)
{
if (player.OpenedNpc is null || player.OpenedNpc.Definition.NpcWindow != NpcWindow.Lahap)
{
player.Logger.LogWarning("Probably Hacker tried to Mix/Unmix Jewels without talking to Lahap. Dupe Method. Acc: [{0}] Character: [{1}]", player.Account?.LoginName, player.SelectedCharacter?.Name);
player.Logger.LogWarning("Probably Hacker tried to Combine/Dismantle Jewels without talking to Lahap. Dupe Method. Acc: [{accountName}] Character: [{characterName}]", player.Account?.LoginName, player.SelectedCharacter?.Name);
return false;
}

Expand All @@ -129,7 +150,7 @@ private bool IsCorrectNpcOpened(Player player)
var mix = player.GameContext.Configuration.JewelMixes.FirstOrDefault(m => m.Number == mixId);
if (mix is null)
{
player.Logger.LogWarning($"Unkown mix type [{mixId}], Player Name: [{player.SelectedCharacter?.Name}], Account Name: [{player.Account?.LoginName}]");
player.Logger.LogWarning("Unknown mix type [{mixType}], Player Name: [{characterName}], Account Name: [{accountName}]", mixId, player.SelectedCharacter?.Name, player.Account?.LoginName);
}

return mix;
Expand Down