From e374ecc3422d6b18f520a9e123b0e23fa24d2bdd Mon Sep 17 00:00:00 2001
From: Matei <matei@wildfiregames.com>
Date: Tue, 18 Jul 2006 04:23:35 +0000
Subject: [PATCH] Increased SettlementAura radius so it looks nicer on maps
 where scenario designers have placed settlements by hand. Eventually we
 should decrease it back to 0.1 when Atlas supports socketted placement.

Also, modified game startup script to use the new tech functions.

This was SVN commit r4139.
---
 .../mods/official/entities/units/celt_cavalry_spearman_b.xml  | 2 +-
 binaries/data/mods/official/scripts/entity_functions.js       | 2 +-
 binaries/data/mods/official/scripts/game_startup.js           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
index c514f6dc9d..7f47cfb6d5 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
 <Entity
-	Parent="template_unit_cavalry_melee_cavalry_spearman"
+	Parent="template_unit_cavalry_melee_spearman"
 >
 	<Traits>
 	
diff --git a/binaries/data/mods/official/scripts/entity_functions.js b/binaries/data/mods/official/scripts/entity_functions.js
index 086e2b72d7..1fbb52003d 100644
--- a/binaries/data/mods/official/scripts/entity_functions.js
+++ b/binaries/data/mods/official/scripts/entity_functions.js
@@ -503,7 +503,7 @@ function attachAuras()
 	
 	if( this.hasClass("Settlement") )
 	{
-		this.addAura ( "settlement", 0.1, 0, new SettlementAura( this ) );
+		this.addAura ( "settlement", 1.0, 0, new SettlementAura( this ) );
 	}
 }
 
diff --git a/binaries/data/mods/official/scripts/game_startup.js b/binaries/data/mods/official/scripts/game_startup.js
index e1ab20f961..aa2b3504ac 100644
--- a/binaries/data/mods/official/scripts/game_startup.js
+++ b/binaries/data/mods/official/scripts/game_startup.js
@@ -33,10 +33,10 @@ for(var i=0; i<players.length; i++)
 // Give the players their civ techs (which will set up their civ bonuses)
 for(var i=0; i<players.length; i++)
 {
-	var tech = getTechnology( "civ_" + players[i].civilization.toLowerCase() );
+	var tech = getTechnology( "civ_" + players[i].civilization.toLowerCase(), players[i] );
 	if( tech != null )
 	{
-		tech.applyEffects( i, false, false );
+		tech.applyEffects( false, false );
 	}
 }