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

Fixed blessed enchants.

Browse Source 
Contributed by tbr.
This commit is contained in:
MobiusDev 2018-06-03 11:15:17 +00:00
parent 26a478c662
commit 4d126c9502
12 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37500-37599.xml vendored
View File

@ -848,7 +848,7 @@
<set name="is_freightable" val="false" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<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="commissionItemType" val="WEAPON_ENCHANT_STONE" />
<skills>
<skill id="22965" level="1" /> <!-- Blessed Lucky Enchant Stone: Weapon (R-grade) -->
@ -862,7 +862,7 @@
<set name="is_freightable" val="false" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="commissionItemType" val="ARMOR_ENCHANT_STONE" />
<skills>
<skill id="22971" level="1" /> <!-- Blessed Lucky Enchant Stone: Armor (R-grade) -->

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

@ -1569,7 +1569,7 @@
<set name="weight" val="120" />
<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" />
@ -1583,7 +1583,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />
@ -1597,7 +1597,7 @@
<set name="weight" val="120" />
<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" />
@ -1611,7 +1611,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -46,7 +46,7 @@ public final class EnchantScroll extends AbstractEnchantItem
final ItemType type = getItem().getItemType();
_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
}
@ -113,7 +113,7 @@ public final class EnchantScroll extends AbstractEnchantItem
}
else if ((supportItem != null))
{
if (isBlessed())
if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed()))
{
return false;
}

4
L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37500-37599.xml vendored
View File

@ -848,7 +848,7 @@
<set name="is_freightable" val="false" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<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="commissionItemType" val="WEAPON_ENCHANT_STONE" />
<skills>
<skill id="22965" level="1" /> <!-- Blessed Lucky Enchant Stone: Weapon (R-grade) -->
@ -862,7 +862,7 @@
<set name="is_freightable" val="false" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="commissionItemType" val="ARMOR_ENCHANT_STONE" />
<skills>
<skill id="22971" level="1" /> <!-- Blessed Lucky Enchant Stone: Armor (R-grade) -->

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

@ -1520,7 +1520,7 @@
<set name="weight" val="120" />
<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" />
@ -1534,7 +1534,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />
@ -1548,7 +1548,7 @@
<set name="weight" val="120" />
<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" />
@ -1562,7 +1562,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -46,7 +46,7 @@ public final class EnchantScroll extends AbstractEnchantItem
final ItemType type = getItem().getItemType();
_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
}
@ -113,7 +113,7 @@ public final class EnchantScroll extends AbstractEnchantItem
}
else if ((supportItem != null))
{
if (isBlessed())
if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed()))
{
return false;
}

4
L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37500-37599.xml vendored
View File

@ -848,7 +848,7 @@
<set name="is_freightable" val="false" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<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="commissionItemType" val="WEAPON_ENCHANT_STONE" />
<skills>
<skill id="22965" level="1" /> <!-- Blessed Lucky Enchant Stone: Weapon (R-grade) -->
@ -862,7 +862,7 @@
<set name="is_freightable" val="false" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="commissionItemType" val="ARMOR_ENCHANT_STONE" />
<skills>
<skill id="22971" level="1" /> <!-- Blessed Lucky Enchant Stone: Armor (R-grade) -->

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

@ -1520,7 +1520,7 @@
<set name="weight" val="120" />
<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" />
@ -1534,7 +1534,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />
@ -1548,7 +1548,7 @@
<set name="weight" val="120" />
<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" />
@ -1562,7 +1562,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -46,7 +46,7 @@ public final class EnchantScroll extends AbstractEnchantItem
final ItemType type = getItem().getItemType();
_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
}
@ -113,7 +113,7 @@ public final class EnchantScroll extends AbstractEnchantItem
}
else if ((supportItem != null))
{
if (isBlessed())
if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed()))
{
return false;
}

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37500-37599.xml vendored
View File

@ -780,7 +780,7 @@
<set name="is_stackable" val="true" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<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="commissionItemType" val="WEAPON_ENCHANT_STONE" />
<skills>
<skill id="22965" level="1" /> <!-- Blessed Lucky Enchant Stone: Weapon (R-grade) -->
@ -793,7 +793,7 @@
<set name="is_stackable" val="true" />
<set name="immediate_effect" val="true" />
<set name="handler" val="ItemSkills" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="commissionItemType" val="ARMOR_ENCHANT_STONE" />
<skills>
<skill id="22971" level="1" /> <!-- Blessed Lucky Enchant Stone: Armor (R-grade) -->

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

@ -1520,7 +1520,7 @@
<set name="weight" val="120" />
<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" />
@ -1534,7 +1534,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />
@ -1548,7 +1548,7 @@
<set name="weight" val="120" />
<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" />
@ -1562,7 +1562,7 @@
<set name="weight" val="120" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="etcitem_type" val="BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -46,7 +46,7 @@ public final class EnchantScroll extends AbstractEnchantItem
final ItemType type = getItem().getItemType();
_isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP);
_isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP);
_isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP);
_isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
}
@ -113,7 +113,7 @@ public final class EnchantScroll extends AbstractEnchantItem
}
else if ((supportItem != null))
{
if (isBlessed())
if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed()))
{
return false;
}