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

Sync with L2jServer HighFive Feb 18th 2015.

Browse Source
This commit is contained in:
mobius 2015-02-18 23:00:01 +00:00
parent 2bc6190412
commit d76ff9a69a
24 changed files with 105 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/stats/skills/00300-00399.xml vendored
View File

@ -2392,7 +2392,7 @@
</cond>
<for>
<effect name="Buff">
<mul stat="mCritRate" val="1" />
<mul stat="mCritRate" val="2" />
</effect>
</for>
</skill>

18
trunk/dist/game/data/stats/skills/00400-00499.xml vendored
View File

@ -2974,10 +2974,10 @@
<table name="#effectPoints"> -114 -117 -119 -121 -124 -126 -129 -131 -133 -136 -138 -140 -142 -144 -146 -148 -150 -152 -154 -156 -157 -159 -160 -162 -163 -164 -166 -167 </table>
<table name="#effectRange"> 600 600 600 600 600 600 600 600 600 600 700 700 700 700 700 700 700 700 700 700 800 800 800 800 800 800 800 800 </table>
<table name="#magicLvl"> 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table>
<table name="#mpConsume"> 46 47 48 50 50 51 52 53 55 56 57 58 60 61 61 62 63 65 66 67 68 69 70 71 72 73 74 75 </table>
<table name="#mpInitialConsume"> 46 47 48 50 50 51 52 53 55 56 57 58 60 61 61 62 63 65 66 67 68 69 70 71 72 73 74 75 </table>
<table name="#power"> 742 782 823 866 910 955 1002 1050 1100 1150 1202 1255 1309 1364 1420 1476 1531 1592 1651 1710 1770 1830 1891 1951 2012 2072 2132 2192 </table>
<table name="#ench1Power"> 2212 2231 2251 2271 2291 2310 2330 2350 2370 2389 2409 2429 2449 2468 2488 2508 2528 2547 2567 2587 2607 2626 2646 2666 2686 2705 2725 2745 2765 2784 </table>
<table name="#ench2MpConsume"> 73 72 71 69 68 67 66 64 63 62 61 59 58 57 56 54 53 52 50 49 48 47 45 44 43 42 40 39 38 37 </table>
<table name="#ench2mpInitialConsume"> 73 72 71 69 68 67 66 64 63 62 61 59 58 57 56 54 53 52 50 49 48 47 45 44 43 42 40 39 38 37 </table>
<table name="#ench2Power"> 2196 2200 2204 2209 2213 2217 2222 2226 2230 2234 2239 2243 2247 2252 2256 2260 2265 2269 2273 2277 2282 2286 2290 2295 2299 2303 2308 2312 2316 2320 </table>
<table name="#enchDuel"> 2230 2268 2306 2345 2383 2421 2460 2498 2536 2575 2613 2651 2689 2728 2766 2804 2843 2881 2919 2958 2996 3034 3072 3111 3149 3187 3226 3264 3302 3341 </table>
<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
@ -2992,7 +2992,7 @@
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0493" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DIRECTIONAL_INSTANT" />
<set name="overHit" val="true" />
@ -3003,7 +3003,7 @@
<enchant1 name="magicLvl" val="#enchMagicLvl" />
<enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant2 name="power" val="#ench2Power" />
<enchant3 name="element" val="0" /> <!-- Fire -->
<enchant3 name="elementPower" val="#enchElementPower" />
@ -3035,7 +3035,7 @@
<table name="#effectPoints"> -183 -188 -193 -198 -203 -208 -213 -218 -223 -228 -233 -237 -242 -247 -252 -257 -261 -266 -271 -275 -279 -284 -288 -292 -296 -300 -304 -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
<table name="#effectRange"> 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 700 700 700 700 700 700 700 700 700 700 800 800 800 800 800 800 800 800 </table>
<table name="#magicLvl"> 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table>
<table name="#mpConsume"> 25 26 27 27 28 29 30 30 31 32 33 34 35 35 36 37 38 38 39 40 41 42 43 43 44 45 45 46 47 48 48 49 50 51 51 52 53 </table>
<table name="#mpInitialConsume"> 25 26 27 27 28 29 30 30 31 32 33 34 35 35 36 37 38 38 39 40 41 42 43 43 44 45 45 46 47 48 48 49 50 51 51 52 53 </table>
<table name="#ench1Power"> 16 22 29 35 41 48 54 60 67 73 79 86 92 98 105 111 117 124 130 136 143 149 155 162 168 174 181 187 193 200 </table>
<table name="#ench2ActivateRates"> 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 </table>
<table name="#ench7Duel"> 17 25 33 40 48 56 63 71 79 86 94 102 109 117 125 132 140 148 155 163 171 178 186 194 201 209 217 224 232 240 </table>
@ -3057,7 +3057,7 @@
<set name="isDebuff" val="true" />
<set name="lvlBonusRate" val="1" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DIRECTIONAL_CONTINUOUS" />
<set name="overHit" val="true" />
@ -3110,7 +3110,7 @@
<table name="#effectPoints"> -266 -279 -288 -296 -304 -311 -317 -323 -328 -333 </table>
<table name="#effectRange"> 600 700 700 700 700 700 800 800 800 800 </table>
<table name="#magicLvl"> 55 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 65 70 73 75 77 80 83 85 88 90 </table>
<table name="#mpInitialConsume"> 65 70 73 75 77 80 83 85 88 90 </table>
<table name="#ench1AbnormalLvl"> 8 9 9 9 9 9 9 9 9 9 9 9 9 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11 </table>
<table name="#ench1Power"> 134 135 135 135 135 135 135 136 136 136 136 136 136 137 137 137 137 137 137 138 138 138 138 138 138 139 139 139 139 139 </table>
<table name="#ench2ActivateRates"> 51 52 54 55 56 58 59 60 62 63 64 66 67 68 70 71 72 74 75 76 78 79 80 82 83 84 86 87 88 90 </table>
@ -3135,7 +3135,7 @@
<set name="isDebuff" val="true" />
<set name="lvlBonusRate" val="1" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DIRECTIONAL_CONTINUOUS" />
<set name="overHit" val="true" />
@ -3149,7 +3149,7 @@
<enchant2 name="activateRate" val="#ench2ActivateRates" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="mpConsume" val="#ench3Cost" />
<enchant3 name="mpInitialConsume" val="#ench3Cost" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="pvpPower" val="#ench4Duel" />
<cond msgId="113" addName="1">

