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

Shiny Elemental, Reflect and Magic shirts.

Browse Source 
Contributed by zoiobnu.
This commit is contained in:
MobiusDev 2016-02-08 21:51:50 +00:00
parent 710c8ebd6b
commit e11c87d751
11 changed files with 599 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
trunk/dist/game/data/enchantItemOptions.xml vendored
View File

@ -1126,6 +1126,97 @@
<options level="9" option1="24974" option2="24980" option3="24983" /> <options level="9" option1="24974" option2="24980" option3="24983" />
<options level="10" option1="24984" option2="24985" option3="24983" /> <options level="10" option1="24984" option2="24985" option3="24983" />
</item> </item>
<item id="37718"> <!-- Shiny Elemental Shirt -->
<options level="0" option1="30299" />
<options level="1" option1="30300" />
<options level="2" option1="30301" />
<options level="3" option1="30302" />
<options level="4" option1="30303" />
<options level="5" option1="30304" />
<options level="6" option1="30305" option2="30310" />
<options level="7" option1="30306" option2="30311" />
<options level="8" option1="30307" option2="30312" />
<options level="9" option1="30308" option2="30313" />
<options level="10" option1="30309" option2="30314" />
</item>
<item id="23240"> <!-- Pa'agrio Shirt -->
<options level="0" option1="30227" />
<options level="1" option1="30228" />
<options level="2" option1="30229" />
<options level="3" option1="30230" />
<options level="4" option1="30231" />
<options level="5" option1="30232" />
<options level="6" option1="30233" />
<options level="7" option1="30234" option2="30238" />
<options level="8" option1="30235" option2="30239" />
<options level="9" option1="30236" option2="30238" />
<options level="10" option1="30237" option2="30239" />
</item>
<item id="23301"> <!-- Sayha Shirt -->
<options level="0" option1="30227" />
<options level="1" option1="30228" />
<options level="2" option1="30229" />
<options level="3" option1="30230" />
<options level="4" option1="30231" />
<options level="5" option1="30232" />
<options level="6" option1="30233" />
<options level="7" option1="30234" option2="30240" option3="30240" />
<options level="8" option1="30235" option2="30240" option3="30240" />
<options level="9" option1="30236" option2="30241" option3="30241" />
<options level="10" option1="30237" option2="30241" option3="30241" />
</item>
<item id="23304"> <!-- Eva's Shirt -->
<options level="0" option1="30227" />
<options level="1" option1="30228" />
<options level="2" option1="30229" />
<options level="3" option1="30230" />
<options level="4" option1="30231" />
<options level="5" option1="30232" />
<options level="6" option1="30233" />
<options level="7" option1="30234" option2="30243" />
<options level="8" option1="30235" option2="30243" />
<options level="9" option1="30236" option2="30244" />
<options level="10" option1="30237" option2="30244" />
</item>
<item id="23307"> <!-- Maphr Shirt -->
<options level="0" option1="30227" />
<options level="1" option1="30228" />
<options level="2" option1="30229" />
<options level="3" option1="30230" />
<options level="4" option1="30231" />
<options level="5" option1="30232" />
<options level="6" option1="30233" />
<options level="7" option1="30234" option2="30245" />
<options level="8" option1="30235" option2="30245" />
<options level="9" option1="30236" option2="30246" />
<options level="10" option1="30237" option2="30246" />
</item>
<item id="46193"> <!-- Physycal Reflect Shirt -->
<options level="0" option1="32839" />
<options level="1" option1="32840" />
<options level="2" option1="32841" />
<options level="3" option1="32842" />
<options level="4" option1="32843" />
<options level="5" option1="32844" />
<options level="6" option1="32845" />
<options level="7" option1="32846" />
<options level="8" option1="32847" />
<options level="9" option1="32848" />
<options level="10" option1="32849" />
</item>
<item id="46194"> <!-- Magical Reflect Shirt -->
<options level="0" option1="32850" />
<options level="1" option1="32851" />
<options level="2" option1="32852" />
<options level="3" option1="32853" />
<options level="4" option1="32854" />
<options level="5" option1="32855" />
<options level="6" option1="32856" />
<options level="7" option1="32857" />
<options level="8" option1="32858" />
<options level="9" option1="32859" />
<options level="10" option1="32860" />
</item>
<item id="21706"> <!-- Power Shirt (Event) --> <item id="21706"> <!-- Power Shirt (Event) -->
<options level="0" option1="24965" /> <options level="0" option1="24965" />
<options level="1" option1="24966" /> <options level="1" option1="24966" />

