From 5fb4be9c89875fbe6d93010bec24c54cd492f6f4 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Wed, 15 Nov 2023 16:28:33 +0100 Subject: [PATCH] Added new spawner flag QUEST, which acts like INVULNERABLE but additionally adds a blue info icon above the NPC #1424 --- .../data/server_info/loader/npc/NpcStaticSpawnLoader.java | 5 +++-- .../holocore/resources/support/npc/spawn/NPCCreator.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/NpcStaticSpawnLoader.java b/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/NpcStaticSpawnLoader.java index 0b5c6a266..9e3175d5c 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/NpcStaticSpawnLoader.java +++ b/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/NpcStaticSpawnLoader.java @@ -1,5 +1,5 @@ /*********************************************************************************** - * Copyright (c) 2019 /// Project SWG /// www.projectswg.com * + * Copyright (c) 2023 /// Project SWG /// www.projectswg.com * * * * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on * * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. * @@ -69,7 +69,8 @@ public final class NpcStaticSpawnLoader extends DataLoader { public enum SpawnerFlag { AGGRESSIVE, ATTACKABLE, - INVULNERABLE + INVULNERABLE, + QUEST } public static class StaticSpawnInfo implements SpawnInfo { diff --git a/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java b/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java index 502c3d54f..902729e21 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java +++ b/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java @@ -150,6 +150,10 @@ public class NPCCreator { case INVULNERABLE: object.addOptionFlags(OptionFlag.INVULNERABLE); break; + case QUEST: + object.addOptionFlags(OptionFlag.INVULNERABLE); + object.addOptionFlags(OptionFlag.INTERESTING); + break; } }