2
trunk/dist/game/data/stats/skills/00600-00699.xml vendored
View File

@ -219,7 +219,7 @@
<skill id="616" levels="3" name="Dark Squad">
<!-- Confirmed CT2.5 -->
<table name="#mAtk"> 7.17 19.32 19.32 </table>
<table name="#mCritRate"> 0 0 0.01 </table>
<table name="#mCritRate"> 1 1 1.01 </table>
<set name="icon" val="icon.skill1443" />
<set name="magicLvl" val="1" />
<set name="operateType" val="PASSIVE" />

8
trunk/dist/game/data/stats/skills/00700-00799.xml vendored
View File

@ -188,7 +188,7 @@
<effect name="Buff">
<mul stat="maxHp" val="1.2" />
<mul stat="rCrit" val="1.2" />
<mul stat="mCritRate" val="0.2" />
<mul stat="mCritPower" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />
<mul stat="pAtkSpd" val="1.2" />
@ -2495,7 +2495,7 @@
<!-- Confirmed CT2.5 and Updated to Ertheia -->
<table name="#abnormalLvl"> 1 2 3 4 5 </table>
<table name="#magicLvl"> 78 85 90 95 99 </table>
<table name="#mpConsume"> 83 92 98 104 110 </table>
<table name="#mpInitialConsume"> 83 92 98 104 110 </table>
<table name="#power"> 4040 11557 13553 15150 16747 </table>
<table name="#ench1Power"> 4071 4102 4133 4164 4195 4226 4257 4289 4320 4351 4382 4413 4444 4475 4507 </table>
<table name="#ench2Cost"> 80 78 76 74 72 70 68 66 64 62 59 57 55 53 51 </table>
@ -2523,7 +2523,7 @@
<set name="isDebuff" val="true" />
<set name="lvlBonusRate" val="1" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DIRECTIONAL_CONTINUOUS" />
<set name="power" val="#power" />
@ -2534,7 +2534,7 @@
<enchant1 name="magicLvl" val="#enchMagicLvl" />
<enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2Cost" />
<enchant2 name="mpInitialConsume" val="#ench2Cost" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="element" val="0" /> <!-- Fire -->

6
trunk/dist/game/data/stats/skills/00800-00899.xml vendored
View File

