Added physicalSkillPowerAdd, mCritPowerAdd, reflectDamageRes and receivedDamageModifier stats.

New Talismans.

trunk/dist/game/data/buylists/custom/0011072.xml

@@ -18,4 +18,5 @@
 	<item id="34987" price="0" />
 	<item id="34988" price="0" />
 	<item id="34989" price="0" />
+	<item id="39572" price="0" />
 </list>

trunk/dist/game/data/stats/items/34900-34999.xml

@@ -572,7 +572,18 @@
 		<!-- Increases Max HP/MP/CP by 100, P. Accuracy and M. Accuracy by 1, P. Evasion and M. Evasion by 1 Vampiric Rage Effect by 2%, and Atk. Spd. and Casting Spd. by 10. -->
 		<set name="icon" val="icon.accessory_immortal_talisman_i01" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="deco1" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="13384-1" />
+		<set name="item_skill" val="8864-1" />
+		<set name="useSkillDisTime" val="6" />
 	</item>
 	<item id="34985" name="Talisman - Destruction" additionalName="" type="Armor">
 		<set name="icon" val="icon.accessory_destruction_talisman_i01" />
@@ -586,6 +597,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="13385-1" />
 		<set name="item_skill" val="8864-2" />
 		<set name="useSkillDisTime" val="6" />
 	</item>
@@ -593,25 +605,69 @@
 		<!-- Increases Max HP/MP/CP by 300, P. Accuracy and M. Accuracy by 2, P. Evasion and M. Evasion by 2, Vampiric Rage Effect by 3%, Atk. Spd. and Casting Spd. by 20, P. Critical Rate by 30, M. Critical Rate by 10, P. Atk. by 103, and M. Atk. by 156. -->
 		<set name="icon" val="icon.accessory_extermination_talisman_i01" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="deco1" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="13386-1" />
+		<set name="item_skill" val="8864-3" />
+		<set name="useSkillDisTime" val="6" />
 	</item>
 	<item id="34987" name="Talisman - Hellfire" additionalName="" type="Armor">
 		<!-- When equipped, increases Max HP, MP, and CP by 400, P. and M. Accuracy by 2, P. and M. Evasion by 2, Vampiric Rage 3% effect, Atk. Spd. and Casting Spd. by 30, Critical Rate by 30, M. Critical Rate by 10, P. Atk. by 103, M. Atk. by 156, Skill Power by 1%, Damage Reflect Resistance by 10, and P. and M. Def. by 20. -->
 		<set name="icon" val="icon.accessory_hellfire_talisman_i01" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="deco1" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="13387-1" />
+		<set name="item_skill" val="8864-4" />
+		<set name="useSkillDisTime" val="6" />
 	</item>
 	<item id="34988" name="Talisman - Desire" additionalName="" type="Armor">
 		<!-- When equipped, increases Max HP, MP, and CP by 500, P. and M. Accuracy by 2, P. and M. Evasion by 2, Vampiric Rage 3% effect, Atk. Spd. and Casting Spd. by 40, Critical Rate by 30, M. Critical Rate by 10, P. Atk. by 203, M. Atk. by 256, Skill Power by 2%, Damage Reflect Resistance by 20, and P. and M. Def. by 40. MP consumption decreases by 1%. -->
 		<set name="icon" val="icon.accessory_ocean_talisman_i01" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="deco1" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="13388-1" />
+		<set name="item_skill" val="8864-5" />
+		<set name="useSkillDisTime" val="6" />
 	</item>
 	<item id="34989" name="Talisman - Longing" additionalName="" type="Armor">
 		<!-- When equipped, increases Max HP, MP, and CP by 600, P. and M. Accuracy by 2, P. and M. Evasion by 2, Vampiric Rage 3% effect, Atk. Spd. and Casting Spd. by 50, Critical Rate by 30, M. Critical Rate by 10, P. Atk. by 303, M. Atk. by 356, Skill Power by 4%, Damage Reflect Resistance by 30, and P. M. Def. by 60, and STR/INT/CON/MEN/DEX/WIT by 2. MP consumption decreases by 3%. -->
 		<set name="icon" val="icon.accessory_longing_talisman_i01" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="deco1" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="13389-1" />
