projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity

refactor(npc): renamed methods for spawning NPCs to make it more obvious what amount of NPCs are being spawned

Browse Source
This commit is contained in:
Mads Boddum
2023-09-23 10:43:38 +02:00
parent bee4d25dbe
commit 0e2ab0c294
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java
+3 -3
View File
@@ -61,19 +61,19 @@ import java.util.concurrent.ThreadLocalRandom;
public class NPCCreator {
public static Collection<AIObject> createNPCs(Spawner spawner) {
public static Collection<AIObject> createAllNPCs(Spawner spawner) {
Arguments.validate(spawner.getMinLevel() <= spawner.getMaxLevel(), "min level must be less than max level");
int amount = spawner.getAmount();
Collection<AIObject> npcs = new ArrayList<>();
for (int i = 0; i < amount; i++) {
npcs.add(createNPC(spawner));
npcs.add(createSingleNpc(spawner));
}
return npcs;
}
private static AIObject createNPC(Spawner spawner) {
public static AIObject createSingleNpc(Spawner spawner) {
int combatLevel = ThreadLocalRandom.current().nextInt(spawner.getMinLevel(), spawner.getMaxLevel()+1);
AIObject object = ObjectCreator.createObjectFromTemplate(spawner.getRandomIffTemplate(), AIObject.class);
src/main/java/com/projectswg/holocore/services/gameplay/missions/DestroyMissionTerminal.kt
+1 -1
View File
@@ -120,7 +120,7 @@ class DestroyMissionTerminal(private val missionsToGenerate: Int, private val de
.withBehavior(AIBehavior.LOITER)
.build()
NPCCreator.createNPCs(Spawner(spawnInfo, egg))
NPCCreator.createAllNPCs(Spawner(spawnInfo, egg))
}
private fun createLair(missionObject: MissionObject): TangibleObject {
src/main/java/com/projectswg/holocore/services/support/npc/spawn/SpawnerService.kt
+2 -2
View File
@@ -154,7 +154,7 @@ class SpawnerService : Service() {
if (respawnDelay > 0) {
executor.execute((respawnDelay * 1000).toLong()) {
NPCCreator.createNPCs(spawner)
NPCCreator.createAllNPCs(spawner)
}
} else {
DestroyObjectIntent.broadcast(spawner.egg)
@@ -202,7 +202,7 @@ class SpawnerService : Service() {
val spawner = Spawner(spawn, egg)
egg.setServerAttribute(ServerAttribute.EGG_SPAWNER, spawner)
NPCCreator.createNPCs(spawner)
NPCCreator.createAllNPCs(spawner)
val patrolRoute = spawner.patrolRoute
if (patrolRoute != null) {
src/test/java/com/projectswg/holocore/services/gameplay/combat/NpcDefaultAttackTest.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class NpcDefaultAttackTest : TestRunnerSynchronousIntents() {
.withLocation(inFrontOfMosEisleyStarport)
.build()
return NPCCreator.createNPCs(Spawner(spawnInfo, egg)).first()
return NPCCreator.createAllNPCs(Spawner(spawnInfo, egg)).first()
}
}