@ -1859,7 +1859,8 @@
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill_transform_etc" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="30" />
<set name="mpConsume" val="20" />
<set name="mpInitialConsume" val="10" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DIRECTIONAL_INSTANT" />
<set name="power" val="1" />
@ -1886,7 +1887,8 @@
<set name="icon" val="icon.skill_transform_etc" />
<set name="isDebuff" val="true" />
<set name="magicLvl" val="75" />
<set name="mpConsume" val="100" />
<set name="mpConsume" val="50" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="power" val="100" />
<set name="reuseDelay" val="23000" />

4
trunk/dist/game/data/stats/skills/01300-01399.xml vendored
View File

@ -1038,7 +1038,7 @@
<mul stat="pDef" val="0.7" />
<mul stat="mAtk" val="0.7" />
<mul stat="mAtkSpd" val="0.8" />
<mul stat="mCritRate" val="-0.3" />
<mul stat="mCritRate" val="0.7" />
</effect>
</for>
</skill>
@ -2167,7 +2167,7 @@
<enchant3for>
<effect name="Buff">
<mul stat="maxHp" val="1.2" />
<mul stat="mCritRate" val="0.02" />
<add stat="mCritRate" val="2" />
<mul stat="cAtk" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />

2
trunk/dist/game/data/stats/skills/01400-01499.xml vendored
View File

@ -2788,7 +2788,7 @@
<table name="#effectPoints"> 523 582 624 </table>
<table name="#magicLvl"> 55 62 68 </table>
<table name="#mAtk"> 1.75 1.85 1.95 </table>
<table name="#mCritRate"> 1 2 3 </table>
<table name="#mCritRate"> 2 3 4 </table>
<table name="#mpConsume"> 80 92 101 </table>
<table name="#mpInitialConsume"> 20 23 26 </table>
<table name="#ench1MpConsume"> 99 97 95 94 92 90 89 87 85 84 82 80 78 77 75 73 72 70 68 67 65 63 62 60 58 57 55 53 52 50 </table>

4
trunk/dist/game/data/stats/skills/01500-01599.xml vendored
View File

@ -1104,7 +1104,7 @@
<effect name="Buff">
<mul stat="mAtk" val="1.4" />
<mul stat="mAtkSpd" val="1.5" />
<mul stat="mCritRate" val="0.5" />
<mul stat="mCritRate" val="1.5" />
<mul stat="MagicalMpConsumeRate" val="0.1" />
</effect>
</for>
@ -1129,7 +1129,7 @@
<mul stat="mAtk" val="1.1" />
<mul stat="healEffect" val="1.4" />
<mul stat="mAtkSpd" val="1.5" />
<mul stat="mCritRate" val="0.5" />
<mul stat="mCritRate" val="1.5" />
<mul stat="MagicalMpConsumeRate" val="0.1" />
</effect>
</for>

2
trunk/dist/game/data/stats/skills/02500-02599.xml vendored
View File

@ -192,7 +192,7 @@
<skill id="2510" levels="1" name="Wondrous Cubic">
<!-- Confirmed CT2.5 and Updated to H5 -->
<table name="#extractableItems">
10633,1,35;0642,1,16;21096,1,2;21101,1,1;10634,1,16;10643,1,10;21097,1,2;21102,1,1;10635,1,11;10644,1,7;21098,1,1.5;21103,1,0.5;21106,1,10636,1,3.5;10645,1,2.1;21099,1,1;21104,1,0.4;21106,1,10637,1,1.5;10646,1,0.9;21100,1,0.3;21105,1,0.299;21593,1,0.001
10633,1,35;10642,1,16;21096,1,2;21101,1,1;10634,1,16;10643,1,10;21097,1,2;21102,1,1;10635,1,11;10644,1,7;21098,1,1.5;21103,1,0.5;21106,1,10636,1,3.5;10645,1,2.1;21099,1,1;21104,1,0.4;21106,1,10637,1,1.5;10646,1,0.9;21100,1,0.3;21105,1,0.299;21593,1,0.001
</table>
<set name="capsuled_items_skill" val="#extractableItems" />
<set name="isMagic" val="2" /> <!-- Static Skill -->

10
trunk/dist/game/data/stats/skills/04600-04699.xml vendored
View File