+		<set name="item_skill" val="8864-6" />
+		<set name="useSkillDisTime" val="6" />
 	</item>
 	<item id="34990" name="Corroded Weapon Fragment" additionalName="" type="EtcItem">
 		<!-- Corroded ingredient. Sell it to a store or trade it in through the Aden Reconstruction Society for a new ingredient. -->

trunk/dist/game/data/stats/items/39500-39599.xml

@@ -381,7 +381,18 @@
 		<!-- Max HP/MP/CP + 800, P./M. Accuracy + 2, P./M. Evasion + 2, Atk./Casting Spd. + 60, P. Critical Rate + 30, M. Critical Rate + 10, P. Atk. + 638, M. Atk. + 742, Skill Power + 5%, Damage Reflect Resistance + 30, P. Def. + 563, M. Def. + 368, Fixed Damage Resistance + 10%, Vampiric Rage + 5, STR/INT/CON/MEN/DEX/WIT/CHA/LUC + 2. Skill MP Consumption - 3%, Skill Cooldown - 3%. -->
 		<set name="icon" val="icon.accessory_punishment_talisman_i01" />
 		<set name="default_action" val="EQUIP" />
+		<set name="bodypart" val="deco1" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_destroyable" val="false" />
+		<set name="equip_skill" val="17978-1" />
+		<set name="item_skill" val="8864-7" />
+		<set name="useSkillDisTime" val="6" />
 	</item>
 	<item id="39573" name="Sealed Talisman - Insanity" additionalName="" type="EtcItem">
 		<!-- Double-click to obtain a Talisman - Insanity. Cannot be exchanged, dropped, or sold in a private store once open. Lv. 85 or above. -->

trunk/dist/game/data/stats/skills/08800-08899.xml

@@ -448,14 +448,75 @@
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
 	</skill>
