From 2c23b6c3bbc5a20b223e16385ae5a8e8b87a2255 Mon Sep 17 00:00:00 2001
From: WhiteTreePaladin <brian@wildfiregames.com>
Date: Thu, 12 Aug 2010 03:33:30 +0000
Subject: [PATCH] Added golden fleece actor placeholder Change golden fleece
 resource value from 3000 to 1000 Changed large tree resources from 500 back
 to 300

This was SVN commit r7916.
---
 .../art/actors/special/golden_fleece.xml       | 18 ++++++++++++++++++
 .../mods/public/gui/gamesetup/gamesetup.js     |  6 ++++--
 .../mods/public/gui/session_new/session.xml    |  2 +-
 .../templates/gaia/flora_tree_baobab.xml       |  2 +-
 .../templates/gaia/flora_tree_oak_large.xml    |  2 +-
 .../gaia/special_treasure_golden_fleece.xml    |  4 ++--
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/special/golden_fleece.xml

diff --git a/binaries/data/mods/public/art/actors/special/golden_fleece.xml b/binaries/data/mods/public/art/actors/special/golden_fleece.xml
new file mode 100644
index 0000000000..4d922017c3
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/special/golden_fleece.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+  
+  <group>
+    <variant frequency="100" name="Mesh">
+      <mesh>skeletal/goat.pmd</mesh>
+    </variant>
+  </group>
+  
+  <group>
+    <variant frequency="100" name="Hair-dark">
+      <texture>skeletal/animal_goat.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index c3540598bf..3cd96fb5f0 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -14,7 +14,7 @@ var g_IsInGuiUpdate;
 var g_PlayerAssignments = {};
 
 // Default game setup attributes
-var g_GameAttributes = { "map": ""};
+var g_GameAttributes = { "map": "" };
 
 // Number of players for currently selected map
 var g_MaxPlayers = 8;
@@ -132,7 +132,9 @@ function handleNetMessage(message)
 		break;
 
 	case "start":
-		Engine.SwitchGuiPage("page_loading.xml", { "attribs": g_GameAttributes, "isNetworked" : g_IsNetworked, "playerAssignments": g_PlayerAssignments});
+		Engine.SwitchGuiPage("page_loading.xml", { "attribs": g_GameAttributes, 
+																		"isNetworked" : g_IsNetworked, 
+																		"playerAssignments": g_PlayerAssignments} );
 		break;
 
 	case "chat":
diff --git a/binaries/data/mods/public/gui/session_new/session.xml b/binaries/data/mods/public/gui/session_new/session.xml
index 1c20091955..6df489b88e 100644
--- a/binaries/data/mods/public/gui/session_new/session.xml
+++ b/binaries/data/mods/public/gui/session_new/session.xml
@@ -397,7 +397,7 @@
 				</object>
 				
 				<!-- Resource Quantity -->
-				<object hidden="true" size="50 40 100% 60" type="image" name="sdResources" tooltip="Resources" tooltip_style="snToolTip">
+				<object hidden="true" size="60 40 100% 60" type="image" name="sdResources" tooltip="Resources" tooltip_style="snToolTip">
 					<object size="0 0 28 24" name="sdResourceIcon" type="image" style="resourceIcon" cell_id="0"/>
 					<object size="28 0 100% 100%" name="sdResourceStats" type="text" style="resourceStatsText"/>
 				</object>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
index ed2acbc347..b9a7de2da7 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
@@ -6,7 +6,7 @@
     <History>The baobab is the giant African tree that dots the landscape of the African savannah.</History>
   </Identity>
   <ResourceSupply>
-    <Amount>500</Amount>
+    <Amount>300</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml
index 2eaa716818..6f024abd4b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml
@@ -5,7 +5,7 @@
     <History>A deciduous tree of the genus Quercus; has acorns and lobed leaves. This one has grown large due to copious amounts of sun, water, and soil nutrients.</History>
   </Identity>
   <ResourceSupply>
-    <Amount>500</Amount>
+    <Amount>300</Amount>
     <Type>wood.tree</Type>
   </ResourceSupply>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
index 117c65e67a..e22159c408 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
@@ -7,11 +7,11 @@
 	<IconCell>1</IconCell>
   </Identity>
   <ResourceSupply>
-    <Amount>3000</Amount>
+    <Amount>1000</Amount>
     <Type>metal.treasure</Type>
   </ResourceSupply>
   <VisualActor>
-    <Actor>fauna/goat.xml</Actor>
+    <Actor>special/golden_fleece.xml</Actor>
   </VisualActor>
   <Footprint>
     <Circle radius="1.0"/>