Combination item rework.

Adapted from: L2jUnity free files.
This commit is contained in:
MobiusDev
2018-02-17 14:58:09 +00:00
parent fab58a3d3d
commit c459395968
126 changed files with 14210 additions and 2012 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1777,8 +1777,6 @@
<item id="34989" name="Talisman - Longing" type="Armor">
<!-- When equipped, increases Max HP, MP, and CP by 600, P. and M. Accuracy by 2, P. and M. Evasion by 2, Vampiric Rage 3% effect, Atk. Spd. and Casting Spd. by 50, Critical Rate by 30, M. Critical Rate by 10, P. Atk. by 303, M. Atk. by 356, Skill Power by 4%, Damage Reflect Resistance by 30, and P. M. Def. by 60, and STR/INT/CON/MEN/DEX/WIT by 2. MP consumption decreases by 3%. -->
<set name="icon" val="icon.accessory_longing_talisman_i01" />
<set name="compoundItem" val="39572" />
<set name="compoundChance" val="8" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="immediate_effect" val="true" />

View File

@@ -515,8 +515,6 @@
<item id="38162" name="Agathion - Twinkling Virgo" type="Armor">
<!-- Can summon Virgo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increase by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38161" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -545,8 +543,6 @@
<item id="38163" name="Agathion - Radiant Virgo" type="Armor">
<!-- Can summon Virgo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increase by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38162" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -575,8 +571,6 @@
<item id="38164" name="Agathion - Virgo" type="Armor">
<!-- Summons Virgo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38163" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -604,8 +598,6 @@
<item id="38165" name="Agathion - Faint Virgo" type="Armor">
<!-- Summons Virgo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38164" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />

View File