-	<skill id="8864" levels="7" name="Talisman - Infinity">
+	<skill id="8864" levels="7" name="Talisman">
-		<!-- AUTO GENERATED SKILL -->
+		<!-- Level 1 : Talisman - Infinity : Increases Max HP/MP/CP by 100, P. Accuracy and M. Accuracy by 1, P. Evasion and M. Evasion by 1, Vampiric Rage by 2%, and Atk. Spd. And Casting Spd. By 10 when equipped. -->
-		<!-- Increases Max HP/MP/CP by 100, P. Accuracy and M. Accuracy by 1, P. Evasion and M. Evasion by 1, Vampiric Rage by 2%, and Atk. Spd. And Casting Spd. By 10 when equipped. -->
+		<!-- Level 2 : Talisman - Destruction : Increases Max HP/MP/CP by 100, P. Accuracy and M. Accuracy by 2, P. Evasion and M. Evasion by 2, Vampiric Rage by 2%, Atk. Spd. And Casting Spd. By 10, P. Critical Rate by 30, and M. Critical Rate by 10 when equipped. -->
+		<!-- Level 3 : Talisman - Annihilation : Increases Max HP/MP/CP by 300, P. Accuracy and M. Accuracy by 2, P. Evasion and M. Evasion by 2, Vampiric Rage by 3%, Atk. Spd. And Casting Spd. By 20, P. Critical Rate by 30, M. Critical Rate by 10, P. Atk. By 103, and M. Atk. by 156 when equipped. -->
+		<!-- Level 4 : Talisman - Hellfire : Increases Max HP/MP/CP by 400, P. Accuracy and M. Accuracy by 2, P. Evasion and M. Evasion by 2, Vampiric Rage by 3%, Atk. Spd. And Casting Spd. By 30, P. Critical Rate by 30, M. Critical Rate by 10, P. Atk. By 103, M. Atk. by 156, Skill Attacks by 1%, Damage Reflect Resistance by 10, and P. Def. and M. Def. by 20 when equipped. -->
+		<!-- Level 5 : Talisman - Desire : Increases Max HP/MP/CP by 500, P. Accuracy and M. Accuracy by 2, P. Evasion and M. Evasion by 2, Vampiric Rage by 3%, Atk. Spd. And Casting Spd. By 40, P. Critical Rate by 30, M. Critical Rate by 10, P. Atk. By 203, M. Atk. by 256, Skill Attacks by 2%, Damage Reflect Resistance by 20, and P. Def. and M. Def. by 40, and decreases MP Consumption for skills by 1%  when equipped. -->
+		<!-- Level 6 : Talisman - Longing : Increases Max HP/MP/CP by 600, P. Accuracy and M. Accuracy by 2, P. Evasion and M. Evasion by 2, Vampiric Rage by 3%, Atk. Spd. And Casting Spd. By 50, P. Critical Rate by 30, M. Critical Rate by 10, P. Atk. By 303, M. Atk. by 356, Skill Attacks by 4%, Damage Reflect Resistance by 30, P. Def. and M. Def. by 60, and STR/INT/CON/MEN/DEX/WIT by 2, and decreases MP Consumption for skills by 3%  when equipped. -->
+		<!-- Level 7 : Talisman - Insanity : Max HP/MP/CP + 800, P./M. Accuracy + 2, P./M. Evasion + 2, Vampiric Rage + 5,  Atk. Spd. + 60, Casting Spd. + 60, P. Critical Rate + 30, M. Critical Rate + 10, P. Atk. + 638, M. Atk. + 742, Skill Power + 5%, Damage Reflect Resistance + 30, P. Def. + 563, M. Def. + 368, All Stats + 2, and Fixed Damage Resistance + 10%. Skill MP Consumption - 3%, and Skill Cooldown - 3%. -->
 		<table name="#icons"> icon.r85_talisman_pa_up_passive icon.r85_talisman_pa_up_passive icon.r85_talisman_pa_up_passive icon.r85_talisman_pa_up_passive icon.r85_talisman_pa_up_passive icon.r85_talisman_pa_up_passive icon.accessory_punishment_talisman_i01 </table>
+		<table name="#abnormalVisualEffect"> TALISMAN_DECO_DARK_PURPLE TALISMAN_DECO_DARK_PURPLE TALISMAN_DECO_GOLD TALISMAN_DECO_ORANGE TALISMAN_DECO_BLUE TALISMAN_DECO_LIGHT_PURPLE TALISMAN_DECO_DARK_PURPLE </table>
+		<table name="#maxHpMpCp"> 100 100 300 400 500 600 800 </table>
+		<table name="#addAccEvas"> 1 2 2 2 2 2 2 </table>
+		<table name="#absorbDam"> 2 2 3 3 3 3 5 </table>
+		<table name="#atkSpeed"> 10 10 20 30 40 50 60 </table>
+		<table name="#rCrit"> 0 30 30 30 30 30 30 </table>
+		<table name="#mCritRate"> 0 10 10 10 10 10 10 </table>
+		<table name="#pAtk"> 0 0 103 103 203 303 638 </table>
+		<table name="#mAtk"> 0 0 156 156 256 356 742 </table>
+		<table name="#physicalSkillPower"> 1 1 1 1.01 1.02 1.04 1.05 </table>
+		<table name="#reflectDamageRes"> 0 0 0 10 20 30 30 </table>
+		<table name="#pDef"> 0 0 0 20 40 60 563 </table>
+		<table name="#mDef"> 0 0 0 20 40 60 368 </table>
+		<table name="#mpConsumeRate"> 1 1 1 1 0.99 0.97 0.97 </table>
+		<table name="#statAdd"> 0 0 0 0 0 2 2 </table>
+		<table name="#statAdd2"> 0 0 0 0 0 0 2 </table>
+		<table name="#receivedDamageModifier"> 1 1 1 1 1 1 0.9 </table>
+		<table name="#reuse"> 1 1 1 1 1 1 0.97 </table>
 		<set name="icon" val="#icons" />
