From 3aace01be70212ea5358a3da6ac2a18eb2d81b99 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Sun, 19 May 2019 17:50:29 +0000
Subject: [PATCH] New Briton Blacksmith.

Make all the props in the blacksmith buildings separate
Add three tools, one hammer, two tongs
Use the new briton shields on the blacksmith
Use the new helmets on the blacksmith
Add new crates, and gives it a bit more geometry.
Update the anvil eyecandy prop

This was SVN commit r22290.
---
 .../actors/props/special/eyecandy/anvil.xml   |   9 +-
 .../props/special/eyecandy/box_pile.xml       |  23 +++-
 .../special/eyecandy/celt_sword_heap_01.xml   |   6 +
 .../props/special/eyecandy/crate_pile.xml     |  29 +++++
 .../structures/britons/workshop_anvil.xml     |   5 +-
 .../celts/blacksmith_armorstand_armor.xml     |   7 +-
 .../celts/blacksmith_armorstand_wood.xml      |  11 +-
 .../structures/celts/blacksmith_barrels.xml   |  33 +++---
 .../structures/celts/blacksmith_bucket.xml    |  11 +-
 .../structures/celts/blacksmith_props.xml     |  16 ---
 .../structures/celts/blacksmith_props_new.xml |  16 ---
 .../art/actors/props/units/tools/hammer.xml   |  13 +++
 .../art/actors/props/units/tools/tongs.xml    |  19 +++
 .../art/actors/props/units/tools/tongs_01.xml |  13 +++
 .../art/actors/props/units/tools/tongs_02.xml |  13 +++
 .../actors/structures/britons/blacksmith.xml  | 108 +++++++++++-------
 .../actors/structures/celts/blacksmith.xml    |  33 ------
 .../actors/structures/gauls/blacksmith.xml    |  79 +++++++++++++
 .../props/{box_pile.dae => box_pile_01.dae}   |   0
 .../public/art/meshes/props/box_pile_02.dae   |   3 +
 .../art/meshes/props/brit_workshop_anvil.dae  |   4 +-
 .../meshes/props/celt_blacksmith_barrels.dae  |   4 +-
 .../meshes/props/celt_blacksmith_props.dae    |   4 +-
 .../props/celt_blacksmith_props_new.dae       |   4 +-
 .../art/meshes/props/celt_sword_heap_03.dae   |   3 +
 .../public/art/meshes/props/tool_hammer.dae   |   3 +
 .../public/art/meshes/props/tool_tongs_01.dae |   3 +
 .../public/art/meshes/props/tool_tongs_02.dae |   3 +
 .../public/art/meshes/props/wrld_anvil.dae    |   4 +-
 .../public/art/meshes/props/wrld_crate_a.dae  |   4 +-
 .../art/meshes/structural/brit_blacksmith.dae |   3 +
 .../structural/celt_blacksmith_struct1.dae    |   4 +-
 .../art/meshes/structural/gaul_blacksmith.dae |   3 +
 .../skins/structural/ao/brit_blacksmith.png   |   3 +
 .../skins/structural/ao/celt_blacksmith.png   |   3 -
 .../skins/structural/ao/gaul_blacksmith.png   |   3 +
 .../templates/structures/gaul_blacksmith.xml  |   2 +-
 37 files changed, 337 insertions(+), 167 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/special/eyecandy/crate_pile.xml
 delete mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props.xml
 delete mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props_new.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/tools/hammer.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/tools/tongs.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/tools/tongs_01.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/tools/tongs_02.xml
 delete mode 100644 binaries/data/mods/public/art/actors/structures/celts/blacksmith.xml
 create mode 100644 binaries/data/mods/public/art/actors/structures/gauls/blacksmith.xml
 rename binaries/data/mods/public/art/meshes/props/{box_pile.dae => box_pile_01.dae} (100%)
 create mode 100644 binaries/data/mods/public/art/meshes/props/box_pile_02.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/celt_sword_heap_03.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/tool_hammer.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/tool_tongs_01.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/tool_tongs_02.dae
 create mode 100644 binaries/data/mods/public/art/meshes/structural/brit_blacksmith.dae
 create mode 100644 binaries/data/mods/public/art/meshes/structural/gaul_blacksmith.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/structural/ao/brit_blacksmith.png
 delete mode 100644 binaries/data/mods/public/art/textures/skins/structural/ao/celt_blacksmith.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/structural/ao/gaul_blacksmith.png

diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/anvil.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/anvil.xml
index e9528fd154..b6e5d81f2e 100644
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/anvil.xml
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/anvil.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations/>
       <mesh>props/wrld_anvil.dae</mesh>
       <props/>
-      <textures><texture file="props/wrld_anvil.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/wrld_anvil.dds" name="baseTex"/>
+        <texture file="null_white.dds" name="specTex"/>
+      </textures>
     </variant>
   </group>
-
+  <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/box_pile.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/box_pile.xml
index 74a8de4f01..250c4df997 100644
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/box_pile.xml
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/box_pile.xml
@@ -3,16 +3,27 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="Base">
-      <mesh>props/box_pile.dae</mesh>
-      <props>
-        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
-        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_02" maxheight="20" minheight="-20"/>
-        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_03" maxheight="20" minheight="-20"/>
-      </props>
       <textures>
         <texture file="null_white.dds" name="baseTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="100" name="Three boxes pile">
+      <mesh>props/box_pile_01.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_02" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_03" maxheight="20" minheight="-20"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Two boxes stacked">
+      <mesh>props/box_pile_02.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/box.xml" attachpoint="box_02" maxheight="20" minheight="-20"/>
+      </props>
+    </variant>
+  </group>
   <material>default.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/celt_sword_heap_01.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/celt_sword_heap_01.xml
index 6e138f1d0a..6c6e1153d6 100644
--- a/binaries/data/mods/public/art/actors/props/special/eyecandy/celt_sword_heap_01.xml
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/celt_sword_heap_01.xml
@@ -15,6 +15,12 @@
     <variant frequency="1" name="Heap-02">
       <mesh>props/celt_sword_heap_02.dae</mesh>
     </variant>
+    <variant frequency="1" name="Heap-03">
+      <mesh>props/celt_sword_heap_03.dae</mesh>
+      <textures>
+        <texture file="props/celt_prop_1.dds" name="baseTex"/>
+      </textures>
+    </variant>
   </group>
   <material>default.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/crate_pile.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/crate_pile.xml
new file mode 100644
index 0000000000..3812da439a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/crate_pile.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <textures>
+        <texture file="null_white.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Three boxes pile">
+      <mesh>props/box_pile_01.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_02" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_03" maxheight="20" minheight="-20"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Two boxes stacked">
+      <mesh>props/box_pile_02.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_02" maxheight="20" minheight="-20"/>
+      </props>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/britons/workshop_anvil.xml b/binaries/data/mods/public/art/actors/props/structures/britons/workshop_anvil.xml
index ba6c113255..9e1c02d013 100644
--- a/binaries/data/mods/public/art/actors/props/structures/britons/workshop_anvil.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/britons/workshop_anvil.xml
@@ -4,6 +4,9 @@
   <group>
     <variant frequency="100" name="Brittonic anvil">
       <mesh>props/brit_workshop_anvil.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/anvil.xml" attachpoint="anvil_01"/>
+      </props>
       <textures>
         <texture file="props/celt_prop_1.dds" name="baseTex"/>
         <texture file="props/celt_prop_1_norm.png" name="normTex"/>
@@ -13,4 +16,4 @@
     </variant>
   </group>
   <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
\ No newline at end of file
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_armor.xml b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_armor.xml
index 5c3af01604..94fc474262 100644
--- a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_armor.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_armor.xml
@@ -5,10 +5,9 @@
     <variant frequency="1" name="barrels">
       <mesh>props/celt_blacksmith_armorstand_rome_csp_a.dae</mesh>
       <textures>
-<texture file="skeletal/rome_csp_a.dds" name="baseTex"/>
-<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-</textures>
+        <texture file="skeletal/rome_csp_a.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
-  <material>player_trans_ao.xml</material>
+  <material>default.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_wood.xml b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_wood.xml
index df605b35b7..38256a3b05 100644
--- a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_wood.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_armorstand_wood.xml
@@ -5,12 +5,11 @@
     <variant frequency="1" name="barrels">
       <mesh>props/celt_blacksmith_armorstand_struct.dae</mesh>
       <textures>