@@ -940,8 +940,6 @@
<item id="38450" name="Agathion - Twinkling Capricorn" type="Armor">
<!-- Summons Capricorn. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38449" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -970,8 +968,6 @@
<item id="38451" name="Agathion - Radiant Capricorn" type="Armor">
<!-- Summons Capricorn. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38450" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1000,8 +996,6 @@
<item id="38452" name="Agathion - Capricorn" type="Armor">
<!-- Summons Capricorn. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38451" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1029,8 +1023,6 @@
<item id="38453" name="Agathion - Faint Capricorn" type="Armor">
<!-- Summons Capricorn. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38452" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1085,8 +1077,6 @@
<item id="38455" name="Agathion - Twinkling Libra" type="Armor">
<!-- Summons Libra. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38454" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1115,8 +1105,6 @@
<item id="38456" name="Agathion - Radiant Libra" type="Armor">
<!-- Summons Libra. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38455" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1145,8 +1133,6 @@
<item id="38457" name="Agathion - Libra" type="Armor">
<!-- Summons Libra. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38456" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1174,8 +1160,6 @@
<item id="38458" name="Agathion - Faint Libra" type="Armor">
<!-- Summons Libra. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38457" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1230,8 +1214,6 @@
<item id="38460" name="Agathion - Twinkling Aries" type="Armor">
<!-- Summons Aries. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38459" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1260,8 +1242,6 @@
<item id="38461" name="Agathion - Radiant Aries" type="Armor">
<!-- Summons Aries. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38460" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1290,8 +1270,6 @@
<item id="38462" name="Agathion - Aries" type="Armor">
<!-- Summons Aries. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38461" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1319,8 +1297,6 @@
<item id="38463" name="Agathion - Faint Aries" type="Armor">
<!-- Summons Aries. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38462" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1375,8 +1351,6 @@
<item id="38465" name="Agathion - Twinkling Taurus" type="Armor">
<!-- Summons Taurus. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38464" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1405,8 +1379,6 @@
<item id="38466" name="Agathion - Radiant Taurus" type="Armor">
<!-- Summons Taurus. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38465" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1435,8 +1407,6 @@
<item id="38467" name="Agathion - Taurus" type="Armor">
<!-- Summons Taurus. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38466" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1464,8 +1434,6 @@
<item id="38468" name="Agathion - Faint Taurus" type="Armor">
<!-- Summons Taurus. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38467" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1520,8 +1488,6 @@
<item id="38470" name="Agathion - Twinkling Leo" type="Armor">
<!-- Summons Leo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38469" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1550,8 +1516,6 @@
<item id="38471" name="Agathion - Radiant Leo" type="Armor">
<!-- Summons Leo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38470" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1580,8 +1544,6 @@
<item id="38472" name="Agathion - Leo" type="Armor">
<!-- Summons Leo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38471" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1609,8 +1571,6 @@
<item id="38473" name="Agathion - Faint Leo" type="Armor">
<!-- Summons Leo. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38472" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
@@ -1666,8 +1626,6 @@
<item id="38475" name="Agathion - Twinkling Gemini" type="Armor">
<!-- Summons Gemini. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38474" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1696,8 +1654,6 @@
<item id="38476" name="Agathion - Radiant Gemini" type="Armor">
<!-- Summons Gemini. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38475" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1726,8 +1682,6 @@
<item id="38477" name="Agathion - Gemini" type="Armor">
<!-- Summons Gemini. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38476" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1755,8 +1709,6 @@
<item id="38478" name="Agathion - Faint Gemini" type="Armor">
<!-- Summons Gemini. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38477" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1811,8 +1763,6 @@
<item id="38480" name="Agathion - Twinkling Scorpio" type="Armor">
<!-- Summons Scorpio. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38479" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1841,8 +1791,6 @@
<item id="38481" name="Agathion - Radiant Scorpio" type="Armor">
<!-- Summons Scorpio. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38480" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1871,8 +1819,6 @@
<item id="38482" name="Agathion - Scorpio" type="Armor">
<!-- Summons Scorpio. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38481" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1900,8 +1846,6 @@
<item id="38483" name="Agathion - Faint Scorpio" type="Armor">
<!-- Summons Scorpio. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38482" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1956,8 +1900,6 @@
<item id="38485" name="Agathion - Twinkling Aquarius" type="Armor">
<!-- Summons Aquarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38484" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -1986,8 +1928,6 @@
<item id="38486" name="Agathion - Radiant Aquarius" type="Armor">
<!-- Summons Aquarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38485" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2016,8 +1956,6 @@
<item id="38487" name="Agathion - Aquarius" type="Armor">
<!-- Summons Aquarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38486" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2045,8 +1983,6 @@
<item id="38488" name="Agathion - Faint Aquarius" type="Armor">
<!-- Summons Aquarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38487" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2101,8 +2037,6 @@
<item id="38490" name="Agathion - Twinkling Pisces" type="Armor">
<!-- Summons Pisces. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38489" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2131,8 +2065,6 @@
<item id="38491" name="Agathion - Radiant Pisces" type="Armor">
<!-- Summons Pisces. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38490" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2161,8 +2093,6 @@
<item id="38492" name="Agathion - Pisces" type="Armor">
<!-- Summons Pisces. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38491" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2190,8 +2120,6 @@
<item id="38493" name="Agathion - Faint Pisces" type="Armor">
<!-- Summons Pisces. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38492" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2246,8 +2174,6 @@
<item id="38495" name="Agathion - Twinkling Sagittarius" type="Armor">
<!-- Summons Sagittarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38494" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2276,8 +2202,6 @@
<item id="38496" name="Agathion - Radiant Sagittarius" type="Armor">
<!-- Summons Sagittarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38495" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -2306,8 +2230,6 @@
<item id="38497" name="Agathion - Sagittarius" type="Armor">
<!-- Summons Sagittarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38496" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
@@ -2336,8 +2258,6 @@
<item id="38498" name="Agathion - Faint Sagittarius" type="Armor">
<!-- Summons Sagittarius. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38497" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />

View File