@ -765,7 +765,7 @@
<table name="#abnormalLvls"> 1 2 3 </table>
<table name="#magicLvl"> 20 40 60 </table>
<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
<table name="#mCritRate"> 2 3 3 </table>
<table name="#mCritRate"> 3 4 4 </table>
<table name="#mpConsume"> 29 53 83 </table>
<table name="#pDef"> 1.8 1.12 1.15 </table>
<set name="abnormalLvl" val="#abnormalLvls" />
@ -793,7 +793,7 @@
<table name="#magicLvl"> 20 40 60 </table>
<table name="#mAtk"> 1.55 1.65 1.75 </table>
<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
<table name="#mCritRate"> 2 3 3 </table>
<table name="#mCritRate"> 3 4 4 </table>
<table name="#mpConsume"> 29 53 83 </table>
<set name="abnormalLvl" val="#abnormalLvls" />
<set name="abnormalTime" val="300" />
@ -882,7 +882,7 @@
<table name="#magicLvl"> 20 40 60 </table>
<table name="#mAtk"> 1.1 1.1 1.16 </table>
<table name="#mAtkSpd"> 1.21 1.29 1.4 </table>
<table name="#mCritRate"> 2 3 3 </table>
<table name="#mCritRate"> 3 4 4 </table>
<table name="#mDef"> 0.9 0.9 0.84 </table>
<table name="#mpConsume"> 29 53 83 </table>
<table name="#pAtk"> 1.05 1.05 1.08 </table>
@ -955,7 +955,7 @@
<table name="#abnormalLvls"> 1 2 3 </table>
<table name="#magicLvl"> 20 40 60 </table>
<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
<table name="#mCritRate"> 2 3 3 </table>
<table name="#mCritRate"> 3 4 4 </table>
<table name="#mpConsume"> 29 53 83 </table>
<table name="#reflect"> 10 15 20 </table>
<set name="abnormalLvl" val="#abnormalLvls" />
@ -983,7 +983,7 @@
<table name="#magicLvl"> 20 40 60 </table>
<table name="#mAtk"> 1.55 1.65 1.75 </table>
<table name="#mAtkSpd"> 1.15 1.23 1.3 </table>
<table name="#mCritRate"> 2 3 3 </table>
<table name="#mCritRate"> 3 4 4 </table>
<table name="#mpConsume"> 43 79 124 </table>
<set name="abnormalLvl" val="#abnormalLvls" />
<set name="abnormalTime" val="300" />

2
trunk/dist/game/data/stats/skills/05500-05599.xml vendored
View File

@ -408,7 +408,7 @@
<effect name="Buff">
<mul stat="cAtk" val="1.35" />
<mul stat="rCrit" val="1.3" />
<mul stat="mCritRate" val="3" />
<mul stat="mCritRate" val="4" />
</effect>
</for>
</skill>

4
trunk/dist/game/data/stats/skills/06300-06399.xml vendored
View File

@ -1061,7 +1061,7 @@
<!-- Confirmed CT2.5 -->
<table name="#cAtk"> 1.05 1.1 </table>
<table name="#icons"> icon.skill6366_1 icon.skill6366_2 </table>
<table name="#mCritRate"> 0.02 0.04 </table>
<table name="#mCritPower"> 1.02 1.04 </table>
<table name="#rCrit"> 1.04 1.08 </table>
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="600" />
@ -1083,7 +1083,7 @@
<for>
<effect name="Buff">
<mul stat="rCrit" val="#rCrit" />
<mul stat="mCritRate" val="#mCritRate" />
<mul stat="mCritPower" val="#mCritPower" />
<mul stat="cAtk" val="#cAtk" />
</effect>
</for>

2
trunk/dist/game/data/stats/skills/07000-07099.xml vendored
View File

@ -922,7 +922,7 @@
<effect name="Buff">
<mul stat="maxHp" val="1.2" />
<mul stat="rCrit" val="1.2" />
<mul stat="mCritRate" val="0.2" />
<mul stat="mCritPower" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />
<mul stat="pAtkSpd" val="1.2" />

1
trunk/dist/game/data/stats/skills/21100-21199.xml vendored
View File

@ -1128,6 +1128,7 @@
<mul stat="mAtk" val="1.1" />
<mul stat="mDef" val="1.2" />
<add stat="mCritRate" val="2" />
<mul stat="mCritPower" val="1.2" />
</effect>
</for>
</skill>

10
trunk/dist/game/data/stats/skills/23200-23299.xml vendored
View File

