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

Blessed Lucky Enchant Stone items.

Browse Source 
Contributed by Ofelin.
This commit is contained in:
MobiusDev
2017-11-20 02:45:07 +00:00
parent 5cefb6405a
commit 32ce8fc211
32 changed files with 193 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml vendored
View File

@@ -758,10 +758,24 @@
<support id="36020" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed Lucky Enchant Stone Weapon -->
<support id="23787" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23788" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23789" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23790" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23791" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23792" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37566" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<!-- Blessed Lucky Enchant Stone Armor -->
<support id="23793" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23794" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23795" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23796" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23797" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23798" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37567" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed High-grade Lucky Enchant Stone Weapon -->
<support id="38757" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />

24
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml vendored
View File

@@ -1284,7 +1284,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23788" name="Blessed Lucky Enchant Stone: Weapon (C-grade)" type="EtcItem">
@@ -1299,7 +1299,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23789" name="Blessed Lucky Enchant Stone: Weapon (B-grade)" type="EtcItem">
@@ -1314,7 +1314,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23790" name="Blessed Lucky Enchant Stone: Weapon (A-grade)" type="EtcItem">
@@ -1329,7 +1329,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23791" name="Blessed Lucky Enchant Stone: Weapon (S-grade)" type="EtcItem">
@@ -1344,7 +1344,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23792" name="Blessed Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1359,7 +1359,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23793" name="Blessed Lucky Enchant Stone: Armor (D-grade)" type="EtcItem">
@@ -1374,7 +1374,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23794" name="Blessed Lucky Enchant Stone: Armor (C-grade)" type="EtcItem">
@@ -1389,7 +1389,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23795" name="Blessed Lucky Enchant Stone: Armor (B-grade)" type="EtcItem">
@@ -1404,7 +1404,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23796" name="Blessed Lucky Enchant Stone: Armor (A-grade)" type="EtcItem">
@@ -1419,7 +1419,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23797" name="Blessed Lucky Enchant Stone: Armor (S-grade)" type="EtcItem">
@@ -1434,7 +1434,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23798" name="Blessed Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1449,7 +1449,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23799" name="Vitality Maintaining Potion (10-minute)" type="EtcItem">

2
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/38700-38799.xml vendored
View File

@@ -1414,7 +1414,7 @@
<set name="is_freightable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
View File

@@ -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;

9
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
View File

@@ -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;
}
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
View File

@@ -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,

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -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);

14
L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml vendored
View File

@@ -784,10 +784,24 @@
<support id="36020" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed Lucky Enchant Stone Weapon -->
<support id="23787" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23788" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23789" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23790" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23791" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23792" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37566" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<!-- Blessed Lucky Enchant Stone Armor -->
<support id="23793" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23794" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23795" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23796" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23797" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23798" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37567" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed High-grade Lucky Enchant Stone Weapon -->
<support id="38757" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />

24
L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml vendored
View File

@@ -1284,7 +1284,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23788" name="Blessed Lucky Enchant Stone: Weapon (C-grade)" type="EtcItem">
@@ -1299,7 +1299,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23789" name="Blessed Lucky Enchant Stone: Weapon (B-grade)" type="EtcItem">
@@ -1314,7 +1314,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23790" name="Blessed Lucky Enchant Stone: Weapon (A-grade)" type="EtcItem">
@@ -1329,7 +1329,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23791" name="Blessed Lucky Enchant Stone: Weapon (S-grade)" type="EtcItem">
@@ -1344,7 +1344,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23792" name="Blessed Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1359,7 +1359,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23793" name="Blessed Lucky Enchant Stone: Armor (D-grade)" type="EtcItem">
@@ -1374,7 +1374,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23794" name="Blessed Lucky Enchant Stone: Armor (C-grade)" type="EtcItem">
@@ -1389,7 +1389,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23795" name="Blessed Lucky Enchant Stone: Armor (B-grade)" type="EtcItem">
@@ -1404,7 +1404,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23796" name="Blessed Lucky Enchant Stone: Armor (A-grade)" type="EtcItem">
@@ -1419,7 +1419,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23797" name="Blessed Lucky Enchant Stone: Armor (S-grade)" type="EtcItem">
@@ -1434,7 +1434,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23798" name="Blessed Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1449,7 +1449,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23799" name="Vitality Maintaining Potion (10-minute)" type="EtcItem">

2
L2J_Mobius_2.5_Underground/dist/game/data/stats/items/38700-38799.xml vendored
View File

@@ -1414,7 +1414,7 @@
<set name="is_freightable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
View File

@@ -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;

9
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
View File

@@ -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;
}
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
View File

@@ -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,

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -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);

14
L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml vendored
View File

@@ -784,10 +784,24 @@
<support id="36020" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed Lucky Enchant Stone Weapon -->
<support id="23787" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23788" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23789" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23790" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23791" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23792" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37566" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<!-- Blessed Lucky Enchant Stone Armor -->
<support id="23793" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23794" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23795" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23796" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23797" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23798" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37567" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed High-grade Lucky Enchant Stone Weapon -->
<support id="38757" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />

