[Holiday Commit #2] New Icons

Added icons for Viking Fishing Ship and Merchant.
0ADMods · Jul 21, 2014 · 63af29a · 63af29a
1 parent 77f15ba
commit 63af29a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/art/textures/ui/session/portraits/units/viking_fishing_ship (old).png b/art/textures/ui/session/portraits/units/viking_fishing_ship (old).png
diff --git a/art/textures/ui/session/portraits/units/viking_fishing_ship.png b/art/textures/ui/session/portraits/units/viking_fishing_ship.png
diff --git a/art/textures/ui/session/portraits/units/viking_merchant (old).png b/art/textures/ui/session/portraits/units/viking_merchant (old).png
diff --git a/art/textures/ui/session/portraits/units/viking_merchant.png b/art/textures/ui/session/portraits/units/viking_merchant.png
diff --git a/simulation/templates/units/viking_ship_fishing.xml b/simulation/templates/units/viking_ship_fishing.xml
@@ -4,7 +4,7 @@
     <Civ>viking</Civ>
     <SpecificName>?</SpecificName>
     <History>?</History>
-    <Icon>units/celt_ship_fishing.png</Icon>
+    <Icon>units/viking_fishing_ship.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/viking/fishing_boat.xml</Actor>

diff --git a/simulation/templates/units/viking_ship_merchant.xml b/simulation/templates/units/viking_ship_merchant.xml
@@ -8,7 +8,7 @@
     <Civ>viking</Civ>
     <SpecificName>Knarr</SpecificName>
     <History>These very small boats were used mainly for fishing, but they were also used to transport goods and personnel. The shell is wickerwork, covered with animal hides. Now they are exclusive to Ireland. They do not have a keel, but are able to ride large ocean waves and navigate up shallow rivers. </History>
-    <Icon>units/celt_ship_merchant.png</Icon>
+    <Icon>units/viking_merchant.png</Icon>
   </Identity>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>