From 0a54a4e2a53c96965fd160c101eda78c8df5cd1e Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone <wowgetoffyourcellphone@wildfiregames.com>
Date: Thu, 4 Aug 2022 15:36:13 +0000
Subject: [PATCH] [Alpha 26] [Fix] Restore the Kushite fisherman actor

Reported by @CovenantKillerJ here:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=512741

This was SVN commit r27029.
---
 .../structures/kushites/fishing_boat.xml      |  2 +-
 .../art/actors/units/kushites/fisherman.xml   | 35 +++++++++++++++++++
 .../templates/units/kush/ship_fishing.xml     |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/units/kushites/fisherman.xml

diff --git a/binaries/data/mods/public/art/actors/structures/kushites/fishing_boat.xml b/binaries/data/mods/public/art/actors/structures/kushites/fishing_boat.xml
index bcfaa3ea7d..20f252277a 100644
--- a/binaries/data/mods/public/art/actors/structures/kushites/fishing_boat.xml
+++ b/binaries/data/mods/public/art/actors/structures/kushites/fishing_boat.xml
@@ -6,7 +6,7 @@
     <variant>
       <mesh>structural/ptol_fishing_boat.dae</mesh>
       <props>
-        <prop actor="units/ptolemies/fisherman.xml" attachpoint="fisherman"/>
+        <prop actor="units/kushites/fisherman.xml" attachpoint="fisherman"/>
         <prop actor="props/structures/ptolemies/fishing_boat_basket.xml" attachpoint="basket"/>
       </props>
       <textures>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/fisherman.xml b/binaries/data/mods/public/art/actors/units/kushites/fisherman.xml
new file mode 100644
index 0000000000..0c65b888ed
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/kushites/fisherman.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>skeletal/new/m_dress.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_kush_meroitic.xml" attachpoint="head"/>
+        <prop actor="props/units/row.xml" attachpoint="weapon_L"/>
+      </props>
+      <textures>
+        <texture file="skeletal/kush/dress_trader_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/fisher/base_ptol.xml"/>
+    <variant file="biped/fisher/carry_ptol.xml">
+      <props>
+        <prop actor="props/units/row.xml" attachpoint="weapon_L"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/fisher/gather_fish.xml"/>
+    <variant file="biped/fisher/walk.xml">
+      <props>
+        <prop actor="props/units/row.xml" attachpoint="weapon_L"/>
+      </props>
+    </variant>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml
index c298c08a11..d50932cdc6 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/ship_fishing.xml
@@ -11,6 +11,6 @@
     <Icon>units/ptol_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/ptolemies/fishing_boat.xml</Actor>
+    <Actor>structures/kushites/fishing_boat.xml</Actor>
   </VisualActor>
 </Entity>