@@ -3,8 +3,6 @@
<item id="38500" name="Agathion - Twinkling Cancer" type="Armor">
<!-- Summons Cancer. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Atk.: Fire/ Water/ Earth/ Wind/ Dark/ Holy Atk. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38499" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -33,8 +31,6 @@
<item id="38501" name="Agathion - Radiant Cancer" type="Armor">
<!-- Summons Cancer. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine.(Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. 2. Attribute Resistance: Fire/ Water/ Earth/ Wind/ Dark/ Holy Def. each increases by 30. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38500" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -63,8 +59,6 @@
<item id="38502" name="Agathion - Cancer" type="Armor">
<!-- Summons Cancer. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.). <Item Skill>. 1. Balanced Power: STR/INT/CON/DEX/WIT/MEN increases by 1. -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38501" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />
@@ -92,8 +86,6 @@
<item id="38503" name="Agathion - Faint Cancer" type="Armor">
<!-- Summons Cancer. <Active Skill>. 1. Agathion Teleport: Town of Aden/Town of Rune/Town of Giran/Heine. (Cooldown is 30min.) -->
<set name="icon" val="icon.agathion_magmeld_teleport" />
<set name="compoundItem" val="38502" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" />

View File

@@ -1503,8 +1503,6 @@
<item id="38850" name="Topaz" additionalName="Lv. 1" type="Armor">
<!-- Disrupts the target's skill casting when used. When used on a PC, inflicts damage with 1062 power. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_topaz_i00" />
<set name="compoundItem" val="38851" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1522,8 +1520,6 @@
<item id="38851" name="Topaz" additionalName="Lv. 2" type="Armor">
<!-- Disrupts the target's skill casting when used. When used on a PC, inflicts damage with 3717 power. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_topaz_i00" />
<set name="compoundItem" val="38852" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1541,8 +1537,6 @@
<item id="38852" name="Topaz" additionalName="Lv. 3" type="Armor">
<!-- Disrupts the target's skill casting when used. When used on a PC, inflicts damage with 6903 power. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_topaz_i00" />
<set name="compoundItem" val="38853" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1560,8 +1554,6 @@
<item id="38853" name="Topaz" additionalName="Lv. 4" type="Armor">
<!-- Disrupts the target's skill casting when used. When used on a PC, inflicts damage with 10089 power. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_topaz_i00" />
<set name="compoundItem" val="38854" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1591,8 +1583,6 @@
<item id="38855" name="Ruby" additionalName="Lv. 1" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 1%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38856" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1610,8 +1600,6 @@
<item id="38856" name="Ruby" additionalName="Lv. 2" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38857" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1629,8 +1617,6 @@
<item id="38857" name="Ruby" additionalName="Lv. 3" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38858" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1648,8 +1634,6 @@
<item id="38858" name="Ruby" additionalName="Lv. 4" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38859" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1667,8 +1651,6 @@
<item id="38859" name="Ruby" additionalName="Lv. 5" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="47688" />
<set name="compoundChance" val="100" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1683,8 +1665,6 @@
<item id="38860" name="Emergency Recovery Jewel Lv. 1" type="Armor">
<!-- Recovers 1500 HP/CP. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38861" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="is_sellable" val="false" />
@@ -1697,8 +1677,6 @@
<item id="38861" name="Emergency Recovery Jewel Lv. 2" type="Armor">
<!-- Recovers 3000 HP/CP. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38862" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1711,8 +1689,6 @@
<item id="38862" name="Emergency Recovery Jewel Lv. 3" type="Armor">
<!-- Recovers 6000 HP/CP. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38863" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1725,8 +1701,6 @@
<item id="38863" name="Emergency Recovery Jewel Lv. 4" type="Armor">
<!-- Recovers 8000 HP/CP. -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="compoundItem" val="38864" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1751,8 +1725,6 @@
<item id="38865" name="Heal Boost Jewel Lv. 1" type="Armor">
<!-- Received Heal Amount + 3%. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38866" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1765,8 +1737,6 @@
<item id="38866" name="Heal Boost Jewel Lv. 2" type="Armor">
<!-- Received Heal Amount + 6%. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38867" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1779,8 +1749,6 @@
<item id="38867" name="Heal Boost Jewel Lv. 3" type="Armor">
<!-- Received Heal Amount + 9%. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38868" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1793,8 +1761,6 @@
<item id="38868" name="Heal Boost Jewel Lv. 4" type="Armor">
<!-- Received Heal Amount + 13%. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38869" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1819,8 +1785,6 @@
<item id="38870" name="Obsidian" additionalName="Lv. 1" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 1%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="compoundItem" val="38871" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1838,8 +1802,6 @@
<item id="38871" name="Obsidian" additionalName="Lv. 2" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 3%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="compoundItem" val="38872" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1857,8 +1819,6 @@
<item id="38872" name="Obsidian" additionalName="Lv. 3" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 7%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="compoundItem" val="38873" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1876,8 +1836,6 @@
<item id="38873" name="Obsidian" additionalName="Lv. 4" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 11%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="compoundItem" val="38874" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1909,8 +1867,6 @@
<item id="38875" name="Opal" additionalName="Lv. 1" type="Armor">
<!-- When equipped, the weapon attribute increases by 10. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="compoundItem" val="38876" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1928,8 +1884,6 @@
<item id="38876" name="Opal" additionalName="Lv. 2" type="Armor">
<!-- When equipped, the weapon attribute increases by 20. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="compoundItem" val="38877" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1947,8 +1901,6 @@
<item id="38877" name="Opal" additionalName="Lv. 3" type="Armor">
<!-- When equipped, the weapon attribute increases by 40. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="compoundItem" val="38878" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1966,8 +1918,6 @@
<item id="38878" name="Opal" additionalName="Lv. 4" type="Armor">
<!-- When equipped, the weapon attribute increases by 70. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="compoundItem" val="38879" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -1999,8 +1949,6 @@
<item id="38880" name="Emerald" additionalName="Lv. 1" type="Armor">
<!-- When equipped, CON + 1 and MEN + 1. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="compoundItem" val="38881" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2018,8 +1966,6 @@
<item id="38881" name="Emerald" additionalName="Lv. 2" type="Armor">
<!-- When equipped, STR + 1, CON + 1, INT + 1, and MEN + 1. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="compoundItem" val="38882" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2038,8 +1984,6 @@
<item id="38882" name="Emerald" additionalName="Lv. 3" type="Armor">
<!-- When equipped, STR + 1, DEX + 1, CON + 1, INT + 1, WIT + 1, and MEN + 1. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="compoundItem" val="38883" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2058,8 +2002,6 @@
<item id="38883" name="Emerald" additionalName="Lv. 4" type="Armor">
<!-- When equipped, STR + 2, DEX + 2, CON + 2, INT + 2, WIT + 2, and MEN + 2. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="compoundItem" val="38884" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2092,8 +2034,6 @@
<item id="38885" name="Aquamarine" additionalName="Lv. 1" type="Armor">
<!-- When using a skill after equipping, there is a 1% chance of recovering 136 MP. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="compoundItem" val="38886" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2112,8 +2052,6 @@
<item id="38886" name="Aquamarine" additionalName="Lv. 2" type="Armor">
<!-- When using a skill after equipping, there is a 2% chance of recovering 136 MP. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="compoundItem" val="38887" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2132,8 +2070,6 @@
<item id="38887" name="Aquamarine" additionalName="Lv. 3" type="Armor">
<!-- When using a skill after equipping, there is a 4% chance of recovering 136 MP. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="compoundItem" val="38888" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2152,8 +2088,6 @@
<item id="38888" name="Aquamarine" additionalName="Lv. 4" type="Armor">
<!-- When using a skill after equipping, there is a 9% chance of recovering 136 MP. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="compoundItem" val="38889" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2186,8 +2120,6 @@
<item id="38890" name="Diamond" additionalName="Lv. 1" type="Armor">
<!-- When equipped, P. Def. Increases by 283 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="compoundItem" val="38891" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2206,8 +2138,6 @@
<item id="38891" name="Diamond" additionalName="Lv. 2" type="Armor">
<!-- When equipped, P. Def. Increases by 567 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="compoundItem" val="38892" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2226,8 +2156,6 @@
<item id="38892" name="Diamond" additionalName="Lv. 3" type="Armor">
<!-- When equipped, P. Def. Increases by 945 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="compoundItem" val="38893" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2246,8 +2174,6 @@
<item id="38893" name="Diamond" additionalName="Lv. 4" type="Armor">
<!-- When equipped, P. Def. Increases by 1418 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="compoundItem" val="38894" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2280,8 +2206,6 @@
<item id="38895" name="Pearl" additionalName="Lv. 1" type="Armor">
<!-- When equipped, M. Def. Increases by 163 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="compoundItem" val="38896" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2300,8 +2224,6 @@
<item id="38896" name="Pearl" additionalName="Lv. 2" type="Armor">
<!-- When equipped, M. Def. Increases by 328 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="compoundItem" val="38897" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2320,8 +2242,6 @@
<item id="38897" name="Pearl" additionalName="Lv. 3" type="Armor">
<!-- When equipped, M. Def. Increases by 548 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="compoundItem" val="38898" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -2340,8 +2260,6 @@
<item id="38898" name="Pearl" additionalName="Lv. 4" type="Armor">
<!-- When equipped, M. Def. Increases by 821 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="compoundItem" val="38899" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />

View File

@@ -231,8 +231,6 @@
<item id="38927" name="Sapphire" additionalName="Lv. 1" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 1%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38928" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -252,8 +250,6 @@
<item id="38928" name="Sapphire" additionalName="Lv. 2" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38929" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -273,8 +269,6 @@
<item id="38929" name="Sapphire" additionalName="Lv. 3" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38930" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
@@ -293,8 +287,6 @@
<item id="38930" name="Sapphire" additionalName="Lv. 4" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="compoundItem" val="38931" />
<set name="compoundChance" val="33" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />

View File

@@ -921,8 +921,6 @@
<item id="39634" name="Venir's Talisman" additionalName="Stage 1" type="Armor">
<!-- MEN + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39635" />
<set name="compoundChance" val="71" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -941,8 +939,6 @@
<item id="39635" name="Venir's Talisman" additionalName="Stage 2" type="Armor">
<!-- MEN/WIT + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39636" />
<set name="compoundChance" val="68" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -960,8 +956,6 @@
<item id="39636" name="Venir's Talisman" additionalName="Stage 3" type="Armor">
<!-- MEN/WIT/CON + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39637" />
<set name="compoundChance" val="65" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -979,8 +973,6 @@
<item id="39637" name="Venir's Talisman" additionalName="Stage 4" type="Armor">
<!-- MEN/WIT/CON/INT + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39638" />
<set name="compoundChance" val="62" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -998,8 +990,6 @@
<item id="39638" name="Venir's Talisman" additionalName="Stage 5" type="Armor">
<!-- MEN/WIT/CON/INT/DEX + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39639" />
<set name="compoundChance" val="59" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1017,8 +1007,6 @@
<item id="39639" name="Venir's Talisman" additionalName="Stage 6" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39640" />
<set name="compoundChance" val="56" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1036,8 +1024,6 @@
<item id="39640" name="Venir's Talisman" additionalName="Stage 7" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR/LUC + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39641" />
<set name="compoundChance" val="53" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1055,8 +1041,6 @@
<item id="39641" name="Venir's Talisman" additionalName="Stage 8" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR/LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39642" />
<set name="compoundChance" val="50" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1074,8 +1058,6 @@
<item id="39642" name="Venir's Talisman" additionalName="Stage 9" type="Armor">
<!-- MEN + 2, WIT/CON/INT/DEX/STR/LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39643" />
<set name="compoundChance" val="47" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1093,8 +1075,6 @@
<item id="39643" name="Venir's Talisman" additionalName="Stage 10" type="Armor">
<!-- MEN/WIT + 2, CON/INT/DEX/STR/LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39644" />
<set name="compoundChance" val="44" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1112,8 +1092,6 @@
<item id="39644" name="Venir's Talisman" additionalName="Stage 11" type="Armor">
<!-- MEN/WIT/CON + 2, INT/DEX/STR/LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39645" />
<set name="compoundChance" val="41" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1131,8 +1109,6 @@
<item id="39645" name="Venir's Talisman" additionalName="Stage 12" type="Armor">
<!-- MEN/WIT/CON/INT + 2, DEX/STR/LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39646" />
<set name="compoundChance" val="38" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1150,8 +1126,6 @@
<item id="39646" name="Venir's Talisman" additionalName="Stage 13" type="Armor">
<!-- MEN/WIT/CON/INT/DEX + 2, STR/LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39647" />
<set name="compoundChance" val="35" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1169,8 +1143,6 @@
<item id="39647" name="Venir's Talisman" additionalName="Stage 14" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR+ 2, LUC/CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39648" />
<set name="compoundChance" val="32" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1187,8 +1159,6 @@
<item id="39648" name="Venir's Talisman" additionalName="Stage 15" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR/LUC + 2, CHA + 1. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39649" />
<set name="compoundChance" val="29" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1205,8 +1175,6 @@
<item id="39649" name="Venir's Talisman" additionalName="Stage 16" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR/LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39650" />
<set name="compoundChance" val="26" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1223,8 +1191,6 @@
<item id="39650" name="Venir's Talisman" additionalName="Stage 17" type="Armor">
<!-- MEN + 3, WIT/CON/INT/DEX/STR/LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39651" />
<set name="compoundChance" val="23" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1241,8 +1207,6 @@
<item id="39651" name="Venir's Talisman" additionalName="Stage 18" type="Armor">
<!-- MEN/WIT + 3, CON/INT/DEX/STR/LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39652" />
<set name="compoundChance" val="20" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1259,8 +1223,6 @@
<item id="39652" name="Venir's Talisman" additionalName="Stage 19" type="Armor">
<!-- MEN/WIT/CON + 3, INT/DEX/STR/LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39653" />
<set name="compoundChance" val="17" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1277,8 +1239,6 @@
<item id="39653" name="Venir's Talisman" additionalName="Stage 20" type="Armor">
<!-- MEN/WIT/CON/INT + 3, DEX/STR/LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39654" />
<set name="compoundChance" val="14" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1295,8 +1255,6 @@
<item id="39654" name="Venir's Talisman" additionalName="Stage 21" type="Armor">
<!-- MEN/WIT/CON/INT/DEX + 3, STR/LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39655" />
<set name="compoundChance" val="11" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1313,8 +1271,6 @@
<item id="39655" name="Venir's Talisman" additionalName="Stage 22" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR + 3, LUC/CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39656" />
<set name="compoundChance" val="8" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />
@@ -1331,8 +1287,6 @@
<item id="39656" name="Venir's Talisman" additionalName="Stage 23" type="Armor">
<!-- MEN/WIT/CON/INT/DEX/STR/LUC + 3, CHA + 2. Equipping 2 or more Venir's Talismans gives the effect of the highest-level talisman. -->
<set name="icon" val="BranchIcon.Icon.etc_allstat_talisman_i02" />
<set name="compoundItem" val="39657" />
<set name="compoundChance" val="5" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="deco1" />
<set name="weight" val="150" />

