Various improvements.

Contributed by Liamxroy.
This commit is contained in:
MobiusDev
2019-03-07 00:57:02 +00:00
parent 58aa93d703
commit f61b0831a2
69 changed files with 1611 additions and 96 deletions

View File

@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
<!-- Scrolls: Enchant Hair's -->
<enchant id="33818" />
<enchant id="34940" />
<enchant id="36978" />
<enchant id="33818" maxEnchant="10" />
<enchant id="34940" maxEnchant="10" />
<enchant id="36978" maxEnchant="10" />
<!-- Heavenly Enchant Scroll: Weapon -->
<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
<!-- Heavenly Enchant Scroll: Armor -->
<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
<!-- Scroll: Enchant Shadow Weapon -->
<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -183,6 +187,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
</enchant>
<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -194,6 +199,13 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
</enchant>
<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
<enchant id="21707" maxEnchant="10">
<item id="21580" /> <!-- Olf's T-shirt -->
<item id="21706" /> <!-- Olf's T-shirt (Event) -->
</enchant>
<!-- Event - Herdsman's Love Scroll Event -->
@@ -461,6 +473,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
<item id="34732" /> <!-- Exchanged Power Shirt -->
<item id="34770" /> <!-- Pa'agrio's Shirt -->
<item id="34771" /> <!-- Sayha's Shirt -->
@@ -486,6 +499,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
<item id="34732" /> <!-- Exchanged Power Shirt -->
<item id="34770" /> <!-- Pa'agrio's Shirt -->
<item id="34771" /> <!-- Sayha's Shirt -->
@@ -511,6 +525,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
<item id="34732" /> <!-- Exchanged Power Shirt -->
<item id="34770" /> <!-- Pa'agrio's Shirt -->
<item id="34771" /> <!-- Sayha's Shirt -->
@@ -536,6 +551,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
<item id="34732" /> <!-- Exchanged Power Shirt -->
<item id="34770" /> <!-- Pa'agrio's Shirt -->
<item id="34771" /> <!-- Sayha's Shirt -->
@@ -561,6 +577,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
<item id="34732" /> <!-- Exchanged Power Shirt -->
<item id="34770" /> <!-- Pa'agrio's Shirt -->
<item id="34771" /> <!-- Sayha's Shirt -->
@@ -586,6 +603,7 @@
<item id="34624" /> <!-- Sayha's Shirt -->
<item id="34625" /> <!-- Eva's Shirt -->
<item id="34626" /> <!-- Maphr's Shirt -->
<item id="23307" /> <!-- Maphr's Shirt -->
<item id="34732" /> <!-- Exchanged Power Shirt -->
<item id="34770" /> <!-- Pa'agrio's Shirt -->
<item id="34771" /> <!-- Sayha's Shirt -->

View File

@@ -301,8 +301,6 @@
<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->

View File

@@ -6091,6 +6091,11 @@
<item id="19590" /> <!-- Bound Immortal Boots -->
<item id="19654" /> <!-- Blessed Immortal Boots -->
<item id="33955" /> <!-- Immortal Boots -->
<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
</requiredItems>
<skills>
<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6125,6 +6130,11 @@
<item id="19596" /> <!-- Bound Immortal Leather Boots -->
<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
<item id="33961" /> <!-- Immortal Leather Boots -->
<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
</requiredItems>
<skills>
<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6158,6 +6168,11 @@
<item id="19601" /> <!-- Bound Immortal Shoes -->
<item id="19665" /> <!-- Blessed Immortal Shoes -->
<item id="33966" /> <!-- Immortal Shoes -->
<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
</requiredItems>
<skills>
<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->

View File

@@ -187,10 +187,8 @@
<set name="immediate_effect" val="true" />
<set name="commissionItemType" val="POTION" />
<skills>
<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
</skills>

View File

@@ -1116,11 +1116,10 @@
<set name="immediate_effect" val="true" />
<set name="is_stackable" val="true" />
<skills>
<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
</skills>
</item>
<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">

View File

@@ -1508,10 +1508,8 @@
<set name="is_stackable" val="true" />
<skills>
<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
</skills>
</item>

View File

@@ -452,7 +452,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
</skills>
</item>
<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
<!-- INT + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -465,7 +472,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
</skills>
</item>
<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
<!-- DEX + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -478,7 +492,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
</skills>
</item>
<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
<!-- WIT + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -491,7 +512,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
</skills>
</item>
<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
<!-- CON + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -504,7 +532,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
</skills>
</item>
<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
<!-- MEN + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -517,7 +552,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
</skills>
</item>
<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
<!-- Atk. Attribute + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -530,7 +572,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
</skills>
</item>
<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
<!-- Fire Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
</skills>
</item>
<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
<!-- Water Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
</skills>
</item>
<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
<!-- Wind Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
</skills>
</item>
<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
<!-- Earth Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
</skills>
</item>
<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
<!-- Holy Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
</skills>
</item>
<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
<!-- Dark Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="bodypart" val="deco1" />
<set name="useSkillDisTime" val="6" />
<set name="equip_reuse_delay" val="30" />
<set name="immediate_effect" val="true" />
<set name="weight" val="150" />
<skills>
<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
</skills>
</item>
<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->

View File

@@ -19,7 +19,7 @@
<height normal="23" />
</collision>
</npc>
<npc id="32293" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
<npc id="34332" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<race>ETC</race>
<sex>FEMALE</sex>