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

Sync with L2jServer HighFive Jun 14th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-06-14 11:51:57 +00:00
parent a3707acaaa
commit 166d6ff9d4
48 changed files with 675 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
trunk/dist/game/data/scripts/ai/individual/Beleth.java vendored
View File

@@ -28,10 +28,12 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -93,6 +95,7 @@ public final class Beleth extends AbstractNpcAI
private L2PcInstance _killer;
private int _allowedObjId;
private int _killedCount;
private long _lastAttack;
private final List<L2Npc> _minions = new CopyOnWriteArrayList<>();
private Beleth()
@@ -372,11 +375,17 @@ public final class Beleth extends AbstractNpcAI
c.setIsImmobilized(false);
}
_lastAttack = System.currentTimeMillis();
startQuestTimer("CHECK_ATTACK", 60000, null, null);
startQuestTimer("SPAWN25", 60000, null, null);
break;
}
case "SPAWN25":
{
_minions.clear();
int a = 0;
for (int i = 0; i < 16; i++)
{
@@ -534,6 +543,33 @@ public final class Beleth extends AbstractNpcAI
}
break;
}
case "CHECK_ATTACK":
{
if ((_lastAttack + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
for (L2Character charInside : ZONE.getCharactersInside())
{
if (charInside != null)
{
if (charInside.isNpc())
{
charInside.deleteMe();
}
else if (charInside.isPlayer())
{
charInside.teleToLocation(MapRegionManager.getInstance().getTeleToLocation(charInside, TeleportWhereType.TOWN));
}
}
}
cancelQuestTimer("CHECK_ATTACK", null, null);
}
else
{
startQuestTimer("CHECK_ATTACK", 60000, null, null);
}
break;
}
}
return super.onAdvEvent(event, npc, player);
}
@@ -718,6 +754,8 @@ public final class Beleth extends AbstractNpcAI
{
if (npc.getId() == REAL_BELETH)
{
cancelQuestTimer("CHECK_ATTACK", null, null);
setBelethKiller(killer);
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
@@ -749,7 +787,7 @@ public final class Beleth extends AbstractNpcAI
startQuestTimer("SPAWN26", 1000, null, null);
}
else if ((npc.getId() == FAKE_BELETH) && (npc.getObjectId() == _allowedObjId))
else if (npc.getObjectId() == _allowedObjId)
{
deleteAll();

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

@@ -157,6 +157,7 @@ public final class EffectMasterHandler
Resurrection.class,
ResurrectionSpecial.class,
Root.class,
RunAway.class,
ServitorShare.class,
SetSkill.class,
ShilensBreath.class,

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

@@ -217,9 +217,8 @@ public class ClanBoard implements IWriteBoardHandler
}
i = 0;
int nbp;
nbp = ClanTable.getInstance().getClans().length / 8;
if ((nbp * 8) != ClanTable.getInstance().getClans().length)
int nbp = ClanTable.getInstance().getClanCount() / 8;
if ((nbp * 8) != ClanTable.getInstance().getClanCount())
{
nbp++;
}

15
trunk/dist/game/data/scripts/handlers/communityboard/HomeBoard.java vendored
View File

@@ -86,9 +86,9 @@ public final class HomeBoard implements IParseBoardHandler
CommunityBoardHandler.getInstance().addBypass(activeChar, "Home", command);
String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/CommunityBoard/" + customPath + "home.html");
html = html.replaceAll("%fav_count%", String.valueOf(getFavoriteCount(activeChar)));
html = html.replaceAll("%region_count%", String.valueOf(getRegionCount(activeChar)));
html = html.replaceAll("%clan_count%", String.valueOf(getClansCount()));
html = html.replaceAll("%fav_count%", Integer.toString(getFavoriteCount(activeChar)));
html = html.replaceAll("%region_count%", Integer.toString(getRegionCount(activeChar)));
html = html.replaceAll("%clan_count%", Integer.toString(ClanTable.getInstance().getClanCount()));
CommunityBoardHandler.separateAndSend(html, activeChar);
}
else if (command.startsWith("_bbstop;"))
@@ -206,13 +206,4 @@ public final class HomeBoard implements IParseBoardHandler
{
return 0; // TODO: Implement.
}
/**
* Gets the clans count.
* @return the clans count
*/
private static int getClansCount()
{
return ClanTable.getInstance().getClans().length;
}
}