View File

@@ -0,0 +1,24 @@
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="list">
<xs:complexType>
<xs:sequence>
<xs:element name="item" maxOccurs="unbounded" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="reward" maxOccurs="unbounded" minOccurs="0">
<xs:complexType>
<xs:attribute type="xs:int" name="id" use="required" />
<xs:attribute type="xs:short" name="count" use="required" />
<xs:attribute type="xs:string" name="type" use="required" />
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute type="xs:int" name="one" use="required" />
<xs:attribute type="xs:int" name="two" use="required" />
<xs:attribute type="xs:byte" name="chance" use="required" />
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>

View File

@@ -134,8 +134,6 @@
<xs:enumeration value="weapon_type" />
<xs:enumeration value="weight" />
<xs:enumeration value="commissionItemType" />
<xs:enumeration value="compoundItem" />
<xs:enumeration value="compoundChance" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>

View File

@@ -21,12 +21,15 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.ByteBuffer;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.StringJoiner;
import java.util.StringTokenizer;
@@ -573,4 +576,15 @@ public final class CommonUtil
}
return sj.toString();
}
/**
* @param val
* @param format
* @return
*/
public static String formatDouble(double val, String format)
{
final DecimalFormat formatter = new DecimalFormat(format, new DecimalFormatSymbols(Locale.ENGLISH));
return formatter.format(val);
}
}

