Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: dist/game/data/stats/items/28500-28599.xml
- ===================================================================
- --- dist/game/data/stats/items/28500-28599.xml (revision 8684)
- +++ dist/game/data/stats/items/28500-28599.xml (working copy)
- @@ -1232,7 +1252,7 @@
- <set name="is_sellable" val="false" />
- <set name="is_stackable" val="true" />
- <set name="default_action" val="SKILL_REDUCE" />
- - <set name="etcitem_type" val="BLESS_ENCHT_AM" />
- + <set name="etcitem_type" val="BLESS_ENCHT_AM_DOWN" />
- <set name="immediate_effect" val="true" />
- <set name="handler" val="EnchantScrolls" />
- <skills>
- @@ -1246,7 +1266,7 @@
- <set name="is_sellable" val="false" />
- <set name="is_stackable" val="true" />
- <set name="default_action" val="SKILL_REDUCE" />
- - <set name="etcitem_type" val="BLESS_ENCHT_AM" />
- + <set name="etcitem_type" val="BLESS_ENCHT_AM_DOWN" />
- <set name="immediate_effect" val="true" />
- <set name="handler" val="EnchantScrolls" />
- <skills>
- @@ -1260,7 +1280,7 @@
- <set name="is_sellable" val="false" />
- <set name="is_stackable" val="true" />
- <set name="default_action" val="SKILL_REDUCE" />
- - <set name="etcitem_type" val="BLESS_ENCHT_AM" />
- + <set name="etcitem_type" val="BLESS_ENCHT_AM_DOWN" />
- <set name="immediate_effect" val="true" />
- <set name="handler" val="EnchantScrolls" />
- <skills>
- Index: java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java (revision 8684)
- +++ java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java (working copy)
- @@ -39,6 +39,7 @@
- EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM,
- EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP,
- EtcItemType.BLESS_ENCHT_AM,
- + EtcItemType.BLESS_ENCHT_AM_DOWN,
- EtcItemType.BLESS_ENCHT_WP,
- EtcItemType.ENCHT_AM,
- EtcItemType.ENCHT_WP,
- Index: java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java (revision 8684)
- +++ java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java (working copy)
- @@ -37,6 +37,7 @@
- {
- private final boolean _isWeapon;
- private final boolean _isBlessed;
- + private final boolean _isBlessedDown;
- private final boolean _isSafe;
- private final boolean _isGiant;
- private final int _scrollGroupId;
- @@ -50,6 +51,7 @@
- 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) || (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);
- + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN);
- _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP);
- _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP);
- }
- @@ -69,6 +71,14 @@
- }
- /**
- + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise
- + */
- + public boolean isBlessedDown()
- + {
- + return _isBlessedDown;
- + }
- +
- + /**
- * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise
- */
- public boolean isSafe()
- Index: java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java (revision 8684)
- +++ java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java (working copy)
- @@ -48,6 +48,7 @@
- GIANT_ENCHT_AM,
- BLESS_ENCHT_WP,
- BLESS_ENCHT_AM,
- + BLESS_ENCHT_AM_DOWN,
- COUPON,
- ELIXIR,
- ENCHT_ATTR,
- Index: java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java (revision 8684)
- +++ java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java (working copy)
- @@ -312,11 +312,12 @@
- player.broadcastUserInfo();
- }
- - if (scrollTemplate.isBlessed() || ((supportTemplate != null) && supportTemplate.isDown()) || ((supportTemplate != null) && supportTemplate.isBlessed()))
- + if (scrollTemplate.isBlessed() || scrollTemplate.isBlessedDown() || ((supportTemplate != null) && supportTemplate.isDown()) || ((supportTemplate != null) && supportTemplate.isBlessed()))
- {
- // blessed enchant - enchant value down by 1
- - if (((supportTemplate != null) && supportTemplate.isDown()))
- + if (scrollTemplate.isBlessedDown() || ((supportTemplate != null) && supportTemplate.isDown()))
- {
- + client.sendPacket(SystemMessageId.THE_ENCHANT_VALUE_IS_DECREASED_BY_1);
- item.setEnchantLevel(item.getEnchantLevel() - 1);
- }
- else // blessed enchant - clear enchant value
- Index: java/org/l2jmobius/gameserver/network/SystemMessageId.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/network/SystemMessageId.java (revision 8684)
- +++ java/org/l2jmobius/gameserver/network/SystemMessageId.java (working copy)
- @@ -17647,6 +17647,9 @@
- @ClientString(id = 13086, message = "The XP recovery fee has changed. Please try again.")
- public static SystemMessageId THE_XP_RECOVERY_FEE_HAS_CHANGED_PLEASE_TRY_AGAIN;
- + @ClientString(id = 13136, message = "The enchant value is decreased by 1.")
- + public static SystemMessageId THE_ENCHANT_VALUE_IS_DECREASED_BY_1;
- +
- @ClientString(id = 19000, message = "KR Live/Classic new numbers (13001-19000)")
- public static SystemMessageId KR_LIVE_CLASSIC_NEW_NUMBERS_13001_19000_2;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement