diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index e80616121..08c59f790 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -49745,7 +49745,7 @@ }, { "shop_price": "900", - "examine": "Unlit: A helmet with an unlit lamp on it. Lit: A helmet with a lamp on it.", + "examine": "A helmet with a lamp on it.", "durability": null, "low_alchemy": "360", "high_alchemy": "540", @@ -49762,7 +49762,7 @@ "requirements": "{11,65}", "shop_price": "900", "ge_buy_limit": "100", - "examine": "Unlit: A helmet with an unlit lamp on it. Lit: A helmet with a lamp on it.", + "examine": "A helmet with an unlit lamp on it.", "durability": null, "low_alchemy": "360", "high_alchemy": "540", diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json index cf676654e..66977fcf0 100644 --- a/Server/data/configs/npc_configs.json +++ b/Server/data/configs/npc_configs.json @@ -1762,6 +1762,7 @@ "melee_animation": "6559", "combat_audio": "481,491,490", "attack_speed": "4", + "defence_animation": "6557", "slayer_exp": "69", "death_animation": "6558", "name": "Wolf", @@ -73419,6 +73420,7 @@ "melee_animation": "6559", "combat_audio": "481,491,490", "attack_speed": "4", + "defence_animation": "6557", "slayer_exp": "69", "death_animation": "6558", "name": "Wolf", @@ -122149,6 +122151,7 @@ "melee_animation": "6559", "combat_audio": "481,491,490", "attack_speed": "4", + "defence_animation": "6557", "slayer_exp": "69", "death_animation": "6558", "name": "Wolf", @@ -171810,6 +171813,7 @@ "melee_animation": "6559", "combat_audio": "481,491,490", "attack_speed": "4", + "defence_animation": "6557", "slayer_exp": "69", "death_animation": "6558", "name": "Wolf", diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java b/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java index ed2aeb7c1..2d4bf79a6 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java @@ -226,14 +226,14 @@ public enum SkillingResource { COPPER_ORE_41(37688, 1, 0.05, 4 | 8 << 16, 17.5, 436, 1, "copper rocks", null, 21298, Skills.MINING), COPPER_ORE_42(37686, 1, 0.05, 4 | 8 << 16, 17.5, 436, 1, "copper rocks", null, 21296, Skills.MINING), COPPER_ORE_43(37687, 1, 0.05, 4 | 8 << 16, 17.5, 436, 1, "copper rocks", null, 21297, Skills.MINING), - COPPER_ORE_44(3042, 1, 0.05, 4 | 8 << 16, 17.5, 436, 1, "copper rocks", null, 450, Skills.MINING), + COPPER_ORE_44(3042, 1, 0.05, 4 | 8 << 16, 17.5, 436, 1, "copper rocks", null, 11552, Skills.MINING), /** * Tin ore (Mining). */ TIN_ORE_0(2094, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 450, Skills.MINING), TIN_ORE_1(2095, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 452, Skills.MINING), - TIN_ORE_2(3043, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 450, Skills.MINING), + TIN_ORE_2(3043, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 11552, Skills.MINING), TIN_ORE_3(4979, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 4994, Skills.MINING), TIN_ORE_4(4980, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 4995, Skills.MINING), TIN_ORE_5(4981, 1, 0.05, 4 | 8 << 16, 17.5, 438, 1, "tin rocks", null, 4996, Skills.MINING), diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java index 31606e965..1d837914b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java @@ -7,7 +7,7 @@ import rs09.game.world.repository.Repository; import java.util.ArrayList; import java.util.HashMap; import java.util.List; - +// 11553 11552 /** * Mining nodes * @author ceik @@ -58,12 +58,12 @@ public enum MiningNode{ COPPER_ORE_41(37688,21298, (byte) 1), COPPER_ORE_42(37686,21296, (byte) 1), COPPER_ORE_43(37687,21297, (byte) 1), - COPPER_ORE_44(3042, 450, (byte) 1), + COPPER_ORE_44(3042, 11552, (byte) 1), //Tin TIN_ORE_0( 2094, 450, (byte) 2), TIN_ORE_1( 2095, 452, (byte) 2), - TIN_ORE_2( 3043, 450, (byte) 2), + TIN_ORE_2( 3043, 11552, (byte) 2), TIN_ORE_3( 4979, 4994, (byte) 2), TIN_ORE_4( 4980, 4995, (byte) 2), TIN_ORE_5( 4981, 4996, (byte) 2), diff --git a/Server/src/main/kotlin/rs09/game/interaction/item/MiningHelmetListener.kt b/Server/src/main/kotlin/rs09/game/interaction/item/MiningHelmetListener.kt new file mode 100644 index 000000000..bc178eeef --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/interaction/item/MiningHelmetListener.kt @@ -0,0 +1,16 @@ +package rs09.game.interaction.item + +import api.* +import rs09.game.interaction.InteractionListener +import org.rs09.consts.Items + +class MiningHelmetListener : InteractionListener { + override fun defineListeners() { + on(Items.MINING_HELMET_5013, ITEM, "drop") {player, _ -> + val removed = removeItem(player, Items.MINING_HELMET_5013) + if (removed) produceGroundItem(player, Items.MINING_HELMET_5014) + sendMessage(player, "The helmet goes out as you drop it.") + return@on true + } + } +} \ No newline at end of file diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt index c9daf5557..6cfeb369c 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt @@ -10,6 +10,7 @@ enum class LightSources(val emptyID: Int, val fullID: Int, val litID: Int, val l OIL_LANTERN(4535,4537,4539,26,false), BULLSEYE_LANTERN(4546,4548,4550,49,false), SAPPHIRE_LANTERN(0,4701,4702,49,false), + MINING_HELMET(0,5014,5013,65,false), EMERALD_LANTERN(0,9064,9065,49,false); companion object { @@ -24,6 +25,7 @@ enum class LightSources(val emptyID: Int, val fullID: Int, val litID: Int, val l 4537, 4539 -> OIL_LANTERN 4548, 4550 -> BULLSEYE_LANTERN 4701, 4702 -> SAPPHIRE_LANTERN + 5014, 5013 -> MINING_HELMET 9064, 9065 -> EMERALD_LANTERN else -> null }