View File

@@ -50,6 +50,7 @@ import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
import com.l2jmobius.gameserver.data.xml.impl.ClanRewardData;
import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.data.xml.impl.CubicData;
import com.l2jmobius.gameserver.data.xml.impl.DoorData;
import com.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
@@ -203,6 +204,7 @@ public class GameServer
CategoryData.getInstance();
SecondaryAuthData.getInstance();
AbilityPointsData.getInstance();
CombinationItemsData.getInstance();
SayuneData.getInstance();
ClanRewardData.getInstance();

View File

@@ -0,0 +1,111 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.data.xml.impl;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.w3c.dom.Document;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
import com.l2jmobius.gameserver.model.items.combination.CombinationItemReward;
import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
/**
* @author UnAfraid
*/
public class CombinationItemsData implements IGameXmlReader
{
private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
private final List<CombinationItem> _items = new ArrayList<>();
protected CombinationItemsData()
{
load();
}
@Override
public synchronized void load()
{
_items.clear();
parseDatapackFile("data/CombinationItems.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _items.size() + " combinations.");
}
@Override
public void parseDocument(Document doc, File f)
{
forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode ->
{
final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode)));
forEach(itemNode, "reward", rewardNode ->
{
final int id = parseInteger(rewardNode.getAttributes(), "id");
final int count = parseInteger(rewardNode.getAttributes(), "count", 1);
final CombinationItemType type = parseEnum(rewardNode.getAttributes(), CombinationItemType.class, "type");
item.addReward(new CombinationItemReward(id, count, type));
if (ItemTable.getInstance().getTemplate(id) == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not find item with id " + id);
}
});
_items.add(item);
}));
}
public int getLoadedElementsCount()
{
return _items.size();
}
public List<CombinationItem> getItems()
{
return _items;
}
public CombinationItem getItemsBySlots(int firstSlot, int secondSlot)
{
return _items.stream().filter(item -> (item.getItemOne() == firstSlot) && (item.getItemTwo() == secondSlot)).findFirst().orElse(null);
}
public List<CombinationItem> getItemsByFirstSlot(int id)
{
return _items.stream().filter(item -> item.getItemOne() == id).collect(Collectors.toList());
}
public List<CombinationItem> getItemsBySecondSlot(int id)
{
return _items.stream().filter(item -> item.getItemTwo() == id).collect(Collectors.toList());
}
public static final CombinationItemsData getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final CombinationItemsData INSTANCE = new CombinationItemsData();
}
}

