Add skilling tests and fixes (#945)

* Add smithing tests

* Add bone burying tests

* Add herblore tests

* Add more prayer tests, fix bone offering

* Spawn brother when opening not searching barrows chest

* Fix resetting barrows

* Fix despawning barrows brothers

* Fix npc defs not loading clones which haven't been defined yet

* Add crafting tests and a few npc dialogues

* Fix music tracks not changing between areas closes #936

* Formatting

* Add all looms closes #875

Author: GregHib

data/area/misthalin/barbarian_village/barbarian_village.npc-spawns.toml

@@ -10,7 +10,7 @@ spawns = [
   { id = "chieftain_gunthor", x = 3078, y = 3444 },
   { id = "haakon_the_champion", x = 3081, y = 3444 },
   { id = "kjell", x = 3079, y = 3414, direction = "NORTH_EAST" },
-  { id = "tassie_slipcast_barbarian_village", x = 3084, y = 3408, members = true },
+  { id = "tassie_slipcast", x = 3084, y = 3408, members = true },
   { id = "barbarian_barbarian_outpost", x = 3079, y = 3444 },
   { id = "barbarian_barbarian_outpost_2", x = 3079, y = 3409 },
   { id = "barbarian_barbarian_outpost_3", x = 3079, y = 3437 },

data/area/misthalin/barbarian_village/barbarian_village.npcs.toml

@@ -87,7 +87,7 @@ examine = "A mighty warrior, Haakon is powerfully concerned for his tribe."
 id = 3329
 examine = "His furs look very damp."
 
-[tassie_slipcast_barbarian_village]
+[tassie_slipcast]
 id = 1793
 examine = "A hard-working potter."
 

data/area/tirannwn/iorwerth_camp/iorwerth_camp.objs.toml

@@ -0,0 +1,2 @@
+[loom_iorwerth_camp]
+id = 787

data/skill/crafting/weaving.tables.toml

@@ -3,28 +3,33 @@ row_id = "item"
 level = "int"
 xp = "int"
 amount = "int"
+amount_default = 1
 product = "item"
 plural = "string"
 
 [.ball_of_wool]
 level = 10
 xp = 120
+amount = 4
 product = "strip_of_cloth"
 plural = "balls of wool"
 
 [.flax]
 level = 52
+amount = 5
 product = "unfinished_net"
 plural = "flax"
 
 [.jute_fibre]
 level = 21
 xp = 380
+amount = 4
 product = "empty_sack"
 plural = "jute fibres"
 
 [.willow_branch]
 level = 36
 xp = 560
+amount = 6
 product = "basket"
 plural = "willow branches"

data/skill/herblore/potion.recipes.toml

@@ -34,7 +34,7 @@ level = 12
 xp = 50.0
 ticks = 2
 remove = ["harralander_potion_unf", "red_spiders_eggs"]
-add = ["strength_potion_3"]
+add = ["restore_potion_3"]
 animation = "mixing_potion"
 message = "You mix the limpwurt root into your potion."
 
@@ -98,7 +98,7 @@ add = ["agility_potion_3"]
 animation = "mixing_potion"
 message = "You mix the toads legs into your potion."
 
-[combat_potion_finished_finished]
+[combat_potion_finished]
 skill = "herblore"
 level = 36
 xp = 84.0
@@ -218,7 +218,7 @@ add = ["magic_essence_3"]
 animation = "mixing_potion"
 message = "You mix the gorak claw powder into your potion."
 
-[fletching_potion_finished_finished]
+[fletching_potion_finished]
 skill = "herblore"
 level = 58
 xp = 132.0
@@ -383,7 +383,7 @@ skill = "herblore"
 level = 84
 xp = 200.0
 ticks = 2
-remove = ["cw_super_energy_potion_3", "papaya_fruit"]
+remove = ["super_energy_3", "papaya_fruit"]
 add = ["recover_special_3"]
 animation = "mixing_potion"
 message = "You mix the papaya fruit into your potion"

engine/src/main/kotlin/world/gregs/voidps/engine/client/ui/Interfaces.kt

@@ -290,6 +290,5 @@ fun Player.playTrack(trackIndex: Int) {
     playMusicTrack(EnumDefinitions.get("music_tracks").int(trackIndex))
     val name = EnumDefinitions.get("music_track_names").string(trackIndex)
     interfaces.sendText("music_player", "currently_playing", name)
-    this["playing_song"] = true
     this["current_track"] = trackIndex
 }

engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/NPCDefinitions.kt

@@ -3,6 +3,7 @@ package world.gregs.voidps.engine.data.definition
 import it.unimi.dsi.fastutil.Hash
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet
 import org.jetbrains.annotations.TestOnly
 import world.gregs.config.Config
@@ -46,6 +47,7 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
         dropTables: DropTables? = null,
     ): NPCDefinitions {
         timedLoad("npc config") {
+            val clones = Object2ObjectOpenHashMap<String, String>(100)
             val ids = Object2IntOpenHashMap<String>()
             val refs = Object2IntOpenHashMap<String>()
             ids.defaultReturnValue(-1)
@@ -60,10 +62,13 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
                             when (val key = key()) {
                                 "clone" -> {
                                     val name = string()
-                                    val npc = refs.getInt(name)
-                                    require(npc >= 0) { "Cannot find npc to clone with id '$name' in ${path}. Make sure it's in the same file." }
-                                    val definition = definitions[npc]
-                                    params.putAll(definition.params ?: continue)
+                                    val npcId = ids.getInt(name)
+                                    if (npcId == -1) {
+                                        clones[stringId] = name
+                                    } else {
+                                        val definition = definitions[npcId]
+                                        params.putAll(definition.params ?: continue)
+                                    }
                                 }
                                 "id" -> id = int()
                                 "categories" -> {
@@ -94,6 +99,25 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
                         }
                     }
                 }
+
+                for ((item, clone) in clones) {
+                    val cloneId = ids.getInt(clone)
+                    require(cloneId != -1) { "Unable to find npc id to clone '$clone'" }
+                    val definition = definitions[cloneId]
+                    val id = ids.getInt(item)
+                    require(id != -1) { "Unable to find npc id '$item'" }
+                    val params = definitions[id].params as? MutableMap<Int, Any>
+                    if (params != null) {
+                        for (param in definition.params ?: continue) {
+                            if (param.key == Params.AKA) {
+                                continue
+                            }
+                            if (!params.containsKey(param.key)) {
+                                params[param.key] = param.value
+                            }
+                        }
+                    }
+                }
             }
             this.ids = ids
             ids.size

game/src/main/kotlin/content/area/asgarnia/falador/farm/Sarah.kt

@@ -0,0 +1,63 @@
+package content.area.asgarnia.falador.farm
+
+import content.entity.player.dialogue.Happy
+import content.entity.player.dialogue.Neutral
+import content.entity.player.dialogue.Quiz
+import content.entity.player.dialogue.type.choice
+import content.entity.player.dialogue.type.npc
+import content.entity.player.dialogue.type.player
+import content.entity.player.dialogue.type.statement
+import world.gregs.voidps.engine.Script
+import world.gregs.voidps.engine.client.message
+import world.gregs.voidps.engine.inv.inventory
+import world.gregs.voidps.engine.inv.remove
+
+class Sarah : Script {
+    init {
+        npcOperate("Talk-to", "sarah") {
+            npc<Neutral>("Hello. How can I help you?")
+            choice {
+                option<Quiz>("What are you selling?")
+                option<Quiz>("Can you give me any Farming advice?") {
+                    npc<Neutral>("Yes - ask a gardener.")
+                }
+                option<Quiz>("Can you tell me how to use the loom?") {
+                    npc<Neutral>("Well, it's actually my loom, but I don't mind you using it, if you like. You can use it to weave sacks and baskets in which you can put vegetables and fruit.")
+                    choice {
+                        option<Quiz>("What do I need to weave sacks?") {
+                            npc<Neutral>("Well, the best sacks are made with jute fibres; you can grow jute yourself in a hops patch. I'd say about 4 jute fibres should be enough to weave a sack.")
+                            player<Happy>("Thank you, that's very kind.")
+                        }
+                        option<Quiz>("What do I need to weave baskets?") {
+                            npc<Neutral>("Well, the best baskets are made with young branches cut from a willow tree. You'll need a very young willow tree; otherwise, the branches will have grown too thick to be able to weave. I suggest growing your own.")
+                            npc<Neutral>("You can cut the branches with a standard pair of secateurs. You will probably need about 6 willow branches to weave a complete basket.")
+                            player<Happy>("Thank you, that's very kind.")
+                        }
+                        option<Happy>("Thank you, that's very kind.")
+                    }
+                }
+                option<Neutral>("I'm okay, thank you.")
+            }
+        }
+
+        itemOnNPCOperate("*", "sheepdog") { (target, item) ->
+            anim("climb_down")
+            when (item.id) {
+                "bones" -> {
+                    inventory.remove(item.id)
+                    target.say("Woof woof!")
+                    statement("You give the dog some nice bones.<br>It happily gnaws on them.")
+                }
+                "cooked_meat", "cooked_chicken" -> {
+                    inventory.remove(item.id)
+                    target.say("Woof woof!")
+                    statement("You give the dog a nice piece of meat.<br>It gobbles it up.")
+                }
+                else -> {
+                    target.say("Grrrr!")
+                    message("The dog doesn't seem interested in that.")
+                }
+            }
+        }
+    }
+}

game/src/main/kotlin/content/area/misthalin/barbarian_village/Barbarian.kt

@@ -0,0 +1,22 @@
+package content.area.misthalin.barbarian_village
+
+import content.entity.player.dialogue.Angry
+import content.entity.player.dialogue.Quiz
+import content.entity.player.dialogue.type.npc
+import world.gregs.voidps.engine.Script
+import world.gregs.voidps.type.random
+
+class Barbarian : Script {
+    init {
+        npcOperate("Talk-to", "barbarian_barbarian_village*") {
+            when (random.nextInt(5)) {
+                0 -> npc<Quiz>("Wanna fight?")
+                1 -> npc<Quiz>("Ah, you come for fight, ja?")
+                2 -> npc<Angry>("You look funny.")
+                3 -> npc<Angry>("Grrr!")
+                4 -> npc<Quiz>("What you want?")
+                else -> npc<Angry>("Go Away!")
+            }
+        }
+    }
+}

game/src/main/kotlin/content/area/misthalin/barbarian_village/TassieSlipcast.kt

@@ -0,0 +1,14 @@
+package content.area.misthalin.barbarian_village
+
+import content.entity.player.dialogue.Happy
+import content.entity.player.dialogue.type.npc
+import world.gregs.voidps.engine.Script
+
+class TassieSlipcast : Script {
+    init {
+        npcOperate("Talk-to", "tassie_slipcast") {
+            npc<Happy>("Please feel free to use the pottery wheel, I won't be using it all the time. Put your pots in the kiln when you've made one.")
+            npc<Happy>("And make sure you tidy up after yourself!")
+        }
+    }
+}