lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WorldExchangeManager improvements.

Browse Source 
Contributed by Index.
This commit is contained in:
MobiusDevelopment
2023-01-08 22:00:59 +00:00
parent 3b162f22e1
commit 5467ec2cfc
3 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/WorldExchangeManager.java
View File

@@ -280,6 +280,16 @@ public class WorldExchangeManager implements IXmlReader
} }
} }
private long calculateFeeForRegister(Player player, int objectId, long amount, long priceForEach)
{
final Item itemToRemove = player.getInventory().getItemByObjectId(objectId);
if (itemToRemove.getId() == Inventory.ADENA_ID)
{
return priceForEach * 100L;
}
return Math.round(priceForEach * (itemToRemove.getId() == Inventory.ADENA_ID ? 1 : amount) * Config.WORLD_EXCHANGE_ADENA_FEE);
}
/** /**
* Forwarded from client packet "ExWorldExchangeRegisterItem" for check ops and register item if it can in World Exchange system * Forwarded from client packet "ExWorldExchangeRegisterItem" for check ops and register item if it can in World Exchange system
* @param player * @param player
@@ -301,9 +311,16 @@ public class WorldExchangeManager implements IXmlReader
player.sendPacket(WorldExchangeRegisterItem.FAIL); player.sendPacket(WorldExchangeRegisterItem.FAIL);
return; return;
} }
if (player.getInventory().getItemByObjectId(itemObjectId) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_THAT_YOU_SEARCHED_DOES_NOT_EXIST));
player.sendPacket(WorldExchangeRegisterItem.FAIL);
return;
}
long totalPrice = priceForEach * amount; final Item item = player.getInventory().getItemByObjectId(itemObjectId);
long feePrice = Math.round(totalPrice * Config.WORLD_EXCHANGE_ADENA_FEE); long totalPrice = priceForEach * (item.getId() == Inventory.ADENA_ID ? 1 : amount);
long feePrice = calculateFeeForRegister(player, itemObjectId, amount, priceForEach);
if ((Config.WORLD_EXCHANGE_MAX_ADENA_FEE != -1) && (feePrice > Config.WORLD_EXCHANGE_MAX_ADENA_FEE)) if ((Config.WORLD_EXCHANGE_MAX_ADENA_FEE != -1) && (feePrice > Config.WORLD_EXCHANGE_MAX_ADENA_FEE))
{ {
feePrice = Config.WORLD_EXCHANGE_MAX_ADENA_FEE; feePrice = Config.WORLD_EXCHANGE_MAX_ADENA_FEE;
@@ -315,15 +332,7 @@ public class WorldExchangeManager implements IXmlReader
return; return;
} }
if (player.getInventory().getItemByObjectId(itemObjectId) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_THAT_YOU_SEARCHED_DOES_NOT_EXIST));
player.sendPacket(WorldExchangeRegisterItem.FAIL);
return;
}
final long freeId = getNextId(); final long freeId = getNextId();
final Item item = player.getInventory().getItemByObjectId(itemObjectId);
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
if (item.isStackable() && (player.getInventory().getInventoryItemCount(item.getId(), -1) > amount)) if (item.isStackable() && (player.getInventory().getInventoryItemCount(item.getId(), -1) > amount))
{ {
@@ -536,11 +545,8 @@ public class WorldExchangeManager implements IXmlReader
} }
player.sendPacket(new WorldExchangeSettleRecvResult(worldExchangeItem.getItemInstance().getObjectId(), worldExchangeItem.getItemInstance().getCount(), (byte) 1)); player.sendPacket(new WorldExchangeSettleRecvResult(worldExchangeItem.getItemInstance().getObjectId(), worldExchangeItem.getItemInstance().getCount(), (byte) 1));
long returnPrice = worldExchangeItem.getPrice() - Math.round(worldExchangeItem.getPrice() * Config.WORLD_EXCHANGE_LCOIN_TAX); final long fee = Math.round(((worldExchangeItem.getPrice() * Config.WORLD_EXCHANGE_LCOIN_TAX) * 100) / 100);
if ((Config.WORLD_EXCHANGE_MAX_LCOIN_TAX != -1) && (returnPrice > Config.WORLD_EXCHANGE_MAX_LCOIN_TAX)) final long returnPrice = worldExchangeItem.getPrice() - Math.min(fee, (Config.WORLD_EXCHANGE_MAX_LCOIN_TAX != -1 ? Config.WORLD_EXCHANGE_MAX_LCOIN_TAX : Long.MAX_VALUE)); // floating-point accuracy workaround :D
{
returnPrice = Config.WORLD_EXCHANGE_MAX_LCOIN_TAX;
}
player.getInventory().addItem("World Exchange Took Money", Inventory.EINHASAD_COIN_ID, (returnPrice), player, null); player.getInventory().addItem("World Exchange Took Money", Inventory.EINHASAD_COIN_ID, (returnPrice), player, null);
worldExchangeItem.setStoreType(WorldExchangeItemStatusType.WORLD_EXCHANGE_NONE); worldExchangeItem.setStoreType(WorldExchangeItemStatusType.WORLD_EXCHANGE_NONE);
Item item = worldExchangeItem.getItemInstance(); Item item = worldExchangeItem.getItemInstance();

36
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/WorldExchangeManager.java
View File

@@ -285,6 +285,16 @@ public class WorldExchangeManager implements IXmlReader
} }
} }
private long calculateFeeForRegister(Player player, int objectId, long amount, long priceForEach)
{
final Item itemToRemove = player.getInventory().getItemByObjectId(objectId);
if (itemToRemove.getId() == Inventory.ADENA_ID)
{
return priceForEach * 100L;
}
return Math.round(priceForEach * (itemToRemove.getId() == Inventory.ADENA_ID ? 1 : amount) * Config.WORLD_EXCHANGE_ADENA_FEE);
}
/** /**
* Forwarded from client packet "ExWorldExchangeRegisterItem" for check ops and register item if it can in World Exchange system * Forwarded from client packet "ExWorldExchangeRegisterItem" for check ops and register item if it can in World Exchange system
* @param player * @param player
@@ -306,9 +316,16 @@ public class WorldExchangeManager implements IXmlReader
player.sendPacket(WorldExchangeRegisterItem.FAIL); player.sendPacket(WorldExchangeRegisterItem.FAIL);
return; return;
} }
if (player.getInventory().getItemByObjectId(itemObjectId) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_IS_NOT_FOUND));
player.sendPacket(WorldExchangeRegisterItem.FAIL);
return;
}
long totalPrice = priceForEach * amount; final Item item = player.getInventory().getItemByObjectId(itemObjectId);
long feePrice = Math.round(totalPrice * Config.WORLD_EXCHANGE_ADENA_FEE); long totalPrice = priceForEach * (item.getId() == Inventory.ADENA_ID ? 1 : amount);
long feePrice = calculateFeeForRegister(player, itemObjectId, amount, priceForEach);
if ((Config.WORLD_EXCHANGE_MAX_ADENA_FEE != -1) && (feePrice > Config.WORLD_EXCHANGE_MAX_ADENA_FEE)) if ((Config.WORLD_EXCHANGE_MAX_ADENA_FEE != -1) && (feePrice > Config.WORLD_EXCHANGE_MAX_ADENA_FEE))
{ {
feePrice = Config.WORLD_EXCHANGE_MAX_ADENA_FEE; feePrice = Config.WORLD_EXCHANGE_MAX_ADENA_FEE;
@@ -320,15 +337,7 @@ public class WorldExchangeManager implements IXmlReader
return; return;
} }
if (player.getInventory().getItemByObjectId(itemObjectId) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_IS_NOT_FOUND));
player.sendPacket(WorldExchangeRegisterItem.FAIL);
return;
}
final long freeId = getNextId(); final long freeId = getNextId();
final Item item = player.getInventory().getItemByObjectId(itemObjectId);
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
if (item.isStackable() && (player.getInventory().getInventoryItemCount(item.getId(), -1) > amount)) if (item.isStackable() && (player.getInventory().getInventoryItemCount(item.getId(), -1) > amount))
{ {
@@ -541,11 +550,8 @@ public class WorldExchangeManager implements IXmlReader
} }
player.sendPacket(new WorldExchangeSettleRecvResult(worldExchangeItem.getItemInstance().getObjectId(), worldExchangeItem.getItemInstance().getCount(), (byte) 1)); player.sendPacket(new WorldExchangeSettleRecvResult(worldExchangeItem.getItemInstance().getObjectId(), worldExchangeItem.getItemInstance().getCount(), (byte) 1));
long returnPrice = worldExchangeItem.getPrice() - Math.round(worldExchangeItem.getPrice() * Config.WORLD_EXCHANGE_LCOIN_TAX); final long fee = Math.round(((worldExchangeItem.getPrice() * Config.WORLD_EXCHANGE_LCOIN_TAX) * 100) / 100);
if ((Config.WORLD_EXCHANGE_MAX_LCOIN_TAX != -1) && (returnPrice > Config.WORLD_EXCHANGE_MAX_LCOIN_TAX)) final long returnPrice = worldExchangeItem.getPrice() - Math.min(fee, (Config.WORLD_EXCHANGE_MAX_LCOIN_TAX != -1 ? Config.WORLD_EXCHANGE_MAX_LCOIN_TAX : Long.MAX_VALUE)); // floating-point accuracy workaround :D
{
returnPrice = Config.WORLD_EXCHANGE_MAX_LCOIN_TAX;
}
player.getInventory().addItem("World Exchange Took Money", Inventory.LCOIN_ID, (returnPrice), player, null); player.getInventory().addItem("World Exchange Took Money", Inventory.LCOIN_ID, (returnPrice), player, null);
worldExchangeItem.setStoreType(WorldExchangeItemStatusType.WORLD_EXCHANGE_NONE); worldExchangeItem.setStoreType(WorldExchangeItemStatusType.WORLD_EXCHANGE_NONE);
Item item = worldExchangeItem.getItemInstance(); Item item = worldExchangeItem.getItemInstance();

36
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/WorldExchangeManager.java
View File

@@ -285,6 +285,16 @@ public class WorldExchangeManager implements IXmlReader
} }
} }
private long calculateFeeForRegister(Player player, int objectId, long amount, long priceForEach)
{
final Item itemToRemove = player.getInventory().getItemByObjectId(objectId);
if (itemToRemove.getId() == Inventory.ADENA_ID)
{
return priceForEach * 100L;
}
return Math.round(priceForEach * (itemToRemove.getId() == Inventory.ADENA_ID ? 1 : amount) * Config.WORLD_EXCHANGE_ADENA_FEE);
}
/** /**
* Forwarded from client packet "ExWorldExchangeRegisterItem" for check ops and register item if it can in World Exchange system * Forwarded from client packet "ExWorldExchangeRegisterItem" for check ops and register item if it can in World Exchange system
* @param player * @param player
@@ -306,9 +316,16 @@ public class WorldExchangeManager implements IXmlReader
player.sendPacket(WorldExchangeRegisterItem.FAIL); player.sendPacket(WorldExchangeRegisterItem.FAIL);
return; return;
} }
if (player.getInventory().getItemByObjectId(itemObjectId) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_IS_NOT_FOUND));
player.sendPacket(WorldExchangeRegisterItem.FAIL);
return;
}
long totalPrice = priceForEach * amount; final Item item = player.getInventory().getItemByObjectId(itemObjectId);
long feePrice = Math.round(totalPrice * Config.WORLD_EXCHANGE_ADENA_FEE); long totalPrice = priceForEach * (item.getId() == Inventory.ADENA_ID ? 1 : amount);
long feePrice = calculateFeeForRegister(player, itemObjectId, amount, priceForEach);
if ((Config.WORLD_EXCHANGE_MAX_ADENA_FEE != -1) && (feePrice > Config.WORLD_EXCHANGE_MAX_ADENA_FEE)) if ((Config.WORLD_EXCHANGE_MAX_ADENA_FEE != -1) && (feePrice > Config.WORLD_EXCHANGE_MAX_ADENA_FEE))
{ {
feePrice = Config.WORLD_EXCHANGE_MAX_ADENA_FEE; feePrice = Config.WORLD_EXCHANGE_MAX_ADENA_FEE;
@@ -320,15 +337,7 @@ public class WorldExchangeManager implements IXmlReader
return; return;
} }
if (player.getInventory().getItemByObjectId(itemObjectId) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_IS_NOT_FOUND));
player.sendPacket(WorldExchangeRegisterItem.FAIL);
return;
}
final long freeId = getNextId(); final long freeId = getNextId();
final Item item = player.getInventory().getItemByObjectId(itemObjectId);
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
if (item.isStackable() && (player.getInventory().getInventoryItemCount(item.getId(), -1) > amount)) if (item.isStackable() && (player.getInventory().getInventoryItemCount(item.getId(), -1) > amount))
{ {
@@ -541,11 +550,8 @@ public class WorldExchangeManager implements IXmlReader
} }
player.sendPacket(new WorldExchangeSettleRecvResult(worldExchangeItem.getItemInstance().getObjectId(), worldExchangeItem.getItemInstance().getCount(), (byte) 1)); player.sendPacket(new WorldExchangeSettleRecvResult(worldExchangeItem.getItemInstance().getObjectId(), worldExchangeItem.getItemInstance().getCount(), (byte) 1));
long returnPrice = worldExchangeItem.getPrice() - Math.round(worldExchangeItem.getPrice() * Config.WORLD_EXCHANGE_LCOIN_TAX); final long fee = Math.round(((worldExchangeItem.getPrice() * Config.WORLD_EXCHANGE_LCOIN_TAX) * 100) / 100);
if ((Config.WORLD_EXCHANGE_MAX_LCOIN_TAX != -1) && (returnPrice > Config.WORLD_EXCHANGE_MAX_LCOIN_TAX)) final long returnPrice = worldExchangeItem.getPrice() - Math.min(fee, (Config.WORLD_EXCHANGE_MAX_LCOIN_TAX != -1 ? Config.WORLD_EXCHANGE_MAX_LCOIN_TAX : Long.MAX_VALUE)); // floating-point accuracy workaround :D
{
returnPrice = Config.WORLD_EXCHANGE_MAX_LCOIN_TAX;
}
player.getInventory().addItem("World Exchange Took Money", Inventory.LCOIN_ID, (returnPrice), player, null); player.getInventory().addItem("World Exchange Took Money", Inventory.LCOIN_ID, (returnPrice), player, null);
worldExchangeItem.setStoreType(WorldExchangeItemStatusType.WORLD_EXCHANGE_NONE); worldExchangeItem.setStoreType(WorldExchangeItemStatusType.WORLD_EXCHANGE_NONE);
Item item = worldExchangeItem.getItemInstance(); Item item = worldExchangeItem.getItemInstance();