1
trunk/dist/game/data/stats/items/37700-37799.xml vendored
View File

@ -243,6 +243,7 @@
<set name="icon" val="icon.ainhasard_shirt" /> <set name="icon" val="icon.ainhasard_shirt" />
<set name="bodypart" val="shirt" /> <set name="bodypart" val="shirt" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="enchant_enabled" val="2" />
<set name="is_auctionable" val="false" /> <set name="is_auctionable" val="false" />
<set name="is_depositable" val="false" /> <set name="is_depositable" val="false" />
<set name="is_dropable" val="false" /> <set name="is_dropable" val="false" />

28
trunk/dist/game/data/stats/items/46100-46199.xml vendored
View File

@ -1100,6 +1100,34 @@
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="material" val="LEATHER" /> <set name="material" val="LEATHER" />
</item> </item>
<item id="46193" name="Physical Reflect Shirt" type="Armor">
<!-- Sparkly magic shirt containing Einhasad's energy.. It can be enchanted up to +10 using Enchant Scroll: Elemental Shirt. When enchanted to +4 or more, passive and stats are increased. When enchanted to +6 or more, various use skills are bestowed . -->
<set name="icon" val="icon.ainhasard_shirt" />
<set name="bodypart" val="shirt" />
<set name="default_action" val="EQUIP" />
<set name="enchant_enabled" val="4" />
<set name="is_auctionable" val="false" />
<set name="is_depositable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_tradable" val="false" />
<set name="material" val="CRYSTAL" />
<set name="weight" val="130" />
</item>
<item id="46194" name="Magical Reflect Shirt" type="Armor">
<!-- Sparkly magic shirt containing Einhasad's energy.. It can be enchanted up to +10 using Enchant Scroll: Elemental Shirt. When enchanted to +4 or more, passive and stats are increased. When enchanted to +6 or more, various use skills are bestowed . -->
<set name="icon" val="icon.ainhasard_shirt" />
<set name="bodypart" val="shirt" />
<set name="default_action" val="EQUIP" />
<set name="enchant_enabled" val="4" />
<set name="is_auctionable" val="false" />
<set name="is_depositable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_tradable" val="false" />
<set name="material" val="CRYSTAL" />
<set name="weight" val="130" />
</item>
<item id="46198" name="Gold Medal" type="EtcItem"> <item id="46198" name="Gold Medal" type="EtcItem">
<!-- A shiny gold medal. Sell it at the shop for a lot of money. --> <!-- A shiny gold medal. Sell it at the shop for a lot of money. -->
<set name="icon" val="icon.etc_event_medal_i00" /> <set name="icon" val="icon.etc_event_medal_i00" />

63
trunk/dist/game/data/stats/options/30200-30299.xml vendored
View File

@ -162,4 +162,67 @@
<add stat="mDef" val="50" /> <add stat="mDef" val="50" />
</for> </for>
</option> </option>
<option id="30227" name="eva_shirt">
<passive_skill id="21326" level="1" />
</option>
<option id="30228" name="eva_shirt">
<passive_skill id="21327" level="1" />
</option>
<option id="30229" name="eva_shirt">
<passive_skill id="21327" level="2" />
</option>
<option id="30230" name="eva_shirt">
<passive_skill id="21327" level="3" />
</option>
<option id="30231" name="eva_shirt">
<passive_skill id="21327" level="4" />
</option>
<option id="30232" name="eva_shirt">
<passive_skill id="21327" level="5" />
</option>
<option id="30233" name="eva_shirt">
<passive_skill id="21327" level="6" />
</option>
<option id="30234" name="eva_shirt">
<passive_skill id="21327" level="7" />
</option>
<option id="30235" name="eva_shirt">
<passive_skill id="21327" level="8" />
</option>
<option id="30236" name="eva_shirt">
<passive_skill id="21327" level="9" />
</option>
<option id="30237" name="eva_shirt">
<passive_skill id="21327" level="10" />
</option>
<option id="30238" name="eva_shirt">
<active_skill id="9367" level="1" />
</option>
<option id="30239" name="eva_shirt">
<active_skill id="9367" level="2" />
</option>
<option id="30240" name="eva_shirt">
<active_skill id="9371" level="1" />
</option>
<option id="30241" name="eva_shirt">
<active_skill id="9373" level="1" />
</option>
<option id="30242" name="eva_shirt">
<active_skill id="9373" level="2" />
</option>
<option id="30243" name="eva_shirt">
<active_skill id="9365" level="1" />
</option>
<option id="30244" name="eva_shirt">
<active_skill id="9365" level="2" />
</option>
<option id="30245" name="eva_shirt">
<passive_skill id="9369" level="1" />
</option>
<option id="30246" name="eva_shirt">
<passive_skill id="9369" level="2" />
</option>
<option id="30299" name="shiny">
<passive_skill id="13561" level="1" />
</option>
</list> </list>

