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

Support for adding multiple non stackable items in multisells.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-09-07 08:22:29 +00:00
parent 1c438fc2e5
commit 3362138af2
15 changed files with 285 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -243,7 +244,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -271,7 +272,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{

19
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.OptionalLong;
@ -236,7 +237,25 @@ public class MultiSellChoose implements IClientIncomingPacket
}
// Check for enchanted level and ingredient count requirements.
final List<ItemChanceHolder> summedIngredients = new ArrayList<>();
for (ItemChanceHolder ingredient : entry.getIngredients())
{
boolean added = false;
for (ItemChanceHolder summedIngredient : summedIngredients)
{
if ((summedIngredient.getId() == ingredient.getId()) && (summedIngredient.getEnchantmentLevel() == ingredient.getEnchantmentLevel()))
{
summedIngredients.add(new ItemChanceHolder(ingredient.getId(), ingredient.getChance(), ingredient.getCount() + summedIngredient.getCount(), ingredient.getEnchantmentLevel(), ingredient.isMaintainIngredient()));
summedIngredients.remove(summedIngredient);
added = true;
}
}
if (!added)
{
summedIngredients.add(ingredient);
}
}
for (ItemChanceHolder ingredient : summedIngredients)
{
if (ingredient.getEnchantmentLevel() > 0)
{