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

Fixed blow rate chances.

Browse Source
This commit is contained in:
MobiusDev
2017-12-09 18:47:45 +00:00
parent 247a5bc9f5
commit 683ae0ef52
137 changed files with 808 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java vendored
View File

@@ -33,14 +33,14 @@ import com.l2jmobius.gameserver.model.stats.Formulas;
public final class Backstab extends AbstractEffect
{
private final double _power;
private final double _chance;
private final double _chanceBoost;
private final double _criticalChance;
private final boolean _overHit;
public Backstab(StatsSet params)
{
_power = params.getDouble("power", 0);
_chance = params.getDouble("chance", 0);
_power = params.getDouble("power");
_chanceBoost = params.getDouble("chanceBoost");
_criticalChance = params.getDouble("criticalChance", 0);
_overHit = params.getBoolean("overHit", false);
}
@@ -48,7 +48,7 @@ public final class Backstab extends AbstractEffect
@Override
public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill)
{
return !effector.isInFrontOf(effected) && !Formulas.calcPhysicalSkillEvasion(effector, effected, skill) && Formulas.calcBlowSuccess(effector, effected, skill, _chance);
return !effector.isInFrontOf(effected) && !Formulas.calcPhysicalSkillEvasion(effector, effected, skill) && Formulas.calcBlowSuccess(effector, effected, skill, _chanceBoost);
}
@Override

21
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -22,7 +22,6 @@ import java.util.Set;
import com.l2jmobius.gameserver.enums.ShotType;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -38,27 +37,24 @@ import com.l2jmobius.gameserver.model.stats.Formulas;
public final class FatalBlow extends AbstractEffect
{
private final double _power;
private final double _chance;
private final double _chanceBoost;
private final double _criticalChance;
private final boolean _overHit;
private final Set<AbnormalType> _abnormals;
private final double _abnormalPower;
public FatalBlow(StatsSet params)
{
_power = params.getDouble("power", 0);
_chance = params.getDouble("chance", 0);
_power = params.getDouble("power");
_chanceBoost = params.getDouble("chanceBoost");
_criticalChance = params.getDouble("criticalChance", 0);
_overHit = params.getBoolean("overHit", false);
final String abnormals = params.getString("abnormalType", null);
String abnormals = params.getString("abnormalType", null);
if ((abnormals != null) && !abnormals.isEmpty())
{
_abnormals = new HashSet<>();
for (String slot : abnormals.split(";"))
{
_abnormals.add(AbnormalType.getAbnormalType(slot));
_abnormals.add(Enum.valueOf(AbnormalType.class, slot));
}
}
else
@@ -71,7 +67,7 @@ public final class FatalBlow extends AbstractEffect
@Override
public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill)
{
return !Formulas.calcPhysicalSkillEvasion(effector, effected, skill) && Formulas.calcBlowSuccess(effector, effected, skill, _chance);
return !Formulas.calcPhysicalSkillEvasion(effector, effected, skill) && Formulas.calcBlowSuccess(effector, effected, skill, _chanceBoost);
}
@Override
@@ -94,11 +90,6 @@ public final class FatalBlow extends AbstractEffect
return;
}
if (_overHit && effected.isAttackable())
{
((L2Attackable) effected).overhitEnabled(true);
}
double power = _power;
// Check if we apply an abnormal modifier

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java vendored
View File

@@ -33,13 +33,13 @@ import com.l2jmobius.gameserver.model.stats.Formulas;
public final class SoulBlow extends AbstractEffect
{
private final double _power;
private final double _chance;
private final double _chanceBoost;
private final boolean _overHit;
public SoulBlow(StatsSet params)
{
_power = params.getDouble("power", 0);
_chance = params.getDouble("chance", 0);
_power = params.getDouble("power");
_chanceBoost = params.getDouble("chanceBoost");
_overHit = params.getBoolean("overHit", false);
}
@@ -52,7 +52,7 @@ public final class SoulBlow extends AbstractEffect
@Override
public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill)
{
return !Formulas.calcPhysicalSkillEvasion(effector, effected, skill) && Formulas.calcBlowSuccess(effector, effected, skill, _chance);
return !Formulas.calcPhysicalSkillEvasion(effector, effected, skill) && Formulas.calcBlowSuccess(effector, effected, skill, _chanceBoost);
}
@Override

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00000-00099.xml vendored
View File