@ -1076,7 +1076,7 @@
<set name="targetType" val="AURA" />
<for>
<effect name="Buff">
<mul stat="mCritRate" val="2" />
<add stat="mCritRate" val="2" />
</effect>
</for>
</skill>
@ -1113,7 +1113,7 @@
<set name="targetType" val="AURA" />
<for>
<effect name="Buff">
<mul stat="mCritRate" val="2" />
<add stat="mCritRate" val="2" />
<mul stat="regMp" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />
@ -1144,7 +1144,7 @@
<effect name="Buff">
<mul stat="maxMp" val="1.2" />
<mul stat="regHp" val="1.2" />
<mul stat="mCritRate" val="2" />
<add stat="mCritRate" val="2" />
<mul stat="cAtk" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />
@ -1173,7 +1173,7 @@
<effect name="Buff">
<mul stat="maxHp" val="1.2" />
<mul stat="rCrit" val="1.2" />
<mul stat="mCritRate" val="0.2" />
<mul stat="mCritPower" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />
<mul stat="pAtkSpd" val="1.2" />
@ -1200,7 +1200,7 @@
<for>
<effect name="Buff">
<mul stat="maxHp" val="1.2" />
<mul stat="mCritRate" val="0.2" />
<add stat="mCritRate" val="2" />
<mul stat="cAtk" val="1.2" />
<mul stat="pAtk" val="1.1" />
<mul stat="pDef" val="1.2" />

32
trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java
View File

@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model;
import java.util.ArrayList;
import java.util.List;
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -35,7 +36,6 @@ public class PartyMatchRoom implements IIdentifiable
private final int _id;
private String _title;
private int _loot;
private int _location;
private int _minlvl;
private int _maxlvl;
private int _maxmem;
@ -46,7 +46,6 @@ public class PartyMatchRoom implements IIdentifiable
_id = id;
_title = title;
_loot = loot;
_location = 0; // TODO: Closes town
_minlvl = minlvl;
_maxlvl = maxlvl;
_maxmem = maxmem;
@ -132,9 +131,29 @@ public class PartyMatchRoom implements IIdentifiable
return _maxlvl;
}
/**
* <ul>
* <li>1 : Talking Island</li>
* <li>2 : Gludio</li>
* <li>3 : Dark Elven Ter.</li>
* <li>4 : Elven Territory</li>
* <li>5 : Dion</li>
* <li>6 : Giran</li>
* <li>7 : Neutral Zone</li>
* <li>8 : Lyonn</li>
* <li>9 : Schuttgart</li>
* <li>10 : Oren</li>
* <li>11 : Hunters Village</li>
* <li>12 : Innadril</li>
* <li>13 : Aden</li>
* <li>14 : Rune</li>
* <li>15 : Goddard</li>
* </ul>
* @return the id
*/
public int getLocation()
{
return _location;
return MapRegionManager.getInstance().getMapRegion(_members.get(0)).getBbs();
}
public int getMembers()
@ -169,11 +188,6 @@ public class PartyMatchRoom implements IIdentifiable
_maxlvl = maxlvl;
}
public void setLocation(int loc)
{
_location = loc;
}
public void setLootType(int loot)
{
_loot = loot;
@ -188,4 +202,4 @@ public class PartyMatchRoom implements IIdentifiable
{
_title = title;
}
}
}

14
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@ -1954,6 +1954,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
if (item.isEquipped())
{
if (item.getMana() < item.useSkillDisTime())
{
abortCast();
return;
}
item.decreaseMana(false, item.useSkillDisTime());
break;
}
@ -5173,10 +5178,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
// Launch weapon Special ability effect if available
L2Weapon activeWeapon = getActiveWeaponItem();
if (activeWeapon != null)
if (crit)
{
activeWeapon.castOnCriticalSkill(this, target);
L2Weapon activeWeapon = getActiveWeaponItem();
if (activeWeapon != null)
{
activeWeapon.castOnCriticalSkill(this, target);
}
}
// Recharge any active auto-soulshot tasks for current creature.

15
trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java
View File

@ -680,20 +680,7 @@ public class CharStat
return 1;
}
double mpConsume = calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill);
if (skill.isDance())
{
return (int) calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume);
}
else if (skill.isMagic())
{
return (int) calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume);
}
else
{
return (int) calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume);
}
return (int) calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill);
}
public byte getAttackElement()

1
trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
View File

