diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml index bb898fa1eb..dbdaba2522 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml @@ -758,14 +758,28 @@ - + + + + + + + - - + + + + + + + + + + - - + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml index dcc4d55d49..7ff1a5ef1c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml @@ -1284,7 +1284,7 @@ - + @@ -1299,7 +1299,7 @@ - + @@ -1314,7 +1314,7 @@ - + @@ -1329,7 +1329,7 @@ - + @@ -1344,7 +1344,7 @@ - + @@ -1359,7 +1359,7 @@ - + @@ -1374,7 +1374,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1404,7 +1404,7 @@ - + @@ -1419,7 +1419,7 @@ - + @@ -1434,7 +1434,7 @@ - + @@ -1449,7 +1449,7 @@ - + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml index 0c249b09dc..c86c6a6fdc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml @@ -1414,7 +1414,7 @@ - + diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 31a1c35a70..b6b752a604 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -46,6 +46,8 @@ public abstract class AbstractEnchantItem EtcItemType.GIANT_ENCHT_WP, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, }; private final int _id; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index 3659d57706..5701ed0e99 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -25,11 +25,13 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; public final class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; + private final boolean _isBlessed; public EnchantSupportItem(StatsSet set) { super(set); - _isWeapon = getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP; + _isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); } @Override @@ -37,4 +39,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem { return _isWeapon; } + + public boolean isBlessed() + { + return _isBlessed; + } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java index 8cb2214eaf..6d8b33ec23 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java @@ -53,6 +53,8 @@ public enum EtcItemType implements ItemType BOLT, ENCHT_ATTR_INC_PROP_ENCHT_WP, ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_WP, ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4379def4d7..50ad2d6463 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -316,7 +316,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket activeChar.broadcastUserInfo(); } - if (scrollTemplate.isBlessed()) + if (scrollTemplate.isBlessed() || ((supportTemplate != null) && supportTemplate.isBlessed())) { // blessed enchant - clear enchant value client.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml index e36e137d0e..1d7f0964a1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml @@ -784,14 +784,28 @@ - + + + + + + + - - + + + + + + + + + + - - + + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml index 4bfe6d709f..df55d03177 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml @@ -1284,7 +1284,7 @@ - + @@ -1299,7 +1299,7 @@ - + @@ -1314,7 +1314,7 @@ - + @@ -1329,7 +1329,7 @@ - + @@ -1344,7 +1344,7 @@ - + @@ -1359,7 +1359,7 @@ - + @@ -1374,7 +1374,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1404,7 +1404,7 @@ - + @@ -1419,7 +1419,7 @@ - + @@ -1434,7 +1434,7 @@ - + @@ -1449,7 +1449,7 @@ - + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml index 132c31964a..2cb66ece07 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml @@ -1414,7 +1414,7 @@ - + diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 31a1c35a70..b6b752a604 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -46,6 +46,8 @@ public abstract class AbstractEnchantItem EtcItemType.GIANT_ENCHT_WP, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, }; private final int _id; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index 3659d57706..5701ed0e99 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -25,11 +25,13 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; public final class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; + private final boolean _isBlessed; public EnchantSupportItem(StatsSet set) { super(set); - _isWeapon = getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP; + _isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); } @Override @@ -37,4 +39,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem { return _isWeapon; } + + public boolean isBlessed() + { + return _isBlessed; + } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java index 8cb2214eaf..6d8b33ec23 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java @@ -53,6 +53,8 @@ public enum EtcItemType implements ItemType BOLT, ENCHT_ATTR_INC_PROP_ENCHT_WP, ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_WP, ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4379def4d7..50ad2d6463 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -316,7 +316,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket activeChar.broadcastUserInfo(); } - if (scrollTemplate.isBlessed()) + if (scrollTemplate.isBlessed() || ((supportTemplate != null) && supportTemplate.isBlessed())) { // blessed enchant - clear enchant value client.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml index 078e6be7a5..e7834716ef 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml @@ -784,14 +784,28 @@ - + + + + + + + - - + + + + + + + + + + - - + + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml index ef7c5a49ea..5b0db32af7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml @@ -1284,7 +1284,7 @@ - + @@ -1299,7 +1299,7 @@ - + @@ -1314,7 +1314,7 @@ - + @@ -1329,7 +1329,7 @@ - + @@ -1344,7 +1344,7 @@ - + @@ -1359,7 +1359,7 @@ - + @@ -1374,7 +1374,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1404,7 +1404,7 @@ - + @@ -1419,7 +1419,7 @@ - + @@ -1434,7 +1434,7 @@ - + @@ -1449,7 +1449,7 @@ - + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml index fa7dcb4f29..bf3afdd2ea 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml @@ -1414,7 +1414,7 @@ - + diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 31a1c35a70..b6b752a604 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -46,6 +46,8 @@ public abstract class AbstractEnchantItem EtcItemType.GIANT_ENCHT_WP, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, }; private final int _id; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index 3659d57706..5701ed0e99 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -25,11 +25,13 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; public final class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; + private final boolean _isBlessed; public EnchantSupportItem(StatsSet set) { super(set); - _isWeapon = getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP; + _isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); } @Override @@ -37,4 +39,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem { return _isWeapon; } + + public boolean isBlessed() + { + return _isBlessed; + } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java index 8cb2214eaf..6d8b33ec23 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java @@ -53,6 +53,8 @@ public enum EtcItemType implements ItemType BOLT, ENCHT_ATTR_INC_PROP_ENCHT_WP, ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_WP, ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4379def4d7..50ad2d6463 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -316,7 +316,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket activeChar.broadcastUserInfo(); } - if (scrollTemplate.isBlessed()) + if (scrollTemplate.isBlessed() || ((supportTemplate != null) && supportTemplate.isBlessed())) { // blessed enchant - clear enchant value client.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml index 078e6be7a5..e7834716ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml @@ -784,14 +784,28 @@ - + + + + + + + - - + + + + + + + + + + - - + + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml index 63a6832ac3..9cef35f274 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml @@ -1310,7 +1310,7 @@ - + @@ -1325,7 +1325,7 @@ - + @@ -1340,7 +1340,7 @@ - + @@ -1355,7 +1355,7 @@ - + @@ -1370,7 +1370,7 @@ - + @@ -1385,7 +1385,7 @@ - + @@ -1400,7 +1400,7 @@ - + @@ -1415,7 +1415,7 @@ - + @@ -1430,7 +1430,7 @@ - + @@ -1445,7 +1445,7 @@ - + @@ -1460,7 +1460,7 @@ - + @@ -1475,7 +1475,7 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml index ede2cb6ed0..17dfa5b486 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml @@ -1414,7 +1414,7 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 31a1c35a70..b6b752a604 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -46,6 +46,8 @@ public abstract class AbstractEnchantItem EtcItemType.GIANT_ENCHT_WP, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, }; private final int _id; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index 3659d57706..5701ed0e99 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -25,11 +25,13 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; public final class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; + private final boolean _isBlessed; public EnchantSupportItem(StatsSet set) { super(set); - _isWeapon = getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP; + _isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); } @Override @@ -37,4 +39,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem { return _isWeapon; } + + public boolean isBlessed() + { + return _isBlessed; + } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java index 8cb2214eaf..6d8b33ec23 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java @@ -53,6 +53,8 @@ public enum EtcItemType implements ItemType BOLT, ENCHT_ATTR_INC_PROP_ENCHT_WP, ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_WP, ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4379def4d7..50ad2d6463 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -316,7 +316,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket activeChar.broadcastUserInfo(); } - if (scrollTemplate.isBlessed()) + if (scrollTemplate.isBlessed() || ((supportTemplate != null) && supportTemplate.isBlessed())) { // blessed enchant - clear enchant value client.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 31a1c35a70..b6b752a604 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -46,6 +46,8 @@ public abstract class AbstractEnchantItem EtcItemType.GIANT_ENCHT_WP, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, }; private final int _id; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index 3659d57706..5701ed0e99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -25,11 +25,13 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; public final class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; + private final boolean _isBlessed; public EnchantSupportItem(StatsSet set) { super(set); - _isWeapon = getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP; + _isWeapon = (getItem().getItemType() == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (getItem().getItemType() == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP); } @Override @@ -37,4 +39,9 @@ public final class EnchantSupportItem extends AbstractEnchantItem { return _isWeapon; } + + public boolean isBlessed() + { + return _isBlessed; + } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java index 8cb2214eaf..6d8b33ec23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java @@ -53,6 +53,8 @@ public enum EtcItemType implements ItemType BOLT, ENCHT_ATTR_INC_PROP_ENCHT_WP, ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_AM, ENCHT_ATTR_CRYSTAL_ENCHANT_WP, ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4379def4d7..50ad2d6463 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -316,7 +316,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket activeChar.broadcastUserInfo(); } - if (scrollTemplate.isBlessed()) + if (scrollTemplate.isBlessed() || ((supportTemplate != null) && supportTemplate.isBlessed())) { // blessed enchant - clear enchant value client.sendPacket(SystemMessageId.THE_BLESSED_ENCHANT_FAILED_THE_ENCHANT_VALUE_OF_THE_ITEM_BECAME_0);