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

Generalized naming for ExtractableItems special reward variable.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-24 07:44:14 +00:00
parent c7cb4dea5f
commit 74daee90f0
6 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
boolean primeReward = false; boolean specialReward = false;
final Map<Item, Long> extractedItems = new HashMap<>(); final Map<Item, Long> extractedItems = new HashMap<>();
final List<Item> enchantedItems = new ArrayList<>(); final List<Item> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
@@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
@@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; 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); player.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE);
} }

8
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
boolean primeReward = false; boolean specialReward = false;
final Map<Item, Long> extractedItems = new HashMap<>(); final Map<Item, Long> extractedItems = new HashMap<>();
final List<Item> enchantedItems = new ArrayList<>(); final List<Item> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
@@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
@@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; 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); player.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE);
} }

8
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
boolean primeReward = false; boolean specialReward = false;
final Map<Item, Long> extractedItems = new HashMap<>(); final Map<Item, Long> extractedItems = new HashMap<>();
final List<Item> enchantedItems = new ArrayList<>(); final List<Item> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
@@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
@@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; 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); player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
} }

8
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
boolean primeReward = false; boolean specialReward = false;
final Map<Item, Long> extractedItems = new HashMap<>(); final Map<Item, Long> extractedItems = new HashMap<>();
final List<Item> enchantedItems = new ArrayList<>(); final List<Item> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
@@ -114,7 +114,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
@@ -169,7 +169,7 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; 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); player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
} }

15
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
boolean primeReward = false; boolean specialReward = false;
final Map<Item, Long> extractedItems = new HashMap<>(); final Map<Item, Long> extractedItems = new HashMap<>();
final List<Item> enchantedItems = new ArrayList<>(); final List<Item> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
@@ -114,14 +114,14 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
if (expi.getId() == -700) // Honor Coins if (expi.getId() == -700) // Honor Coins
{ {
player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin."); player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin.");
primeReward = true; specialReward = true;
continue; continue;
} }
@@ -176,16 +176,17 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
if (expi.getId() == -700) // Honor Coins if (expi.getId() == -700) // Honor Coins
{ {
player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount) + " Honor Points!"); player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin.");
primeReward = true; specialReward = true;
continue; continue;
} }
if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); 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); player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
} }

15
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -71,7 +71,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
boolean primeReward = false; boolean specialReward = false;
final Map<Item, Long> extractedItems = new HashMap<>(); final Map<Item, Long> extractedItems = new HashMap<>();
final List<Item> enchantedItems = new ArrayList<>(); final List<Item> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
@@ -114,14 +114,14 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
if (expi.getId() == -700) // Honor Coins if (expi.getId() == -700) // Honor Coins
{ {
player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin."); player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin.");
primeReward = true; specialReward = true;
continue; continue;
} }
@@ -176,16 +176,17 @@ public class ExtractableItems implements IItemHandler
{ {
player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; specialReward = true;
continue; continue;
} }
if (expi.getId() == -700) // Honor Coins if (expi.getId() == -700) // Honor Coins
{ {
player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount); player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount) + " Honor Points!"); player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin.");
primeReward = true; specialReward = true;
continue; continue;
} }
if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); 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); player.sendPacket(SystemMessageId.FAILED_TO_CHANGE_THE_ITEM);
} }