58
trunk/dist/game/data/stats/options/30300-30399.xml vendored Normal file
View File

@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/optionsData.xsd">
<option id="30300" name="shiny">
<passive_skill id="13562" level="1" />
</option>
<option id="30301" name="shiny">
<passive_skill id="13562" level="2" />
</option>
<option id="30302" name="shiny">
<passive_skill id="13562" level="3" />
</option>
<option id="30303" name="shiny">
<passive_skill id="13562" level="4" />
</option>
<option id="30304" name="shiny">
<passive_skill id="13562" level="5" />
</option>
<option id="30305" name="shiny">
<passive_skill id="13562" level="6" />
</option>
<option id="30306" name="shiny">
<passive_skill id="13562" level="7" />
</option>
<option id="30307" name="shiny">
<passive_skill id="13562" level="8" />
</option>
<option id="30308" name="shiny">
<passive_skill id="13562" level="9" />
</option>
<option id="30309" name="shiny">
<passive_skill id="13562" level="10" />
</option>
<option id="30310" name="shiny">
<active_skill id="13563" level="1" />
</option>
<option id="30311" name="shiny">
<active_skill id="13563" level="2" />
<active_skill id="13564" level="1" />
</option>
<option id="30312" name="shiny">
<active_skill id="13563" level="3" />
<active_skill id="13564" level="2" />
<active_skill id="13565" level="1" />
</option>
<option id="30313" name="shiny">
<active_skill id="13564" level="3" />
<active_skill id="13563" level="4" />
<active_skill id="13565" level="2" />
<active_skill id="13566" level="1" />
</option>
<option id="30314" name="shiny">
<active_skill id="13563" level="5" />
<active_skill id="13564" level="4" />
<active_skill id="13565" level="3" />
<active_skill id="13566" level="2" />
<active_skill id="13567" level="1" />
</option>
</list>

69
trunk/dist/game/data/stats/options/32800-32899.xml vendored Normal file
View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/optionsData.xsd">
<option id="32839" name="physical_reflect_shirt">
<passive_skill id="18446" level="1" />
</option>
<option id="32840" name="physical_reflect_shirt">
<passive_skill id="18444" level="1" />
</option>
<option id="32841" name="physical_reflect_shirt">
<passive_skill id="18444" level="2" />
</option>
<option id="32842" name="physical_reflect_shirt">
<passive_skill id="18444" level="3" />
</option>
<option id="32843" name="physical_reflect_shirt">
<passive_skill id="18444" level="4" />
</option>
<option id="32844" name="physical_reflect_shirt">
<passive_skill id="18444" level="5" />
</option>
<option id="32845" name="physical_reflect_shirt">
<passive_skill id="18444" level="6" />
</option>
<option id="32846" name="physical_reflect_shirt">
<passive_skill id="18444" level="7" />
</option>
<option id="32847" name="physical_reflect_shirt">
<passive_skill id="18444" level="8" />
</option>
<option id="32848" name="physical_reflect_shirt">
<passive_skill id="18444" level="9" />
</option>
<option id="32849" name="physical_reflect_shirt">
<passive_skill id="18444" level="10" />
</option>
<option id="32850" name="magic_reflect_shirt">
<passive_skill id="18447" level="1" />
</option>
<option id="32851" name="magic_reflect_shirt">
<passive_skill id="18445" level="1" />
</option>
<option id="32852" name="magic_reflect_shirt">
<passive_skill id="18445" level="2" />
</option>
<option id="32853" name="magic_reflect_shirt">
<passive_skill id="18445" level="3" />
</option>
<option id="32854" name="magic_reflect_shirt">
<passive_skill id="18445" level="4" />
</option>
<option id="32855" name="magic_reflect_shirt">
<passive_skill id="18445" level="5" />
</option>
<option id="32856" name="magic_reflect_shirt">
<passive_skill id="18445" level="6" />
</option>
<option id="32857" name="magic_reflect_shirt">
<passive_skill id="18445" level="7" />
</option>
<option id="32858" name="magic_reflect_shirt">
<passive_skill id="18445" level="8" />
</option>
<option id="32859" name="magic_reflect_shirt">
<passive_skill id="18445" level="9" />
</option>
<option id="32860" name="magic_reflect_shirt">
<passive_skill id="18445" level="10" />
</option>
</list>