39
trunk/dist/game/data/scripts/handlers/effecthandlers/Fear.java vendored
View File

@@ -18,12 +18,8 @@
*/
package handlers.effecthandlers;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlEvent;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
@@ -33,7 +29,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.util.Util;
/**
* Fear effect implementation.
@@ -41,8 +36,6 @@ import com.l2jserver.gameserver.util.Util;
*/
public final class Fear extends AbstractEffect
{
public static final int FEAR_RANGE = 500;
public Fear(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
@@ -77,7 +70,7 @@ public final class Fear extends AbstractEffect
@Override
public boolean onActionTime(BuffInfo info)
{
fearAction(info, false);
info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_AFRAID, info.getEffector(), false);
return false;
}
@@ -89,34 +82,6 @@ public final class Fear extends AbstractEffect
info.getEffected().abortCast();
}
info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_AFRAID);
fearAction(info, true);
}
private void fearAction(BuffInfo info, boolean start)
{
double radians = Math.toRadians(start ? Util.calculateAngleFrom(info.getEffector(), info.getEffected()) : Util.convertHeadingToDegree(info.getEffected().getHeading()));
int posX = (int) (info.getEffected().getX() + (FEAR_RANGE * Math.cos(radians)));
int posY = (int) (info.getEffected().getY() + (FEAR_RANGE * Math.sin(radians)));
int posZ = info.getEffected().getZ();
if (!info.getEffected().isPet())
{
info.getEffected().setRunning();
}
// If pathfinding enabled the creature will go to the defined destination (retail like).
// Otherwise it will go to the nearest obstacle.
final Location destination;
if (Config.PATHFINDING > 0)
{
destination = new Location(posX, posY, posZ, info.getEffected().getInstanceId());
}
else
{
destination = GeoData.getInstance().moveCheck(info.getEffected().getX(), info.getEffected().getY(), info.getEffected().getZ(), posX, posY, posZ, info.getEffected().getInstanceId());
}
info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_AFRAID, info.getEffector(), true);
}
}

2
trunk/dist/game/data/scripts/handlers/effecthandlers/Grow.java vendored
View File

@@ -47,7 +47,6 @@ public final class Grow extends AbstractEffect
if (info.getEffected().isNpc())
{
L2Npc npc = (L2Npc) info.getEffected();
npc.setCollisionHeight(npc.getTemplate().getCollisionHeight());
npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius());
}
}
@@ -58,7 +57,6 @@ public final class Grow extends AbstractEffect
if (info.getEffected().isNpc())
{
L2Npc npc = (L2Npc) info.getEffected();
npc.setCollisionHeight(npc.getTemplate().getCollisionHeightGrown());
npc.setCollisionRadius(npc.getTemplate().getCollisionRadiusGrown());
}
}

75
trunk/dist/game/data/scripts/handlers/effecthandlers/RunAway.java vendored Normal file
View File

@@ -0,0 +1,75 @@
/*
* 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.ai.CtrlEvent;
import com.l2jserver.gameserver.ai.L2AttackableAI;
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.skills.BuffInfo;
import com.l2jserver.util.Rnd;
/**
* Run Away effect implementation.
* @author Zoey76
*/
public final class RunAway extends AbstractEffect
{
private final int _power;
private final int _time;
public RunAway(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
_power = params.getInt("power", 0);
_time = params.getInt("time", 0);
}
@Override
public boolean isInstant()
{
return true;
}
@Override
public void onStart(BuffInfo info)
{
if (!info.getEffected().isAttackable())
{
return;
}
if (Rnd.get(100) > _power)
{
return;
}
if (info.getEffected().isCastingNow() && info.getEffected().canAbortCast())
{
info.getEffected().abortCast();
}
((L2AttackableAI) info.getEffected().getAI()).setFearTime(_time);
info.getEffected().getAI().notifyEvent(CtrlEvent.EVT_AFRAID, info.getEffector(), true);
}
}