@@ -1784,7 +1784,7 @@
<value level="24">977</value>
</power>
<overHit>true</overHit>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>
@@ -3290,7 +3290,7 @@
<value level="36">15</value>
<value level="37">15</value>
</criticalChance>
<chance>40</chance>
<chanceBoost>400</chanceBoost>
<overHit>true</overHit>
</effect>
<effect name="Lethal">

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00200-00299.xml vendored
View File

@@ -4554,9 +4554,10 @@
<value level="37">5479</value>
</power>
<overHit>true</overHit>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>10</halfLethal>
</effect>
</effects>

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml vendored
View File

@@ -1079,12 +1079,13 @@
<value level="10">3653</value>
</power>
<overHit>true</overHit>
<chance>25</chance>
<chanceBoost>250</chanceBoost>
</effect>
<effect name="Bluff">
<chance>80</chance>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>5</halfLethal>
</effect>
</effects>
@@ -1715,10 +1716,11 @@
<effect name="FatalBlow">
<power>5773</power>
<criticalChance>20</criticalChance>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
<overHit>true</overHit>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>15</halfLethal>
</effect>
</effects>

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00400-00499.xml vendored
View File

@@ -1210,9 +1210,10 @@
<value level="10">3653</value>
</power>
<overHit>true</overHit>
<chance>25</chance>
<chanceBoost>250</chanceBoost>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>5</halfLethal>
</effect>
</effects>

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00500-00599.xml vendored
View File

@@ -525,7 +525,7 @@
<value level="28">5479</value>
</power>
<overHit>true</overHit>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>
@@ -4201,9 +4201,10 @@
<value level="4">5199</value>
</power>
<overHit>true</overHit>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>10</halfLethal>
</effect>
</effects>

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00600-00699.xml vendored
View File

@@ -2634,9 +2634,10 @@
<effect name="FatalBlow">
<power>6969</power>
<overHit>true</overHit>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>10</halfLethal>
</effect>
</effects>

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00900-00999.xml vendored
View File

@@ -1604,7 +1604,7 @@
<effect name="FatalBlow">
<power>11234</power>
<criticalChance>30</criticalChance>
<chance>60</chance>
<chanceBoost>600</chanceBoost>
<overHit>true</overHit>
</effect>
<effect name="Lethal">

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01500-01599.xml vendored
View File

@@ -3668,7 +3668,7 @@
<effect name="FatalBlow">
<power>11234</power>
<criticalChance>30</criticalChance>
<chance>60</chance>
<chanceBoost>600</chanceBoost>
<overHit>true</overHit>
</effect>
<effect name="Lethal">

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/04000-04099.xml vendored
View File

@@ -2431,7 +2431,7 @@
<value level="11">7461</value>
<value level="12">7850</value>
</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/04100-04199.xml vendored
View File

@@ -3417,7 +3417,7 @@
<value level="11">44350</value>
<value level="12">49193</value>
</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>
@@ -4046,7 +4046,7 @@
<value level="11">73917</value>
<value level="12">81989</value>
</power>
<chance>67</chance>
<chanceBoost>670</chanceBoost>
</effect>
</effects>
</skill>

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/04500-04599.xml vendored
View File

@@ -2542,7 +2542,7 @@
<value level="11">7461</value>
<value level="12">7850</value>
</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
<effect name="DamOverTime">
<power>

24
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/04700-04799.xml vendored
View File