-<texture file="structural/celt_struct_1.dds" name="baseTex"/>
-<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
-<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
-<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-</textures>
+        <texture file="structural/celt_struct_1.dds" name="baseTex"/>
+        <texture file="structural/celt_struct_1_norm.png" name="normTex"/>
+        <texture file="structural/celt_struct_1_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_barrels.xml b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_barrels.xml
index 58657fc06b..96a7af33e1 100644
--- a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_barrels.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_barrels.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="barrels">
-      <mesh>props/celt_blacksmith_barrels.dae</mesh>
-      <textures>
-<texture file="props/celt_prop_1.dds" name="baseTex"/>
-<texture file="props/celt_prop_1_norm.png" name="normTex"/>
-<texture file="props/celt_prop_1_spec.png" name="specTex"/>
-<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-</textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="barrels">
+      <mesh>props/celt_blacksmith_barrels.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="barrel_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/barrel_a_celt_sword_heap.xml" attachpoint="barrel_empty_01" maxheight="20" minheight="-20"/>
+      </props>
+      <textures>
+        <texture file="null_white.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_bucket.xml b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_bucket.xml
index 43a835e8e0..304b084c9a 100644
--- a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_bucket.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_bucket.xml
@@ -5,12 +5,11 @@
     <variant frequency="1" name="bucket">
       <mesh>props/celt_blacksmith_bucket.dae</mesh>
       <textures>
-<texture file="props/celt_prop_1.dds" name="baseTex"/>
-<texture file="props/celt_prop_1_norm.png" name="normTex"/>
-<texture file="props/celt_prop_1_spec.png" name="specTex"/>
-<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-</textures>
+        <texture file="props/celt_prop_1.dds" name="baseTex"/>
+        <texture file="props/celt_prop_1_norm.png" name="normTex"/>
+        <texture file="props/celt_prop_1_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props.xml b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props.xml
deleted file mode 100644
index 6734b4ba55..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="barrels">
-      <mesh>props/celt_blacksmith_props.dae</mesh>
-      <textures>
-<texture file="props/celt_prop_1.png" name="baseTex"/>
-<texture file="props/celt_prop_1_norm.png" name="normTex"/>
-<texture file="props/celt_prop_1_spec.png" name="specTex"/>
-<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-</textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props_new.xml b/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props_new.xml
deleted file mode 100644
index 641182e281..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/celts/blacksmith_props_new.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="barrels">
-      <mesh>props/celt_blacksmith_props_new.dae</mesh>
-      <textures>
-		<texture file="props/celt_props_new.dds" name="baseTex"/>
-	    <texture file="props/celt_props_new_norm.png" name="normTex"/>
-	    <texture file="props/celt_props_new_spec.png" name="specTex"/>
-		<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/tools/hammer.xml b/binaries/data/mods/public/art/actors/props/units/tools/hammer.xml
new file mode 100644
index 0000000000..35aebbe7e7
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/tools/hammer.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tool_hammer.dae</mesh>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/tools/tongs.xml b/binaries/data/mods/public/art/actors/props/units/tools/tongs.xml
new file mode 100644
index 0000000000..7ce944ba6b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/tools/tongs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tool_tongs_02.dae</mesh>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="100" name="Base 2">
+      <mesh>props/tool_tongs_01.dae</mesh>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/tools/tongs_01.xml b/binaries/data/mods/public/art/actors/props/units/tools/tongs_01.xml
new file mode 100644
index 0000000000..2b1c99f8ba
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/tools/tongs_01.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tool_tongs_01.dae</mesh>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/tools/tongs_02.xml b/binaries/data/mods/public/art/actors/props/units/tools/tongs_02.xml
new file mode 100644
index 0000000000..036ef904ee
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/tools/tongs_02.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tool_tongs_02.dae</mesh>
+      <textures>
+        <texture file="props/prop_weap.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/britons/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/britons/blacksmith.xml
index 26bda7ff55..7bdb878aa5 100644
--- a/binaries/data/mods/public/art/actors/structures/britons/blacksmith.xml
+++ b/binaries/data/mods/public/art/actors/structures/britons/blacksmith.xml
@@ -2,52 +2,78 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="0" name="Blacksmith">
-      <mesh>structural/celt_blacksmith_struct1.dae</mesh>
+    <variant frequency="1" name="Blacksmith">
+      <mesh>structural/brit_blacksmith.dae</mesh>
       <props>
