From 311bbcdbad9952e0c3db21881720777748bea626 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 6 Sep 2021 21:21:18 +0000 Subject: [PATCH] Chance multisell price check adjustments. --- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- .../org/l2jmobius/gameserver/data/xml/MultisellData.java | 9 ++++++++- 19 files changed, 152 insertions(+), 19 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 00fc96d603..87325466bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -173,7 +173,14 @@ public class MultisellData implements IXmlReader continue; } - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } products.add(product); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 105dad8ed4..f94b191561 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -167,7 +167,14 @@ public class MultisellData implements IXmlReader final Item item = ItemTable.getInstance().getTemplate(id); if (item != null) { - totalPrice += ((item.getReferencePrice() / 2) * count); + if (chance > 0) + { + totalPrice += ((item.getReferencePrice() / 2) * count) * (chance / 100); + } + else + { + totalPrice += ((item.getReferencePrice() / 2) * count); + } } } else