From 776931c7a4a92a9eab59ac372e0d7684f9221377 Mon Sep 17 00:00:00 2001 From: Logg Date: Sun, 27 Mar 2022 05:01:05 +0000 Subject: [PATCH] Replaced instances of "Hatchet" with "Axe" (except for stealing creation hatchet & others that were introduced as "Hatchet") --- Server/data/configs/item_configs.json | 36 +++++++++---------- .../core/game/content/dialogue/BarfyBill.java | 2 +- .../game/content/dialogue/HariDialogue.java | 2 +- .../game/content/dialogue/SigurdDialogue.java | 2 +- .../content/dialogue/TarquinDialogue.java | 2 +- .../woodcutting/WoodcuttingSkillPulse.java | 2 +- .../game/content/tutorial/TutorialStage.kt | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index d29bc0c9f..f46f68940 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -5122,7 +5122,7 @@ "id": "507" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -5137,7 +5137,7 @@ "id": "509" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -5152,7 +5152,7 @@ "id": "511" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -5167,7 +5167,7 @@ "id": "513" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -5182,7 +5182,7 @@ "id": "515" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -5197,7 +5197,7 @@ "id": "517" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -5212,7 +5212,7 @@ "id": "519" }, { - "examine": "A piece of ancient goblin hatchet.", + "examine": "A piece of ancient goblin axe.", "durability": null, "name": "Picture", "high_alchemy": "1", @@ -15148,7 +15148,7 @@ { "shop_price": "56", "ge_buy_limit": "100", - "examine": "A woodcutter's hatchet.", + "examine": "A woodcutter's axe.", "durability": null, "low_alchemy": "22", "high_alchemy": "33", @@ -15177,7 +15177,7 @@ { "shop_price": "20", "ge_buy_limit": "100", - "examine": "A woodcutter's hatchet.", + "examine": "A woodcutter's axe.", "durability": null, "low_alchemy": "6", "high_alchemy": "9", @@ -15208,7 +15208,7 @@ "requirements": "{0,5}", "shop_price": "200", "ge_buy_limit": "100", - "examine": "A woodcutter's hatchet.", + "examine": "A woodcutter's axe.", "durability": null, "low_alchemy": "80", "high_alchemy": "120", @@ -15239,7 +15239,7 @@ "requirements": "{0,20}", "shop_price": "660", "ge_buy_limit": "100", - "examine": "A powerful hatchet.", + "examine": "A powerful axe.", "durability": null, "low_alchemy": "208", "high_alchemy": "312", @@ -15270,7 +15270,7 @@ "requirements": "{0,30}-{8,31}", "shop_price": "1625", "ge_buy_limit": "100", - "examine": "A powerful hatchet.", + "examine": "A powerful axe.", "durability": null, "low_alchemy": "512", "high_alchemy": "768", @@ -15300,7 +15300,7 @@ { "requirements": "{0,40}-{8,41}", "ge_buy_limit": "100", - "examine": "A powerful hatchet.", + "examine": "A powerful axe.", "durability": null, "low_alchemy": "5120", "high_alchemy": "7680", @@ -15328,7 +15328,7 @@ { "requirements": "{0,10}", "ge_buy_limit": "100", - "examine": "A sinister looking hatchet.", + "examine": "A sinister looking axe.", "durability": null, "low_alchemy": "153", "high_alchemy": "230", @@ -43479,7 +43479,7 @@ "id": "4414" }, { - "examine": "A jungle forester's blunt hatchet.", + "examine": "A jungle forester's blunt axe.", "durability": null, "name": "Blunt axe", "low_alchemy": "22", @@ -65476,7 +65476,7 @@ { "requirements": "{0,60}-{8,61}", "ge_buy_limit": "10", - "examine": "A very powerful hatchet.", + "examine": "A very powerful axe.", "has_special": "true", "rare_item": "true", "durability": null, @@ -123906,7 +123906,7 @@ "bonuses": "40,25,-4,1,0,0,0,0,1,0,0,40,0,0,0" }, { - "examine": "A powerful hatchet.", + "examine": "A powerful axe.", "durability": null, "low_alchemy": "5120", "high_alchemy": "7680", @@ -123923,7 +123923,7 @@ "bonuses": "-2,26,24,0,0,0,1,0,0,0,0,29,0,0,0" }, { - "examine": "A very powerful hatchet.", + "examine": "A very powerful axe.", "has_special": "true", "durability": null, "low_alchemy": "22000", diff --git a/Server/src/main/java/core/game/content/dialogue/BarfyBill.java b/Server/src/main/java/core/game/content/dialogue/BarfyBill.java index 7420dbcb3..8c6ccc5dc 100644 --- a/Server/src/main/java/core/game/content/dialogue/BarfyBill.java +++ b/Server/src/main/java/core/game/content/dialogue/BarfyBill.java @@ -66,7 +66,7 @@ public final class BarfyBill extends DialoguePlugin { } break; case 24: - npc("Then take your hatchet to it and shape it how you like!"); + npc("Then take your axe to it and shape it how you like!"); stage = 26; break; case 26: diff --git a/Server/src/main/java/core/game/content/dialogue/HariDialogue.java b/Server/src/main/java/core/game/content/dialogue/HariDialogue.java index f278a17ec..c65644d19 100644 --- a/Server/src/main/java/core/game/content/dialogue/HariDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/HariDialogue.java @@ -102,7 +102,7 @@ public final class HariDialogue extends DialoguePlugin { } break; case 18: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have done that you can shape the log further", "with your hatchet to make a canoe."); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have done that you can shape the log further", "with your axe to make a canoe."); stage = 19; break; case 19: diff --git a/Server/src/main/java/core/game/content/dialogue/SigurdDialogue.java b/Server/src/main/java/core/game/content/dialogue/SigurdDialogue.java index f64b80363..f8dfe0c86 100644 --- a/Server/src/main/java/core/game/content/dialogue/SigurdDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/SigurdDialogue.java @@ -113,7 +113,7 @@ public class SigurdDialogue extends DialoguePlugin { break; case 24: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Then take your hatchet to it and shape it how you", "like!"); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Then take your axe to it and shape it how you", "like!"); stage = 26; break; case 26: diff --git a/Server/src/main/java/core/game/content/dialogue/TarquinDialogue.java b/Server/src/main/java/core/game/content/dialogue/TarquinDialogue.java index 24cf9d4fa..f4fc2ce25 100644 --- a/Server/src/main/java/core/game/content/dialogue/TarquinDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/TarquinDialogue.java @@ -105,7 +105,7 @@ public class TarquinDialogue extends DialoguePlugin { } break; case 24: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Then take your hatchet to it and shape it how you like!"); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Then take your axe to it and shape it how you like!"); stage = 26; break; case 26: diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java index 6b9ee24f0..7678bf604 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java @@ -88,7 +88,7 @@ public class WoodcuttingSkillPulse extends Pulse { return false; } if (SkillingTool.getHatchet(player) == null) { - player.getPacketDispatch().sendMessage("You do not have a hatchet to use."); + player.getPacketDispatch().sendMessage("You do not have an axe to use."); return false; } if (player.getInventory().freeSlots() < 1) { diff --git a/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt b/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt index bcf472d3c..0f94cf243 100644 --- a/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt +++ b/Server/src/main/kotlin/rs09/game/content/tutorial/TutorialStage.kt @@ -265,7 +265,7 @@ object TutorialStage { "Cooking your shrimp", "Now you have caught some shrimp, let's cook it. First light a fire: chop", "down a tree and then use the tinderbox on the logs. If you've lost", - "your hatchet or tinderbox Brynna will give you another.", + "your axe or tinderbox Brynna will give you another.", "Once you have a fire, \"use\" your shrimp on the fire." ) )