@@ -1082,8 +1082,8 @@
<value level="16">9648</value>
<value level="17">9830</value>
</power>
<criticalChance>30</criticalChance>
<chance>50</chance>
<criticalChance>10</criticalChance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>
@@ -2305,7 +2305,7 @@
<value level="11">44350</value>
<value level="12">49193</value>
</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>
@@ -2365,7 +2365,7 @@
<value level="11">38806</value>
<value level="12">43290</value>
</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>
@@ -2425,7 +2425,7 @@
<value level="11">20667</value>
<value level="12">23023</value>
</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>
@@ -2485,7 +2485,7 @@
<value level="11">19381</value>
<value level="12">21645</value>
</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>
@@ -2545,7 +2545,7 @@
<value level="11">18140</value>
<value level="12">20268</value>
</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>
@@ -3600,7 +3600,7 @@
<value level="11">73917</value>
<value level="12">81989</value>
</power>
<chance>67</chance>
<chanceBoost>670</chanceBoost>
</effect>
</effects>
</skill>
@@ -3660,7 +3660,7 @@
<value level="11">64677</value>
<value level="12">72150</value>
</power>
<chance>67</chance>
<chanceBoost>670</chanceBoost>
</effect>
</effects>
</skill>
@@ -3720,7 +3720,7 @@
<value level="11">34445</value>
<value level="12">38371</value>
</power>
<chance>67</chance>
<chanceBoost>670</chanceBoost>
</effect>
</effects>
</skill>
@@ -3780,7 +3780,7 @@
<value level="11">32302</value>
<value level="12">36075</value>
</power>
<chance>67</chance>
<chanceBoost>670</chanceBoost>
</effect>
</effects>
</skill>
@@ -3840,7 +3840,7 @@
<value level="11">30232</value>
<value level="12">33780</value>
</power>
<chance>67</chance>
<chanceBoost>670</chanceBoost>
</effect>
</effects>
</skill>

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/05000-05099.xml vendored
View File

@@ -2817,7 +2817,7 @@
<value level="3">7306</value>
<value level="4">8602</value>
</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
<effect name="PhysicalMute" />
</effects>
@@ -2916,15 +2916,13 @@
<effects>
<effect name="FatalBlow">
<power>6335</power>
<chance>15</chance>
<chanceBoost>150</chanceBoost>
</effect>
<effect name="Speed">
<amount>40</amount>
<mode>DIFF</mode>
</effect>
</effects>
<selfEffects>
</selfEffects>
</skill>
<skill id="5085" toLevel="1" name="Anesthesia">
<!-- Confirmed CT2.5 -->

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/05100-05199.xml vendored
View File

@@ -1309,7 +1309,7 @@
<effects>
<effect name="FatalBlow">
<power>39544</power>
<chance>115</chance>
<chanceBoost>1150</chanceBoost>
</effect>
</effects>
</skill>

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/06000-06099.xml vendored
View File

@@ -1861,7 +1861,7 @@
<value level="12">6844</value>
<value level="13">6960</value>
</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08500-08599.xml vendored
View File

@@ -1536,10 +1536,11 @@
<effect name="FatalBlow">
<power>5773</power>
<criticalChance>20</criticalChance>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
<overHit>true</overHit>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>15</halfLethal>
</effect>
</effects>

11
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml vendored
View File

@@ -799,7 +799,7 @@
</power>
<criticalChance>20</criticalChance>
<abnormalType>BLEEDING</abnormalType>
<abnormalPower>4130</abnormalPower>
<abnormalPower>4130</abnormalPower> <!-- TODO: Must have different values per level. -->
<chanceBoost>365</chanceBoost>
<overHit>true</overHit>
</effect>
@@ -859,6 +859,7 @@
</conditions>
<effects>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>15</halfLethal>
</effect>
</effects>
@@ -875,7 +876,7 @@
<value fromLevel="3" toLevel="7" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
</power>
<criticalChance>20</criticalChance>
<chance>36.5</chance>
<chanceBoost>365</chanceBoost>
<overHit>true</overHit>
</effect>
</pveEffects>
@@ -893,7 +894,7 @@
<value fromLevel="3" toLevel="7" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * (5 + subIndex)}</value>
</power>
<criticalChance>20</criticalChance>
<chance>36.5</chance>
<chanceBoost>365</chanceBoost>
<overHit>true</overHit>
</effect>
</pvpEffects>
@@ -2974,7 +2975,7 @@
</effect>
<effect name="FatalBlow">
<power>8875</power>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
</effect>
</effects>
</skill>
@@ -3162,7 +3163,7 @@
<value level="6">27993</value>
<value level="7">29472</value>
</power>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
</effect>
<effect name="Speed">
<amount>-23</amount>

17
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml vendored
View File

