Add multi-target hunt modes closes GregHib#566

jarryd229 · Dec 30, 2024 · 0712977 · 0712977
1 parent 801b3ba
commit 0712977
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntFloorItem.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntFloorItem.kt
@@ -8,7 +8,8 @@ import world.gregs.voidps.engine.event.Events
 
 data class HuntFloorItem(
     val mode: String,
-    val target: FloorItem
+    val targets: List<FloorItem>,
+    val target: FloorItem = targets.random()
 ) : Event {
 
     override val size = 4

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntNPC.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntNPC.kt
@@ -7,7 +7,8 @@ import world.gregs.voidps.engine.event.Events
 
 data class HuntNPC(
     val mode: String,
-    val target: NPC
+    val targets: List<NPC>,
+    val target: NPC = targets.random()
 ) : Event {
 
     override val size = 4

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntObject.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntObject.kt
@@ -8,7 +8,8 @@ import world.gregs.voidps.engine.event.Events
 
 data class HuntObject(
     val mode: String,
-    val target: GameObject
+    val targets: List<GameObject>,
+    val target: GameObject = targets.random()
 ) : Event {
 
     override val size = 4

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntPlayer.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/HuntPlayer.kt
@@ -8,7 +8,8 @@ import world.gregs.voidps.engine.event.Events
 
 data class HuntPlayer(
     val mode: String,
-    val target: Player
+    val targets: List<Player>,
+    val target: Player = targets.random()
 ) : Event {
 
     override val size = 3

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/Hunting.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/Hunting.kt
@@ -59,22 +59,22 @@ class Hunting(
                 "player" -> {
                     val targets = getCharacters(npc, players, range, definition)
                     val target = targets.randomOrNull(seed) ?: continue
-                    npc.emit(HuntPlayer(mode, target))
+                    npc.emit(HuntPlayer(mode, targets, target))
                 }
                 "npc" -> {
                     val targets = getCharacters(npc, npcs, range, definition)
                     val target = targets.randomOrNull(seed) ?: continue
-                    npc.emit(HuntNPC(mode, target))
+                    npc.emit(HuntNPC(mode, targets, target))
                 }
                 "object" -> {
                     val targets = getObjects(npc, definition)
                     val target = targets.randomOrNull(seed) ?: continue
-                    npc.emit(HuntObject(mode, target))
+                    npc.emit(HuntObject(mode, targets, target))
                 }
                 "floor_item" -> {
                     val targets = getItems(npc, range, definition)
                     val target = targets.randomOrNull(seed) ?: continue
-                    npc.emit(HuntFloorItem(mode, target))
+                    npc.emit(HuntFloorItem(mode, targets, target))
                 }
             }
         }