3
trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java vendored
View File

@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Instance;
@@ -242,7 +241,7 @@ public final class DarkCloudMansion extends AbstractInstance
@Override
protected boolean checkConditions(L2PcInstance player)
{
if (debug || player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS))
if (debug)
{
return true;
}

5
trunk/dist/game/data/stats/skills/00000-00099.xml vendored
View File

@@ -955,6 +955,7 @@
<param consumeItemId="1459" consumeItemCount="4" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -1334,13 +1335,13 @@
</effect>
<effect name="ConsumeBody" />
</enchant1for>
<enchant1for>
<enchant2for>
<effect name="Sweeper" />
<effect name="ManaHealByLevel">
<param power="#ench2DrainMp" />
</effect>
<effect name="ConsumeBody" />
</enchant1for>
</enchant2for>
</skill>
<skill id="44" levels="3" name="Remedy">
<table name="#dispelAbnormals"> BLEEDING,3 BLEEDING,7 BLEEDING,9 </table>

32
trunk/dist/game/data/stats/skills/00400-00499.xml vendored
View File

@@ -312,6 +312,7 @@
<table name="#magicLvl"> 55 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 50 53 55 58 59 61 63 65 67 68 </table>
<table name="#ench1Cost"> 66 65 64 63 62 61 60 58 57 56 55 54 53 52 51 49 48 47 46 45 44 43 41 40 39 38 37 36 35 34 </table>
<table name="#ench2Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
<table name="#ench2LethalStrikeRate"> 25 25 25 26 26 26 26 27 27 27 27 28 28 28 29 29 29 29 30 30 30 30 31 31 31 31 32 32 32 33 </table>
<table name="#ench3Attack"> 191 196 201 206 211 216 221 227 232 237 242 247 252 257 263 268 273 278 283 288 293 298 304 309 314 319 324 329 334 340 </table>
<table name="#ench4HolyAttack"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
@@ -343,19 +344,28 @@
<target race="UNDEAD" />
</cond>
<for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</for>
<enchant2for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="#ench2Power" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="#ench2LethalStrikeRate" />
</effect>
</enchant2for>
<enchant3for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
@@ -1820,6 +1830,7 @@
<table name="#magicLvl"> 55 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 50 53 55 58 59 61 63 65 67 68 </table>
<table name="#ench1Cost"> 66 65 64 63 62 61 60 58 57 56 55 54 53 52 51 49 48 47 46 45 44 43 41 40 39 38 37 36 35 34 </table>
<table name="#ench2Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
<table name="#ench2LethalStrikeRate"> 25 25 25 26 26 26 26 27 27 27 27 28 28 28 29 29 29 29 30 30 30 30 31 31 31 31 32 32 32 33 </table>
<table name="#ench3Attack"> 191 196 201 206 211 216 221 227 232 237 242 247 252 257 263 268 273 278 283 288 293 298 304 309 314 319 324 329 334 340 </table>
<table name="#ench4DarkAttack"> 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 </table>
@@ -1851,19 +1862,28 @@
<target race="DIVINE" />
</cond>
<for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</for>
<enchant2for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="#ench2Power" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="#ench2LethalStrikeRate" />
</effect>
</enchant2for>
<enchant3for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>

21
trunk/dist/game/data/stats/skills/01400-01499.xml vendored
View File

