Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json	(revision 23803)
@@ -1,148 +1,142 @@
 {
 	"Code": "gaul",
 	"Culture": "celt",
 	"Name": "Gauls",
 	"Emblem": "session/portraits/emblems/emblem_celts.png",
 	"History": "The Gauls were the Celtic tribes of continental Europe. Dominated by a priestly class of Druids, they featured a sophisticated culture of advanced metalworking, agriculture, trade and even road engineering. With heavy infantry and cavalry, Gallic warriors valiantly resisted Caesar's campaign of conquest and Rome's authoritarian rule.",
 	"Music":[
 			{"File":"Celtic_Pride.ogg", "Type":"peace"},
 			{"File":"Cisalpine_Gaul.ogg", "Type":"peace"},
 			{"File":"Harvest_Festival.ogg", "Type":"peace"},
 			{"File":"Water's_Edge.ogg", "Type":"peace"},
 			{"File":"Sunrise.ogg", "Type":"peace"}
 		],
 	"Factions":
 	[
 		{
 			"Name": "Gauls",
 			"Description": "The Celts of mainland Europe.",
 			"Technologies":
 			[
 				{
+					"Name": "Harvesting Machine",
+					"History": "The Gauls invented an harvesting machine, making it much easier to harvest grain.",
+					"Description": "Workers +15% grain gather rate."
+				},
+				{
 					"Name": "Vae Victis",
 					"History": "Woe to the Defeated! The Gallic chieftain Brennus seized Rome (with the exception of a garrison on Capitoline Hill). When Camillus besieged him with a relief force from Veii, he negotiated his surrender for 1000 pounds of gold, and adding the weight of his sword on the scale when the Romans complained that he used false weights he uttered those famous words.",
 					"Description": "A set amount of metal and food from every structure destroyed or captured."
 				},
 				{
 					"Name": "Carnutes",
 					"History": "The Carnutes were druids from Aulercia. They fought when needed, and were largely responsible for turning back the Belgae incursions into Armorica and Aulercia.",
 					"Description": "Gallic druids gain a small melee attack."
 				}
 			],
 			"Heroes":
 			[
 				{
 					"Name": "Viridomarus",
 					"Class": "",
 					"Armament": "",
 					"Emblem": "",
 					"History": "When Celtic armies met the enemy, before the battle would start, the Celtic leader would go to the first line and challenge the bravest of the enemy warriors to a single combat. The story of how Marcus Claudius Marcellus killed a Gallic leader at Clastidium (222 B.C.) is typical of such encounters. Advancing with a small army, Marcellus met a combined force of Insubrian Gauls and Gaesatae at Clastidium. The Gallic army advanced with the usual rush and terrifying cries, and their king, Viridomarus, picking out Marcellus by means of his badges of rank, made for him, shouting a challenge and brandishing his spear. Viridomarus was an outstanding figure not only for his size but also for his adornments; for he was resplendent in bright colors and his armor shone with gold and silver. This armor, thought Marcellus, would be a fitting offering to the gods. He charged the Gaul, pierced his bright breastplate and cast him to the ground. It was an easy task to kill Viridomarus and strip him of his armor."
 				},
 				{
 					"Name": "Brennus",
 					"Class": "",
 					"Armament": "",
 					"Emblem": "",
 					"History": "Brennus is the name which the Roman historians give to the famous leader of the Gauls who took Rome in the time of Camillus. According to Geoffrey of Monmouth, the cleric who wrote “History of the Kings of Britain”, Brennus and his brother Belinus invaded Gaul and sacked Rome in 390 B.C., 'proving' that Britons had conquered Rome, the greatest civilization in the world, long before Rome conquered the Britons. We know from many ancient sources which predate Geoffrey that Rome was indeed sacked, but in 387 not 390, and that the raid was led by a man named Brennus, but he and his invading horde were Gallic Senones, not British. In this episode several features of Geoffrey's editing method can be seen: he modified the historical Brennus, created the brother Belinus, borrowed the Gallic invasion, but omitted the parts where the Celts seemed weak or foolish. His technique is both additive and subtractive. Like the tale of Trojan origin, the story of the sack of Rome is not pure fabrication; it is a creative rearrangement of the available facts, with details added as necessary. By virtue of their historical association, Beli and Bran are often muddled with the earlier brothers Belinus and Brennus (the sons of Dunvallo Molmutius) who contended for power in northern Britain in around 390 B.C., and were regarded as gods in old Celtic tradition."
 				},
 				{
 					"Name": "Vercingetorix",
 					"Class": "",
 					"Armament": "",
 					"Emblem": "",
 					"History": "Vercingetorix (Gaulish: Ver-Rix Cingetos) was the chieftain of the Arverni tribe in Gaul (modern France). Starting in 52 B.C. he led a revolt against the invading Romans under Julius Caesar, his actions during the revolt are remembered to this day. Vercingetorix was probably born near his tribes capital (Gergovia). From what little info we have Vercingetorix was probably born in 72 B.C., his father was Celtius and we don't know who his mother was. Because we only know of him from Roman sources we don't know much about Vercingetorix as a child or young man, except that perhaps he was probably very high spirited and probably gained some renown in deeds."
 				}
 			]
 		}
 	],
 	"CivBonuses":
 	[
 		{
 			"Name": "Ardiosmanae",
 			"History": "Represents Celtic farming methods. ",
 			"Description": "Enhanced food gained from ranching and farming. "
 		},
 		{
 			"Name": "Deas Celtica",
 			"History": "Celtic religion and druidry inspired their warlike mindset. ",
 			"Description": "Druids increase attack rates of soldiers near them slightly."
 		}
 	],
 	"TeamBonuses":
 	[
 		{
 			"Name": "Druidic Wisdom",
 			"History": "The Druids of the Gauls maintained an organized religion that advanced the technology of their people even during wartime.",
 			"Description": "Allied Structures −20% technology research time."
 		}
 	],
-	"Structures":
-	[
-		{
-			"Name": "Melonas",
-			"Class": "",
-			"Emblem": "",
-			"History": "The Celts developed the first rotary flour mill.",
-			"Requirements": "",
-			"Phase": "",
-			"Special": ""
-		}
-	],
+	"Structures": [],
 	"WallSets":
 	[
 		"structures/wallset_palisade",
 		"structures/gaul_wallset_stone"
 	],
 	"StartEntities":
 	[
 		{
 			"Template": "structures/gaul_civil_centre"
 		},
 		{
 			"Template": "units/gaul_support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/gaul_infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/gaul_infantry_javelinist_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/gaul_cavalry_javelinist_b"
 		}
 	],
 	"Formations":
 	[
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
 		"special/formations/line_closed",
 		"special/formations/column_open",
 		"special/formations/line_open",
 		"special/formations/flank",
 		"special/formations/battle_line",
 		"special/formations/skirmish",
 		"special/formations/wedge"
 	],
 	"AINames":
 	[
 		"Viridomarus",
 		"Brennus",
 		"Cativolcus",
 		"Cingetorix",
 		"Vercingetorix",
 		"Divico",
 		"Ambiorix",
 		"Liscus",
 		"Valetiacus",
 		"Viridovix"
 	],
 	"SkirmishReplacements":
 	{
 		"skirmish/structures/default_house_5": "structures/{civ}_house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_harvester.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_harvester.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_harvester.json	(revision 23803)
@@ -0,0 +1,24 @@
+{
+	"genericName": "Harvesting Machine",
+	"description": "The Gauls invented an harvesting machine, making it much easier to harvest grain.",
+	"cost": { "food": 0, "wood": 400, "stone": 0, "metal": 200 },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_town" },
+			{
+				"any": [
+					{ "civ": "gaul" }
+				]
+			}
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "plow.png",
+	"researchTime": 40,
+	"tooltip": "Workers +15% grain gather rate.",
+	"modifications": [
+		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.15 }
+	],
+	"affects": ["Worker"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_harvester.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml	(revision 23803)
@@ -1,72 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <AlertRaiser>
     <List datatype="tokens">FemaleCitizen</List>
     <RaiseAlertRange>60</RaiseAlertRange>
     <EndOfAlertRange>100</EndOfAlertRange>
     <SearchRange>100</SearchRange>
   </AlertRaiser>
   <BuildRestrictions>
     <Category>Farmstead</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>300</CapturePoints>
   </Capturable>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>900</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Classes datatype="tokens">DropsiteFood</Classes>
     <GenericName>Farmstead</GenericName>
     <SelectionGroupName>template_structure_economic_farmstead</SelectionGroupName>
     <Icon>structures/farmstead.png</Icon>
     <Tooltip>Dropsite for the food resource. Research food gathering improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Farmstead</VisibleClasses>
   </Identity>
   <Loot>
     <wood>20</wood>
   </Loot>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       gather_wicker_baskets
       gather_farming_plows
       gather_farming_training
       gather_farming_fertilizer
+      gather_farming_harvester
     </Technologies>
   </ProductionQueue>
   <RallyPoint disable=""/>
   <ResourceDropsite>
     <Types>food</Types>
     <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_farmstead.xml</select>
       <constructed>interface/complete/building/complete_farmstead.xml</constructed>
       <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
       <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>20</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml	(revision 23803)
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/brit_rotarymill
-    </Entities>
-  </Builder>
   <Health>
     <DamageVariants>
       <lightdamage>0.80</lightdamage>
       <mediumdamage>0.50</mediumdamage>
       <heavydamage>0.20</heavydamage>
     </DamageVariants>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SelectionGroupName>units/brit_infantry_javelinist_b</SelectionGroupName>
     <SpecificName>Adretos</SpecificName>
     <Icon>units/brit_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/brit_infantry_javelinist_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/britons/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml	(revision 23803)
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/brit_rotarymill
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>brit</Civ>
     <SelectionGroupName>units/brit_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Talmoris</SpecificName>
     <Icon>units/gaul_infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit_infantry_slinger_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/britons/infantry_slinger_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml	(revision 23803)
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/brit_rotarymill
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>brit</Civ>
     <SelectionGroupName>units/brit_infantry_spearman_b</SelectionGroupName>
     <GenericName>Celtic Spearman</GenericName>
     <SpecificName>Catucos</SpecificName>
     <Icon>units/brit_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/brit_infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/britons/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml	(revision 23803)
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/brit_rotarymill
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>brit</Civ>
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt_support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml	(revision 23803)
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
       structures/gaul_tavern
-      structures/gaul_rotarymill
     </Entities>
   </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul_infantry_javelinist_b</SelectionGroupName>
     <SpecificName>Adretos</SpecificName>
     <Icon>units/gaul_infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/gaul_infantry_javelinist_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/gauls/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml	(revision 23803)
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
       structures/gaul_tavern
-      structures/gaul_rotarymill
     </Entities>
   </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Talmoris</SpecificName>
     <Icon>units/gaul_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/gaul_infantry_slinger_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/gauls/infantry_slinger_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml	(revision 23803)
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
       structures/gaul_tavern
-      structures/gaul_rotarymill
     </Entities>
   </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul_infantry_spearman_b</SelectionGroupName>
     <SpecificName>Catucos</SpecificName>
     <Icon>units/gaul_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/gaul_infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/gauls/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml	(revision 23802)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml	(revision 23803)
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/gaul_rotarymill
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt_support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>