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

Enable enchant for different id scrolls.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-12-13 20:54:16 +00:00
parent 6928cb8ce2
commit f8a5bad1cc
17 changed files with 255 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -107,18 +107,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -138,6 +126,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -107,18 +107,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -138,6 +126,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}

27
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -113,18 +113,6 @@ public class EnchantScroll extends AbstractEnchantItem
@Override
public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
if ((_items != null) && !_items.contains(itemToEnchant.getId()))
{
return false;
@ -148,6 +136,21 @@ public class EnchantScroll extends AbstractEnchantItem
return false;
}
}
if (_items == null)
{
for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
{
if (scroll.getId() == getId())
{
continue;
}
final Set<Integer> scrollItems = scroll.getItems();
if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
{
return false;
}
}
}
return super.isValid(itemToEnchant, supportItem);
}