+		<set name="abnormalVisualEffect" val="#abnormalVisualEffect" />
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
+		<for>
+			<effect name="Buff">
+				<add stat="maxCp" val="#maxHpMpCp" />
+				<add stat="maxCp" val="#maxHpMpCp" />
+				<add stat="maxCp" val="#maxHpMpCp" />
+				<add stat="accCombat" val="#addAccEvas" />
+				<add stat="accMagic" val="#addAccEvas" />
+				<add stat="pSkillEvas" val="#addAccEvas" />
+				<add stat="mEvas" val="#addAccEvas" />
+				<add stat="absorbDam" val="#absorbDam" />
+				<add stat="pAtkSpd" val="#atkSpeed" />
+				<add stat="mAtkSpd" val="#atkSpeed" />
+				<add stat="rCrit" val="#rCrit" />
+				<add stat="mCritRate" val="#mCritRate" />
+				<add stat="pAtk" val="#pAtk" />
+				<add stat="mAtk" val="#mAtk" />
+				<mul stat="physicalSkillPower" val="#physicalSkillPower" />
+				<add stat="reflectDamageRes" val="#reflectDamageRes" />
+				<add stat="pDef" val="#pDef" />
+				<add stat="mDef" val="#mDef" />
+				<mul stat="PhysicalMpConsumeRate" val="#mpConsumeRate" />
+				<mul stat="MagicalMpConsumeRate" val="#mpConsumeRate" />
+				<mul stat="DanceMpConsumeRate" val="#mpConsumeRate" />
+				<add stat="STR" val="#statAdd" />
+				<add stat="INT" val="#statAdd" />
+				<add stat="CON" val="#statAdd" />
+				<add stat="MEN" val="#statAdd" />
+				<add stat="WIT" val="#statAdd" />
+				<add stat="DEX" val="#statAdd" />
+				<add stat="LUC" val="#statAdd2" />
+				<add stat="CHA" val="#statAdd2" />
+				<mul stat="receivedDamageModifier" val="#receivedDamageModifier" />
+				<mul stat="pReuse" val="#reuse" />
+				<mul stat="mReuse" val="#reuse" />
+				<mul stat="dReuse" val="#reuse" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="8870" levels="1" name="Tauti's Ring">
 		<!-- AUTO GENERATED SKILL -->

trunk/dist/game/data/stats/skills/13300-13399.xml

@@ -744,7 +744,7 @@
 		<!-- AUTO GENERATED SKILL -->
 		<!-- Talisman - Infinity burns with power. -->
 		<set name="icon" val="icon.accessory_immortal_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>
@@ -752,7 +752,7 @@
 		<!-- AUTO GENERATED SKILL -->
 		<!-- Talisman - Destruction burns with power. -->
 		<set name="icon" val="icon.accessory_destruction_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>
@@ -760,7 +760,7 @@
 		<!-- AUTO GENERATED SKILL -->
 		<!-- Talisman - Annihilation burns with power. -->
 		<set name="icon" val="icon.accessory_extermination_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>
@@ -768,7 +768,7 @@
 		<!-- AUTO GENERATED SKILL -->
 		<!-- Talisman - Hellfire burns with power. -->
 		<set name="icon" val="icon.accessory_hellfire_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>
@@ -776,7 +776,7 @@
 		<!-- AUTO GENERATED SKILL -->
 		<!-- Talisman - Desire burns with power. -->
 		<set name="icon" val="icon.accessory_ocean_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>
@@ -784,7 +784,7 @@
 		<!-- AUTO GENERATED SKILL -->
 		<!-- Talisman - Longing burns with power. -->
 		<set name="icon" val="icon.accessory_longing_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>

