From 74daee90f0e90cb5b2a2677310dee59522d930df Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 24 Dec 2021 07:44:14 +0000 Subject: [PATCH] Generalized naming for ExtractableItems special reward variable. --- .../handlers/itemhandlers/ExtractableItems.java | 8 ++++---- .../handlers/itemhandlers/ExtractableItems.java | 8 ++++---- .../handlers/itemhandlers/ExtractableItems.java | 8 ++++---- .../handlers/itemhandlers/ExtractableItems.java | 8 ++++---- .../handlers/itemhandlers/ExtractableItems.java | 15 ++++++++------- .../handlers/itemhandlers/ExtractableItems.java | 15 ++++++++------- 6 files changed, 32 insertions(+), 30 deletions(-) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 604b134414..fcc423a788 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler return false; } - boolean primeReward = false; + boolean specialReward = false; final Map extractedItems = new HashMap<>(); final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) @@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -201,7 +201,7 @@ public class ExtractableItems implements IItemHandler } } - if (extractedItems.isEmpty() && !primeReward) + if (extractedItems.isEmpty() && !specialReward) { player.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 604b134414..fcc423a788 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler return false; } - boolean primeReward = false; + boolean specialReward = false; final Map extractedItems = new HashMap<>(); final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) @@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -201,7 +201,7 @@ public class ExtractableItems implements IItemHandler } } - if (extractedItems.isEmpty() && !primeReward) + if (extractedItems.isEmpty() && !specialReward) { player.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 2d81eeaae6..4249592a7c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler return false; } - boolean primeReward = false; + boolean specialReward = false; final Map extractedItems = new HashMap<>(); final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) @@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -201,7 +201,7 @@ public class ExtractableItems implements IItemHandler } } - if (extractedItems.isEmpty() && !primeReward) + if (extractedItems.isEmpty() && !specialReward) { player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6ed099eccf..080c2c5fa9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler return false; } - boolean primeReward = false; + boolean specialReward = false; final Map extractedItems = new HashMap<>(); final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) @@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } @@ -201,7 +201,7 @@ public class ExtractableItems implements IItemHandler } } - if (extractedItems.isEmpty() && !primeReward) + if (extractedItems.isEmpty() && !specialReward) { player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index a535d9c4a1..b5dd7cfc44 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler return false; } - boolean primeReward = false; + boolean specialReward = false; final Map extractedItems = new HashMap<>(); final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) @@ -114,14 +114,14 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } if (expi.getId() == -700) // Honor Coins { player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin."); - primeReward = true; + specialReward = true; continue; } @@ -176,16 +176,17 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } if (expi.getId() == -700) // Honor Coins { player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); - player.sendMessage("You have obtained " + (createItemAmount) + " Honor Points!"); - primeReward = true; + player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin."); + specialReward = true; continue; } + if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); @@ -214,7 +215,7 @@ public class ExtractableItems implements IItemHandler } } - if (extractedItems.isEmpty() && !primeReward) + if (extractedItems.isEmpty() && !specialReward) { player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index a535d9c4a1..b5dd7cfc44 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler return false; } - boolean primeReward = false; + boolean specialReward = false; final Map extractedItems = new HashMap<>(); final List enchantedItems = new ArrayList<>(); if (etcitem.getExtractableCountMin() > 0) @@ -114,14 +114,14 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } if (expi.getId() == -700) // Honor Coins { player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin."); - primeReward = true; + specialReward = true; continue; } @@ -176,16 +176,17 @@ public class ExtractableItems implements IItemHandler { player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); - primeReward = true; + specialReward = true; continue; } if (expi.getId() == -700) // Honor Coins { player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); - player.sendMessage("You have obtained " + (createItemAmount) + " Honor Points!"); - primeReward = true; + player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin."); + specialReward = true; continue; } + if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); @@ -214,7 +215,7 @@ public class ExtractableItems implements IItemHandler } } - if (extractedItems.isEmpty() && !primeReward) + if (extractedItems.isEmpty() && !specialReward) { player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM); }