From 38da2f88bc73686de10f74b529764a869b3b37e8 Mon Sep 17 00:00:00 2001
From: Itms <itms@wildfiregames.com>
Date: Wed, 2 Jan 2019 23:34:51 +0000
Subject: [PATCH] Rename the Viking longboat into longship, and fix the form of
 the specific name of the Roman bireme.

Based on patch by: Phormio
Differential Revision: https://code.wildfiregames.com/D507
This was SVN commit r22011.
---
 .../viking/{longboat_sail.xml => longship_sail.xml}       | 2 +-
 .../structures/viking/{longboat.xml => longship.xml}      | 8 ++++----
 .../{viking_lb_sail.dae => viking_longship_sail.dae}      | 0
 .../{viking_longboat.dae => viking_longship.dae}          | 0
 .../{viking_longboat.png => viking_longship.png}          | 0
 .../units/{viking_longboat.png => viking_longship.png}    | 0
 .../simulation/templates/units/rome_ship_bireme.xml       | 2 +-
 .../units/{viking_longboat.xml => viking_longship.xml}    | 6 +++---
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename binaries/data/mods/public/art/actors/props/structures/viking/{longboat_sail.xml => longship_sail.xml} (85%)
 rename binaries/data/mods/public/art/actors/structures/viking/{longboat.xml => longship.xml} (60%)
 rename binaries/data/mods/public/art/meshes/props/{viking_lb_sail.dae => viking_longship_sail.dae} (100%)
 rename binaries/data/mods/public/art/meshes/structural/{viking_longboat.dae => viking_longship.dae} (100%)
 rename binaries/data/mods/public/art/textures/skins/structural/{viking_longboat.png => viking_longship.png} (100%)
 rename binaries/data/mods/public/art/textures/ui/session/portraits/units/{viking_longboat.png => viking_longship.png} (100%)
 rename binaries/data/mods/public/simulation/templates/units/{viking_longboat.xml => viking_longship.xml} (54%)

diff --git a/binaries/data/mods/public/art/actors/props/structures/viking/longboat_sail.xml b/binaries/data/mods/public/art/actors/props/structures/viking/longship_sail.xml
similarity index 85%
rename from binaries/data/mods/public/art/actors/props/structures/viking/longboat_sail.xml
rename to binaries/data/mods/public/art/actors/props/structures/viking/longship_sail.xml
index 148d38ffac..840c140399 100644
--- a/binaries/data/mods/public/art/actors/props/structures/viking/longboat_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/viking/longship_sail.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <group>
     <variant frequency="100" name="sail">
-      <mesh>props/viking_lb_sail.dae</mesh>
+      <mesh>props/viking_longship_sail.dae</mesh>
       <textures><texture file="props/kart_merchant_sail_a.png" name="baseTex"/></textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/viking/longboat.xml b/binaries/data/mods/public/art/actors/structures/viking/longship.xml
similarity index 60%
rename from binaries/data/mods/public/art/actors/structures/viking/longboat.xml
rename to binaries/data/mods/public/art/actors/structures/viking/longship.xml
index ddfd0e4cfd..ebdd763e76 100644
--- a/binaries/data/mods/public/art/actors/structures/viking/longboat.xml
+++ b/binaries/data/mods/public/art/actors/structures/viking/longship.xml
@@ -3,13 +3,13 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="Longboat">
-      <mesh>structural/viking_longboat.dae</mesh>
+    <variant frequency="1" name="Longship">
+      <mesh>structural/viking_longship.dae</mesh>
       <props>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-        <prop actor="props/structures/viking/longboat_sail.xml" attachpoint="root"/>
+        <prop actor="props/structures/viking/longship_sail.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="structural/viking_longboat.png" name="baseTex"/></textures>
+      <textures><texture file="structural/viking_longship.png" name="baseTex"/></textures>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/meshes/props/viking_lb_sail.dae b/binaries/data/mods/public/art/meshes/props/viking_longship_sail.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/viking_lb_sail.dae
rename to binaries/data/mods/public/art/meshes/props/viking_longship_sail.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/viking_longboat.dae b/binaries/data/mods/public/art/meshes/structural/viking_longship.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/structural/viking_longboat.dae
rename to binaries/data/mods/public/art/meshes/structural/viking_longship.dae
diff --git a/binaries/data/mods/public/art/textures/skins/structural/viking_longboat.png b/binaries/data/mods/public/art/textures/skins/structural/viking_longship.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/viking_longboat.png
rename to binaries/data/mods/public/art/textures/skins/structural/viking_longship.png
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/viking_longboat.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/viking_longship.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/viking_longboat.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/viking_longship.png
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
index 2fe349ed5b..0c488b1dc5 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_mechanical_ship_bireme">
   <Identity>
     <Civ>rome</Civ>
-    <SpecificName>Liburnus</SpecificName>
+    <SpecificName>Liburna</SpecificName>
     <Icon>units/rome_ship_bireme.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/viking_longboat.xml b/binaries/data/mods/public/simulation/templates/units/viking_longship.xml
similarity index 54%
rename from binaries/data/mods/public/simulation/templates/units/viking_longboat.xml
rename to binaries/data/mods/public/simulation/templates/units/viking_longship.xml
index 7af8d25853..3f49f2d7f8 100644
--- a/binaries/data/mods/public/simulation/templates/units/viking_longboat.xml
+++ b/binaries/data/mods/public/simulation/templates/units/viking_longship.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_bireme">
   <Identity>
-    <SpecificName>Longboat</SpecificName>
-    <Icon>units/viking_longboat.png</Icon>
+    <SpecificName>Longship</SpecificName>
+    <Icon>units/viking_longship.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/viking/longboat.xml</Actor>
+    <Actor>structures/viking/longship.xml</Actor>
   </VisualActor>
 </Entity>