From 9a7fb2d0906ed38783dd573ff583569ad56bfbc1 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Mon, 9 Jan 2006 15:58:42 +0000
Subject: [PATCH] A few more manual fixes.

This was SVN commit r3348.
---
 .../official/entities/template_entity_script.js    |  6 +++---
 .../official/entities/template_unit_infantry.xml   | 14 +++++++-------
 .../gui/test/functions_page_session_manual.js      | 13 ++++++-------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/binaries/data/mods/official/entities/template_entity_script.js b/binaries/data/mods/official/entities/template_entity_script.js
index 6f69f8e6ce..31361f7514 100644
--- a/binaries/data/mods/official/entities/template_entity_script.js
+++ b/binaries/data/mods/official/entities/template_entity_script.js
@@ -428,7 +428,7 @@ function entityDamage( damage, inflictor )
 				console.write("One of your units has earned " + this.traits.loot.xp + " upgrade points!");
 
 			// If he now has maximum upgrade points for his rank,
-			if (inflictor.traits.xp.curr >= inflictor.traits.xp.req)
+			if (inflictor.traits.promotion.curr >= inflictor.traits.promotion.req)
 			{
 				// Notify the player.
 				if (this.traits.id.specific)
@@ -437,13 +437,13 @@ function entityDamage( damage, inflictor )
 					console.write("One of your units has gained a promotion!");
 				
 				// Reset his upgrade points.
-				inflictor.traits.xp.curr = 0; 
+				inflictor.traits.promotion.curr = 0; 
 
 				// Upgrade his portrait to the next level.
 				inflictor.traits.id.icon_cell++; 
 
 				// Transmogrify him into his next rank.
-				inflictor.template = getEntityTemplate(inflictor.traits.xp.newentity);
+				inflictor.template = getEntityTemplate(inflictor.traits.promotion.newentity);
 			}
 		}
 
diff --git a/binaries/data/mods/official/entities/template_unit_infantry.xml b/binaries/data/mods/official/entities/template_unit_infantry.xml
index f0f1251bd5..ff3a38eb0a 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry.xml
@@ -72,14 +72,14 @@
  		<Gather>
 			<Resource>
 				<Food>
-					<Fruit>2</Fruit>
-					<Grain>2</Grain>
-					<Fish>2</Fish>
-					<Milk>2</Milk>
+					<Fruit>20</Fruit>
+					<Grain>20</Grain>
+					<Fish>20</Fish>
+					<Milk>20</Milk>
 				</Food>
-				<Wood>1</Wood>
-				<Stone>1</Stone>
-				<Ore>1</Ore>
+				<Wood>10</Wood>
+				<Stone>10</Stone>
+				<Ore>10</Ore>
 			</Resource>
  			<Range>2.0</Range>
 			<Speed>3000</Speed>
diff --git a/binaries/data/mods/official/gui/test/functions_page_session_manual.js b/binaries/data/mods/official/gui/test/functions_page_session_manual.js
index bc4c2f1787..b099dc1151 100644
--- a/binaries/data/mods/official/gui/test/functions_page_session_manual.js
+++ b/binaries/data/mods/official/gui/test/functions_page_session_manual.js
@@ -26,16 +26,15 @@ function addItemsRecursively (container, indent, fontName)
 			else
 				recursiveString += "]";
 		
-			if (typeof container[item] == 'object')
-			{
+			// Display the property name, and the value, if any.
+			if (container[item] == true && container[item].toString() != true)
 				recursiveString += indent + " " + item + "\n";
-				addItemsRecursively (container[item], indent + "--", fontName);
-			}
 			else
-			{
 				recursiveString += indent + " " + item + ": " + container[item] + "\n";
-			}
-			
+
+			// Retrieve sub-items.
+			if (typeof container[item] == 'object')
+				addItemsRecursively (container[item], indent + "--", fontName);			
 		}
 	}
 }