161
trunk/dist/game/data/stats/skills/13500-13599.xml vendored
View File

@ -196,6 +196,38 @@
<set name="icon" val="icon.accessory_earring_of_lind_i00" /> <set name="icon" val="icon.accessory_earring_of_lind_i00" />
<set name="operateType" val="PASSIVE" /> <set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<for>
<effect name="DefenceTrait">
<param TURN_STONE="50" />
</effect>
<effect name="AttackTrait">
<param TURN_STONE="50" />
</effect>
<effect name="DefenceTrait">
<param KNOCKDOWN="40" />
</effect>
<effect name="AttackTrait">
<param KNOCKDOWN="40" />
</effect>
<effect name="AttackTrait">
<param SLEEP="50" />
</effect>
<effect name="DefenceTrait">
<param SLEEP="50" />
</effect>
<effect name="Buff">
<mul stat="critDmg" val="0.10" />
<mul stat="mCritPower" val="0.10" />
<!--<mul stat="mAbnormalReflect" val="0.10" />
<mul stat="pAbnormalReflect" val="0.10" />-->
<add stat="windRes" val="30" />
<add stat="darkRes" val="20" />
<mul stat="reflectSkillMagic" val="0.10" />
<add stat="runSpd" val="5" />
<add stat="DEX" val="3" />
<add stat="WIT" val="3" />
</effect>
</for>
</skill> </skill>
<skill id="13525" levels="1" name="Blessed Lindvior's Earring"> <skill id="13525" levels="1" name="Blessed Lindvior's Earring">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->
@ -477,6 +509,12 @@
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<set name="hitTime" val="200" /> <set name="hitTime" val="200" />
<set name="reuseDelay" val="7200000" /> <set name="reuseDelay" val="7200000" />
<set name="abnormalTime" val="5" />
<for>
<effect name="DispelBySlot">
<param dispel="KNOCKDOWN,10" />
</effect>
</for>
</skill> </skill>
<skill id="13543" levels="1" name="NC Messenger's Hat"> <skill id="13543" levels="1" name="NC Messenger's Hat">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->
@ -605,27 +643,93 @@
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
</skill> </skill>
<skill id="13561" levels="1" name="Basic Effect: Shiny Elemental Shirt"> <skill id="13561" levels="1" name="Basic Effect: Shiny Elemental Shirt">
<!-- AUTO GENERATED SKILL -->
<!-- M. Def. + 8. --> <!-- M. Def. + 8. -->
<set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i01" /> <set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i01" />
<set name="operateType" val="PASSIVE" /> <set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="mDef" val="8" />
<add stat="pDef" val="28" />
</effect>
</for>
</skill> </skill>
<skill id="13562" levels="10" name="Enchant Effect: Shiny Elemental Shirt"> <skill id="13562" levels="10" name="Enchant Effect: Shiny Elemental Shirt">
<!-- AUTO GENERATED SKILL -->
<!-- M. Def. + 9. --> <!-- M. Def. + 9. -->
<set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i00" /> <set name="icon" val="BranchSys2.icon.etc_scroll_of_enchant_shirt_i00" />
<set name="operateType" val="PASSIVE" /> <set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<table name="#mDef"> 9 10 11 12 13 14 15 16 17 18 </table>
<table name="#pDef"> 29 30 31 34 37 40 43 46 49 52 </table>
<table name="#reflectDamageRes"> 0 0 0 0 0 5 5 5 5 5 </table>
<table name="#STR"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#DEX"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#CON"> 0 0 0 1 2 2 3 3 4 4 </table>
<table name="#INT"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#WIT"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#MEN"> 0 0 0 1 2 2 3 3 4 4 </table>
<table name="#runSpd"> 0 0 0 7 7 7 7 7 7 7</table>
<table name="#maxHp"> 0 0 0 510 520 531 536 541 547 552 </table>
<table name="#maxMp"> 0 0 0 510 520 531 536 541 547 552 </table>
<table name="#mpConsume" > 0 0 0 0 1.03 1.03 1.03 1.03 1.03 1.03 </table>
<table name="#element"> 0 0 0 6 12 18 24 30 36 36 </table>
<table name="#absorbDam" > 0 0 0 0 0 0 0 1.05 1.05 1.05 </table>
<table name="#reuse" > 0 0 0 0 0 0 0 1.03 1.03 1.03 </table>
<table name="#receivedDamageModifier" > 0 0 0 0 0 0 0 0 1.03 1.03 </table>
<for>
<effect name="Buff">
<add stat="mDef" val="#mDef" />
<add stat="pDef" val="#pDef" />
<add stat="STR" val="#STR" />
<add stat="DEX" val="#DEX" />
<add stat="CON" val="#CON" />
<add stat="INT" val="#INT" />
<add stat="WIT" val="#WIT" />
<add stat="MEN" val="#MEN" />
<add stat="runSpd" val="#runSpd" />
<add stat="maxHp" val="#maxHp" />
<add stat="maxMp" val="#maxMp" />
<add stat="darkRes" val="#element" />
<add stat="holyRes" val="#element" />
<add stat="windRes" val="#element" />
<add stat="earthRes" val="#element" />
<add stat="waterRes" val="#element" />
<add stat="fireRes" val="#element" />
<add stat="reflectDamageRes" val="#reflectDamageRes" />
<mul stat="physicalMpConsumeRate" val="#mpConsume" />
<mul stat="magicalMpConsumeRate" val="#mpConsume" />
<mul stat="absorbDam" val="#absorbDam" />
<mul stat="atkReuse" val="#reuse" />
<mul stat="pReuse" val="#reuse" />
<mul stat="mReuse" val="#reuse" />
<mul stat="dReuse" val="#reuse" />
<mul stat="receivedDamageModifier" val="#receivedDamageModifier" />
</effect>
</for>
</skill> </skill>
<skill id="13563" levels="5" name="Einhasad's Wrath"> <skill id="13563" levels="5" name="Einhasad's Wrath">
<!-- AUTO GENERATED SKILL -->
<!-- Increases P. Atk + 10%, M. Atk. + 20%, Atk. Spd. + 10%, Casting Spd. + 10%. Decreases P. Def. and M. Def. by 10%. Cooldown is 30 minutes. --> <!-- Increases P. Atk + 10%, M. Atk. + 20%, Atk. Spd. + 10%, Casting Spd. + 10%. Decreases P. Def. and M. Def. by 10%. Cooldown is 30 minutes. -->
<table name="#reuseDelays"> 1800000 1740000 1680000 1620000 1500000 </table> <table name="#reuseDelays"> 1800000 1740000 1680000 1620000 1500000 </table>
<set name="icon" val="icon.ainhasard_shirt" /> <set name="icon" val="icon.ainhasard_shirt" />
<set name="operateType" val="ACTIVE_CONTINUOUS" /> <set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="abnormalTime" val="60" />
<set name="abnormalType" val="ULTIMATE_BUFF" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<set name="reuseDelay" val="#reuseDelays" /> <set name="reuseDelay" val="#reuseDelays" />
<set name="isMagic" val="1" />
<set name="hitTime" val="100" />
<for>
<effect name="Buff">
<mul stat="mAtk" val="1.20" />
<mul stat="pAtk" val="1.10" />
<mul stat="mAtkSpd" val="1.10" />
<mul stat="pAtkSpd" val="1.10" />
</effect>
<effect name="Debuff" >
<mul stat="mDef" val="1.10" />
<mul stat="pDef" val="1.10" />
</effect>
</for>
</skill> </skill>
<skill id="13564" levels="4" name="Einhasad's Protection"> <skill id="13564" levels="4" name="Einhasad's Protection">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->
@ -635,6 +739,23 @@
<set name="operateType" val="ACTIVE_CONTINUOUS" /> <set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<set name="reuseDelay" val="#reuseDelays" /> <set name="reuseDelay" val="#reuseDelays" />
<set name="isMagic" val="1" />
<set name="hitTime" val="200" />
<set name="abnormalTime" val="5" />
<set name="abnormalType" val="INVINCIBILITY" />
<set name="abnormalVisualEffect" val="INVINCIBILITY" />
<for>
<effect name="BlockDamage">
<param block="HP"/>
</effect>
<effect name="BlockDamage">
<param block="MP"/>
</effect>
<effect name="BlockDebuff" />
<effect name="Buff">
<sub stat="cancelVuln" val="100" />
</effect>
</for>
</skill> </skill>
<skill id="13565" levels="3" name="Einhasad's Silence"> <skill id="13565" levels="3" name="Einhasad's Silence">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->
@ -644,6 +765,10 @@
<set name="operateType" val="ACTIVE_CONTINUOUS" /> <set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<set name="reuseDelay" val="#reuseDelays" /> <set name="reuseDelay" val="#reuseDelays" />
<for>
<effect name="DispelAll"/>
<effect abnormalLvl="1" abnormalTime="5" abnormalType="TARGET_LOCK" name="RemoveTarget" self="1" val="0"/>
</for>
</skill> </skill>
<skill id="13566" levels="2" name="Einhasad's Salvation"> <skill id="13566" levels="2" name="Einhasad's Salvation">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->
@ -653,6 +778,19 @@
<set name="operateType" val="ACTIVE_CONTINUOUS" /> <set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<set name="reuseDelay" val="#reuseDelays" /> <set name="reuseDelay" val="#reuseDelays" />
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="3600" />
<set name="abnormalType" val="RESURRECTION_SPECIAL" />
<set name="castRange" val="400" />
<set name="effectPoint" val="1" />
<set name="effectRange" val="900" />
<set name="hitTime" val="200" />
<set name="isMagic" val="1" />
<for>
<effect name="ResurrectionSpecial">
<param power="100" />
</effect>
</for>
</skill> </skill>
<skill id="13567" levels="1" name="Einhasad's Blessing"> <skill id="13567" levels="1" name="Einhasad's Blessing">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->
@ -661,6 +799,23 @@
<set name="operateType" val="ACTIVE_INSTANT" /> <set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<set name="reuseDelay" val="1800000" /> <set name="reuseDelay" val="1800000" />
<set name="hitTime" val="200" />
<set name="coolTime" val="200" />
<for>
<effect name="ManaHealPercent">
<param power="100" />
</effect>
<effect name="CpHealPercent">
<param power="100" />
</effect>
<effect name="HealPercent">
<param power="100" />
</effect>
<effect name="DispelByCategory">
<param slot="debuff" rate="25" max="10" />
</effect>
</for>
</skill> </skill>
<skill id="13568" levels="1" name="Talisman Energy"> <skill id="13568" levels="1" name="Talisman Energy">
<!-- AUTO GENERATED SKILL --> <!-- AUTO GENERATED SKILL -->

