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

Implemented Spawn chaseRange parameter.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-08-07 21:05:53 +00:00
parent b47ac4b571
commit 0eebada4bd
142 changed files with 579 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_01.0_Ertheia/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_02.5_Underground/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_02.5_Underground/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_03.0_Helios/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_03.0_Helios/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_04.0_GrandCrusade/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_05.0_Salvation/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_05.0_Salvation/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_05.5_EtinasFate/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_06.0_Fafurion/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = True
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = True
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_08.2_Homunculus/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = True
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = True
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_10.1_MasterClass/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = True
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_10.1_MasterClass/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

2
L2J_Mobius_10.2_MasterClass/dist/game/config/NPC.ini vendored
View File

@@ -98,6 +98,7 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = True
# Maximum distance monsters can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 1500
AggroDistanceCheckRange = 1500
@@ -107,6 +108,7 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Overridden by Spawn chaseRange parameter.
# Default: 3000
AggroDistanceCheckRaidRange = 3000

1
L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

8
L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini vendored
View File

@@ -572,8 +572,8 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -581,8 +581,8 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

8
L2J_Mobius_C6_Interlude/dist/game/config/General.ini vendored
View File

@@ -600,8 +600,8 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -609,8 +609,8 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

10
L2J_Mobius_CT_0_Interlude/dist/game/config/NPC.ini vendored
View File

@@ -111,8 +111,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -120,8 +121,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_CT_0_Interlude/dist/game/data/xsd/spawns.xsd vendored
View File

@@ -50,6 +50,7 @@
<xs:attribute name="count" type="xs:positiveInteger" use="optional" />
<xs:attribute name="respawnDelay" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="respawnRandom" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="chaseRange" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="periodOfDay" use="optional">
<xs:simpleType>
<xs:restriction base="xs:token">

