Add multi target hunt modes, sheep shearing and berry bushes (#613)

* Add multi-target hunt modes closes #566

* Change transforms

* Add sheep shearing

* Add berry bushes

* Add script exception name

Author: GregHib

data/definitions/animations.yml

@@ -1401,6 +1401,7 @@ giant_spider_defend: 5328
 giant_spider_death: 5329
 rat_attack: 2705
 rat_defend: 2706
+rat_death: 2707
 giant_rat_attack: 14859
 giant_rat_death: 14860
 giant_rat_defend: 14861
@@ -1569,6 +1570,7 @@ traiborn_bone_spell: 4602
 summon_demon: 4617
 demon_attack: 64
 demon_defend: 65
+demon_death: 67
 delrith_continue: 4620
 delrith_appear: 4623
 delrith_death: 4624
@@ -1871,3 +1873,5 @@ edgeville_to_barbarian_village: 9903
 barbarian_village_to_lumbridge: 9904
 barbarian_village_to_champions_guild: 9904
 champions_guild_to_lumbridge: 9904
+shear_sheep: 893
+pick_plant: 2282

data/definitions/npcs.yml

@@ -57,6 +57,10 @@ sheep:
   wander_radius: 10
   race: sheep
   examine: "White and fluffy."
+sheep_shorn:
+  <<: *sheep
+  id: 42
+  examine: "Freshly sheared."
 banker:
   id: 44
   interact_distance: 2
@@ -847,9 +851,17 @@ crow_2:
 crow_3:
   <<: *crow
   id: 1756
+sheep_black_feet_shorn:
+  <<: *sheep
+  id: 1762
+  examine: "Freshly sheared."
 sheep_black_feet:
   <<: *sheep
   id: 1763
+sheep_2_shorn:
+  <<: *sheep
+  id: 1764
+  examine: "Freshly sheared."
 sheep_2:
   <<: *sheep
   id: 1765
@@ -1380,15 +1392,64 @@ lil_lamb:
   <<: *sheep
   id: 5146
   examine: "How cute!"
-sheep_light:
+sheep_light_1_shorn:
+  <<: *sheep
+  id: 5148
+  examine: "Freshly sheared."
+sheep_light_1:
+  <<: *sheep
+  id: 5156
+sheep_light_2_shorn:
+  <<: *sheep
+  id: 5149
+  examine: "Freshly sheared."
+sheep_light_2:
   <<: *sheep
   id: 5157
-sheep_grey:
+sheep_light_3_shorn:
+  <<: *sheep
+  id: 5150
+  examine: "Freshly sheared."
+sheep_light_3:
+  <<: *sheep
+  id: 5158
+sheep_light_4_shorn:
+  <<: *sheep
+  id: 5151
+  examine: "Freshly sheared."
+sheep_light_4:
+  <<: *sheep
+  id: 5159
+sheep_light_5_shorn:
+  <<: *sheep
+  id: 5152
+  examine: "Freshly sheared."
+sheep_light_5:
   <<: *sheep
   id: 5160
-sheep_light_2:
+sheep_light_6_shorn:
+  <<: *sheep
+  id: 5153
+  examine: "Freshly sheared."
+sheep_light_6:
   <<: *sheep
   id: 5161
+sheep_light_monastery_1_shorn:
+  <<: *sheep
+  id: 5154
+  examine: "White and shaggy."
+sheep_light_monastery_1:
+  <<: *sheep
+  id: 5162
+  examine: "White and shaggy."
+sheep_light_monastery_2_shorn:
+  <<: *sheep
+  id: 5155
+  examine: "White and shaggy."
+sheep_light_monastery_2:
+  <<: *sheep
+  id: 5163
+  examine: "White and shaggy."
 banker_sophanem_dungeon:
   id: 5258
   interact_distance: 2
@@ -1927,6 +1988,10 @@ sheep_black:
   <<: *sheep
   id: 8876
   examine: "It's sporting the height of wool-based fashion."
+sheep_black_shorn:
+  <<: *sheep
+  id: 8877
+  examine: "Freshly sheared."
 iconis:
   id: 8879
   race: human

data/definitions/objects.yml

@@ -12055,3 +12055,24 @@ a_sinking_canoe_stable_dugout:
 a_sinking_canoe_waka:
   id: 12162
   examine: "Glug, glug, glug."
+nettles:
+  id: 1181
+  examine: "I'd better not get stung."
+cadava_bush_full:
+  id: 23625
+  examine: "Wild cadava berries are growing here."
+cadava_bush_half:
+  id: 23626
+  examine: "Wild cadava berries are growing here."
+cadava_bush_empty:
+  id: 23627
+  examine: "Wild cadava berries grow here."
+redberry_bush_full:
+  id: 23628
+  examine: "Wild redberries are growing here."
+redberry_bush_half:
+  id: 23629
+  examine: "Wild redberries are growing here."
+redberry_bush_empty:
+  id: 23630
+  examine: "Wild redberries grow here."

data/spawns/npc-spawns.yml

@@ -1086,8 +1086,8 @@
 - { id: sheep, x: 2659, y: 4707, members: true }
 - { id: sheep_black_feet, x: 2653, y: 4713, members: true }
 - { id: sheep_2, x: 2659, y: 4714, members: true }
-- { id: sheep_grey, x: 2656, y: 4714, members: true }
-- { id: sheep_light_2, x: 2653, y: 4706, members: true }
+- { id: sheep_light_5, x: 2656, y: 4714, members: true }
+- { id: sheep_light_6, x: 2653, y: 4706, members: true }
 - { id: duck_swim, x: 2662, y: 4686, members: true }
 - { id: duck_swim, x: 2666, y: 4687, members: true }
 - { id: duck_swim, x: 2668, y: 4688, members: true }
@@ -1310,8 +1310,8 @@
 - { id: sheep, x: 2921, y: 3319 }
 - { id: sheep_2, x: 2920, y: 3320 }
 - { id: sheep_2, x: 2922, y: 3320 }
-- { id: sheep_light_2, x: 2925, y: 3324 }
-- { id: sheep_light_2, x: 2920, y: 3318 }
+- { id: sheep_light_6, x: 2925, y: 3324 }
+- { id: sheep_light_6, x: 2920, y: 3318 }
 - { id: cow, x: 2917, y: 3289 }
 - { id: cow, x: 2925, y: 3282 }
 - { id: cow, x: 2926, y: 3271 }
@@ -1796,7 +1796,7 @@
 - { id: butterfly_1, x: 3179, y: 3226 }
 - { id: sheep, x: 3197, y: 3261 }
 - { id: sheep_2, x: 3193, y: 3262 }
-- { id: sheep_grey, x: 3197, y: 3263 }
+- { id: sheep_light_5, x: 3197, y: 3263 }
 - { id: sheep_black, x: 3195, y: 3263 }
 - { id: hank, x: 3195, y: 3254 }
 - { id: giant_spider, x: 3165, y: 3249 }
@@ -1839,8 +1839,8 @@
 - { id: sheep, x: 3197, y: 3265 }
 - { id: sheep_2, x: 3197, y: 3269 }
 - { id: sheep_penguin, x: 3199, y: 3267 }
-- { id: sheep_grey, x: 3195, y: 3272 }
-- { id: sheep_light_2, x: 3194, y: 3267 }
+- { id: sheep_light_5, x: 3195, y: 3272 }
+- { id: sheep_light_6, x: 3194, y: 3267 }
 - { id: sheep_black, x: 3195, y: 3275 }
 - { id: cow_calf_2, x: 3166, y: 3321 }
 - { id: cow_calf_3, x: 3181, y: 3315 }
@@ -2190,9 +2190,9 @@
 - { id: chicken, x: 3230, y: 3298 }
 - { id: chicken, x: 3235, y: 3298 }
 - { id: chicken, x: 3237, y: 3323 }
-- { id: sheep_grey, x: 3202, y: 3271 }
-- { id: sheep_light_2, x: 3210, y: 3274 }
-- { id: sheep_light, x: 3205, y: 3266 }
+- { id: sheep_light_5, x: 3202, y: 3271 }
+- { id: sheep_light_6, x: 3210, y: 3274 }
+- { id: sheep_light_2, x: 3205, y: 3266 }
 - { id: sheep_black, x: 3208, y: 3272 }
 - { id: sheep_black, x: 3208, y: 3267 }
 - { id: sheep_black, x: 3201, y: 3271 }
@@ -2206,9 +2206,9 @@
 - { id: gillie_groats, x: 3254, y: 3274 }
 # 12852
 - { id: sheep, x: 3238, y: 3349 }
-- { id: sheep_grey, x: 3246, y: 3344 }
-- { id: sheep_light_2, x: 3246, y: 3350 }
-- { id: sheep_light_2, x: 3233, y: 3343 }
+- { id: sheep_light_5, x: 3246, y: 3344 }
+- { id: sheep_light_6, x: 3246, y: 3350 }
+- { id: sheep_light_6, x: 3233, y: 3343 }
 - { id: dark_wizard_water, x: 3225, y: 3374 }
 - { id: dark_wizard_water, x: 3232, y: 3367 }
 - { id: dark_wizard_water, x: 3225, y: 3365 }

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

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

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

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

engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/hunt/Hunting.kt

@@ -58,22 +58,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))
                 }
             }
         }

game/src/main/kotlin/ContentLoader.kt

@@ -23,15 +23,17 @@ object ContentLoader {
                 scriptCount++
             }
         } else {
+            var script = ""
             try {
                 while (scripts.ready()) {
-                    loadScript(scripts.readLine())
+                    script = scripts.readLine()
+                    loadScript(script)
                     scriptCount++
                 }
                 scripts.close()
-            } catch (e: ClassNotFoundException) {
+            } catch (e: Exception) {
                 scripts.close()
-                logger.error(e) { "Failed to load script: ${e.message}" }
+                logger.error(e) { "Failed to load script: $script" }
                 logger.error { "Make sure the scripts package is correct." }
                 exitProcess(1)
             }