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

Addition of isQuestMonster method.

Browse Source
This commit is contained in:
MobiusDev
2018-08-07 19:13:24 +00:00
parent b3b769bac0
commit 63a57222b7
24 changed files with 144 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
View File

@@ -530,8 +530,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
final int randX = newlocx + Rnd.get(Config.MOB_MIN_SPAWN_RANGE, Config.MOB_MAX_SPAWN_RANGE);
final int randY = newlocy + Rnd.get(Config.MOB_MIN_SPAWN_RANGE, Config.MOB_MAX_SPAWN_RANGE);
final boolean isQuestMonster = (npc.getTitle() != null) && npc.getTitle().contains("Quest");
if (npc.isMonster() && !isQuestMonster && !npc.isWalker() && !npc.isInsideZone(ZoneId.NO_BOOKMARK) && (getInstanceId() == 0) && GeoEngine.getInstance().canMoveToTarget(newlocx, newlocy, newlocz, randX, randY, newlocz, npc.getInstanceWorld()) && !getTemplate().isUndying() && !npc.isRaid() && !npc.isRaidMinion() && !Config.MOBS_LIST_NOT_RANDOM.contains(npc.getId()))
if (npc.isMonster() && !npc.isQuestMonster() && !npc.isWalker() && !npc.isInsideZone(ZoneId.NO_BOOKMARK) && (getInstanceId() == 0) && GeoEngine.getInstance().canMoveToTarget(newlocx, newlocy, newlocz, randX, randY, newlocz, npc.getInstanceWorld()) && !getTemplate().isUndying() && !npc.isRaid() && !npc.isRaidMinion() && !Config.MOBS_LIST_NOT_RANDOM.contains(npc.getId()))
{
newlocx = randX;
newlocy = randY;

10
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@@ -129,6 +129,7 @@ public class L2Npc extends L2Character
private boolean _isRandomAnimationEnabled = true;
private boolean _isRandomWalkingEnabled = true;
private boolean _isTalkable = getTemplate().isTalkable();
private final boolean _isQuestMonster = getTemplate().isQuestMonster();
private final boolean _isFakePlayer = getTemplate().isFakePlayer();
protected RandomAnimationTask _rAniTask;
@@ -1644,6 +1645,15 @@ public class L2Npc extends L2Character
return _isTalkable;
}
/**
* Checks if the NPC is a Quest Monster.
* @return {@code true} if the NPC is a Quest Monster, {@code false} otherwise.
*/
public boolean isQuestMonster()
{
return _isQuestMonster;
}
/**
* Sets the weapon id with which this npc was killed.
* @param weaponId

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@@ -73,6 +73,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
private boolean _attackable;
private boolean _targetable;
private boolean _talkable;
private boolean _isQuestMonster;
private boolean _undying;
private boolean _showName;
private boolean _randomWalk;
@@ -154,6 +155,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
_attackable = set.getBoolean("attackable", true);
_targetable = set.getBoolean("targetable", true);
_talkable = set.getBoolean("talkable", true);
_isQuestMonster = _title.contains("Quest");
_undying = set.getBoolean("undying", true);
_showName = set.getBoolean("showName", true);
_randomWalk = set.getBoolean("randomWalk", !_type.equals("L2Guard"));
@@ -372,6 +374,11 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
return _talkable;
}
public boolean isQuestMonster()
{
return _isQuestMonster;
}
public boolean isUndying()
{
return _undying;