@@ -296,19 +296,19 @@
<skillLevel>1</skillLevel>
</effect>
</selfEffects>
<effects>
<effects>
<effect name="FatalBlow">
<power>
<value level="1">56030</value>
<value level="2">58530</value>
<value level="3">61030</value>
</power>
<criticalChance>15</criticalChance>
<chanceBoost>300</chanceBoost>
<overHit>true</overHit>
</effect>
</effects>
</skill>
<criticalChance>15</criticalChance> <!-- Guessed -->
<chanceBoost>365</chanceBoost> <!-- Guessed -->
<overHit>true</overHit> <!-- Guessed -->
</effect>
</effects>
</skill>
<skill id="10747" toLevel="1" name="Rogue - Individual Passive">
<!-- Glory Days confirmed -->
<icon>icon.skill0217</icon>
@@ -358,11 +358,12 @@
<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
</effect>
<effect name="FatalBlow">
<chance>30</chance>
<chanceBoost>300</chanceBoost>
<power>8875</power>
<overHit>true</overHit>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>15</halfLethal>
</effect>
</effects>

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11300-11399.xml vendored
View File

@@ -3737,7 +3737,7 @@
<effects>
<effect name="FatalBlow">
<!-- Guessed -->
<chance>30</chance>
<chanceBoost>300</chanceBoost>
<power>
<value level="1">45696</value>
<value level="2">47772</value>
@@ -3745,7 +3745,7 @@
</power>
</effect>
<effect name="Lethal">
<!-- Guessed -->
<fullLethal>0</fullLethal>
<halfLethal>10</halfLethal>
</effect>
</effects>
@@ -3771,7 +3771,7 @@
<effects>
<effect name="FatalBlow">
<!-- Guessed -->
<chance>30</chance>
<chanceBoost>300</chanceBoost>
<power>
<value level="1">51411</value>
<value level="2">53747</value>
@@ -3779,7 +3779,7 @@
</power>
</effect>
<effect name="Lethal">
<!-- Guessed -->
<fullLethal>0</fullLethal>
<halfLethal>10</halfLethal>
</effect>
</effects>

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14200-14299.xml vendored
View File

@@ -2857,7 +2857,7 @@
<value level="6">5029</value>
<value level="7">5479</value>
</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
<effect name="DamOverTime">
<power>100</power>

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14500-14599.xml vendored
View File

@@ -2872,9 +2872,10 @@
<effects>
<effect name="FatalBlow">
<power>7127</power>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>5</halfLethal>
</effect>
<effect name="DispelBySlot">

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14600-14699.xml vendored
View File

@@ -2238,9 +2238,10 @@
<effects>
<effect name="FatalBlow">
<power>1700</power>
<chance>30</chance>
<chanceBoost>300</chanceBoost>
</effect>
<effect name="Lethal">
<fullLethal>0</fullLethal>
<halfLethal>5</halfLethal>
</effect>
</effects>

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14900-14999.xml vendored
View File

@@ -1546,7 +1546,7 @@
</effect>
<effect name="FatalBlow">
<power>3000</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>
@@ -1674,7 +1674,7 @@
</effect>
<effect name="FatalBlow">
<power>3000</power>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/20000-20099.xml vendored
View File

@@ -64,7 +64,7 @@
<effect name="FatalBlow">
<power>3420</power>
<overHit>true</overHit>
<chance>20</chance>
<chanceBoost>200</chanceBoost>
</effect>
</effects>
</skill>

167
L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd vendored
View File