@ -454,6 +454,7 @@ public abstract class Inventory extends ItemContainer
if (itemSkill != null)
{
itemSkill.setReferenceItemId(item.getId());
player.addSkill(itemSkill, false);
if (itemSkill.isActive())

8
trunk/java/com/l2jserver/gameserver/model/skills/Skill.java
View File

@ -126,7 +126,7 @@ public final class Skill implements IIdentifiable
/** If {@code true} this skill's effect recovery HP/MP or CP from herb. */
private final boolean _isRecoveryHerb;
private final int _refId;
private int _refId;
// all times in milliseconds
private final int _hitTime;
// private final int _skillInterruptTime;
@ -225,7 +225,6 @@ public final class Skill implements IIdentifiable
{
_id = set.getInt("skill_id");
_level = set.getInt("level");
_refId = set.getInt("referenceId", 0);
_displayId = set.getInt("displayId", _id);
_displayLevel = set.getInt("displayLevel", _level);
_name = set.getString("name", "");
@ -1602,6 +1601,11 @@ public final class Skill implements IIdentifiable
return _refId;
}
public void setReferenceItemId(int val)
{
_refId = val;
}
public String getAttributeName()
{
return _attribute;

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java
View File

@ -53,7 +53,7 @@ public class ExManagePartyRoomMember extends L2GameServerPacket
writeS(_activeChar.getName());
writeD(_activeChar.getActiveClass());
writeD(_activeChar.getLevel());
writeD(0x00); // TODO: Closes town
writeD(_room.getLocation());
if (_room.getOwner().equals(_activeChar))
{
writeD(1);

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java
View File

@ -48,7 +48,7 @@ public class ExPartyRoomMember extends L2GameServerPacket
writeS(member.getName());
writeD(member.getActiveClass());
writeD(member.getLevel());
writeD(0x00); // TODO: Closes town
writeD(_room.getLocation());
if (_room.getOwner().equals(member))
{
writeD(0x01);

16
trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java
View File

@ -41,13 +41,13 @@ public class PartyMatchDetail extends L2GameServerPacket
protected final void writeImpl()
{
writeC(0x9d);
writeD(_room.getId()); // Room ID
writeD(_room.getMaxMembers()); // Max Members
writeD(_room.getMinLvl()); // Level Min
writeD(_room.getMaxLvl()); // Level Max
writeD(_room.getLootType()); // Loot Type
writeD(_room.getLocation()); // Room Location
writeS(_room.getTitle()); // Room title
writeH(0x00); // Unknown
writeD(_room.getId());
writeD(_room.getMaxMembers());
writeD(_room.getMinLvl());
writeD(_room.getMaxLvl());
writeD(_room.getLootType());
writeD(_room.getLocation());
writeS(_room.getTitle());
writeH(59064);
}
}

40
trunk/java/com/l2jserver/gameserver/util/MinionList.java
View File

@ -18,7 +18,6 @@
*/
package com.l2jserver.gameserver.util;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
@ -38,7 +37,7 @@ import com.l2jserver.util.Rnd;
*/
public class MinionList
{
private static Logger _log = Logger.getLogger(MinionList.class.getName());
private static final Logger _log = Logger.getLogger(MinionList.class.getName());
protected final L2MonsterInstance _master;
/** List containing the current spawned minions */
@ -85,7 +84,8 @@ public class MinionList
return;
}
int minionCount, minionId, minionsToSpawn;
int minionCount, minionId;
long minionsToSpawn;
for (MinionHolder minion : minions)
{
minionCount = minion.getCount();
@ -272,22 +272,16 @@ public class MinionList
{
return;
}
// searching in reused minions
if ((_reusedMinionReferences != null) && !_reusedMinionReferences.isEmpty())
if (_reusedMinionReferences != null)
{
L2MonsterInstance minion;
Iterator<L2MonsterInstance> iter = _reusedMinionReferences.iterator();
while (iter.hasNext())
final L2MonsterInstance minion = _reusedMinionReferences.stream().filter(m -> (m.getId() == minionId)).findFirst().orElse(null);
if (minion != null)
{
minion = iter.next();
if ((minion != null) && (minion.getId() == minionId))
{
iter.remove();
minion.refreshID();
initializeNpcInstance(_master, minion);
return;
}
_reusedMinionReferences.remove(minion);
minion.refreshID();
initializeNpcInstance(_master, minion);
return;
}
}
// not found in cache
@ -397,17 +391,9 @@ public class MinionList
// Statistics part
private final int countSpawnedMinionsById(int minionId)
private final long countSpawnedMinionsById(int minionId)
{
int count = 0;
for (L2MonsterInstance minion : _minionReferences)
{
if ((minion != null) && (minion.getId() == minionId))
{
count++;
}
}
return count;
return _minionReferences.stream().filter(npc -> npc.getId() == minionId).count();
}
public final int countSpawnedMinions()
@ -417,6 +403,6 @@ public class MinionList
public final long lazyCountSpawnedMinionsGroups()
{
return _minionReferences.stream().distinct().count();
return _minionReferences.stream().map(L2MonsterInstance::getId).distinct().count();
}
}