Moreeeee

Alarcarr · Mar 31, 2015 · 756a385 · DaloLorn · Mar 31, 2015 · DaloLorn
1 parent eb79261
commit 756a385
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
diff --git a/data/research/base_grid.txt b/data/research/base_grid.txt
@@ -54,9 +54,7 @@ Grid: Base
 	c1: 9,10
 	ImpShieldCap: 6,7
 	ImpShieldCap: 7,8
-	ImpShieldReg: 7,7
 	ImpShieldCap2: 8,7
-	CovariantShield: 8,6
 	ImpSupportCapSmall: 3,-2
 	ImpSupportDamage: 4,-2
 	ImpAllHealth: 6,0
@@ -217,7 +215,6 @@ Grid: Base
 	c2: 9,8
 	SysOreProcessor: -5,-11
 	c3: -4,6
-	SysGravitonCondenser: -5,6
 	c2: -6,7
 	SSG: -6,8
 	ImpDamage: 9,0
@@ -252,3 +249,6 @@ Grid: Base
 	ImpAllRange: -2,4
 	ImpSupportDamage: 6,-7
 	ModAugmentSupply: 4,-1
+	SysGravitonCondenser: -7,7
+	DevEnergy: -5,6
+	AdvShield: 7,7
diff --git a/data/research/improvements/ImpPopulation.txt b/data/research/improvements/ImpPopulation.txt
@@ -33,3 +33,11 @@ Technology: TileDev
 	Time Cost: 60
 	Icon: DesignationIcons::10
 	ModAttribute(TileDevelopmentFactor, AddBase, 0.3)
+Technology: MechPop
+	Name: Population Matrix
+	Description: Reduced Labor cost for Mecha Pop
+	Icon: ResourceIconsSmall::3
+	Point Cost: 1000
+	Time Cost: 300
+	SecondaryEnergyCost(1500)
+	ModAttribute(MechPopulationBuilt, Multiply, 0.9)
diff --git a/data/research/unlocks/Subsystems/Armor/CompositeArmor.txt b/data/research/unlocks/Subsystems/Armor/CompositeArmor.txt
@@ -2,7 +2,7 @@ Technology: CompositeArmor
 	Name: Composite Armor
 	Class: Unlock
 
-	Point Cost: 700
+	Point Cost: 500
 	Time Cost: 180
 
 	Icon: CompositeArmor

diff --git a/data/research/unlocks/Subsystems/Armor/CrystallineArmor.txt b/data/research/unlocks/Subsystems/Armor/CrystallineArmor.txt
@@ -3,7 +3,7 @@ Technology: CrystalineArmor
 	Class: Unlock
 	Description: #R_CRYSTAL_ARMOR_DESC
 
-	Point Cost: 1500
+	Point Cost: 700
 	Time Cost: 240
 
 	Icon: CrystalArmor

diff --git a/data/research/unlocks/Subsystems/Armor/QuantumArmor.txt b/data/research/unlocks/Subsystems/Armor/QuantumArmor.txt
@@ -2,7 +2,7 @@ Technology: QuantumArmor
 	Name: Quantum Armor
 	Class: Unlock
 
-	Point Cost: 1500
+	Point Cost: 1000
 	Time Cost: 240
 
 	Icon: QuantumArmor

diff --git a/data/research/unlocks/Subsystems/Special/AdvShields.txt b/data/research/unlocks/Subsystems/Special/AdvShields.txt
@@ -0,0 +1,14 @@
+Technology: AdvShield
+	Name: Advanced Shielding
+	Point Cost: 1000
+	Time Cost: 120
+	Icon: FtlGen
+	Blurb: +20% Shield  HP
+	Class: Unlock
+	Color: #bf01ff
+	AddModifier(ShieldCapacityFactor(1.2))
+	SecondaryEnergyCost(1200)
+	UnlockSubsystem(ShieldRegenerator)
+	UnlockSubsystem(ShieldTransmitter)
+	UnlockSubsystem(ShieldBattery)
+	UnlockSubsystem(DefensiveMatrix)
diff --git a/data/research/unlocks/Subsystems/Weapons/MassDisruptor.txt b/data/research/unlocks/Subsystems/Weapons/MassDisruptor.txt
@@ -1,7 +1,7 @@
 Technology: Matter Disruptor
 	Name: Matter Disruptor
 	Class: Unlock
-	Point Cost: 1000
+	Point Cost: 700
 	Time Cost: 120
 	Icon: WaveEmitter
 	Description: #R_MATTERDISRUPTOR_DESC

diff --git a/data/traits/lifestyle/Mechanoid.txt b/data/traits/lifestyle/Mechanoid.txt
@@ -18,6 +18,8 @@ Trait: Mechanoid
 	TriggerHomeworld(MorphSystemPlanetResource(3, Iron))
 	TriggerHomeworld(AddStatus(MonoHomeworld))
 
+	ReplaceTechnologyNodes(ImpPopLvl3, MechPop)
+	ReplaceTechnologyNodes(ImpPopLvl2, MechPop)
 	RemoveTechnologyNodes(SlavePopulation)
 	ModAttribute(PopulationGrowthFactor, Multiply, 0)
 	ModAttribute(PopulationDecayFactor, Multiply, 0)