Sync with L2jServer HighFive Jun 14th 2015.

This commit is contained in:
MobiusDev
2015-06-14 11:51:57 +00:00
parent a3707acaaa
commit 166d6ff9d4
48 changed files with 675 additions and 356 deletions

View File

@@ -955,6 +955,7 @@
<param consumeItemId="1459" consumeItemCount="4" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -1334,13 +1335,13 @@
</effect>
<effect name="ConsumeBody" />
</enchant1for>
<enchant1for>
<enchant2for>
<effect name="Sweeper" />
<effect name="ManaHealByLevel">
<param power="#ench2DrainMp" />
</effect>
<effect name="ConsumeBody" />
</enchant1for>
</enchant2for>
</skill>
<skill id="44" levels="3" name="Remedy">
<table name="#dispelAbnormals"> BLEEDING,3 BLEEDING,7 BLEEDING,9 </table>

View File

@@ -312,6 +312,7 @@
<table name="#magicLvl"> 55 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 50 53 55 58 59 61 63 65 67 68 </table>
<table name="#ench1Cost"> 66 65 64 63 62 61 60 58 57 56 55 54 53 52 51 49 48 47 46 45 44 43 41 40 39 38 37 36 35 34 </table>
<table name="#ench2Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
<table name="#ench2LethalStrikeRate"> 25 25 25 26 26 26 26 27 27 27 27 28 28 28 29 29 29 29 30 30 30 30 31 31 31 31 32 32 32 33 </table>
<table name="#ench3Attack"> 191 196 201 206 211 216 221 227 232 237 242 247 252 257 263 268 273 278 283 288 293 298 304 309 314 319 324 329 334 340 </table>
<table name="#ench4HolyAttack"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
@@ -343,19 +344,28 @@
<target race="UNDEAD" />
</cond>
<for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</for>
<enchant2for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="#ench2Power" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="#ench2LethalStrikeRate" />
</effect>
</enchant2for>
<enchant3for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
@@ -1820,6 +1830,7 @@
<table name="#magicLvl"> 55 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 50 53 55 58 59 61 63 65 67 68 </table>
<table name="#ench1Cost"> 66 65 64 63 62 61 60 58 57 56 55 54 53 52 51 49 48 47 46 45 44 43 41 40 39 38 37 36 35 34 </table>
<table name="#ench2Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
<table name="#ench2LethalStrikeRate"> 25 25 25 26 26 26 26 27 27 27 27 28 28 28 29 29 29 29 30 30 30 30 31 31 31 31 32 32 32 33 </table>
<table name="#ench3Attack"> 191 196 201 206 211 216 221 227 232 237 242 247 252 257 263 268 273 278 283 288 293 298 304 309 314 319 324 329 334 340 </table>
<table name="#ench4DarkAttack"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
@@ -1851,19 +1862,28 @@
<target race="DIVINE" />
</cond>
<for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</for>
<enchant2for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="#ench2Power" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="#ench2LethalStrikeRate" />
</effect>
</enchant2for>
<enchant3for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>

View File

@@ -7,6 +7,7 @@
<table name="#magicLvl"> 56 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 41 43 44 46 48 49 51 52 53 55 </table>
<table name="#mpInitialConsume"> 11 11 11 12 12 13 13 13 14 14 </table>
<table name="#ench1Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
<table name="#ench1LethalStrikeRate"> 25 25 25 26 26 26 27 27 27 28 28 28 28 29 29 29 30 30 30 31 31 31 31 32 32 32 33 33 33 34 </table>
<table name="#ench2mpConsume"> 53 52 51 50 49 48 48 47 46 45 44 43 42 41 40 39 38 38 37 36 35 34 33 32 31 30 29 29 28 27 </table>
<table name="#ench2mpInitialConsume"> 13 13 12 12 12 12 12 11 11 11 11 10 10 10 10 9 9 9 9 9 8 8 8 8 7 7 7 7 7 6 </table>
@@ -42,25 +43,37 @@
<target race="UNDEAD" />
</cond>
<for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</for>
<enchant1for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="#ench1Power" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="#ench1LethalStrikeRate" />
</effect>
</enchant1for>
<enchant2for>
<effect name="Fear" abnormalTime="#ench2Time" />
<effect name="RunAway">
<param power="#ench1Power" />
<param time="#ench2Time" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</enchant2for>
<enchant3for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>

View File

@@ -1885,13 +1885,14 @@
<skill id="2286" levels="6" name="Scroll: Recovery">
<!-- Confirmed CT2.5 -->
<table name="#levelRange"> 1;19 20;39 40;51 52;60 61;75 76;85 </table>
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<table name="#itemConsumeId"> 8594 8595 8596 8597 8598 8599 </table>
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="#itemConsumeId" />
<set name="magicLvl" val="1" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="simultaneousCast" val="true" />
<set name="targetType" val="SELF" />
<cond msgId="113" addName="1">
<and>

View File

@@ -1572,8 +1572,11 @@
<set name="targetType" val="ONE" />
<set name="trait" val="DERANGEMENT" />
<for>
<effect name="RunAway">
<param power="40" />
<param time="20" />
</effect>
<effect name="Fear" />
<!-- FIXME: We need an instant effect that will work only vs monsters and fear them with 40% chance for 20 seconds here -->
</for>
</skill>
<skill id="5174" levels="15" name="Poison">

View File

@@ -1258,7 +1258,7 @@
<skill id="5493" levels="1" name="Naia Production">
<set name="castRange" val="800" />
<set name="channelingSkillId" val="5106" />
<set name="channelingSkillId" val="5106" />
<set name="channelingTickInterval" val="2" />
<set name="effectPoint" val="1" />
<set name="effectRange" val="1000" />
<set name="hitTime" val="25000" />
@@ -1271,6 +1271,9 @@
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<cond msgId="109">
<target npcId="32331" />
</cond>
</skill>
<skill id="5494" levels="1" name="Gust">
<!-- Confirmed CT2.5 -->