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

Sync with L2jServer HighFive Nov 14th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-11-14 16:31:37 +00:00
parent 887fbcc6b5
commit e38353e409
125 changed files with 1998 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,10 @@ public final class EffectMasterHandler
Betray.class,
Blink.class,
BlockAction.class,
BlockBuff.class,
BlockChat.class,
BlockDamage.class,
BlockDebuff.class,
BlockParty.class,
BlockBuffSlot.class,
BlockResurrection.class,
@@ -112,7 +115,6 @@ public final class EffectMasterHandler
IgnoreDeath.class,
ImmobileBuff.class,
ImmobilePetBuff.class,
Invincible.class,
JumpToFriend.class,
KnockBack.class,
KnockDown.class,
@@ -139,7 +141,6 @@ public final class EffectMasterHandler
OpenDwarfRecipeBook.class,
Paralyze.class,
Passive.class,
Petrification.class,
PhysicalAttack.class,
PhysicalAttackHpLink.class,
PhysicalAttackMute.class,

15
trunk/dist/game/data/scripts/handlers/effecthandlers/Invincible.java → trunk/dist/game/data/scripts/handlers/effecthandlers/BlockBuff.java vendored
View File

@@ -22,13 +22,14 @@ import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.effects.L2EffectType;
/**
* Invincible effect implementation.
* @author Zealar
*/
public final class Invincible extends AbstractEffect
public final class BlockBuff extends AbstractEffect
{
public Invincible(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
public BlockBuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
}
@@ -36,6 +37,12 @@ public final class Invincible extends AbstractEffect
@Override
public int getEffectFlags()
{
return EffectFlag.INVUL.getMask();
return EffectFlag.BLOCK_BUFF.getMask();
}
@Override
public L2EffectType getEffectType()
{
return L2EffectType.BLOCK_BUFF;
}
}

33
trunk/dist/game/data/scripts/handlers/effecthandlers/Petrification.java → trunk/dist/game/data/scripts/handlers/effecthandlers/BlockDamage.java vendored
View File

@@ -18,41 +18,40 @@
*/
package handlers.effecthandlers;
import com.l2jserver.gameserver.ai.CtrlEvent;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.effects.L2EffectType;
/**
* Petrification effect implementation.
* @author Zealar
*/
public final class Petrification extends AbstractEffect
public final class BlockDamage extends AbstractEffect
{
public Petrification(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
public enum BlockType
{
HP,
MP
}
private final BlockType _type;
public BlockDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
_type = params.getEnum("type", BlockType.class, BlockType.HP);
}
@Override
public int getEffectFlags()
{
return EffectFlag.PARALYZED.getMask() | EffectFlag.INVUL.getMask();
return _type == BlockType.HP ? EffectFlag.BLOCK_HP.getMask() : EffectFlag.BLOCK_MP.getMask();
}
@Override
public void onExit(BuffInfo info)
public L2EffectType getEffectType()
{
if (!info.getEffected().isPlayer())
{
info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_THINK);
}
}
@Override
public void onStart(BuffInfo info)
{
info.getEffected().startParalyze();
return L2EffectType.BLOCK_DAMAGE;
}
}

48
trunk/dist/game/data/scripts/handlers/effecthandlers/BlockDebuff.java vendored Normal file
View File

@@ -0,0 +1,48 @@
/*
* Copyright (C) 2004-2015 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack 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 DataPack 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.model.StatsSet;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.effects.L2EffectType;
/**
* @author Zealar
*/
public final class BlockDebuff extends AbstractEffect
{
public BlockDebuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
}
@Override
public int getEffectFlags()
{
return EffectFlag.BLOCK_DEBUFF.getMask();
}
@Override
public L2EffectType getEffectType()
{
return L2EffectType.BLOCK_DEBUFF;
}
}

2
trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@@ -425,7 +425,7 @@ public abstract class Chamber extends AbstractInstance
return;
}
final Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId());
Location ret = inst.getSpawnLoc();
Location ret = inst.getExitLoc();
final String return_point = player.getVariables().getString(RETURN, null);
if (return_point != null)
{

4
trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -1386,7 +1386,7 @@ public final class Kamaloka extends AbstractInstance
// set name for the kamaloka
inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
// set return location
inst.setSpawnLoc(new Location(player));
inst.setExitLoc(new Location(player));
// disable summon friend into instance
inst.setAllowSummon(false);
// set duration and empty destroy time
@@ -1577,7 +1577,7 @@ public final class Kamaloka extends AbstractInstance
{
if ((partyMember != null) && (partyMember.getInstanceId() == world.getInstanceId()))
{
teleportPlayer(partyMember, inst.getSpawnLoc(), 0);
teleportPlayer(partyMember, inst.getExitLoc(), 0);
}
}
}

2
trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
View File

@@ -282,7 +282,7 @@ public final class NornilsGarden extends AbstractInstance
final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
inst.setName(InstanceManager.getInstance().getInstanceIdName(TEMPLATE_ID));
inst.setSpawnLoc(new Location(player));
inst.setExitLoc(new Location(player));
inst.setAllowSummon(false);
inst.setDuration(DURATION_TIME * 60000);
inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);

2
trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java vendored
View File

@@ -290,7 +290,7 @@ public final class Q00511_AwlUnderFoot extends Quest
L2Party party = player.getParty();
int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
Instance ins = InstanceManager.getInstance().getInstance(instanceId);
ins.setSpawnLoc(new Location(player));
ins.setExitLoc(new Location(player));
world = new FAUWorld();
world.setInstanceId(instanceId);
world.setTemplateId(dungeon.getInstanceId());