@@ -870,6 +870,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="chanceBoost" type="xs:unsignedShort" />
<xs:element name="dispel">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
@@ -1213,6 +1214,21 @@
</xs:complexType>
</xs:element>
<xs:element name="side" type="xs:string" />
<xs:element name="fullLethal">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PARALYZE">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
@@ -1554,21 +1570,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="fullLethal">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="itemId">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
@@ -2014,7 +2015,6 @@
</xs:complexType>
</xs:element>
<xs:element name="allowNormalAttack" type="xs:boolean" />
<xs:element name="chanceBoost" type="xs:unsignedShort" />
<xs:element name="saveHp" type="xs:unsignedByte" />
<xs:element name="attackSkillId" type="xs:unsignedShort" />
<xs:element name="summonPoints" type="xs:unsignedByte" />
@@ -2073,6 +2073,7 @@
<xs:element name="addedSkillId" type="xs:unsignedShort" />
<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
<xs:element name="skills" type="xs:string" />
<xs:element name="pAtkMod" type="xs:unsignedByte" />
<xs:element name="isSummonSpawn" type="xs:boolean" />
<xs:element name="randomOffset" type="xs:unsignedByte" />
<xs:element name="AGGRESSION">
@@ -2108,7 +2109,6 @@
</xs:element>
<xs:element name="damageModifier" type="xs:decimal" />
<xs:element name="animationSpeed" type="xs:unsignedShort" />
<xs:element name="pAtkMod" type="xs:unsignedByte" />
</xs:choice>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
@@ -2477,22 +2477,6 @@
<xs:element name="effect">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="amount">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="attribute" type="xs:string" />
<xs:element minOccurs="0" name="ON_MAGIC_SKILL" />
<xs:element minOccurs="0" name="ON_CRITICAL_SKILL" />
<xs:element minOccurs="0" name="ON_EQUIP" />
@@ -2619,7 +2603,6 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="criticalChance" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="chance" type="xs:decimal" />
<xs:element minOccurs="0" name="abnormalType" type="xs:string" />
<xs:element minOccurs="0" name="abnormalPower">
<xs:complexType>
@@ -2656,63 +2639,65 @@
<xs:element maxOccurs="unbounded" name="effect">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="minDamage" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="magicTypes" type="xs:string" />
<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="amount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="slot" type="xs:string" />
<xs:element minOccurs="0" name="attribute" type="xs:string" />
<xs:element minOccurs="0" name="mode" type="xs:string" />
<xs:element minOccurs="0" name="model" type="xs:string" />
<xs:element minOccurs="0" name="power">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="criticalChance" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="chance" type="xs:decimal" />
<xs:element minOccurs="0" name="isCritical" type="xs:boolean" />
<xs:element minOccurs="0" name="allowSkillAttack" type="xs:boolean" />
<xs:element minOccurs="0" name="allowNormalAttack" type="xs:boolean" />
<xs:element minOccurs="0" name="targetType" type="xs:string" />
<xs:element minOccurs="0" name="affectScope" type="xs:string" />
<xs:element minOccurs="0" name="staticChance" type="xs:boolean" />
<xs:element minOccurs="0" name="abnormalType" type="xs:string" />
<xs:element minOccurs="0" name="abnormalPower" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="chanceBoost" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="overHit" type="xs:boolean" />
<xs:element minOccurs="0" name="ticks" type="xs:unsignedByte" />
<xs:choice maxOccurs="unbounded">
<xs:element name="minDamage" type="xs:unsignedByte" />
<xs:element name="chance" type="xs:unsignedByte" />
<xs:element name="staticChance" type="xs:boolean" />
<xs:element name="magicTypes" type="xs:string" />
<xs:element name="skillId" type="xs:unsignedShort" />
<xs:element name="skillLevel" type="xs:unsignedByte" />
<xs:element name="fullLethal" type="xs:unsignedByte" />
<xs:element name="halfLethal" type="xs:unsignedByte" />
<xs:element name="amount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="slot" type="xs:string" />
<xs:element name="attribute" type="xs:string" />
<xs:element name="mode" type="xs:string" />
<xs:element name="model" type="xs:string" />
<xs:element name="power">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="criticalChance" type="xs:unsignedByte" />
<xs:element name="abnormalType" type="xs:string" />
<xs:element name="abnormalPower" type="xs:unsignedShort" />
<xs:element name="chanceBoost" type="xs:unsignedShort" />
<xs:element name="overHit" type="xs:boolean" />
<xs:element name="ticks" type="xs:unsignedByte" />
<xs:element name="isCritical" type="xs:boolean" />
<xs:element name="allowSkillAttack" type="xs:boolean" />
<xs:element name="allowNormalAttack" type="xs:boolean" />
<xs:element name="targetType" type="xs:string" />
<xs:element name="affectScope" type="xs:string" />
</xs:choice>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />