From dbfbdcdacdd9b7377b211d90a51b8d6e68f7e3d6 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 3 Nov 2021 10:49:36 +0000
Subject: [PATCH] Added golf club

---
 .../common/abilities/ability_set_manifest.ron |  5 +++++
 .../abilities/tool/golf_club/charged.ron      | 17 +++++++++++++++
 .../common/items/weapons/tool/golf_club.ron   | 21 +++++++++++++++++++
 assets/voxygen/item_image_manifest.ron        |  5 +++++
 .../voxygen/voxel/biped_weapon_manifest.ron   |  4 ++++
 .../voxygen/voxel/weapon/tool/golf_club.vox   |  3 +++
 6 files changed, 55 insertions(+)
 create mode 100644 assets/common/abilities/tool/golf_club/charged.ron
 create mode 100644 assets/common/items/weapons/tool/golf_club.ron
 create mode 100644 assets/voxygen/voxel/weapon/tool/golf_club.vox

diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron
index bb94cd51db..62cca4443f 100644
--- a/assets/common/abilities/ability_set_manifest.ron
+++ b/assets/common/abilities/ability_set_manifest.ron
@@ -294,6 +294,11 @@
         secondary: "common.abilities.empty.basic",
         abilities: [],
     ),
+    Custom("Golf Club"): (
+        primary: "common.abilities.hammer.singlestrike",
+        secondary: "common.abilities.tool.golf_club.charged",
+        abilities: [],
+    ),
     Tool(Debug): (
         primary: "common.abilities.debug.forwardboost",
         secondary: "common.abilities.debug.upboost",
diff --git a/assets/common/abilities/tool/golf_club/charged.ron b/assets/common/abilities/tool/golf_club/charged.ron
new file mode 100644
index 0000000000..954c05dcf5
--- /dev/null
+++ b/assets/common/abilities/tool/golf_club/charged.ron
@@ -0,0 +1,17 @@
+ChargedMelee(
+    energy_cost: 1,
+    energy_drain: 1.0,
+    initial_damage: 1.0,
+    scaled_damage: 0.1,
+    initial_poise_damage: 1,
+    scaled_poise_damage: 1,
+    initial_knockback: 500.0,
+    scaled_knockback: 2000.0,
+    range: 5.0,
+    max_angle: 30.0,
+    charge_duration: 2.0,
+    swing_duration: 0.1,
+    hit_timing: 0.2,
+    recover_duration: 1.5,
+    damage_kind: Crushing,
+)
diff --git a/assets/common/items/weapons/tool/golf_club.ron b/assets/common/items/weapons/tool/golf_club.ron
new file mode 100644
index 0000000000..80a4d20624
--- /dev/null
+++ b/assets/common/items/weapons/tool/golf_club.ron
@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Golf Club",
+    description: "Peasant swatter. Fiercely anti-urbanist. Climate crisis? What climate crisis?",
+    kind: Tool((
+        kind: Hammer,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.5,
+            power: 0.6,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 0.083333336,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Golf Club")),
+)
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index e4d3c04279..e353e31449 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -2866,6 +2866,11 @@
         "voxel.weapon.tool.broom_belzeshrub_purple",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
+    // Misc
+    Tool("common.items.weapons.tool.golf_club"): VoxTrans(
+        "voxel.weapon.tool.golf_club",
+        (2.0, -1.0, 0.0), (-135.0, 25.0, 0.0), 1.1,
+    ),
     // Gems
     Ingredient("Amethyst"): VoxTrans(
         "voxel.sprite.mineral.gem.amethystgem",
diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index a87845437a..9bf91969d1 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -1000,6 +1000,10 @@
         vox_spec: ("weapon.sword.frost-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
+    "common.items.weapons.tool.golf_club": (
+        vox_spec: ("weapon.tool.golf_club", (-5.5, -4.0, -4.0)),
+        color: None
+    ),
     // Misc
     "common.items.weapons.empty.empty": (
             vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
diff --git a/assets/voxygen/voxel/weapon/tool/golf_club.vox b/assets/voxygen/voxel/weapon/tool/golf_club.vox
new file mode 100644
index 0000000000..ff1b82d5d0
--- /dev/null
+++ b/assets/voxygen/voxel/weapon/tool/golf_club.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:376af4f3d3c46d12d65d68dd25b2eb9fa584d8c9162441efc69ae2178196c33d
+size 1464