96
trunk/dist/game/data/stats/skills/18400-18499.xml vendored
View File

@ -314,27 +314,113 @@
<set name="icon" val="icon.skill0000" /> <set name="icon" val="icon.skill0000" />
<set name="operateType" val="ACTIVE_INSTANT" /> <set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<table name="#mDef"> 0 9 10 11 12 13 14 15 16 17 18 </table>
<table name="#pDef"> 0 29 30 31 34 37 40 43 46 49 52 </table>
<table name="#def"> 0 0 0 0 1.05 1.06 1.08 1.10 1.12 1.15 </table>
<table name="#STR"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#DEX"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#CON"> 0 0 0 1 2 2 3 3 4 4 </table>
<table name="#INT"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#WIT"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#MEN"> 0 0 0 1 2 2 3 3 4 4 </table>
<table name="#runSpd"> 0 0 0 7 7 7 7 7 7 7</table>
<table name="#maxHp"> 0 0 0 510 520 531 536 541 547 552 </table>
<table name="#maxMp"> 0 0 0 510 520 531 536 541 547 552 </table>
<table name="#element"> 0 0 0 6 12 18 24 30 36 42 </table>
<table name="#absorbDam" > 0 0 0 0 0 1.08 1.12 1.16 1.20 1.25 </table>
<table name="#reflect" > 0 0 0 0 0 0 1.07 1.09 1.12 1.15 </table>
<for>
<effect name="Buff">
<add stat="mDef" val="#mDef" />
<add stat="pDef" val="#pDef" />
<add stat="STR" val="#STR" />
<add stat="DEX" val="#DEX" />
<add stat="CON" val="#CON" />
<add stat="INT" val="#INT" />
<add stat="WIT" val="#WIT" />
<add stat="MEN" val="#MEN" />
<mul stat="pDef" val="#def" />
<add stat="runSpd" val="#runSpd" />
<add stat="maxHp" val="#maxHp" />
<add stat="maxMp" val="#maxMp" />
<add stat="darkRes" val="#element" />
<add stat="holyRes" val="#element" />
<add stat="windRes" val="#element" />
<add stat="earthRes" val="#element" />
<add stat="waterRes" val="#element" />
<add stat="fireRes" val="#element" />
<mul stat="pvpPhysDef" val="#absorbDam" />
<mul stat="pvpPhysSkillsDef" val="#absorbDam" />
<mul stat="reflectSkillPhysic" val="#reflect" />
</effect>
</for>
</skill> </skill>
<!-- M. Def. + $s1. --> <!-- M. Def. + $s1. -->
<skill id="18445" levels="1" name="Magical Reflect Shirt Enchant Effect"> <skill id="18445" levels="1" name="Magical Reflect Shirt Enchant Effect">
<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
<set name="icon" val="icon.skill0000" /> <set name="icon" val="icon.skill0000" />
<set name="operateType" val="ACTIVE_INSTANT" /> <set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<table name="#mDef"> 0 9 10 11 12 13 14 15 16 17 18 </table>
<table name="#pDef"> 0 29 30 31 34 37 40 43 46 49 52 </table>
<table name="#def"> 0 0 0 0 1.05 1.06 1.08 1.10 1.12 1.15 </table>
<table name="#STR"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#DEX"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#CON"> 0 0 0 1 2 2 3 3 4 4 </table>
<table name="#INT"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#WIT"> 0 0 0 1 2 3 3 4 4 4 </table>
<table name="#MEN"> 0 0 0 1 2 2 3 3 4 4 </table>
<table name="#runSpd"> 0 0 0 7 7 7 7 7 7 7</table>
<table name="#maxHp"> 0 0 0 510 520 531 536 541 547 552 </table>
<table name="#maxMp"> 0 0 0 510 520 531 536 541 547 552 </table>
<table name="#element"> 0 0 0 6 12 18 24 30 36 42 </table>
<table name="#absorbDam" > 0 0 0 0 0 1.08 1.12 1.16 1.20 1.25 </table>
<table name="#reflect" > 0 0 0 0 0 0 1.07 1.09 1.12 1.15 </table>
<for>
<effect name="Buff">
<add stat="mDef" val="#mDef" />
<add stat="pDef" val="#pDef" />
<add stat="STR" val="#STR" />
<add stat="DEX" val="#DEX" />
<add stat="CON" val="#CON" />
<add stat="INT" val="#INT" />
<add stat="WIT" val="#WIT" />
<add stat="MEN" val="#MEN" />
<mul stat="pDef" val="#def" />
<add stat="runSpd" val="#runSpd" />
<add stat="maxHp" val="#maxHp" />
<add stat="maxMp" val="#maxMp" />
<add stat="darkRes" val="#element" />
<add stat="holyRes" val="#element" />
<add stat="windRes" val="#element" />
<add stat="earthRes" val="#element" />
<add stat="waterRes" val="#element" />
<add stat="fireRes" val="#element" />
<mul stat="pvpMagicalDef" val="#absorbDam" />
<mul stat="reflectSkillMagic" val="#reflect" />
</effect>
</for>
</skill> </skill>
<!-- M. Def. + 8. -->
<skill id="18446" levels="1" name="Reflect Shirt Basic Effect"> <skill id="18446" levels="1" name="Reflect Shirt Basic Effect">
<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
<set name="icon" val="icon.skill0000" /> <set name="icon" val="icon.skill0000" />
<set name="operateType" val="ACTIVE_INSTANT" /> <set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="mDef" val="8" />
<add stat="pDef" val="28" />
</effect>
</for>
</skill> </skill>
<!-- M. Def. + $s1. -->
<skill id="18447" levels="1" name="Reflect Shirt Basic Effect"> <skill id="18447" levels="1" name="Reflect Shirt Basic Effect">
<!-- AUTO GENERATED INFINITE ODYSSEY SKILL TODO: FIX IT -->
<set name="icon" val="icon.skill0000" /> <set name="icon" val="icon.skill0000" />
<set name="operateType" val="ACTIVE_INSTANT" /> <set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" /> <set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="mDef" val="8" />
<add stat="pDef" val="28" />
</effect>
</for>
</skill> </skill>
<!-- Summon Piero. --> <!-- Summon Piero. -->
<skill id="18448" levels="1" name="Summon Piero"> <skill id="18448" levels="1" name="Summon Piero">