View File

@@ -170,8 +170,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
private int _sharedReuseGroup;
private CommissionItemType _commissionItemType;
private int _compoundItem;
private float _compoundChance;
private boolean _isAppearanceable;
private boolean _isBlessed;
@@ -230,8 +228,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
_reuseDelay = set.getInt("reuse_delay", 0);
_sharedReuseGroup = set.getInt("shared_reuse_group", 0);
_commissionItemType = set.getEnum("commissionItemType", CommissionItemType.class, CommissionItemType.OTHER_ITEM);
_compoundItem = set.getInt("compoundItem", 0);
_compoundChance = set.getFloat("compoundChance", 0);
_common = ((_itemId >= 11605) && (_itemId <= 12361));
_heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842);
_pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024)) || ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220));
@@ -961,16 +957,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
return _commissionItemType;
}
public int getCompoundItem()
{
return _compoundItem;
}
public float getCompoundChance()
{
return _compoundChance;
}
/**
* Usable in HTML windows.
* @return the icon link in client files

View File

@@ -0,0 +1,65 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.model.items.combination;
import java.util.EnumMap;
import java.util.Map;
import com.l2jmobius.gameserver.model.StatsSet;
/**
* @author UnAfraid
*/
public class CombinationItem
{
private final int _itemOne;
private final int _itemTwo;
private final int _chance;
private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class);
public CombinationItem(StatsSet set)
{
_itemOne = set.getInt("one");
_itemTwo = set.getInt("two");
_chance = set.getInt("chance");
}
public int getItemOne()
{
return _itemOne;
}
public int getItemTwo()
{
return _itemTwo;
}
public int getChance()
{
return _chance;
}
public void addReward(CombinationItemReward item)
{
_rewards.put(item.getType(), item);
}
public CombinationItemReward getReward(CombinationItemType type)
{
return _rewards.get(type);
}
}

