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

-Implemented some Jewel Boxes.

Browse Source 
-Added SummonDebuff effect for Golden Lion & Lumi summons (apply on summoner when summon).
-Added stat hpRestoreOnKill - restoring n% hp when kill a enemy (mob or player) - example: Berserker skill.
-Updated id 10000-10279 range skills.
-Update TriggerForce effect for Rolling Thunder skill.

Contributed by NviX.
This commit is contained in:
MobiusDev 2015-07-12 21:19:09 +00:00
parent 747334ab81
commit 12b76e722e
16 changed files with 1199 additions and 577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trunk/.settings/org.eclipse.jdt.core.prefs
View File

@ -406,3 +406,4 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

5
trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -18,14 +18,14 @@
*/
package handlers;
import handlers.effecthandlers.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jserver.gameserver.handler.EffectHandler;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import handlers.effecthandlers.*;
/**
* Effect Master handler.
* @author BiggBoss, Zoey76
@ -175,6 +175,7 @@ public final class EffectMasterHandler
Summon.class,
SummonAgathion.class,
SummonCubic.class,
SummonDebuff.class,
SummonNpc.class,
SummonPet.class,
SummonTrap.class,

3
trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java vendored
View File

@ -48,7 +48,8 @@ public final class FocusMaxEnergy extends AbstractEffect
{
final Skill sonicMastery = info.getEffected().getSkills().get(992);
final Skill focusMastery = info.getEffected().getSkills().get(993);
int maxCharge = (sonicMastery != null) ? sonicMastery.getLevel() : (focusMastery != null) ? focusMastery.getLevel() : 0;
final Skill maximumForceMastery = info.getEffected().getSkills().get(10301);
int maxCharge = (sonicMastery != null) ? sonicMastery.getLevel() : (focusMastery != null) ? focusMastery.getLevel() : (maximumForceMastery != null) ? 15 : 0;
if (maxCharge != 0)
{
int count = maxCharge - info.getEffected().getActingPlayer().getCharges();

7
trunk/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@ -28,6 +28,7 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.BuffInfo;
/**
@ -42,6 +43,7 @@ public final class Summon extends AbstractEffect
private final int _lifeTime;
private final int _consumeItemInterval;
private final int _summonPoints;
private final SkillHolder _debuff;
public Summon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
@ -58,6 +60,7 @@ public final class Summon extends AbstractEffect
_consumeItemInterval = params.getInt("consumeItemInterval", 0);
_lifeTime = params.getInt("lifeTime", 3600) * 1000;
_summonPoints = params.getInt("summonPoints", 0);
_debuff = new SkillHolder(params.getInt("debuffId", 0), 1);
}
@Override
@ -115,5 +118,9 @@ public final class Summon extends AbstractEffect
summon.setShowSummonAnimation(true);
summon.setRunning();
summon.spawnMe();
if (_debuff.getSkillId() != 0)
{
_debuff.getSkill().applyEffects(player, player);
}
}
}

69
trunk/dist/game/data/scripts/handlers/effecthandlers/SummonDebuff.java vendored Normal file
View File

@ -0,0 +1,69 @@
/*
* Copyright (C) 2004-2015 L2J Server
*
* This file is part of L2J Server.
*
* L2J Server 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.
*
* L2J Server 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 <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
/**
* @author NviX
*/
public final class SummonDebuff extends AbstractEffect
{
private static final int PRICE_OF_SUMMONING_LION = 10061;
private static final int PRICE_OF_SUMMONING_LUMI = 11818;
/**
* @param attachCond
* @param applyCond
* @param set
* @param params
*/
public SummonDebuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
}
@Override
public boolean onActionTime(BuffInfo info)
{
L2PcInstance player = info.getEffected().getActingPlayer();
if (player.hasSummon())
{
if (player.getEffectList().isAffectedBySkill(PRICE_OF_SUMMONING_LION))
{
Skill skill = SkillData.getInstance().getSkill(PRICE_OF_SUMMONING_LION, 1);
skill.applyEffects(player, player);
return true;
}
else if (player.getEffectList().isAffectedBySkill(PRICE_OF_SUMMONING_LUMI))
{
Skill skill = SkillData.getInstance().getSkill(PRICE_OF_SUMMONING_LUMI, 1);
skill.applyEffects(player, player);
return true;
}
}
return false;
}
}

19
trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java vendored
View File

@ -58,6 +58,7 @@ public final class TriggerForce extends AbstractEffect
private static final int RESISTANCE_AURA = 10035;
private static final int RECOVERY_AURA = 10037;
private static final int SPIRIT_AURA = 10039;
private static final int ROLLING_THUNDER = 10287;
/**
* @param attachCond
@ -100,7 +101,7 @@ public final class TriggerForce extends AbstractEffect
}
else
{
if (_skill.getSkillId() != RAGE_AURA)
if ((_skill.getSkillId() != RAGE_AURA) && (_skill.getSkillId() != ROLLING_THUNDER))
{
_skill.getSkill().applyEffects(effector, effector);
}
@ -117,8 +118,8 @@ public final class TriggerForce extends AbstractEffect
{
return false;
}
// apply Rage Aura to enemies
if (_skill.getSkillId() == RAGE_AURA)
// apply offensive aura to enemies
if ((_skill.getSkillId() == RAGE_AURA) || (_skill.getSkillId() == ROLLING_THUNDER))
{
final boolean srcInArena = (effector.isInsideZone(ZoneId.PVP) && (!effector.isInsideZone(ZoneId.SIEGE)));
for (L2Character obj : effector.getKnownList().getKnownCharactersInRadius(200))
@ -130,7 +131,7 @@ public final class TriggerForce extends AbstractEffect
}
}
}
// remove Rage Aura from enemies who not in affect radius
// remove offensive aura from enemies who not in affect radius
if (!_affectedObjects.isEmpty())
{
for (L2Character obj : _affectedObjects)
@ -141,6 +142,10 @@ public final class TriggerForce extends AbstractEffect
{
obj.getEffectList().remove(true, obj.getEffectList().getBuffInfoBySkillId(RAGE_AURA));
}
if (obj.getEffectList().isAffectedBySkill(ROLLING_THUNDER))
{
obj.getEffectList().remove(true, obj.getEffectList().getBuffInfoBySkillId(ROLLING_THUNDER));
}
_affectedObjToRemove.add(obj);
}
}
@ -167,7 +172,7 @@ public final class TriggerForce extends AbstractEffect
{
_affectedMembers.add(member);
}
if (!member.getEffectList().isAffectedBySkill(_skill.getSkillId()) && (member.calculateDistance(effector, true, false) < 900) && (_skill.getSkillId() != RAGE_AURA))
if (!member.getEffectList().isAffectedBySkill(_skill.getSkillId()) && (member.calculateDistance(effector, true, false) < 900) && (_skill.getSkillId() != RAGE_AURA) && (_skill.getSkillId() != ROLLING_THUNDER))
{
if ((member != effector))
{
@ -299,6 +304,10 @@ public final class TriggerForce extends AbstractEffect
{
obj.getEffectList().remove(true, obj.getEffectList().getBuffInfoBySkillId(RAGE_AURA));
}
if (obj.getEffectList().isAffectedBySkill(ROLLING_THUNDER))
{
obj.getEffectList().remove(true, obj.getEffectList().getBuffInfoBySkillId(ROLLING_THUNDER));
}
}
_affectedObjects.clear();
_affectedObjToRemove.clear();

66
trunk/dist/game/data/stats/items/38900-38999.xml vendored
View File

@ -195,59 +195,103 @@
<set name="is_sellable" val="false" />
</item>
<item id="38932" name="La Vie En Rose's Ruby Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Ruby. -->
<set name="icon" val="icon.etc_bm_jewelbox_ruby_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38855,1,1,100" />
</item>
<item id="38933" name="La Vie En Rose's Sapphire Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Sapphire. -->
<set name="icon" val="icon.etc_bm_jewelbox_sapphire_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38927,1,1,100" />
</item>
<item id="38934" name="La Vie En Rose's Topaz Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Topaz. -->
<set name="icon" val="icon.etc_bm_jewelbox_topaz_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38850,1,1,100" />
</item>
<item id="38935" name="La Vie En Rose's Opal Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Opal. -->
<set name="icon" val="icon.etc_bm_jewelbox_opal_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38875,1,1,100" />
</item>
<item id="38936" name="La Vie En Rose's Obsidian Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Obsidian. -->
<set name="icon" val="icon.etc_bm_jewelbox_obsidian_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38870,1,1,100" />
</item>
<item id="38937" name="La Vie En Rose's Diamond Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Diamond. -->
<set name="icon" val="icon.etc_bm_jewelbox_diamond_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38890,1,1,100" />
</item>
<item id="38938" name="La Vie En Rose's Emerald Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Emerald. -->
<set name="icon" val="icon.etc_bm_jewelbox_emerald_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38880,1,1,100" />
</item>
<item id="38939" name="La Vie En Rose's Aquamarine Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Aquamarine. -->
<set name="icon" val="icon.etc_bm_jewelbox_aquamarine_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38885,1,1,100" />
</item>
<item id="38940" name="La Vie En Rose's Pearl Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire a Lv. 1 Pearl. -->
<set name="icon" val="icon.etc_bm_jewelbox_pearl_i00" />
<set name="default_action" val="PEEL" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<set name="capsuled_items" val="38895,1,1,100" />
</item>
<item id="38941" name="La Vie En Rose's Jewelry Box" additionalName="" type="EtcItem">
<!-- Double-click to acquire 1 of La Vie En Rose's jewels. -->
<set name="icon" val="icon.etc_bm_jewelbox_main_i00" />
<set name="default_action" val="CAPSULE" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ItemSkills" />
<set name="item_skill" val="17824-1" />
</item>
<item id="38942" name="La Vie En Rose's Jewelry Pack" additionalName="" type="EtcItem">
<!-- Double-click to acquire 10 La Vie En Rose's Jewelry Boxes. -->
<set name="icon" val="icon.etc_bm_jewelbox_main_i00" />
<set name="default_action" val="CAPSULE" />
<set name="immediate_effect" val="true" />
<set name="is_premium" val="true" />
<set name="is_stackable" val="true" />
<set name="handler" val="ItemSkills" />
<set name="item_skill" val="26211-1" />
</item>
<item id="38943" name="La Vie En Rose's Noble Brooch Chest" additionalName="" type="EtcItem">
<!-- Double-click to acquire 1 La Vie En Rose's Noble Brooch. -->

911
trunk/dist/game/data/stats/skills/10000-10099.xml vendored
View File

File diff suppressed because it is too large Load Diff

62
trunk/dist/game/data/stats/skills/10100-10199.xml vendored
View File

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
<!-- Level 1 : For 1 min., P./M. Def. +50%, Attribute Resistance + 10, Speed + 10. When equipped with a sword or blunt weapon, Accuracy + 4, Atk. Spd. + 10%, Critical Rate + 30, Critical Damage + 30%. -->
<!-- Level 2 : For 1 min., P./M. Def. +70%, Attribute Resistance + 20, Speed + 20. When equipped with a sword or blunt weapon, Accuracy + 6, Atk. Spd. + 20%, Critical Rate + 40, Critical Damage + 40%. -->
<!-- Level 3 : For 1 min., P./M. Def. +100%, Attribute Resistance + 25, Speed + 25. When equipped with a sword or blunt weapon, Accuracy + 8, Atk. Spd. + 25%, Critical Rate + 50, Critical Damage + 50%. -->
<!-- Level 4 : For 1 min., P./M. Def. +120%, Attribute Resistance + 30, Speed + 30. When equipped with a sword or blunt weapon, Accuracy + 10, Atk. Spd. + 30%, Critical Rate + 60, Critical Damage + 60%. -->
<skill id="10100" levels="4" name="Guardian's Frenzy">
<table name="#magicLvl"> 85 90 95 99 </table>
<table name="#mpConsume"> 20 21 23 24 </table>
@ -49,10 +45,6 @@
</effect>
</for>
</skill>
<!-- Level 1 : For 1 min., P. Skill Power + 5%, P./M. Def. + 50%, Speed + 10. When equipped with a sword or blunt weapon, Accuracy + 4, Atk. Spd. + 10%, Critical Rate + 30, Critical Damage + 30%. -->
<!-- Level 2 : For 1 min., P. Skill Power + 7%, P./M. Def. + 65%, Speed + 20. When equipped with a sword or blunt weapon, Accuracy + 6, Atk. Spd. + 15%, Critical Rate + 40, Critical Damage + 40%. -->
<!-- Level 3 : For 1 min., P. Skill Power + 10%, P./M. Def. + 80%, Speed + 25. When equipped with a sword or blunt weapon, Accuracy + 8, Atk. Spd. + 20%, Critical Rate + 50, Critical Damage + 50%. -->
<!-- Level 4 : For 1 min., P. Skill Power + 15%, P./M. Def. + 100%, Speed + 30. When equipped with a sword or blunt weapon, Accuracy + 10, Atk. Spd. + 25%, Critical Rate + 60, Critical Damage + 60%. -->
<skill id="10101" levels="4" name="Templar's Frenzy">
<table name="#magicLvl"> 85 90 95 99 </table>
<table name="#mpConsume"> 20 21 23 24 </table>
@ -94,42 +86,80 @@
</effect>
</for>
</skill>
<!-- Level 1 : Summons a Dark Panther to attack enemies in front of you with 33505 Power added to P. Atk. and knocks them down. Requires a shield. Consumes 6 Soulstones. Over-hit. -->
<!-- Level 2 : Summons a Dark Panther to attack enemies in front of you with 34353 Power added to P. Atk. and knocks them down. Requires a shield. Consumes 6 Soulstones. Over-hit. -->
<!-- Level 3 : Summons a Dark Panther to attack enemies in front of you with 35201 Power added to P. Atk. and knocks them down. Requires a shield. Consumes 6 Soulstones. Over-hit. -->
<skill id="10102" levels="3" name="Shadow Slash">
<table name="#magicLvl"> 97 98 99 </table>
<table name="#power"> 33505 34353 35201 </table>
<table name="#mpConsume"> 185 191 197 </table>
<table name="#abnormalLvls"> 1 2 3 </table>
<set name="icon" val="icon.skill10102" />
<set name="abnormalLvl" val="#abnormalLvls" />
<set name="abnormalTime" val="3" />
<set name="abnormalType" val="KNOCK_DOWN" />
<set name="abnormalVisualEffect" val="KNOCK_DOWN" />
<set name="activateRate" val="80" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="power" val="#power" />
<set name="mpConsume" val="#mpConsume" />
<set name="effectRange" val="40" />
<set name="castRange" val="40" />
<set name="effectRange" val="400" />
<set name="effectPoint" val="-100" /> <!-- Need verify -->
<set name="fanRange" val="0,0,80,150" />
<set name="affectLimit" val="5-12" />
<set name="affectRange" val="150" />
<set name="hitTime" val="3000" />
<set name="coolTime" val="500" />
<set name="itemConsumeCount" val="6" />
<set name="itemConsumeId" val="1785" />
<set name="reuseDelay" val="60000" />
<set name="isDebuff" val="true" />
<set name="targetType" val="FRONT_AREA" />
<set name="overHit" val="true" />
<set name="isDebuff" val="true" />
<set name="trait" val="KNOCKDOWN" />
<cond msgId="113" addName="1">
<using kind="SHIELD" />
</cond>
<for>
<effect name="PhysicalAttack" />
<effect name="KnockDown">
<param speed="700" distance="50" />
</effect>
</for>
</skill>
<!-- Level 1 : Freezes the air, inflicting 18151 damage to target and nearby enemies, and for 10 sec., decreases enemy Speed by 100. Consumes 6 Soulstones. -->
<!-- Level 2 : Freezes the air, inflicting 18641 damage to target and nearby enemies, and for 10 sec., decreases enemy Speed by 100. Consumes 6 Soulstones. -->
<!-- Level 3 : Freezes the air, inflicting 19131 damage to target and nearby enemies, and for 10 sec., decreases enemy Speed by 100. Consumes 6 Soulstones. -->
<!-- Level 4 : Freezes the air, inflicting 19131 damage to target and nearby enemies, and for 10 sec., decreases enemy Speed by 100. -->
<skill id="10103" levels="4" name="Mass Freezing Strike">
<table name="#magicLvl"> 97 98 99 99 </table>
<table name="#mpConsume"> 185 191 197 197 </table>
<table name="#power"> 18151 18641 19131 19131 </table>
<table name="#abnormalLvls"> 1 2 3 4 </table>
<set name="abnormalLvl" val="#abnormalLvls" />
<set name="abnormalTime" val="10" />
<set name="abnormalType" val="SPEED_DOWN" />
<set name="activateRate" val="80" />
<set name="basicProperty" val="MEN" />
<set name="affectLimit" val="5-12" />
<set name="affectRange" val="150" />
<set name="icon" val="icon.skill10103" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="mpConsume" val="#mpConsume" />
<set name="castRange" val="40" />
<set name="effectRange" val="400" />
<set name="effectPoint" val="-100" /> <!-- Need verify -->
<set name="hitTime" val="1500" />
<set name="coolTime" val="500" />
<set name="reuseDelay" val="60000" />
<set name="power" val="#power" />
<set name="skillRadius" val="200" />
<set name="itemConsumeCount" val="6" />
<set name="itemConsumeId" val="1785" />
<set name="isDebuff" val="true" />
<set name="targetType" val="AREA" />
<for>
<effect name="PhysicalAttack" />
<effect name="Debuff">
<sub stat="runSpd" val="100" />
</effect>
</for>
</skill>
</list>

573
trunk/dist/game/data/stats/skills/10200-10299.xml vendored
View File

File diff suppressed because it is too large Load Diff

15
trunk/dist/game/data/stats/skills/17800-17899.xml vendored
View File

@ -170,10 +170,23 @@
</for>
</skill>
<skill id="17824" levels="1" name="La Vie En Rose's Jewelry Box">
<!-- AUTO GENERATED SKILL -->
<table name="#extractableItems"> 38855,1,7;38927,1,7;38850,1,10;38875,1,14.5;38870,1,10;38890,1,12;38880,1,13;38885,1,14.5;38895,1,12 </table>
<set name="icon" val="icon.etc_bm_jewelbox_main_i00" />
<set name="capsuled_items_skill" val="#extractableItems" />
<set name="isMagic" val="2" />
<set name="magicLvl" val="1" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<cond msgId="129">
<and>
<player invSize="10" />
<player weight="80" />
</and>
</cond>
<for>
<effect name="RestorationRandom" />
</for>
</skill>
<skill id="17825" levels="5" name="Emerald">
<table name="#rate1"> 1 1 1 2 3 </table>

15
trunk/dist/game/data/stats/skills/26200-26299.xml vendored
View File

@ -89,10 +89,23 @@
<set name="hitTime" val="3000" />
</skill>
<skill id="26211" levels="1" name="La Vie En Rose's Jewelry Box">
<!-- AUTO GENERATED SKILL -->
<set name="icon" val="icon.etc_bm_jewelbox_main_i00" />
<set name="isMagic" val="2" />
<set name="magicLvl" val="1" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<cond msgId="129">
<and>
<player invSize="10" />
<player weight="80" />
</and>
</cond>
<for>
<effect name="Restoration">
<param itemId="38941" itemCount="10" />
</effect>
</for>
</skill>
<skill id="26212" levels="1" name="Premium Account: Quick Healing Potion">
<!-- AUTO GENERATED SKILL -->

2
trunk/dist/game/data/xsd/skills.xsd vendored
View File

@ -262,6 +262,7 @@
<xs:attribute type="xs:string" name="KNOCKDOWN" use="optional" />
<xs:attribute type="xs:integer" name="speed" use="optional" />
<xs:attribute type="xs:integer" name="distance" use="optional" />
<xs:attribute type="xs:integer" name="debuffId" use="optional" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@ -393,6 +394,7 @@
<xs:enumeration value="receivedDamageModifier" />
<xs:enumeration value="maxSkillDamage" />
<xs:enumeration value="weaponElementPower" />
<xs:enumeration value="hpRestoreOnKill" />
</xs:restriction>
</xs:simpleType>
<xs:complexType name="addType" mixed="true">

11
trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
View File

@ -350,6 +350,17 @@ public class L2Attackable extends L2Npc
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay);
// if killer have stat hpRestoreOnKill
int hpRestore = (int) killer.getStat().calcStat(Stats.HP_RESTORE_ON_KILL, 0, null, null);
if (hpRestore > 0)
{
double amount = (killer.getMaxHp() * hpRestore) / 100;
amount = Math.max(Math.min(amount, killer.getMaxRecoverableHp() - killer.getCurrentHp()), 0);
if (amount != 0)
{
killer.setCurrentHp(amount + killer.getCurrentHp());
}
}
}
// Notify to minions if there are.

12
trunk/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java
View File

@ -312,6 +312,18 @@ public class PcStatus extends PlayableStatus
return;
}
if ((attacker != null) && (attacker.isPlayer()))
{
final int hpRestore = (int) attacker.getStat().calcStat(Stats.HP_RESTORE_ON_KILL, 0, null, null);
if (hpRestore > 0)
{
final double amount = Math.max(Math.min((attacker.getMaxHp() * hpRestore) / 100, attacker.getMaxRecoverableHp() - attacker.getCurrentHp()), 0);
if (amount != 0)
{
attacker.setCurrentHp(amount + attacker.getCurrentHp());
}
}
}
getActiveChar().doDie(attacker);
}
}

5
trunk/java/com/l2jserver/gameserver/model/stats/Stats.java
View File

@ -210,7 +210,10 @@ public enum Stats
MAX_SUMMON_POINTS("summonPoints"),
// Max Skill Damage Receive
MAX_SKILL_DAMAGE("maxSkillDamage");
MAX_SKILL_DAMAGE("maxSkillDamage"),
// Hp restore on kill enemy
HP_RESTORE_ON_KILL("hpRestoreOnKill");
public static final int NUM_STATS = values().length;