10
trunk/dist/game/data/xsd/optionsData.xsd vendored
View File

@ -74,7 +74,7 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="active_skill" minOccurs="0"> <xs:element name="active_skill" minOccurs="0" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" use="required"> <xs:attribute name="id" use="required">
<xs:simpleType> <xs:simpleType>
@ -94,7 +94,7 @@
</xs:attribute> </xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="passive_skill" minOccurs="0"> <xs:element name="passive_skill" minOccurs="0" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" use="required"> <xs:attribute name="id" use="required">
<xs:simpleType> <xs:simpleType>
@ -114,7 +114,7 @@
</xs:attribute> </xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="attack_skill" minOccurs="0"> <xs:element name="attack_skill" minOccurs="0" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" use="required"> <xs:attribute name="id" use="required">
<xs:simpleType> <xs:simpleType>
@ -142,7 +142,7 @@
</xs:attribute> </xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="critical_skill" minOccurs="0"> <xs:element name="critical_skill" minOccurs="0" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" use="required"> <xs:attribute name="id" use="required">
<xs:simpleType> <xs:simpleType>
@ -170,7 +170,7 @@
</xs:attribute> </xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="magic_skill" minOccurs="0"> <xs:element name="magic_skill" minOccurs="0" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" use="required"> <xs:attribute name="id" use="required">
<xs:simpleType> <xs:simpleType>