-        <prop actor="props/structures/celts/blacksmith_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/blacksmith_props_new.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/blacksmith_armorstand_wood.xml" attachpoint="celt_armorstand"/>
-        <prop actor="props/structures/celts/blacksmith_armorstand_armor.xml" attachpoint="celt_armorstand"/>
         <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
-        <prop actor="particle/flame.xml" attachpoint="fire"/>
-        <prop actor="particle/flame.xml" attachpoint="fire1"/>
-        <prop actor="particle/flame.xml" attachpoint="fire2"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/blacksmith_barrels.xml" attachpoint="celtbarrels"/>
-        <prop actor="props/structures/celts/blacksmith_bucket_water.xml" attachpoint="celtcube"/>
-        <prop actor="props/structures/celts/blacksmith_bucket.xml" attachpoint="celtcube"/>
+        <prop actor="particle/flame.xml" attachpoint="flame_01"/>
+        <prop actor="particle/flame.xml" attachpoint="flame_02"/>
+        <prop actor="particle/flame.xml" attachpoint="flame_03"/>
+        <prop actor="props/structures/celts/blacksmith_barrels.xml" attachpoint="barrels" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_bucket_water.xml" attachpoint="water_bucket" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_bucket.xml" attachpoint="water_bucket" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_armorstand_wood.xml" attachpoint="armorstand" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_armorstand_armor.xml" attachpoint="armorstand" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_01"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_02"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_03"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_04"/>
+        <prop actor="props/units/tools/tongs_01.xml" attachpoint="tongs_01"/>
+        <prop actor="props/units/tools/tongs_01.xml" attachpoint="tongs_02"/>
+        <prop actor="props/units/tools/tongs_01.xml" attachpoint="tongs_03"/>
+        <prop actor="props/units/tools/tongs_02.xml" attachpoint="tongs_04"/>
+        <prop actor="props/units/tools/tongs_02.xml" attachpoint="tongs_05"/>
+        <prop actor="props/structures/britons/workshop_anvil.xml" attachpoint="anvil_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="barrel_01"/>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/crate_pile.xml" attachpoint="box_pile_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/shields/brit_shield_spear_sq_c_02.xml" attachpoint="shield_oval_big_01" />
+        <prop actor="props/units/shields/brit_shield_spear_sq_c_03.xml" attachpoint="shield_oval_big_02" />
+        <prop actor="props/units/shields/brit_shield_spear_sq_d_02.xml" attachpoint="shield_oval_big_03"/>
+        <prop actor="props/units/shields/brit_shield_spear_sq_d_03.xml" attachpoint="shield_oval_big_04" />
+        <prop actor="props/units/shields/brit_shield_spear_oval_f_01.xml" attachpoint="shield_oval_small_01" />
+        <prop actor="props/units/shields/brit_shield_spear_oval_e_01.xml" attachpoint="shield_oval_small_02" />
+        <prop actor="props/units/shields/brit_shield_spear_oval_g_01.xml" attachpoint="shield_oval_small_03" />
+        <prop actor="props/units/shields/brit_shield_spear_oval_h_01.xml" attachpoint="shield_oval_small_04" />
+        <prop actor="props/units/shields/brit_shield_spear_hex_b_02.xml" attachpoint="shield_hex_01" />
+        <prop actor="props/units/shields/brit_shield_spear_hex_b_03.xml" attachpoint="shield_hex_02" />
+        <prop actor="props/units/shields/brit_shield_spear_hex_b_02.xml" attachpoint="shield_hex_03" />
+        <prop actor="props/units/shields/brit_shield_spear_hex_b_02.xml" attachpoint="shield_hex_04" />
+        <prop actor="props/units/shields/brit_shield_spear_hex_b_02.xml" attachpoint="shield_hex_05" />
+        <prop actor="props/units/shields/brit_shield_jav_sq_b_01.xml" attachpoint="shield_square_01" />
+        <prop actor="props/units/shields/brit_shield_jav_sq_b_01.xml" attachpoint="shield_square_02"/>
+        <prop actor="props/units/shields/brit_shield_jav_sq_b_02.xml" attachpoint="shield_square_03"/>
+        <prop actor="props/units/shields/brit_shield_jav_sq_b_03.xml" attachpoint="shield_square_04"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_01"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_02"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_03" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_04" />
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_05" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_01"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_02"/>
+        <prop actor="props/units/helmets/celt_helmet_mihovo.xml" attachpoint="helmet_03"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_04"/>
+        <prop actor="props/units/helmets/celt_helmet_mihovo.xml" attachpoint="helmet_05"/>
+        <prop actor="props/units/helmets/celt_helmet_waterloo.xml" attachpoint="helmet_06"/>
+        <prop actor="props/units/helmets/celt_helmet_mihovo.xml" attachpoint="helmet_07"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_08"/>
       </props>
       <textures>