24
L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml vendored
View File

@@ -1284,7 +1284,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23788" name="Blessed Lucky Enchant Stone: Weapon (C-grade)" type="EtcItem">
@@ -1299,7 +1299,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23789" name="Blessed Lucky Enchant Stone: Weapon (B-grade)" type="EtcItem">
@@ -1314,7 +1314,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23790" name="Blessed Lucky Enchant Stone: Weapon (A-grade)" type="EtcItem">
@@ -1329,7 +1329,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23791" name="Blessed Lucky Enchant Stone: Weapon (S-grade)" type="EtcItem">
@@ -1344,7 +1344,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23792" name="Blessed Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1359,7 +1359,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23793" name="Blessed Lucky Enchant Stone: Armor (D-grade)" type="EtcItem">
@@ -1374,7 +1374,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23794" name="Blessed Lucky Enchant Stone: Armor (C-grade)" type="EtcItem">
@@ -1389,7 +1389,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23795" name="Blessed Lucky Enchant Stone: Armor (B-grade)" type="EtcItem">
@@ -1404,7 +1404,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23796" name="Blessed Lucky Enchant Stone: Armor (A-grade)" type="EtcItem">
@@ -1419,7 +1419,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23797" name="Blessed Lucky Enchant Stone: Armor (S-grade)" type="EtcItem">
@@ -1434,7 +1434,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23798" name="Blessed Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1449,7 +1449,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23799" name="Vitality Maintaining Potion (10-minute)" type="EtcItem">

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/items/38700-38799.xml vendored
View File

@@ -1414,7 +1414,7 @@
<set name="is_freightable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
View File

@@ -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;

9
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
View File

@@ -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;
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
View File

@@ -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,

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -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);

14
L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml vendored
View File

@@ -784,10 +784,24 @@
<support id="36020" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed Lucky Enchant Stone Weapon -->
<support id="23787" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23788" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23789" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23790" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23791" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23792" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37566" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<!-- Blessed Lucky Enchant Stone Armor -->
<support id="23793" targetGrade="D" minEnchant="3" maxEnchant="9" />
<support id="23794" targetGrade="C" minEnchant="3" maxEnchant="9" />
<support id="23795" targetGrade="B" minEnchant="3" maxEnchant="9" />
<support id="23796" targetGrade="A" minEnchant="3" maxEnchant="9" />
<support id="23797" targetGrade="S" minEnchant="3" maxEnchant="9" />
<support id="23798" targetGrade="R" minEnchant="3" maxEnchant="9" />
<support id="37567" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="10" />
<support id="38758" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<support id="38760" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="30" />
<!-- Blessed High-grade Lucky Enchant Stone Weapon -->
<support id="38757" targetGrade="R" minEnchant="3" maxEnchant="9" bonusRate="20" />

24
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml vendored
View File

@@ -1310,7 +1310,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23788" name="Blessed Lucky Enchant Stone: Weapon (C-grade)" type="EtcItem">
@@ -1325,7 +1325,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23789" name="Blessed Lucky Enchant Stone: Weapon (B-grade)" type="EtcItem">
@@ -1340,7 +1340,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23790" name="Blessed Lucky Enchant Stone: Weapon (A-grade)" type="EtcItem">
@@ -1355,7 +1355,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23791" name="Blessed Lucky Enchant Stone: Weapon (S-grade)" type="EtcItem">
@@ -1370,7 +1370,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23792" name="Blessed Lucky Enchant Stone: Weapon (R-grade)" type="EtcItem">
@@ -1385,7 +1385,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="is_stackable" val="true" />
</item>
<item id="23793" name="Blessed Lucky Enchant Stone: Armor (D-grade)" type="EtcItem">
@@ -1400,7 +1400,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23794" name="Blessed Lucky Enchant Stone: Armor (C-grade)" type="EtcItem">
@@ -1415,7 +1415,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23795" name="Blessed Lucky Enchant Stone: Armor (B-grade)" type="EtcItem">
@@ -1430,7 +1430,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23796" name="Blessed Lucky Enchant Stone: Armor (A-grade)" type="EtcItem">
@@ -1445,7 +1445,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23797" name="Blessed Lucky Enchant Stone: Armor (S-grade)" type="EtcItem">
@@ -1460,7 +1460,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23798" name="Blessed Lucky Enchant Stone: Armor (R-grade)" type="EtcItem">
@@ -1475,7 +1475,7 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="is_stackable" val="true" />
</item>
<item id="23799" name="Vitality Maintaining Potion (10-minute)" type="EtcItem">

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/38700-38799.xml vendored
View File

@@ -1414,7 +1414,7 @@
<set name="is_freightable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
View File

@@ -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;

9
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
View File

@@ -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;
}
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
View File

@@ -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,

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -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);

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
View File

@@ -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;

9
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java
View File

@@ -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;
}
}

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/EtcItemType.java
View File

@@ -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,

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -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);