diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java index 5d0d5f667e..0ca0b27696 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0000-0099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0000-0099.xml index 2ed619979e..b3e66ccb66 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0000-0099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0000-0099.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -41,13 +41,13 @@ - + - + @@ -65,14 +65,14 @@ - + - + @@ -83,11 +83,11 @@ 204 438
1 2
- + - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -141,14 +141,14 @@ - + - + @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -198,11 +198,11 @@ - + - + @@ -227,7 +227,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -258,12 +258,12 @@ - + - + @@ -281,11 +281,11 @@ - + - + @@ -300,11 +300,11 @@ - + - + @@ -318,12 +318,12 @@ 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767
- + - + @@ -345,13 +345,13 @@ - + - + @@ -369,14 +369,14 @@ - + - + @@ -395,7 +395,7 @@ - + @@ -405,7 +405,7 @@ - + @@ -431,12 +431,12 @@ - + - + @@ -458,14 +458,14 @@ - + - + @@ -483,12 +483,12 @@ - + - + @@ -503,12 +503,12 @@ - + - + @@ -533,7 +533,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -565,12 +565,12 @@ - + - + 14663 14664 14665 14666 14667 14668 14669 14670 14671
@@ -588,12 +588,12 @@ - + - + @@ -612,12 +612,12 @@ - + - + @@ -637,14 +637,14 @@ - + - + @@ -662,7 +662,7 @@ - + @@ -673,7 +673,7 @@ - + @@ -692,12 +692,12 @@ - + - + @@ -715,11 +715,11 @@ - + - + @@ -735,7 +735,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -769,7 +769,7 @@ - + @@ -780,7 +780,7 @@ - + @@ -793,11 +793,11 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 29 29 30
- + - + @@ -816,12 +816,12 @@ - + - + @@ -835,12 +835,12 @@ - + - + @@ -857,12 +857,12 @@ - + - + @@ -890,7 +890,7 @@ - + @@ -898,7 +898,7 @@ - + @@ -924,13 +924,13 @@ - + - + @@ -943,12 +943,12 @@ - + - + @@ -961,11 +961,11 @@ - + - + @@ -983,7 +983,7 @@ - + @@ -991,7 +991,7 @@ - + @@ -1010,14 +1010,14 @@ - + - + @@ -1038,12 +1038,12 @@ - + - + @@ -1054,9 +1054,9 @@ - + - + @@ -1072,12 +1072,12 @@ - + - + @@ -1088,13 +1088,13 @@ - + - + @@ -1112,12 +1112,12 @@ - + - + @@ -1139,12 +1139,12 @@ - + - + @@ -1167,13 +1167,13 @@ - + - + @@ -1196,12 +1196,12 @@ 408 467 523
- + - + @@ -1221,11 +1221,11 @@ - + - + @@ -1238,11 +1238,11 @@ - + - + @@ -1271,12 +1271,12 @@ 138 268
- + - + @@ -1293,11 +1293,11 @@ 1 2
204 408
- + - + @@ -1310,11 +1310,11 @@ - + - + @@ -1338,7 +1338,7 @@ - + @@ -1347,7 +1347,7 @@ - + @@ -1363,11 +1363,11 @@ 10 18 27
204 379 549
- + - + @@ -1380,11 +1380,11 @@ - + - + @@ -1419,14 +1419,14 @@ - + - + @@ -1448,12 +1448,12 @@ - + - + @@ -1473,11 +1473,11 @@ - + - + @@ -1489,11 +1489,11 @@ - + - + @@ -1510,12 +1510,12 @@ 111 204
- + - + @@ -1539,12 +1539,12 @@ - + - + @@ -1566,11 +1566,11 @@ 1 2
235 523
- + - + @@ -1617,12 +1617,12 @@ - + - + @@ -1649,12 +1649,12 @@ - + - + @@ -1679,12 +1679,12 @@ - + - + @@ -1703,14 +1703,14 @@ - + - + @@ -1731,11 +1731,11 @@ 303 549
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0100-0199.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0100-0199.xml index 1b1d9ae24e..4460025764 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0100-0199.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0100-0199.xml @@ -12,14 +12,14 @@ - + - + @@ -44,14 +44,14 @@ - + - + @@ -82,12 +82,12 @@ - + - + @@ -111,14 +111,14 @@ - + - + @@ -132,11 +132,11 @@ - + - + @@ -163,14 +163,14 @@ - + - + @@ -189,12 +189,12 @@ - + - + @@ -213,12 +213,12 @@ - + - + @@ -231,11 +231,11 @@ - + - + @@ -273,11 +273,11 @@ 1780000 1760000 1740000 1720000 1700000 1680000 1660000 1640000 1620000 1600000 1580000 1560000 1540000 1520000 1500000 1480000 1460000 1440000 1420000 1400000 1380000 1360000 1340000 1320000 1300000 1280000 1260000 1240000 1220000 1200000
204 438
- + - + @@ -315,11 +315,11 @@ 1780000 1760000 1740000 1720000 1700000 1680000 1660000 1640000 1620000 1600000 1580000 1560000 1540000 1520000 1500000 1480000 1460000 1440000 1420000 1400000 1380000 1360000 1340000 1320000 1300000 1280000 1260000 1240000 1220000 1200000
268 523
- + - + @@ -348,11 +348,11 @@ 21 21 20 20 19 19 18 18 17 17 16 16 16 15 15 14 14 14 13 13 12 12 12 11 11 10 10 10 9 9
10 20 30 40
- + - + @@ -371,9 +371,9 @@ 200 400
- + - + @@ -398,12 +398,12 @@ - + - + @@ -429,12 +429,12 @@ - + - + @@ -447,9 +447,9 @@ - + - + @@ -472,14 +472,14 @@ - + - + @@ -497,11 +497,11 @@ 268 379 467 549 597 635
- + - + @@ -526,13 +526,13 @@ - + - + @@ -557,12 +557,12 @@ 379 467 549
- + - + @@ -595,12 +595,12 @@ - + - + @@ -625,12 +625,12 @@ - + - + @@ -646,11 +646,11 @@ 0.81 0.82 0.82 0.83 0.84 0.84 0.85 0.86 0.86 0.87 0.88 0.88 0.89 0.9 0.9 0.91 0.92 0.92 0.93 0.94 0.94 0.95 0.96 0.96 0.97 0.98 0.98 0.99 1.00 1.00
438 523
- + - + @@ -675,11 +675,11 @@ 18 22 27
379 467 549
- + - + @@ -698,9 +698,9 @@ - + - + @@ -711,9 +711,9 @@ 0.4 0.4 0.41 0.41 0.41 0.42 0.42 0.42 0.43 0.43 0.43 0.44 0.44 0.44 0.45 0.45 0.45 0.46 0.46 0.46 0.47 0.47 0.47 0.48 0.48 0.48 0.49 0.49 0.49 0.5
0.2 0.3 0.4
- + - + @@ -727,12 +727,12 @@ 16 19 24
341 408 495
- + - + @@ -746,9 +746,9 @@ 2 3 4
- + - + @@ -758,9 +758,9 @@ 9 11 12 13 14
0 0 0 3 3
- + - + @@ -775,17 +775,17 @@ - - - + + + 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
- + - + @@ -795,9 +795,9 @@ 10 12 14 16 18 20 23 25 28 30 34 36 40 42 43 46 47 49 52 54 56 59 61 63 66 68 70 72 74 76 78 80 82 84 86 88 91 93 95 97 99 102 104 106 108
- + - + @@ -805,9 +805,9 @@ 19 20 22 23 24 26 27 28 30 31 32 35 36 37 40 42 43 44 46 47 49 51 52 54 56 57 59 61 63 64 66 68 70 72 74 76 78 80 82 84 86 88 91 93 95 97 99 102 104 106 140
- + - + @@ -816,10 +816,10 @@ 1.9 2.7 2.9 3.6 4.5 4.7 5.6 6.7
0.9 1.1 1.2 1.5 1.7 1.8 2.1 2.5
- + - + @@ -832,9 +832,9 @@ 2.0 3.0 10.0
- + - + @@ -842,9 +842,9 @@ 1.5 1.7 1.85 2
- + - + @@ -853,9 +853,9 @@ - + - + @@ -869,30 +869,30 @@ 0.8 0.75 0.7
- + - + - + - + - + - + 1.05 1.07 1.1
- + - + @@ -900,9 +900,9 @@ 7 11
- + - + @@ -911,10 +911,10 @@ 2.5 3 3.5 4 4.5 5 5.5 6
0.8 0.9 1 1.1 1.2 1.3 1.4 1.5
- + - + @@ -926,18 +926,18 @@ - + - + 20 55
0.4 0.0
- + - + @@ -951,12 +951,12 @@ 14 21 25
303 438 523
- + - + @@ -990,12 +990,12 @@ - + - + @@ -1018,7 +1018,7 @@ - + @@ -1026,7 +1026,7 @@ - + @@ -1041,9 +1041,9 @@ 36 43 49 55 64 72
1.1 1.5 1.9 2.3 2.7 3.1
- + - + @@ -1053,18 +1053,18 @@ 24 32 40 52 64 72
32 56 93 177 295 384
- + - + - + - + @@ -1072,9 +1072,9 @@ 180 300
20 55
- + - + @@ -1082,9 +1082,9 @@ - + - + @@ -1096,9 +1096,9 @@ 0.93 0.9
7 9
- + - + @@ -1108,9 +1108,9 @@ 2 3 4
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0200-0299.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0200-0299.xml index 61ef12de2f..ab19e4ea12 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0200-0299.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0200-0299.xml @@ -9,9 +9,9 @@ 0 1 2 2 3 4 4 5 6 6 7 8 8 9 10 10 11 12 12 13 14 14 15 16 16 17 18 18 19 20
113 127 141 155 169 183 196 210 224 238 252 266 279 293 307 321 335 349 362 376 390 404 418 432 445 459 473 487 501 515
- + - + @@ -40,9 +40,9 @@ 10.3 11.4 27.6 32.8 35.6 38.6 45.2 48.9 52.7 61.1 65.6 70.4 80.9 86.5 92.4 105.1 111.9 178.8 189.9 201.4 213.5 226 239.1 252.7 266.7 281.3 296.4 311.9 328 344.5 361.6 379.1 397 415.4 434.3 453.5 473.2 493.1 513.5 534.2 555.1 576.3 597.8 619.4 641.2 663.1 685 707.1 729.1 751 772.9 794.6
- + - + @@ -55,9 +55,9 @@ 3.6 6 7.4 9 10.8 12.8 15.1 17.6 20.3 21.8 23.4 25 26.6 28.4 30.2 32.1 34.1 36.1 38.2 40.4 42.7 45 47.4 49.9 52.4 55 57.7 60.4 63.2 66.1 69 71.9 74.9 78 81.1 84.2 87.3 90.5 93.7 96.8 100 103.2 106.4 109.6 112.8
- + - + @@ -70,9 +70,9 @@ 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
- + - + @@ -89,9 +89,9 @@ 60 100 150 200 250 300 350 400 440 480
483 486 490 493 496 500 503 506 510 513 516 520 523 526 530 533 536 540 543 546 550 553 556 560 563 566 570 573 576 580
10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 190 200 210 220 230 240 250 260 270 280 290 300
- + - + @@ -108,9 +108,9 @@ 1.1 1.6 1.7 2.1 2.6 2.7 3.4 4
- + - + @@ -120,9 +120,9 @@ 30 50 70 100 140 152 180 200
- + - + @@ -131,9 +131,9 @@ - + - + @@ -147,9 +147,9 @@ 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10
- + - + @@ -165,9 +165,9 @@ 1.5 3.1 4.1 5.2 6.5 7.9 9.4 11.1 13 14 15.1 16.2 17.3 18.5 19.8 21.1 22.4 23.8 25.3 26.8 28.3 29.9 31.6 33.3 35 36.8 38.6 40.5 42.4 44.4 46.4 48.4 50.4 52.5 54.6 56.8 58.9 61.1 63.3 65.5 67.6 69.8 72 74.2 76.4
- + - + @@ -179,9 +179,9 @@ - + - + @@ -194,9 +194,9 @@ - + - + @@ -230,14 +230,14 @@ - + - + @@ -251,10 +251,10 @@ 4 5 6
- + - + @@ -266,9 +266,9 @@ - + - + @@ -281,9 +281,9 @@ 4.2 5.3 6.5 7.7 9 9.9 10.8 12.7 13.7 14.8 16.9 18 19.1 21.5 22.7 24 25.3 26.6 27.9 29.3 30.7 32.1 33.6 35 36.5 38.1 39.6 41.2 42.8 44.5 46.1 47.8 49.5 51.3 53 54.8 56.6 58.4 60.2 62.1 64 65.8 67.7 69.7 71.6 73.5 75.5 77.4 79.4 81.3
3 3 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
- + - + @@ -298,9 +298,9 @@ 1.05 1.07 1.1
- + - + @@ -310,9 +310,9 @@ 1.1 1.5 1.9 2.3 2.7 3.1 3.4
- + - + @@ -333,12 +333,12 @@ 219 495
- + - + @@ -358,9 +358,9 @@ 1.9 3.3 4.8 6.4 8.1 8.9 9.8 11.7 12.7 13.7 15.8 16.9 18 20.4 21.6 22.8 24.1 25.4 26.7 28 29.4 30.8 32.2 33.7 35.2 36.7 38.2 39.8 41.4 43 44.6 46.3 48 49.7 51.4 53.2 55 56.7 58.6 60.4 62.2 64.1 66 67.8 69.7 71.6 73.6 75.5 77.4 79.3
- + - + @@ -373,9 +373,9 @@ 17.7 19.1 20.5 23.5 25 26.7 30 31.8 33.6 37.4 39.3 41.3 45.6 47.7 50 54.6 57.1 59.5 62.1 64.6 67.3 70 72.7 75.5 78.4 81.3 84.3 87.3 90.4 93.5 96.7 99.9 103.2 106.5 109.9 113.3 116.8 120.3 123.8 127.4 131 134.7 138.4 142.1 145.8 149.6 153.4 157.2 161 164.9 168.7 172.6
0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65
- + - + @@ -391,9 +391,9 @@ 1.3 2.2 3.2 4.2 5.3 6.8 8.4 10.1 11.9 13.7 15.7 16.7 17.8 18.8 19.9 21.1 22.2 23.4 24.5 25.8 27 28.2 29.5 30.8 32.1 33.5 34.8 36.2 37.6 39.1 40.5 42 43.5 44.9 46.5 48 49.5 51.1 52.7 54.2 55.8 57.4 59.1 60.7 62.3 63.9 65.6
4 4 6 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- + - + @@ -408,9 +408,9 @@ 1.7 2.7 4.3 5.4 7.2 8.5 10.6 12.1 14.5 15.3 16.2 17.9 18.8 19.8 21.7 22.7 23.7 25.8 26.8 27.9 30.1 31.2 32.4 33.5 34.7 35.9 37.1 38.4 39.6 40.8 42.1 43.4 44.7 45.9 47.3 48.6 49.9 51.2 52.5 53.9 55.2
- + - + @@ -422,9 +422,9 @@ 7.2 8.6 11 12.7 15.4 17.4 20.5 22.7 26.3 27.6 28.8 31.5 32.9 34.2 37.1 38.6 40.1 43.2 44.8 46.4 49.8 51.5 53.2 54.9 56.7 58.5 60.3 62.1 64 65.9 67.7 69.7 71.6 73.5 75.5 77.4 79.4 81.4 83.4 85.4 87.4
- + - + @@ -436,9 +436,9 @@ 5.4 6.3 7.8 8.8 10.9 12.5 15 16.9 19.8 20.8 21.8 24 25.1 26.3 28.6 29.8 31 33.6 34.9 36.2 38.9 40.3 41.7 43.1 44.6 46 47.5 49 50.5 52.1 53.6 55.2 56.7 58.3 59.9 61.5 63.1 64.7 66.4 68 69.6
- + - + @@ -458,41 +458,41 @@ - + - + - + - + - + - + - + - + - + - + @@ -500,9 +500,9 @@ 6.7 8 9.2
- + - + @@ -519,7 +519,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -535,13 +535,13 @@ - + - + @@ -551,19 +551,19 @@ - + - + - - - + + + @@ -572,9 +572,9 @@ 1.9 3.5 5.7 7.2 8.3 10.3 11.9 14.6 16.6 20 21.3 22.6 25.4 26.9 28.5 31.8 33.6 35.4 39.2 41.2 43.2 47.5 49.8 52.1 54.4 56.8 59.2 61.7 64.3 66.8 69.4 72.1 74.8 77.4 80.2 82.9 85.6 88.4 91.1 93.8 96.5 99.3
1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45
1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17
- + - + @@ -600,9 +600,9 @@ 1.9 3.5 5.7 7.2 8.3 10.3 11.9 14.6 16.6 20 21.3 22.6 25.4 26.9 28.5 31.8 33.6 35.4 39.2 41.2 43.2 47.5 49.8 52.1 54.4 56.8 59.2 61.7 64.3 66.8 69.4 72.1 74.8 77.4 80.2 82.9 85.6 88.4 91.1 93.8 96.5 99.3
1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45
1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17
- + - + @@ -625,9 +625,9 @@ 11.6 13.4 16.1 18.4 20.9 23.8 26.9 29.1 32.8 35.4 39.6 42.6 47.3 49 50.7 54.2 56.1 57.9 61.8 63.7 65.7 69.9 72 74.2 78.6 80.9 83.2 85.5 87.8 90.2 92.6 95.1 97.6 100.1 102.6 105.1 107.7 110.3 112.9 115.5 118.1 120.8 123.4 126.1 128.8
- + - + @@ -644,9 +644,9 @@ 12.6 14.5 17.5 19.3 21.2 23.2 25.5 27 30.1 32.5 36.3 39.1 43.5 45 46.6 49.8 51.5 53.2 56.7 58.5 60.4 64.2 66.1 68.1 72.2 74.2 76.3 78.5 80.6 82.8 85.1 87.3 89.6 91.9 94.2 96.5 98.9 101.2 103.6 106 108.5 110.9 113.3 115.8 118.2
- + - + @@ -687,9 +687,9 @@ 11.6 13.3 15.2 17.2 19.5 21.1 23.7 25.6 28.7 30.8 34.3 35.5 36.7 39.3 40.6 41.9 44.7 46.1 47.6 50.6 52.1 53.7 56.9 58.6 60.2 61.9 63.6 65.3 67.1 68.9 70.7 72.5 74.3 76.1 78 79.9 81.7 83.6 85.5 87.5 89.4 91.3 93.3
- + - + @@ -730,12 +730,12 @@ 0 1 2 2 3 4 4 5 6 6 7 8 8 9 10 10 11 12 12 13 14 14 15 16 16 17 18 18 19 20
- + - + @@ -759,14 +759,14 @@ - + - + @@ -777,9 +777,9 @@ - + - + @@ -795,9 +795,9 @@ 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
- + - + @@ -811,9 +811,9 @@ 11.1 11.8 12.5 14 14.8 15.6 17.3 18.1 19 20.8 21.7 22.6 24.5 25.5 26.4 27.4 28.4 29.5 30.5 31.6 32.6 33.7 34.8 35.9 37 38.1 39.2 40.3 41.4 42.6 43.7 44.8 46
- + - + @@ -854,9 +854,9 @@ 14.8 15.6 16.5 18.3 19.2 20.2 22.1 23.1 24.1 26.2 27.3 28.4 30.6 31.8 33 34.1 35.3 36.5 37.8 39 40.3 41.5 42.8 44.1 45.4 46.7 48 49.4 50.7 52 53.4 54.7 56.1
- + - + @@ -904,7 +904,7 @@ - + @@ -912,7 +912,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -947,7 +947,7 @@ - + @@ -971,12 +971,12 @@ - + - + @@ -998,14 +998,14 @@ - + - + @@ -1021,13 +1021,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1054,13 +1054,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1087,13 +1087,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1120,13 +1120,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1153,13 +1153,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1186,13 +1186,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1219,13 +1219,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1253,13 +1253,13 @@ - + - + @@ -1287,13 +1287,13 @@ - + - + @@ -1321,13 +1321,13 @@ - + - + @@ -1355,13 +1355,13 @@ - + - + @@ -1389,13 +1389,13 @@ - + - + @@ -1423,13 +1423,13 @@ - + - + @@ -1459,13 +1459,13 @@ - + - + @@ -1491,12 +1491,12 @@ - + - + @@ -1527,13 +1527,13 @@ - + - + @@ -1556,7 +1556,7 @@ - + @@ -1565,7 +1565,7 @@ - + @@ -1590,7 +1590,7 @@ - + @@ -1599,7 +1599,7 @@ - + @@ -1613,11 +1613,11 @@ - + - + @@ -1651,12 +1651,12 @@ - + - + 14799 14800 14801 14802 14803 14804 14805
@@ -1679,7 +1679,7 @@ - + @@ -1689,7 +1689,7 @@ - + @@ -1701,9 +1701,9 @@ 22 24 28 29 31 32 38 39 41 42 48 49 50 52 53 59 61 62 64 66 72 73 75 76 78 79 81
- + - + @@ -1717,12 +1717,12 @@ 500 700 900
- + - + @@ -1732,11 +1732,11 @@ 0.6 0.4 0.2
341 467 582
- + - + @@ -1763,9 +1763,9 @@ 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85
75.24 74.48 74.48 74.69 74.69 73.92 74.88 74.1 74.1 74.26 74.26 73.47 74.4 73.6 73.6 73.71 73.71 72.9 73.8 72.98 72.98 73.04 73.04 72.21 73.08 72.24 72.24 72.25 72.25 71.4
- + - + @@ -1804,13 +1804,13 @@ - + - + @@ -1821,9 +1821,9 @@ 32.9 39.4 46.6 54.6 63.3 72.7 79.3 86.1 93.1 100.2 107.5 114.8 122.1 129.3
- + - + @@ -1835,9 +1835,9 @@ 116.9 129 141.6 150.4 159.3 168.4 177.7 187 196.5 206.2 215.8
- + - + @@ -1850,11 +1850,11 @@ - + - + @@ -1892,9 +1892,9 @@ 4.5 7.3 10.7 15.1 20.5 27.1 32.9 39.4 46.6 54.6 63.3 72.7 79.3 86.1 93.1 100.2 107.5 114.8 122.1 129.3
3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- + - + @@ -1908,9 +1908,9 @@ - + - + @@ -1922,9 +1922,9 @@ - + - + @@ -1934,9 +1934,9 @@ - + - + @@ -1950,11 +1950,11 @@ 597 646
- + - + @@ -1976,11 +1976,11 @@ - + - + @@ -2016,11 +2016,11 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0300-0399.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0300-0399.xml index 69d1aa3ed7..95d11eb51c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0300-0399.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/0300-0399.xml @@ -16,12 +16,12 @@ - + - + 14702 14703 14704 14705 14706
@@ -39,12 +39,12 @@ - + - + @@ -68,11 +68,11 @@ 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35
438 549 597 635
- + - + @@ -97,13 +97,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -130,13 +130,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -161,13 +161,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -193,13 +193,13 @@ - + - + @@ -226,13 +226,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -260,13 +260,13 @@ - + - + @@ -294,13 +294,13 @@ - + - + @@ -326,13 +326,13 @@ - + - + @@ -361,9 +361,9 @@ - + - + @@ -394,11 +394,11 @@ 566 582 597 611 624 635 646 655
- + - + @@ -469,13 +469,13 @@ - + - + @@ -497,7 +497,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -513,9 +513,9 @@ - + - + @@ -532,9 +532,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -557,9 +557,9 @@ 0.61 0.62 0.62 0.63 0.64 0.64 0.65 0.66 0.66 0.67 0.68 0.68 0.69 0.7 0.7 0.71 0.72 0.72 0.73 0.74 0.74 0.75 0.76 0.76 0.77 0.78 0.78 0.79 0.8 0.8
- + - + @@ -577,9 +577,9 @@ 2 3
5 10
- + - + @@ -615,13 +615,13 @@ - + - + @@ -636,7 +636,7 @@ - + @@ -646,7 +646,7 @@ - + @@ -670,9 +670,9 @@ 29.64 29.64 29.64 29.26 29.26 29.26 28.86 28.86 28.86 28.44 28.44 28.44 28 28 28 27.54 27.54 27.54 27.06 27.06 27.06 26.56 26.56 26.56 26.04 26.04 26.04 25.5 25.5 25.5
- + - + @@ -695,10 +695,10 @@ - + - + @@ -710,10 +710,10 @@ - + - + @@ -728,13 +728,13 @@ - + - + @@ -743,11 +743,11 @@ - + - + @@ -756,11 +756,11 @@ - + - + @@ -780,9 +780,9 @@ - + - + @@ -793,9 +793,9 @@ - + - + @@ -805,9 +805,9 @@ - + - + @@ -816,9 +816,9 @@ - + - + @@ -828,9 +828,9 @@ - + - + @@ -838,9 +838,9 @@ - + - + @@ -848,9 +848,9 @@ - + - + @@ -859,10 +859,10 @@ - + - + @@ -876,9 +876,9 @@ - + - + @@ -890,9 +890,9 @@ - + - + @@ -904,9 +904,9 @@ - + - + @@ -918,9 +918,9 @@ - + - + @@ -937,9 +937,9 @@ - + - + @@ -955,10 +955,10 @@ - + - + @@ -978,12 +978,12 @@ - + - + @@ -1008,9 +1008,9 @@ - + - + @@ -1026,9 +1026,9 @@ - + - + @@ -1048,11 +1048,11 @@ - + - + @@ -1066,12 +1066,12 @@ - + - + @@ -1087,10 +1087,10 @@ - + - + @@ -1109,9 +1109,9 @@ - + - + @@ -1123,13 +1123,13 @@ - + - + @@ -1147,9 +1147,9 @@ - + - + @@ -1167,9 +1167,9 @@ - + - + @@ -1191,9 +1191,9 @@ - + - + @@ -1215,9 +1215,9 @@ - + - + @@ -1236,13 +1236,13 @@ - + - + @@ -1260,11 +1260,11 @@ - + - + @@ -1295,11 +1295,11 @@ - + - + @@ -1333,11 +1333,11 @@ - + - + @@ -1369,10 +1369,10 @@ - + - + @@ -1387,11 +1387,11 @@ - + - + @@ -1406,11 +1406,11 @@ - + - + @@ -1429,11 +1429,11 @@ - + - + @@ -1460,9 +1460,9 @@ - + - + @@ -1485,13 +1485,13 @@ - + - + @@ -1506,13 +1506,13 @@ - + - + @@ -1528,13 +1528,13 @@ - + - + @@ -1549,13 +1549,13 @@ - + - + @@ -1573,9 +1573,9 @@ - + - + @@ -1592,12 +1592,12 @@ - + - + @@ -1613,13 +1613,13 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1000-1099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1000-1099.xml index 8023e1bdf1..63b7b48528 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1000-1099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1000-1099.xml @@ -6,9 +6,9 @@ 3 6 9 12 15 18 21 24 27 30
2 3 5 6 7 9 11 11 13 14
- + - + @@ -33,13 +33,13 @@ 285 418 532
- + - + @@ -72,13 +72,13 @@ - + - + @@ -111,13 +111,13 @@ - + - + @@ -150,13 +150,13 @@ - + - + @@ -188,13 +188,13 @@ - + - + @@ -225,13 +225,13 @@ - + - + @@ -264,13 +264,13 @@ - + - + @@ -301,13 +301,13 @@ - + - + @@ -338,12 +338,12 @@ - + - + @@ -368,12 +368,12 @@ - + - + @@ -387,12 +387,12 @@ - + - + @@ -412,12 +412,12 @@ - + - + @@ -437,12 +437,12 @@ - + - + @@ -456,12 +456,12 @@ - + - + @@ -474,12 +474,12 @@ 418 495 566
- + - + @@ -503,12 +503,12 @@ - + - + @@ -527,13 +527,13 @@ - + - + @@ -554,13 +554,13 @@ - + - + @@ -577,13 +577,13 @@ - + - + @@ -600,12 +600,12 @@ 0.7 0.6 0.5
379 457 532
- + - + @@ -636,12 +636,12 @@ 331 379 418
- + - + @@ -666,13 +666,13 @@ - + - + @@ -692,12 +692,12 @@ 243 379 457 532
- + - + @@ -734,12 +734,12 @@ 418 495
- + - + @@ -770,12 +770,12 @@ 121 243 418
- + - + @@ -808,12 +808,12 @@ - + - + @@ -833,12 +833,12 @@ - + - + @@ -869,12 +869,12 @@ 331 457 532
- + - + @@ -905,12 +905,12 @@ 418 457 495 532 597 646
- + - + @@ -938,12 +938,12 @@ - + - + @@ -968,12 +968,12 @@ 418 457 495 532 582 635
- + - + @@ -1001,13 +1001,13 @@ - + - + @@ -1023,12 +1023,12 @@ 20000 1500
- + - + @@ -1039,12 +1039,12 @@ - + - + @@ -1064,12 +1064,12 @@ 243 418 495
- + - + @@ -1105,12 +1105,12 @@ 331 495
- + - + @@ -1158,13 +1158,13 @@ - + - + @@ -1188,12 +1188,12 @@ 121 204 379
- + - + @@ -1227,12 +1227,12 @@ - + - + @@ -1259,13 +1259,13 @@ - + - + @@ -1295,13 +1295,13 @@ - + - + @@ -1323,12 +1323,12 @@ 5 7
121 417
- + - + @@ -1362,13 +1362,13 @@ - + - + @@ -1389,12 +1389,12 @@ 30 33 37 40 43 47 50 53 57 60 63 67 70 75 80
- + - + @@ -1412,12 +1412,12 @@ 243 418 495
- + - + @@ -1448,12 +1448,12 @@ 204 285 418 495 566 624
- + - + @@ -1491,13 +1491,13 @@ - + - + @@ -1524,12 +1524,12 @@ 204 331 457
- + - + @@ -1560,12 +1560,12 @@ 418 495
- + - + @@ -1596,12 +1596,12 @@ 243 418 495
- + - + @@ -1628,13 +1628,13 @@ - + - + @@ -1651,13 +1651,13 @@ - + - + @@ -1678,12 +1678,12 @@ - + - + @@ -1712,14 +1712,14 @@ - + - + @@ -1746,13 +1746,13 @@ - + - + @@ -1780,14 +1780,14 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1100-1199.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1100-1199.xml index 7339ba51d6..8070f20091 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1100-1199.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1100-1199.xml @@ -12,13 +12,13 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -65,12 +65,12 @@ - + - + @@ -95,14 +95,14 @@ - + - + @@ -120,13 +120,13 @@ - + - + @@ -145,13 +145,13 @@ - + - + @@ -169,7 +169,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -203,12 +203,12 @@ - + - + @@ -233,12 +233,12 @@ - + - + @@ -261,12 +261,12 @@ - + - + @@ -295,12 +295,12 @@ - + - + @@ -329,12 +329,12 @@ - + - + @@ -358,12 +358,12 @@ 418 495
- + - + @@ -394,12 +394,12 @@ 379 457 532
- + - + @@ -430,12 +430,12 @@ 418 495
- + - + @@ -466,12 +466,12 @@ 331 457
- + - + @@ -502,12 +502,12 @@ 331 457 532
- + - + @@ -538,12 +538,12 @@ 331 457 532
- + - + @@ -570,13 +570,13 @@ - + - + @@ -600,13 +600,13 @@ - + - + @@ -628,13 +628,13 @@ - + - + @@ -662,12 +662,12 @@ - + - + @@ -693,13 +693,13 @@ - + - + @@ -715,12 +715,12 @@ - + - + @@ -731,12 +731,12 @@ 243 379 495 549 611
- + - + @@ -757,13 +757,13 @@ - + - + @@ -791,13 +791,13 @@ - + - + @@ -818,13 +818,13 @@ - + - + @@ -849,12 +849,12 @@ - + - + @@ -881,13 +881,13 @@ - + - + @@ -911,12 +911,12 @@ - + - + @@ -936,13 +936,13 @@ - + - + @@ -967,13 +967,13 @@ - + - + @@ -999,14 +999,14 @@ - + - + @@ -1023,12 +1023,12 @@ - + - + @@ -1048,14 +1048,14 @@ - + - + @@ -1072,13 +1072,13 @@ - + - + @@ -1098,14 +1098,14 @@ - + - + @@ -1122,13 +1122,13 @@ - + - + @@ -1142,13 +1142,13 @@ - + - + @@ -1162,14 +1162,14 @@ - + - + @@ -1187,12 +1187,12 @@ 243 379 418
- + - + @@ -1221,13 +1221,13 @@ - + - + @@ -1247,14 +1247,14 @@ - + - + @@ -1277,12 +1277,12 @@ 331 379 418
- + - + @@ -1310,12 +1310,12 @@ 285 379 418
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1200-1299.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1200-1299.xml index abfba9d74a..15070a27cd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1200-1299.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1200-1299.xml @@ -17,13 +17,13 @@ - + - + @@ -47,12 +47,12 @@ 204 285
- + - + @@ -87,12 +87,12 @@ - + - + @@ -121,14 +121,14 @@ - + - + @@ -150,7 +150,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -179,14 +179,14 @@ - + - + @@ -200,7 +200,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -219,12 +219,12 @@ - + - + @@ -245,12 +245,12 @@ - + - + @@ -276,12 +276,12 @@ - + - + @@ -304,13 +304,13 @@ - + - + @@ -329,13 +329,13 @@ - + - + @@ -357,13 +357,13 @@ - + - + @@ -395,12 +395,12 @@ - + - + @@ -433,12 +433,12 @@ - + - + @@ -466,12 +466,12 @@ - + - + @@ -501,12 +501,12 @@ - + - + @@ -532,12 +532,12 @@ - + - + @@ -562,13 +562,13 @@ - + - + @@ -594,13 +594,13 @@ - + - + @@ -631,13 +631,13 @@ - + - + @@ -660,12 +660,12 @@ - + - + @@ -692,12 +692,12 @@ - + - + @@ -726,13 +726,13 @@ - + - + @@ -756,13 +756,13 @@ - + - + @@ -787,13 +787,13 @@ - + - + @@ -818,14 +818,14 @@ - + - + @@ -857,13 +857,13 @@ - + - + @@ -889,12 +889,12 @@ - + - + @@ -927,13 +927,13 @@ - + - + @@ -954,12 +954,12 @@ 379 457 532
- + - + @@ -990,12 +990,12 @@ 379 457 532
- + - + @@ -1026,12 +1026,12 @@ 379 457 532 582 611 635
- + - + @@ -1060,13 +1060,13 @@ - + - + @@ -1090,12 +1090,12 @@ - + - + @@ -1122,14 +1122,14 @@ - + - + @@ -1156,14 +1156,14 @@ - + - + @@ -1191,14 +1191,14 @@ - + - + @@ -1225,13 +1225,13 @@ - + - + @@ -1264,13 +1264,13 @@ - + - + @@ -1301,13 +1301,13 @@ 457 532
- + - + @@ -1338,13 +1338,13 @@ 379 457 532
- + - + @@ -1375,13 +1375,13 @@ 418 495 532
- + - + @@ -1407,13 +1407,13 @@ - + - + @@ -1425,13 +1425,13 @@ 20000 3500
- + - + @@ -1453,13 +1453,13 @@ - + - + @@ -1486,12 +1486,12 @@ 331 418 495
- + - + @@ -1517,12 +1517,12 @@ - + - + @@ -1539,12 +1539,12 @@ 379 495 597 646
- + - + @@ -1577,13 +1577,13 @@ - + - + @@ -1623,13 +1623,13 @@ - + - + @@ -1665,9 +1665,9 @@ 7 9 11 12 13
10 20 30 40 50
- + - + @@ -1694,13 +1694,13 @@ - + - + @@ -1722,14 +1722,14 @@ - + - + @@ -1749,14 +1749,14 @@ - + - + @@ -1772,14 +1772,14 @@ - + - + @@ -1799,14 +1799,14 @@ - + - + @@ -1828,12 +1828,12 @@ - + - + @@ -1864,7 +1864,7 @@ - + @@ -1872,7 +1872,7 @@ - + @@ -1889,13 +1889,13 @@ - + - + @@ -1913,13 +1913,13 @@ - + - + @@ -1936,13 +1936,13 @@ - + - + @@ -1956,12 +1956,12 @@ - + - + @@ -1981,12 +1981,12 @@ - + - + @@ -2013,12 +2013,12 @@ - + - + @@ -2047,13 +2047,13 @@ - + - + @@ -2082,12 +2082,12 @@ - + - + @@ -2107,12 +2107,12 @@ - + - + @@ -2134,12 +2134,12 @@ - + - + @@ -2161,12 +2161,12 @@ - + - + @@ -2194,13 +2194,13 @@ - + - + @@ -2223,9 +2223,9 @@ 15 18 18 21 24 24 24 24 27 27 27 30 30
8 9 10 11 11 11 12 12 13 13 13 14 14
- + - + @@ -2249,13 +2249,13 @@ 582 624 655
- + - + @@ -2276,12 +2276,12 @@ - + - + @@ -2293,12 +2293,12 @@ - + - + @@ -2310,12 +2310,12 @@ - + - + @@ -2329,12 +2329,12 @@ - + - + @@ -2347,13 +2347,13 @@ - + - + @@ -2371,13 +2371,13 @@ - + - + @@ -2395,13 +2395,13 @@ - + - + @@ -2419,13 +2419,13 @@ - + - + @@ -2438,13 +2438,13 @@ - + - + @@ -2457,13 +2457,13 @@ - + - + @@ -2486,14 +2486,14 @@ - + - + @@ -2515,14 +2515,14 @@ - + - + @@ -2532,9 +2532,9 @@ 3.2 4 4.3 5.1 5.8 6.2
2.6 3.2 3.5 4.1 4.7 4.9
- + - + @@ -2565,13 +2565,13 @@ - + - + @@ -2598,12 +2598,12 @@ 495 635
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1300-1399.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1300-1399.xml index 76e7740f66..31dd17c6ba 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1300-1399.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/1300-1399.xml @@ -9,12 +9,12 @@ 40 48 60
- + - + @@ -27,12 +27,12 @@ - + - + @@ -53,12 +53,12 @@ 582 635
- + - + @@ -89,12 +89,12 @@ 549 611 646
- + - + @@ -128,13 +128,13 @@ - + - + @@ -157,12 +157,12 @@ - + - + @@ -184,13 +184,13 @@ 611 635 655
- + - + @@ -221,13 +221,13 @@ 457 566 624
- + - + @@ -258,13 +258,13 @@ 457 549 597
- + - + @@ -292,13 +292,13 @@ 418 549 611 655
- + - + @@ -331,13 +331,13 @@ - + - + @@ -355,12 +355,12 @@ - + - + @@ -369,12 +369,12 @@ 24 37 50 62 70 76 82 88 94 100 104 107 110 113 116 119 121 124 127 130 133 136 139 142 145 149 155
- + - + @@ -383,65 +383,65 @@ 24 37 50 62 70 76 82 88 94 100 104 107 110 113 116 119 121 124 127 130 133 136 139 142 145 149 155
- + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -449,26 +449,26 @@ - + - + - + - + @@ -478,12 +478,12 @@ - + - + @@ -494,11 +494,11 @@ - + - + @@ -512,12 +512,12 @@ - + - + @@ -531,13 +531,13 @@ - + - + @@ -549,13 +549,13 @@ - + - + @@ -572,12 +572,12 @@ - + - + @@ -599,12 +599,12 @@ - + - + @@ -627,12 +627,12 @@ - + - + @@ -665,12 +665,12 @@ - + - + @@ -700,12 +700,12 @@ - + - + @@ -735,12 +735,12 @@ - + - + @@ -770,12 +770,12 @@ - + - + @@ -790,13 +790,13 @@ - + - + @@ -809,13 +809,13 @@ - + - + @@ -830,13 +830,13 @@ - + - + @@ -858,11 +858,11 @@ - + - + @@ -884,12 +884,12 @@ - + - + @@ -912,12 +912,12 @@ - + - + @@ -940,12 +940,12 @@ - + - + @@ -968,12 +968,12 @@ - + - + @@ -993,12 +993,12 @@ - + - + @@ -1018,13 +1018,13 @@ - + - + @@ -1032,13 +1032,13 @@ - + - + @@ -1048,9 +1048,9 @@ - + - + @@ -1075,9 +1075,9 @@ - + - + @@ -1099,12 +1099,12 @@ - + - + @@ -1136,9 +1136,9 @@ - + - + @@ -1165,12 +1165,12 @@ - + - + @@ -1180,12 +1180,12 @@ - + - + @@ -1193,12 +1193,12 @@ - + - + @@ -1215,11 +1215,11 @@ - + - + @@ -1235,11 +1235,11 @@ - + - + @@ -1257,12 +1257,12 @@ - + - + @@ -1284,12 +1284,12 @@ - + - + @@ -1312,12 +1312,12 @@ - + - + @@ -1345,13 +1345,13 @@ - + - + @@ -1368,13 +1368,13 @@ - + - + @@ -1391,14 +1391,14 @@ - + - + @@ -1413,14 +1413,14 @@ - + - + @@ -1431,13 +1431,13 @@ - + - + @@ -1454,14 +1454,14 @@ - + - + @@ -1484,13 +1484,13 @@ - + - + @@ -1505,13 +1505,13 @@ - + - + @@ -1527,14 +1527,14 @@ - + - + @@ -1552,7 +1552,7 @@ - + @@ -1562,7 +1562,7 @@ - + @@ -1574,9 +1574,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1586,9 +1586,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1598,9 +1598,9 @@ 1 2 3 4 5 6 7 8
- + - + @@ -1611,9 +1611,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1624,9 +1624,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1635,9 +1635,9 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2000-2099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2000-2099.xml index 72d8ab3d89..60f7697e1a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2000-2099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2000-2099.xml @@ -1,9 +1,9 @@  - + - + @@ -12,9 +12,9 @@ - + - + @@ -25,10 +25,10 @@ - + - + @@ -39,9 +39,9 @@ - + - + @@ -52,40 +52,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -94,9 +94,9 @@ - + - + @@ -107,9 +107,9 @@ - + - + @@ -119,116 +119,116 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -239,9 +239,9 @@ - + - + @@ -252,15 +252,15 @@ - + - + - + - + @@ -271,9 +271,9 @@ - + - + @@ -283,16 +283,16 @@ - + - + - + - + @@ -304,89 +304,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -395,10 +395,10 @@ - + - + @@ -408,10 +408,10 @@ - + - + @@ -421,10 +421,10 @@ - + - + @@ -434,10 +434,10 @@ - + - + @@ -447,10 +447,10 @@ - + - + @@ -460,10 +460,10 @@ - + - + @@ -473,10 +473,10 @@ - + - + @@ -486,10 +486,10 @@ - + - + @@ -499,10 +499,10 @@ - + - + @@ -512,37 +512,37 @@ - + - + - + - + - + - + - + - + - + - + @@ -550,83 +550,83 @@ - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + @@ -639,12 +639,12 @@ - + - + @@ -654,9 +654,9 @@ - + - + @@ -666,9 +666,9 @@ - + - + @@ -684,9 +684,9 @@ - + - + @@ -695,9 +695,9 @@ - + - + @@ -706,9 +706,9 @@ - + - + @@ -717,9 +717,9 @@ - + - + @@ -728,9 +728,9 @@ - + - + @@ -739,9 +739,9 @@ - + - + @@ -750,9 +750,9 @@ - + - + @@ -761,9 +761,9 @@ - + - + @@ -772,9 +772,9 @@ - + - + @@ -783,9 +783,9 @@ - + - + @@ -794,9 +794,9 @@ - + - + @@ -805,9 +805,9 @@ - + - + @@ -816,9 +816,9 @@ - + - + @@ -827,9 +827,9 @@ - + - + @@ -838,9 +838,9 @@ - + - + @@ -849,9 +849,9 @@ - + - + @@ -860,9 +860,9 @@ - + - + @@ -871,19 +871,19 @@ - + - + - + - + @@ -891,29 +891,29 @@ 4 6 8
- + - + - + - + - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2100-2199.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2100-2199.xml index 378927ec19..ba5c724d01 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2100-2199.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2100-2199.xml @@ -1,28 +1,28 @@  - + - + - + - + - + - + @@ -32,9 +32,9 @@ - + - + @@ -44,9 +44,9 @@ - + - + @@ -56,9 +56,9 @@ - + - + @@ -68,9 +68,9 @@ - + - + @@ -80,9 +80,9 @@ - + - + @@ -92,9 +92,9 @@ - + - + @@ -104,9 +104,9 @@ - + - + @@ -116,9 +116,9 @@ - + - + @@ -128,9 +128,9 @@ - + - + @@ -140,9 +140,9 @@ - + - + @@ -152,9 +152,9 @@ - + - + @@ -164,9 +164,9 @@ - + - + @@ -176,9 +176,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -200,9 +200,9 @@ - + - + @@ -212,9 +212,9 @@ - + - + @@ -224,9 +224,9 @@ - + - + @@ -236,9 +236,9 @@ - + - + @@ -248,9 +248,9 @@ - + - + @@ -258,10 +258,10 @@ - + - - + + @@ -269,10 +269,10 @@ - + - - + + @@ -280,19 +280,19 @@ - + - - + + - + - - + + @@ -300,10 +300,10 @@ - + - - + + @@ -311,10 +311,10 @@ - + - - + + @@ -322,10 +322,10 @@ - + - - + + @@ -333,10 +333,10 @@ - + - - + + @@ -344,10 +344,10 @@ - + - - + + @@ -355,10 +355,10 @@ - + - - + + @@ -366,10 +366,10 @@ - + - - + + @@ -377,10 +377,10 @@ - + - - + + @@ -388,10 +388,10 @@ - + - - + + @@ -399,10 +399,10 @@ - + - - + + @@ -413,17 +413,17 @@ - + - + - + - + @@ -434,9 +434,9 @@ - + - + @@ -448,9 +448,9 @@ - + - + @@ -464,9 +464,9 @@ - - - + + + @@ -475,9 +475,9 @@ - - - + + + @@ -486,9 +486,9 @@ - - - + + + @@ -497,9 +497,9 @@ - - - + + + @@ -508,9 +508,9 @@ - - - + + + @@ -519,9 +519,9 @@ - - - + + + @@ -530,9 +530,9 @@ - - - + + + @@ -541,9 +541,9 @@ - - - + + + @@ -552,9 +552,9 @@ - - - + + + @@ -563,9 +563,9 @@ - - - + + + @@ -576,10 +576,10 @@ 2.0
- + - + @@ -589,10 +589,10 @@ 2.0
- + - + @@ -602,10 +602,10 @@ 2.0
- + - + @@ -615,10 +615,10 @@ 2.0
- + - + @@ -628,10 +628,10 @@ 2.0
- + - + @@ -641,10 +641,10 @@ 1.5
- + - + @@ -654,10 +654,10 @@ 1.5
- + - + @@ -667,10 +667,10 @@ 1.5
- + - + @@ -680,10 +680,10 @@ 1.5
- + - + @@ -693,10 +693,10 @@ 1.5
- + - + @@ -706,10 +706,10 @@ 2.0
- + - + @@ -719,10 +719,10 @@ 2.0
- + - + @@ -732,10 +732,10 @@ 2.0
- + - + @@ -745,10 +745,10 @@ 2.0
- + - + @@ -758,10 +758,10 @@ 2.0
- + - + @@ -771,9 +771,9 @@ - + - + @@ -784,9 +784,9 @@ 50 200
- + - + @@ -800,18 +800,18 @@ - + - + - + - + @@ -823,9 +823,9 @@ 1.23 1.3
- + - + @@ -838,9 +838,9 @@ - + - + @@ -848,9 +848,9 @@ - - - + + + @@ -858,9 +858,9 @@ - - - + + + @@ -868,9 +868,9 @@ - - - + + + @@ -878,9 +878,9 @@ - - - + + + @@ -889,9 +889,9 @@ - - - + + + @@ -899,9 +899,9 @@ - - - + + + @@ -913,10 +913,10 @@ - + - + @@ -925,20 +925,20 @@ - + - + - + - + @@ -946,10 +946,10 @@ - + - + @@ -958,9 +958,9 @@ - - - + + + @@ -968,9 +968,9 @@ - - - + + + @@ -978,9 +978,9 @@ - - - + + + @@ -988,9 +988,9 @@ - - - + + + @@ -998,9 +998,9 @@ - - - + + + @@ -1008,9 +1008,9 @@ - - - + + + @@ -1018,18 +1018,18 @@ - - - + + + - + - + @@ -1037,12 +1037,12 @@ - + - + @@ -1051,9 +1051,9 @@ 6411 6412 6413 6414 6415 6416 6417 6418 6419
- - - + + + @@ -1062,9 +1062,9 @@ 6420 6421 6422 6423 6424 6425 6426 6427 6428
- - - + + + @@ -1073,9 +1073,9 @@ 6429 6430 6431 6432 6433 6434 6435 6436 6437
- - - + + + @@ -1084,9 +1084,9 @@ 6438 6439 6440 6441 6442 6443 6444 6445 6446
- - - + + + @@ -1095,9 +1095,9 @@ 6447 6448 6449 6450 6451 6452 6453 6454 6455
- - - + + + @@ -1106,9 +1106,9 @@ 6456 6457 6458 6459 6460 6461 6462 6463 6464
- - - + + + @@ -1117,9 +1117,9 @@ 6465 6466 6467 6468 6469 6470 6471 6472 6473
- - - + + + @@ -1128,9 +1128,9 @@ 6474 6475 6476 6477 6478 6479 6480 6481 6482
- - - + + + @@ -1139,9 +1139,9 @@ 6483 6484 6485 6486 6487 6488 6489 6490 6491
- - - + + + @@ -1150,9 +1150,9 @@ 6492 6493 6494
- - - + + + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2200-2299.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2200-2299.xml index 2a1a7c560d..e2c206ff8e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2200-2299.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/2200-2299.xml @@ -4,9 +4,9 @@ 6495 6496 6497
- - - + + + @@ -15,9 +15,9 @@ 6498 6499 6500
- - - + + + @@ -26,9 +26,9 @@ 6501 6502 6503
- - - + + + @@ -37,9 +37,9 @@ 6504 6505 6506
- - - + + + @@ -48,9 +48,9 @@ 6507 6508 6509
- - - + + + @@ -59,9 +59,9 @@ 6510 6511 6512
- - - + + + @@ -70,9 +70,9 @@ 6513 6514 6515
- - - + + + @@ -81,66 +81,66 @@ 6516 6517 6518
- - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,9 +148,9 @@ 7614 7615 7616 7617
- - - + + + @@ -158,9 +158,9 @@ 7610 7611 7612 7613
- - - + + + @@ -168,9 +168,9 @@ 7629 7630 7631 7632 7633
- - - + + + @@ -178,9 +178,9 @@ 7636 7637 7725
- - - + + + @@ -188,9 +188,9 @@ 7634 7635
- - - + + + @@ -198,9 +198,9 @@ 7726 7727 7728 7729 7730 7731 7732 7733 7734
- - - + + + @@ -208,9 +208,9 @@ 7735 7736 7737 7738 7739 7740 7741 7742 7743
- - - + + + @@ -218,9 +218,9 @@ 7744 7745 7746 7747 7748 7749 7750 7751 7752
- - - + + + @@ -228,9 +228,9 @@ 7753 7754 7755 7756 7757 7758 7759 7760 7761
- - - + + + @@ -238,9 +238,9 @@ 7762 7763 7764 7765 7766 7767 7768 7769 7770
- - - + + + @@ -248,9 +248,9 @@ 7771 7772 7773 7774 7775 7776 7777 7778 7779
- - - + + + @@ -258,9 +258,9 @@ 7780 7781 7782 7783 7784 7785 7786 7787 7788
- - - + + + @@ -268,9 +268,9 @@ 7789 7790 7791 7792 7793 7794 7795 7796 7797
- - - + + + @@ -278,29 +278,29 @@ 7798 7799 7800 7801 7802 7803 7804 7805 7806
- - - + + + 6665 6666 6667 6668 6669 6670 6671 6672
- + - + - - - + + + @@ -314,10 +314,10 @@ - + - + @@ -326,10 +326,10 @@ - + - + @@ -349,11 +349,11 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3000-3099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3000-3099.xml index d398dcc235..f7b4ebf58b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3000-3099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3000-3099.xml @@ -1,24 +1,24 @@  - + - + - + - + - + - + - + - + @@ -27,9 +27,9 @@ - + - + @@ -37,50 +37,50 @@ - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -88,9 +88,9 @@ 1 1 64 64 70
1 1 1.05 1.05 1.05
- + - + @@ -102,9 +102,9 @@ 1 64 64
1 1.05 1.05
- + - + @@ -119,9 +119,9 @@ - + - + @@ -134,9 +134,9 @@ 71 67 63 60 56 53
46 49 52 55 58 61
- + - + @@ -148,9 +148,9 @@ 50 47 45 42 40 37
46 49 52 55 58 61
- + - + @@ -163,9 +163,9 @@ 46 49 52 55 58 61
- + - + @@ -178,9 +178,9 @@ 5 5 5 6 6 7
- + - + @@ -190,9 +190,9 @@ 6 7 8 9 10 14 18
- + - + @@ -200,9 +200,9 @@ - - - + + + @@ -212,9 +212,9 @@ 5 5 6 6 6 7
46 49 52 55 58 61
- + - + @@ -226,9 +226,9 @@ 12 13 14 15 16 17
46 49 52 55 58 61
- + - + @@ -238,67 +238,67 @@ 248.56 298.04 352.73 411.98 474.82 539.9
46 49 52 55 58 61
- + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -306,9 +306,9 @@ 50 48 46 44 42 40
46 49 52 55 58 61
- + - + @@ -317,34 +317,34 @@ - - - + + + - - - + + + - - - + + + 68 69 70 71 72 73 74
8 9 10 12 14 19 21
- + - + @@ -357,10 +357,10 @@ 92 92 114 114 114 144
5 5 6 6 6 7
- + - + @@ -374,10 +374,10 @@ 92 92 114 114 114 144
5 5 6 6 6 7
- + - + @@ -391,9 +391,9 @@ 81.6 61.4 84.14 75.49 66.77 58.01 49.42 84.11 166.26 146.88 127 107.01 133.97 124.79 275.26 267.13 257.98 297.21 331.38 361.06
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1.05 1.05 1.05 1.05
- + - + @@ -405,18 +405,18 @@ 106.45 118.22 129.81 140.87 151.04 159.93
46 49 52 55 58 61
- + - + - - - + + + @@ -425,9 +425,9 @@ 1.05 1.04 1.05 1.04 1.03 1.03 1.02 1.04 1.07 1.06 1.05 1.04 1.05 1.04 1.09 1.08 1.08 1.09 1.09 1.10
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1.05 1.05 1.05 1.05
- + - + @@ -440,9 +440,9 @@ 3.9 2.8 3.7 3.1 2.6 2.2 1.8 2.9 5.7 4.8 3.9 3.2 3.8 3.4 6.5 6.5 6.5 6.5 6.5 6.5
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1.05 1.05 1.05 1.05
- + - + @@ -453,9 +453,9 @@ 1 1.05 1.1
- + - + @@ -468,9 +468,9 @@ 1 1.05 1.1
- + - + @@ -479,9 +479,9 @@ - + - + @@ -489,16 +489,16 @@ - - - + + + - - - + + + @@ -509,9 +509,9 @@ - + - + @@ -525,9 +525,9 @@ - + - + @@ -541,9 +541,9 @@ - + - + @@ -557,9 +557,9 @@ - + - + @@ -567,17 +567,17 @@ - - - + + + 1 1.05 1.1
- + - + @@ -588,9 +588,9 @@ 1 1.05
- + - + @@ -604,10 +604,10 @@ - + - + @@ -617,10 +617,10 @@ - + - + @@ -632,10 +632,10 @@ - + - + @@ -651,10 +651,10 @@ - + - + @@ -668,9 +668,9 @@ - + - + @@ -682,9 +682,9 @@ - + - + @@ -693,9 +693,9 @@ - + - + @@ -704,24 +704,24 @@ - - - + + + - - - + + + 1 1.05 1.1
- + - + @@ -730,9 +730,9 @@ - + - + @@ -744,9 +744,9 @@ 64 67 70
- + - + @@ -757,16 +757,16 @@ - - - + + + - + - + @@ -776,9 +776,9 @@ 153 167
- + - + @@ -790,10 +790,10 @@ - + - + @@ -804,10 +804,10 @@ - + - + @@ -818,9 +818,9 @@ 46 49 52 55 58 61
20.36 22.51 24.59 26.53 28.27 29.7
- + - + @@ -830,9 +830,9 @@ 46 49 52 55 58 61
75.86 87.22 99.39 112.26 125.66 139.41
- + - + @@ -843,10 +843,10 @@ - + - + @@ -857,10 +857,10 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3500-3599.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3500-3599.xml index 924014ef67..c45cc16611 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3500-3599.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3500-3599.xml @@ -2,9 +2,9 @@ - + - + @@ -16,9 +16,9 @@ - + - + @@ -28,9 +28,9 @@ - + - + @@ -40,9 +40,9 @@ - + - + @@ -52,9 +52,9 @@ - + - + @@ -66,9 +66,9 @@ - + - + @@ -78,9 +78,9 @@ - + - + @@ -92,9 +92,9 @@ - + - + @@ -108,9 +108,9 @@ - + - + @@ -120,9 +120,9 @@ - + - + @@ -132,9 +132,9 @@ - + - + @@ -146,9 +146,9 @@ - + - + @@ -160,9 +160,9 @@ - + - + @@ -172,9 +172,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -200,9 +200,9 @@ - + - + @@ -212,9 +212,9 @@ - + - + @@ -224,9 +224,9 @@ - + - + @@ -242,9 +242,9 @@ - + - + @@ -256,9 +256,9 @@ - + - + @@ -268,9 +268,9 @@ - + - + @@ -280,9 +280,9 @@ - + - + @@ -294,9 +294,9 @@ - + - + @@ -308,9 +308,9 @@ - + - + @@ -322,9 +322,9 @@ - + - + @@ -342,9 +342,9 @@ - + - + @@ -360,9 +360,9 @@ - + - + @@ -380,9 +380,9 @@ - + - + @@ -404,9 +404,9 @@ - + - + @@ -424,9 +424,9 @@ - + - + @@ -446,9 +446,9 @@ - + - + @@ -464,9 +464,9 @@ - + - + @@ -486,9 +486,9 @@ - + - + @@ -506,9 +506,9 @@ - + - + @@ -528,9 +528,9 @@ - + - + @@ -550,9 +550,9 @@ - + - + @@ -574,9 +574,9 @@ - + - + @@ -594,9 +594,9 @@ - + - + @@ -614,9 +614,9 @@ - + - + @@ -636,9 +636,9 @@ - + - + @@ -662,9 +662,9 @@ - + - + @@ -684,9 +684,9 @@ - + - + @@ -707,18 +707,18 @@ 203.97 226.51 248.71 269.91 289.4 306.42
- + - + - + - + @@ -727,9 +727,9 @@ - + - + @@ -738,9 +738,9 @@ - + - + @@ -749,9 +749,9 @@ - + - + @@ -760,9 +760,9 @@ - + - + @@ -771,9 +771,9 @@ - + - + @@ -782,9 +782,9 @@ - + - + @@ -793,9 +793,9 @@ - + - + @@ -804,9 +804,9 @@ - + - + @@ -815,9 +815,9 @@ - + - + @@ -825,9 +825,9 @@ - + - + @@ -847,9 +847,9 @@ - + - + @@ -859,9 +859,9 @@ - + - + @@ -883,9 +883,9 @@ - + - + @@ -909,9 +909,9 @@ - + - + @@ -926,9 +926,9 @@ - + - + @@ -943,9 +943,9 @@ - + - + @@ -957,9 +957,9 @@ - + - + @@ -968,9 +968,9 @@ - + - + @@ -983,9 +983,9 @@ - + - + @@ -996,9 +996,9 @@ - + - + @@ -1007,9 +1007,9 @@ - + - + @@ -1017,31 +1017,31 @@ - - - + + + - - - + + + - - - + + + 6 7 8 9 10 14
- + - + @@ -1050,10 +1050,10 @@ - + - + @@ -1063,9 +1063,9 @@ - + - + @@ -1090,9 +1090,9 @@ - + - + @@ -1104,9 +1104,9 @@ 265 906 999 1059
- + - + @@ -1116,9 +1116,9 @@ - + - + @@ -1131,10 +1131,10 @@ - + - + @@ -1145,19 +1145,19 @@ - + - + - + - + @@ -1172,12 +1172,12 @@ - + - + @@ -1186,9 +1186,9 @@ - + - + @@ -1218,11 +1218,11 @@ - + - + @@ -1232,9 +1232,9 @@ - + - + @@ -1262,11 +1262,11 @@ - + - + @@ -1274,9 +1274,9 @@ - + - + @@ -1301,9 +1301,9 @@ - + - + @@ -1333,10 +1333,10 @@ - + - + @@ -1344,9 +1344,9 @@ - + - + @@ -1378,11 +1378,11 @@ - + - + @@ -1391,9 +1391,9 @@ - + - + @@ -1425,10 +1425,10 @@ - + - + @@ -1436,9 +1436,9 @@ - + - + @@ -1474,10 +1474,10 @@ - + - + @@ -1486,9 +1486,9 @@ - + - + @@ -1518,19 +1518,19 @@ - + - + - + - + @@ -1554,11 +1554,11 @@ - + - + @@ -1569,9 +1569,9 @@ - + - + @@ -1601,17 +1601,17 @@ - + - + - + - + @@ -1637,16 +1637,16 @@ - + - + - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3600-3699.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3600-3699.xml index b3d6bf4f12..9ccc991cef 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3600-3699.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/3600-3699.xml @@ -6,9 +6,9 @@ 1 1 1 1 1 1 1.05 1.05 1.05
46 49 52 55 58 61 64 67 75 80
- + - + @@ -22,9 +22,9 @@ 1 1 1 1 1 1 1.05 1.05 1.05
46 49 52 55 58 61 64 67 75
- + - + @@ -37,9 +37,9 @@ 1 1 1 1 1 1 1.05 1.05 1.05
46 49 52 55 58 61 64 67 75
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4000-4099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4000-4099.xml index 710411ba9a..e6b703b8f6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4000-4099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4000-4099.xml @@ -10,13 +10,13 @@ - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,9 +45,9 @@ - + - + @@ -58,9 +58,9 @@ - + - + @@ -69,9 +69,9 @@ - + - + @@ -82,9 +82,9 @@ - + - + @@ -95,9 +95,9 @@ - + - + @@ -108,9 +108,9 @@ - + - + @@ -121,11 +121,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -135,11 +135,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -149,11 +149,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -163,11 +163,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -176,9 +176,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -200,9 +200,9 @@ - + - + @@ -212,9 +212,9 @@ - + - + @@ -225,12 +225,12 @@ - + - + @@ -241,11 +241,11 @@ - + - + @@ -261,13 +261,13 @@ - + - + @@ -279,11 +279,11 @@ - + - + @@ -291,9 +291,9 @@ - + - + @@ -302,28 +302,28 @@ - + - + - + - + - + - + @@ -334,12 +334,12 @@ 138 204 285 379 477 566 635 659 676 689 700 709
- + - + @@ -355,12 +355,12 @@ - + - + @@ -371,11 +371,11 @@ - + - + @@ -384,11 +384,11 @@ 20 40 70
- + - + @@ -406,11 +406,11 @@ 20 40 70
- + - + @@ -426,12 +426,12 @@ 20 40 70
- + - + @@ -447,12 +447,12 @@ 20 40 70
- + - + @@ -470,11 +470,11 @@ - + - + @@ -486,13 +486,13 @@ - + - + @@ -506,13 +506,13 @@ - + - + @@ -530,13 +530,13 @@ - + - + @@ -554,14 +554,14 @@ - + - + @@ -580,12 +580,12 @@ - + - + @@ -604,12 +604,12 @@ - + - + @@ -626,12 +626,12 @@ - + - + @@ -643,11 +643,11 @@ - + - + @@ -665,10 +665,10 @@ - + - + @@ -680,10 +680,10 @@ - + - + @@ -695,12 +695,12 @@ - + - + @@ -711,17 +711,17 @@ - + - + - + - + @@ -742,13 +742,13 @@ - + - + @@ -764,13 +764,13 @@ - + - + @@ -783,9 +783,9 @@ 1.5 1.8 2
- + - + @@ -800,12 +800,12 @@ - + - + @@ -815,12 +815,12 @@ - + - + @@ -833,10 +833,10 @@ - + - + @@ -845,10 +845,10 @@ - + - + @@ -864,10 +864,10 @@ - + - + @@ -882,10 +882,10 @@ - + - + @@ -900,10 +900,10 @@ - + - + @@ -913,17 +913,17 @@ - + - + - + - + @@ -932,9 +932,9 @@ - + - + @@ -943,9 +943,9 @@ - + - + @@ -954,9 +954,9 @@ - + - + @@ -965,9 +965,9 @@ - + - + @@ -978,9 +978,9 @@ - + - + @@ -994,11 +994,11 @@ - + - + @@ -1010,12 +1010,12 @@ - + - + @@ -1029,12 +1029,12 @@ - + - + @@ -1047,13 +1047,13 @@ - + - + @@ -1065,12 +1065,12 @@ - + - + @@ -1082,11 +1082,11 @@ - + - + @@ -1098,12 +1098,12 @@ - + - + @@ -1112,9 +1112,9 @@ - + - + @@ -1127,9 +1127,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1146,13 +1146,13 @@ - + - + @@ -1167,12 +1167,12 @@ - + - + @@ -1185,12 +1185,12 @@ 30 70
- + - + @@ -1209,11 +1209,11 @@ - + - + @@ -1230,12 +1230,12 @@ - + - + @@ -1252,12 +1252,12 @@ - + - + @@ -1269,14 +1269,14 @@ - + - + @@ -1286,12 +1286,12 @@ - + - + @@ -1300,22 +1300,22 @@ - + - + - + - + @@ -1323,13 +1323,13 @@ - + - + @@ -1341,21 +1341,21 @@ - + - + 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10
- + - + @@ -1364,9 +1364,9 @@ - + - + @@ -1375,9 +1375,9 @@ - + - + @@ -1392,13 +1392,13 @@ - + - + @@ -1410,13 +1410,13 @@ - + - + @@ -1425,11 +1425,11 @@ - + - + @@ -1441,11 +1441,11 @@ - + - + @@ -1456,11 +1456,11 @@ - + - + @@ -1474,11 +1474,11 @@ - + - + @@ -1491,9 +1491,9 @@ - + - + @@ -1507,12 +1507,12 @@ - + - + @@ -1522,9 +1522,9 @@ - + - + @@ -1534,11 +1534,11 @@ 20 40 70
- + - + @@ -1557,12 +1557,12 @@ - + - + @@ -1579,12 +1579,12 @@ - + - + @@ -1603,12 +1603,12 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4100-4199.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4100-4199.xml index 0d8e0bc895..a661bb7cf6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4100-4199.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4100-4199.xml @@ -8,14 +8,14 @@ - + - + @@ -27,12 +27,12 @@ - + - + @@ -48,13 +48,13 @@ - + - + @@ -70,11 +70,11 @@ 40 70
- + - + @@ -95,13 +95,13 @@ - + - + @@ -116,12 +116,12 @@ - + - + @@ -129,14 +129,14 @@ - + - + @@ -146,14 +146,14 @@ - + - + @@ -164,13 +164,13 @@ - + - + @@ -183,13 +183,13 @@ - + - + @@ -209,13 +209,13 @@ - + - + @@ -225,7 +225,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -246,13 +246,13 @@ - + - + @@ -260,13 +260,13 @@ - + - + @@ -280,12 +280,12 @@ - + - + @@ -294,18 +294,18 @@ - + - + 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10
- + - + @@ -321,12 +321,12 @@ - + - + @@ -342,13 +342,13 @@ - + - + @@ -365,12 +365,12 @@ - + - + @@ -389,12 +389,12 @@ - + - + @@ -403,9 +403,9 @@ - + - + @@ -416,9 +416,9 @@ - + - + @@ -436,11 +436,11 @@ - + - + @@ -452,38 +452,38 @@ - + - + - + - + - + - + - + - + @@ -491,36 +491,36 @@ - + - + - + - + - + - + @@ -529,12 +529,12 @@ - + - + @@ -545,17 +545,17 @@ - + - + - + - + @@ -563,19 +563,19 @@ - + - + - + - + @@ -584,10 +584,10 @@ - + - + @@ -599,7 +599,7 @@ - + @@ -607,7 +607,7 @@ - + @@ -619,13 +619,13 @@ - + - + @@ -634,7 +634,7 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + @@ -643,7 +643,7 @@ - + @@ -651,10 +651,10 @@ 1 2 3 4 5 6 7 8 9 10 11 12
- + - + @@ -664,13 +664,13 @@ 18 26 38 52 68 85 102 102 102 102 102 102
- + - + @@ -679,13 +679,13 @@ 18 26 38 52 68 85 102 102 102 102 102 102
- + - + @@ -694,7 +694,7 @@ 5 15 25 35 45 55 65 75 85 95
- + @@ -702,7 +702,7 @@ - + @@ -714,20 +714,20 @@ - + - + 0.83 0.8 0.77
- + - + @@ -741,10 +741,10 @@ 0.83 0.8 0.77
- + - + @@ -759,12 +759,12 @@ - + - + @@ -775,13 +775,13 @@ - + - + @@ -800,13 +800,13 @@ - + - + @@ -820,13 +820,13 @@ - + - + @@ -842,11 +842,11 @@ - + - + @@ -860,12 +860,12 @@ - + - + @@ -880,11 +880,11 @@ - + - + @@ -901,12 +901,12 @@ - + - + @@ -919,12 +919,12 @@ - + - + @@ -936,12 +936,12 @@ - + - + @@ -953,13 +953,13 @@ - + - + @@ -971,13 +971,13 @@ - + - + @@ -989,12 +989,12 @@ - + - + @@ -1006,20 +1006,20 @@ - + - + - + - + @@ -1028,10 +1028,10 @@ 0.9 0.7 0.5
- + - + @@ -1046,12 +1046,12 @@ - + - + @@ -1068,11 +1068,11 @@ - + - + @@ -1084,11 +1084,11 @@ - + - + @@ -1102,11 +1102,11 @@ - + - + @@ -1115,11 +1115,11 @@ - + - + @@ -1137,11 +1137,11 @@ - + - + @@ -1155,12 +1155,12 @@ - + - + @@ -1176,10 +1176,10 @@ - + - + @@ -1192,10 +1192,10 @@ - + - + @@ -1207,11 +1207,11 @@ - + - + @@ -1227,10 +1227,10 @@ - + - + @@ -1247,10 +1247,10 @@ - + - + @@ -1267,10 +1267,10 @@ - + - + @@ -1287,10 +1287,10 @@ - + - + @@ -1307,12 +1307,12 @@ - + - + @@ -1326,13 +1326,13 @@ - + - + @@ -1344,11 +1344,11 @@ - + - + @@ -1362,12 +1362,12 @@ - + - + @@ -1383,10 +1383,10 @@ - + - + @@ -1399,12 +1399,12 @@ - + - + @@ -1422,12 +1422,12 @@ - + - + @@ -1445,12 +1445,12 @@ - + - + @@ -1467,11 +1467,11 @@ - + - + @@ -1486,11 +1486,11 @@ - + - + @@ -1507,13 +1507,13 @@ - + - + @@ -1531,12 +1531,12 @@ - + - + @@ -1551,11 +1551,11 @@ - + - + @@ -1572,11 +1572,11 @@ - + - + @@ -1594,10 +1594,10 @@ - + - + @@ -1608,12 +1608,12 @@ - + - + @@ -1627,12 +1627,12 @@ - + - + @@ -1646,10 +1646,10 @@ - + - + @@ -1661,12 +1661,12 @@ - + - + @@ -1680,13 +1680,13 @@ - + - + @@ -1704,12 +1704,12 @@ - + - + @@ -1725,11 +1725,11 @@ - + - + @@ -1747,11 +1747,11 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4200-4299.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4200-4299.xml index f20c742ae7..2685e820f4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4200-4299.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4200-4299.xml @@ -10,10 +10,10 @@ - + - + @@ -31,12 +31,12 @@ - + - + @@ -52,12 +52,12 @@ - + - + @@ -74,12 +74,12 @@ - + - + @@ -99,12 +99,12 @@ - + - + @@ -120,12 +120,12 @@ - + - + @@ -140,12 +140,12 @@ - + - + @@ -162,13 +162,13 @@ - + - + @@ -184,10 +184,10 @@ - + - + @@ -202,12 +202,12 @@ - + - + @@ -221,12 +221,12 @@ - + - + @@ -240,10 +240,10 @@ - + - + @@ -257,10 +257,10 @@ - + - + @@ -274,10 +274,10 @@ - + - + @@ -291,10 +291,10 @@ - + - + @@ -304,10 +304,10 @@ - + - + @@ -318,12 +318,12 @@ - + - - + + @@ -331,12 +331,12 @@ - + - - + + @@ -347,12 +347,12 @@ - + - + @@ -367,13 +367,13 @@ - + - + @@ -384,12 +384,12 @@ - + - + @@ -397,40 +397,40 @@ - + - + - + - + - + - + - - + + - + - + @@ -444,9 +444,9 @@ - + - + @@ -455,17 +455,17 @@ - + - + - + - + @@ -483,11 +483,11 @@ - + - + @@ -499,11 +499,11 @@ - + - + @@ -512,11 +512,11 @@ - + - + @@ -528,11 +528,11 @@ - + - + @@ -544,20 +544,20 @@ - + - + - + - + @@ -573,18 +573,18 @@ - + - + - + - + @@ -594,12 +594,12 @@ - + - + @@ -615,13 +615,13 @@ - + - + @@ -636,13 +636,13 @@ - + - + @@ -653,9 +653,9 @@ - + - + @@ -665,9 +665,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -689,9 +689,9 @@ - + - + @@ -704,10 +704,10 @@ - + - + @@ -725,22 +725,22 @@ - + - + - + - + @@ -753,9 +753,9 @@ - + - + @@ -770,13 +770,13 @@ - + - + @@ -790,13 +790,13 @@ - + - + @@ -813,13 +813,13 @@ - + - + @@ -838,13 +838,13 @@ - + - + @@ -856,13 +856,13 @@ - + - + @@ -874,14 +874,14 @@ - + - + @@ -895,13 +895,13 @@ - + - + @@ -915,13 +915,13 @@ - + - + @@ -933,20 +933,20 @@ - + - + - + - + @@ -963,7 +963,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -982,10 +982,10 @@ - + - + @@ -1004,13 +1004,13 @@ - + - + @@ -1029,13 +1029,13 @@ - + - + @@ -1051,23 +1051,23 @@ - + - + - + - + @@ -1087,9 +1087,9 @@ - + - + @@ -1104,9 +1104,9 @@ - + - + @@ -1115,11 +1115,11 @@ - + - + @@ -1133,11 +1133,11 @@ - + - + @@ -1152,9 +1152,9 @@ 0.22 0.19 0.16 0.13 0.1 0.1 0.1 0.1 0.1 0.1
- + - + @@ -1171,17 +1171,17 @@ - + - + - + - + @@ -1189,9 +1189,9 @@ 0.5 0.5 0.15 0
1 0.5 0.5 0
- + - + @@ -1202,17 +1202,17 @@ - + - + - + - + @@ -1222,9 +1222,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1234,9 +1234,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -1246,9 +1246,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -1258,9 +1258,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -1270,9 +1270,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1281,18 +1281,18 @@ - + - + 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1304,9 +1304,9 @@ 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1318,9 +1318,9 @@ 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1332,9 +1332,9 @@ 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1344,9 +1344,9 @@ - + - + @@ -1356,9 +1356,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1368,9 +1368,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1379,9 +1379,9 @@ - + - + @@ -1391,9 +1391,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1402,9 +1402,9 @@ - + - + @@ -1419,11 +1419,11 @@ - + - + @@ -1433,72 +1433,72 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4300-4399.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4300-4399.xml index 9615d62732..f7e14c10d0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4300-4399.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4300-4399.xml @@ -2,36 +2,36 @@ - - - + + + - - - + + + - - - + + + - + - + @@ -40,9 +40,9 @@ - + - + @@ -51,9 +51,9 @@ - + - + @@ -62,9 +62,9 @@ - + - + @@ -73,9 +73,9 @@ - + - + @@ -84,9 +84,9 @@ - + - + @@ -95,9 +95,9 @@ - + - + @@ -106,9 +106,9 @@ - + - + @@ -117,9 +117,9 @@ - + - + @@ -128,9 +128,9 @@ - + - + @@ -146,9 +146,9 @@ - + - + @@ -169,14 +169,14 @@ - + - + @@ -188,13 +188,13 @@ - + - + @@ -207,14 +207,14 @@ - + - + @@ -227,11 +227,11 @@ - + - + @@ -247,11 +247,11 @@ - + - + @@ -271,12 +271,12 @@ - + - + @@ -293,14 +293,14 @@ - + - + @@ -316,12 +316,12 @@ - + - + @@ -333,11 +333,11 @@ - + - + @@ -349,11 +349,11 @@ - + - + @@ -365,11 +365,11 @@ - + - + @@ -381,11 +381,11 @@ - + - + @@ -397,11 +397,11 @@ - + - + @@ -413,11 +413,11 @@ - + - + @@ -429,11 +429,11 @@ - + - + @@ -445,11 +445,11 @@ - + - + @@ -461,11 +461,11 @@ - + - + @@ -477,11 +477,11 @@ - + - + @@ -492,9 +492,9 @@ - + - + @@ -506,9 +506,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -518,10 +518,10 @@ - + - + @@ -529,9 +529,9 @@ - + - + @@ -543,9 +543,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -555,9 +555,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -568,22 +568,22 @@ - + - + - + - + @@ -591,11 +591,11 @@ - + - + @@ -609,11 +609,11 @@ - + - + @@ -628,10 +628,10 @@ 20 33
20 30
- + - + @@ -645,10 +645,10 @@ 20 30 40
3000 6000 9000
- + - + @@ -662,10 +662,10 @@ 1.08 1.12 1.15
20 30 40
- + - + @@ -679,10 +679,10 @@ 1.08 1.12 1.15
20 30 40
- + - + @@ -697,10 +697,10 @@ 0.5 0.4 0.3 0.2
50 60 70 80
- + - + @@ -717,10 +717,10 @@ 1.1 1.15 1.2 1.25 1.3 1.35
20 30 40 50 60 70
- + - + @@ -734,10 +734,10 @@ 1.1 1.15 1.2 1.25 1.3 1.35
20 30 40 50 60 70
- + - + @@ -751,10 +751,10 @@ 1.23 1.3
20 30
- + - + @@ -769,10 +769,10 @@ 0.8 0.75 0.7 0.75
15 20 30 40
- + - + @@ -786,10 +786,10 @@ 20 30 40 50 60 70
18 25 36 42 48 53
- + - + @@ -810,10 +810,10 @@ 2 4
20 40
- + - + @@ -834,10 +834,10 @@ 1.3 1.4 1.5 1.6 1.7 1.8
20 30 40 50 60 70
- + - + @@ -851,10 +851,10 @@ 20 30 40 50
6 7 8 9
- + - + @@ -868,10 +868,10 @@ 1.15 1.23 1.3
30 45 60
- + - + @@ -885,10 +885,10 @@ 1.55 1.65 1.75
30 45 60
- + - + @@ -902,10 +902,10 @@ 1.15 1.33
30 60
- + - + @@ -919,10 +919,10 @@ 20 30 40
2 3 4
- + - + @@ -936,11 +936,11 @@ 0.2 0.25 0.3
30 45 60
- + - + @@ -954,10 +954,10 @@ 1.3 1.32 1.35
30 45 60
- + - + @@ -970,11 +970,11 @@ 1 2
- + - + @@ -990,11 +990,11 @@ 1 2
- + - + @@ -1009,11 +1009,11 @@ - + - + @@ -1026,11 +1026,11 @@ 1 2
- + - + @@ -1048,11 +1048,11 @@ 1 2
- + - + @@ -1069,11 +1069,11 @@ - + - + @@ -1085,10 +1085,10 @@ - + - + @@ -1096,10 +1096,10 @@ - + - + @@ -1109,10 +1109,10 @@ - + - + @@ -1122,10 +1122,10 @@ - + - + @@ -1135,10 +1135,10 @@ - + - + @@ -1148,10 +1148,10 @@ - + - + @@ -1161,10 +1161,10 @@ - + - + @@ -1174,10 +1174,10 @@ - + - + @@ -1187,10 +1187,10 @@ - + - + @@ -1201,9 +1201,9 @@ - + - + @@ -1217,12 +1217,12 @@ - + - + @@ -1232,12 +1232,12 @@ - + - + @@ -1249,9 +1249,9 @@ 0.9 0.85 0.8 0.75 0.7 0.35
- + - + @@ -1260,9 +1260,9 @@ - + - + @@ -1272,21 +1272,21 @@ - + - + 14 22 31 43 55 68 79 84 89 92 94 95
- + - + @@ -1300,11 +1300,11 @@ - + - + @@ -1312,11 +1312,11 @@ - + - + @@ -1327,11 +1327,11 @@ - + - + @@ -1342,11 +1342,11 @@ - + - + @@ -1357,11 +1357,11 @@ - + - + @@ -1372,9 +1372,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1384,9 +1384,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1397,9 +1397,9 @@ - + - + @@ -1408,12 +1408,12 @@ 20 33
- + - + @@ -1425,12 +1425,12 @@ 1.08 1.12 1.15
- + - + @@ -1445,9 +1445,9 @@ 1.08 1.12 1.15
- + - + @@ -1460,13 +1460,13 @@ 1.1 1.15 1.2 1.25 1.3 1.35
- + - + @@ -1478,13 +1478,13 @@ 1.1 1.15 1.2 1.25 1.3 1.35
- + - + @@ -1496,13 +1496,13 @@ 1.23 1.3
- + - + @@ -1522,10 +1522,10 @@ - + - + @@ -1544,13 +1544,13 @@ 1.3 1.4 1.5 1.6 1.7 1.8
- + - + @@ -1565,10 +1565,10 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4400-4499.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4400-4499.xml index d99f375857..0a2912423b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4400-4499.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4400-4499.xml @@ -3,13 +3,13 @@ 1.15 1.23 1.3
- + - + @@ -21,13 +21,13 @@ 1.55 1.65 1.75
- + - + @@ -39,13 +39,13 @@ 1.15 1.33
- + - + @@ -61,9 +61,9 @@ - + - + @@ -73,13 +73,13 @@ 0.2 0.25 0.3
- + - + @@ -91,13 +91,13 @@ 1.3 1.32 1.35
- + - + @@ -113,9 +113,9 @@ - + - + @@ -123,16 +123,16 @@ - - - + + + 1 1.2 1.3 2 2 4 4 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12
- + - + @@ -141,9 +141,9 @@ 1 1.2 1.3 2 2 4 4 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12
- + - + @@ -152,9 +152,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -163,9 +163,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -174,9 +174,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -185,9 +185,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -198,9 +198,9 @@ 1.3 1 0.7
0.95 1 1.05
- + - + @@ -209,9 +209,9 @@ - - - + + + @@ -229,11 +229,11 @@ 1 1 1 1 1 1 1 1 1 0.85 1 1 1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 0.85 1 1 1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.85 1 1 1 1 1 1 1 1 1 1 1 1 1
- + - + @@ -251,18 +251,18 @@ - - + + - + 0.95 0.9 0.85 0.8 0.75
- + - + @@ -271,9 +271,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -282,9 +282,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -293,9 +293,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -304,9 +304,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -315,11 +315,11 @@ 2 1.7 1.3 1 0.8
- + - + @@ -328,9 +328,9 @@ 0.85 0.7 0.5 0.3 0.1
- + - + @@ -340,9 +340,9 @@ 0.85 0.8 0.75 0.7 0.65
- + - + @@ -352,9 +352,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -364,9 +364,9 @@ 0.9 0.95 0.8 0.75 0.7
- + - + @@ -376,9 +376,9 @@ 0.85 0.7 0.5 0.3 0.1
- + - + @@ -388,9 +388,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -398,9 +398,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -408,9 +408,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -418,9 +418,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -428,11 +428,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -440,11 +440,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -452,11 +452,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -464,11 +464,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -476,11 +476,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -488,11 +488,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -500,11 +500,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -512,11 +512,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -524,9 +524,9 @@ 70 80 90 95 100
- + - + @@ -534,9 +534,9 @@ 30 35 40 45 50
- + - + @@ -546,9 +546,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -558,9 +558,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -570,9 +570,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -582,9 +582,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -594,9 +594,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -606,9 +606,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -618,9 +618,9 @@ 0.5 0.4 0.3 0.2 0.1
- + - + @@ -631,11 +631,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -643,11 +643,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -655,11 +655,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -667,11 +667,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -679,11 +679,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -691,11 +691,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -703,9 +703,9 @@ 10 15 20 25 30
- + - + @@ -713,9 +713,9 @@ 10 15 20 25 30
- + - + @@ -723,9 +723,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -735,9 +735,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -747,9 +747,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -759,9 +759,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -771,9 +771,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -783,9 +783,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -796,10 +796,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -811,10 +811,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -826,10 +826,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -841,10 +841,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -856,10 +856,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -869,11 +869,11 @@ 20 33
- + - + @@ -884,17 +884,17 @@ - - - + + + - + - + @@ -906,11 +906,11 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -925,9 +925,9 @@ - - - + + + @@ -938,13 +938,13 @@ - + - + @@ -953,21 +953,21 @@ - + - + - + - + @@ -978,11 +978,11 @@ 13 20 27 35 45
- + - + @@ -1001,13 +1001,13 @@ - + - + @@ -1016,14 +1016,14 @@ - + - + @@ -1031,26 +1031,26 @@ - + - + - + - + @@ -1062,14 +1062,14 @@ - + - + @@ -1080,7 +1080,7 @@ - + @@ -1089,7 +1089,7 @@ - + @@ -1106,12 +1106,12 @@ - + - + @@ -1120,18 +1120,18 @@ - + - + - - - + + + @@ -1144,12 +1144,12 @@ - + - + @@ -1166,12 +1166,12 @@ - + - + @@ -1190,12 +1190,12 @@ - + - + @@ -1209,13 +1209,13 @@ - + - + @@ -1223,10 +1223,10 @@ 18 29 40 53 68 83 98 104 109 113 115 117
48 50 53 55 56 57 59 60 61 62 63 65
- + - + @@ -1235,11 +1235,11 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -1248,11 +1248,11 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -1263,17 +1263,17 @@ 14 24 34 44 54 64 74 79 84 89 94 99
- + - + - - - + + + @@ -1286,10 +1286,10 @@ - + - + @@ -1302,11 +1302,11 @@ - + - + @@ -1316,27 +1316,27 @@ - + - + - + - + - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4500-4599.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4500-4599.xml index acf12fba79..16cdb06f5f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4500-4599.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4500-4599.xml @@ -2,114 +2,114 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -130,18 +130,18 @@ - + - + - + - + - + @@ -150,9 +150,9 @@ - + - + @@ -161,9 +161,9 @@ - + - + @@ -173,9 +173,9 @@ - + - + @@ -185,9 +185,9 @@ - + - + @@ -203,9 +203,9 @@ - + - + @@ -221,10 +221,10 @@ - + - + @@ -237,11 +237,11 @@ - + - + @@ -250,9 +250,9 @@ - + - + @@ -264,10 +264,10 @@ - + - + @@ -275,10 +275,10 @@ - + - + @@ -291,9 +291,9 @@ - + - + @@ -305,44 +305,44 @@ - + - + - + - + - + - + - + - + @@ -354,11 +354,11 @@ - + - + @@ -372,11 +372,11 @@ - + - + @@ -390,11 +390,11 @@ - + - + @@ -408,11 +408,11 @@ - + - + @@ -426,11 +426,11 @@ - + - + @@ -444,11 +444,11 @@ - + - + @@ -463,11 +463,11 @@ - + - + @@ -482,11 +482,11 @@ - + - + @@ -502,10 +502,10 @@ - + - + @@ -516,9 +516,9 @@ 90
- + - + @@ -526,9 +526,9 @@ - + - + @@ -542,9 +542,9 @@ - + - + @@ -554,9 +554,9 @@ - + - + @@ -567,21 +567,21 @@ - + - + - + - + @@ -591,29 +591,29 @@ - + - + - + - + - + - + @@ -623,11 +623,11 @@ - + - + @@ -646,11 +646,11 @@ - + - + @@ -669,11 +669,11 @@ - + - + @@ -692,11 +692,11 @@ - + - + @@ -711,9 +711,9 @@ - + - + @@ -724,11 +724,11 @@ - + - + @@ -739,11 +739,11 @@ - + - + @@ -754,11 +754,11 @@ - + - + @@ -770,9 +770,9 @@ - + - + @@ -785,13 +785,13 @@ 13 15 18 20 23 26 29 32 35 38 42 44
- + - + @@ -800,13 +800,13 @@ 13 15 18 20 23 26 29 32 35 38 42 44
- + - + @@ -824,11 +824,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -844,11 +844,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -864,23 +864,23 @@ - + - + 13 20 27 35 45 55 65 69 73 75 77 78
37 39 41 43 45 46 48 50 51 53 54 56
- + - + @@ -890,13 +890,13 @@ 37 39 41 43 45 46 48 50 51 53 54 56
- + - + @@ -906,13 +906,13 @@ 37 39 41 43 45 46 48 50 51 53 54 56
- + - + @@ -931,12 +931,12 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -952,11 +952,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -972,25 +972,25 @@ - + - + 18 29 40 53 68 83 98 104 109 113 115 117
42 44 46 48 50 52 55 57 58 60 62 64
- + - + @@ -1005,11 +1005,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -1021,11 +1021,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -1037,12 +1037,12 @@ - + - + 30 70
@@ -1052,12 +1052,12 @@ - + - + @@ -1081,11 +1081,11 @@ - + - + @@ -1103,13 +1103,13 @@ - + - + @@ -1126,11 +1126,11 @@ - + - + @@ -1147,12 +1147,12 @@ - + - + @@ -1172,13 +1172,13 @@ - + - + @@ -1196,13 +1196,13 @@ - + - + @@ -1221,13 +1221,13 @@ - + - + @@ -1247,12 +1247,12 @@ - + - + @@ -1269,12 +1269,12 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -1297,12 +1297,12 @@ - + - + @@ -1329,13 +1329,13 @@ - + - + @@ -1355,13 +1355,13 @@ - + - + @@ -1383,12 +1383,12 @@ - + - + @@ -1415,12 +1415,12 @@ - + - + @@ -1440,12 +1440,12 @@ - + - + @@ -1465,12 +1465,12 @@ - + - + @@ -1491,12 +1491,12 @@ - + - + @@ -1517,12 +1517,12 @@ - + - + @@ -1543,12 +1543,12 @@ - + - + @@ -1567,12 +1567,12 @@ - + - + @@ -1596,13 +1596,13 @@ - + - + @@ -1623,13 +1623,13 @@ - + - + @@ -1650,13 +1650,13 @@ - + - + @@ -1675,12 +1675,12 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4600-4699.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4600-4699.xml index b9ae75f582..957a4f2ce8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4600-4699.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4600-4699.xml @@ -8,11 +8,11 @@ - + - + @@ -28,10 +28,10 @@ 20 40 60
- + - + @@ -53,10 +53,10 @@ - + - + @@ -76,10 +76,10 @@ - + - + @@ -99,10 +99,10 @@ - + - + @@ -121,10 +121,10 @@ - + - + @@ -140,10 +140,10 @@ - + - + @@ -155,14 +155,14 @@ - + - + @@ -176,10 +176,10 @@ 30 70
- + - + @@ -202,10 +202,10 @@ 20 40 60 70
- + - + @@ -222,10 +222,10 @@ 20 40 60
- + - + @@ -242,10 +242,10 @@ 20 40 60
- + - + @@ -263,10 +263,10 @@ - + - + @@ -277,10 +277,10 @@ - + - + @@ -293,13 +293,13 @@ - + - + @@ -310,10 +310,10 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -329,19 +329,19 @@ - + - + - + - + @@ -349,10 +349,10 @@ - + - + @@ -364,9 +364,9 @@ - + - + @@ -382,10 +382,10 @@ - + - + @@ -402,10 +402,10 @@ - + - + @@ -420,10 +420,10 @@ - + - + @@ -438,10 +438,10 @@ - + - + @@ -453,9 +453,9 @@ - + - + @@ -472,9 +472,9 @@ - + - + @@ -490,10 +490,10 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -510,10 +510,10 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -525,10 +525,10 @@ - + - + @@ -542,10 +542,10 @@ - + - + @@ -560,10 +560,10 @@ - + - + @@ -576,10 +576,10 @@ 20 40 60
- + - + @@ -600,10 +600,10 @@ 20 40 60
- + - + @@ -627,10 +627,10 @@ 20 40 60
- + - + @@ -655,10 +655,10 @@ 20 40 60
- + - + @@ -683,10 +683,10 @@ 20 40 60
- + - + @@ -716,10 +716,10 @@ 20 40 60
- + - + @@ -745,10 +745,10 @@ 20 40 60
- + - + @@ -769,10 +769,10 @@ 20 40 60
- + - + @@ -797,10 +797,10 @@ 20 40 60
- + - + @@ -825,10 +825,10 @@ - + - + @@ -843,18 +843,18 @@ - + - + 1.05 1.07 1.09
- + - + @@ -870,10 +870,10 @@ - + - + @@ -886,9 +886,9 @@ 1.15 1.33
30 70
- + - + @@ -902,9 +902,9 @@ 1.15 1.25 1.3
20 40 60
- + - + @@ -918,9 +918,9 @@ 1.3 1.4 1.5
20 40 60
- + - + @@ -934,9 +934,9 @@ 1.08 1.12 1.15
20 40 60
- + - + @@ -950,9 +950,9 @@ 1.08 1.12 1.15
20 40 60
- + - + @@ -973,11 +973,11 @@ - + - + @@ -990,9 +990,9 @@ - + - + @@ -1006,9 +1006,9 @@ - + - + @@ -1019,9 +1019,9 @@ - + - + @@ -1035,10 +1035,10 @@ - + - + @@ -1052,10 +1052,10 @@ - + - + @@ -1067,10 +1067,10 @@ - + - + @@ -1082,10 +1082,10 @@ - + - + @@ -1098,10 +1098,10 @@ - + - + @@ -1118,10 +1118,10 @@ - + - + @@ -1138,10 +1138,10 @@ - + - + @@ -1158,10 +1158,10 @@ - + - + @@ -1177,10 +1177,10 @@ - + - + @@ -1198,10 +1198,10 @@ - + - + @@ -1212,9 +1212,9 @@ - + - + @@ -1229,10 +1229,10 @@ - + - + @@ -1247,10 +1247,10 @@ - + - + @@ -1265,10 +1265,10 @@ - + - + @@ -1283,10 +1283,10 @@ - + - + @@ -1301,10 +1301,10 @@ - + - + @@ -1319,10 +1319,10 @@ - + - + @@ -1335,13 +1335,13 @@ - + - + @@ -1350,8 +1350,8 @@ - - + + @@ -1362,9 +1362,9 @@ - + - + @@ -1376,10 +1376,10 @@ - + - + @@ -1394,10 +1394,10 @@ - + - + @@ -1412,10 +1412,10 @@ - + - + @@ -1430,10 +1430,10 @@ - + - + @@ -1448,10 +1448,10 @@ - + - + @@ -1466,10 +1466,10 @@ - + - + @@ -1479,9 +1479,9 @@ - + - + @@ -1490,10 +1490,10 @@ - + - + @@ -1504,24 +1504,24 @@ - + - + - + - + @@ -1530,13 +1530,13 @@ - + - + @@ -1548,14 +1548,14 @@ - + - + @@ -1565,45 +1565,45 @@ - + - + - + - + - + - + - + - + @@ -1614,14 +1614,14 @@ 3000 0
- + - + @@ -1630,20 +1630,20 @@ - + - + 0.15 0.5 0.8 1
- + - + @@ -1651,9 +1651,9 @@ - + - + @@ -1663,9 +1663,9 @@ - + - + @@ -1673,9 +1673,9 @@ - + - + @@ -1692,9 +1692,9 @@ - + - + @@ -1705,9 +1705,9 @@ - + - + @@ -1723,18 +1723,18 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + 1.2 1.3 1.4 1.5 1.75 2 3 4 5 6 8.5 11
- + - + @@ -1751,13 +1751,13 @@ 120 120 120 150 165 180 195 210 225 240 255 270 285
122 157 194 202 207 212 215 220 224 229 233 237 242
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4700-4799.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4700-4799.xml index 2c454a23e4..12fac56141 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4700-4799.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4700-4799.xml @@ -8,13 +8,13 @@ 360 360 360 450 495 540 585 630 675 720 765 810 855
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -30,13 +30,13 @@ 62 79 98 102 104 107 108 110 113 115 117 119 122
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -50,12 +50,12 @@ 120 120 120 150 165 180 195 210 225 240 255 270 285
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -73,12 +73,12 @@ 120 120 120 150 165 180 195 210 225 240 255 270 285
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -94,12 +94,12 @@ 62 79 98 102 104 107 108 110 113 115 117 119 122
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -112,12 +112,12 @@ 0.94 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9
0.95 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9
- + - + @@ -135,13 +135,13 @@ 0.95 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9
- + - + @@ -162,10 +162,10 @@ - + - + @@ -177,11 +177,11 @@ - + - + @@ -195,12 +195,12 @@ - + - + @@ -213,12 +213,12 @@ - + - + @@ -232,11 +232,11 @@ 138 204 285 379 477 566 635 659 676 689 700 709
- + - + @@ -258,10 +258,10 @@ - + - + @@ -275,11 +275,11 @@ - + - + @@ -287,23 +287,23 @@ - + - + - + - + - + - + @@ -315,11 +315,11 @@ - + - + @@ -333,11 +333,11 @@ - + - + @@ -348,10 +348,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -360,10 +360,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -372,10 +372,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -384,10 +384,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -396,10 +396,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -409,10 +409,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -426,10 +426,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -443,10 +443,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -461,11 +461,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -479,10 +479,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -498,10 +498,10 @@ - + - + @@ -512,10 +512,10 @@ - + - + @@ -526,10 +526,10 @@ - + - + @@ -540,10 +540,10 @@ - + - + @@ -552,11 +552,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -565,11 +565,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -578,11 +578,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -591,11 +591,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -604,11 +604,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -617,10 +617,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -629,10 +629,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -641,10 +641,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -653,10 +653,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -665,10 +665,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -678,10 +678,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -695,10 +695,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -713,10 +713,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -731,10 +731,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -749,10 +749,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -768,10 +768,10 @@ - + - + @@ -782,10 +782,10 @@ - + - + @@ -796,10 +796,10 @@ - + - + @@ -810,10 +810,10 @@ - + - + @@ -822,10 +822,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -834,10 +834,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -846,10 +846,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -858,10 +858,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -870,10 +870,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -883,10 +883,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -900,10 +900,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -917,10 +917,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -934,10 +934,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -951,10 +951,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -967,10 +967,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -979,10 +979,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -991,10 +991,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1003,10 +1003,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1015,10 +1015,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1028,10 +1028,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1045,10 +1045,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1062,10 +1062,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1079,10 +1079,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1096,10 +1096,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1112,10 +1112,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1124,10 +1124,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1136,10 +1136,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1148,10 +1148,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1160,10 +1160,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1172,10 +1172,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1185,10 +1185,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1198,10 +1198,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1211,10 +1211,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1224,10 +1224,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1237,10 +1237,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1254,10 +1254,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1271,10 +1271,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1288,10 +1288,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1305,10 +1305,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1320,9 +1320,9 @@ 1 2 3 4 5 6 7 8 9 10
1.03 1.06 1.09 1.1 1.12 1.15 1.18 1.21 1.24 1.27 1.3
- + - + @@ -1332,72 +1332,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4800-4899.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4800-4899.xml index 2b141262e8..3dcc8f62c6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4800-4899.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4800-4899.xml @@ -2,870 +2,870 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4900-4999.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4900-4999.xml index 7b7aaa2afd..074fa3233f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4900-4999.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/4900-4999.xml @@ -2,801 +2,801 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/7000-7099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/7000-7099.xml index 85df61c67e..723fbeb57b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/7000-7099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/7000-7099.xml @@ -3,12 +3,12 @@ - + - + @@ -17,12 +17,12 @@ - + - + @@ -31,12 +31,12 @@ - + - + @@ -46,9 +46,9 @@ - + - + @@ -62,12 +62,12 @@ - + - + @@ -82,10 +82,10 @@ - + - + @@ -94,18 +94,18 @@ - + - + - - - + + + @@ -115,9 +115,9 @@ 2 3 4 5
250 500 750 1500
250 500 750 1500
- + - + @@ -136,13 +136,13 @@ - + - + @@ -155,13 +155,13 @@ - + - + @@ -176,13 +176,13 @@ - + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/9000-9099.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/9000-9099.xml index 0ce9e9e77f..72dc18c0da 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/9000-9099.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/skills/9000-9099.xml @@ -2,9 +2,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -15,9 +15,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -28,9 +28,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -41,9 +41,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -54,9 +54,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -67,9 +67,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 411d248f58..3527dac666 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -53,6 +53,7 @@ import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.taskmanager.AttackableThinkTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -880,17 +881,17 @@ public class AttackableAI extends CreatureAI inRange = true; } - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || inRange) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive() && (Rnd.get(100) <= 5)) + if (((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL) || inRange) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive() && (Rnd.get(100) <= 5)) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { break; } boolean useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { @@ -940,15 +941,15 @@ public class AttackableAI extends CreatureAI { if (/* sk.getCastRange() >= dist && sk.getCastRange() <= 70 && */!sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk) && ((Rnd.get(100) <= 8) || ((_actor instanceof PenaltyMonster) && (Rnd.get(100) <= 20)))) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { break; } useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index a41db5e02b..1b0d3599a8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Commander; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.FortSiegeGuard; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index af079132c4..e46471501c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -363,17 +364,17 @@ public class SiegeGuardAI extends CreatureAI implements Runnable for (Skill sk : skills) { final int castRange = sk.getCastRange(); - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if (((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if (((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { break; } boolean useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { @@ -479,15 +480,15 @@ public class SiegeGuardAI extends CreatureAI implements Runnable final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist2) && (castRange <= 70) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { break; } boolean useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ISkillHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ISkillHandler.java index 04bf98c814..def1eafa6f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ISkillHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ISkillHandler.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.handler; import java.util.List; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; public interface ISkillHandler { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java index a15b054aad..2f507ec36e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java @@ -55,7 +55,7 @@ import org.l2jmobius.gameserver.handler.skillhandlers.TakeCastle; import org.l2jmobius.gameserver.handler.skillhandlers.Unlock; import org.l2jmobius.gameserver.handler.skillhandlers.ZakenPlayer; import org.l2jmobius.gameserver.handler.skillhandlers.ZakenSelf; -import org.l2jmobius.gameserver.model.Skill.SkillType; +import org.l2jmobius.gameserver.model.skill.SkillType; public class SkillHandler { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java index c226aaa71b..2b3fe8da22 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; @@ -65,7 +65,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.POISON) && (effect.getSkill().getLevel() <= 3)) + if ((effect.getSkill().getSkillType() == SkillType.POISON) && (effect.getSkill().getLevel() <= 3)) { effect.exit(true); break; @@ -80,7 +80,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.POISON) && (effect.getSkill().getLevel() <= 7)) + if ((effect.getSkill().getSkillType() == SkillType.POISON) && (effect.getSkill().getLevel() <= 7)) { effect.exit(true); break; @@ -95,7 +95,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.BLEED) && (effect.getSkill().getLevel() <= 3)) + if ((effect.getSkill().getSkillType() == SkillType.BLEED) && (effect.getSkill().getLevel() <= 3)) { effect.exit(true); break; @@ -110,7 +110,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.BLEED) && (effect.getSkill().getLevel() <= 7)) + if ((effect.getSkill().getSkillType() == SkillType.BLEED) && (effect.getSkill().getLevel() <= 7)) { effect.exit(true); break; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java index 6ffa6256e0..3c819b945a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java index b481067f93..5718606ce3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author _drunk_ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index f548bbfbcc..07fe0a45f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java @@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java index 95be872dec..576fb430d1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; public class Charge implements ISkillHandler { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java index 1ec11a68d5..6496bcf63a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java index 225bf5162c..118faafc6c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index 3247668008..5a44950663 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -38,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -234,7 +235,7 @@ public class Continuous implements ISkillHandler } } - if (target.isDead() && (skill.getTargetType() == Skill.SkillTargetType.TARGET_AREA_CORPSE_MOB) && (target instanceof Npc)) + if (target.isDead() && (skill.getTargetType() == SkillTargetType.AREA_CORPSE_MOB) && (target instanceof Npc)) { ((Npc) target).endDecayTask(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java index c25920d74b..f15c1ce0bd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java @@ -20,12 +20,12 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * Just a quick draft to support Wrath skill. Missing angle based calculation etc. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java index e013bdd9a7..1df4a6bc8d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.RecipeManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; public class Craft implements ISkillHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java index a64746aac4..1f37365ada 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author Julian diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java index 2864b14e33..1965fc2884 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Effect.EffectType; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -43,6 +42,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.tasks.player.CancelSkillRestoreTask; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -298,7 +299,7 @@ public class Disablers implements ISkillHandler { if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - if (skill.getTargetType() == Skill.SkillTargetType.TARGET_UNDEAD) + if (skill.getTargetType() == SkillTargetType.UNDEAD) { if (target.isUndead()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java index fc2184b913..8cb5ba99e2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author _drunk_ TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index 76c50cdfa5..633c3a6e9e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.type.FishingZone; import org.l2jmobius.gameserver.model.zone.type.WaterZone; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java index 549e3579b7..3762cb5471 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java @@ -21,12 +21,12 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Fishing; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java index 267a376fa8..59a7c1eb9a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; public class GetPlayer implements ISkillHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java index 1a6466c8e7..dad21b53f6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author Forsaiken diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index 436a7a13a9..76b0f7ae12 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -22,13 +22,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java index 168a524712..55609cadfc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java index 5650cab7b8..b9f0d73993 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java index 3d9b6c504b..419dc1abd0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java @@ -20,13 +20,13 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java index edf11215fb..f800b45e77 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java @@ -21,12 +21,13 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -62,7 +63,7 @@ public class Mdam implements ISkillHandler } else if (target.isAlikeDead()) { - if ((skill.getTargetType() == Skill.SkillTargetType.TARGET_AREA_CORPSE_MOB) && (target instanceof Npc)) + if ((skill.getTargetType() == SkillTargetType.AREA_CORPSE_MOB) && (target instanceof Npc)) { ((Npc) target).endDecayTask(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index f7c2950f34..7e49e38fee 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -36,6 +35,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java index 8834b55115..b7ba040c56 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java index 21a6c5f0ba..f7c66f45ad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java @@ -21,13 +21,13 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; @@ -63,7 +63,7 @@ public class Resurrect implements ISkillHandler targetPlayer = (Player) target; // Check for same party or for same clan, if target is for clan. - if ((skill.getTargetType() == SkillTargetType.TARGET_CORPSE_CLAN) && ((player == null) || (player.getClanId() != targetPlayer.getClanId()))) + if ((skill.getTargetType() == SkillTargetType.CORPSE_CLAN) && ((player == null) || (player.getClanId() != targetPlayer.getClanId()))) { continue; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java index 8a115efd40..50c9eb84d5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java index 2ed1fd9039..bde8f79007 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.ManorSeedData; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java index 096236e699..d49ecc979e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java @@ -21,12 +21,12 @@ import java.util.List; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java index a0a9f2d6a4..b40b6f1cd8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; @@ -32,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java index cc21dfef93..ab87f4211c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java index f1918d2cf1..66afdb7921 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java @@ -22,9 +22,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author evill33t diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java index 68c85d78e4..f85338cc01 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java @@ -21,13 +21,13 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java index 49344d0347..45ab70eb8c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java @@ -22,12 +22,12 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Artefact; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java index b95070b8d9..eec2dce38c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java @@ -22,12 +22,12 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java index 8cc91a18a3..101cfdb89a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java @@ -21,15 +21,15 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; public class ZakenPlayer implements ISkillHandler { private static final SkillType[] SKILL_TYPES = { - SkillType.ZAKENPLAYER + SkillType.ZAKEN_PLAYER }; @Override diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java index a8205a9f28..57d59d222b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java @@ -21,15 +21,15 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; public class ZakenSelf implements ISkillHandler { private static final SkillType[] SKILL_TYPES = { - SkillType.ZAKENSELF + SkillType.ZAKEN_SELF }; @Override diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Effect.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Effect.java index e287cf5a11..3b793c5157 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Effect.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Effect.java @@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Func; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java index 93ef7b2a62..86862d13c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -48,22 +47,15 @@ import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Env; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillOperateType; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.model.skill.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Func; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; -import org.l2jmobius.gameserver.model.skill.handlers.SkillCharge; -import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeDmg; -import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeEffect; -import org.l2jmobius.gameserver.model.skill.handlers.SkillCreateItem; -import org.l2jmobius.gameserver.model.skill.handlers.SkillDefault; -import org.l2jmobius.gameserver.model.skill.handlers.SkillDrain; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSeed; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSignet; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSignetCasttime; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSummon; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -87,203 +79,6 @@ public abstract class Skill public static final int SKILL_FAKE_DEX = 9005; public static final int SKILL_FAKE_STR = 9006; - private final int _targetConsumeId; - private final int _targetConsume; - - public enum SkillOpType - { - OP_PASSIVE, - OP_ACTIVE, - OP_TOGGLE, - OP_CHANCE - } - - /** Target types of skills : SELF, PARTY, CLAN, PET... */ - public enum SkillTargetType - { - TARGET_NONE, - TARGET_SELF, - TARGET_ONE, - TARGET_PARTY, - TARGET_ALLY, - TARGET_CLAN, - TARGET_PET, - TARGET_AREA, - TARGET_AURA, - TARGET_CORPSE, - TARGET_UNDEAD, - TARGET_AREA_UNDEAD, - TARGET_MULTIFACE, - TARGET_CORPSE_ALLY, - TARGET_CORPSE_CLAN, - TARGET_CORPSE_PLAYER, - TARGET_CORPSE_PET, - TARGET_ITEM, - TARGET_AREA_CORPSE_MOB, - TARGET_CORPSE_MOB, - TARGET_UNLOCKABLE, - TARGET_HOLY, - TARGET_PARTY_MEMBER, - TARGET_PARTY_OTHER, - TARGET_ENEMY_SUMMON, - TARGET_OWNER_PET, - TARGET_GROUND, - TARGET_SIEGE, - TARGET_TYRANNOSAURUS, - TARGET_AREA_AIM_CORPSE, - TARGET_CLAN_MEMBER - } - - public enum SkillType - { - // Damage - PDAM, - MDAM, - CPDAM, - MANADAM, - DOT, - MDOT, - DRAIN_SOUL, - DRAIN(SkillDrain.class), - DEATHLINK, - FATALCOUNTER, - BLOW, - - // Disablers - BLEED, - POISON, - STUN, - ROOT, - CONFUSION, - FEAR, - SLEEP, - CONFUSE_MOB_ONLY, - MUTE, - PARALYZE, - WEAKNESS, - - // hp, mp, cp - HEAL, - HOT, - BALANCE_LIFE, - HEAL_PERCENT, - HEAL_STATIC, - COMBATPOINTHEAL, - COMBATPOINTPERCENTHEAL, - CPHOT, - MANAHEAL, - MANA_BY_LEVEL, - MANAHEAL_PERCENT, - MANARECHARGE, - MPHOT, - - // Aggro - AGGDAMAGE, - AGGREDUCE, - AGGREMOVE, - AGGREDUCE_CHAR, - AGGDEBUFF, - - // Fishing - FISHING, - PUMPING, - REELING, - - // MISC - UNLOCK, - ENCHANT_ARMOR, - ENCHANT_WEAPON, - SOULSHOT, - SPIRITSHOT, - SIEGEFLAG, - TAKECASTLE, - DELUXE_KEY_UNLOCK, - SOW, - HARVEST, - GET_PLAYER, - - // Creation - COMMON_CRAFT, - DWARVEN_CRAFT, - CREATE_ITEM(SkillCreateItem.class), - SUMMON_TREASURE_KEY, - - // Summons - SUMMON(SkillSummon.class), - FEED_PET, - DEATHLINK_PET, - STRSIEGEASSAULT, - ERASE, - BETRAY, - - // Cancel - CANCEL, - MAGE_BANE, - WARRIOR_BANE, - NEGATE, - - BUFF, - DEBUFF, - PASSIVE, - CONT, - SIGNET(SkillSignet.class), - SIGNET_CASTTIME(SkillSignetCasttime.class), - - RESURRECT, - CHARGE(SkillCharge.class), - CHARGE_EFFECT(SkillChargeEffect.class), - CHARGEDAM(SkillChargeDmg.class), - MHOT, - DETECT_WEAKNESS, - LUCK, - RECALL, - SUMMON_FRIEND, - REFLECT, - SPOIL, - SWEEP, - FAKE_DEATH, - UNBLEED, - UNPOISON, - UNDEAD_DEFENSE, - SEED(SkillSeed.class), - BEAST_FEED, - FORCE_BUFF, - CLAN_GATE, - GIVE_SP, - COREDONE, - ZAKENPLAYER, - ZAKENSELF, - - // unimplemented - NOTDONE; - - private final Class _class; - - public Skill makeSkill(StatSet set) - { - try - { - final Constructor c = _class.getConstructor(StatSet.class); - return c.newInstance(set); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - - private SkillType() - { - _class = SkillDefault.class; - } - - private SkillType(Class classType) - { - _class = classType; - } - } - - protected ChanceCondition _chanceCondition = null; // elements public static final int ELEMENT_WIND = 1; public static final int ELEMENT_FIRE = 2; @@ -385,7 +180,7 @@ public abstract class Skill // not needed, just for easier debug private final String _name; - private final SkillOpType _operateType; + private final SkillOperateType _operateType; private final boolean _magic; private final boolean _staticReuse; private final boolean _staticHitTime; @@ -503,6 +298,11 @@ public abstract class Skill private final boolean _advancedFlag; private final int _advancedMultiplier; + private final int _targetConsumeId; + private final int _targetConsume; + + protected ChanceCondition _chanceCondition = null; + protected Skill(StatSet set) { _id = set.getInt("skill_id", 0); @@ -511,7 +311,7 @@ public abstract class Skill _advancedMultiplier = set.getInt("advancedMultiplier", 1); _displayId = set.getInt("displayId", _id); _name = set.getString("name"); - _operateType = set.getEnum("operateType", SkillOpType.class); + _operateType = set.getEnum("operateType", SkillOperateType.class); _magic = set.getBoolean("isMagic", false); _staticReuse = set.getBoolean("staticReuse", false); _staticHitTime = set.getBoolean("staticHitTime", false); @@ -571,7 +371,7 @@ public abstract class Skill _bestowed = set.getBoolean("bestowed", false); _targetConsume = set.getInt("targetConsumeCount", 0); _targetConsumeId = set.getInt("targetConsumeId", 0); - if (_operateType == SkillOpType.OP_CHANCE) + if (_operateType == SkillOperateType.CHANCE) { _chanceCondition = ChanceCondition.parse(set); } @@ -1047,22 +847,22 @@ public abstract class Skill public boolean isActive() { - return _operateType == SkillOpType.OP_ACTIVE; + return _operateType == SkillOperateType.ACTIVE; } public boolean isPassive() { - return _operateType == SkillOpType.OP_PASSIVE; + return _operateType == SkillOperateType.PASSIVE; } public boolean isToggle() { - return _operateType == SkillOpType.OP_TOGGLE; + return _operateType == SkillOperateType.TOGGLE; } public boolean isChance() { - return _operateType == SkillOpType.OP_CHANCE; + return _operateType == SkillOperateType.CHANCE; } public ChanceCondition getChanceCondition() @@ -1420,7 +1220,7 @@ public abstract class Skill switch (_targetType) { // The skill can only be used on the Creature targeted, or on the caster itself - case TARGET_ONE: + case ONE: { boolean canTargetSelf = false; switch (_skillType) @@ -1521,13 +1321,13 @@ public abstract class Skill targetList.add(target); return targetList; } - case TARGET_SELF: - case TARGET_GROUND: + case SELF: + case GROUND: { targetList.add(creature); return targetList; } - case TARGET_HOLY: + case HOLY: { if ((creature instanceof Player) && (creature.getTarget() instanceof Artefact)) { @@ -1537,7 +1337,7 @@ public abstract class Skill return null; } - case TARGET_PET: + case PET: { target = creature.getPet(); if ((target != null) && !target.isDead()) @@ -1547,7 +1347,7 @@ public abstract class Skill } return null; } - case TARGET_OWNER_PET: + case OWNER_PET: { if (creature instanceof Summon) { @@ -1560,7 +1360,7 @@ public abstract class Skill } return null; } - case TARGET_CORPSE_PET: + case CORPSE_PET: { if (creature instanceof Player) { @@ -1573,7 +1373,7 @@ public abstract class Skill } return null; } - case TARGET_AURA: + case AURA: { final int radius = _skillRadius; final boolean srcInArena = creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE); @@ -1681,7 +1481,7 @@ public abstract class Skill } return targetList; } - case TARGET_AREA: + case AREA: { // Like L2OFF players can use TARGET_AREA skills on NPC in peacezone if ((!(target instanceof Attackable) && !(target instanceof Playable) && !(target instanceof Npc)) || // Target is not Attackable or PlayableInstance or Npc @@ -1862,7 +1662,7 @@ public abstract class Skill } return targetList; } - case TARGET_MULTIFACE: + case MULTIFACE: { if (!(target instanceof Attackable) && !(target instanceof Player)) { @@ -1939,7 +1739,7 @@ public abstract class Skill return targetList; // TODO multiface targets all around right now. need it to just get targets the character is facing. } - case TARGET_PARTY: + case PARTY: { targetList.add(creature); if (onlyFirst) @@ -2004,7 +1804,7 @@ public abstract class Skill } return targetList; } - case TARGET_PARTY_MEMBER: + case PARTY_MEMBER: { if ((target != null) && !target.isDead() && ((target == creature) || ((creature.getParty() != null) && (target.getParty() != null) && (creature.getParty().getPartyLeaderOID() == target.getParty().getPartyLeaderOID())) || (creature.getPet() == target) || (creature == target.getPet()))) { @@ -2015,7 +1815,7 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_PARTY_OTHER: + case PARTY_OTHER: { if ((target != creature) && (target != null) && !target.isDead() && (creature.getParty() != null) && (target.getParty() != null) && (creature.getParty().getPartyLeaderOID() == target.getParty().getPartyLeaderOID())) { @@ -2026,15 +1826,15 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_CORPSE_ALLY: - case TARGET_ALLY: + case CORPSE_ALLY: + case ALLY: { if (creature instanceof Player) { final int radius = _skillRadius; final Player player = (Player) creature; final Clan clan = player.getClan(); - if (_targetType != SkillTargetType.TARGET_CORPSE_ALLY) // if corpse, the caster is not included + if (_targetType != SkillTargetType.CORPSE_ALLY) // if corpse, the caster is not included { if (player.isInOlympiadMode()) { @@ -2058,7 +1858,7 @@ public abstract class Skill { continue; } - if (newPlayer.isDead() && (_targetType != SkillTargetType.TARGET_CORPSE_ALLY)) + if (newPlayer.isDead() && (_targetType != SkillTargetType.CORPSE_ALLY)) { continue; } @@ -2077,15 +1877,15 @@ public abstract class Skill } return targetList; } - case TARGET_CORPSE_CLAN: - case TARGET_CLAN: + case CORPSE_CLAN: + case CLAN: { if (creature instanceof Player) { final int radius = _skillRadius; final Player player = (Player) creature; final Clan clan = player.getClan(); - if (_targetType != SkillTargetType.TARGET_CORPSE_CLAN) + if (_targetType != SkillTargetType.CORPSE_CLAN) { if (player.isInOlympiadMode()) { @@ -2120,11 +1920,11 @@ public abstract class Skill } final Summon pet = newTarget.getPet(); - if ((pet != null) && Util.checkIfInRange(radius, creature, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.TARGET_CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.TARGET_CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) + if ((pet != null) && Util.checkIfInRange(radius, creature, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) { targetList.add(pet); } - if (_targetType == SkillTargetType.TARGET_CORPSE_CLAN) + if (_targetType == SkillTargetType.CORPSE_CLAN) { if (!newTarget.isDead()) { @@ -2186,7 +1986,7 @@ public abstract class Skill } return targetList; } - case TARGET_CORPSE_PLAYER: + case CORPSE_PLAYER: { if ((target != null) && target.isDead()) { @@ -2250,7 +2050,7 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_CORPSE_MOB: + case CORPSE_MOB: { if (!(target instanceof Attackable) || !target.isDead()) { @@ -2261,7 +2061,7 @@ public abstract class Skill targetList.add(target); return targetList; } - case TARGET_AREA_CORPSE_MOB: + case AREA_CORPSE_MOB: { if (!(target instanceof Attackable) || !target.isDead()) { @@ -2378,7 +2178,7 @@ public abstract class Skill } return targetList; } - case TARGET_UNLOCKABLE: + case UNLOCKABLE: { if (!(target instanceof Door) && !(target instanceof Chest)) { @@ -2390,12 +2190,12 @@ public abstract class Skill targetList.add(target); return targetList; } - case TARGET_ITEM: + case ITEM: { creature.sendMessage("Target type of skill is not currently handled."); return null; } - case TARGET_UNDEAD: + case UNDEAD: { if ((target instanceof Npc) || (target instanceof Servitor)) { @@ -2411,7 +2211,7 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_AREA_UNDEAD: + case AREA_UNDEAD: { Creature cha; final int radius = _skillRadius; @@ -2477,7 +2277,7 @@ public abstract class Skill } return targetList; } - case TARGET_ENEMY_SUMMON: + case ENEMY_SUMMON: { if (target instanceof Summon) { @@ -2490,7 +2290,7 @@ public abstract class Skill } return null; } - case TARGET_SIEGE: + case SIEGE: { if ((target != null) && !target.isDead() && ((target instanceof Door) || (target instanceof ControlTower))) { @@ -2499,7 +2299,7 @@ public abstract class Skill } return null; } - case TARGET_TYRANNOSAURUS: + case TYRANNOSAURUS: { if (target instanceof Player) { @@ -2513,7 +2313,7 @@ public abstract class Skill } return null; } - case TARGET_AREA_AIM_CORPSE: + case AREA_AIM_CORPSE: { if ((target != null) && target.isDead()) { @@ -2523,7 +2323,7 @@ public abstract class Skill return null; } // npc only for now - untested - case TARGET_CLAN_MEMBER: + case CLAN_MEMBER: { if (creature instanceof Npc) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index dc0b60ca3c..0b55c4456f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -54,8 +54,6 @@ import org.l2jmobius.gameserver.model.ForceBuff; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; @@ -89,6 +87,8 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skill.Calculator; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.model.skill.funcs.Func; @@ -1337,7 +1337,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return; } boolean canCast = true; - if ((skill.getTargetType() == SkillTargetType.TARGET_GROUND) && (this instanceof Player)) + if ((skill.getTargetType() == SkillTargetType.GROUND) && (this instanceof Player)) { final Location wp = ((Player) this).getCurrentSkillWorldPosition(); if (!region.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ())) @@ -1386,7 +1386,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder final List targets = skill.getTargetList(this); // Set the target of the skill in function of Skill Type and Target Type Creature target = null; - if ((skill.getTargetType() == SkillTargetType.TARGET_AURA) || (skill.getTargetType() == SkillTargetType.TARGET_GROUND) || skill.isPotion()) + if ((skill.getTargetType() == SkillTargetType.AURA) || (skill.getTargetType() == SkillTargetType.GROUND) || skill.isPotion()) { target = this; } @@ -1395,7 +1395,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; } - else if (((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.REFLECT) || (skill.getSkillType() == SkillType.SEED) || (skill.getTargetType() == SkillTargetType.TARGET_SELF) || (skill.getTargetType() == SkillTargetType.TARGET_PET) || (skill.getTargetType() == SkillTargetType.TARGET_PARTY) || (skill.getTargetType() == SkillTargetType.TARGET_CLAN) || (skill.getTargetType() == SkillTargetType.TARGET_ALLY)) && !skill.isPotion()) + else if (((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.REFLECT) || (skill.getSkillType() == SkillType.SEED) || (skill.getTargetType() == SkillTargetType.SELF) || (skill.getTargetType() == SkillTargetType.PET) || (skill.getTargetType() == SkillTargetType.PARTY) || (skill.getTargetType() == SkillTargetType.CLAN) || (skill.getTargetType() == SkillTargetType.ALLY)) && !skill.isPotion()) { target = targets.get(0); } @@ -1899,8 +1899,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder switch (skill.getTargetType()) { - case TARGET_AURA: // AURA, SELF should be cast even if no target has been found - case TARGET_SELF: + case AURA: // AURA, SELF should be cast even if no target has been found + case SELF: { target = this; break; @@ -6820,7 +6820,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder */ public void onMagicLaunchedTimer(List targets, Skill skill, int coolTime, boolean instant) { - if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.TARGET_AURA))) + if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.AURA))) { _skillCast = null; enableAllSkills(); @@ -6878,7 +6878,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder } } - if (targetList.isEmpty() && (skill.getTargetType() != SkillTargetType.TARGET_AURA)) + if (targetList.isEmpty() && (skill.getTargetType() != SkillTargetType.AURA)) { if (this instanceof Player) { @@ -6949,7 +6949,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder */ public void onMagicHitTimer(List targets, Skill skill, int coolTime, boolean instant) { - if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.TARGET_AURA))) + if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.AURA))) { _skillCast = null; enableAllSkills(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java index caee383a27..438659a576 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.CastleTeleporter; @@ -78,6 +77,7 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.TownZone; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index b6f1be8be6..9bc35223b8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -97,8 +97,6 @@ import org.l2jmobius.gameserver.model.Request; import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SubClass; import org.l2jmobius.gameserver.model.Timestamp; @@ -161,6 +159,8 @@ import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.siege.clanhalls.DevastatedCastle; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.model.skill.handlers.SkillSummon; @@ -649,7 +649,7 @@ public class Player extends Playable // Like L2OFF you can use cupid bow skills on peace zone // Like L2OFF players can use TARGET_AURA skills on peace zone, all targets will be ignored. // Check limited to active target. - if (skill.isOffensive() && (isInsidePeaceZone(Player.this, getTarget()) && (skill.getTargetType() != SkillTargetType.TARGET_AURA)) && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262/* Double Heart Shot */))) + if (skill.isOffensive() && (isInsidePeaceZone(Player.this, getTarget()) && (skill.getTargetType() != SkillTargetType.AURA)) && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262/* Double Heart Shot */))) { sendPacket(ActionFailed.STATIC_PACKET); return; @@ -664,7 +664,7 @@ public class Player extends Playable switch (skill.getTargetType()) { - case TARGET_GROUND: + case GROUND: { return; } @@ -2435,7 +2435,7 @@ public class Player extends Playable final Skill effectSkill = currenteffect.getSkill(); // Ignore all buff skills that are party related (ie. songs, dances) while still remaining weapon dependant on cast though. // Check to rest to assure current effect meets weapon requirements. - if (!effectSkill.isOffensive() && ((effectSkill.getTargetType() != SkillTargetType.TARGET_PARTY) || (effectSkill.getSkillType() != SkillType.BUFF)) && !effectSkill.getWeaponDependancy(this)) + if (!effectSkill.isOffensive() && ((effectSkill.getTargetType() != SkillTargetType.PARTY) || (effectSkill.getSkillType() != SkillType.BUFF)) && !effectSkill.getWeaponDependancy(this)) { sendMessage(effectSkill.getName() + " cannot be used with this weapon."); currenteffect.exit(); @@ -9231,7 +9231,7 @@ public class Player extends Playable switch (skillTargetType) { // Target the player if skill type is AURA, PARTY, CLAN or SELF - case TARGET_AURA: + case AURA: { if (isInOlympiadMode() && !isOlympiadStart()) { @@ -9239,16 +9239,16 @@ public class Player extends Playable } // fallthough? } - case TARGET_PARTY: - case TARGET_ALLY: - case TARGET_CLAN: - case TARGET_GROUND: - case TARGET_SELF: + case PARTY: + case ALLY: + case CLAN: + case GROUND: + case SELF: { target = this; break; } - case TARGET_PET: + case PET: { target = getPet(); break; @@ -9461,14 +9461,14 @@ public class Player extends Playable { if (isInsidePeaceZone(this, target) // Like L2OFF you can use cupid bow skills on peace zone && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262 /* Double Heart Shot */) // - && (skillTargetType != SkillTargetType.TARGET_AURA))) // Like L2OFF people can use TARGET_AURE skills on peace zone + && (skillTargetType != SkillTargetType.AURA))) // Like L2OFF people can use TARGET_AURE skills on peace zone { // If Creature or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); sendPacket(ActionFailed.STATIC_PACKET); return; } - if (isInOlympiadMode() && !isOlympiadStart() && (skillTargetType != SkillTargetType.TARGET_AURA)) + if (isInOlympiadMode() && !isOlympiadStart() && (skillTargetType != SkillTargetType.AURA)) { // if Player is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed sendPacket(ActionFailed.STATIC_PACKET); @@ -9484,12 +9484,12 @@ public class Player extends Playable // Check if a Forced ATTACK is in progress on non-attackable target if (!target.isAutoAttackable(this) // && (!forceUse && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262 /* Double Heart Shot */))) // - && (skillTargetType != SkillTargetType.TARGET_AURA) // - && (skillTargetType != SkillTargetType.TARGET_CLAN) // - && (skillTargetType != SkillTargetType.TARGET_ALLY) // - && (skillTargetType != SkillTargetType.TARGET_PARTY) // - && (skillTargetType != SkillTargetType.TARGET_SELF) // - && (skillTargetType != SkillTargetType.TARGET_GROUND)) + && (skillTargetType != SkillTargetType.AURA) // + && (skillTargetType != SkillTargetType.CLAN) // + && (skillTargetType != SkillTargetType.ALLY) // + && (skillTargetType != SkillTargetType.PARTY) // + && (skillTargetType != SkillTargetType.SELF) // + && (skillTargetType != SkillTargetType.GROUND)) { // Send a Server->Client packet ActionFailed to the Player sendPacket(ActionFailed.STATIC_PACKET); @@ -9500,7 +9500,7 @@ public class Player extends Playable if (dontMove) { // Calculate the distance between the Player and the target - if (skillTargetType == SkillTargetType.TARGET_GROUND) + if (skillTargetType == SkillTargetType.GROUND) { if (!isInsideRadius2D(getCurrentSkillWorldPosition().getX(), getCurrentSkillWorldPosition().getY(), getCurrentSkillWorldPosition().getZ(), skill.getCastRange() + getTemplate().getCollisionRadius())) { @@ -9534,7 +9534,7 @@ public class Player extends Playable } } // Check if the skill is defensive and if the target is a monster and if force attack is set.. if not then we don't want to cast. - if (!skill.isOffensive() && (target instanceof Monster) && !forceUse && (skillTargetType != SkillTargetType.TARGET_PET) && (skillTargetType != SkillTargetType.TARGET_AURA) && (skillTargetType != SkillTargetType.TARGET_CLAN) && (skillTargetType != SkillTargetType.TARGET_SELF) && (skillTargetType != SkillTargetType.TARGET_PARTY) && (skillTargetType != SkillTargetType.TARGET_ALLY) && (skillTargetType != SkillTargetType.TARGET_CORPSE_MOB) && (skillTargetType != SkillTargetType.TARGET_AREA_CORPSE_MOB) && (skillTargetType != SkillTargetType.TARGET_GROUND) && (skillType != SkillType.BEAST_FEED) && (skillType != SkillType.DELUXE_KEY_UNLOCK) && (skillType != SkillType.UNLOCK)) + if (!skill.isOffensive() && (target instanceof Monster) && !forceUse && (skillTargetType != SkillTargetType.PET) && (skillTargetType != SkillTargetType.AURA) && (skillTargetType != SkillTargetType.CLAN) && (skillTargetType != SkillTargetType.SELF) && (skillTargetType != SkillTargetType.PARTY) && (skillTargetType != SkillTargetType.ALLY) && (skillTargetType != SkillTargetType.CORPSE_MOB) && (skillTargetType != SkillTargetType.AREA_CORPSE_MOB) && (skillTargetType != SkillTargetType.GROUND) && (skillType != SkillType.BEAST_FEED) && (skillType != SkillType.DELUXE_KEY_UNLOCK) && (skillType != SkillType.UNLOCK)) { // send the action failed so that the skill doens't go off. sendPacket(ActionFailed.STATIC_PACKET); @@ -9591,7 +9591,7 @@ public class Player extends Playable return; } - if ((skillTargetType == SkillTargetType.TARGET_GROUND) && (getCurrentSkillWorldPosition() == null)) + if ((skillTargetType == SkillTargetType.GROUND) && (getCurrentSkillWorldPosition() == null)) { sendPacket(ActionFailed.STATIC_PACKET); return; @@ -9600,12 +9600,12 @@ public class Player extends Playable // Check if this is a Pvp skill and target isn't a non-flagged/non-karma player switch (skillTargetType) { - case TARGET_PARTY: - case TARGET_ALLY: // For such skills, checkPvpSkill() is called from Skill.getTargetList() - case TARGET_CLAN: // For such skills, checkPvpSkill() is called from Skill.getTargetList() - case TARGET_AURA: - case TARGET_SELF: - case TARGET_GROUND: + case PARTY: + case ALLY: // For such skills, checkPvpSkill() is called from Skill.getTargetList() + case CLAN: // For such skills, checkPvpSkill() is called from Skill.getTargetList() + case AURA: + case SELF: + case GROUND: { break; } @@ -9625,7 +9625,7 @@ public class Player extends Playable } } - if ((skillTargetType == SkillTargetType.TARGET_HOLY) && !TakeCastle.checkIfOkToCastSealOfRule(this, false)) + if ((skillTargetType == SkillTargetType.HOLY) && !TakeCastle.checkIfOkToCastSealOfRule(this, false)) { sendPacket(ActionFailed.STATIC_PACKET); abortCast(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java index d7dcb8ccf7..bd0a8c9da6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.Door; @@ -40,6 +38,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; @@ -595,15 +595,15 @@ public abstract class Summon extends Playable switch (skill.getTargetType()) { // OWNER_PET should be cast even if no target has been found - case TARGET_OWNER_PET: + case OWNER_PET: { target = _owner; break; } // PARTY, AURA, SELF should be cast even if no target has been found - case TARGET_PARTY: - case TARGET_AURA: - case TARGET_SELF: + case PARTY: + case AURA: + case SELF: { target = this; break; @@ -704,7 +704,7 @@ public abstract class Summon extends Playable } // Check if a Forced ATTACK is in progress on non-attackable target - if (!target.isAutoAttackable(this) && !forceUse && (skill.getTargetType() != SkillTargetType.TARGET_AURA) && (skill.getTargetType() != SkillTargetType.TARGET_CLAN) && (skill.getTargetType() != SkillTargetType.TARGET_ALLY) && (skill.getTargetType() != SkillTargetType.TARGET_PARTY) && (skill.getTargetType() != SkillTargetType.TARGET_SELF)) + if (!target.isAutoAttackable(this) && !forceUse && (skill.getTargetType() != SkillTargetType.AURA) && (skill.getTargetType() != SkillTargetType.CLAN) && (skill.getTargetType() != SkillTargetType.ALLY) && (skill.getTargetType() != SkillTargetType.PARTY) && (skill.getTargetType() != SkillTargetType.SELF)) { return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java index 24a07507bc..011572d72d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @version $Revision: 1.15.2.10.2.16 $ $Date: 2005/04/06 16:13:40 $ @@ -45,7 +47,7 @@ public class BabyPet extends Pet for (Skill skill : getTemplate().getSkills().values()) { // just in case, also allow cp heal and mp recharges to be considered here...you never know ;) - if (skill.isActive() && (skill.getTargetType() == Skill.SkillTargetType.TARGET_OWNER_PET) && ((skill.getSkillType() == Skill.SkillType.HEAL) || (skill.getSkillType() == Skill.SkillType.HOT) || (skill.getSkillType() == Skill.SkillType.BALANCE_LIFE) || (skill.getSkillType() == Skill.SkillType.HEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.HEAL_STATIC) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == Skill.SkillType.CPHOT) || (skill.getSkillType() == Skill.SkillType.MANAHEAL) || (skill.getSkillType() == Skill.SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == Skill.SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.MANARECHARGE) || (skill.getSkillType() == Skill.SkillType.MPHOT))) + if (skill.isActive() && (skill.getTargetType() == SkillTargetType.OWNER_PET) && ((skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.HOT) || (skill.getSkillType() == SkillType.BALANCE_LIFE) || (skill.getSkillType() == SkillType.HEAL_PERCENT) || (skill.getSkillType() == SkillType.HEAL_STATIC) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.CPHOT) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == SkillType.MANARECHARGE) || (skill.getSkillType() == SkillType.MPHOT))) { // only consider two skills. If the pet has more, too bad...they won't be used by its AI. // for now assign the first two skills in the order they come. Once we have both skills, re-arrange them diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java index 235ee8d59e..4b418ff544 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.TeleportLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java index a560d3fe97..8c6e1601c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java @@ -31,13 +31,13 @@ import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.handlers.SkillDrain; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 757441a658..17617f8f99 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.StopMove; @@ -255,7 +256,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a buff, check if the owner has it already [ owner.getEffect(Skill skill) ] - if (skill.getSkillType() == Skill.SkillType.BUFF) + if (skill.getSkillType() == SkillType.BUFF) { totalBuffsAvailable++; } @@ -339,7 +340,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a debuff, check if the attacker has it already [ attacker.getEffect(Skill skill) ] - if ((skill.getSkillType() == Skill.SkillType.DEBUFF) && (Rnd.get(3) < 1) && (attacker.getFirstEffect(skill) != null)) + if ((skill.getSkillType() == SkillType.DEBUFF) && (Rnd.get(3) < 1) && (attacker.getFirstEffect(skill) != null)) { sitCastAndFollow(skill, attacker); } @@ -359,7 +360,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a buff, check if the owner has it already [ owner.getEffect(Skill skill) ] - if ((Rnd.get(5) < chance) && ((skill.getSkillType() == Skill.SkillType.HEAL) || (skill.getSkillType() == Skill.SkillType.HOT) || (skill.getSkillType() == Skill.SkillType.BALANCE_LIFE) || (skill.getSkillType() == Skill.SkillType.HEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.HEAL_STATIC) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == Skill.SkillType.CPHOT) || (skill.getSkillType() == Skill.SkillType.MANAHEAL) || (skill.getSkillType() == Skill.SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == Skill.SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.MANARECHARGE) || (skill.getSkillType() == Skill.SkillType.MPHOT))) + if ((Rnd.get(5) < chance) && ((skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.HOT) || (skill.getSkillType() == SkillType.BALANCE_LIFE) || (skill.getSkillType() == SkillType.HEAL_PERCENT) || (skill.getSkillType() == SkillType.HEAL_STATIC) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.CPHOT) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == SkillType.MANARECHARGE) || (skill.getSkillType() == SkillType.MPHOT))) { sitCastAndFollow(skill, _owner); return; @@ -498,7 +499,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : _tamedBeast.getTemplate().getSkills().values()) { // if the skill is a buff, check if the owner has it already [ owner.getEffect(Skill skill) ] - if (skill.getSkillType() == Skill.SkillType.BUFF) + if (skill.getSkillType() == SkillType.BUFF) { if (i == rand) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java index 73128812ac..b7cd730f59 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -35,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.skill.funcs.Func; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java index 9896dee02a..58f374408e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillOperateType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillOperateType.java new file mode 100644 index 0000000000..fb0e4ad6a2 --- /dev/null +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillOperateType.java @@ -0,0 +1,28 @@ +/* + * 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 . + */ +package org.l2jmobius.gameserver.model.skill; + +/** + * @author Mobius + */ +public enum SkillOperateType +{ + PASSIVE, + ACTIVE, + TOGGLE, + CHANCE +} \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillTargetType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillTargetType.java new file mode 100644 index 0000000000..2bd9de826a --- /dev/null +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillTargetType.java @@ -0,0 +1,55 @@ +/* + * 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 . + */ +package org.l2jmobius.gameserver.model.skill; + +/** + * @author Mobius + */ +public enum SkillTargetType +{ + NONE, + SELF, + ONE, + PARTY, + ALLY, + CLAN, + PET, + AREA, + AURA, + CORPSE, + UNDEAD, + AREA_UNDEAD, + MULTIFACE, + CORPSE_ALLY, + CORPSE_CLAN, + CORPSE_PLAYER, + CORPSE_PET, + ITEM, + AREA_CORPSE_MOB, + CORPSE_MOB, + UNLOCKABLE, + HOLY, + PARTY_MEMBER, + PARTY_OTHER, + ENEMY_SUMMON, + OWNER_PET, + GROUND, + SIEGE, + TYRANNOSAURUS, + AREA_AIM_CORPSE, + CLAN_MEMBER +} diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillType.java new file mode 100644 index 0000000000..2d0280752d --- /dev/null +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/SkillType.java @@ -0,0 +1,184 @@ +/* + * 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 . + */ +package org.l2jmobius.gameserver.model.skill; + +import java.lang.reflect.Constructor; + +import org.l2jmobius.gameserver.model.Skill; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skill.handlers.SkillCharge; +import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeDmg; +import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeEffect; +import org.l2jmobius.gameserver.model.skill.handlers.SkillCreateItem; +import org.l2jmobius.gameserver.model.skill.handlers.SkillDefault; +import org.l2jmobius.gameserver.model.skill.handlers.SkillDrain; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSeed; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSignet; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSignetCasttime; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSummon; + +/** + * @author Mobius + */ +public enum SkillType +{ + // Damage + PDAM, + MDAM, + CPDAM, + MANADAM, + DOT, + MDOT, + DRAIN_SOUL, + DRAIN(SkillDrain.class), + DEATHLINK, + FATALCOUNTER, + BLOW, + + // Disablers + BLEED, + POISON, + STUN, + ROOT, + CONFUSION, + FEAR, + SLEEP, + CONFUSE_MOB_ONLY, + MUTE, + PARALYZE, + WEAKNESS, + + // HP, MP, CP + HEAL, + HOT, + BALANCE_LIFE, + HEAL_PERCENT, + HEAL_STATIC, + COMBATPOINTHEAL, + COMBATPOINTPERCENTHEAL, + CPHOT, + MANAHEAL, + MANA_BY_LEVEL, + MANAHEAL_PERCENT, + MANARECHARGE, + MPHOT, + + // Aggro + AGGDAMAGE, + AGGREDUCE, + AGGREMOVE, + AGGREDUCE_CHAR, + AGGDEBUFF, + + // Fishing + FISHING, + PUMPING, + REELING, + + // Misc + UNLOCK, + ENCHANT_ARMOR, + ENCHANT_WEAPON, + SOULSHOT, + SPIRITSHOT, + SIEGEFLAG, + TAKECASTLE, + DELUXE_KEY_UNLOCK, + SOW, + HARVEST, + GET_PLAYER, + + // Creation + COMMON_CRAFT, + DWARVEN_CRAFT, + CREATE_ITEM(SkillCreateItem.class), + SUMMON_TREASURE_KEY, + + // Summons + SUMMON(SkillSummon.class), + FEED_PET, + DEATHLINK_PET, + STRSIEGEASSAULT, + ERASE, + BETRAY, + + // Cancel + CANCEL, + MAGE_BANE, + WARRIOR_BANE, + NEGATE, + + BUFF, + DEBUFF, + PASSIVE, + CONT, + SIGNET(SkillSignet.class), + SIGNET_CASTTIME(SkillSignetCasttime.class), + + RESURRECT, + CHARGE(SkillCharge.class), + CHARGE_EFFECT(SkillChargeEffect.class), + CHARGEDAM(SkillChargeDmg.class), + MHOT, + DETECT_WEAKNESS, + LUCK, + RECALL, + SUMMON_FRIEND, + REFLECT, + SPOIL, + SWEEP, + FAKE_DEATH, + UNBLEED, + UNPOISON, + UNDEAD_DEFENSE, + SEED(SkillSeed.class), + BEAST_FEED, + FORCE_BUFF, + CLAN_GATE, + GIVE_SP, + CORE_DONE, + ZAKEN_PLAYER, + ZAKEN_SELF, + + // Unimplemented + NOT_DONE; + + private final Class _class; + + public Skill makeSkill(StatSet set) + { + try + { + final Constructor c = _class.getConstructor(StatSet.class); + return c.newInstance(set); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + private SkillType() + { + _class = SkillDefault.class; + } + + private SkillType(Class classType) + { + _class = classType; + } +} diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java index 2a0c55d616..b00787f849 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java index 796ce1148b..f54db2c1a0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java index 4c0c55c84d..03af8157ed 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -66,7 +66,7 @@ class EffectDamOverTime extends Effect } } - final boolean awake = !(getEffected() instanceof Attackable) && ((getSkill().getTargetType() != SkillTargetType.TARGET_SELF) || !getSkill().isToggle()); + final boolean awake = !(getEffected() instanceof Attackable) && ((getSkill().getTargetType() != SkillTargetType.SELF) || !getSkill().isToggle()); getEffected().reduceCurrentHpByDamOverTime(damage, getEffector(), awake, getPeriod()); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java index 062c56f18e..cc54b42255 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java index c924fbbdfd..0d0f18c9af 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java @@ -20,8 +20,8 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author Gnat diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java index 71bc41e203..a130d0c668 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Env; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.model.skill.handlers.SkillSignetCasttime; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; @@ -81,7 +81,7 @@ public class EffectSignetMDam extends Effect int x = getEffector().getX(); int y = getEffector().getY(); int z = getEffector().getZ(); - if ((getEffector() instanceof Player) && (getSkill().getTargetType() == Skill.SkillTargetType.TARGET_GROUND)) + if ((getEffector() instanceof Player) && (getSkill().getTargetType() == SkillTargetType.GROUND)) { final Location wordPosition = ((Player) getEffector()).getCurrentSkillWorldPosition(); if (wordPosition != null) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java index 40170dd887..5c7de7d24c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java index 5e08d09eaf..32cda909f9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java @@ -21,8 +21,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Lambda; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java index 60ce4af81a..a80017f83b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -80,7 +81,7 @@ public class SkillChargeDmg extends Skill double modifier = 0; modifier = (effect.getLevel() - getNumCharges()) * 0.33; - if ((getTargetType() != SkillTargetType.TARGET_AREA) && (getTargetType() != SkillTargetType.TARGET_MULTIFACE)) + if ((getTargetType() != SkillTargetType.AREA) && (getTargetType() != SkillTargetType.MULTIFACE)) { effect.numCharges -= getNumCharges(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java index fcbb460098..3208496ae4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Cubic; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -62,7 +63,7 @@ public class SkillDrain extends Skill continue; } - if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (target.isAlikeDead() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { continue; } @@ -107,7 +108,7 @@ public class SkillDrain extends Skill creature.sendPacket(suhp); // Check to see if we should damage the target - if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB))) + if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.CORPSE_MOB))) { // Manage attack or cast break of the target (calculating rate, sending message...) if (!target.isRaid() && Formulas.calcAtkBreak(target, damage)) @@ -117,7 +118,7 @@ public class SkillDrain extends Skill } creature.sendDamageMessage(target, damage, mcrit, false, false); - if (hasEffects() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (hasEffects() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { if (target.reflectSkill(this)) { @@ -149,7 +150,7 @@ public class SkillDrain extends Skill } // Check to see if we should do the decay right after the cast - if (target.isDead() && (getTargetType() == SkillTargetType.TARGET_CORPSE_MOB) && (target instanceof Npc)) + if (target.isDead() && (getTargetType() == SkillTargetType.CORPSE_MOB) && (target instanceof Npc)) { ((Npc) target).endDecayTask(); } @@ -179,7 +180,7 @@ public class SkillDrain extends Skill { for (Creature target : targets) { - if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (target.isAlikeDead() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { continue; } @@ -196,7 +197,7 @@ public class SkillDrain extends Skill owner.sendPacket(suhp); // Check to see if we should damage the target - if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB))) + if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.CORPSE_MOB))) { target.reduceCurrentHp(damage, activeCubic.getOwner()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java index 5e6f8ee72e..fe3f0e5b92 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.model.skill.effects.EffectSeed; public class SkillSeed extends Skill @@ -44,7 +45,7 @@ public class SkillSeed extends Skill for (WorldObject target2 : targets) { final Creature target = (Creature) target2; - if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (target.isAlikeDead() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { continue; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java index 8bda361ccd..2d593b34f9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; public class SkillSignet extends Skill { @@ -58,7 +59,7 @@ public class SkillSignet extends Skill int x = caster.getX(); int y = caster.getY(); int z = caster.getZ(); - if ((caster instanceof Player) && (getTargetType() == Skill.SkillTargetType.TARGET_GROUND)) + if ((caster instanceof Player) && (getTargetType() == SkillTargetType.GROUND)) { final Location wordPosition = ((Player) caster).getCurrentSkillWorldPosition(); if (wordPosition != null) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java index e4db286a93..25e0850b23 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java @@ -30,9 +30,10 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Cubic; -import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; +import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -79,10 +80,11 @@ public class SkillSummon extends Skill final Player player = (Player) creature; if (_isCubic) { - if (getTargetType() != Skill.SkillTargetType.TARGET_SELF) + if (getTargetType() != SkillTargetType.SELF) { return true; // Player is always able to cast mass cubic skill } + final int mastery = player.getSkillLevel(SKILL_CUBIC_MASTERY); final int count = player.getCubics().size(); if (count > mastery) @@ -97,6 +99,7 @@ public class SkillSummon extends Skill { return false; } + if (player.getPet() != null) { creature.sendPacket(new SystemMessage(SystemMessageId.YOU_ALREADY_HAVE_A_PET)); @@ -236,7 +239,7 @@ public class SkillSummon extends Skill World.getInstance().storeObject(summon); // Check to see if we should do the decay right after the cast - if (getTargetType() == SkillTargetType.TARGET_CORPSE_MOB) + if (getTargetType() == SkillTargetType.CORPSE_MOB) { final Creature target = targets.get(0); if (target.isDead() && (target instanceof Npc)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9fbc7ec30a..268da1fc0c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -20,8 +20,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java index a96d47f192..1ed15ccd3b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -34,7 +34,6 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.item.ItemTemplate; @@ -42,12 +41,14 @@ import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.skill.conditions.ConditionElementSeed; import org.l2jmobius.gameserver.model.skill.conditions.ConditionForceBuff; import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameTime; +import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameTime.CheckGameTime; import org.l2jmobius.gameserver.model.skill.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.skill.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.skill.conditions.ConditionLogicOr; @@ -58,6 +59,7 @@ import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerLevel; import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerMp; import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerRace; import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerState; +import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerState.CheckPlayerState; import org.l2jmobius.gameserver.model.skill.conditions.ConditionSkillStats; import org.l2jmobius.gameserver.model.skill.conditions.ConditionSlotItemId; import org.l2jmobius.gameserver.model.skill.conditions.ConditionTargetAggro; @@ -68,8 +70,6 @@ import org.l2jmobius.gameserver.model.skill.conditions.ConditionTargetUsesWeapon import org.l2jmobius.gameserver.model.skill.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.skill.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.skill.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameTime.CheckGameTime; -import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerState.CheckPlayerState; import org.l2jmobius.gameserver.model.skill.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Lambda; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java index 0a92df6e0b..31a8251bdd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java @@ -25,9 +25,9 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skill.SkillType; +import org.l2jmobius.gameserver.model.skill.conditions.Condition; /** * @author mkizub diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java index 5d0d5f667e..0ca0b27696 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0000-0099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0000-0099.xml index 2ed619979e..b3e66ccb66 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0000-0099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0000-0099.xml @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -41,13 +41,13 @@ - + - + @@ -65,14 +65,14 @@ - + - + @@ -83,11 +83,11 @@ 204 438
1 2
- + - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -141,14 +141,14 @@ - + - + @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -198,11 +198,11 @@ - + - + @@ -227,7 +227,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -258,12 +258,12 @@ - + - + @@ -281,11 +281,11 @@ - + - + @@ -300,11 +300,11 @@ - + - + @@ -318,12 +318,12 @@ 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767
- + - + @@ -345,13 +345,13 @@ - + - + @@ -369,14 +369,14 @@ - + - + @@ -395,7 +395,7 @@ - + @@ -405,7 +405,7 @@ - + @@ -431,12 +431,12 @@ - + - + @@ -458,14 +458,14 @@ - + - + @@ -483,12 +483,12 @@ - + - + @@ -503,12 +503,12 @@ - + - + @@ -533,7 +533,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -565,12 +565,12 @@ - + - + 14663 14664 14665 14666 14667 14668 14669 14670 14671
@@ -588,12 +588,12 @@ - + - + @@ -612,12 +612,12 @@ - + - + @@ -637,14 +637,14 @@ - + - + @@ -662,7 +662,7 @@ - + @@ -673,7 +673,7 @@ - + @@ -692,12 +692,12 @@ - + - + @@ -715,11 +715,11 @@ - + - + @@ -735,7 +735,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -769,7 +769,7 @@ - + @@ -780,7 +780,7 @@ - + @@ -793,11 +793,11 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 29 29 30
- + - + @@ -816,12 +816,12 @@ - + - + @@ -835,12 +835,12 @@ - + - + @@ -857,12 +857,12 @@ - + - + @@ -890,7 +890,7 @@ - + @@ -898,7 +898,7 @@ - + @@ -924,13 +924,13 @@ - + - + @@ -943,12 +943,12 @@ - + - + @@ -961,11 +961,11 @@ - + - + @@ -983,7 +983,7 @@ - + @@ -991,7 +991,7 @@ - + @@ -1010,14 +1010,14 @@ - + - + @@ -1038,12 +1038,12 @@ - + - + @@ -1054,9 +1054,9 @@ - + - + @@ -1072,12 +1072,12 @@ - + - + @@ -1088,13 +1088,13 @@ - + - + @@ -1112,12 +1112,12 @@ - + - + @@ -1139,12 +1139,12 @@ - + - + @@ -1167,13 +1167,13 @@ - + - + @@ -1196,12 +1196,12 @@ 408 467 523
- + - + @@ -1221,11 +1221,11 @@ - + - + @@ -1238,11 +1238,11 @@ - + - + @@ -1271,12 +1271,12 @@ 138 268
- + - + @@ -1293,11 +1293,11 @@ 1 2
204 408
- + - + @@ -1310,11 +1310,11 @@ - + - + @@ -1338,7 +1338,7 @@ - + @@ -1347,7 +1347,7 @@ - + @@ -1363,11 +1363,11 @@ 10 18 27
204 379 549
- + - + @@ -1380,11 +1380,11 @@ - + - + @@ -1419,14 +1419,14 @@ - + - + @@ -1448,12 +1448,12 @@ - + - + @@ -1473,11 +1473,11 @@ - + - + @@ -1489,11 +1489,11 @@ - + - + @@ -1510,12 +1510,12 @@ 111 204
- + - + @@ -1539,12 +1539,12 @@ - + - + @@ -1566,11 +1566,11 @@ 1 2
235 523
- + - + @@ -1617,12 +1617,12 @@ - + - + @@ -1649,12 +1649,12 @@ - + - + @@ -1679,12 +1679,12 @@ - + - + @@ -1703,14 +1703,14 @@ - + - + @@ -1731,11 +1731,11 @@ 303 549
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0100-0199.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0100-0199.xml index 1b1d9ae24e..4460025764 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0100-0199.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0100-0199.xml @@ -12,14 +12,14 @@ - + - + @@ -44,14 +44,14 @@ - + - + @@ -82,12 +82,12 @@ - + - + @@ -111,14 +111,14 @@ - + - + @@ -132,11 +132,11 @@ - + - + @@ -163,14 +163,14 @@ - + - + @@ -189,12 +189,12 @@ - + - + @@ -213,12 +213,12 @@ - + - + @@ -231,11 +231,11 @@ - + - + @@ -273,11 +273,11 @@ 1780000 1760000 1740000 1720000 1700000 1680000 1660000 1640000 1620000 1600000 1580000 1560000 1540000 1520000 1500000 1480000 1460000 1440000 1420000 1400000 1380000 1360000 1340000 1320000 1300000 1280000 1260000 1240000 1220000 1200000
204 438
- + - + @@ -315,11 +315,11 @@ 1780000 1760000 1740000 1720000 1700000 1680000 1660000 1640000 1620000 1600000 1580000 1560000 1540000 1520000 1500000 1480000 1460000 1440000 1420000 1400000 1380000 1360000 1340000 1320000 1300000 1280000 1260000 1240000 1220000 1200000
268 523
- + - + @@ -348,11 +348,11 @@ 21 21 20 20 19 19 18 18 17 17 16 16 16 15 15 14 14 14 13 13 12 12 12 11 11 10 10 10 9 9
10 20 30 40
- + - + @@ -371,9 +371,9 @@ 200 400
- + - + @@ -398,12 +398,12 @@ - + - + @@ -429,12 +429,12 @@ - + - + @@ -447,9 +447,9 @@ - + - + @@ -472,14 +472,14 @@ - + - + @@ -497,11 +497,11 @@ 268 379 467 549 597 635
- + - + @@ -526,13 +526,13 @@ - + - + @@ -557,12 +557,12 @@ 379 467 549
- + - + @@ -595,12 +595,12 @@ - + - + @@ -625,12 +625,12 @@ - + - + @@ -646,11 +646,11 @@ 0.81 0.82 0.82 0.83 0.84 0.84 0.85 0.86 0.86 0.87 0.88 0.88 0.89 0.9 0.9 0.91 0.92 0.92 0.93 0.94 0.94 0.95 0.96 0.96 0.97 0.98 0.98 0.99 1.00 1.00
438 523
- + - + @@ -675,11 +675,11 @@ 18 22 27
379 467 549
- + - + @@ -698,9 +698,9 @@ - + - + @@ -711,9 +711,9 @@ 0.4 0.4 0.41 0.41 0.41 0.42 0.42 0.42 0.43 0.43 0.43 0.44 0.44 0.44 0.45 0.45 0.45 0.46 0.46 0.46 0.47 0.47 0.47 0.48 0.48 0.48 0.49 0.49 0.49 0.5
0.2 0.3 0.4
- + - + @@ -727,12 +727,12 @@ 16 19 24
341 408 495
- + - + @@ -746,9 +746,9 @@ 2 3 4
- + - + @@ -758,9 +758,9 @@ 9 11 12 13 14
0 0 0 3 3
- + - + @@ -775,17 +775,17 @@ - - - + + + 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
- + - + @@ -795,9 +795,9 @@ 10 12 14 16 18 20 23 25 28 30 34 36 40 42 43 46 47 49 52 54 56 59 61 63 66 68 70 72 74 76 78 80 82 84 86 88 91 93 95 97 99 102 104 106 108
- + - + @@ -805,9 +805,9 @@ 19 20 22 23 24 26 27 28 30 31 32 35 36 37 40 42 43 44 46 47 49 51 52 54 56 57 59 61 63 64 66 68 70 72 74 76 78 80 82 84 86 88 91 93 95 97 99 102 104 106 140
- + - + @@ -816,10 +816,10 @@ 1.9 2.7 2.9 3.6 4.5 4.7 5.6 6.7
0.9 1.1 1.2 1.5 1.7 1.8 2.1 2.5
- + - + @@ -832,9 +832,9 @@ 2.0 3.0 10.0
- + - + @@ -842,9 +842,9 @@ 1.5 1.7 1.85 2
- + - + @@ -853,9 +853,9 @@ - + - + @@ -869,30 +869,30 @@ 0.8 0.75 0.7
- + - + - + - + - + - + 1.05 1.07 1.1
- + - + @@ -900,9 +900,9 @@ 7 11
- + - + @@ -911,10 +911,10 @@ 2.5 3 3.5 4 4.5 5 5.5 6
0.8 0.9 1 1.1 1.2 1.3 1.4 1.5
- + - + @@ -926,18 +926,18 @@ - + - + 20 55
0.4 0.0
- + - + @@ -951,12 +951,12 @@ 14 21 25
303 438 523
- + - + @@ -990,12 +990,12 @@ - + - + @@ -1018,7 +1018,7 @@ - + @@ -1026,7 +1026,7 @@ - + @@ -1041,9 +1041,9 @@ 36 43 49 55 64 72
1.1 1.5 1.9 2.3 2.7 3.1
- + - + @@ -1053,18 +1053,18 @@ 24 32 40 52 64 72
32 56 93 177 295 384
- + - + - + - + @@ -1072,9 +1072,9 @@ 180 300
20 55
- + - + @@ -1082,9 +1082,9 @@ - + - + @@ -1096,9 +1096,9 @@ 0.93 0.9
7 9
- + - + @@ -1108,9 +1108,9 @@ 2 3 4
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0200-0299.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0200-0299.xml index 61ef12de2f..ab19e4ea12 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0200-0299.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0200-0299.xml @@ -9,9 +9,9 @@ 0 1 2 2 3 4 4 5 6 6 7 8 8 9 10 10 11 12 12 13 14 14 15 16 16 17 18 18 19 20
113 127 141 155 169 183 196 210 224 238 252 266 279 293 307 321 335 349 362 376 390 404 418 432 445 459 473 487 501 515
- + - + @@ -40,9 +40,9 @@ 10.3 11.4 27.6 32.8 35.6 38.6 45.2 48.9 52.7 61.1 65.6 70.4 80.9 86.5 92.4 105.1 111.9 178.8 189.9 201.4 213.5 226 239.1 252.7 266.7 281.3 296.4 311.9 328 344.5 361.6 379.1 397 415.4 434.3 453.5 473.2 493.1 513.5 534.2 555.1 576.3 597.8 619.4 641.2 663.1 685 707.1 729.1 751 772.9 794.6
- + - + @@ -55,9 +55,9 @@ 3.6 6 7.4 9 10.8 12.8 15.1 17.6 20.3 21.8 23.4 25 26.6 28.4 30.2 32.1 34.1 36.1 38.2 40.4 42.7 45 47.4 49.9 52.4 55 57.7 60.4 63.2 66.1 69 71.9 74.9 78 81.1 84.2 87.3 90.5 93.7 96.8 100 103.2 106.4 109.6 112.8
- + - + @@ -70,9 +70,9 @@ 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
- + - + @@ -89,9 +89,9 @@ 60 100 150 200 250 300 350 400 440 480
483 486 490 493 496 500 503 506 510 513 516 520 523 526 530 533 536 540 543 546 550 553 556 560 563 566 570 573 576 580
10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 190 200 210 220 230 240 250 260 270 280 290 300
- + - + @@ -108,9 +108,9 @@ 1.1 1.6 1.7 2.1 2.6 2.7 3.4 4
- + - + @@ -120,9 +120,9 @@ 30 50 70 100 140 152 180 200
- + - + @@ -131,9 +131,9 @@ - + - + @@ -147,9 +147,9 @@ 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10
- + - + @@ -165,9 +165,9 @@ 1.5 3.1 4.1 5.2 6.5 7.9 9.4 11.1 13 14 15.1 16.2 17.3 18.5 19.8 21.1 22.4 23.8 25.3 26.8 28.3 29.9 31.6 33.3 35 36.8 38.6 40.5 42.4 44.4 46.4 48.4 50.4 52.5 54.6 56.8 58.9 61.1 63.3 65.5 67.6 69.8 72 74.2 76.4
- + - + @@ -179,9 +179,9 @@ - + - + @@ -194,9 +194,9 @@ - + - + @@ -230,14 +230,14 @@ - + - + @@ -251,10 +251,10 @@ 4 5 6
- + - + @@ -266,9 +266,9 @@ - + - + @@ -281,9 +281,9 @@ 4.2 5.3 6.5 7.7 9 9.9 10.8 12.7 13.7 14.8 16.9 18 19.1 21.5 22.7 24 25.3 26.6 27.9 29.3 30.7 32.1 33.6 35 36.5 38.1 39.6 41.2 42.8 44.5 46.1 47.8 49.5 51.3 53 54.8 56.6 58.4 60.2 62.1 64 65.8 67.7 69.7 71.6 73.5 75.5 77.4 79.4 81.3
3 3 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
- + - + @@ -298,9 +298,9 @@ 1.05 1.07 1.1
- + - + @@ -310,9 +310,9 @@ 1.1 1.5 1.9 2.3 2.7 3.1 3.4
- + - + @@ -333,12 +333,12 @@ 219 495
- + - + @@ -358,9 +358,9 @@ 1.9 3.3 4.8 6.4 8.1 8.9 9.8 11.7 12.7 13.7 15.8 16.9 18 20.4 21.6 22.8 24.1 25.4 26.7 28 29.4 30.8 32.2 33.7 35.2 36.7 38.2 39.8 41.4 43 44.6 46.3 48 49.7 51.4 53.2 55 56.7 58.6 60.4 62.2 64.1 66 67.8 69.7 71.6 73.6 75.5 77.4 79.3
- + - + @@ -373,9 +373,9 @@ 17.7 19.1 20.5 23.5 25 26.7 30 31.8 33.6 37.4 39.3 41.3 45.6 47.7 50 54.6 57.1 59.5 62.1 64.6 67.3 70 72.7 75.5 78.4 81.3 84.3 87.3 90.4 93.5 96.7 99.9 103.2 106.5 109.9 113.3 116.8 120.3 123.8 127.4 131 134.7 138.4 142.1 145.8 149.6 153.4 157.2 161 164.9 168.7 172.6
0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.85 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.75 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65 0.65
- + - + @@ -391,9 +391,9 @@ 1.3 2.2 3.2 4.2 5.3 6.8 8.4 10.1 11.9 13.7 15.7 16.7 17.8 18.8 19.9 21.1 22.2 23.4 24.5 25.8 27 28.2 29.5 30.8 32.1 33.5 34.8 36.2 37.6 39.1 40.5 42 43.5 44.9 46.5 48 49.5 51.1 52.7 54.2 55.8 57.4 59.1 60.7 62.3 63.9 65.6
4 4 6 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- + - + @@ -408,9 +408,9 @@ 1.7 2.7 4.3 5.4 7.2 8.5 10.6 12.1 14.5 15.3 16.2 17.9 18.8 19.8 21.7 22.7 23.7 25.8 26.8 27.9 30.1 31.2 32.4 33.5 34.7 35.9 37.1 38.4 39.6 40.8 42.1 43.4 44.7 45.9 47.3 48.6 49.9 51.2 52.5 53.9 55.2
- + - + @@ -422,9 +422,9 @@ 7.2 8.6 11 12.7 15.4 17.4 20.5 22.7 26.3 27.6 28.8 31.5 32.9 34.2 37.1 38.6 40.1 43.2 44.8 46.4 49.8 51.5 53.2 54.9 56.7 58.5 60.3 62.1 64 65.9 67.7 69.7 71.6 73.5 75.5 77.4 79.4 81.4 83.4 85.4 87.4
- + - + @@ -436,9 +436,9 @@ 5.4 6.3 7.8 8.8 10.9 12.5 15 16.9 19.8 20.8 21.8 24 25.1 26.3 28.6 29.8 31 33.6 34.9 36.2 38.9 40.3 41.7 43.1 44.6 46 47.5 49 50.5 52.1 53.6 55.2 56.7 58.3 59.9 61.5 63.1 64.7 66.4 68 69.6
- + - + @@ -458,41 +458,41 @@ - + - + - + - + - + - + - + - + - + - + @@ -500,9 +500,9 @@ 6.7 8 9.2
- + - + @@ -519,7 +519,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -535,13 +535,13 @@ - + - + @@ -551,19 +551,19 @@ - + - + - - - + + + @@ -572,9 +572,9 @@ 1.9 3.5 5.7 7.2 8.3 10.3 11.9 14.6 16.6 20 21.3 22.6 25.4 26.9 28.5 31.8 33.6 35.4 39.2 41.2 43.2 47.5 49.8 52.1 54.4 56.8 59.2 61.7 64.3 66.8 69.4 72.1 74.8 77.4 80.2 82.9 85.6 88.4 91.1 93.8 96.5 99.3
1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45
1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17
- + - + @@ -600,9 +600,9 @@ 1.9 3.5 5.7 7.2 8.3 10.3 11.9 14.6 16.6 20 21.3 22.6 25.4 26.9 28.5 31.8 33.6 35.4 39.2 41.2 43.2 47.5 49.8 52.1 54.4 56.8 59.2 61.7 64.3 66.8 69.4 72.1 74.8 77.4 80.2 82.9 85.6 88.4 91.1 93.8 96.5 99.3
1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45 1.45
1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17 1.17
- + - + @@ -625,9 +625,9 @@ 11.6 13.4 16.1 18.4 20.9 23.8 26.9 29.1 32.8 35.4 39.6 42.6 47.3 49 50.7 54.2 56.1 57.9 61.8 63.7 65.7 69.9 72 74.2 78.6 80.9 83.2 85.5 87.8 90.2 92.6 95.1 97.6 100.1 102.6 105.1 107.7 110.3 112.9 115.5 118.1 120.8 123.4 126.1 128.8
- + - + @@ -644,9 +644,9 @@ 12.6 14.5 17.5 19.3 21.2 23.2 25.5 27 30.1 32.5 36.3 39.1 43.5 45 46.6 49.8 51.5 53.2 56.7 58.5 60.4 64.2 66.1 68.1 72.2 74.2 76.3 78.5 80.6 82.8 85.1 87.3 89.6 91.9 94.2 96.5 98.9 101.2 103.6 106 108.5 110.9 113.3 115.8 118.2
- + - + @@ -687,9 +687,9 @@ 11.6 13.3 15.2 17.2 19.5 21.1 23.7 25.6 28.7 30.8 34.3 35.5 36.7 39.3 40.6 41.9 44.7 46.1 47.6 50.6 52.1 53.7 56.9 58.6 60.2 61.9 63.6 65.3 67.1 68.9 70.7 72.5 74.3 76.1 78 79.9 81.7 83.6 85.5 87.5 89.4 91.3 93.3
- + - + @@ -730,12 +730,12 @@ 0 1 2 2 3 4 4 5 6 6 7 8 8 9 10 10 11 12 12 13 14 14 15 16 16 17 18 18 19 20
- + - + @@ -759,14 +759,14 @@ - + - + @@ -777,9 +777,9 @@ - + - + @@ -795,9 +795,9 @@ 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3
- + - + @@ -811,9 +811,9 @@ 11.1 11.8 12.5 14 14.8 15.6 17.3 18.1 19 20.8 21.7 22.6 24.5 25.5 26.4 27.4 28.4 29.5 30.5 31.6 32.6 33.7 34.8 35.9 37 38.1 39.2 40.3 41.4 42.6 43.7 44.8 46
- + - + @@ -854,9 +854,9 @@ 14.8 15.6 16.5 18.3 19.2 20.2 22.1 23.1 24.1 26.2 27.3 28.4 30.6 31.8 33 34.1 35.3 36.5 37.8 39 40.3 41.5 42.8 44.1 45.4 46.7 48 49.4 50.7 52 53.4 54.7 56.1
- + - + @@ -904,7 +904,7 @@ - + @@ -912,7 +912,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -947,7 +947,7 @@ - + @@ -971,12 +971,12 @@ - + - + @@ -998,14 +998,14 @@ - + - + @@ -1021,13 +1021,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1054,13 +1054,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1087,13 +1087,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1120,13 +1120,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1153,13 +1153,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1186,13 +1186,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1219,13 +1219,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -1253,13 +1253,13 @@ - + - + @@ -1287,13 +1287,13 @@ - + - + @@ -1321,13 +1321,13 @@ - + - + @@ -1355,13 +1355,13 @@ - + - + @@ -1389,13 +1389,13 @@ - + - + @@ -1423,13 +1423,13 @@ - + - + @@ -1459,13 +1459,13 @@ - + - + @@ -1491,12 +1491,12 @@ - + - + @@ -1527,13 +1527,13 @@ - + - + @@ -1556,7 +1556,7 @@ - + @@ -1565,7 +1565,7 @@ - + @@ -1590,7 +1590,7 @@ - + @@ -1599,7 +1599,7 @@ - + @@ -1613,11 +1613,11 @@ - + - + @@ -1651,12 +1651,12 @@ - + - + 14799 14800 14801 14802 14803 14804 14805
@@ -1679,7 +1679,7 @@ - + @@ -1689,7 +1689,7 @@ - + @@ -1701,9 +1701,9 @@ 22 24 28 29 31 32 38 39 41 42 48 49 50 52 53 59 61 62 64 66 72 73 75 76 78 79 81
- + - + @@ -1717,12 +1717,12 @@ 500 700 900
- + - + @@ -1732,11 +1732,11 @@ 0.6 0.4 0.2
341 467 582
- + - + @@ -1763,9 +1763,9 @@ 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85
75.24 74.48 74.48 74.69 74.69 73.92 74.88 74.1 74.1 74.26 74.26 73.47 74.4 73.6 73.6 73.71 73.71 72.9 73.8 72.98 72.98 73.04 73.04 72.21 73.08 72.24 72.24 72.25 72.25 71.4
- + - + @@ -1804,13 +1804,13 @@ - + - + @@ -1821,9 +1821,9 @@ 32.9 39.4 46.6 54.6 63.3 72.7 79.3 86.1 93.1 100.2 107.5 114.8 122.1 129.3
- + - + @@ -1835,9 +1835,9 @@ 116.9 129 141.6 150.4 159.3 168.4 177.7 187 196.5 206.2 215.8
- + - + @@ -1850,11 +1850,11 @@ - + - + @@ -1892,9 +1892,9 @@ 4.5 7.3 10.7 15.1 20.5 27.1 32.9 39.4 46.6 54.6 63.3 72.7 79.3 86.1 93.1 100.2 107.5 114.8 122.1 129.3
3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- + - + @@ -1908,9 +1908,9 @@ - + - + @@ -1922,9 +1922,9 @@ - + - + @@ -1934,9 +1934,9 @@ - + - + @@ -1950,11 +1950,11 @@ 597 646
- + - + @@ -1976,11 +1976,11 @@ - + - + @@ -2016,11 +2016,11 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0300-0399.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0300-0399.xml index 07eb9e397c..f0f4fc0b6b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0300-0399.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0300-0399.xml @@ -16,12 +16,12 @@ - + - + 14702 14703 14704 14705 14706
@@ -39,12 +39,12 @@ - + - + @@ -68,11 +68,11 @@ 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.25 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.3 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35 1.35
438 549 597 635
- + - + @@ -97,13 +97,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -130,13 +130,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -161,13 +161,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -193,13 +193,13 @@ - + - + @@ -226,13 +226,13 @@ 58 57 56 55 53 52 51 50 48 47 46 45 43 42 41 40 39 37 36 35 34 32 31 30 29 27 26 25 24 22
- + - + @@ -260,13 +260,13 @@ - + - + @@ -294,13 +294,13 @@ - + - + @@ -326,13 +326,13 @@ - + - + @@ -361,9 +361,9 @@ - + - + @@ -394,11 +394,11 @@ 566 582 597 611 624 635 646 655
- + - + @@ -469,13 +469,13 @@ - + - + @@ -497,7 +497,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -513,9 +513,9 @@ - + - + @@ -532,9 +532,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -557,9 +557,9 @@ 0.61 0.62 0.62 0.63 0.64 0.64 0.65 0.66 0.66 0.67 0.68 0.68 0.69 0.7 0.7 0.71 0.72 0.72 0.73 0.74 0.74 0.75 0.76 0.76 0.77 0.78 0.78 0.79 0.8 0.8
- + - + @@ -577,9 +577,9 @@ 2 3
5 10
- + - + @@ -615,13 +615,13 @@ - + - + @@ -636,7 +636,7 @@ - + @@ -646,7 +646,7 @@ - + @@ -670,9 +670,9 @@ 29.64 29.64 29.64 29.26 29.26 29.26 28.86 28.86 28.86 28.44 28.44 28.44 28 28 28 27.54 27.54 27.54 27.06 27.06 27.06 26.56 26.56 26.56 26.04 26.04 26.04 25.5 25.5 25.5
- + - + @@ -695,10 +695,10 @@ - + - + @@ -710,10 +710,10 @@ - + - + @@ -728,13 +728,13 @@ - + - + @@ -743,11 +743,11 @@ - + - + @@ -756,11 +756,11 @@ - + - + @@ -780,9 +780,9 @@ - + - + @@ -793,9 +793,9 @@ - + - + @@ -805,9 +805,9 @@ - + - + @@ -816,9 +816,9 @@ - + - + @@ -828,9 +828,9 @@ - + - + @@ -838,9 +838,9 @@ - + - + @@ -848,9 +848,9 @@ - + - + @@ -859,10 +859,10 @@ - + - + @@ -876,9 +876,9 @@ - + - + @@ -890,9 +890,9 @@ - + - + @@ -904,9 +904,9 @@ - + - + @@ -918,9 +918,9 @@ - + - + @@ -937,9 +937,9 @@ - + - + @@ -955,10 +955,10 @@ - + - + @@ -978,12 +978,12 @@ - + - + @@ -1008,9 +1008,9 @@ - + - + @@ -1026,9 +1026,9 @@ - + - + @@ -1048,11 +1048,11 @@ - + - + @@ -1066,12 +1066,12 @@ - + - + @@ -1087,10 +1087,10 @@ - + - + @@ -1109,9 +1109,9 @@ - + - + @@ -1123,13 +1123,13 @@ - + - + @@ -1147,9 +1147,9 @@ - + - + @@ -1167,9 +1167,9 @@ - + - + @@ -1191,9 +1191,9 @@ - + - + @@ -1215,9 +1215,9 @@ - + - + @@ -1236,13 +1236,13 @@ - + - + @@ -1260,11 +1260,11 @@ - + - + @@ -1295,11 +1295,11 @@ - + - + @@ -1333,11 +1333,11 @@ - + - + @@ -1369,10 +1369,10 @@ - + - + @@ -1387,11 +1387,11 @@ - + - + @@ -1406,11 +1406,11 @@ - + - + @@ -1429,11 +1429,11 @@ - + - + @@ -1460,9 +1460,9 @@ - + - + @@ -1485,13 +1485,13 @@ - + - + @@ -1506,13 +1506,13 @@ - + - + @@ -1528,13 +1528,13 @@ - + - + @@ -1549,13 +1549,13 @@ - + - + @@ -1573,9 +1573,9 @@ - + - + @@ -1592,12 +1592,12 @@ - + - + @@ -1613,13 +1613,13 @@ - + - + @@ -1631,9 +1631,9 @@ 1.03 1.05 1.06
- + - + @@ -1645,9 +1645,9 @@ 1.06 1.1 1.12
- + - + @@ -1659,9 +1659,9 @@ 1.03 1.05 1.06
- + - + @@ -1673,9 +1673,9 @@ 1.03 1.05 1.06
- + - + @@ -1687,9 +1687,9 @@ 1.03 1.05 1.06
- + - + @@ -1701,9 +1701,9 @@ 1.03 1.05 1.06
- + - + @@ -1715,9 +1715,9 @@ 1.03 1.05 1.06
- + - + @@ -1729,9 +1729,9 @@ 1.03 1.05 1.06
- + - + @@ -1743,9 +1743,9 @@ 1.03 1.05 1.06
- + - + @@ -1757,9 +1757,9 @@ 1.06 1.1 1.12
- + - + @@ -1771,9 +1771,9 @@ 1 2 3
- + - + @@ -1785,9 +1785,9 @@ 1 2 3
- + - + @@ -1799,9 +1799,9 @@ 1.03 1.05 1.06
- + - + @@ -1813,9 +1813,9 @@ 1.03 1.05 1.06
- + - + @@ -1827,9 +1827,9 @@ 0.97 0.95 0.94
- + - + @@ -1842,9 +1842,9 @@ 0.97 0.95 0.94
- + - + @@ -1857,9 +1857,9 @@ 0.97 0.95 0.94
- + - + @@ -1871,9 +1871,9 @@ 0.97 0.95 0.94
- + - + @@ -1885,9 +1885,9 @@ 0.97 0.95 0.94
- + - + @@ -1899,9 +1899,9 @@ 3 5 6
- + - + @@ -1910,9 +1910,9 @@ 0.9 0.8 0.7
- + - + @@ -1921,9 +1921,9 @@ - - - + + + @@ -1934,9 +1934,9 @@ - + - + @@ -1954,9 +1954,9 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0400-0499.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0400-0499.xml index 44cda9a6fb..00b9626179 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0400-0499.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/0400-0499.xml @@ -16,13 +16,13 @@ - + - + @@ -50,13 +50,13 @@ - + - + @@ -80,11 +80,11 @@ - + - + @@ -103,13 +103,13 @@ 80 81 82 82 83 84 84 85 86 86 87 88 88 89 90 90 91 92 92 93 94 94 95 96 96 97 98 98 99 100
25 27 28 29 30 31 32 33 34 34
- + - + @@ -128,14 +128,14 @@ 80 81 82 82 83 84 84 85 86 86 87 88 88 89 90 90 91 92 92 93 94 94 95 96 96 97 98 98 99 100
40 43 46 59 51
- + - + @@ -160,10 +160,10 @@ - + - + @@ -183,12 +183,12 @@ 33 66 100
133 153 170
- + - + @@ -226,13 +226,13 @@ - + - + @@ -253,13 +253,13 @@ - + - + @@ -278,14 +278,14 @@ - + - + @@ -311,9 +311,9 @@ - + - + @@ -343,10 +343,10 @@ 0.55 0.7 0.85
- + - + @@ -387,10 +387,10 @@ - + - + @@ -404,9 +404,9 @@ 28 29 30 31 32 33 34 34
62 67 73 78 83 88 94 100
- + - + @@ -435,11 +435,11 @@ 1.15 1.15 1.15 1.17 1.17 1.17 1.2 1.2
- + - + @@ -462,11 +462,11 @@ 27 31 34
0.9 0.8 0.7
- + - + @@ -478,11 +478,11 @@ 27 31 34
0.9 0.8 0.7
- + - + @@ -497,19 +497,19 @@ - + - + 1.5 1.75 2.0
- + - + @@ -523,9 +523,9 @@ - + - + @@ -540,9 +540,9 @@ - + - + @@ -573,9 +573,9 @@ 1 2 3 4 5
- + - + @@ -589,9 +589,9 @@ 11 13 14
2 3 4
- + - + @@ -606,12 +606,12 @@ 0.85 0.77 0.7
15 23 30
- + - + @@ -625,9 +625,9 @@ 0.9 0.8 0.7
58 66 74
- + - + @@ -640,11 +640,11 @@ - + - + @@ -665,10 +665,10 @@ - + - + @@ -680,10 +680,10 @@ - + - + @@ -691,19 +691,19 @@ - + - + - + - + @@ -716,9 +716,9 @@ - + - + @@ -734,9 +734,9 @@ - + - + @@ -749,9 +749,9 @@ - + - + @@ -776,9 +776,9 @@ - + - + @@ -789,9 +789,9 @@ - + - + @@ -799,9 +799,9 @@ - + - + @@ -820,9 +820,9 @@ - + - + @@ -834,9 +834,9 @@ - + - + @@ -854,13 +854,13 @@ - + - + @@ -870,9 +870,9 @@ - + - + @@ -885,23 +885,23 @@ - + - + - + - + @@ -918,11 +918,11 @@ - + - + @@ -930,12 +930,12 @@ - + - + @@ -949,9 +949,9 @@ - + - + @@ -961,10 +961,10 @@ - + - + @@ -976,9 +976,9 @@ - + - + @@ -994,9 +994,9 @@ - + - + @@ -1019,11 +1019,11 @@ - + - + @@ -1042,12 +1042,12 @@ - + - + @@ -1074,9 +1074,9 @@ - + - + @@ -1099,10 +1099,10 @@ - + - + @@ -1124,11 +1124,11 @@ - + - + @@ -1139,19 +1139,19 @@ - + - + - + - + @@ -1176,9 +1176,9 @@ - + - + @@ -1207,9 +1207,9 @@ - + - + @@ -1234,9 +1234,9 @@ - + - + @@ -1261,9 +1261,9 @@ - + - + @@ -1288,9 +1288,9 @@ - + - + @@ -1315,9 +1315,9 @@ - + - + @@ -1347,14 +1347,14 @@ 2 3
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1000-1099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1000-1099.xml index 8023e1bdf1..63b7b48528 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1000-1099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1000-1099.xml @@ -6,9 +6,9 @@ 3 6 9 12 15 18 21 24 27 30
2 3 5 6 7 9 11 11 13 14
- + - + @@ -33,13 +33,13 @@ 285 418 532
- + - + @@ -72,13 +72,13 @@ - + - + @@ -111,13 +111,13 @@ - + - + @@ -150,13 +150,13 @@ - + - + @@ -188,13 +188,13 @@ - + - + @@ -225,13 +225,13 @@ - + - + @@ -264,13 +264,13 @@ - + - + @@ -301,13 +301,13 @@ - + - + @@ -338,12 +338,12 @@ - + - + @@ -368,12 +368,12 @@ - + - + @@ -387,12 +387,12 @@ - + - + @@ -412,12 +412,12 @@ - + - + @@ -437,12 +437,12 @@ - + - + @@ -456,12 +456,12 @@ - + - + @@ -474,12 +474,12 @@ 418 495 566
- + - + @@ -503,12 +503,12 @@ - + - + @@ -527,13 +527,13 @@ - + - + @@ -554,13 +554,13 @@ - + - + @@ -577,13 +577,13 @@ - + - + @@ -600,12 +600,12 @@ 0.7 0.6 0.5
379 457 532
- + - + @@ -636,12 +636,12 @@ 331 379 418
- + - + @@ -666,13 +666,13 @@ - + - + @@ -692,12 +692,12 @@ 243 379 457 532
- + - + @@ -734,12 +734,12 @@ 418 495
- + - + @@ -770,12 +770,12 @@ 121 243 418
- + - + @@ -808,12 +808,12 @@ - + - + @@ -833,12 +833,12 @@ - + - + @@ -869,12 +869,12 @@ 331 457 532
- + - + @@ -905,12 +905,12 @@ 418 457 495 532 597 646
- + - + @@ -938,12 +938,12 @@ - + - + @@ -968,12 +968,12 @@ 418 457 495 532 582 635
- + - + @@ -1001,13 +1001,13 @@ - + - + @@ -1023,12 +1023,12 @@ 20000 1500
- + - + @@ -1039,12 +1039,12 @@ - + - + @@ -1064,12 +1064,12 @@ 243 418 495
- + - + @@ -1105,12 +1105,12 @@ 331 495
- + - + @@ -1158,13 +1158,13 @@ - + - + @@ -1188,12 +1188,12 @@ 121 204 379
- + - + @@ -1227,12 +1227,12 @@ - + - + @@ -1259,13 +1259,13 @@ - + - + @@ -1295,13 +1295,13 @@ - + - + @@ -1323,12 +1323,12 @@ 5 7
121 417
- + - + @@ -1362,13 +1362,13 @@ - + - + @@ -1389,12 +1389,12 @@ 30 33 37 40 43 47 50 53 57 60 63 67 70 75 80
- + - + @@ -1412,12 +1412,12 @@ 243 418 495
- + - + @@ -1448,12 +1448,12 @@ 204 285 418 495 566 624
- + - + @@ -1491,13 +1491,13 @@ - + - + @@ -1524,12 +1524,12 @@ 204 331 457
- + - + @@ -1560,12 +1560,12 @@ 418 495
- + - + @@ -1596,12 +1596,12 @@ 243 418 495
- + - + @@ -1628,13 +1628,13 @@ - + - + @@ -1651,13 +1651,13 @@ - + - + @@ -1678,12 +1678,12 @@ - + - + @@ -1712,14 +1712,14 @@ - + - + @@ -1746,13 +1746,13 @@ - + - + @@ -1780,14 +1780,14 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1100-1199.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1100-1199.xml index 7339ba51d6..8070f20091 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1100-1199.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1100-1199.xml @@ -12,13 +12,13 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -65,12 +65,12 @@ - + - + @@ -95,14 +95,14 @@ - + - + @@ -120,13 +120,13 @@ - + - + @@ -145,13 +145,13 @@ - + - + @@ -169,7 +169,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -203,12 +203,12 @@ - + - + @@ -233,12 +233,12 @@ - + - + @@ -261,12 +261,12 @@ - + - + @@ -295,12 +295,12 @@ - + - + @@ -329,12 +329,12 @@ - + - + @@ -358,12 +358,12 @@ 418 495
- + - + @@ -394,12 +394,12 @@ 379 457 532
- + - + @@ -430,12 +430,12 @@ 418 495
- + - + @@ -466,12 +466,12 @@ 331 457
- + - + @@ -502,12 +502,12 @@ 331 457 532
- + - + @@ -538,12 +538,12 @@ 331 457 532
- + - + @@ -570,13 +570,13 @@ - + - + @@ -600,13 +600,13 @@ - + - + @@ -628,13 +628,13 @@ - + - + @@ -662,12 +662,12 @@ - + - + @@ -693,13 +693,13 @@ - + - + @@ -715,12 +715,12 @@ - + - + @@ -731,12 +731,12 @@ 243 379 495 549 611
- + - + @@ -757,13 +757,13 @@ - + - + @@ -791,13 +791,13 @@ - + - + @@ -818,13 +818,13 @@ - + - + @@ -849,12 +849,12 @@ - + - + @@ -881,13 +881,13 @@ - + - + @@ -911,12 +911,12 @@ - + - + @@ -936,13 +936,13 @@ - + - + @@ -967,13 +967,13 @@ - + - + @@ -999,14 +999,14 @@ - + - + @@ -1023,12 +1023,12 @@ - + - + @@ -1048,14 +1048,14 @@ - + - + @@ -1072,13 +1072,13 @@ - + - + @@ -1098,14 +1098,14 @@ - + - + @@ -1122,13 +1122,13 @@ - + - + @@ -1142,13 +1142,13 @@ - + - + @@ -1162,14 +1162,14 @@ - + - + @@ -1187,12 +1187,12 @@ 243 379 418
- + - + @@ -1221,13 +1221,13 @@ - + - + @@ -1247,14 +1247,14 @@ - + - + @@ -1277,12 +1277,12 @@ 331 379 418
- + - + @@ -1310,12 +1310,12 @@ 285 379 418
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1200-1299.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1200-1299.xml index abfba9d74a..15070a27cd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1200-1299.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1200-1299.xml @@ -17,13 +17,13 @@ - + - + @@ -47,12 +47,12 @@ 204 285
- + - + @@ -87,12 +87,12 @@ - + - + @@ -121,14 +121,14 @@ - + - + @@ -150,7 +150,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -179,14 +179,14 @@ - + - + @@ -200,7 +200,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -219,12 +219,12 @@ - + - + @@ -245,12 +245,12 @@ - + - + @@ -276,12 +276,12 @@ - + - + @@ -304,13 +304,13 @@ - + - + @@ -329,13 +329,13 @@ - + - + @@ -357,13 +357,13 @@ - + - + @@ -395,12 +395,12 @@ - + - + @@ -433,12 +433,12 @@ - + - + @@ -466,12 +466,12 @@ - + - + @@ -501,12 +501,12 @@ - + - + @@ -532,12 +532,12 @@ - + - + @@ -562,13 +562,13 @@ - + - + @@ -594,13 +594,13 @@ - + - + @@ -631,13 +631,13 @@ - + - + @@ -660,12 +660,12 @@ - + - + @@ -692,12 +692,12 @@ - + - + @@ -726,13 +726,13 @@ - + - + @@ -756,13 +756,13 @@ - + - + @@ -787,13 +787,13 @@ - + - + @@ -818,14 +818,14 @@ - + - + @@ -857,13 +857,13 @@ - + - + @@ -889,12 +889,12 @@ - + - + @@ -927,13 +927,13 @@ - + - + @@ -954,12 +954,12 @@ 379 457 532
- + - + @@ -990,12 +990,12 @@ 379 457 532
- + - + @@ -1026,12 +1026,12 @@ 379 457 532 582 611 635
- + - + @@ -1060,13 +1060,13 @@ - + - + @@ -1090,12 +1090,12 @@ - + - + @@ -1122,14 +1122,14 @@ - + - + @@ -1156,14 +1156,14 @@ - + - + @@ -1191,14 +1191,14 @@ - + - + @@ -1225,13 +1225,13 @@ - + - + @@ -1264,13 +1264,13 @@ - + - + @@ -1301,13 +1301,13 @@ 457 532
- + - + @@ -1338,13 +1338,13 @@ 379 457 532
- + - + @@ -1375,13 +1375,13 @@ 418 495 532
- + - + @@ -1407,13 +1407,13 @@ - + - + @@ -1425,13 +1425,13 @@ 20000 3500
- + - + @@ -1453,13 +1453,13 @@ - + - + @@ -1486,12 +1486,12 @@ 331 418 495
- + - + @@ -1517,12 +1517,12 @@ - + - + @@ -1539,12 +1539,12 @@ 379 495 597 646
- + - + @@ -1577,13 +1577,13 @@ - + - + @@ -1623,13 +1623,13 @@ - + - + @@ -1665,9 +1665,9 @@ 7 9 11 12 13
10 20 30 40 50
- + - + @@ -1694,13 +1694,13 @@ - + - + @@ -1722,14 +1722,14 @@ - + - + @@ -1749,14 +1749,14 @@ - + - + @@ -1772,14 +1772,14 @@ - + - + @@ -1799,14 +1799,14 @@ - + - + @@ -1828,12 +1828,12 @@ - + - + @@ -1864,7 +1864,7 @@ - + @@ -1872,7 +1872,7 @@ - + @@ -1889,13 +1889,13 @@ - + - + @@ -1913,13 +1913,13 @@ - + - + @@ -1936,13 +1936,13 @@ - + - + @@ -1956,12 +1956,12 @@ - + - + @@ -1981,12 +1981,12 @@ - + - + @@ -2013,12 +2013,12 @@ - + - + @@ -2047,13 +2047,13 @@ - + - + @@ -2082,12 +2082,12 @@ - + - + @@ -2107,12 +2107,12 @@ - + - + @@ -2134,12 +2134,12 @@ - + - + @@ -2161,12 +2161,12 @@ - + - + @@ -2194,13 +2194,13 @@ - + - + @@ -2223,9 +2223,9 @@ 15 18 18 21 24 24 24 24 27 27 27 30 30
8 9 10 11 11 11 12 12 13 13 13 14 14
- + - + @@ -2249,13 +2249,13 @@ 582 624 655
- + - + @@ -2276,12 +2276,12 @@ - + - + @@ -2293,12 +2293,12 @@ - + - + @@ -2310,12 +2310,12 @@ - + - + @@ -2329,12 +2329,12 @@ - + - + @@ -2347,13 +2347,13 @@ - + - + @@ -2371,13 +2371,13 @@ - + - + @@ -2395,13 +2395,13 @@ - + - + @@ -2419,13 +2419,13 @@ - + - + @@ -2438,13 +2438,13 @@ - + - + @@ -2457,13 +2457,13 @@ - + - + @@ -2486,14 +2486,14 @@ - + - + @@ -2515,14 +2515,14 @@ - + - + @@ -2532,9 +2532,9 @@ 3.2 4 4.3 5.1 5.8 6.2
2.6 3.2 3.5 4.1 4.7 4.9
- + - + @@ -2565,13 +2565,13 @@ - + - + @@ -2598,12 +2598,12 @@ 495 635
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1300-1399.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1300-1399.xml index d409c92803..16595104c7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1300-1399.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1300-1399.xml @@ -9,12 +9,12 @@ 40 48 60
- + - + @@ -27,12 +27,12 @@ - + - + @@ -53,12 +53,12 @@ 582 635
- + - + @@ -89,12 +89,12 @@ 549 611 646
- + - + @@ -128,13 +128,13 @@ - + - + @@ -157,12 +157,12 @@ - + - + @@ -184,13 +184,13 @@ 611 635 655
- + - + @@ -221,13 +221,13 @@ 457 566 624
- + - + @@ -258,13 +258,13 @@ 457 549 597
- + - + @@ -292,13 +292,13 @@ 418 549 611 655
- + - + @@ -331,13 +331,13 @@ - + - + @@ -355,12 +355,12 @@ - + - + @@ -369,12 +369,12 @@ 24 37 50 62 70 76 82 88 94 100 104 107 110 113 116 119 121 124 127 130 133 136 139 142 145 149 155
- + - + @@ -383,65 +383,65 @@ 24 37 50 62 70 76 82 88 94 100 104 107 110 113 116 119 121 124 127 130 133 136 139 142 145 149 155
- + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -449,26 +449,26 @@ - + - + - + - + @@ -478,12 +478,12 @@ - + - + @@ -494,11 +494,11 @@ - + - + @@ -512,12 +512,12 @@ - + - + @@ -531,13 +531,13 @@ - + - + @@ -549,13 +549,13 @@ - + - + @@ -572,12 +572,12 @@ - + - + @@ -599,12 +599,12 @@ - + - + @@ -627,12 +627,12 @@ - + - + @@ -665,12 +665,12 @@ - + - + @@ -700,12 +700,12 @@ - + - + @@ -735,12 +735,12 @@ - + - + @@ -770,12 +770,12 @@ - + - + @@ -790,13 +790,13 @@ - + - + @@ -809,13 +809,13 @@ - + - + @@ -830,13 +830,13 @@ - + - + @@ -858,11 +858,11 @@ - + - + @@ -884,12 +884,12 @@ - + - + @@ -912,12 +912,12 @@ - + - + @@ -940,12 +940,12 @@ - + - + @@ -968,12 +968,12 @@ - + - + @@ -993,12 +993,12 @@ - + - + @@ -1018,13 +1018,13 @@ - + - + @@ -1032,13 +1032,13 @@ - + - + @@ -1048,9 +1048,9 @@ - + - + @@ -1075,9 +1075,9 @@ - + - + @@ -1099,12 +1099,12 @@ - + - + @@ -1136,9 +1136,9 @@ - + - + @@ -1165,12 +1165,12 @@ - + - + @@ -1180,12 +1180,12 @@ - + - + @@ -1193,12 +1193,12 @@ - + - + @@ -1215,11 +1215,11 @@ - + - + @@ -1235,11 +1235,11 @@ - + - + @@ -1257,12 +1257,12 @@ - + - + @@ -1284,12 +1284,12 @@ - + - + @@ -1312,12 +1312,12 @@ - + - + @@ -1345,13 +1345,13 @@ - + - + @@ -1368,13 +1368,13 @@ - + - + @@ -1391,14 +1391,14 @@ - + - + @@ -1413,14 +1413,14 @@ - + - + @@ -1431,13 +1431,13 @@ - + - + @@ -1454,14 +1454,14 @@ - + - + @@ -1484,13 +1484,13 @@ - + - + @@ -1505,13 +1505,13 @@ - + - + @@ -1527,14 +1527,14 @@ - + - + @@ -1552,7 +1552,7 @@ - + @@ -1562,7 +1562,7 @@ - + @@ -1574,9 +1574,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1586,9 +1586,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1598,9 +1598,9 @@ 1 2 3 4 5 6 7 8
- + - + @@ -1611,9 +1611,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1624,9 +1624,9 @@ 6 12 18 24 30 36 42 48
- + - + @@ -1635,9 +1635,9 @@ - + - + @@ -1653,10 +1653,10 @@ - + - + @@ -1678,10 +1678,10 @@ - + - + @@ -1707,10 +1707,10 @@ - + - + @@ -1720,24 +1720,24 @@ - + - - + + - + - - + + - + - - + + @@ -1751,9 +1751,9 @@ - + - + @@ -1781,9 +1781,9 @@ - + - + @@ -1816,10 +1816,10 @@ - + - + @@ -1845,10 +1845,10 @@ - + - + @@ -1872,10 +1872,10 @@ - + - + @@ -1899,10 +1899,10 @@ - + - + @@ -1923,12 +1923,12 @@ - + - + @@ -1943,11 +1943,11 @@ 40 80 160
25 50 100
- + - + @@ -1965,10 +1965,10 @@ - + - + @@ -1987,10 +1987,10 @@ - + - + @@ -2009,10 +2009,10 @@ - + - + @@ -2032,10 +2032,10 @@ - + - + @@ -2053,9 +2053,9 @@ - + - + @@ -2072,9 +2072,9 @@ - + - + @@ -2098,9 +2098,9 @@ - + - + @@ -2131,9 +2131,9 @@ - + - + @@ -2151,9 +2151,9 @@ - + - + @@ -2176,10 +2176,10 @@ - + - + @@ -2202,9 +2202,9 @@ - + - + @@ -2224,10 +2224,10 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1400-1499.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1400-1499.xml index f23c846d27..59180fb036 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1400-1499.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/1400-1499.xml @@ -15,9 +15,9 @@ - + - + @@ -43,9 +43,9 @@ - + - + @@ -68,9 +68,9 @@ - + - + @@ -79,9 +79,9 @@ - + - + @@ -94,10 +94,10 @@ - + - + @@ -108,9 +108,9 @@ - - - + + + @@ -125,12 +125,12 @@ - + - + @@ -150,12 +150,12 @@ - + - + @@ -175,12 +175,12 @@ - + - + @@ -195,12 +195,12 @@ - + - + @@ -214,13 +214,13 @@ - + - + @@ -232,12 +232,12 @@ - + - + @@ -255,10 +255,10 @@ - + - + @@ -275,13 +275,13 @@ - + - + @@ -301,13 +301,13 @@ - + - + @@ -331,13 +331,13 @@ - + - + @@ -352,13 +352,13 @@ - + - + @@ -383,13 +383,13 @@ - + - + @@ -399,11 +399,11 @@ - + - + @@ -413,9 +413,9 @@ - + - + @@ -444,9 +444,9 @@ - + - + @@ -475,9 +475,9 @@ - + - + @@ -506,9 +506,9 @@ - + - + @@ -531,9 +531,9 @@ - + - + @@ -562,9 +562,9 @@ - + - + @@ -590,11 +590,11 @@ - + - + @@ -618,16 +618,16 @@ - + - + - + @@ -636,7 +636,7 @@ - + @@ -645,7 +645,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -670,17 +670,17 @@ - + - + - + @@ -692,13 +692,13 @@ 27 28 30 33 34
90 105 120 135 150
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2000-2099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2000-2099.xml index 72d8ab3d89..60f7697e1a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2000-2099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2000-2099.xml @@ -1,9 +1,9 @@  - + - + @@ -12,9 +12,9 @@ - + - + @@ -25,10 +25,10 @@ - + - + @@ -39,9 +39,9 @@ - + - + @@ -52,40 +52,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -94,9 +94,9 @@ - + - + @@ -107,9 +107,9 @@ - + - + @@ -119,116 +119,116 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -239,9 +239,9 @@ - + - + @@ -252,15 +252,15 @@ - + - + - + - + @@ -271,9 +271,9 @@ - + - + @@ -283,16 +283,16 @@ - + - + - + - + @@ -304,89 +304,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -395,10 +395,10 @@ - + - + @@ -408,10 +408,10 @@ - + - + @@ -421,10 +421,10 @@ - + - + @@ -434,10 +434,10 @@ - + - + @@ -447,10 +447,10 @@ - + - + @@ -460,10 +460,10 @@ - + - + @@ -473,10 +473,10 @@ - + - + @@ -486,10 +486,10 @@ - + - + @@ -499,10 +499,10 @@ - + - + @@ -512,37 +512,37 @@ - + - + - + - + - + - + - + - + - + - + @@ -550,83 +550,83 @@ - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + @@ -639,12 +639,12 @@ - + - + @@ -654,9 +654,9 @@ - + - + @@ -666,9 +666,9 @@ - + - + @@ -684,9 +684,9 @@ - + - + @@ -695,9 +695,9 @@ - + - + @@ -706,9 +706,9 @@ - + - + @@ -717,9 +717,9 @@ - + - + @@ -728,9 +728,9 @@ - + - + @@ -739,9 +739,9 @@ - + - + @@ -750,9 +750,9 @@ - + - + @@ -761,9 +761,9 @@ - + - + @@ -772,9 +772,9 @@ - + - + @@ -783,9 +783,9 @@ - + - + @@ -794,9 +794,9 @@ - + - + @@ -805,9 +805,9 @@ - + - + @@ -816,9 +816,9 @@ - + - + @@ -827,9 +827,9 @@ - + - + @@ -838,9 +838,9 @@ - + - + @@ -849,9 +849,9 @@ - + - + @@ -860,9 +860,9 @@ - + - + @@ -871,19 +871,19 @@ - + - + - + - + @@ -891,29 +891,29 @@ 4 6 8
- + - + - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2100-2199.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2100-2199.xml index 378927ec19..ba5c724d01 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2100-2199.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2100-2199.xml @@ -1,28 +1,28 @@  - + - + - + - + - + - + @@ -32,9 +32,9 @@ - + - + @@ -44,9 +44,9 @@ - + - + @@ -56,9 +56,9 @@ - + - + @@ -68,9 +68,9 @@ - + - + @@ -80,9 +80,9 @@ - + - + @@ -92,9 +92,9 @@ - + - + @@ -104,9 +104,9 @@ - + - + @@ -116,9 +116,9 @@ - + - + @@ -128,9 +128,9 @@ - + - + @@ -140,9 +140,9 @@ - + - + @@ -152,9 +152,9 @@ - + - + @@ -164,9 +164,9 @@ - + - + @@ -176,9 +176,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -200,9 +200,9 @@ - + - + @@ -212,9 +212,9 @@ - + - + @@ -224,9 +224,9 @@ - + - + @@ -236,9 +236,9 @@ - + - + @@ -248,9 +248,9 @@ - + - + @@ -258,10 +258,10 @@ - + - - + + @@ -269,10 +269,10 @@ - + - - + + @@ -280,19 +280,19 @@ - + - - + + - + - - + + @@ -300,10 +300,10 @@ - + - - + + @@ -311,10 +311,10 @@ - + - - + + @@ -322,10 +322,10 @@ - + - - + + @@ -333,10 +333,10 @@ - + - - + + @@ -344,10 +344,10 @@ - + - - + + @@ -355,10 +355,10 @@ - + - - + + @@ -366,10 +366,10 @@ - + - - + + @@ -377,10 +377,10 @@ - + - - + + @@ -388,10 +388,10 @@ - + - - + + @@ -399,10 +399,10 @@ - + - - + + @@ -413,17 +413,17 @@ - + - + - + - + @@ -434,9 +434,9 @@ - + - + @@ -448,9 +448,9 @@ - + - + @@ -464,9 +464,9 @@ - - - + + + @@ -475,9 +475,9 @@ - - - + + + @@ -486,9 +486,9 @@ - - - + + + @@ -497,9 +497,9 @@ - - - + + + @@ -508,9 +508,9 @@ - - - + + + @@ -519,9 +519,9 @@ - - - + + + @@ -530,9 +530,9 @@ - - - + + + @@ -541,9 +541,9 @@ - - - + + + @@ -552,9 +552,9 @@ - - - + + + @@ -563,9 +563,9 @@ - - - + + + @@ -576,10 +576,10 @@ 2.0
- + - + @@ -589,10 +589,10 @@ 2.0
- + - + @@ -602,10 +602,10 @@ 2.0
- + - + @@ -615,10 +615,10 @@ 2.0
- + - + @@ -628,10 +628,10 @@ 2.0
- + - + @@ -641,10 +641,10 @@ 1.5
- + - + @@ -654,10 +654,10 @@ 1.5
- + - + @@ -667,10 +667,10 @@ 1.5
- + - + @@ -680,10 +680,10 @@ 1.5
- + - + @@ -693,10 +693,10 @@ 1.5
- + - + @@ -706,10 +706,10 @@ 2.0
- + - + @@ -719,10 +719,10 @@ 2.0
- + - + @@ -732,10 +732,10 @@ 2.0
- + - + @@ -745,10 +745,10 @@ 2.0
- + - + @@ -758,10 +758,10 @@ 2.0
- + - + @@ -771,9 +771,9 @@ - + - + @@ -784,9 +784,9 @@ 50 200
- + - + @@ -800,18 +800,18 @@ - + - + - + - + @@ -823,9 +823,9 @@ 1.23 1.3
- + - + @@ -838,9 +838,9 @@ - + - + @@ -848,9 +848,9 @@ - - - + + + @@ -858,9 +858,9 @@ - - - + + + @@ -868,9 +868,9 @@ - - - + + + @@ -878,9 +878,9 @@ - - - + + + @@ -889,9 +889,9 @@ - - - + + + @@ -899,9 +899,9 @@ - - - + + + @@ -913,10 +913,10 @@ - + - + @@ -925,20 +925,20 @@ - + - + - + - + @@ -946,10 +946,10 @@ - + - + @@ -958,9 +958,9 @@ - - - + + + @@ -968,9 +968,9 @@ - - - + + + @@ -978,9 +978,9 @@ - - - + + + @@ -988,9 +988,9 @@ - - - + + + @@ -998,9 +998,9 @@ - - - + + + @@ -1008,9 +1008,9 @@ - - - + + + @@ -1018,18 +1018,18 @@ - - - + + + - + - + @@ -1037,12 +1037,12 @@ - + - + @@ -1051,9 +1051,9 @@ 6411 6412 6413 6414 6415 6416 6417 6418 6419
- - - + + + @@ -1062,9 +1062,9 @@ 6420 6421 6422 6423 6424 6425 6426 6427 6428
- - - + + + @@ -1073,9 +1073,9 @@ 6429 6430 6431 6432 6433 6434 6435 6436 6437
- - - + + + @@ -1084,9 +1084,9 @@ 6438 6439 6440 6441 6442 6443 6444 6445 6446
- - - + + + @@ -1095,9 +1095,9 @@ 6447 6448 6449 6450 6451 6452 6453 6454 6455
- - - + + + @@ -1106,9 +1106,9 @@ 6456 6457 6458 6459 6460 6461 6462 6463 6464
- - - + + + @@ -1117,9 +1117,9 @@ 6465 6466 6467 6468 6469 6470 6471 6472 6473
- - - + + + @@ -1128,9 +1128,9 @@ 6474 6475 6476 6477 6478 6479 6480 6481 6482
- - - + + + @@ -1139,9 +1139,9 @@ 6483 6484 6485 6486 6487 6488 6489 6490 6491
- - - + + + @@ -1150,9 +1150,9 @@ 6492 6493 6494
- - - + + + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2200-2299.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2200-2299.xml index e61c4bbb32..6c3461d057 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2200-2299.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2200-2299.xml @@ -4,9 +4,9 @@ 6495 6496 6497
- - - + + + @@ -15,9 +15,9 @@ 6498 6499 6500
- - - + + + @@ -26,9 +26,9 @@ 6501 6502 6503
- - - + + + @@ -37,9 +37,9 @@ 6504 6505 6506
- - - + + + @@ -48,9 +48,9 @@ 6507 6508 6509
- - - + + + @@ -59,9 +59,9 @@ 6510 6511 6512
- - - + + + @@ -70,9 +70,9 @@ 6513 6514 6515
- - - + + + @@ -81,66 +81,66 @@ 6516 6517 6518
- - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,9 +148,9 @@ 7614 7615 7616 7617
- - - + + + @@ -158,9 +158,9 @@ 7610 7611 7612 7613
- - - + + + @@ -168,9 +168,9 @@ 7629 7630 7631 7632 7633
- - - + + + @@ -178,9 +178,9 @@ 7636 7637 7725
- - - + + + @@ -188,9 +188,9 @@ 7634 7635
- - - + + + @@ -198,9 +198,9 @@ 7726 7727 7728 7729 7730 7731 7732 7733 7734
- - - + + + @@ -208,9 +208,9 @@ 7735 7736 7737 7738 7739 7740 7741 7742 7743
- - - + + + @@ -218,9 +218,9 @@ 7744 7745 7746 7747 7748 7749 7750 7751 7752
- - - + + + @@ -228,9 +228,9 @@ 7753 7754 7755 7756 7757 7758 7759 7760 7761
- - - + + + @@ -238,9 +238,9 @@ 7762 7763 7764 7765 7766 7767 7768 7769 7770
- - - + + + @@ -248,9 +248,9 @@ 7771 7772 7773 7774 7775 7776 7777 7778 7779
- - - + + + @@ -258,9 +258,9 @@ 7780 7781 7782 7783 7784 7785 7786 7787 7788
- - - + + + @@ -268,9 +268,9 @@ 7789 7790 7791 7792 7793 7794 7795 7796 7797
- - - + + + @@ -278,29 +278,29 @@ 7798 7799 7800 7801 7802 7803 7804 7805 7806
- - - + + + 6665 6666 6667 6668 6669 6670 6671 6672
- + - + - - - + + + @@ -314,10 +314,10 @@ - + - + @@ -326,10 +326,10 @@ - + - + @@ -349,104 +349,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - + - + @@ -459,18 +459,18 @@ - + - + - + - + @@ -478,9 +478,9 @@ - + - + @@ -494,9 +494,9 @@ - + - + @@ -509,11 +509,11 @@ - + - + @@ -525,11 +525,11 @@ - + - + @@ -540,11 +540,11 @@ - + - + @@ -555,11 +555,11 @@ - + - + @@ -575,10 +575,10 @@ - + - + @@ -594,10 +594,10 @@ - + - + @@ -607,10 +607,10 @@ - + - + @@ -620,10 +620,10 @@ - + - + @@ -633,10 +633,10 @@ - + - + @@ -646,10 +646,10 @@ - + - + @@ -664,9 +664,9 @@ - + - + @@ -679,9 +679,9 @@ - + - + @@ -689,10 +689,10 @@ - + - + @@ -704,9 +704,9 @@ 8403 8404 8405 8406 8407 8408 8409 8410 8411
- - - + + + @@ -714,9 +714,9 @@ 8412 8413 8414 8415 8416 8417 8418 8419 8420
- - - + + + @@ -724,9 +724,9 @@ 8421 8422 8423 8424 8425 8426 8427 8428 8429
- - - + + + @@ -734,9 +734,9 @@ 8430 8431 8432 8433 8434 8435 8436 8437 8438
- - - + + + @@ -744,9 +744,9 @@ 8439 8440 8441 8442 8443 8444 8445 8446 8447
- - - + + + @@ -754,9 +754,9 @@ 8448 8449 8450 8451 8452 8453 8454 8455 8456
- - - + + + @@ -764,9 +764,9 @@ 8457 8458 8459 8460 8461 8462 8463 8464 8465
- - - + + + @@ -774,9 +774,9 @@ 8466 8467 8468 8469 8470 8471 8472 8473 8474
- - - + + + @@ -784,9 +784,9 @@ 8475 8476 8477 8478 8479 8480 8481 8482 8483
- - - + + + @@ -794,32 +794,32 @@ 8534 8535 8536 8537 8538 8539 8540
- - - + + + - - - + + + - - - + + + - - - + + + @@ -834,9 +834,9 @@ - + - + @@ -849,17 +849,17 @@ - + - + - - - + + + @@ -868,9 +868,9 @@ 8570 8571 8572 8573 8574 8575
- - - + + + @@ -882,9 +882,9 @@ - + - + @@ -894,9 +894,9 @@ - + - + @@ -905,9 +905,9 @@ - + - + @@ -923,9 +923,9 @@ - + - + @@ -941,9 +941,9 @@ - + - + @@ -959,9 +959,9 @@ - + - + @@ -977,9 +977,9 @@ - + - + @@ -995,9 +995,9 @@ - + - + @@ -1008,9 +1008,9 @@ - + - + @@ -1019,9 +1019,9 @@ 800 1000 1200 1600 2000 2300
300000 300000 300000 300000 300000 600000
- + - + @@ -1033,9 +1033,9 @@ 75 125 175 250 350 420
600000 600000 600000 600000 600000 600000
- + - + @@ -1046,9 +1046,9 @@ 250 400 600 800 1000 1200
- + - + @@ -1056,9 +1056,9 @@ - - - + + + @@ -1066,9 +1066,9 @@ - - - + + + @@ -1077,9 +1077,9 @@ - - - + + + @@ -1088,9 +1088,9 @@ - - - + + + @@ -1099,9 +1099,9 @@ - - - + + + @@ -1110,9 +1110,9 @@ - - - + + + @@ -1121,9 +1121,9 @@ - - - + + + @@ -1132,9 +1132,9 @@ - - - + + + @@ -1143,9 +1143,9 @@ - - - + + + @@ -1154,9 +1154,9 @@ - - - + + + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2300-2399.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2300-2399.xml index 0317cdd666..c13a72b214 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2300-2399.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/2300-2399.xml @@ -1,9 +1,9 @@  - - - + + + @@ -11,10 +11,10 @@ - + - - + + @@ -22,10 +22,10 @@ - + - - + + @@ -33,10 +33,10 @@ - + - - + + @@ -44,10 +44,10 @@ - + - - + + @@ -56,9 +56,9 @@ - + - + @@ -75,16 +75,16 @@ - + - + - + - + @@ -93,26 +93,26 @@ - - - + + + - - - + + + - + - + @@ -124,10 +124,10 @@ - + - + @@ -139,10 +139,10 @@ - + - + @@ -154,10 +154,10 @@ - + - + @@ -169,10 +169,10 @@ - + - + @@ -184,10 +184,10 @@ - + - + @@ -199,10 +199,10 @@ - + - + @@ -214,10 +214,10 @@ - + - + @@ -229,10 +229,10 @@ - + - + @@ -244,10 +244,10 @@ - + - + @@ -258,31 +258,31 @@ - + - + - + - + 6665 6666 6667 6668 6669 6670 6671 6672
- + - + @@ -292,9 +292,9 @@ - - - + + + @@ -302,9 +302,9 @@ - - - + + + @@ -312,9 +312,9 @@ - - - + + + @@ -322,9 +322,9 @@ - - - + + + @@ -332,9 +332,9 @@ - - - + + + @@ -342,9 +342,9 @@ - - - + + + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3000-3099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3000-3099.xml index 821302afdb..19fba710be 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3000-3099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3000-3099.xml @@ -1,24 +1,24 @@  - + - + - + - + - + - + - + - + @@ -27,9 +27,9 @@ - + - + @@ -37,50 +37,50 @@ - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -88,9 +88,9 @@ 1 1 64 64 70
1 1 1.05 1.05 1.05
- + - + @@ -102,9 +102,9 @@ 1 64 64
1 1.05 1.05
- + - + @@ -119,9 +119,9 @@ - + - + @@ -134,9 +134,9 @@ 71 67 63 60 56 53
46 49 52 55 58 61
- + - + @@ -148,9 +148,9 @@ 50 47 45 42 40 37
46 49 52 55 58 61
- + - + @@ -163,9 +163,9 @@ 46 49 52 55 58 61
- + - + @@ -178,9 +178,9 @@ 5 5 5 6 6 7
- + - + @@ -190,9 +190,9 @@ 6 7 8 9 10 14 18
- + - + @@ -200,9 +200,9 @@ - - - + + + @@ -212,9 +212,9 @@ 5 5 6 6 6 7
46 49 52 55 58 61
- + - + @@ -226,9 +226,9 @@ 12 13 14 15 16 17
46 49 52 55 58 61
- + - + @@ -238,67 +238,67 @@ 248.56 298.04 352.73 411.98 474.82 539.9
46 49 52 55 58 61
- + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -306,9 +306,9 @@ 50 48 46 44 42 40
46 49 52 55 58 61
- + - + @@ -317,34 +317,34 @@ - - - + + + - - - + + + - - - + + + 68 69 70 71 72 73 74
8 9 10 12 14 19 21
- + - + @@ -357,10 +357,10 @@ 92 92 114 114 114 144
5 5 6 6 6 7
- + - + @@ -374,10 +374,10 @@ 92 92 114 114 114 144
5 5 6 6 6 7
- + - + @@ -391,9 +391,9 @@ 81.6 61.4 84.14 75.49 66.77 58.01 49.42 84.11 166.26 146.88 127 107.01 133.97 124.79 275.26 267.13 257.98 297.21 331.38 361.06
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1.05 1.05 1.05 1.05
- + - + @@ -405,18 +405,18 @@ 106.45 118.22 129.81 140.87 151.04 159.93
46 49 52 55 58 61
- + - + - - - + + + @@ -425,9 +425,9 @@ 1.05 1.04 1.05 1.04 1.03 1.03 1.02 1.04 1.07 1.06 1.05 1.04 1.05 1.04 1.09 1.08 1.08 1.09 1.09 1.10
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1.05 1.05 1.05 1.05
- + - + @@ -440,9 +440,9 @@ 3.9 2.8 3.7 3.1 2.6 2.2 1.8 2.9 5.7 4.8 3.9 3.2 3.8 3.4 6.5 6.5 6.5 6.5 6.5 6.5
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1.05 1.05 1.05 1.05
- + - + @@ -453,9 +453,9 @@ 1 1.05 1.1
- + - + @@ -468,9 +468,9 @@ 1 1.05 1.1
- + - + @@ -479,9 +479,9 @@ - + - + @@ -489,16 +489,16 @@ - - - + + + - - - + + + @@ -509,9 +509,9 @@ - + - + @@ -525,9 +525,9 @@ - + - + @@ -541,9 +541,9 @@ - + - + @@ -557,9 +557,9 @@ - + - + @@ -567,17 +567,17 @@ - - - + + + 1 1.05 1.1
- + - + @@ -588,9 +588,9 @@ 1 1.05
- + - + @@ -604,10 +604,10 @@ - + - + @@ -617,10 +617,10 @@ - + - + @@ -632,10 +632,10 @@ - + - + @@ -651,10 +651,10 @@ - + - + @@ -668,9 +668,9 @@ - + - + @@ -682,9 +682,9 @@ - + - + @@ -693,9 +693,9 @@ - + - + @@ -704,24 +704,24 @@ - - - + + + - - - + + + 1 1.05 1.1
- + - + @@ -730,9 +730,9 @@ - + - + @@ -744,9 +744,9 @@ 64 67 70
- + - + @@ -757,16 +757,16 @@ - - - + + + - + - + @@ -776,9 +776,9 @@ 153 167
- + - + @@ -790,10 +790,10 @@ - + - + @@ -804,10 +804,10 @@ - + - + @@ -818,9 +818,9 @@ 46 49 52 55 58 61
20.36 22.51 24.59 26.53 28.27 29.7
- + - + @@ -830,9 +830,9 @@ 46 49 52 55 58 61
75.86 87.22 99.39 112.26 125.66 139.41
- + - + @@ -843,10 +843,10 @@ - + - + @@ -857,10 +857,10 @@ - + - + @@ -873,11 +873,11 @@ 2 2 2 3 3 3 4 4 5 5
46 49 52 55 58 61 64 67 70 76
- + - + @@ -889,9 +889,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -904,9 +904,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -915,9 +915,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -927,9 +927,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -939,9 +939,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -951,9 +951,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -963,9 +963,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -975,9 +975,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -987,9 +987,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -999,9 +999,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1011,9 +1011,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1023,9 +1023,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1035,9 +1035,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1047,9 +1047,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1062,9 +1062,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -1073,9 +1073,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1085,9 +1085,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1097,9 +1097,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -1109,9 +1109,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3100-3199.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3100-3199.xml index f9100f8168..e1655ec95f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3100-3199.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3100-3199.xml @@ -4,9 +4,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -16,9 +16,9 @@ 2 2 2 3 3 3 2 2 2 2
1 2 3 4 5 6 7 8 9 10
- + - + @@ -28,9 +28,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -40,9 +40,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -52,9 +52,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -64,9 +64,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -76,9 +76,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -88,9 +88,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -102,11 +102,11 @@ 2 2 2 3 3 3 4 4 5 5
46 49 52 55 58 61 64 67 70 76
- + - + @@ -120,11 +120,11 @@ 2 2 2 3 3 3 4 4 5 5
46 49 52 55 58 61 64 67 70 76
- + - + @@ -136,9 +136,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -147,9 +147,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -159,9 +159,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -171,9 +171,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -183,9 +183,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -195,9 +195,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -207,9 +207,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -219,9 +219,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -231,9 +231,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -243,9 +243,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -255,9 +255,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -267,9 +267,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -279,9 +279,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -297,13 +297,13 @@ - + - + @@ -314,13 +314,13 @@ - + - + @@ -341,12 +341,12 @@ - + - + @@ -363,13 +363,13 @@ - + - + @@ -387,13 +387,13 @@ - + - + @@ -411,13 +411,13 @@ - + - + @@ -434,13 +434,13 @@ - + - + @@ -458,13 +458,13 @@ - + - + @@ -475,13 +475,13 @@ - + - + @@ -498,13 +498,13 @@ - + - + @@ -521,13 +521,13 @@ - + - + @@ -544,13 +544,13 @@ - + - + @@ -567,13 +567,13 @@ - + - + @@ -590,13 +590,13 @@ - + - + @@ -614,13 +614,13 @@ - + - + @@ -638,13 +638,13 @@ - + - + @@ -661,13 +661,13 @@ - + - + @@ -684,13 +684,13 @@ - + - + @@ -707,13 +707,13 @@ - + - + @@ -730,13 +730,13 @@ - + - + @@ -753,13 +753,13 @@ - + - + @@ -776,13 +776,13 @@ - + - + @@ -800,13 +800,13 @@ - + - + @@ -819,26 +819,26 @@ - + - + - + - + @@ -850,13 +850,13 @@ - + - + @@ -876,13 +876,13 @@ - + - + @@ -899,14 +899,14 @@ - + - + @@ -918,13 +918,13 @@ - + - + @@ -937,12 +937,12 @@ - + - + @@ -959,7 +959,7 @@ - + @@ -968,7 +968,7 @@ - + @@ -986,9 +986,9 @@ - + - + @@ -1006,12 +1006,12 @@ - + - + @@ -1019,23 +1019,23 @@ - + - + - + - + @@ -1043,12 +1043,12 @@ - + - + @@ -1066,11 +1066,11 @@ - + - + @@ -1092,13 +1092,13 @@ - + - + @@ -1110,11 +1110,11 @@ - + - + @@ -1131,11 +1131,11 @@ - + - + @@ -1152,11 +1152,11 @@ - + - + @@ -1173,11 +1173,11 @@ - + - + @@ -1198,7 +1198,7 @@ - + @@ -1207,7 +1207,7 @@ - + @@ -1221,7 +1221,7 @@ - + @@ -1230,7 +1230,7 @@ - + @@ -1244,7 +1244,7 @@ - + @@ -1253,7 +1253,7 @@ - + @@ -1270,13 +1270,13 @@ - + - + @@ -1290,7 +1290,7 @@ - + @@ -1299,7 +1299,7 @@ - + @@ -1313,7 +1313,7 @@ - + @@ -1322,7 +1322,7 @@ - + @@ -1336,13 +1336,13 @@ - + - + @@ -1359,14 +1359,14 @@ - + - + @@ -1383,14 +1383,14 @@ - + - + @@ -1407,14 +1407,14 @@ - + - + @@ -1428,14 +1428,14 @@ - + - + @@ -1452,14 +1452,14 @@ - + - + @@ -1476,14 +1476,14 @@ - + - + @@ -1497,14 +1497,14 @@ - + - + @@ -1521,14 +1521,14 @@ - + - + @@ -1544,14 +1544,14 @@ - + - + @@ -1567,14 +1567,14 @@ - + - + @@ -1587,14 +1587,14 @@ - + - + @@ -1607,7 +1607,7 @@ - + @@ -1617,7 +1617,7 @@ - + @@ -1630,7 +1630,7 @@ - + @@ -1640,7 +1640,7 @@ - + @@ -1653,14 +1653,14 @@ - + - + @@ -1673,14 +1673,14 @@ - + - + @@ -1697,14 +1697,14 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -1725,13 +1725,13 @@ - + - + @@ -1750,14 +1750,14 @@ - + - + @@ -1773,10 +1773,10 @@ - + - + @@ -1799,14 +1799,14 @@ - + - + @@ -1828,10 +1828,10 @@ - + - + @@ -1849,14 +1849,14 @@ - + - + @@ -1876,14 +1876,14 @@ - + - + @@ -1902,14 +1902,14 @@ - + - + @@ -1929,13 +1929,13 @@ - + - + @@ -1952,14 +1952,14 @@ - + - + @@ -1974,12 +1974,12 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3200-3299.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3200-3299.xml index f5e6b41e7c..6d54968541 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3200-3299.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3200-3299.xml @@ -7,12 +7,12 @@ 0.95 0.93 0.9
- + - + @@ -28,12 +28,12 @@ - + - + @@ -50,12 +50,12 @@ - + - + @@ -69,9 +69,9 @@ - + - + @@ -83,13 +83,13 @@ 5 6 7
- + - + @@ -104,29 +104,29 @@ 20000 3500
- + - + - - - + + + 1 1 2 2 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -136,9 +136,9 @@ 1 1 2 2 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -148,9 +148,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -160,9 +160,9 @@ 1 1 2 2 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -172,9 +172,9 @@ 1 1 2 2 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -184,9 +184,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -196,9 +196,9 @@ 1 1 2 2 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -208,9 +208,9 @@ 1 1 2 2 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -220,9 +220,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -232,10 +232,10 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -244,9 +244,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -256,9 +256,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -268,9 +268,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -282,9 +282,9 @@ 1 2 3 4 5 6 7 8 9 10
- + - + @@ -294,9 +294,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -306,9 +306,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -318,9 +318,9 @@ 2 2 2 3 3 3 3 3 3 3
1 2 3 4 5 6 7 8 9 10
- + - + @@ -330,9 +330,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -342,9 +342,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -354,9 +354,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -366,9 +366,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -378,9 +378,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -390,9 +390,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -402,9 +402,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -414,9 +414,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -426,9 +426,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -438,9 +438,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -450,9 +450,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -462,9 +462,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -474,9 +474,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -486,9 +486,9 @@ 2 2 2 3 3 3 4 4 5 5
1 2 3 4 5 6 7 8 9 10
- + - + @@ -497,9 +497,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
- + - + @@ -507,9 +507,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
- + - + @@ -517,9 +517,9 @@ 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 1.04 1.15
- + - + @@ -527,9 +527,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
- + - + @@ -537,9 +537,9 @@ 1.06 1.07 1.08 1.09 1.1 1.11 1.12 1.13 1.14 1.15
- + - + @@ -547,9 +547,9 @@ 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 1.11 1.15
- + - + @@ -557,9 +557,9 @@ 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 1.11 1.12
- + - + @@ -567,9 +567,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
- + - + @@ -577,9 +577,9 @@ 1 1 1 2 2 2 3 3 4 4
- + - + @@ -587,9 +587,9 @@ 1 1 1 2 2 2 3 3 4 4
- + - + @@ -597,9 +597,9 @@ 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.14 0.15
- + - + @@ -607,9 +607,9 @@ 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.25
- + - + @@ -617,9 +617,9 @@ 1.05 1.1 1.15 1.2 1.25 1.3 1.35 1.4 1.45 1.5
- + - + @@ -627,9 +627,9 @@ 2.2 2.4 2.6 2.8 3 3.2 3.4 3.6 3.8 4
- + - + @@ -637,9 +637,9 @@ 1.03 1.06 1.09 1.12 1.15 1.18 1.21 1.24 1.27 1.3
- + - + @@ -647,9 +647,9 @@ 1.03 1.06 1.09 1.12 1.15 1.18 1.21 1.24 1.27 1.3
- + - + @@ -657,9 +657,9 @@ 0.95 0.92 0.9
- + - + @@ -667,9 +667,9 @@ 0.95 0.92 0.9
- + - + @@ -677,9 +677,9 @@ 0.95 0.92 0.9
- + - + @@ -687,9 +687,9 @@ 0.95 0.92 0.9
- + - + @@ -699,9 +699,9 @@ 5 6 7
- + - + @@ -714,11 +714,11 @@ - + - + @@ -729,10 +729,10 @@ - + - + @@ -743,28 +743,28 @@ - + - + - + - + - + - + @@ -773,19 +773,19 @@ - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3500-3599.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3500-3599.xml index 924014ef67..c45cc16611 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3500-3599.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3500-3599.xml @@ -2,9 +2,9 @@ - + - + @@ -16,9 +16,9 @@ - + - + @@ -28,9 +28,9 @@ - + - + @@ -40,9 +40,9 @@ - + - + @@ -52,9 +52,9 @@ - + - + @@ -66,9 +66,9 @@ - + - + @@ -78,9 +78,9 @@ - + - + @@ -92,9 +92,9 @@ - + - + @@ -108,9 +108,9 @@ - + - + @@ -120,9 +120,9 @@ - + - + @@ -132,9 +132,9 @@ - + - + @@ -146,9 +146,9 @@ - + - + @@ -160,9 +160,9 @@ - + - + @@ -172,9 +172,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -200,9 +200,9 @@ - + - + @@ -212,9 +212,9 @@ - + - + @@ -224,9 +224,9 @@ - + - + @@ -242,9 +242,9 @@ - + - + @@ -256,9 +256,9 @@ - + - + @@ -268,9 +268,9 @@ - + - + @@ -280,9 +280,9 @@ - + - + @@ -294,9 +294,9 @@ - + - + @@ -308,9 +308,9 @@ - + - + @@ -322,9 +322,9 @@ - + - + @@ -342,9 +342,9 @@ - + - + @@ -360,9 +360,9 @@ - + - + @@ -380,9 +380,9 @@ - + - + @@ -404,9 +404,9 @@ - + - + @@ -424,9 +424,9 @@ - + - + @@ -446,9 +446,9 @@ - + - + @@ -464,9 +464,9 @@ - + - + @@ -486,9 +486,9 @@ - + - + @@ -506,9 +506,9 @@ - + - + @@ -528,9 +528,9 @@ - + - + @@ -550,9 +550,9 @@ - + - + @@ -574,9 +574,9 @@ - + - + @@ -594,9 +594,9 @@ - + - + @@ -614,9 +614,9 @@ - + - + @@ -636,9 +636,9 @@ - + - + @@ -662,9 +662,9 @@ - + - + @@ -684,9 +684,9 @@ - + - + @@ -707,18 +707,18 @@ 203.97 226.51 248.71 269.91 289.4 306.42
- + - + - + - + @@ -727,9 +727,9 @@ - + - + @@ -738,9 +738,9 @@ - + - + @@ -749,9 +749,9 @@ - + - + @@ -760,9 +760,9 @@ - + - + @@ -771,9 +771,9 @@ - + - + @@ -782,9 +782,9 @@ - + - + @@ -793,9 +793,9 @@ - + - + @@ -804,9 +804,9 @@ - + - + @@ -815,9 +815,9 @@ - + - + @@ -825,9 +825,9 @@ - + - + @@ -847,9 +847,9 @@ - + - + @@ -859,9 +859,9 @@ - + - + @@ -883,9 +883,9 @@ - + - + @@ -909,9 +909,9 @@ - + - + @@ -926,9 +926,9 @@ - + - + @@ -943,9 +943,9 @@ - + - + @@ -957,9 +957,9 @@ - + - + @@ -968,9 +968,9 @@ - + - + @@ -983,9 +983,9 @@ - + - + @@ -996,9 +996,9 @@ - + - + @@ -1007,9 +1007,9 @@ - + - + @@ -1017,31 +1017,31 @@ - - - + + + - - - + + + - - - + + + 6 7 8 9 10 14
- + - + @@ -1050,10 +1050,10 @@ - + - + @@ -1063,9 +1063,9 @@ - + - + @@ -1090,9 +1090,9 @@ - + - + @@ -1104,9 +1104,9 @@ 265 906 999 1059
- + - + @@ -1116,9 +1116,9 @@ - + - + @@ -1131,10 +1131,10 @@ - + - + @@ -1145,19 +1145,19 @@ - + - + - + - + @@ -1172,12 +1172,12 @@ - + - + @@ -1186,9 +1186,9 @@ - + - + @@ -1218,11 +1218,11 @@ - + - + @@ -1232,9 +1232,9 @@ - + - + @@ -1262,11 +1262,11 @@ - + - + @@ -1274,9 +1274,9 @@ - + - + @@ -1301,9 +1301,9 @@ - + - + @@ -1333,10 +1333,10 @@ - + - + @@ -1344,9 +1344,9 @@ - + - + @@ -1378,11 +1378,11 @@ - + - + @@ -1391,9 +1391,9 @@ - + - + @@ -1425,10 +1425,10 @@ - + - + @@ -1436,9 +1436,9 @@ - + - + @@ -1474,10 +1474,10 @@ - + - + @@ -1486,9 +1486,9 @@ - + - + @@ -1518,19 +1518,19 @@ - + - + - + - + @@ -1554,11 +1554,11 @@ - + - + @@ -1569,9 +1569,9 @@ - + - + @@ -1601,17 +1601,17 @@ - + - + - + - + @@ -1637,16 +1637,16 @@ - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3600-3699.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3600-3699.xml index b711668a0c..77a061fe39 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3600-3699.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/3600-3699.xml @@ -6,9 +6,9 @@ 1 1 1 1 1 1 1.05 1.05 1.05
46 49 52 55 58 61 64 67 75 80
- + - + @@ -22,9 +22,9 @@ 1 1 1 1 1 1 1.05 1.05 1.05
46 49 52 55 58 61 64 67 75
- + - + @@ -37,9 +37,9 @@ 1 1 1 1 1 1 1.05 1.05 1.05
46 49 52 55 58 61 64 67 75
- + - + @@ -54,10 +54,10 @@ 3 3.1 3.2 3.3 3.4 3.5 3.75 4 4.25 4.5
4 6 8 10 12 14 16 18 19 20
15 20 25 30 35 40 45 50 55 60
- + - + @@ -74,9 +74,9 @@ - + - + @@ -91,9 +91,9 @@ - + - + @@ -103,9 +103,9 @@ - + - + @@ -115,9 +115,9 @@ - + - + @@ -127,9 +127,9 @@ - + - + @@ -141,9 +141,9 @@ - + - + @@ -155,9 +155,9 @@ - + - + @@ -169,9 +169,9 @@ - + - + @@ -181,9 +181,9 @@ - + - + @@ -193,9 +193,9 @@ - + - + @@ -205,9 +205,9 @@ - + - + @@ -217,9 +217,9 @@ - + - + @@ -229,9 +229,9 @@ - + - + @@ -241,9 +241,9 @@ - + - + @@ -253,9 +253,9 @@ - + - + @@ -265,9 +265,9 @@ - + - + @@ -277,9 +277,9 @@ - + - + @@ -289,9 +289,9 @@ - + - + @@ -301,9 +301,9 @@ - + - + @@ -313,9 +313,9 @@ - + - + @@ -325,9 +325,9 @@ - + - + @@ -337,9 +337,9 @@ - + - + @@ -349,11 +349,11 @@ - + - + @@ -369,11 +369,11 @@ - + - + @@ -390,11 +390,11 @@ - + - + @@ -418,9 +418,9 @@ 3 3.1 3.2 3.3 3.4 3.5 3.75 4 4.25 4.5
4 6 8 10 12 14 16 18 19 20
15 20 25 30 35 40 45 50 55 60
- + - + @@ -439,35 +439,35 @@ - + - + - + - + - + - + @@ -477,12 +477,12 @@ 0.5 0
50 100
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4000-4099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4000-4099.xml index 710411ba9a..e6b703b8f6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4000-4099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4000-4099.xml @@ -10,13 +10,13 @@ - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,9 +45,9 @@ - + - + @@ -58,9 +58,9 @@ - + - + @@ -69,9 +69,9 @@ - + - + @@ -82,9 +82,9 @@ - + - + @@ -95,9 +95,9 @@ - + - + @@ -108,9 +108,9 @@ - + - + @@ -121,11 +121,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -135,11 +135,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -149,11 +149,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -163,11 +163,11 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -176,9 +176,9 @@ - + - + @@ -188,9 +188,9 @@ - + - + @@ -200,9 +200,9 @@ - + - + @@ -212,9 +212,9 @@ - + - + @@ -225,12 +225,12 @@ - + - + @@ -241,11 +241,11 @@ - + - + @@ -261,13 +261,13 @@ - + - + @@ -279,11 +279,11 @@ - + - + @@ -291,9 +291,9 @@ - + - + @@ -302,28 +302,28 @@ - + - + - + - + - + - + @@ -334,12 +334,12 @@ 138 204 285 379 477 566 635 659 676 689 700 709
- + - + @@ -355,12 +355,12 @@ - + - + @@ -371,11 +371,11 @@ - + - + @@ -384,11 +384,11 @@ 20 40 70
- + - + @@ -406,11 +406,11 @@ 20 40 70
- + - + @@ -426,12 +426,12 @@ 20 40 70
- + - + @@ -447,12 +447,12 @@ 20 40 70
- + - + @@ -470,11 +470,11 @@ - + - + @@ -486,13 +486,13 @@ - + - + @@ -506,13 +506,13 @@ - + - + @@ -530,13 +530,13 @@ - + - + @@ -554,14 +554,14 @@ - + - + @@ -580,12 +580,12 @@ - + - + @@ -604,12 +604,12 @@ - + - + @@ -626,12 +626,12 @@ - + - + @@ -643,11 +643,11 @@ - + - + @@ -665,10 +665,10 @@ - + - + @@ -680,10 +680,10 @@ - + - + @@ -695,12 +695,12 @@ - + - + @@ -711,17 +711,17 @@ - + - + - + - + @@ -742,13 +742,13 @@ - + - + @@ -764,13 +764,13 @@ - + - + @@ -783,9 +783,9 @@ 1.5 1.8 2
- + - + @@ -800,12 +800,12 @@ - + - + @@ -815,12 +815,12 @@ - + - + @@ -833,10 +833,10 @@ - + - + @@ -845,10 +845,10 @@ - + - + @@ -864,10 +864,10 @@ - + - + @@ -882,10 +882,10 @@ - + - + @@ -900,10 +900,10 @@ - + - + @@ -913,17 +913,17 @@ - + - + - + - + @@ -932,9 +932,9 @@ - + - + @@ -943,9 +943,9 @@ - + - + @@ -954,9 +954,9 @@ - + - + @@ -965,9 +965,9 @@ - + - + @@ -978,9 +978,9 @@ - + - + @@ -994,11 +994,11 @@ - + - + @@ -1010,12 +1010,12 @@ - + - + @@ -1029,12 +1029,12 @@ - + - + @@ -1047,13 +1047,13 @@ - + - + @@ -1065,12 +1065,12 @@ - + - + @@ -1082,11 +1082,11 @@ - + - + @@ -1098,12 +1098,12 @@ - + - + @@ -1112,9 +1112,9 @@ - + - + @@ -1127,9 +1127,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1146,13 +1146,13 @@ - + - + @@ -1167,12 +1167,12 @@ - + - + @@ -1185,12 +1185,12 @@ 30 70
- + - + @@ -1209,11 +1209,11 @@ - + - + @@ -1230,12 +1230,12 @@ - + - + @@ -1252,12 +1252,12 @@ - + - + @@ -1269,14 +1269,14 @@ - + - + @@ -1286,12 +1286,12 @@ - + - + @@ -1300,22 +1300,22 @@ - + - + - + - + @@ -1323,13 +1323,13 @@ - + - + @@ -1341,21 +1341,21 @@ - + - + 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10
- + - + @@ -1364,9 +1364,9 @@ - + - + @@ -1375,9 +1375,9 @@ - + - + @@ -1392,13 +1392,13 @@ - + - + @@ -1410,13 +1410,13 @@ - + - + @@ -1425,11 +1425,11 @@ - + - + @@ -1441,11 +1441,11 @@ - + - + @@ -1456,11 +1456,11 @@ - + - + @@ -1474,11 +1474,11 @@ - + - + @@ -1491,9 +1491,9 @@ - + - + @@ -1507,12 +1507,12 @@ - + - + @@ -1522,9 +1522,9 @@ - + - + @@ -1534,11 +1534,11 @@ 20 40 70
- + - + @@ -1557,12 +1557,12 @@ - + - + @@ -1579,12 +1579,12 @@ - + - + @@ -1603,12 +1603,12 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4100-4199.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4100-4199.xml index 0d8e0bc895..a661bb7cf6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4100-4199.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4100-4199.xml @@ -8,14 +8,14 @@ - + - + @@ -27,12 +27,12 @@ - + - + @@ -48,13 +48,13 @@ - + - + @@ -70,11 +70,11 @@ 40 70
- + - + @@ -95,13 +95,13 @@ - + - + @@ -116,12 +116,12 @@ - + - + @@ -129,14 +129,14 @@ - + - + @@ -146,14 +146,14 @@ - + - + @@ -164,13 +164,13 @@ - + - + @@ -183,13 +183,13 @@ - + - + @@ -209,13 +209,13 @@ - + - + @@ -225,7 +225,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -246,13 +246,13 @@ - + - + @@ -260,13 +260,13 @@ - + - + @@ -280,12 +280,12 @@ - + - + @@ -294,18 +294,18 @@ - + - + 1.05 1.11 1.17 1.25 1.33 1.43 1.67 2 3.33 10
- + - + @@ -321,12 +321,12 @@ - + - + @@ -342,13 +342,13 @@ - + - + @@ -365,12 +365,12 @@ - + - + @@ -389,12 +389,12 @@ - + - + @@ -403,9 +403,9 @@ - + - + @@ -416,9 +416,9 @@ - + - + @@ -436,11 +436,11 @@ - + - + @@ -452,38 +452,38 @@ - + - + - + - + - + - + - + - + @@ -491,36 +491,36 @@ - + - + - + - + - + - + @@ -529,12 +529,12 @@ - + - + @@ -545,17 +545,17 @@ - + - + - + - + @@ -563,19 +563,19 @@ - + - + - + - + @@ -584,10 +584,10 @@ - + - + @@ -599,7 +599,7 @@ - + @@ -607,7 +607,7 @@ - + @@ -619,13 +619,13 @@ - + - + @@ -634,7 +634,7 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + @@ -643,7 +643,7 @@ - + @@ -651,10 +651,10 @@ 1 2 3 4 5 6 7 8 9 10 11 12
- + - + @@ -664,13 +664,13 @@ 18 26 38 52 68 85 102 102 102 102 102 102
- + - + @@ -679,13 +679,13 @@ 18 26 38 52 68 85 102 102 102 102 102 102
- + - + @@ -694,7 +694,7 @@ 5 15 25 35 45 55 65 75 85 95
- + @@ -702,7 +702,7 @@ - + @@ -714,20 +714,20 @@ - + - + 0.83 0.8 0.77
- + - + @@ -741,10 +741,10 @@ 0.83 0.8 0.77
- + - + @@ -759,12 +759,12 @@ - + - + @@ -775,13 +775,13 @@ - + - + @@ -800,13 +800,13 @@ - + - + @@ -820,13 +820,13 @@ - + - + @@ -842,11 +842,11 @@ - + - + @@ -860,12 +860,12 @@ - + - + @@ -880,11 +880,11 @@ - + - + @@ -901,12 +901,12 @@ - + - + @@ -919,12 +919,12 @@ - + - + @@ -936,12 +936,12 @@ - + - + @@ -953,13 +953,13 @@ - + - + @@ -971,13 +971,13 @@ - + - + @@ -989,12 +989,12 @@ - + - + @@ -1006,20 +1006,20 @@ - + - + - + - + @@ -1028,10 +1028,10 @@ 0.9 0.7 0.5
- + - + @@ -1046,12 +1046,12 @@ - + - + @@ -1068,11 +1068,11 @@ - + - + @@ -1084,11 +1084,11 @@ - + - + @@ -1102,11 +1102,11 @@ - + - + @@ -1115,11 +1115,11 @@ - + - + @@ -1137,11 +1137,11 @@ - + - + @@ -1155,12 +1155,12 @@ - + - + @@ -1176,10 +1176,10 @@ - + - + @@ -1192,10 +1192,10 @@ - + - + @@ -1207,11 +1207,11 @@ - + - + @@ -1227,10 +1227,10 @@ - + - + @@ -1247,10 +1247,10 @@ - + - + @@ -1267,10 +1267,10 @@ - + - + @@ -1287,10 +1287,10 @@ - + - + @@ -1307,12 +1307,12 @@ - + - + @@ -1326,13 +1326,13 @@ - + - + @@ -1344,11 +1344,11 @@ - + - + @@ -1362,12 +1362,12 @@ - + - + @@ -1383,10 +1383,10 @@ - + - + @@ -1399,12 +1399,12 @@ - + - + @@ -1422,12 +1422,12 @@ - + - + @@ -1445,12 +1445,12 @@ - + - + @@ -1467,11 +1467,11 @@ - + - + @@ -1486,11 +1486,11 @@ - + - + @@ -1507,13 +1507,13 @@ - + - + @@ -1531,12 +1531,12 @@ - + - + @@ -1551,11 +1551,11 @@ - + - + @@ -1572,11 +1572,11 @@ - + - + @@ -1594,10 +1594,10 @@ - + - + @@ -1608,12 +1608,12 @@ - + - + @@ -1627,12 +1627,12 @@ - + - + @@ -1646,10 +1646,10 @@ - + - + @@ -1661,12 +1661,12 @@ - + - + @@ -1680,13 +1680,13 @@ - + - + @@ -1704,12 +1704,12 @@ - + - + @@ -1725,11 +1725,11 @@ - + - + @@ -1747,11 +1747,11 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4200-4299.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4200-4299.xml index f20c742ae7..2685e820f4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4200-4299.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4200-4299.xml @@ -10,10 +10,10 @@ - + - + @@ -31,12 +31,12 @@ - + - + @@ -52,12 +52,12 @@ - + - + @@ -74,12 +74,12 @@ - + - + @@ -99,12 +99,12 @@ - + - + @@ -120,12 +120,12 @@ - + - + @@ -140,12 +140,12 @@ - + - + @@ -162,13 +162,13 @@ - + - + @@ -184,10 +184,10 @@ - + - + @@ -202,12 +202,12 @@ - + - + @@ -221,12 +221,12 @@ - + - + @@ -240,10 +240,10 @@ - + - + @@ -257,10 +257,10 @@ - + - + @@ -274,10 +274,10 @@ - + - + @@ -291,10 +291,10 @@ - + - + @@ -304,10 +304,10 @@ - + - + @@ -318,12 +318,12 @@ - + - - + + @@ -331,12 +331,12 @@ - + - - + + @@ -347,12 +347,12 @@ - + - + @@ -367,13 +367,13 @@ - + - + @@ -384,12 +384,12 @@ - + - + @@ -397,40 +397,40 @@ - + - + - + - + - + - + - - + + - + - + @@ -444,9 +444,9 @@ - + - + @@ -455,17 +455,17 @@ - + - + - + - + @@ -483,11 +483,11 @@ - + - + @@ -499,11 +499,11 @@ - + - + @@ -512,11 +512,11 @@ - + - + @@ -528,11 +528,11 @@ - + - + @@ -544,20 +544,20 @@ - + - + - + - + @@ -573,18 +573,18 @@ - + - + - + - + @@ -594,12 +594,12 @@ - + - + @@ -615,13 +615,13 @@ - + - + @@ -636,13 +636,13 @@ - + - + @@ -653,9 +653,9 @@ - + - + @@ -665,9 +665,9 @@ - + - + @@ -677,9 +677,9 @@ - + - + @@ -689,9 +689,9 @@ - + - + @@ -704,10 +704,10 @@ - + - + @@ -725,22 +725,22 @@ - + - + - + - + @@ -753,9 +753,9 @@ - + - + @@ -770,13 +770,13 @@ - + - + @@ -790,13 +790,13 @@ - + - + @@ -813,13 +813,13 @@ - + - + @@ -838,13 +838,13 @@ - + - + @@ -856,13 +856,13 @@ - + - + @@ -874,14 +874,14 @@ - + - + @@ -895,13 +895,13 @@ - + - + @@ -915,13 +915,13 @@ - + - + @@ -933,20 +933,20 @@ - + - + - + - + @@ -963,7 +963,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -982,10 +982,10 @@ - + - + @@ -1004,13 +1004,13 @@ - + - + @@ -1029,13 +1029,13 @@ - + - + @@ -1051,23 +1051,23 @@ - + - + - + - + @@ -1087,9 +1087,9 @@ - + - + @@ -1104,9 +1104,9 @@ - + - + @@ -1115,11 +1115,11 @@ - + - + @@ -1133,11 +1133,11 @@ - + - + @@ -1152,9 +1152,9 @@ 0.22 0.19 0.16 0.13 0.1 0.1 0.1 0.1 0.1 0.1
- + - + @@ -1171,17 +1171,17 @@ - + - + - + - + @@ -1189,9 +1189,9 @@ 0.5 0.5 0.15 0
1 0.5 0.5 0
- + - + @@ -1202,17 +1202,17 @@ - + - + - + - + @@ -1222,9 +1222,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1234,9 +1234,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -1246,9 +1246,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -1258,9 +1258,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -1270,9 +1270,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1281,18 +1281,18 @@ - + - + 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1304,9 +1304,9 @@ 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1318,9 +1318,9 @@ 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1332,9 +1332,9 @@ 1.1 1.15 1.2 1.3 1.5
0.9 0.85 0.8 0.7 0.5
- + - + @@ -1344,9 +1344,9 @@ - + - + @@ -1356,9 +1356,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1368,9 +1368,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1379,9 +1379,9 @@ - + - + @@ -1391,9 +1391,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1402,9 +1402,9 @@ - + - + @@ -1419,11 +1419,11 @@ - + - + @@ -1433,72 +1433,72 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4300-4399.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4300-4399.xml index 9615d62732..f7e14c10d0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4300-4399.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4300-4399.xml @@ -2,36 +2,36 @@ - - - + + + - - - + + + - - - + + + - + - + @@ -40,9 +40,9 @@ - + - + @@ -51,9 +51,9 @@ - + - + @@ -62,9 +62,9 @@ - + - + @@ -73,9 +73,9 @@ - + - + @@ -84,9 +84,9 @@ - + - + @@ -95,9 +95,9 @@ - + - + @@ -106,9 +106,9 @@ - + - + @@ -117,9 +117,9 @@ - + - + @@ -128,9 +128,9 @@ - + - + @@ -146,9 +146,9 @@ - + - + @@ -169,14 +169,14 @@ - + - + @@ -188,13 +188,13 @@ - + - + @@ -207,14 +207,14 @@ - + - + @@ -227,11 +227,11 @@ - + - + @@ -247,11 +247,11 @@ - + - + @@ -271,12 +271,12 @@ - + - + @@ -293,14 +293,14 @@ - + - + @@ -316,12 +316,12 @@ - + - + @@ -333,11 +333,11 @@ - + - + @@ -349,11 +349,11 @@ - + - + @@ -365,11 +365,11 @@ - + - + @@ -381,11 +381,11 @@ - + - + @@ -397,11 +397,11 @@ - + - + @@ -413,11 +413,11 @@ - + - + @@ -429,11 +429,11 @@ - + - + @@ -445,11 +445,11 @@ - + - + @@ -461,11 +461,11 @@ - + - + @@ -477,11 +477,11 @@ - + - + @@ -492,9 +492,9 @@ - + - + @@ -506,9 +506,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -518,10 +518,10 @@ - + - + @@ -529,9 +529,9 @@ - + - + @@ -543,9 +543,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -555,9 +555,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -568,22 +568,22 @@ - + - + - + - + @@ -591,11 +591,11 @@ - + - + @@ -609,11 +609,11 @@ - + - + @@ -628,10 +628,10 @@ 20 33
20 30
- + - + @@ -645,10 +645,10 @@ 20 30 40
3000 6000 9000
- + - + @@ -662,10 +662,10 @@ 1.08 1.12 1.15
20 30 40
- + - + @@ -679,10 +679,10 @@ 1.08 1.12 1.15
20 30 40
- + - + @@ -697,10 +697,10 @@ 0.5 0.4 0.3 0.2
50 60 70 80
- + - + @@ -717,10 +717,10 @@ 1.1 1.15 1.2 1.25 1.3 1.35
20 30 40 50 60 70
- + - + @@ -734,10 +734,10 @@ 1.1 1.15 1.2 1.25 1.3 1.35
20 30 40 50 60 70
- + - + @@ -751,10 +751,10 @@ 1.23 1.3
20 30
- + - + @@ -769,10 +769,10 @@ 0.8 0.75 0.7 0.75
15 20 30 40
- + - + @@ -786,10 +786,10 @@ 20 30 40 50 60 70
18 25 36 42 48 53
- + - + @@ -810,10 +810,10 @@ 2 4
20 40
- + - + @@ -834,10 +834,10 @@ 1.3 1.4 1.5 1.6 1.7 1.8
20 30 40 50 60 70
- + - + @@ -851,10 +851,10 @@ 20 30 40 50
6 7 8 9
- + - + @@ -868,10 +868,10 @@ 1.15 1.23 1.3
30 45 60
- + - + @@ -885,10 +885,10 @@ 1.55 1.65 1.75
30 45 60
- + - + @@ -902,10 +902,10 @@ 1.15 1.33
30 60
- + - + @@ -919,10 +919,10 @@ 20 30 40
2 3 4
- + - + @@ -936,11 +936,11 @@ 0.2 0.25 0.3
30 45 60
- + - + @@ -954,10 +954,10 @@ 1.3 1.32 1.35
30 45 60
- + - + @@ -970,11 +970,11 @@ 1 2
- + - + @@ -990,11 +990,11 @@ 1 2
- + - + @@ -1009,11 +1009,11 @@ - + - + @@ -1026,11 +1026,11 @@ 1 2
- + - + @@ -1048,11 +1048,11 @@ 1 2
- + - + @@ -1069,11 +1069,11 @@ - + - + @@ -1085,10 +1085,10 @@ - + - + @@ -1096,10 +1096,10 @@ - + - + @@ -1109,10 +1109,10 @@ - + - + @@ -1122,10 +1122,10 @@ - + - + @@ -1135,10 +1135,10 @@ - + - + @@ -1148,10 +1148,10 @@ - + - + @@ -1161,10 +1161,10 @@ - + - + @@ -1174,10 +1174,10 @@ - + - + @@ -1187,10 +1187,10 @@ - + - + @@ -1201,9 +1201,9 @@ - + - + @@ -1217,12 +1217,12 @@ - + - + @@ -1232,12 +1232,12 @@ - + - + @@ -1249,9 +1249,9 @@ 0.9 0.85 0.8 0.75 0.7 0.35
- + - + @@ -1260,9 +1260,9 @@ - + - + @@ -1272,21 +1272,21 @@ - + - + 14 22 31 43 55 68 79 84 89 92 94 95
- + - + @@ -1300,11 +1300,11 @@ - + - + @@ -1312,11 +1312,11 @@ - + - + @@ -1327,11 +1327,11 @@ - + - + @@ -1342,11 +1342,11 @@ - + - + @@ -1357,11 +1357,11 @@ - + - + @@ -1372,9 +1372,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1384,9 +1384,9 @@ 0.85 0.7 0.5 0.3 0.1 0
- + - + @@ -1397,9 +1397,9 @@ - + - + @@ -1408,12 +1408,12 @@ 20 33
- + - + @@ -1425,12 +1425,12 @@ 1.08 1.12 1.15
- + - + @@ -1445,9 +1445,9 @@ 1.08 1.12 1.15
- + - + @@ -1460,13 +1460,13 @@ 1.1 1.15 1.2 1.25 1.3 1.35
- + - + @@ -1478,13 +1478,13 @@ 1.1 1.15 1.2 1.25 1.3 1.35
- + - + @@ -1496,13 +1496,13 @@ 1.23 1.3
- + - + @@ -1522,10 +1522,10 @@ - + - + @@ -1544,13 +1544,13 @@ 1.3 1.4 1.5 1.6 1.7 1.8
- + - + @@ -1565,10 +1565,10 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4400-4499.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4400-4499.xml index d99f375857..0a2912423b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4400-4499.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4400-4499.xml @@ -3,13 +3,13 @@ 1.15 1.23 1.3
- + - + @@ -21,13 +21,13 @@ 1.55 1.65 1.75
- + - + @@ -39,13 +39,13 @@ 1.15 1.33
- + - + @@ -61,9 +61,9 @@ - + - + @@ -73,13 +73,13 @@ 0.2 0.25 0.3
- + - + @@ -91,13 +91,13 @@ 1.3 1.32 1.35
- + - + @@ -113,9 +113,9 @@ - + - + @@ -123,16 +123,16 @@ - - - + + + 1 1.2 1.3 2 2 4 4 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12
- + - + @@ -141,9 +141,9 @@ 1 1.2 1.3 2 2 4 4 0.25 0.5 2 3 4 5 6 7 8 9 10 11 12
- + - + @@ -152,9 +152,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -163,9 +163,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -174,9 +174,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -185,9 +185,9 @@ 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1
- + - + @@ -198,9 +198,9 @@ 1.3 1 0.7
0.95 1 1.05
- + - + @@ -209,9 +209,9 @@ - - - + + + @@ -229,11 +229,11 @@ 1 1 1 1 1 1 1 1 1 0.85 1 1 1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 0.85 1 1 1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.85 1 1 1 1 1 1 1 1 1 1 1 1 1
- + - + @@ -251,18 +251,18 @@ - - + + - + 0.95 0.9 0.85 0.8 0.75
- + - + @@ -271,9 +271,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -282,9 +282,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -293,9 +293,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -304,9 +304,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -315,11 +315,11 @@ 2 1.7 1.3 1 0.8
- + - + @@ -328,9 +328,9 @@ 0.85 0.7 0.5 0.3 0.1
- + - + @@ -340,9 +340,9 @@ 0.85 0.8 0.75 0.7 0.65
- + - + @@ -352,9 +352,9 @@ 0.95 0.9 0.85 0.8 0.75
- + - + @@ -364,9 +364,9 @@ 0.9 0.95 0.8 0.75 0.7
- + - + @@ -376,9 +376,9 @@ 0.85 0.7 0.5 0.3 0.1
- + - + @@ -388,9 +388,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -398,9 +398,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -408,9 +408,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -418,9 +418,9 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -428,11 +428,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -440,11 +440,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -452,11 +452,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -464,11 +464,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -476,11 +476,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -488,11 +488,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -500,11 +500,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -512,11 +512,11 @@ 0.3 0.2 0.1 0.05 0
- + - + @@ -524,9 +524,9 @@ 70 80 90 95 100
- + - + @@ -534,9 +534,9 @@ 30 35 40 45 50
- + - + @@ -546,9 +546,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -558,9 +558,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -570,9 +570,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -582,9 +582,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -594,9 +594,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -606,9 +606,9 @@ 0.7 0.65 0.6 0.55 0.5
- + - + @@ -618,9 +618,9 @@ 0.5 0.4 0.3 0.2 0.1
- + - + @@ -631,11 +631,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -643,11 +643,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -655,11 +655,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -667,11 +667,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -679,11 +679,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -691,11 +691,11 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -703,9 +703,9 @@ 10 15 20 25 30
- + - + @@ -713,9 +713,9 @@ 10 15 20 25 30
- + - + @@ -723,9 +723,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -735,9 +735,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -747,9 +747,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -759,9 +759,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -771,9 +771,9 @@ 1.1 1.15 1.2 1.25 1.3
- + - + @@ -783,9 +783,9 @@ 1.1 1.15 1.2 1.3 1.5
- + - + @@ -796,10 +796,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -811,10 +811,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -826,10 +826,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -841,10 +841,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -856,10 +856,10 @@ 1.1 1.15 1.2
0.95 0.93 0.9
- + - + @@ -869,11 +869,11 @@ 20 33
- + - + @@ -884,17 +884,17 @@ - - - + + + - + - + @@ -906,11 +906,11 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -925,9 +925,9 @@ - - - + + + @@ -938,13 +938,13 @@ - + - + @@ -953,21 +953,21 @@ - + - + - + - + @@ -978,11 +978,11 @@ 13 20 27 35 45
- + - + @@ -1001,13 +1001,13 @@ - + - + @@ -1016,14 +1016,14 @@ - + - + @@ -1031,26 +1031,26 @@ - + - + - + - + @@ -1062,14 +1062,14 @@ - + - + @@ -1080,7 +1080,7 @@ - + @@ -1089,7 +1089,7 @@ - + @@ -1106,12 +1106,12 @@ - + - + @@ -1120,18 +1120,18 @@ - + - + - - - + + + @@ -1144,12 +1144,12 @@ - + - + @@ -1166,12 +1166,12 @@ - + - + @@ -1190,12 +1190,12 @@ - + - + @@ -1209,13 +1209,13 @@ - + - + @@ -1223,10 +1223,10 @@ 18 29 40 53 68 83 98 104 109 113 115 117
48 50 53 55 56 57 59 60 61 62 63 65
- + - + @@ -1235,11 +1235,11 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -1248,11 +1248,11 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -1263,17 +1263,17 @@ 14 24 34 44 54 64 74 79 84 89 94 99
- + - + - - - + + + @@ -1286,10 +1286,10 @@ - + - + @@ -1302,11 +1302,11 @@ - + - + @@ -1316,27 +1316,27 @@ - + - + - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4500-4599.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4500-4599.xml index acf12fba79..16cdb06f5f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4500-4599.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4500-4599.xml @@ -2,114 +2,114 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -130,18 +130,18 @@ - + - + - + - + - + @@ -150,9 +150,9 @@ - + - + @@ -161,9 +161,9 @@ - + - + @@ -173,9 +173,9 @@ - + - + @@ -185,9 +185,9 @@ - + - + @@ -203,9 +203,9 @@ - + - + @@ -221,10 +221,10 @@ - + - + @@ -237,11 +237,11 @@ - + - + @@ -250,9 +250,9 @@ - + - + @@ -264,10 +264,10 @@ - + - + @@ -275,10 +275,10 @@ - + - + @@ -291,9 +291,9 @@ - + - + @@ -305,44 +305,44 @@ - + - + - + - + - + - + - + - + @@ -354,11 +354,11 @@ - + - + @@ -372,11 +372,11 @@ - + - + @@ -390,11 +390,11 @@ - + - + @@ -408,11 +408,11 @@ - + - + @@ -426,11 +426,11 @@ - + - + @@ -444,11 +444,11 @@ - + - + @@ -463,11 +463,11 @@ - + - + @@ -482,11 +482,11 @@ - + - + @@ -502,10 +502,10 @@ - + - + @@ -516,9 +516,9 @@ 90
- + - + @@ -526,9 +526,9 @@ - + - + @@ -542,9 +542,9 @@ - + - + @@ -554,9 +554,9 @@ - + - + @@ -567,21 +567,21 @@ - + - + - + - + @@ -591,29 +591,29 @@ - + - + - + - + - + - + @@ -623,11 +623,11 @@ - + - + @@ -646,11 +646,11 @@ - + - + @@ -669,11 +669,11 @@ - + - + @@ -692,11 +692,11 @@ - + - + @@ -711,9 +711,9 @@ - + - + @@ -724,11 +724,11 @@ - + - + @@ -739,11 +739,11 @@ - + - + @@ -754,11 +754,11 @@ - + - + @@ -770,9 +770,9 @@ - + - + @@ -785,13 +785,13 @@ 13 15 18 20 23 26 29 32 35 38 42 44
- + - + @@ -800,13 +800,13 @@ 13 15 18 20 23 26 29 32 35 38 42 44
- + - + @@ -824,11 +824,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -844,11 +844,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -864,23 +864,23 @@ - + - + 13 20 27 35 45 55 65 69 73 75 77 78
37 39 41 43 45 46 48 50 51 53 54 56
- + - + @@ -890,13 +890,13 @@ 37 39 41 43 45 46 48 50 51 53 54 56
- + - + @@ -906,13 +906,13 @@ 37 39 41 43 45 46 48 50 51 53 54 56
- + - + @@ -931,12 +931,12 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -952,11 +952,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -972,25 +972,25 @@ - + - + 18 29 40 53 68 83 98 104 109 113 115 117
42 44 46 48 50 52 55 57 58 60 62 64
- + - + @@ -1005,11 +1005,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -1021,11 +1021,11 @@ - + - + 10 20 30 40 50 60 70 75 80 85 90 95
@@ -1037,12 +1037,12 @@ - + - + 30 70
@@ -1052,12 +1052,12 @@ - + - + @@ -1081,11 +1081,11 @@ - + - + @@ -1103,13 +1103,13 @@ - + - + @@ -1126,11 +1126,11 @@ - + - + @@ -1147,12 +1147,12 @@ - + - + @@ -1172,13 +1172,13 @@ - + - + @@ -1196,13 +1196,13 @@ - + - + @@ -1221,13 +1221,13 @@ - + - + @@ -1247,12 +1247,12 @@ - + - + @@ -1269,12 +1269,12 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -1297,12 +1297,12 @@ - + - + @@ -1329,13 +1329,13 @@ - + - + @@ -1355,13 +1355,13 @@ - + - + @@ -1383,12 +1383,12 @@ - + - + @@ -1415,12 +1415,12 @@ - + - + @@ -1440,12 +1440,12 @@ - + - + @@ -1465,12 +1465,12 @@ - + - + @@ -1491,12 +1491,12 @@ - + - + @@ -1517,12 +1517,12 @@ - + - + @@ -1543,12 +1543,12 @@ - + - + @@ -1567,12 +1567,12 @@ - + - + @@ -1596,13 +1596,13 @@ - + - + @@ -1623,13 +1623,13 @@ - + - + @@ -1650,13 +1650,13 @@ - + - + @@ -1675,12 +1675,12 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4600-4699.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4600-4699.xml index b9ae75f582..957a4f2ce8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4600-4699.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4600-4699.xml @@ -8,11 +8,11 @@ - + - + @@ -28,10 +28,10 @@ 20 40 60
- + - + @@ -53,10 +53,10 @@ - + - + @@ -76,10 +76,10 @@ - + - + @@ -99,10 +99,10 @@ - + - + @@ -121,10 +121,10 @@ - + - + @@ -140,10 +140,10 @@ - + - + @@ -155,14 +155,14 @@ - + - + @@ -176,10 +176,10 @@ 30 70
- + - + @@ -202,10 +202,10 @@ 20 40 60 70
- + - + @@ -222,10 +222,10 @@ 20 40 60
- + - + @@ -242,10 +242,10 @@ 20 40 60
- + - + @@ -263,10 +263,10 @@ - + - + @@ -277,10 +277,10 @@ - + - + @@ -293,13 +293,13 @@ - + - + @@ -310,10 +310,10 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -329,19 +329,19 @@ - + - + - + - + @@ -349,10 +349,10 @@ - + - + @@ -364,9 +364,9 @@ - + - + @@ -382,10 +382,10 @@ - + - + @@ -402,10 +402,10 @@ - + - + @@ -420,10 +420,10 @@ - + - + @@ -438,10 +438,10 @@ - + - + @@ -453,9 +453,9 @@ - + - + @@ -472,9 +472,9 @@ - + - + @@ -490,10 +490,10 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -510,10 +510,10 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + @@ -525,10 +525,10 @@ - + - + @@ -542,10 +542,10 @@ - + - + @@ -560,10 +560,10 @@ - + - + @@ -576,10 +576,10 @@ 20 40 60
- + - + @@ -600,10 +600,10 @@ 20 40 60
- + - + @@ -627,10 +627,10 @@ 20 40 60
- + - + @@ -655,10 +655,10 @@ 20 40 60
- + - + @@ -683,10 +683,10 @@ 20 40 60
- + - + @@ -716,10 +716,10 @@ 20 40 60
- + - + @@ -745,10 +745,10 @@ 20 40 60
- + - + @@ -769,10 +769,10 @@ 20 40 60
- + - + @@ -797,10 +797,10 @@ 20 40 60
- + - + @@ -825,10 +825,10 @@ - + - + @@ -843,18 +843,18 @@ - + - + 1.05 1.07 1.09
- + - + @@ -870,10 +870,10 @@ - + - + @@ -886,9 +886,9 @@ 1.15 1.33
30 70
- + - + @@ -902,9 +902,9 @@ 1.15 1.25 1.3
20 40 60
- + - + @@ -918,9 +918,9 @@ 1.3 1.4 1.5
20 40 60
- + - + @@ -934,9 +934,9 @@ 1.08 1.12 1.15
20 40 60
- + - + @@ -950,9 +950,9 @@ 1.08 1.12 1.15
20 40 60
- + - + @@ -973,11 +973,11 @@ - + - + @@ -990,9 +990,9 @@ - + - + @@ -1006,9 +1006,9 @@ - + - + @@ -1019,9 +1019,9 @@ - + - + @@ -1035,10 +1035,10 @@ - + - + @@ -1052,10 +1052,10 @@ - + - + @@ -1067,10 +1067,10 @@ - + - + @@ -1082,10 +1082,10 @@ - + - + @@ -1098,10 +1098,10 @@ - + - + @@ -1118,10 +1118,10 @@ - + - + @@ -1138,10 +1138,10 @@ - + - + @@ -1158,10 +1158,10 @@ - + - + @@ -1177,10 +1177,10 @@ - + - + @@ -1198,10 +1198,10 @@ - + - + @@ -1212,9 +1212,9 @@ - + - + @@ -1229,10 +1229,10 @@ - + - + @@ -1247,10 +1247,10 @@ - + - + @@ -1265,10 +1265,10 @@ - + - + @@ -1283,10 +1283,10 @@ - + - + @@ -1301,10 +1301,10 @@ - + - + @@ -1319,10 +1319,10 @@ - + - + @@ -1335,13 +1335,13 @@ - + - + @@ -1350,8 +1350,8 @@ - - + + @@ -1362,9 +1362,9 @@ - + - + @@ -1376,10 +1376,10 @@ - + - + @@ -1394,10 +1394,10 @@ - + - + @@ -1412,10 +1412,10 @@ - + - + @@ -1430,10 +1430,10 @@ - + - + @@ -1448,10 +1448,10 @@ - + - + @@ -1466,10 +1466,10 @@ - + - + @@ -1479,9 +1479,9 @@ - + - + @@ -1490,10 +1490,10 @@ - + - + @@ -1504,24 +1504,24 @@ - + - + - + - + @@ -1530,13 +1530,13 @@ - + - + @@ -1548,14 +1548,14 @@ - + - + @@ -1565,45 +1565,45 @@ - + - + - + - + - + - + - + - + @@ -1614,14 +1614,14 @@ 3000 0
- + - + @@ -1630,20 +1630,20 @@ - + - + 0.15 0.5 0.8 1
- + - + @@ -1651,9 +1651,9 @@ - + - + @@ -1663,9 +1663,9 @@ - + - + @@ -1673,9 +1673,9 @@ - + - + @@ -1692,9 +1692,9 @@ - + - + @@ -1705,9 +1705,9 @@ - + - + @@ -1723,18 +1723,18 @@ 10 20 30 40 50 60 70 75 80 85 90 95
- + - + 1.2 1.3 1.4 1.5 1.75 2 3 4 5 6 8.5 11
- + - + @@ -1751,13 +1751,13 @@ 120 120 120 150 165 180 195 210 225 240 255 270 285
122 157 194 202 207 212 215 220 224 229 233 237 242
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4700-4799.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4700-4799.xml index 2c454a23e4..12fac56141 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4700-4799.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4700-4799.xml @@ -8,13 +8,13 @@ 360 360 360 450 495 540 585 630 675 720 765 810 855
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -30,13 +30,13 @@ 62 79 98 102 104 107 108 110 113 115 117 119 122
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -50,12 +50,12 @@ 120 120 120 150 165 180 195 210 225 240 255 270 285
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -73,12 +73,12 @@ 120 120 120 150 165 180 195 210 225 240 255 270 285
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -94,12 +94,12 @@ 62 79 98 102 104 107 108 110 113 115 117 119 122
541 611 659 666 669 673 676 679 681 684 687 689 692
- + - + @@ -112,12 +112,12 @@ 0.94 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9
0.95 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9
- + - + @@ -135,13 +135,13 @@ 0.95 0.92 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9 0.9
- + - + @@ -162,10 +162,10 @@ - + - + @@ -177,11 +177,11 @@ - + - + @@ -195,12 +195,12 @@ - + - + @@ -213,12 +213,12 @@ - + - + @@ -232,11 +232,11 @@ 138 204 285 379 477 566 635 659 676 689 700 709
- + - + @@ -258,10 +258,10 @@ - + - + @@ -275,11 +275,11 @@ - + - + @@ -287,23 +287,23 @@ - + - + - + - + - + - + @@ -315,11 +315,11 @@ - + - + @@ -333,11 +333,11 @@ - + - + @@ -348,10 +348,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -360,10 +360,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -372,10 +372,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -384,10 +384,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -396,10 +396,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -409,10 +409,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -426,10 +426,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -443,10 +443,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -461,11 +461,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -479,10 +479,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -498,10 +498,10 @@ - + - + @@ -512,10 +512,10 @@ - + - + @@ -526,10 +526,10 @@ - + - + @@ -540,10 +540,10 @@ - + - + @@ -552,11 +552,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -565,11 +565,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -578,11 +578,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -591,11 +591,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -604,11 +604,11 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -617,10 +617,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -629,10 +629,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -641,10 +641,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -653,10 +653,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -665,10 +665,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -678,10 +678,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -695,10 +695,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -713,10 +713,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -731,10 +731,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -749,10 +749,10 @@ 18 25 35 47 59 72 83 88 91 93 95 96
- + - + @@ -768,10 +768,10 @@ - + - + @@ -782,10 +782,10 @@ - + - + @@ -796,10 +796,10 @@ - + - + @@ -810,10 +810,10 @@ - + - + @@ -822,10 +822,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -834,10 +834,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -846,10 +846,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -858,10 +858,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -870,10 +870,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -883,10 +883,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -900,10 +900,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -917,10 +917,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -934,10 +934,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -951,10 +951,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -967,10 +967,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -979,10 +979,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -991,10 +991,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1003,10 +1003,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1015,10 +1015,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1028,10 +1028,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1045,10 +1045,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1062,10 +1062,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1079,10 +1079,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1096,10 +1096,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1112,10 +1112,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1124,10 +1124,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1136,10 +1136,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1148,10 +1148,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1160,10 +1160,10 @@ 36 50 69 93 118 143 166 175 182 186 189 192
- + - + @@ -1172,10 +1172,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1185,10 +1185,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1198,10 +1198,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1211,10 +1211,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1224,10 +1224,10 @@ 21 34 50 67 86 104 119 125 129 131 131 132
- + - + @@ -1237,10 +1237,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1254,10 +1254,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1271,10 +1271,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1288,10 +1288,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1305,10 +1305,10 @@ 43 69 99 134 173 207 239 250 258 262 262 263
- + - + @@ -1320,9 +1320,9 @@ 1 2 3 4 5 6 7 8 9 10
1.03 1.06 1.09 1.1 1.12 1.15 1.18 1.21 1.24 1.27 1.3
- + - + @@ -1332,72 +1332,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4800-4899.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4800-4899.xml index 2b141262e8..3dcc8f62c6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4800-4899.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4800-4899.xml @@ -2,870 +2,870 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4900-4999.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4900-4999.xml index 196a65979c..15a1d167ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4900-4999.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/4900-4999.xml @@ -2,818 +2,818 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -821,9 +821,9 @@ - + - + @@ -834,51 +834,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -889,21 +889,21 @@ - + - + - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5000-5099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5000-5099.xml index a4e1621fd4..0f4d8dcfb1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5000-5099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5000-5099.xml @@ -3,23 +3,23 @@ - + - + - + - + @@ -28,12 +28,12 @@ - + - + @@ -48,22 +48,22 @@ - + - + - + - + @@ -74,11 +74,11 @@ - + - + @@ -87,12 +87,12 @@ - + - + @@ -110,9 +110,9 @@ true false false true true
- + - + @@ -150,9 +150,9 @@ true false false true true
- + - + @@ -184,12 +184,12 @@ - + - + @@ -197,12 +197,12 @@ - + - + @@ -214,10 +214,10 @@ - + - + @@ -231,13 +231,13 @@ - + - + @@ -250,12 +250,12 @@ - + - + @@ -267,14 +267,14 @@ - + - + @@ -292,10 +292,10 @@ - + - + @@ -312,13 +312,13 @@ - + - + @@ -330,13 +330,13 @@ - + - + @@ -356,13 +356,13 @@ 1000 2000
700 1000
- + - + @@ -372,13 +372,13 @@ - + - + @@ -393,10 +393,10 @@ - + - + @@ -410,9 +410,9 @@ 20 30 40 50 60 70 80 90 100 110 120 130
- + - + @@ -423,12 +423,12 @@ - + - + @@ -449,12 +449,12 @@ - + - + @@ -468,10 +468,10 @@ 0.9 0.7 0.7 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5
- + - + @@ -481,108 +481,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -591,9 +591,9 @@ 0.85 0.75 0.7
1 2 3
- + - + @@ -601,9 +601,9 @@ - - - + + + @@ -611,20 +611,20 @@ - + - + > - + - + @@ -635,9 +635,9 @@ - + - + @@ -649,13 +649,13 @@ 18 26 38 52 68 85 102 119 136 153 170 187
- + - + @@ -666,11 +666,11 @@ - + - + @@ -680,10 +680,10 @@ 1350 2700 2700
- + - + @@ -702,11 +702,11 @@ - + - + @@ -718,10 +718,10 @@ - + - + @@ -734,7 +734,7 @@ - + @@ -742,7 +742,7 @@ - + @@ -755,7 +755,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -775,12 +775,12 @@ - + - + @@ -794,11 +794,11 @@ - + - + @@ -812,11 +812,11 @@ - + - + @@ -830,11 +830,11 @@ - + - + @@ -846,11 +846,11 @@ - + - + @@ -864,11 +864,11 @@ - + - + @@ -882,11 +882,11 @@ - + - + @@ -900,11 +900,11 @@ - + - + @@ -918,11 +918,11 @@ - + - + @@ -936,11 +936,11 @@ - + - + @@ -954,11 +954,11 @@ - + - + @@ -972,11 +972,11 @@ - + - + @@ -990,11 +990,11 @@ - + - + @@ -1008,11 +1008,11 @@ - + - + @@ -1026,11 +1026,11 @@ - + - + @@ -1044,11 +1044,11 @@ - + - + @@ -1062,11 +1062,11 @@ - + - + @@ -1080,11 +1080,11 @@ - + - + @@ -1098,11 +1098,11 @@ - + - + @@ -1115,12 +1115,12 @@ - + - + @@ -1138,12 +1138,12 @@ - + - + @@ -1161,12 +1161,12 @@ - + - + @@ -1184,12 +1184,12 @@ - + - + @@ -1207,12 +1207,12 @@ - + - + @@ -1228,18 +1228,18 @@ - + - + - + - + @@ -1248,9 +1248,9 @@ - + - + @@ -1273,9 +1273,9 @@ 1 0.949 0.898 0.847 0.796 0.745 0.694 0.643 0.592 0.591 0.540 0.489 0.438 0.387 0.336 0.285
1 0.949 0.898 0.847 0.796 0.745 0.694 0.643 0.592 0.591 0.540 0.489 0.438 0.387 0.336 0.285
- + - + @@ -1291,17 +1291,17 @@ - + - + - + - + @@ -1311,12 +1311,12 @@ - + - + @@ -1327,12 +1327,12 @@ - + - + @@ -1345,11 +1345,11 @@ 75 75 75 20
- + - + @@ -1362,12 +1362,12 @@ - + - + @@ -1376,13 +1376,13 @@ 93 93 93 5
- + - + @@ -1395,13 +1395,13 @@ - + - + @@ -1415,12 +1415,12 @@ - + - + @@ -1430,9 +1430,9 @@ - + - + @@ -1449,10 +1449,10 @@ 3 4
- + - + @@ -1463,10 +1463,10 @@ - + - + @@ -1476,28 +1476,28 @@ - - - + + + - + - + - + - + @@ -1507,12 +1507,12 @@ - + - + @@ -1521,13 +1521,13 @@ - + - + @@ -1537,30 +1537,30 @@ - + - + - + - + - + - + @@ -1572,15 +1572,15 @@ - + - + - - - + + + @@ -1588,12 +1588,12 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5100-5199.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5100-5199.xml index e83059e3b3..df4a51de6e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5100-5199.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5100-5199.xml @@ -5,12 +5,12 @@ - + - + @@ -23,12 +23,12 @@ - + - + @@ -41,12 +41,12 @@ - + - + @@ -55,20 +55,20 @@ - + - + - + - + @@ -80,10 +80,10 @@ - + - + @@ -101,14 +101,14 @@ - + - + @@ -126,13 +126,13 @@ - + - + @@ -149,13 +149,13 @@ - + - + @@ -166,10 +166,10 @@ - + - + @@ -179,7 +179,7 @@ - + @@ -188,14 +188,14 @@ - + - + @@ -204,7 +204,7 @@ - + @@ -216,25 +216,25 @@ - + - + - + - + @@ -248,12 +248,12 @@ - + - + @@ -264,9 +264,9 @@ - + - + @@ -276,11 +276,11 @@ - + - + @@ -291,13 +291,13 @@ - + - + @@ -307,13 +307,13 @@ - + - + @@ -323,11 +323,11 @@ - + - + @@ -342,31 +342,31 @@ - + - + - + - + - + - + @@ -378,9 +378,9 @@ - + - + @@ -391,16 +391,16 @@ - + - + - + - + @@ -416,9 +416,9 @@ - + - + @@ -428,9 +428,9 @@ - + - + @@ -441,9 +441,9 @@ - + - + @@ -464,9 +464,9 @@ - + - + @@ -475,41 +475,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -517,13 +517,13 @@ - + - + @@ -533,12 +533,12 @@ - + - + @@ -552,11 +552,11 @@ - + - + @@ -574,14 +574,14 @@ - + - + @@ -590,13 +590,13 @@ - + - + @@ -615,12 +615,12 @@ - + - + @@ -630,13 +630,13 @@ - + - + @@ -646,9 +646,9 @@ - + - + @@ -659,9 +659,9 @@ - + - + @@ -671,10 +671,10 @@ - + - + @@ -697,9 +697,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -710,9 +710,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -729,9 +729,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -749,9 +749,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -763,9 +763,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -782,9 +782,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -802,9 +802,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -816,9 +816,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -835,9 +835,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -854,9 +854,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -873,9 +873,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -893,9 +893,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -912,9 +912,9 @@ 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -932,9 +932,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -949,9 +949,9 @@ 1 1 1 2 2 2 3 3 4 4
46 49 52 55 58 61 64 67 70 76
- + - + @@ -967,9 +967,9 @@ 1 1 1 2 2 2 3 3 4 4
46 49 52 55 58 61 64 67 70 76
- + - + @@ -986,9 +986,9 @@ 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19
46 49 52 55 58 61 64 67 70 76
- + - + @@ -1007,9 +1007,9 @@ 10 11 11 12 13 14 14 15 16 17
- + - + @@ -1028,10 +1028,10 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -1043,9 +1043,9 @@ 0.9 0.89 0.88 0.87 0.86 0.85 0.84 0.83 0.82 0.81
46 49 52 55 58 61 64 67 70 76
- + - + @@ -1064,9 +1064,9 @@ 0.9 0.89 0.88 0.87 0.86 0.85 0.84 0.83 0.82 0.81
- + - + @@ -1089,9 +1089,9 @@ - + - + @@ -1105,10 +1105,10 @@ - + - + @@ -1122,9 +1122,9 @@ 19 26 34 43 51 55 58 61 63 65
- + - + @@ -1139,9 +1139,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -1158,9 +1158,9 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -1175,10 +1175,10 @@ - + - + @@ -1192,10 +1192,10 @@ 5 5 6 6 6 7 7 7 8 8
- + - + @@ -1213,10 +1213,10 @@ 46 49 52 55 58 61 64 67 70 76
5 5 6 6 6 7 7 7 8 8
- + - + @@ -1231,12 +1231,12 @@ 46 49 52 55 58 61 64 67 70 76
- + - + @@ -1252,11 +1252,11 @@ - + - + @@ -1270,48 +1270,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -1321,25 +1321,25 @@ - + - + - + - + - + - + @@ -1348,12 +1348,12 @@ 1.15 1.33
418 495
- + - + @@ -1368,12 +1368,12 @@ 285 418 549 646
6 7 8 9
- + - + @@ -1389,12 +1389,12 @@ 1.1 1.15 1.2
331 457 532
- + - + @@ -1410,12 +1410,12 @@ 1.1 1.15 1.2 1.25 1.3 1.35
418 457 495 532 597 646
- + - + @@ -1431,12 +1431,12 @@ 39 44 48 52 58 65
418 457 495 532 582 635
- + - + @@ -1451,12 +1451,12 @@ 35 44 52
2 3 4
- + - + @@ -1471,12 +1471,12 @@ 20 33
204 285
- + - + @@ -1492,12 +1492,12 @@ 1.15 1.23 1.3
204 331 457
- + - + @@ -1513,12 +1513,12 @@ 1.55 1.65 1.75
243 418 495
- + - + @@ -1534,12 +1534,12 @@ 340 380 417 450 472
- + - + @@ -1552,12 +1552,12 @@ - + - + @@ -1575,12 +1575,12 @@ - + - + @@ -1599,12 +1599,12 @@ - + - + @@ -1622,13 +1622,13 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5200-5299.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5200-5299.xml index 103feb30ac..4f91672c73 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5200-5299.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/5200-5299.xml @@ -7,12 +7,12 @@ 604 617 630
- + - + @@ -24,12 +24,12 @@ 418 495
1 2
- + - + @@ -47,11 +47,11 @@ - + - + @@ -65,9 +65,9 @@ - + - + @@ -78,15 +78,15 @@ - + - + - + - + @@ -96,10 +96,10 @@ - + - + @@ -114,9 +114,9 @@ - + - + @@ -127,11 +127,11 @@ - + - + @@ -143,11 +143,11 @@ - + - + @@ -159,11 +159,11 @@ - + - + @@ -175,10 +175,10 @@ - + - + @@ -191,11 +191,11 @@ - + - + @@ -207,11 +207,11 @@ - + - + @@ -223,11 +223,11 @@ - + - + @@ -239,11 +239,11 @@ - + - + @@ -255,11 +255,11 @@ - + - + @@ -271,11 +271,11 @@ - + - + @@ -286,10 +286,10 @@ - + - + @@ -301,10 +301,10 @@ - + - + @@ -314,14 +314,14 @@ - + - + @@ -335,11 +335,11 @@ - + - + @@ -350,13 +350,13 @@ - + - + @@ -368,14 +368,14 @@ - + - + @@ -391,11 +391,11 @@ - + - + @@ -408,12 +408,12 @@ - + - + @@ -427,13 +427,13 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/7000-7099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/7000-7099.xml index 43fe08e261..caae128824 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/7000-7099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/7000-7099.xml @@ -1,19 +1,19 @@  - - - + + + - + - + @@ -22,12 +22,12 @@ - + - + @@ -36,12 +36,12 @@ - + - + @@ -51,9 +51,9 @@ - + - + @@ -67,12 +67,12 @@ - + - + @@ -87,10 +87,10 @@ - + - + @@ -99,18 +99,18 @@ - + - + - - - + + + @@ -120,9 +120,9 @@ 2 3 4 5
250 500 750 1500
250 500 750 1500
- + - + @@ -141,13 +141,13 @@ - + - + @@ -160,13 +160,13 @@ - + - + @@ -181,13 +181,13 @@ - + - + @@ -197,64 +197,64 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + @@ -267,12 +267,12 @@ - + - + @@ -285,12 +285,12 @@ - + - + @@ -303,12 +303,12 @@ - + - + @@ -321,12 +321,12 @@ - + - + @@ -339,12 +339,12 @@ - + - + @@ -357,12 +357,12 @@ - + - + @@ -375,12 +375,12 @@ - + - + @@ -393,12 +393,12 @@ - + - + @@ -411,12 +411,12 @@ - + - + @@ -429,12 +429,12 @@ - + - + @@ -447,12 +447,12 @@ - + - + @@ -465,12 +465,12 @@ - + - + @@ -483,12 +483,12 @@ - + - + @@ -501,12 +501,12 @@ - + - + @@ -519,12 +519,12 @@ - + - + @@ -546,10 +546,10 @@ - + - + @@ -563,10 +563,10 @@ - + - + @@ -578,12 +578,12 @@ - + - + @@ -598,10 +598,10 @@ - + - + @@ -614,12 +614,12 @@ - + - + @@ -638,12 +638,12 @@ - + - + @@ -663,12 +663,12 @@ - + - + @@ -695,12 +695,12 @@ - + - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/9000-9099.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/9000-9099.xml index 0ce9e9e77f..72dc18c0da 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/9000-9099.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/skills/9000-9099.xml @@ -2,9 +2,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -15,9 +15,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -28,9 +28,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -41,9 +41,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -54,9 +54,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + @@ -67,9 +67,9 @@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 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
- + - + diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 411d248f58..3527dac666 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -53,6 +53,7 @@ import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.taskmanager.AttackableThinkTaskManager; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; @@ -880,17 +881,17 @@ public class AttackableAI extends CreatureAI inRange = true; } - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || inRange) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive() && (Rnd.get(100) <= 5)) + if (((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL) || inRange) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive() && (Rnd.get(100) <= 5)) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { break; } boolean useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { @@ -940,15 +941,15 @@ public class AttackableAI extends CreatureAI { if (/* sk.getCastRange() >= dist && sk.getCastRange() <= 70 && */!sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk) && ((Rnd.get(100) <= 8) || ((_actor instanceof PenaltyMonster) && (Rnd.get(100) <= 20)))) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { break; } useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index a41db5e02b..1b0d3599a8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Commander; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.FortSiegeGuard; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index af079132c4..e46471501c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; /** @@ -363,17 +364,17 @@ public class SiegeGuardAI extends CreatureAI implements Runnable for (Skill sk : skills) { final int castRange = sk.getCastRange(); - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if (((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) + if (((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { break; } boolean useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { @@ -479,15 +480,15 @@ public class SiegeGuardAI extends CreatureAI implements Runnable final int castRange = sk.getCastRange(); if (((castRange * castRange) >= dist2) && (castRange <= 70) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { - if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL)) + if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL)) { - if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { break; } boolean useSkillSelf = true; - if (sk.getSkillType() == Skill.SkillType.BUFF) + if (sk.getSkillType() == SkillType.BUFF) { for (Effect effect : _actor.getAllEffects()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ISkillHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ISkillHandler.java index 04bf98c814..def1eafa6f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ISkillHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ISkillHandler.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.handler; import java.util.List; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; public interface ISkillHandler { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java index a15b054aad..2f507ec36e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java @@ -55,7 +55,7 @@ import org.l2jmobius.gameserver.handler.skillhandlers.TakeCastle; import org.l2jmobius.gameserver.handler.skillhandlers.Unlock; import org.l2jmobius.gameserver.handler.skillhandlers.ZakenPlayer; import org.l2jmobius.gameserver.handler.skillhandlers.ZakenSelf; -import org.l2jmobius.gameserver.model.Skill.SkillType; +import org.l2jmobius.gameserver.model.skill.SkillType; public class SkillHandler { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java index c226aaa71b..2b3fe8da22 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; @@ -65,7 +65,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.POISON) && (effect.getSkill().getLevel() <= 3)) + if ((effect.getSkill().getSkillType() == SkillType.POISON) && (effect.getSkill().getLevel() <= 3)) { effect.exit(true); break; @@ -80,7 +80,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.POISON) && (effect.getSkill().getLevel() <= 7)) + if ((effect.getSkill().getSkillType() == SkillType.POISON) && (effect.getSkill().getLevel() <= 7)) { effect.exit(true); break; @@ -95,7 +95,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.BLEED) && (effect.getSkill().getLevel() <= 3)) + if ((effect.getSkill().getSkillType() == SkillType.BLEED) && (effect.getSkill().getLevel() <= 3)) { effect.exit(true); break; @@ -110,7 +110,7 @@ public class Remedy implements IItemHandler { for (Effect effect : player.getAllEffects()) { - if ((effect.getSkill().getSkillType() == Skill.SkillType.BLEED) && (effect.getSkill().getLevel() <= 7)) + if ((effect.getSkill().getSkillType() == SkillType.BLEED) && (effect.getSkill().getLevel() <= 7)) { effect.exit(true); break; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java index 44608ddd03..c6c8fb316f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BalanceLife.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java index b481067f93..5718606ce3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/BeastFeed.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author _drunk_ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index 1820b52548..699ce59681 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java @@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java index 95be872dec..576fb430d1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; public class Charge implements ISkillHandler { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java index 1ec11a68d5..6496bcf63a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java index 225bf5162c..118faafc6c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index 6be22d0e39..a9d8aab719 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -39,6 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -266,7 +267,7 @@ public class Continuous implements ISkillHandler } } - if (target.isDead() && (skill.getTargetType() == Skill.SkillTargetType.TARGET_AREA_CORPSE_MOB) && (target instanceof Npc)) + if (target.isDead() && (skill.getTargetType() == SkillTargetType.AREA_CORPSE_MOB) && (target instanceof Npc)) { ((Npc) target).endDecayTask(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java index c25920d74b..f15c1ce0bd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java @@ -20,12 +20,12 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * Just a quick draft to support Wrath skill. Missing angle based calculation etc. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java index e013bdd9a7..1df4a6bc8d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Craft.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.RecipeManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; public class Craft implements ISkillHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java index a64746aac4..1f37365ada 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DeluxeKey.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author Julian diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java index 2864b14e33..1965fc2884 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Effect.EffectType; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -43,6 +42,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.tasks.player.CancelSkillRestoreTask; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -298,7 +299,7 @@ public class Disablers implements ISkillHandler { if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - if (skill.getTargetType() == Skill.SkillTargetType.TARGET_UNDEAD) + if (skill.getTargetType() == SkillTargetType.UNDEAD) { if (target.isUndead()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java index fc2184b913..8cb5ba99e2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/DrainSoul.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author _drunk_ TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index 76c50cdfa5..633c3a6e9e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.type.FishingZone; import org.l2jmobius.gameserver.model.zone.type.WaterZone; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java index 549e3579b7..3762cb5471 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java @@ -21,12 +21,12 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Fishing; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java index 267a376fa8..59a7c1eb9a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GetPlayer.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; public class GetPlayer implements ISkillHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java index 1a6466c8e7..dad21b53f6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/GiveSp.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author Forsaiken diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index 436a7a13a9..76b0f7ae12 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -22,13 +22,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java index 2a3d6cc416..5fa34d8099 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java index 5650cab7b8..b9f0d73993 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java @@ -20,9 +20,9 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java index 4748bff1d2..b6f818997e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Manadam.java @@ -20,13 +20,13 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java index edf11215fb..f800b45e77 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java @@ -21,12 +21,13 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -62,7 +63,7 @@ public class Mdam implements ISkillHandler } else if (target.isAlikeDead()) { - if ((skill.getTargetType() == Skill.SkillTargetType.TARGET_AREA_CORPSE_MOB) && (target instanceof Npc)) + if ((skill.getTargetType() == SkillTargetType.AREA_CORPSE_MOB) && (target instanceof Npc)) { ((Npc) target).endDecayTask(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 82ce6c61f6..09284b66a3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -36,6 +35,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java index e344d45c7c..ed405a599e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java index 21a6c5f0ba..f7c66f45ad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Resurrect.java @@ -21,13 +21,13 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; @@ -63,7 +63,7 @@ public class Resurrect implements ISkillHandler targetPlayer = (Player) target; // Check for same party or for same clan, if target is for clan. - if ((skill.getTargetType() == SkillTargetType.TARGET_CORPSE_CLAN) && ((player == null) || (player.getClanId() != targetPlayer.getClanId()))) + if ((skill.getTargetType() == SkillTargetType.CORPSE_CLAN) && ((player == null) || (player.getClanId() != targetPlayer.getClanId()))) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java index 8a115efd40..50c9eb84d5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java index 2ed1fd9039..bde8f79007 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.ManorSeedData; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java index 096236e699..d49ecc979e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java @@ -21,12 +21,12 @@ import java.util.List; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java index a0a9f2d6a4..b40b6f1cd8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; @@ -32,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java index cc21dfef93..ab87f4211c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java index f1918d2cf1..66afdb7921 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonTreasureKey.java @@ -22,9 +22,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author evill33t diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java index 68c85d78e4..f85338cc01 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java @@ -21,13 +21,13 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java index 49344d0347..45ab70eb8c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java @@ -22,12 +22,12 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Artefact; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java index b95070b8d9..eec2dce38c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Unlock.java @@ -22,12 +22,12 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java index 8cc91a18a3..101cfdb89a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java @@ -21,15 +21,15 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; public class ZakenPlayer implements ISkillHandler { private static final SkillType[] SKILL_TYPES = { - SkillType.ZAKENPLAYER + SkillType.ZAKEN_PLAYER }; @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java index a8205a9f28..57d59d222b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java @@ -21,15 +21,15 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillType; public class ZakenSelf implements ISkillHandler { private static final SkillType[] SKILL_TYPES = { - SkillType.ZAKENSELF + SkillType.ZAKEN_SELF }; @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java index e287cf5a11..3b793c5157 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java @@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Func; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java index d83d966ba8..80fbc4dae6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -48,22 +47,15 @@ import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Env; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillOperateType; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.model.skill.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Func; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; -import org.l2jmobius.gameserver.model.skill.handlers.SkillCharge; -import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeDmg; -import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeEffect; -import org.l2jmobius.gameserver.model.skill.handlers.SkillCreateItem; -import org.l2jmobius.gameserver.model.skill.handlers.SkillDefault; -import org.l2jmobius.gameserver.model.skill.handlers.SkillDrain; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSeed; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSignet; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSignetCasttime; -import org.l2jmobius.gameserver.model.skill.handlers.SkillSummon; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; @@ -88,203 +80,6 @@ public abstract class Skill public static final int SKILL_FAKE_DEX = 9005; public static final int SKILL_FAKE_STR = 9006; - private final int _targetConsumeId; - private final int _targetConsume; - - public enum SkillOpType - { - OP_PASSIVE, - OP_ACTIVE, - OP_TOGGLE, - OP_CHANCE - } - - /** Target types of skills : SELF, PARTY, CLAN, PET... */ - public enum SkillTargetType - { - TARGET_NONE, - TARGET_SELF, - TARGET_ONE, - TARGET_PARTY, - TARGET_ALLY, - TARGET_CLAN, - TARGET_PET, - TARGET_AREA, - TARGET_AURA, - TARGET_CORPSE, - TARGET_UNDEAD, - TARGET_AREA_UNDEAD, - TARGET_MULTIFACE, - TARGET_CORPSE_ALLY, - TARGET_CORPSE_CLAN, - TARGET_CORPSE_PLAYER, - TARGET_CORPSE_PET, - TARGET_ITEM, - TARGET_AREA_CORPSE_MOB, - TARGET_CORPSE_MOB, - TARGET_UNLOCKABLE, - TARGET_HOLY, - TARGET_PARTY_MEMBER, - TARGET_PARTY_OTHER, - TARGET_ENEMY_SUMMON, - TARGET_OWNER_PET, - TARGET_GROUND, - TARGET_SIEGE, - TARGET_TYRANNOSAURUS, - TARGET_AREA_AIM_CORPSE, - TARGET_CLAN_MEMBER - } - - public enum SkillType - { - // Damage - PDAM, - MDAM, - CPDAM, - MANADAM, - DOT, - MDOT, - DRAIN_SOUL, - DRAIN(SkillDrain.class), - DEATHLINK, - FATALCOUNTER, - BLOW, - - // Disablers - BLEED, - POISON, - STUN, - ROOT, - CONFUSION, - FEAR, - SLEEP, - CONFUSE_MOB_ONLY, - MUTE, - PARALYZE, - WEAKNESS, - - // hp, mp, cp - HEAL, - HOT, - BALANCE_LIFE, - HEAL_PERCENT, - HEAL_STATIC, - COMBATPOINTHEAL, - COMBATPOINTPERCENTHEAL, - CPHOT, - MANAHEAL, - MANA_BY_LEVEL, - MANAHEAL_PERCENT, - MANARECHARGE, - MPHOT, - - // Aggro - AGGDAMAGE, - AGGREDUCE, - AGGREMOVE, - AGGREDUCE_CHAR, - AGGDEBUFF, - - // Fishing - FISHING, - PUMPING, - REELING, - - // MISC - UNLOCK, - ENCHANT_ARMOR, - ENCHANT_WEAPON, - SOULSHOT, - SPIRITSHOT, - SIEGEFLAG, - TAKECASTLE, - DELUXE_KEY_UNLOCK, - SOW, - HARVEST, - GET_PLAYER, - - // Creation - COMMON_CRAFT, - DWARVEN_CRAFT, - CREATE_ITEM(SkillCreateItem.class), - SUMMON_TREASURE_KEY, - - // Summons - SUMMON(SkillSummon.class), - FEED_PET, - DEATHLINK_PET, - STRSIEGEASSAULT, - ERASE, - BETRAY, - - // Cancel - CANCEL, - MAGE_BANE, - WARRIOR_BANE, - NEGATE, - - BUFF, - DEBUFF, - PASSIVE, - CONT, - SIGNET(SkillSignet.class), - SIGNET_CASTTIME(SkillSignetCasttime.class), - - RESURRECT, - CHARGE(SkillCharge.class), - CHARGE_EFFECT(SkillChargeEffect.class), - CHARGEDAM(SkillChargeDmg.class), - MHOT, - DETECT_WEAKNESS, - LUCK, - RECALL, - SUMMON_FRIEND, - REFLECT, - SPOIL, - SWEEP, - FAKE_DEATH, - UNBLEED, - UNPOISON, - UNDEAD_DEFENSE, - SEED(SkillSeed.class), - BEAST_FEED, - FORCE_BUFF, - CLAN_GATE, - GIVE_SP, - COREDONE, - ZAKENPLAYER, - ZAKENSELF, - - // unimplemented - NOTDONE; - - private final Class _class; - - public Skill makeSkill(StatSet set) - { - try - { - final Constructor c = _class.getConstructor(StatSet.class); - return c.newInstance(set); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - - private SkillType() - { - _class = SkillDefault.class; - } - - private SkillType(Class classType) - { - _class = classType; - } - } - - protected ChanceCondition _chanceCondition = null; // elements public static final int ELEMENT_WIND = 1; public static final int ELEMENT_FIRE = 2; @@ -386,7 +181,7 @@ public abstract class Skill // not needed, just for easier debug private final String _name; - private final SkillOpType _operateType; + private final SkillOperateType _operateType; private final boolean _magic; private final boolean _staticReuse; private final boolean _staticHitTime; @@ -504,6 +299,11 @@ public abstract class Skill private final boolean _advancedFlag; private final int _advancedMultiplier; + private final int _targetConsumeId; + private final int _targetConsume; + + protected ChanceCondition _chanceCondition = null; + protected Skill(StatSet set) { _id = set.getInt("skill_id", 0); @@ -512,7 +312,7 @@ public abstract class Skill _advancedMultiplier = set.getInt("advancedMultiplier", 1); _displayId = set.getInt("displayId", _id); _name = set.getString("name"); - _operateType = set.getEnum("operateType", SkillOpType.class); + _operateType = set.getEnum("operateType", SkillOperateType.class); _magic = set.getBoolean("isMagic", false); _staticReuse = set.getBoolean("staticReuse", false); _staticHitTime = set.getBoolean("staticHitTime", false); @@ -572,7 +372,7 @@ public abstract class Skill _bestowed = set.getBoolean("bestowed", false); _targetConsume = set.getInt("targetConsumeCount", 0); _targetConsumeId = set.getInt("targetConsumeId", 0); - if (_operateType == SkillOpType.OP_CHANCE) + if (_operateType == SkillOperateType.CHANCE) { _chanceCondition = ChanceCondition.parse(set); } @@ -1048,22 +848,22 @@ public abstract class Skill public boolean isActive() { - return _operateType == SkillOpType.OP_ACTIVE; + return _operateType == SkillOperateType.ACTIVE; } public boolean isPassive() { - return _operateType == SkillOpType.OP_PASSIVE; + return _operateType == SkillOperateType.PASSIVE; } public boolean isToggle() { - return _operateType == SkillOpType.OP_TOGGLE; + return _operateType == SkillOperateType.TOGGLE; } public boolean isChance() { - return _operateType == SkillOpType.OP_CHANCE; + return _operateType == SkillOperateType.CHANCE; } public ChanceCondition getChanceCondition() @@ -1421,7 +1221,7 @@ public abstract class Skill switch (_targetType) { // The skill can only be used on the Creature targeted, or on the caster itself - case TARGET_ONE: + case ONE: { boolean canTargetSelf = false; switch (_skillType) @@ -1522,13 +1322,13 @@ public abstract class Skill targetList.add(target); return targetList; } - case TARGET_SELF: - case TARGET_GROUND: + case SELF: + case GROUND: { targetList.add(creature); return targetList; } - case TARGET_HOLY: + case HOLY: { if ((creature instanceof Player) && (creature.getTarget() instanceof Artefact)) { @@ -1538,7 +1338,7 @@ public abstract class Skill return null; } - case TARGET_PET: + case PET: { target = creature.getPet(); if ((target != null) && !target.isDead()) @@ -1548,7 +1348,7 @@ public abstract class Skill } return null; } - case TARGET_OWNER_PET: + case OWNER_PET: { if (creature instanceof Summon) { @@ -1561,7 +1361,7 @@ public abstract class Skill } return null; } - case TARGET_CORPSE_PET: + case CORPSE_PET: { if (creature instanceof Player) { @@ -1574,7 +1374,7 @@ public abstract class Skill } return null; } - case TARGET_AURA: + case AURA: { final int radius = _skillRadius; final boolean srcInArena = creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE); @@ -1682,7 +1482,7 @@ public abstract class Skill } return targetList; } - case TARGET_AREA: + case AREA: { // Like L2OFF players can use TARGET_AREA skills on NPC in peacezone if ((!(target instanceof Attackable) && !(target instanceof Playable) && !(target instanceof Npc)) || // Target is not Attackable or PlayableInstance or Npc @@ -1863,7 +1663,7 @@ public abstract class Skill } return targetList; } - case TARGET_MULTIFACE: + case MULTIFACE: { if (!(target instanceof Attackable) && !(target instanceof Player)) { @@ -1940,7 +1740,7 @@ public abstract class Skill return targetList; // TODO multiface targets all around right now. need it to just get targets the character is facing. } - case TARGET_PARTY: + case PARTY: { targetList.add(creature); if (onlyFirst) @@ -2005,7 +1805,7 @@ public abstract class Skill } return targetList; } - case TARGET_PARTY_MEMBER: + case PARTY_MEMBER: { if ((target != null) && !target.isDead() && ((target == creature) || ((creature.getParty() != null) && (target.getParty() != null) && (creature.getParty().getPartyLeaderOID() == target.getParty().getPartyLeaderOID())) || (creature.getPet() == target) || (creature == target.getPet()))) { @@ -2016,7 +1816,7 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_PARTY_OTHER: + case PARTY_OTHER: { if ((target != creature) && (target != null) && !target.isDead() && (creature.getParty() != null) && (target.getParty() != null) && (creature.getParty().getPartyLeaderOID() == target.getParty().getPartyLeaderOID())) { @@ -2027,15 +1827,15 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_CORPSE_ALLY: - case TARGET_ALLY: + case CORPSE_ALLY: + case ALLY: { if (creature instanceof Player) { final int radius = _skillRadius; final Player player = (Player) creature; final Clan clan = player.getClan(); - if (_targetType != SkillTargetType.TARGET_CORPSE_ALLY) // if corpse, the caster is not included + if (_targetType != SkillTargetType.CORPSE_ALLY) // if corpse, the caster is not included { if (player.isInOlympiadMode()) { @@ -2059,7 +1859,7 @@ public abstract class Skill { continue; } - if (newPlayer.isDead() && (_targetType != SkillTargetType.TARGET_CORPSE_ALLY)) + if (newPlayer.isDead() && (_targetType != SkillTargetType.CORPSE_ALLY)) { continue; } @@ -2082,15 +1882,15 @@ public abstract class Skill } return targetList; } - case TARGET_CORPSE_CLAN: - case TARGET_CLAN: + case CORPSE_CLAN: + case CLAN: { if (creature instanceof Player) { final int radius = _skillRadius; final Player player = (Player) creature; final Clan clan = player.getClan(); - if (_targetType != SkillTargetType.TARGET_CORPSE_CLAN) + if (_targetType != SkillTargetType.CORPSE_CLAN) { if (player.isInOlympiadMode()) { @@ -2129,11 +1929,11 @@ public abstract class Skill } final Summon pet = newTarget.getPet(); - if ((pet != null) && Util.checkIfInRange(radius, creature, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.TARGET_CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.TARGET_CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) + if ((pet != null) && Util.checkIfInRange(radius, creature, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) { targetList.add(pet); } - if (_targetType == SkillTargetType.TARGET_CORPSE_CLAN) + if (_targetType == SkillTargetType.CORPSE_CLAN) { if (!newTarget.isDead()) { @@ -2195,7 +1995,7 @@ public abstract class Skill } return targetList; } - case TARGET_CORPSE_PLAYER: + case CORPSE_PLAYER: { if ((target != null) && target.isDead()) { @@ -2259,7 +2059,7 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_CORPSE_MOB: + case CORPSE_MOB: { if (!(target instanceof Attackable) || !target.isDead()) { @@ -2270,7 +2070,7 @@ public abstract class Skill targetList.add(target); return targetList; } - case TARGET_AREA_CORPSE_MOB: + case AREA_CORPSE_MOB: { if (!(target instanceof Attackable) || !target.isDead()) { @@ -2387,7 +2187,7 @@ public abstract class Skill } return targetList; } - case TARGET_UNLOCKABLE: + case UNLOCKABLE: { if (!(target instanceof Door) && !(target instanceof Chest)) { @@ -2399,12 +2199,12 @@ public abstract class Skill targetList.add(target); return targetList; } - case TARGET_ITEM: + case ITEM: { creature.sendMessage("Target type of skill is not currently handled."); return null; } - case TARGET_UNDEAD: + case UNDEAD: { if ((target instanceof Npc) || (target instanceof Servitor)) { @@ -2420,7 +2220,7 @@ public abstract class Skill creature.sendPacket(new SystemMessage(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET)); return null; } - case TARGET_AREA_UNDEAD: + case AREA_UNDEAD: { Creature cha; final int radius = _skillRadius; @@ -2486,7 +2286,7 @@ public abstract class Skill } return targetList; } - case TARGET_ENEMY_SUMMON: + case ENEMY_SUMMON: { if (target instanceof Summon) { @@ -2499,7 +2299,7 @@ public abstract class Skill } return null; } - case TARGET_SIEGE: + case SIEGE: { if ((target != null) && !target.isDead() && ((target instanceof Door) || (target instanceof ControlTower))) { @@ -2508,7 +2308,7 @@ public abstract class Skill } return null; } - case TARGET_TYRANNOSAURUS: + case TYRANNOSAURUS: { if (target instanceof Player) { @@ -2522,7 +2322,7 @@ public abstract class Skill } return null; } - case TARGET_AREA_AIM_CORPSE: + case AREA_AIM_CORPSE: { if ((target != null) && target.isDead()) { @@ -2532,7 +2332,7 @@ public abstract class Skill return null; } // npc only for now - untested - case TARGET_CLAN_MEMBER: + case CLAN_MEMBER: { if (creature instanceof Npc) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 48e67b74f1..ca7f2ae150 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -56,8 +56,6 @@ import org.l2jmobius.gameserver.model.ForceBuff; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; @@ -91,6 +89,8 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skill.Calculator; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.model.skill.funcs.Func; @@ -1380,7 +1380,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return; } boolean canCast = true; - if ((skill.getTargetType() == SkillTargetType.TARGET_GROUND) && (this instanceof Player)) + if ((skill.getTargetType() == SkillTargetType.GROUND) && (this instanceof Player)) { final Location wp = ((Player) this).getCurrentSkillWorldPosition(); if (!region.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ())) @@ -1429,7 +1429,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder final List targets = skill.getTargetList(this); // Set the target of the skill in function of Skill Type and Target Type Creature target = null; - if ((skill.getTargetType() == SkillTargetType.TARGET_AURA) || (skill.getTargetType() == SkillTargetType.TARGET_GROUND) || skill.isPotion()) + if ((skill.getTargetType() == SkillTargetType.AURA) || (skill.getTargetType() == SkillTargetType.GROUND) || skill.isPotion()) { target = this; } @@ -1438,7 +1438,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; } - else if (((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.REFLECT) || (skill.getSkillType() == SkillType.SEED) || (skill.getTargetType() == SkillTargetType.TARGET_SELF) || (skill.getTargetType() == SkillTargetType.TARGET_PET) || (skill.getTargetType() == SkillTargetType.TARGET_PARTY) || (skill.getTargetType() == SkillTargetType.TARGET_CLAN) || (skill.getTargetType() == SkillTargetType.TARGET_ALLY)) && !skill.isPotion()) + else if (((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.REFLECT) || (skill.getSkillType() == SkillType.SEED) || (skill.getTargetType() == SkillTargetType.SELF) || (skill.getTargetType() == SkillTargetType.PET) || (skill.getTargetType() == SkillTargetType.PARTY) || (skill.getTargetType() == SkillTargetType.CLAN) || (skill.getTargetType() == SkillTargetType.ALLY)) && !skill.isPotion()) { target = targets.get(0); } @@ -1942,8 +1942,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder switch (skill.getTargetType()) { - case TARGET_AURA: // AURA, SELF should be cast even if no target has been found - case TARGET_SELF: + case AURA: // AURA, SELF should be cast even if no target has been found + case SELF: { target = this; break; @@ -6867,7 +6867,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder */ public void onMagicLaunchedTimer(List targets, Skill skill, int coolTime, boolean instant) { - if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.TARGET_AURA))) + if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.AURA))) { _skillCast = null; enableAllSkills(); @@ -6925,7 +6925,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder } } - if (targetList.isEmpty() && (skill.getTargetType() != SkillTargetType.TARGET_AURA)) + if (targetList.isEmpty() && (skill.getTargetType() != SkillTargetType.AURA)) { if (this instanceof Player) { @@ -6996,7 +6996,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder */ public void onMagicHitTimer(List targets, Skill skill, int coolTime, boolean instant) { - if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.TARGET_AURA))) + if ((skill == null) || (((targets == null) || targets.isEmpty()) && (skill.getTargetType() != SkillTargetType.AURA))) { _skillCast = null; enableAllSkills(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index 84d32ca5fa..fb1b5f5243 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.CastleTeleporter; @@ -78,6 +77,7 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.TownZone; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index a24c4ea2ef..f8fc21c118 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -100,8 +100,6 @@ import org.l2jmobius.gameserver.model.Request; import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SubClass; import org.l2jmobius.gameserver.model.Timestamp; @@ -164,6 +162,8 @@ import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.siege.clanhalls.DevastatedCastle; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.model.skill.handlers.SkillSummon; @@ -663,7 +663,7 @@ public class Player extends Playable // Like L2OFF you can use cupid bow skills on peace zone // Like L2OFF players can use TARGET_AURA skills on peace zone, all targets will be ignored. // Check limited to active target. - if (skill.isOffensive() && (isInsidePeaceZone(Player.this, getTarget()) && (skill.getTargetType() != SkillTargetType.TARGET_AURA)) && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262/* Double Heart Shot */))) + if (skill.isOffensive() && (isInsidePeaceZone(Player.this, getTarget()) && (skill.getTargetType() != SkillTargetType.AURA)) && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262/* Double Heart Shot */))) { sendPacket(ActionFailed.STATIC_PACKET); return; @@ -678,7 +678,7 @@ public class Player extends Playable switch (skill.getTargetType()) { - case TARGET_GROUND: + case GROUND: { return; } @@ -2503,7 +2503,7 @@ public class Player extends Playable final Skill effectSkill = currenteffect.getSkill(); // Ignore all buff skills that are party related (ie. songs, dances) while still remaining weapon dependant on cast though. // Check to rest to assure current effect meets weapon requirements. - if (!effectSkill.isOffensive() && ((effectSkill.getTargetType() != SkillTargetType.TARGET_PARTY) || (effectSkill.getSkillType() != SkillType.BUFF)) && !effectSkill.getWeaponDependancy(this)) + if (!effectSkill.isOffensive() && ((effectSkill.getTargetType() != SkillTargetType.PARTY) || (effectSkill.getSkillType() != SkillType.BUFF)) && !effectSkill.getWeaponDependancy(this)) { sendMessage(effectSkill.getName() + " cannot be used with this weapon."); currenteffect.exit(); @@ -9388,7 +9388,7 @@ public class Player extends Playable switch (skillTargetType) { // Target the player if skill type is AURA, PARTY, CLAN or SELF - case TARGET_AURA: + case AURA: { if (isInOlympiadMode() && !isOlympiadStart()) { @@ -9396,16 +9396,16 @@ public class Player extends Playable } // fallthough? } - case TARGET_PARTY: - case TARGET_ALLY: - case TARGET_CLAN: - case TARGET_GROUND: - case TARGET_SELF: + case PARTY: + case ALLY: + case CLAN: + case GROUND: + case SELF: { target = this; break; } - case TARGET_PET: + case PET: { target = getPet(); break; @@ -9627,14 +9627,14 @@ public class Player extends Playable { if (isInsidePeaceZone(this, target) // Like L2OFF you can use cupid bow skills on peace zone && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262 /* Double Heart Shot */) // - && (skillTargetType != SkillTargetType.TARGET_AURA))) // Like L2OFF people can use TARGET_AURE skills on peace zone + && (skillTargetType != SkillTargetType.AURA))) // Like L2OFF people can use TARGET_AURE skills on peace zone { // If Creature or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); sendPacket(ActionFailed.STATIC_PACKET); return; } - if (isInOlympiadMode() && !isOlympiadStart() && (skillTargetType != SkillTargetType.TARGET_AURA)) + if (isInOlympiadMode() && !isOlympiadStart() && (skillTargetType != SkillTargetType.AURA)) { // if Player is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed sendPacket(ActionFailed.STATIC_PACKET); @@ -9650,12 +9650,12 @@ public class Player extends Playable // Check if a Forced ATTACK is in progress on non-attackable target if (!target.isAutoAttackable(this) // && (!forceUse && ((skill.getId() != 3260 /* Forgiveness */) && (skill.getId() != 3261 /* Heart Shot */) && (skill.getId() != 3262 /* Double Heart Shot */))) // - && (skillTargetType != SkillTargetType.TARGET_AURA) // - && (skillTargetType != SkillTargetType.TARGET_CLAN) // - && (skillTargetType != SkillTargetType.TARGET_ALLY) // - && (skillTargetType != SkillTargetType.TARGET_PARTY) // - && (skillTargetType != SkillTargetType.TARGET_SELF) // - && (skillTargetType != SkillTargetType.TARGET_GROUND)) + && (skillTargetType != SkillTargetType.AURA) // + && (skillTargetType != SkillTargetType.CLAN) // + && (skillTargetType != SkillTargetType.ALLY) // + && (skillTargetType != SkillTargetType.PARTY) // + && (skillTargetType != SkillTargetType.SELF) // + && (skillTargetType != SkillTargetType.GROUND)) { // Send a Server->Client packet ActionFailed to the Player sendPacket(ActionFailed.STATIC_PACKET); @@ -9666,7 +9666,7 @@ public class Player extends Playable if (dontMove) { // Calculate the distance between the Player and the target - if (skillTargetType == SkillTargetType.TARGET_GROUND) + if (skillTargetType == SkillTargetType.GROUND) { if (!isInsideRadius2D(getCurrentSkillWorldPosition().getX(), getCurrentSkillWorldPosition().getY(), getCurrentSkillWorldPosition().getZ(), skill.getCastRange() + getTemplate().getCollisionRadius())) { @@ -9700,7 +9700,7 @@ public class Player extends Playable } } // Check if the skill is defensive and if the target is a monster and if force attack is set.. if not then we don't want to cast. - if (!skill.isOffensive() && (target instanceof Monster) && !forceUse && (skillTargetType != SkillTargetType.TARGET_PET) && (skillTargetType != SkillTargetType.TARGET_AURA) && (skillTargetType != SkillTargetType.TARGET_CLAN) && (skillTargetType != SkillTargetType.TARGET_SELF) && (skillTargetType != SkillTargetType.TARGET_PARTY) && (skillTargetType != SkillTargetType.TARGET_ALLY) && (skillTargetType != SkillTargetType.TARGET_CORPSE_MOB) && (skillTargetType != SkillTargetType.TARGET_AREA_CORPSE_MOB) && (skillTargetType != SkillTargetType.TARGET_GROUND) && (skillType != SkillType.BEAST_FEED) && (skillType != SkillType.DELUXE_KEY_UNLOCK) && (skillType != SkillType.UNLOCK)) + if (!skill.isOffensive() && (target instanceof Monster) && !forceUse && (skillTargetType != SkillTargetType.PET) && (skillTargetType != SkillTargetType.AURA) && (skillTargetType != SkillTargetType.CLAN) && (skillTargetType != SkillTargetType.SELF) && (skillTargetType != SkillTargetType.PARTY) && (skillTargetType != SkillTargetType.ALLY) && (skillTargetType != SkillTargetType.CORPSE_MOB) && (skillTargetType != SkillTargetType.AREA_CORPSE_MOB) && (skillTargetType != SkillTargetType.GROUND) && (skillType != SkillType.BEAST_FEED) && (skillType != SkillType.DELUXE_KEY_UNLOCK) && (skillType != SkillType.UNLOCK)) { // send the action failed so that the skill doens't go off. sendPacket(ActionFailed.STATIC_PACKET); @@ -9757,7 +9757,7 @@ public class Player extends Playable return; } - if ((skillTargetType == SkillTargetType.TARGET_GROUND) && (getCurrentSkillWorldPosition() == null)) + if ((skillTargetType == SkillTargetType.GROUND) && (getCurrentSkillWorldPosition() == null)) { sendPacket(ActionFailed.STATIC_PACKET); return; @@ -9766,12 +9766,12 @@ public class Player extends Playable // Check if this is a Pvp skill and target isn't a non-flagged/non-karma player switch (skillTargetType) { - case TARGET_PARTY: - case TARGET_ALLY: // For such skills, checkPvpSkill() is called from Skill.getTargetList() - case TARGET_CLAN: // For such skills, checkPvpSkill() is called from Skill.getTargetList() - case TARGET_AURA: - case TARGET_SELF: - case TARGET_GROUND: + case PARTY: + case ALLY: // For such skills, checkPvpSkill() is called from Skill.getTargetList() + case CLAN: // For such skills, checkPvpSkill() is called from Skill.getTargetList() + case AURA: + case SELF: + case GROUND: { break; } @@ -9791,7 +9791,7 @@ public class Player extends Playable } } - if ((skillTargetType == SkillTargetType.TARGET_HOLY) && !TakeCastle.checkIfOkToCastSealOfRule(this, false)) + if ((skillTargetType == SkillTargetType.HOLY) && !TakeCastle.checkIfOkToCastSealOfRule(this, false)) { sendPacket(ActionFailed.STATIC_PACKET); abortCast(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index d7dcb8ccf7..bd0a8c9da6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.Door; @@ -40,6 +38,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; @@ -595,15 +595,15 @@ public abstract class Summon extends Playable switch (skill.getTargetType()) { // OWNER_PET should be cast even if no target has been found - case TARGET_OWNER_PET: + case OWNER_PET: { target = _owner; break; } // PARTY, AURA, SELF should be cast even if no target has been found - case TARGET_PARTY: - case TARGET_AURA: - case TARGET_SELF: + case PARTY: + case AURA: + case SELF: { target = this; break; @@ -704,7 +704,7 @@ public abstract class Summon extends Playable } // Check if a Forced ATTACK is in progress on non-attackable target - if (!target.isAutoAttackable(this) && !forceUse && (skill.getTargetType() != SkillTargetType.TARGET_AURA) && (skill.getTargetType() != SkillTargetType.TARGET_CLAN) && (skill.getTargetType() != SkillTargetType.TARGET_ALLY) && (skill.getTargetType() != SkillTargetType.TARGET_PARTY) && (skill.getTargetType() != SkillTargetType.TARGET_SELF)) + if (!target.isAutoAttackable(this) && !forceUse && (skill.getTargetType() != SkillTargetType.AURA) && (skill.getTargetType() != SkillTargetType.CLAN) && (skill.getTargetType() != SkillTargetType.ALLY) && (skill.getTargetType() != SkillTargetType.PARTY) && (skill.getTargetType() != SkillTargetType.SELF)) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java index 24a07507bc..011572d72d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @version $Revision: 1.15.2.10.2.16 $ $Date: 2005/04/06 16:13:40 $ @@ -45,7 +47,7 @@ public class BabyPet extends Pet for (Skill skill : getTemplate().getSkills().values()) { // just in case, also allow cp heal and mp recharges to be considered here...you never know ;) - if (skill.isActive() && (skill.getTargetType() == Skill.SkillTargetType.TARGET_OWNER_PET) && ((skill.getSkillType() == Skill.SkillType.HEAL) || (skill.getSkillType() == Skill.SkillType.HOT) || (skill.getSkillType() == Skill.SkillType.BALANCE_LIFE) || (skill.getSkillType() == Skill.SkillType.HEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.HEAL_STATIC) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == Skill.SkillType.CPHOT) || (skill.getSkillType() == Skill.SkillType.MANAHEAL) || (skill.getSkillType() == Skill.SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == Skill.SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.MANARECHARGE) || (skill.getSkillType() == Skill.SkillType.MPHOT))) + if (skill.isActive() && (skill.getTargetType() == SkillTargetType.OWNER_PET) && ((skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.HOT) || (skill.getSkillType() == SkillType.BALANCE_LIFE) || (skill.getSkillType() == SkillType.HEAL_PERCENT) || (skill.getSkillType() == SkillType.HEAL_STATIC) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.CPHOT) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == SkillType.MANARECHARGE) || (skill.getSkillType() == SkillType.MPHOT))) { // only consider two skills. If the pet has more, too bad...they won't be used by its AI. // for now assign the first two skills in the order they come. Once we have both skills, re-arrange them diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java index 235ee8d59e..4b418ff544 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.TeleportLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java index 831e086530..e2bdd19b65 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Cubic.java @@ -32,13 +32,13 @@ import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.handlers.SkillDrain; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 757441a658..17617f8f99 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.StopMove; @@ -255,7 +256,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a buff, check if the owner has it already [ owner.getEffect(Skill skill) ] - if (skill.getSkillType() == Skill.SkillType.BUFF) + if (skill.getSkillType() == SkillType.BUFF) { totalBuffsAvailable++; } @@ -339,7 +340,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a debuff, check if the attacker has it already [ attacker.getEffect(Skill skill) ] - if ((skill.getSkillType() == Skill.SkillType.DEBUFF) && (Rnd.get(3) < 1) && (attacker.getFirstEffect(skill) != null)) + if ((skill.getSkillType() == SkillType.DEBUFF) && (Rnd.get(3) < 1) && (attacker.getFirstEffect(skill) != null)) { sitCastAndFollow(skill, attacker); } @@ -359,7 +360,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a buff, check if the owner has it already [ owner.getEffect(Skill skill) ] - if ((Rnd.get(5) < chance) && ((skill.getSkillType() == Skill.SkillType.HEAL) || (skill.getSkillType() == Skill.SkillType.HOT) || (skill.getSkillType() == Skill.SkillType.BALANCE_LIFE) || (skill.getSkillType() == Skill.SkillType.HEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.HEAL_STATIC) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == Skill.SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == Skill.SkillType.CPHOT) || (skill.getSkillType() == Skill.SkillType.MANAHEAL) || (skill.getSkillType() == Skill.SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == Skill.SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == Skill.SkillType.MANARECHARGE) || (skill.getSkillType() == Skill.SkillType.MPHOT))) + if ((Rnd.get(5) < chance) && ((skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.HOT) || (skill.getSkillType() == SkillType.BALANCE_LIFE) || (skill.getSkillType() == SkillType.HEAL_PERCENT) || (skill.getSkillType() == SkillType.HEAL_STATIC) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.CPHOT) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.MANA_BY_LEVEL) || (skill.getSkillType() == SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == SkillType.MANARECHARGE) || (skill.getSkillType() == SkillType.MPHOT))) { sitCastAndFollow(skill, _owner); return; @@ -498,7 +499,7 @@ public class TamedBeast extends FeedableBeast for (Skill skill : _tamedBeast.getTemplate().getSkills().values()) { // if the skill is a buff, check if the owner has it already [ owner.getEffect(Skill skill) ] - if (skill.getSkillType() == Skill.SkillType.BUFF) + if (skill.getSkillType() == SkillType.BUFF) { if (i == rand) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java index 73128812ac..b7cd730f59 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -35,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.skill.funcs.Func; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java index 9896dee02a..58f374408e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillOperateType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillOperateType.java new file mode 100644 index 0000000000..fb0e4ad6a2 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillOperateType.java @@ -0,0 +1,28 @@ +/* + * 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 . + */ +package org.l2jmobius.gameserver.model.skill; + +/** + * @author Mobius + */ +public enum SkillOperateType +{ + PASSIVE, + ACTIVE, + TOGGLE, + CHANCE +} \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillTargetType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillTargetType.java new file mode 100644 index 0000000000..2bd9de826a --- /dev/null +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillTargetType.java @@ -0,0 +1,55 @@ +/* + * 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 . + */ +package org.l2jmobius.gameserver.model.skill; + +/** + * @author Mobius + */ +public enum SkillTargetType +{ + NONE, + SELF, + ONE, + PARTY, + ALLY, + CLAN, + PET, + AREA, + AURA, + CORPSE, + UNDEAD, + AREA_UNDEAD, + MULTIFACE, + CORPSE_ALLY, + CORPSE_CLAN, + CORPSE_PLAYER, + CORPSE_PET, + ITEM, + AREA_CORPSE_MOB, + CORPSE_MOB, + UNLOCKABLE, + HOLY, + PARTY_MEMBER, + PARTY_OTHER, + ENEMY_SUMMON, + OWNER_PET, + GROUND, + SIEGE, + TYRANNOSAURUS, + AREA_AIM_CORPSE, + CLAN_MEMBER +} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillType.java new file mode 100644 index 0000000000..2d0280752d --- /dev/null +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillType.java @@ -0,0 +1,184 @@ +/* + * 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 . + */ +package org.l2jmobius.gameserver.model.skill; + +import java.lang.reflect.Constructor; + +import org.l2jmobius.gameserver.model.Skill; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skill.handlers.SkillCharge; +import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeDmg; +import org.l2jmobius.gameserver.model.skill.handlers.SkillChargeEffect; +import org.l2jmobius.gameserver.model.skill.handlers.SkillCreateItem; +import org.l2jmobius.gameserver.model.skill.handlers.SkillDefault; +import org.l2jmobius.gameserver.model.skill.handlers.SkillDrain; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSeed; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSignet; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSignetCasttime; +import org.l2jmobius.gameserver.model.skill.handlers.SkillSummon; + +/** + * @author Mobius + */ +public enum SkillType +{ + // Damage + PDAM, + MDAM, + CPDAM, + MANADAM, + DOT, + MDOT, + DRAIN_SOUL, + DRAIN(SkillDrain.class), + DEATHLINK, + FATALCOUNTER, + BLOW, + + // Disablers + BLEED, + POISON, + STUN, + ROOT, + CONFUSION, + FEAR, + SLEEP, + CONFUSE_MOB_ONLY, + MUTE, + PARALYZE, + WEAKNESS, + + // HP, MP, CP + HEAL, + HOT, + BALANCE_LIFE, + HEAL_PERCENT, + HEAL_STATIC, + COMBATPOINTHEAL, + COMBATPOINTPERCENTHEAL, + CPHOT, + MANAHEAL, + MANA_BY_LEVEL, + MANAHEAL_PERCENT, + MANARECHARGE, + MPHOT, + + // Aggro + AGGDAMAGE, + AGGREDUCE, + AGGREMOVE, + AGGREDUCE_CHAR, + AGGDEBUFF, + + // Fishing + FISHING, + PUMPING, + REELING, + + // Misc + UNLOCK, + ENCHANT_ARMOR, + ENCHANT_WEAPON, + SOULSHOT, + SPIRITSHOT, + SIEGEFLAG, + TAKECASTLE, + DELUXE_KEY_UNLOCK, + SOW, + HARVEST, + GET_PLAYER, + + // Creation + COMMON_CRAFT, + DWARVEN_CRAFT, + CREATE_ITEM(SkillCreateItem.class), + SUMMON_TREASURE_KEY, + + // Summons + SUMMON(SkillSummon.class), + FEED_PET, + DEATHLINK_PET, + STRSIEGEASSAULT, + ERASE, + BETRAY, + + // Cancel + CANCEL, + MAGE_BANE, + WARRIOR_BANE, + NEGATE, + + BUFF, + DEBUFF, + PASSIVE, + CONT, + SIGNET(SkillSignet.class), + SIGNET_CASTTIME(SkillSignetCasttime.class), + + RESURRECT, + CHARGE(SkillCharge.class), + CHARGE_EFFECT(SkillChargeEffect.class), + CHARGEDAM(SkillChargeDmg.class), + MHOT, + DETECT_WEAKNESS, + LUCK, + RECALL, + SUMMON_FRIEND, + REFLECT, + SPOIL, + SWEEP, + FAKE_DEATH, + UNBLEED, + UNPOISON, + UNDEAD_DEFENSE, + SEED(SkillSeed.class), + BEAST_FEED, + FORCE_BUFF, + CLAN_GATE, + GIVE_SP, + CORE_DONE, + ZAKEN_PLAYER, + ZAKEN_SELF, + + // Unimplemented + NOT_DONE; + + private final Class _class; + + public Skill makeSkill(StatSet set) + { + try + { + final Constructor c = _class.getConstructor(StatSet.class); + return c.newInstance(set); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + private SkillType() + { + _class = SkillDefault.class; + } + + private SkillType(Class classType) + { + _class = classType; + } +} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java index 2a0c55d616..b00787f849 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectCancel.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java index 796ce1148b..f54db2c1a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectChameleonRest.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java index 4c0c55c84d..03af8157ed 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDamOverTime.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillTargetType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -66,7 +66,7 @@ class EffectDamOverTime extends Effect } } - final boolean awake = !(getEffected() instanceof Attackable) && ((getSkill().getTargetType() != SkillTargetType.TARGET_SELF) || !getSkill().isToggle()); + final boolean awake = !(getEffected() instanceof Attackable) && ((getSkill().getTargetType() != SkillTargetType.SELF) || !getSkill().isToggle()); getEffected().reduceCurrentHpByDamOverTime(damage, getEffector(), awake, getPeriod()); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java index 062c56f18e..cc54b42255 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectDeflectBuff.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java index c924fbbdfd..0d0f18c9af 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectNegate.java @@ -20,8 +20,8 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; /** * @author Gnat diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java index 71bc41e203..a130d0c668 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSignetMDam.java @@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Env; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.model.skill.handlers.SkillSignetCasttime; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; @@ -81,7 +81,7 @@ public class EffectSignetMDam extends Effect int x = getEffector().getX(); int y = getEffector().getY(); int z = getEffector().getZ(); - if ((getEffector() instanceof Player) && (getSkill().getTargetType() == Skill.SkillTargetType.TARGET_GROUND)) + if ((getEffector() instanceof Player) && (getSkill().getTargetType() == SkillTargetType.GROUND)) { final Location wordPosition = ((Player) getEffector()).getCurrentSkillWorldPosition(); if (wordPosition != null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java index 40170dd887..5c7de7d24c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectSilentMove.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.skill.effects; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java index 5e08d09eaf..32cda909f9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/effects/EffectTemplate.java @@ -21,8 +21,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.Effect; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Lambda; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java index 64a6eb87a2..7d9de3d253 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillChargeDmg.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skill.BaseStat; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.model.skill.effects.EffectCharge; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; @@ -81,7 +82,7 @@ public class SkillChargeDmg extends Skill double modifier = 0; modifier = (effect.getLevel() - getNumCharges()) * 0.33; - if ((getTargetType() != SkillTargetType.TARGET_AREA) && (getTargetType() != SkillTargetType.TARGET_MULTIFACE)) + if ((getTargetType() != SkillTargetType.AREA) && (getTargetType() != SkillTargetType.MULTIFACE)) { effect.numCharges -= getNumCharges(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java index fcbb460098..3208496ae4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillDrain.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Cubic; import org.l2jmobius.gameserver.model.skill.Formulas; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -62,7 +63,7 @@ public class SkillDrain extends Skill continue; } - if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (target.isAlikeDead() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { continue; } @@ -107,7 +108,7 @@ public class SkillDrain extends Skill creature.sendPacket(suhp); // Check to see if we should damage the target - if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB))) + if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.CORPSE_MOB))) { // Manage attack or cast break of the target (calculating rate, sending message...) if (!target.isRaid() && Formulas.calcAtkBreak(target, damage)) @@ -117,7 +118,7 @@ public class SkillDrain extends Skill } creature.sendDamageMessage(target, damage, mcrit, false, false); - if (hasEffects() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (hasEffects() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { if (target.reflectSkill(this)) { @@ -149,7 +150,7 @@ public class SkillDrain extends Skill } // Check to see if we should do the decay right after the cast - if (target.isDead() && (getTargetType() == SkillTargetType.TARGET_CORPSE_MOB) && (target instanceof Npc)) + if (target.isDead() && (getTargetType() == SkillTargetType.CORPSE_MOB) && (target instanceof Npc)) { ((Npc) target).endDecayTask(); } @@ -179,7 +180,7 @@ public class SkillDrain extends Skill { for (Creature target : targets) { - if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (target.isAlikeDead() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { continue; } @@ -196,7 +197,7 @@ public class SkillDrain extends Skill owner.sendPacket(suhp); // Check to see if we should damage the target - if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB))) + if ((damage > 0) && (!target.isDead() || (getTargetType() != SkillTargetType.CORPSE_MOB))) { target.reduceCurrentHp(damage, activeCubic.getOwner()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java index 5e6f8ee72e..fe3f0e5b92 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSeed.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.model.skill.effects.EffectSeed; public class SkillSeed extends Skill @@ -44,7 +45,7 @@ public class SkillSeed extends Skill for (WorldObject target2 : targets) { final Creature target = (Creature) target2; - if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) + if (target.isAlikeDead() && (getTargetType() != SkillTargetType.CORPSE_MOB)) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java index 8bda361ccd..2d593b34f9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSignet.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; public class SkillSignet extends Skill { @@ -58,7 +59,7 @@ public class SkillSignet extends Skill int x = caster.getX(); int y = caster.getY(); int z = caster.getZ(); - if ((caster instanceof Player) && (getTargetType() == Skill.SkillTargetType.TARGET_GROUND)) + if ((caster instanceof Player) && (getTargetType() == SkillTargetType.GROUND)) { final Location wordPosition = ((Player) caster).getCurrentSkillWorldPosition(); if (wordPosition != null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java index e4db286a93..25e0850b23 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/handlers/SkillSummon.java @@ -30,9 +30,10 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Cubic; -import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; +import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.skill.SkillTargetType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -79,10 +80,11 @@ public class SkillSummon extends Skill final Player player = (Player) creature; if (_isCubic) { - if (getTargetType() != Skill.SkillTargetType.TARGET_SELF) + if (getTargetType() != SkillTargetType.SELF) { return true; // Player is always able to cast mass cubic skill } + final int mastery = player.getSkillLevel(SKILL_CUBIC_MASTERY); final int count = player.getCubics().size(); if (count > mastery) @@ -97,6 +99,7 @@ public class SkillSummon extends Skill { return false; } + if (player.getPet() != null) { creature.sendPacket(new SystemMessage(SystemMessageId.YOU_ALREADY_HAVE_A_PET)); @@ -236,7 +239,7 @@ public class SkillSummon extends Skill World.getInstance().storeObject(summon); // Check to see if we should do the decay right after the cast - if (getTargetType() == SkillTargetType.TARGET_CORPSE_MOB) + if (getTargetType() == SkillTargetType.CORPSE_MOB) { final Creature target = targets.get(0); if (target.isDead() && (target instanceof Npc)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9fbc7ec30a..268da1fc0c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -20,8 +20,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java index a96d47f192..1ed15ccd3b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -34,7 +34,6 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.item.ItemTemplate; @@ -42,12 +41,14 @@ import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skill.Env; +import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.model.skill.Stat; import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.skill.conditions.ConditionElementSeed; import org.l2jmobius.gameserver.model.skill.conditions.ConditionForceBuff; import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameTime; +import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameTime.CheckGameTime; import org.l2jmobius.gameserver.model.skill.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.skill.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.skill.conditions.ConditionLogicOr; @@ -58,6 +59,7 @@ import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerLevel; import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerMp; import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerRace; import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerState; +import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerState.CheckPlayerState; import org.l2jmobius.gameserver.model.skill.conditions.ConditionSkillStats; import org.l2jmobius.gameserver.model.skill.conditions.ConditionSlotItemId; import org.l2jmobius.gameserver.model.skill.conditions.ConditionTargetAggro; @@ -68,8 +70,6 @@ import org.l2jmobius.gameserver.model.skill.conditions.ConditionTargetUsesWeapon import org.l2jmobius.gameserver.model.skill.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.skill.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.skill.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.skill.conditions.ConditionGameTime.CheckGameTime; -import org.l2jmobius.gameserver.model.skill.conditions.ConditionPlayerState.CheckPlayerState; import org.l2jmobius.gameserver.model.skill.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skill.funcs.FuncTemplate; import org.l2jmobius.gameserver.model.skill.funcs.Lambda; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java index 0a92df6e0b..31a8251bdd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java @@ -25,9 +25,9 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.model.skill.conditions.Condition; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skill.SkillType; +import org.l2jmobius.gameserver.model.skill.conditions.Condition; /** * @author mkizub