-        <texture file="structural/celt_struct_1.dds" name="baseTex"/>
-        <texture file="structural/celt_struct_1_norm.png" name="normTex"/>
-        <texture file="structural/celt_struct_1_spec.png" name="specTex"/>
-        <texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Blacksmith test">
-      <mesh>structural/celt_blacksmith_struct1.dae</mesh>
-      <props>
-        <prop actor="props/structures/celts/blacksmith_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/blacksmith_props_new.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/blacksmith_armorstand_wood.xml" attachpoint="celt_armorstand"/>
-        <prop actor="props/structures/celts/blacksmith_armorstand_armor.xml" attachpoint="celt_armorstand"/>
-        <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
-        <prop actor="particle/flame.xml" attachpoint="fire"/>
-        <prop actor="particle/flame.xml" attachpoint="fire1"/>
-        <prop actor="particle/flame.xml" attachpoint="fire2"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/blacksmith_barrels.xml" attachpoint="celtbarrels"/>
-        <prop actor="props/structures/celts/blacksmith_bucket_water.xml" attachpoint="celtcube"/>
-        <prop actor="props/structures/celts/blacksmith_bucket.xml" attachpoint="celtcube"/>
-      </props>
-      <textures>
-        <texture file="structural/brit_struct_1.png" name="baseTex"/>
-        <texture file="structural/celt_struct_1_norm.png" name="normTex"/>
-        <texture file="structural/celt_struct_1_spec.png" name="specTex"/>
-        <texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
+        <texture file="structural/brit_struct.png" name="baseTex"/>
+        <texture file="structural/celt_struct_norm.png" name="normTex"/>
+        <texture file="structural/celt_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/brit_blacksmith.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/celts/blacksmith.xml
deleted file mode 100644
index ef6c0448d7..0000000000
--- a/binaries/data/mods/public/art/actors/structures/celts/blacksmith.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Blacksmith">
-      <mesh>structural/celt_blacksmith_struct1.dae</mesh>
-      <props>
-        <prop actor="props/structures/celts/blacksmith_props.xml" attachpoint="root"/>
-<prop actor="props/structures/celts/blacksmith_props_new.xml" attachpoint="root"/>
-<prop actor="props/structures/celts/blacksmith_armorstand_wood.xml" attachpoint="celt_armorstand"/>
-<prop actor="props/structures/celts/blacksmith_armorstand_armor.xml" attachpoint="celt_armorstand"/>
-
-        <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
-        <prop actor="particle/flame.xml" attachpoint="fire"/>
-<prop actor="particle/flame.xml" attachpoint="fire1"/>
-<prop actor="particle/flame.xml" attachpoint="fire2"/>
-        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
-
-<prop actor="props/structures/celts/blacksmith_barrels.xml" attachpoint="celtbarrels"/>
-<prop actor="props/structures/celts/blacksmith_bucket_water.xml" attachpoint="celtcube"/>
-<prop actor="props/structures/celts/blacksmith_bucket.xml" attachpoint="celtcube"/>
-
-      </props>
-      <textures>
-        <texture file="structural/celt_struct_1.dds" name="baseTex"/>
-	    <texture file="structural/celt_struct_1_norm.png" name="normTex"/>
-	    <texture file="structural/celt_struct_1_spec.png" name="specTex"/>
-        <texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/gauls/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/gauls/blacksmith.xml
new file mode 100644
index 0000000000..983a82312d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/gauls/blacksmith.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Blacksmith">
+      <mesh>structural/gaul_blacksmith.dae</mesh>
+      <props>
+        <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
+        <prop actor="particle/flame.xml" attachpoint="flame_01"/>
+        <prop actor="particle/flame.xml" attachpoint="flame_02"/>
+        <prop actor="particle/flame.xml" attachpoint="flame_03"/>
+        <prop actor="props/structures/celts/blacksmith_barrels.xml" attachpoint="barrels" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_bucket_water.xml" attachpoint="water_bucket" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_bucket.xml" attachpoint="water_bucket" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_armorstand_wood.xml" attachpoint="armorstand" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/celts/blacksmith_armorstand_armor.xml" attachpoint="armorstand" maxheight="20" minheight="-20"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_01"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_02"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_03"/>
+        <prop actor="props/units/tools/hammer.xml" attachpoint="hammer_04"/>
+        <prop actor="props/units/tools/tongs_01.xml" attachpoint="tongs_01"/>
+        <prop actor="props/units/tools/tongs_01.xml" attachpoint="tongs_02"/>
+        <prop actor="props/units/tools/tongs_01.xml" attachpoint="tongs_03"/>
+        <prop actor="props/units/tools/tongs_02.xml" attachpoint="tongs_04"/>
+        <prop actor="props/units/tools/tongs_02.xml" attachpoint="tongs_05"/>
+        <prop actor="props/structures/britons/workshop_anvil.xml" attachpoint="anvil_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="barrel_01"/>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="box_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/special/eyecandy/crate_pile.xml" attachpoint="box_pile_01" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_01" />
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_02" />
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_03"/>
+        <prop actor="props/units/shields/gaul_shield_oval_b_03.xml" attachpoint="shield_oval_big_04" />
+        <prop actor="props/units/shields/gaul_shield_jav_oval_d_01.xml" attachpoint="shield_oval_small_01" />
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_01.xml" attachpoint="shield_oval_small_02" />
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_02.xml" attachpoint="shield_oval_small_03" />
+        <prop actor="props/units/shields/gaul_shield_jav_oval_h_03.xml" attachpoint="shield_oval_small_04" />
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_01.xml" attachpoint="shield_hex_01" />
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_02.xml" attachpoint="shield_hex_02" />
+        <prop actor="props/units/shields/gaul_shield_spear_hex_a_03.xml" attachpoint="shield_hex_03" />
+        <prop actor="props/units/shields/gaul_shield_cav_sw_hex_a_01.xml" attachpoint="shield_hex_04" />
+        <prop actor="props/units/shields/gaul_shield_cav_sw_hex_a_01.xml" attachpoint="shield_hex_05" />
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_02.xml" attachpoint="shield_square_01" />
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_01.xml" attachpoint="shield_square_02"/>
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_03.xml" attachpoint="shield_square_03"/>
+        <prop actor="props/units/shields/gaul_shield_jav_sq_b_02.xml" attachpoint="shield_square_04"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_01"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_02"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_03" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_04" />
+        <prop actor="props/units/weapons/csword.xml" attachpoint="sword_05" maxheight="20" minheight="-20"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_01"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_02"/>
+        <prop actor="props/units/helmets/celt_helmet_mihovo.xml" attachpoint="helmet_03"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_04"/>
+        <prop actor="props/units/helmets/celt_helmet_mihovo.xml" attachpoint="helmet_05"/>
+        <prop actor="props/units/helmets/celt_helmet_waterloo.xml" attachpoint="helmet_06"/>
+        <prop actor="props/units/helmets/celt_helmet_mihovo.xml" attachpoint="helmet_07"/>
+        <prop actor="props/units/helmets/celt_helmet_alesia_03.xml" attachpoint="helmet_08"/>
+      </props>
+      <textures>
+        <texture file="structural/celt_struct.dds" name="baseTex"/>
+        <texture file="structural/celt_struct_norm.png" name="normTex"/>
+        <texture file="structural/celt_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/gaul_blacksmith.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/props/box_pile.dae b/binaries/data/mods/public/art/meshes/props/box_pile_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/box_pile.dae
rename to binaries/data/mods/public/art/meshes/props/box_pile_01.dae
diff --git a/binaries/data/mods/public/art/meshes/props/box_pile_02.dae b/binaries/data/mods/public/art/meshes/props/box_pile_02.dae
new file mode 100644
index 0000000000..3585f9d6ef
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/box_pile_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:748c6bb1c06089a3a170616a6dffbcf36e9a065f30554882e915aad056f0cdba
+size 3443
diff --git a/binaries/data/mods/public/art/meshes/props/brit_workshop_anvil.dae b/binaries/data/mods/public/art/meshes/props/brit_workshop_anvil.dae
index 5eb9b95715..8e608ddcf6 100644
--- a/binaries/data/mods/public/art/meshes/props/brit_workshop_anvil.dae
+++ b/binaries/data/mods/public/art/meshes/props/brit_workshop_anvil.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f545c9c5e9c60ae67f58210286632648e3ed5daca09194f2928aa9ed4255fa8
-size 44553
+oid sha256:9c77a5243d37dcac3849b36227d51175203fb188c2a8bb7e8361d719e2123773
+size 12898
diff --git a/binaries/data/mods/public/art/meshes/props/celt_blacksmith_barrels.dae b/binaries/data/mods/public/art/meshes/props/celt_blacksmith_barrels.dae
index a981a99c08..0cb214f6c0 100644
--- a/binaries/data/mods/public/art/meshes/props/celt_blacksmith_barrels.dae
+++ b/binaries/data/mods/public/art/meshes/props/celt_blacksmith_barrels.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abc6add0d0e5b1774abc802cc37aca151d8366a89d6aeb32ecfad5503af102a9
-size 64049
+oid sha256:ca42bf58dec49e709d7dccdb42010af6b3a4af948804f17b86c13645f8a2e428
+size 3749
diff --git a/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props.dae b/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props.dae
index 09d7dc736e..1bda0de462 100644
--- a/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props.dae
+++ b/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc4a0e6ab1e62cc0e363cba59c399abc223d38cffa06a0760ceb33763855cfa1
-size 487051
+oid sha256:58aa6d8fe8ec6f528d1bfde97469f2eee44f3c8030c04167d6fd0d50c1ba7e6a
+size 71217
diff --git a/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props_new.dae b/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props_new.dae
index ff2717faea..ca24a5de91 100644
--- a/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props_new.dae
+++ b/binaries/data/mods/public/art/meshes/props/celt_blacksmith_props_new.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00923fc1182486439049b9bedf0946a4b2160dc1d6248dc3914f0860d90e55c8
-size 146692
+oid sha256:df9708e92c8d86e8a1bfa7c088dd6fdbcfecb4377bcb2f0ac30181d4498a1e14
+size 5828
diff --git a/binaries/data/mods/public/art/meshes/props/celt_sword_heap_03.dae b/binaries/data/mods/public/art/meshes/props/celt_sword_heap_03.dae
new file mode 100644
index 0000000000..afe091c0db
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/celt_sword_heap_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f83ec3b9e3cabdb6cad5a763dacb804adc3ef36c0c4ed9346f6ded3d39db2af4
+size 44255
diff --git a/binaries/data/mods/public/art/meshes/props/tool_hammer.dae b/binaries/data/mods/public/art/meshes/props/tool_hammer.dae
new file mode 100644
index 0000000000..4f8fec6970
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/tool_hammer.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60bb254e510a04fdc711484466094f4255befd90302570a2b1408892940f68c2
+size 7339
diff --git a/binaries/data/mods/public/art/meshes/props/tool_tongs_01.dae b/binaries/data/mods/public/art/meshes/props/tool_tongs_01.dae
new file mode 100644
index 0000000000..d54717e135
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/tool_tongs_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f31f559190d894cfa056cf3aeeb507021bb71213649b34d55ce9a1139a4046f3
+size 12452
diff --git a/binaries/data/mods/public/art/meshes/props/tool_tongs_02.dae b/binaries/data/mods/public/art/meshes/props/tool_tongs_02.dae
new file mode 100644
index 0000000000..5242f06ec2
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/tool_tongs_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfc50be61cb45c336543e7dfae5035ed6acf95ea9d0260fe67da2aa4ee85d276
+size 17727
diff --git a/binaries/data/mods/public/art/meshes/props/wrld_anvil.dae b/binaries/data/mods/public/art/meshes/props/wrld_anvil.dae
index 5efc3c5d71..c2905caeb2 100644
--- a/binaries/data/mods/public/art/meshes/props/wrld_anvil.dae
+++ b/binaries/data/mods/public/art/meshes/props/wrld_anvil.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:317d3a7e1f2f20538f5f4f6c822284b9b0c8bd6a589c4479883e18ec6f4e13df
-size 5644
+oid sha256:e57840445aaef14acb9bef7625ef6d2824e514d2643e3423f422fc66c7c6eea9
+size 14299
diff --git a/binaries/data/mods/public/art/meshes/props/wrld_crate_a.dae b/binaries/data/mods/public/art/meshes/props/wrld_crate_a.dae
index 5f156ea28d..9c594f9dc5 100644
--- a/binaries/data/mods/public/art/meshes/props/wrld_crate_a.dae
+++ b/binaries/data/mods/public/art/meshes/props/wrld_crate_a.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f96f186c190d8b6db6709ec9595fbde66404171523af5d1e6782dad3af9ae656
-size 4465
+oid sha256:ab75d9969ef5ddc13b65fe3d93902b234a793d38f74af658c69aa21354aae3f6
+size 16643
diff --git a/binaries/data/mods/public/art/meshes/structural/brit_blacksmith.dae b/binaries/data/mods/public/art/meshes/structural/brit_blacksmith.dae
new file mode 100644
index 0000000000..666c6ed20f
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/brit_blacksmith.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6b021e810c02bbd7c6ccc95e48160510da32b9cbff4d975bdd90c87a395b21c
+size 612438
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_blacksmith_struct1.dae b/binaries/data/mods/public/art/meshes/structural/celt_blacksmith_struct1.dae
index a466624c8b..395bdf30ae 100644
--- a/binaries/data/mods/public/art/meshes/structural/celt_blacksmith_struct1.dae
+++ b/binaries/data/mods/public/art/meshes/structural/celt_blacksmith_struct1.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5b36a2c383bdbddb0b4717c751e3dbc5075e9bd7dc27ac95a7f5f04cf163a85
-size 506581
+oid sha256:4ba260dedf2d48340e7a306b2a36e52a36b25a03599fe58875a1184747bd5c97
+size 565302
diff --git a/binaries/data/mods/public/art/meshes/structural/gaul_blacksmith.dae b/binaries/data/mods/public/art/meshes/structural/gaul_blacksmith.dae
new file mode 100644
index 0000000000..7f0f0bcb0d
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/gaul_blacksmith.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd23af1e1dca3ec4b675f8a1c08d07e0a3cda013c3b30ca644d6aeb3c432c86c
+size 565541
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/brit_blacksmith.png b/binaries/data/mods/public/art/textures/skins/structural/ao/brit_blacksmith.png
new file mode 100644
index 0000000000..dde03dbf71
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/structural/ao/brit_blacksmith.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b49f2a5cd02bd761bbeddd4660c95c4384d61860153b2146abe601691f3b48eb
+size 513906
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/celt_blacksmith.png b/binaries/data/mods/public/art/textures/skins/structural/ao/celt_blacksmith.png
deleted file mode 100644
index 2c5762ce67..0000000000
--- a/binaries/data/mods/public/art/textures/skins/structural/ao/celt_blacksmith.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8c11adea9c770ce2e3ea3148904dc0b88173ea81430ca7e5b03b22813ddeb09
-size 576588
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/gaul_blacksmith.png b/binaries/data/mods/public/art/textures/skins/structural/ao/gaul_blacksmith.png
new file mode 100644
index 0000000000..eeef13161e
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/structural/ao/gaul_blacksmith.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b5caac4eff0cc82248535e044e855a744f76ead415c7d63bbdc9870451c1e21
+size 825619
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
index c4b0f71674..599f4212a6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
@@ -8,6 +8,6 @@
     <SpecificName>Gobanion</SpecificName>
   </Identity>
   <VisualActor>
-    <Actor>structures/celts/blacksmith.xml</Actor>
+    <Actor>structures/gauls/blacksmith.xml</Actor>
   </VisualActor>
 </Entity>