trunk/dist/game/data/stats/skills/17900-17999.xml

@@ -915,10 +915,9 @@
 		<set name="reuseDelay" val="1200000" />
 	</skill>
 	<skill id="17978" levels="1" name="Equip Talisman - Insanity">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- The Talisman pulsates with power. -->
 		<set name="icon" val="icon.accessory_punishment_talisman_i01" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="TOGGLE" />
 		<set name="targetType" val="SELF" />
 		<set name="isMagic" val="3" />
 	</skill>

trunk/dist/game/data/xsd/skills.xsd

@@ -313,11 +313,13 @@
 			<xs:enumeration value="transDamToPlayer" />
 			<xs:enumeration value="vengeancePdam" />
 			<xs:enumeration value="physicalSkillPower" />
+			<xs:enumeration value="physicalSkillPowerAdd" />
 			<xs:enumeration value="vengeanceMdam" />
 			<xs:enumeration value="maxSouls" />
 			<xs:enumeration value="BowMpConsumeRate" />
 			<xs:enumeration value="fishingExpertise" />
 			<xs:enumeration value="mCritPower" />
+			<xs:enumeration value="mCritPowerAdd" />
 			<xs:enumeration value="maxRecoverableCp" />
 			<xs:enumeration value="maxRecoverableHp" />
 			<xs:enumeration value="whLimit" />
@@ -384,6 +386,8 @@
 			<xs:enumeration value="waterRes" />
 			<xs:enumeration value="windRes" />
 			<xs:enumeration value="magicSuccRes" />
+			<xs:enumeration value="reflectDamageRes" />
+			<xs:enumeration value="receivedDamageModifier" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="addType" mixed="true">

trunk/dist/game/data_classic/xsd/skills.xsd

@@ -313,11 +313,13 @@
 			<xs:enumeration value="transDamToPlayer" />
 			<xs:enumeration value="vengeancePdam" />
 			<xs:enumeration value="physicalSkillPower" />
+			<xs:enumeration value="physicalSkillPowerAdd" />
 			<xs:enumeration value="vengeanceMdam" />
 			<xs:enumeration value="maxSouls" />
 			<xs:enumeration value="BowMpConsumeRate" />
 			<xs:enumeration value="fishingExpertise" />
 			<xs:enumeration value="mCritPower" />
+			<xs:enumeration value="mCritPowerAdd" />
 			<xs:enumeration value="maxRecoverableCp" />
 			<xs:enumeration value="maxRecoverableHp" />
 			<xs:enumeration value="whLimit" />
@@ -384,6 +386,8 @@
 			<xs:enumeration value="waterRes" />
 			<xs:enumeration value="windRes" />
 			<xs:enumeration value="magicSuccRes" />
+			<xs:enumeration value="reflectDamageRes" />
+			<xs:enumeration value="receivedDamageModifier" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="addType" mixed="true">

trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5006,7 +5006,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				{
 					// Reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary
 					double reflectPercent = target.getStat().calcStat(Stats.REFLECT_DAMAGE_PERCENT, 0, null, null);
-					
 					if (reflectPercent > 0)
 					{
 						reflectedDamage = (int) ((reflectPercent / 100.) * damage);
@@ -5016,6 +5015,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 							reflectedDamage = target.getMaxHp();
 						}
 					}
+					
+					// Reflect resistance
+					double reflectResistance = target.getStat().calcStat(Stats.REFLECT_DAMAGE_RESISTANCE, 0, null, null);
+					if (reflectResistance > 0)
+					{
+						reflectedDamage -= reflectResistance;
+					}
 				}
 			}
 			