2
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -733,7 +733,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || (npc.getInstanceId() == 0)))
{

6
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/SpawnTable.java
View File

@@ -335,6 +335,11 @@ public class SpawnTable implements IXmlReader
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
@@ -371,6 +376,7 @@ public class SpawnTable implements IXmlReader
spawnDat.setXYZ(spawnInfo.getInt("x", 0), spawnInfo.getInt("y", 0), spawnInfo.getInt("z", 0));
spawnDat.setHeading(spawnInfo.getInt("heading", -1));
spawnDat.setRespawnDelay(spawnInfo.getInt("respawnDelay", 0), spawnInfo.getInt("respawnRandom", 0));
spawnDat.setChaseRange(spawnInfo.getInt("chaseRange", 0));
spawnDat.setLocationId(spawnInfo.getInt("locId", 0));
final String territoryName = spawnInfo.getString("territoryName", "");
final String spawnName = spawnInfo.getString("spawnName", "");

12
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -71,6 +71,8 @@ public class Spawn extends Location implements IIdentifiable, INamable
private int _respawnMinDelay;
/** Maximum respawn delay */
private int _respawnMaxDelay;
/** Maximum distance monsters can be pulled away from spawn. */
private int _chaseRange;
/** The generic constructor of Npc managed by this Spawn */
private Constructor<? extends Npc> _constructor;
/** If True an Npc is respawned each time that another is killed */
@@ -546,6 +548,16 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public void setChaseRange(int chaseRange)
{
_chaseRange = chaseRange;
}
public int getChaseRange()
{
return _chaseRange;
}
public void setSpawnTerritory(NpcSpawnTerritory territory)
{
_spawnTerritory = territory;

10
L2J_Mobius_CT_2.4_Epilogue/dist/game/config/NPC.ini vendored
View File

@@ -111,8 +111,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -120,8 +121,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/spawns.xsd vendored
View File

@@ -50,6 +50,7 @@
<xs:attribute name="count" type="xs:positiveInteger" use="optional" />
<xs:attribute name="respawnDelay" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="respawnRandom" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="chaseRange" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="periodOfDay" use="optional">
<xs:simpleType>
<xs:restriction base="xs:token">

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -733,7 +733,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || (npc.getInstanceId() == 0)))
{

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SpawnTable.java
View File

@@ -335,6 +335,11 @@ public class SpawnTable implements IXmlReader
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
@@ -371,6 +376,7 @@ public class SpawnTable implements IXmlReader
spawnDat.setXYZ(spawnInfo.getInt("x", 0), spawnInfo.getInt("y", 0), spawnInfo.getInt("z", 0));
spawnDat.setHeading(spawnInfo.getInt("heading", -1));
spawnDat.setRespawnDelay(spawnInfo.getInt("respawnDelay", 0), spawnInfo.getInt("respawnRandom", 0));
spawnDat.setChaseRange(spawnInfo.getInt("chaseRange", 0));
spawnDat.setLocationId(spawnInfo.getInt("locId", 0));
final String territoryName = spawnInfo.getString("territoryName", "");
final String spawnName = spawnInfo.getString("spawnName", "");

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -71,6 +71,8 @@ public class Spawn extends Location implements IIdentifiable, INamable
private int _respawnMinDelay;
/** Maximum respawn delay */
private int _respawnMaxDelay;
/** Maximum distance monsters can be pulled away from spawn. */
private int _chaseRange;
/** The generic constructor of Npc managed by this Spawn */
private Constructor<? extends Npc> _constructor;
/** If True an Npc is respawned each time that another is killed */
@@ -540,6 +542,16 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public void setChaseRange(int chaseRange)
{
_chaseRange = chaseRange;
}
public int getChaseRange()
{
return _chaseRange;
}
public void setSpawnTerritory(NpcSpawnTerritory territory)
{
_spawnTerritory = territory;

10
L2J_Mobius_CT_2.6_HighFive/dist/game/config/NPC.ini vendored
View File

@@ -111,8 +111,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -120,8 +121,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/spawns.xsd vendored
View File

@@ -50,6 +50,7 @@
<xs:attribute name="count" type="xs:positiveInteger" use="optional" />
<xs:attribute name="respawnDelay" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="respawnRandom" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="chaseRange" type="xs:nonNegativeInteger" use="optional" />
<xs:attribute name="periodOfDay" use="optional">
<xs:simpleType>
<xs:restriction base="xs:token">

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -733,7 +733,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || (npc.getInstanceId() == 0)))
{

6
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SpawnTable.java
View File

@@ -335,6 +335,11 @@ public class SpawnTable implements IXmlReader
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
@@ -371,6 +376,7 @@ public class SpawnTable implements IXmlReader
spawnDat.setXYZ(spawnInfo.getInt("x", 0), spawnInfo.getInt("y", 0), spawnInfo.getInt("z", 0));
spawnDat.setHeading(spawnInfo.getInt("heading", -1));
spawnDat.setRespawnDelay(spawnInfo.getInt("respawnDelay", 0), spawnInfo.getInt("respawnRandom", 0));
spawnDat.setChaseRange(spawnInfo.getInt("chaseRange", 0));
spawnDat.setLocationId(spawnInfo.getInt("locId", 0));
final String territoryName = spawnInfo.getString("territoryName", "");
final String spawnName = spawnInfo.getString("spawnName", "");

12
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -71,6 +71,8 @@ public class Spawn extends Location implements IIdentifiable, INamable
private int _respawnMinDelay;
/** Maximum respawn delay */
private int _respawnMaxDelay;
/** Maximum distance monsters can be pulled away from spawn. */
private int _chaseRange;
/** The generic constructor of Npc managed by this Spawn */
private Constructor<? extends Npc> _constructor;
/** If True an Npc is respawned each time that another is killed */
@@ -546,6 +548,16 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public void setChaseRange(int chaseRange)
{
_chaseRange = chaseRange;
}
public int getChaseRange()
{
return _chaseRange;
}
public void setSpawnTerritory(NpcSpawnTerritory territory)
{
_spawnTerritory = territory;

10
L2J_Mobius_Classic_1.0/dist/game/config/NPC.ini vendored
View File

@@ -98,8 +98,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -107,8 +108,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_Classic_1.0/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

10
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/NPC.ini vendored
View File

@@ -98,8 +98,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -107,8 +108,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/NPC.ini vendored
View File

@@ -98,8 +98,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -107,8 +108,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

10
L2J_Mobius_Classic_2.5_Zaken/dist/game/config/NPC.ini vendored
View File

@@ -98,8 +98,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -107,8 +108,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

5
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -517,6 +517,11 @@ public class Spawn extends Location implements IIdentifiable, INamable
return _respawnMinDelay != _respawnMaxDelay;
}
public int getChaseRange()
{
return _spawnTemplate.getChaseRange();
}
public Npc getLastSpawn()
{
if (!_spawnedNpcs.isEmpty())

8
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -54,6 +54,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
private final int _count;
private final Duration _respawnTime;
private final Duration _respawnTimeRandom;
private final int _chaseRange;
private List<ChanceLocation> _locations;
private SpawnTerritory _zone;
private StatSet _parameters;
@@ -73,6 +74,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = template._count;
_respawnTime = template._respawnTime;
_respawnTimeRandom = template._respawnTimeRandom;
_chaseRange = template._chaseRange;
_spawnAnimation = template._spawnAnimation;
_saveInDB = template._saveInDB;
_dbName = template._dbName;
@@ -90,6 +92,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null);
_chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
_dbName = set.getString("dbName", null);
@@ -195,6 +198,11 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return _respawnTimeRandom;
}
public int getChaseRange()
{
return _chaseRange;
}
public List<ChanceLocation> getLocation()
{
return _locations;

10
L2J_Mobius_Classic_2.7_Antharas/dist/game/config/NPC.ini vendored
View File

@@ -98,8 +98,9 @@ MaxDriftRange = 300
AggroDistanceCheckEnabled = False
# Maximum distance monsters can be pulled away from spawn.
# Default: 1500
AggroDistanceCheckRange = 1500
# Overridden by Spawn chaseRange parameter.
# Default: 2000
AggroDistanceCheckRange = 2000
# Use maximum aggro distance check for raids.
# Grandbosses are excluded.
@@ -107,8 +108,9 @@ AggroDistanceCheckRange = 1500
AggroDistanceCheckRaids = False
# Maximum distance raids can be pulled away from spawn.
# Default: 3000
AggroDistanceCheckRaidRange = 3000
# Overridden by Spawn chaseRange parameter.
# Default: 4000
AggroDistanceCheckRaidRange = 4000
# Use maximum aggro distance check in instances.
# Default: False

1
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/shared.xsd vendored
View File

@@ -113,6 +113,7 @@
<xs:attribute type="xs:positiveInteger" name="count" />
<xs:attribute type="xs:string" name="respawnTime" />
<xs:attribute type="xs:string" name="respawnRandom" />
<xs:attribute type="xs:integer" name="chaseRange" />
<xs:attribute type="xs:integer" name="x" />
<xs:attribute type="xs:integer" name="y" />
<xs:attribute type="xs:integer" name="z" />

2
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -608,7 +608,7 @@ public class AttackableAI extends CreatureAI
if (Config.AGGRO_DISTANCE_CHECK_ENABLED && npc.isMonster() && !npc.isWalker() && !(npc instanceof GrandBoss))
{
final Spawn spawn = npc.getSpawn();
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE)))
if ((spawn != null) && (npc.calculateDistance3D(spawn.getLocation()) > (spawn.getChaseRange() > 0 ? Math.max(Config.MAX_DRIFT_RANGE, spawn.getChaseRange()) : (npc.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))))
{
if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !npc.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || !npc.isInInstance()))
{

Some files were not shown because too many files have changed in this diff Show More