View File

@@ -0,0 +1,38 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.model.items.combination;
import com.l2jmobius.gameserver.model.holders.ItemHolder;
/**
* @author UnAfraid
*/
public class CombinationItemReward extends ItemHolder
{
private final CombinationItemType _type;
public CombinationItemReward(int id, int count, CombinationItemType type)
{
super(id, count);
_type = type;
}
public CombinationItemType getType()
{
return _type;
}
}

View File

@@ -0,0 +1,26 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jmobius.gameserver.model.items.combination;
/**
* @author UnAfraid
*/
public enum CombinationItemType
{
ON_SUCCESS,
ON_FAILURE;
}

View File

@@ -16,9 +16,13 @@
*/
package com.l2jmobius.gameserver.network.clientpackets.compound;
import java.util.List;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -78,8 +82,10 @@ public class RequestNewEnchantPushOne implements IClientIncomingPacket
return;
}
final List<CombinationItem> combinationItems = CombinationItemsData.getInstance().getItemsByFirstSlot(itemOne.getId());
// Not implemented or not able to merge!
if ((itemOne.getItem().getCompoundItem() == 0) || (itemOne.getItem().getCompoundChance() == 0))
if (combinationItems.isEmpty())
{
client.sendPacket(ExEnchantOneFail.STATIC_PACKET);
activeChar.removeRequest(request.getClass());

View File

@@ -17,8 +17,10 @@
package com.l2jmobius.gameserver.network.clientpackets.compound;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -86,15 +88,10 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return;
}
// Combining only same items!
if (itemOne.getItem().getId() != itemTwo.getItem().getId())
{
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;
}
final CombinationItem combinationItem = CombinationItemsData.getInstance().getItemsBySlots(itemOne.getId(), itemTwo.getId());
// Not implemented or not able to merge!
if ((itemOne.getItem().getCompoundItem() == 0) || (itemOne.getItem().getCompoundChance() == 0))
if (combinationItem == null)
{
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return;

View File

@@ -18,8 +18,12 @@ package com.l2jmobius.gameserver.network.clientpackets.compound;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
import com.l2jmobius.gameserver.model.items.combination.CombinationItemReward;
import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -82,50 +86,39 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
// Lets prevent using same item twice
if (itemOne.getObjectId() == itemTwo.getObjectId())
{
client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
activeChar.removeRequest(request.getClass());
return;
}
// Combining only same items!
if (itemOne.getItem().getId() != itemTwo.getItem().getId())
{
client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
activeChar.removeRequest(request.getClass());
return;
}
final CombinationItem combinationItem = CombinationItemsData.getInstance().getItemsBySlots(itemOne.getId(), itemTwo.getId());
// Not implemented or not able to merge!
if ((itemOne.getItem().getCompoundItem() == 0) || (itemOne.getItem().getCompoundChance() == 0))
if (combinationItem == null)
{
client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
activeChar.removeRequest(request.getClass());
return;
}
final InventoryUpdate iu = new InventoryUpdate();
final double random = Rnd.nextDouble() * 100;
iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo);
// Success
if (random < itemOne.getItem().getCompoundChance())
if (activeChar.destroyItem("Compound-Item-One", itemOne, 1, null, true) && activeChar.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{
iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo);
final double random = (Rnd.nextDouble() * 100);
final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
final L2ItemInstance item = activeChar.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
if (activeChar.destroyItem("Compound-Item-One", itemOne, null, true) && activeChar.destroyItem("Compound-Item-Two", itemTwo, null, true))
if (success)
{
final L2ItemInstance item = activeChar.addItem("Compound-Result", itemOne.getItem().getCompoundItem(), 1, null, true);
client.sendPacket(new ExEnchantSucess(item.getItem().getId()));
client.sendPacket(new ExEnchantSucess(item.getId()));
}
}
else
{
iu.addRemovedItem(itemTwo);
// Upon fail we destroy the second item.
if (activeChar.destroyItem("Compound-Item-Two-Fail", itemTwo, null, true))
else
{
client.sendPacket(new ExEnchantFail(itemOne.getItem().getId(), itemTwo.getItem().getId()));
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
}