@@ -6472,13 +6478,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void reduceCurrentHp(double i, L2Character attacker, boolean awake, boolean isDOT, Skill skill)
 	{
+		// Damage modifier
+		final double damage = getStat().calcStat(Stats.RECEIVED_DAMAGE_MODIFIER, i, null, null);
+		
 		if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && (Config.L2JMOD_CHAMPION_HP != 0))
 		{
-			getStatus().reduceHp(i / Config.L2JMOD_CHAMPION_HP, attacker, awake, isDOT, false);
+			getStatus().reduceHp((damage / Config.L2JMOD_CHAMPION_HP), attacker, awake, isDOT, false);
 		}
 		else
 		{
-			getStatus().reduceHp(i, attacker, awake, isDOT, false);
+			getStatus().reduceHp(damage, attacker, awake, isDOT, false);
 		}
 	}
 	

trunk/java/com/l2jserver/gameserver/model/skills/AbnormalVisualEffect.java

@@ -91,6 +91,7 @@ public enum AbnormalVisualEffect
 	HERB_OF_POWER(69),
 	HERB_OF_MAGIC(70),
 	TALISMAN_DECO_DARK_PURPLE(71),
+	TALISMAN_POWER2(72), // removed?
 	TALISMAN_DECO_GOLD(73),
 	TALISMAN_DECO_ORANGE(74),
 	TALISMAN_DECO_BLUE(75),

trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -827,6 +827,13 @@ public final class Formulas
 				}
 			}
 		}
+		
+		// Physical skill dmg add
+		if (skill != null)
+		{
+			damage += attacker.calcStat(Stats.PHYSICAL_SKILL_POWER_ADD, 0, null, null);
+		}
+		
 		return damage;
 	}
 	
@@ -936,6 +943,13 @@ public final class Formulas
 				}
 			}
 		}
+		
+		// Magical Crit dmg add
+		if (mcrit)
+		{
+			damage += attacker.calcStat(Stats.MAGIC_CRIT_DMG_ADD, 0, null, null);
+		}
+		
 		return damage;
 	}
 	

trunk/java/com/l2jserver/gameserver/model/stats/Stats.java

@@ -47,6 +47,7 @@ public enum Stats
 	POWER_ATTACK("pAtk"),
 	MAGIC_ATTACK("mAtk"),
 	PHYSICAL_SKILL_POWER("physicalSkillPower"),
+	PHYSICAL_SKILL_POWER_ADD("physicalSkillPowerAdd"),
 	POWER_ATTACK_SPEED("pAtkSpd"),
 	MAGIC_ATTACK_SPEED("mAtkSpd"), // Magic Skill Casting Time Rate
 	ATK_REUSE("atkReuse"), // Bows Hits Reuse Rate
@@ -57,6 +58,7 @@ public enum Stats
 	CRITICAL_DAMAGE("cAtk"),
 	CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
 	MAGIC_CRIT_DMG("mCritPower"),
+	MAGIC_CRIT_DMG_ADD("mCritPowerAdd"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_DMG("pvpPhysDmg"),
@@ -147,6 +149,7 @@ public enum Stats
 	REFLECT_DAMAGE_PERCENT("reflectDam"),
 	REFLECT_SKILL_MAGIC("reflectSkillMagic"),
 	REFLECT_SKILL_PHYSIC("reflectSkillPhysic"),
+	REFLECT_DAMAGE_RESISTANCE("reflectDamageRes"),
 	VENGEANCE_SKILL_MAGIC_DAMAGE("vengeanceMdam"),
 	VENGEANCE_SKILL_PHYSICAL_DAMAGE("vengeancePdam"),
 	ABSORB_DAMAGE_PERCENT("absorbDam"),
@@ -154,6 +157,7 @@ public enum Stats
 	MANA_SHIELD_PERCENT("manaShield"),
 	TRANSFER_DAMAGE_TO_PLAYER("transDamToPlayer"),
 	ABSORB_MANA_DAMAGE_PERCENT("absorbDamMana"),
+	RECEIVED_DAMAGE_MODIFIER("receivedDamageModifier"),
 	
 	WEIGHT_LIMIT("weightLimit"),
 	WEIGHT_PENALTY("weightPenalty"),