@@ -7,6 +7,7 @@
<table name="#magicLvl"> 56 58 60 62 64 66 68 70 72 74 </table>
<table name="#mpConsume"> 41 43 44 46 48 49 51 52 53 55 </table>
<table name="#mpInitialConsume"> 11 11 11 12 12 13 13 13 14 14 </table>
<table name="#ench1Power"> 30 31 32 32 33 34 34 35 36 36 37 38 38 39 40 40 41 42 42 43 44 44 45 46 46 47 48 48 49 50 </table>
<table name="#ench1LethalStrikeRate"> 25 25 25 26 26 26 27 27 27 28 28 28 28 29 29 29 30 30 30 31 31 31 31 32 32 32 33 33 33 34 </table>
<table name="#ench2mpConsume"> 53 52 51 50 49 48 48 47 46 45 44 43 42 41 40 39 38 38 37 36 35 34 33 32 31 30 29 29 28 27 </table>
<table name="#ench2mpInitialConsume"> 13 13 12 12 12 12 12 11 11 11 11 10 10 10 10 9 9 9 9 9 8 8 8 8 7 7 7 7 7 6 </table>
@@ -42,25 +43,37 @@
<target race="UNDEAD" />
</cond>
<for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</for>
<enchant1for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="#ench1Power" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="#ench1LethalStrikeRate" />
</effect>
</enchant1for>
<enchant2for>
<effect name="Fear" abnormalTime="#ench2Time" />
<effect name="RunAway">
<param power="#ench1Power" />
<param time="#ench2Time" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>
</enchant2for>
<enchant3for>
<effect name="Fear" abnormalTime="20" />
<effect name="RunAway">
<param power="30" />
<param time="20" />
</effect>
<effect name="Lethal">
<param fullLethal="25" />
</effect>

5
trunk/dist/game/data/stats/skills/02200-02299.xml vendored
View File

@@ -1885,13 +1885,14 @@
<skill id="2286" levels="6" name="Scroll: Recovery">
<!-- Confirmed CT2.5 -->
<table name="#levelRange"> 1;19 20;39 40;51 52;60 61;75 76;85 </table>
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<table name="#itemConsumeId"> 8594 8595 8596 8597 8598 8599 </table>
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="#itemConsumeId" />
<set name="magicLvl" val="1" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="simultaneousCast" val="true" />
<set name="targetType" val="SELF" />
<cond msgId="113" addName="1">
<and>

5
trunk/dist/game/data/stats/skills/05100-05199.xml vendored
View File

@@ -1572,8 +1572,11 @@
<set name="targetType" val="ONE" />
<set name="trait" val="DERANGEMENT" />
<for>
<effect name="RunAway">
<param power="40" />
<param time="20" />
</effect>
<effect name="Fear" />
<!-- FIXME: We need an instant effect that will work only vs monsters and fear them with 40% chance for 20 seconds here -->
</for>
</skill>
<skill id="5174" levels="15" name="Poison">

5
trunk/dist/game/data/stats/skills/05400-05499.xml vendored
View File

@@ -1258,7 +1258,7 @@
<skill id="5493" levels="1" name="Naia Production">
<set name="castRange" val="800" />
<set name="channelingSkillId" val="5106" />
<set name="channelingSkillId" val="5106" />
<set name="channelingTickInterval" val="2" />
<set name="effectPoint" val="1" />
<set name="effectRange" val="1000" />
<set name="hitTime" val="25000" />
@@ -1271,6 +1271,9 @@
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<cond msgId="109">
<target npcId="32331" />
</cond>
</skill>
<skill id="5494" levels="1" name="Gust">
<!-- Confirmed CT2.5 -->

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

@@ -258,6 +258,7 @@
<xs:attribute type="xs:short" name="skillId1" use="optional" />
<xs:attribute type="xs:short" name="skillId2" use="optional" />
<xs:attribute type="xs:short" name="skillId3" use="optional" />
<xs:attribute type="xs:string" name="time" use="optional" />
<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" />