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

Send RequestNewEnchantTry ExEnchantSucess or ExEnchantFail before creating item.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-12-10 15:07:12 +00:00
parent 42d5d76bb6
commit bba8642e8c
2 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess;
@ -107,20 +106,25 @@ public class RequestNewEnchantTry implements ClientPacket
return;
}
// Calculate compound result.
final double random = (Rnd.nextDouble() * 100);
final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
// Send success or fail packet.
if (success)
{
player.sendPacket(new ExEnchantSucess(rewardItem.getId()));
}
else
{
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
// Take required items and add result item.
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true)))
{
final double random = (Rnd.nextDouble() * 100);
final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
// Notify to scripts.
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
@ -129,25 +133,6 @@ public class RequestNewEnchantTry implements ClientPacket
}
}
final InventoryUpdate iu = new InventoryUpdate();
if (itemOne.isStackable() && (itemOne.getCount() > 0))
{
iu.addModifiedItem(itemOne);
}
else
{
iu.addRemovedItem(itemOne);
}
if (itemTwo.isStackable() && (itemTwo.getCount() > 0))
{
iu.addModifiedItem(itemTwo);
}
else
{
iu.addRemovedItem(itemTwo);
}
player.sendInventoryUpdate(iu);
player.removeRequest(request.getClass());
}
}

45
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess;
@ -104,40 +103,26 @@ public class RequestNewEnchantTry implements ClientPacket
return;
}
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true)))
// Calculate compound result.
final double random = (Rnd.nextDouble() * 100);
final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
// Send success or fail packet.
if (success)
{
final double random = (Rnd.nextDouble() * 100);
final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (success)
{
player.sendPacket(new ExEnchantSucess(item.getId()));
}
else
{
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
player.sendPacket(new ExEnchantSucess(rewardItem.getId()));
}
else
{
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
final InventoryUpdate iu = new InventoryUpdate();
if (itemOne.isStackable() && (itemOne.getCount() > 0))
// Take required items and add result item.
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true)))
{
iu.addModifiedItem(itemOne);
player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
}
else
{
iu.addRemovedItem(itemOne);
}
if (itemTwo.isStackable() && (itemTwo.getCount() > 0))
{
iu.addModifiedItem(itemTwo);
}
else
{
iu.addRemovedItem(itemTwo);
}
player.sendInventoryUpdate(iu);
player.removeRequest(request.getClass());
}