From b91ec9b449b72dd7bde008ea3bb4d94fe6e6fb63 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sun, 15 Dec 2013 15:33:35 +0000
Subject: [PATCH] Added new Ptolemies track to the Ptolemies civ json.

Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.

Portrait for Ptol camel archer.

This was SVN commit r14361.
---
 .../ui/session/portraits/units/ptol_cavalry_archer.png        | 3 +++
 binaries/data/mods/public/civs/ptol.json                      | 4 ++--
 .../public/simulation/templates/template_unit_infantry.xml    | 1 -
 .../templates/template_unit_support_female_citizen.xml        | 1 -
 .../simulation/templates/units/ptol_cavalry_archer_b.xml      | 2 +-
 .../simulation/templates/units/ptol_infantry_slinger_b.xml    | 2 +-
 .../simulation/templates/units/ptol_infantry_swordsman_b.xml  | 1 +
 7 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png

diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png
new file mode 100644
index 0000000000..d17e58b00f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/units/ptol_cavalry_archer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46632cde78e8fdc1a256b9fa88799650518c596e14eed70cd88e8c7879dccc17
+size 21483
diff --git a/binaries/data/mods/public/civs/ptol.json b/binaries/data/mods/public/civs/ptol.json
index 668fc6c0c4..838e815e83 100644
--- a/binaries/data/mods/public/civs/ptol.json
+++ b/binaries/data/mods/public/civs/ptol.json
@@ -5,8 +5,8 @@
 	"Emblem":"session/portraits/emblems/emblem_ptolemies.png",
 	"History":"The Ptolemaic dynasty was a Macedonian Greek royal family which ruled the Ptolemaic Empire in Egypt during the Hellenistic period. Their rule lasted for 275 years, from 305 BC to 30 BC. They were the last dynasty of ancient Egypt.",
 	"Music":[
-			{"File":"Valley_of_the_Nile.ogg", "Type":"peace"},
-			{"File":"Sands_of_Time.ogg", "Type":"peace"}
+			{"File":"Ammon-Ra.ogg", "Type":"peace"},
+			{"File":"Valley_of_the_Nile.ogg", "Type":"peace"}
 		],
 	"Factions":
 	[
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 711a93b2e7..a172222584 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -65,7 +65,6 @@
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <food.fish>0.5</food.fish>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.35</food.grain>
       <food.meat>1</food.meat>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 7bc4e21922..2881ddc3d3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -61,7 +61,6 @@ Gather resources, build civic structures, and inspire nearby males to work faste
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
-      <food.fish>0.5</food.fish>
       <food.fruit>1</food.fruit>
       <food.grain>0.65</food.grain>
       <food.meat>1</food.meat>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
index eb5351b98c..3173f514a6 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
@@ -7,7 +7,7 @@
 	<GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>?</SpecificName>
     <History>?</History>
-	<Icon>units/pers_cavalry_archer.png</Icon>
+	<Icon>units/ptol_cavalry_archer.png</Icon>
     <Tooltip>Classes: Ranged Cavalry Camel Archer.
 Counters: 2x vs. Spearmen, 1.5x vs. Swordsmen.
 Countered by: Skirmishers and Elephants.
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
index 94b7fd0afe..aa4fec1f70 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
@@ -10,7 +10,7 @@
   </Builder>
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>units/mace_infantry_slinger_b</SelectionGroupName>
+    <SelectionGroupName>units/ptol_infantry_slinger_b</SelectionGroupName>
     <GenericName>Judean Slinger</GenericName>
     <SpecificName>?</SpecificName>
     <History>?</History>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_b.xml
index 730f97e9de..15b8c5dc51 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_b.xml
@@ -22,6 +22,7 @@
     <Classes datatype="tokens">Celt Mercenary</Classes>
     <History></History>
     <Icon>units/cart_infantry_swordsman.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_infantry_swordsman_a</Entity>