From 72867c7917ed63f2a410257b6e0f8ee88777de64 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 17 Jul 2015 12:54:32 +0000 Subject: [PATCH] -Updated some skills in 10500-10700 range. -Added stat maxPhysCritRate (for othell passive atm, increase crit rate limit). -Yul stances don't stack anymore. Contributed by NviX. --- .../game/data/stats/skills/10500-10599.xml | 578 ++++++++++++------ .../game/data/stats/skills/10600-10699.xml | 138 ++++- .../game/data/stats/skills/10700-10799.xml | 404 +++++++----- trunk/dist/game/data/xsd/skills.xsd | 1 + .../gameserver/model/actor/stat/CharStat.java | 14 +- .../gameserver/model/skills/AbnormalType.java | 3 +- .../gameserver/model/stats/Stats.java | 1 + 7 files changed, 772 insertions(+), 367 deletions(-) diff --git a/trunk/dist/game/data/stats/skills/10500-10599.xml b/trunk/dist/game/data/stats/skills/10500-10599.xml index c76165a4e3..585730a68e 100644 --- a/trunk/dist/game/data/stats/skills/10500-10599.xml +++ b/trunk/dist/game/data/stats/skills/10500-10599.xml @@ -1373,24 +1373,28 @@ + + 38 41 45 47
+ 90 95 97 99
+ 13302 13303 13304 13305
+ + + + - 38 41 45 47
- - 90 95 97 99
- 13302 13303 13304 13305
- - - - - - + + + + + + @@ -1401,35 +1405,80 @@ - + + 85 90 95 99
- 1 2 3 4
- 45 46 47 48 49 50 51 52 53 54
+ 1 1 2 2
+ 1 2 3 4
+ 16 17 18 19 20 21 22 23 24 25
- - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 40 50
- 85 90 95 99
+ 90 99
+ 1 2
+ + + + + + - - - - - - + + @@ -1437,189 +1486,248 @@ + + + - 30 35 40 45
- 1 1 2 2
- 30 30 35 35
+ 1.35 1.36 1.37 1.38
+ 1.1 1.11 1.12 1.13
85 90 95 99
+ - - 1.10 1.11 1.12 1.13
- 0.35 0.36 0.37 0.38
- - + - + + + + - - - - - + 71 72 74 77 79 82 84 87
- 83 80 76 73 69 66 62 59 55 52
- 82 83 84 85 86 87 88 89 90 95
+ 81 82 83 84 85 86 87 88 89 90
13541 13847 14152 14458 14764 15070 15375 15681 15987 16293
30 33 36 40 43 46 50 53 56 60
85 86 88 90 92 94 96 98
7396 7647 8149 8652 9154 9657 10159 10662
- - + 1 2 3 4 5 6 7 8
+ 44000 43000 42000 41000 40000 39000 38000 37000 36000 35000
+ + + + + + + + + + + + - + - - - + + + + + + + + + + + + + - + - + - + + 38 40 42 44 46
+ 44 42 40 38 36 34 33 31 29 27
+ 61 62 63 64 65 66 67 68 69 70
+ -1 -2 -3 -4 -5 -6 -7 -8 -9 -10
+ 12 13 14 15 16
+ 85 88 91 94 97
+ 3 4 5 6 7
+ 59000 58000 57000 56000 55000 54000 53000 52000 51000 50000
+ + + + + + + - 38 40 42 44 46
- - 44 42 40 38 36 34 33 31 29 27
- 76 77 78 79 80 81 82 83 84 85
- 1 2 3 4 5 6 7 8 9 10
- 12 13 14 15 16
- 85 88 91 94 97
- 50 55 60 65 70 75
- 3 4 5 6 7
- - - + - - + - + + - + - - - - - - + + - + - + + + - + + + - + + + + + 38 38 40 43 45 47
+ 85 86 89 92 95 98
+ 45 50 55 60 65 70
+ - 38 38 40 43 45 47
- - 85 86 89 92 95 98
- 45 50 55 60 65 70
- + - + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1627,7 +1735,6 @@ - @@ -1667,42 +1774,54 @@ - + + 40 43 45 47
+ 45 43 41 39 37 35 33 31 30 28
+ 61 62 63 64 65 66 67 68 69 70
+ 89 92 95 98
+ 40 43 45 47
+ 60 65 70 75
+ 1 2 3 4
+ 29000 28000 27000 26000 25000 24000 23000 22000 21000 20000
+ + + + + + - 40 43 45 47
- - 45 43 41 39 37 35 33 31 30 28
- 76 77 78 79 80 81 82 83 84 85
- 89 92 95 98
- 40 43 45 47
- 11000 12000 13000 14300
- 60 65 70 75
- - - - + - - - + + - + + + + + + + + - - + + + - - + + + + @@ -1714,6 +1833,7 @@ + @@ -1737,50 +1857,60 @@ --> - + + 38 40 42 44 46
+ 44 42 40 38 36 34 33 31 29 27
+ 85 88 91 94 97
+ 38 40 42 44 46
+ 61 62 63 64 65 66 67 68 69 70
+ 59000 58000 57000 56000 55000 54000 53000 52000 51000 50000
+ + + + + - 38 40 42 44 46
- - 44 42 40 38 36 34 33 31 29 27
- 85 88 91 94 97
- 38 40 42 44 46
- 66 67 68 69 70 71 72 73 74 75
- 70 75 80 85 90
- - - - + - - + + - - + + + + + + + + - + + + 106 115 125 129
10662 11162 11662 12162
85 90 95 97
- + - + + - + - + @@ -1797,7 +1927,6 @@ - @@ -1806,17 +1935,15 @@ - + 206 213 220 227 234 241 248 255 262 270
21 22 23 24 25 26 27 28 29 30
- - @@ -1826,6 +1953,12 @@ + + + + + + @@ -1836,9 +1969,16 @@ + + + + + + + @@ -1847,24 +1987,30 @@ 133 135 140 145 149 154 159 164
- - + + 51 52 53 54 55 56 57 58 59 60
- 51 52 53 54 55 56 57 58 59 60
- - + + + + + + - - + - + + + + + @@ -1875,7 +2021,6 @@ - @@ -1915,62 +2060,76 @@ 2 3
2 0
- 10 0
+ 50 0
1.30 1.40
1.60 1.70
+ - - + - - - - + + + + + - - - - - - - - + + + + + - - + + + + - + + + - + - + + + + + + + + + + + + - + + - + @@ -1979,10 +2138,11 @@ - + - - + + + @@ -1990,7 +2150,8 @@ - 1.05 1.06 1.07 1.1
+ 1.07 1.09 1.11 1.15
+ 4 6 8 10
85 90 95 99
@@ -2001,16 +2162,51 @@ + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/stats/skills/10600-10699.xml b/trunk/dist/game/data/stats/skills/10600-10699.xml index 1c0e07f728..4c1619b47d 100644 --- a/trunk/dist/game/data/stats/skills/10600-10699.xml +++ b/trunk/dist/game/data/stats/skills/10600-10699.xml @@ -1,8 +1,10 @@ - + + + @@ -10,87 +12,189 @@ + + + + + + + + - - + + + + + + + + + - - - - 85 90 95 99
+ 0.95 0.94 0.93 0.9
+ 5 6 7 10
+ + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + + + + + + + + - - + + + + + + + + + - - - - 85 90 95 99
+ 1.05 1.06 1.07 1.1
+ 2 3 4 5
+ + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/stats/skills/10700-10799.xml b/trunk/dist/game/data/stats/skills/10700-10799.xml index e06133126b..b32440057f 100644 --- a/trunk/dist/game/data/stats/skills/10700-10799.xml +++ b/trunk/dist/game/data/stats/skills/10700-10799.xml @@ -14,7 +14,6 @@ - @@ -24,11 +23,13 @@ - + + + @@ -45,7 +46,6 @@ - + 1426 1466 1506 1546 1586 1626 1666 1706 1746 1792
- @@ -150,29 +149,44 @@ - + - - + - + - + + + + + + + + + + + + + + + + + + + + - @@ -186,44 +200,57 @@ - + 31 32 33 34 35 36 37 38 39 40
1.51 1.52 1.53 1.54 1.55 1.56 1.57 1.58 1.59 1.60
- - - - - - + + + + + + + + + + + + + + + + + + - + 21 22 23 24 25 26 27 28 29 30
- + + @@ -236,6 +263,8 @@ + + @@ -244,17 +273,17 @@ - + 808 841 875 910 946 983 1022 1062 1104 1147
- + @@ -262,45 +291,48 @@ + + 85 90 95 99
+ 1.10 1.12 1.15 1.20
+ 1.05 1.06 1.07 1.10
+ 1 2 3 4
+ + + - 85 90 95 99
- 1.10 1.12 1.15 1.20
- 1.05 1.06 1.07 1.10
- 1 2 3 4
- - - + - + + 85 90 95 99
+ 1.10 1.12 1.15 1.20
+ 0.95 0.94 0.93 0.90
+ 1 2 3 4
+ + + - 85 90 95 99
- 1.10 1.12 1.15 1.20
- 0.95 0.94 0.93 0.90
- 1 2 3 4
- - @@ -310,22 +342,21 @@ - - - + 85 90 95 99
+ 1.10 1.12 1.15 1.20
+ 1.05 1.06 1.07 1.10
+ 1 2 3 4
+ + + - 85 90 95 99
- 1.10 1.12 1.15 1.20
- 1.05 1.06 1.07 1.10
- 1 2 3 4
- @@ -340,135 +371,159 @@ - - - - - - + 98 100 103 107 110 114 117 121
- 113 106 99 91 84 77 70 62 55 48
85 86 88 90 92 94 96 98
20814 21546 23011 24476 25941 27406 28871 30336
30 33 36 40 43 46 50 53 56 60
31801 32534 33266 33998 34731 35463 36196 36928 37661 38393
- + 6900 6800 6700 6600 6500 6400 6300 6200 6100 6000
+ - - + - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + 60 61 63 65 67 69 71 74
- 69 65 60 56 51 47 42 38 34 29
85 86 88 90 92 94 96 98
2681 2771 2952 3133 3313 3494 3675 3855
4036 4126 4216 4307 4397 4487 4578 4668 4758 4848
30 33 36 40 43 46 50 53 56 60
- + 4900 4800 4700 4600 4500 4400 4300 4200 4100 4000
+ + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - + + 79 82 84 87 90 93 96 99
+ 93 87 81 75 69 63 57 51 45 39
+ 85 87 89 91 93 95 97 99
+ 19477 21035 22593 24151 25709 27267 28825 30383
+ 30 33 36 40 43 46 50 53 56 60
+ 31162 31941 32720 33499 34278 35057 35836 36615 37394 38173
+ 6900 6800 6700 6600 6500 6400 6300 6200 6100 6000
+ + + + + + + + - - 79 82 84 87 90 93 96 99
- - 93 87 81 75 69 63 57 51 45 39
- 85 87 89 91 93 95 97 99
- 15634 16748 17863 18977 20091 21206 22320 23435
- 30 33 36 40 43 46 50 53 56 60
- 23992 24549 25106 25663 26220 26778 27335 27892 28449 29006
- - - - - - - - - - - + + @@ -490,60 +545,78 @@ + + + + + - - - - - - + 117 119 123 128 132 136 140 144
- 135 126 118 109 100 92 83 74 66 57
85 86 88 90 92 94 96 98
22198 22974 24524 26075 27625 29176 30726 32277
33827 34602 35378 36153 36928 37703 38479 39254 40029 40804
30 33 36 40 43 46 50 53 56 60
- - + 6900 6800 6700 6600 6500 6400 6300 6200 6100 6000
+ - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -590,94 +663,112 @@ - - - - - - - + 98 103 108 114 119
- 111 104 97 90 83 76 69 61 54 47
85 88 91 94 97
- 9947 11006 12065 13124 14183
- 88 89 90 91 92 93 94 95 96 97
+ 19867 22249 24631 27013 29395
+ 51 52 53 54 55 56 57 58 59 60
30 33 36 40 43 46 50 53 56 60
- 15242 15595 15948 16301 16654 17007 17360 17713 18066 18419
- + 31777 32571 33365 34159 34953 35747 36541 37335 38129 38923
+ 59000 58000 57000 56000 55000 54000 53000 52000 51000 50000
+ 1 2 3 4 5
+ + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + 102 106 109 113 116 120 124 127
- 119 111 104 96 88 81 73 66 58 50
30 33 36 40 43 46 50 53 56 60
85 87 89 91 93 95 97 99
24888 25558 26229 26900 27571 28242 28912 29583
29918 30254 30589 30925 31260 31595 31931 32266 32601 32937
- 56 57 58 59 60 61 62 63 64 65
- + 61 62 63 64 65 66 67 68 69 70
+ 29000 28000 27000 26000 25000 24000 23000 22000 21000 20000
+ + + + + - - - + + + + + + + @@ -697,15 +788,18 @@ + + + + + + + + + - - - - - - diff --git a/trunk/dist/game/data/xsd/skills.xsd b/trunk/dist/game/data/xsd/skills.xsd index 0f381b80d2..1af15a95c3 100644 --- a/trunk/dist/game/data/xsd/skills.xsd +++ b/trunk/dist/game/data/xsd/skills.xsd @@ -404,6 +404,7 @@ + diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java b/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java index 851a60929b..71d1da43d0 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java @@ -61,8 +61,7 @@ public class CharStat /** * Calculate the new value of the state with modifiers that will be applied on the targeted L2Character.
- * Concept :
_calculators. Each Calculator (a calculator per state) own a table of Func object. A Func object is a mathematic function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...) :
+ * Concept :
_calculators. Each Calculator (a calculator per state) own a table of Func object. A Func object is a mathematic function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...) :
* FuncAtkAccuracy -> Math.sqrt(_player.getDEX())*6+_player.getLevel()
* When the calc method of a calculator is launched, each mathematical function is called according to its priority _order.
* Indeed, Func with lowest priority order is executed firsta and Funcs with the same order are executed in unspecified order.
@@ -191,9 +190,18 @@ public class CharStat { int val = (int) calcStat(Stats.CRITICAL_RATE, _activeChar.getTemplate().getBaseCritRate(), target, skill); + int maxCrit = (int) _activeChar.getStat().calcStat(Stats.MAX_PHYS_CRIT_RATE, 0, null, null); + if (!_activeChar.canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) { - val = Math.min(val, Config.MAX_PCRIT_RATE); + if (maxCrit > 0) + { + val = Math.min(val, (Config.MAX_PCRIT_RATE + maxCrit)); + } + else + { + val = Math.min(val, Config.MAX_PCRIT_RATE); + } } return val; diff --git a/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java b/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java index 417b3d97db..470fc5a74b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java +++ b/trunk/java/com/l2jserver/gameserver/model/skills/AbnormalType.java @@ -374,7 +374,8 @@ public enum AbnormalType ELEMENTAL_RESISTANCE_ISS, HOLY_ATTACK_RESISTANCE_ISS, MENTAL_ATTACK_RESISTANCE_ISS, - SIGEL_AURA; + SIGEL_AURA, + YUL_STANCE; /** * Get the enumerate for the given String. diff --git a/trunk/java/com/l2jserver/gameserver/model/stats/Stats.java b/trunk/java/com/l2jserver/gameserver/model/stats/Stats.java index aa700a2409..d3795fa006 100644 --- a/trunk/java/com/l2jserver/gameserver/model/stats/Stats.java +++ b/trunk/java/com/l2jserver/gameserver/model/stats/Stats.java @@ -86,6 +86,7 @@ public enum Stats DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). SHIELD_RATE("rShld"), CRITICAL_RATE("rCrit"), + MAX_PHYS_CRIT_RATE("maxPhysCritRate"), BLOW_RATE("blowRate"), MCRITICAL_RATE("mCritRate"), EXPSP_RATE("rExp"),