4
trunk/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
View File

@ -95,12 +95,12 @@ public class OptionData implements IXmlReader
} }
case "active_skill": case "active_skill":
{ {
op.setActiveSkill(new SkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level"))); op.addActiveSkill(new SkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level")));
break; break;
} }
case "passive_skill": case "passive_skill":
{ {
op.setPassiveSkill(new SkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level"))); op.addPassiveSkill(new SkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level")));
break; break;
} }
case "attack_skill": case "attack_skill":

53
trunk/java/com/l2jmobius/gameserver/model/options/Options.java
View File

@ -37,8 +37,8 @@ public class Options
private final int _id; private final int _id;
private final List<FuncTemplate> _funcs = new ArrayList<>(); private final List<FuncTemplate> _funcs = new ArrayList<>();
private SkillHolder _activeSkill = null; private final List<SkillHolder> _activeSkills = new ArrayList<>();
private SkillHolder _passiveSkill = null; private final List<SkillHolder> _passiveSkills = new ArrayList<>();
private final List<OptionsSkillHolder> _activationSkills = new ArrayList<>(); private final List<OptionsSkillHolder> _activationSkills = new ArrayList<>();
@ -87,32 +87,32 @@ public class Options
public boolean hasActiveSkill() public boolean hasActiveSkill()
{ {
return _activeSkill != null; return !_activeSkills.isEmpty();
} }
public SkillHolder getActiveSkill() public List<SkillHolder> getActiveSkill()
{ {
return _activeSkill; return _activeSkills;
} }
public void setActiveSkill(SkillHolder holder) public void addActiveSkill(SkillHolder holder)
{ {
_activeSkill = holder; _activeSkills.add(holder);
} }
public boolean hasPassiveSkill() public boolean hasPassiveSkill()
{ {
return _passiveSkill != null; return !_passiveSkills.isEmpty();
} }
public SkillHolder getPassiveSkill() public List<SkillHolder> getPassiveSkill()
{ {
return _passiveSkill; return _passiveSkills;
} }
public void setPassiveSkill(SkillHolder holder) public void addPassiveSkill(SkillHolder holder)
{ {
_passiveSkill = holder; _passiveSkills.add(holder);
} }
public boolean hasActivationSkills() public boolean hasActivationSkills()
@ -164,13 +164,19 @@ public class Options
} }
if (hasActiveSkill()) if (hasActiveSkill())
{ {
addSkill(player, getActiveSkill().getSkill()); for (SkillHolder holder : _activeSkills)
player.sendDebugMessage("Adding active skill: " + getActiveSkill()); {
addSkill(player, holder.getSkill());
player.sendDebugMessage("Adding active skill: " + holder);
}
} }
if (hasPassiveSkill()) if (hasPassiveSkill())
{ {
addSkill(player, getPassiveSkill().getSkill()); for (SkillHolder holder : _passiveSkills)
player.sendDebugMessage("Adding passive skill: " + getPassiveSkill()); {
addSkill(player, holder.getSkill());
player.sendDebugMessage("Adding passive skill: " + holder);
}
} }
if (hasActivationSkills()) if (hasActivationSkills())
{ {
@ -193,13 +199,20 @@ public class Options
} }
if (hasActiveSkill()) if (hasActiveSkill())
{ {
player.removeSkill(getActiveSkill().getSkill(), false, false); for (SkillHolder holder : _activeSkills)
player.sendDebugMessage("Removing active skill: " + getActiveSkill()); {
player.removeSkill(holder.getSkill(), false, false);
player.sendDebugMessage("Removing active skill: " + holder);
}
} }
if (hasPassiveSkill()) if (hasPassiveSkill())
{ {
player.removeSkill(getPassiveSkill().getSkill(), false, true); for (SkillHolder holder : _passiveSkills)
player.sendDebugMessage("Removing passive skill: " + getPassiveSkill()); {
player.removeSkill(holder.getSkill(), false, true);
player.sendDebugMessage("Removing passive skill: " + holder);
}
} }
if (hasActivationSkills()) if (hasActivationSkills())
{ {