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

Simplified Kerr spawn logic.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-09-03 21:18:24 +00:00
parent 50b82a8621
commit 42acb4e7c7
2 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Kerr/Kerr.java vendored
View File

@ -16,12 +16,11 @@
*/ */
package ai.areas.OrcBarracks.Kerr; package ai.areas.OrcBarracks.Kerr;
import org.l2jmobius.Config; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.WorldRegion;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -55,7 +54,7 @@ public class Kerr extends AbstractNpcAI
// Misc // Misc
private static final int SPAWN_COUNT = 3; private static final int SPAWN_COUNT = 3;
private static final int RESPAWN_DELAY = 60000; // 1 minute. private static final int RESPAWN_DELAY = 60000; // 1 minute.
private static final int MIN_SPAWN_DISTANCE = Config.MAX_DRIFT_RANGE * 3; private static final Map<Npc, Location> KERR_SPAWN_LOCATIONS = new ConcurrentHashMap<>(SPAWN_COUNT);
private Kerr() private Kerr()
{ {
@ -69,33 +68,24 @@ public class Kerr extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
KERR_SPAWN_LOCATIONS.remove(npc);
ThreadPool.schedule(() -> spawnKerr(), RESPAWN_DELAY); ThreadPool.schedule(() -> spawnKerr(), RESPAWN_DELAY);
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
private void spawnKerr() private void spawnKerr()
{ {
Location location = null; while (true)
while (location == null)
{ {
final Location randomLocation = getRandomEntry(SPAWNS); final Location location = getRandomEntry(SPAWNS);
final WorldRegion region = World.getInstance().getRegion(randomLocation.getX(), randomLocation.getY()); if (KERR_SPAWN_LOCATIONS.containsValue(location))
if (region == null)
{ {
continue; continue;
} }
SEARCH: for (WorldObject wo : region.getVisibleObjects()) KERR_SPAWN_LOCATIONS.put(addSpawn(KERR, location), location);
{ break;
if ((wo.getId() == KERR) && (wo.calculateDistance2D(randomLocation) < MIN_SPAWN_DISTANCE))
{
continue SEARCH;
}
location = randomLocation;
}
} }
addSpawn(KERR, location);
} }
public static void main(String[] args) public static void main(String[] args)

30
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Kerr/Kerr.java vendored
View File

@ -16,12 +16,11 @@
*/ */
package ai.areas.OrcBarracks.Kerr; package ai.areas.OrcBarracks.Kerr;
import org.l2jmobius.Config; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.WorldRegion;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -55,7 +54,7 @@ public class Kerr extends AbstractNpcAI
// Misc // Misc
private static final int SPAWN_COUNT = 3; private static final int SPAWN_COUNT = 3;
private static final int RESPAWN_DELAY = 60000; // 1 minute. private static final int RESPAWN_DELAY = 60000; // 1 minute.
private static final int MIN_SPAWN_DISTANCE = Config.MAX_DRIFT_RANGE * 3; private static final Map<Npc, Location> KERR_SPAWN_LOCATIONS = new ConcurrentHashMap<>(SPAWN_COUNT);
private Kerr() private Kerr()
{ {
@ -69,33 +68,24 @@ public class Kerr extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{ {
KERR_SPAWN_LOCATIONS.remove(npc);
ThreadPool.schedule(() -> spawnKerr(), RESPAWN_DELAY); ThreadPool.schedule(() -> spawnKerr(), RESPAWN_DELAY);
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }
private void spawnKerr() private void spawnKerr()
{ {
Location location = null; while (true)
while (location == null)
{ {
final Location randomLocation = getRandomEntry(SPAWNS); final Location location = getRandomEntry(SPAWNS);
final WorldRegion region = World.getInstance().getRegion(randomLocation.getX(), randomLocation.getY()); if (KERR_SPAWN_LOCATIONS.containsValue(location))
if (region == null)
{ {
continue; continue;
} }
SEARCH: for (WorldObject wo : region.getVisibleObjects()) KERR_SPAWN_LOCATIONS.put(addSpawn(KERR, location), location);
{ break;
if ((wo.getId() == KERR) && (wo.calculateDistance2D(randomLocation) < MIN_SPAWN_DISTANCE))
{
continue SEARCH;
}
location = randomLocation;
}
} }
addSpawn(KERR, location);
} }
public static void main(String[] args) public static void main(String[] args)