From 74b600d661d992bcf7cd2e5c4da4cd2ad776780e Mon Sep 17 00:00:00 2001
From: mimo <mimo@wildfiregames.com>
Date: Mon, 13 Jul 2015 12:46:26 +0000
Subject: [PATCH] modify also capture points in the civ specific techs
 affecting structure health, fixes #3333

This was SVN commit r16852.
---
 .../data/mods/public/simulation/components/Capturable.js     | 2 +-
 .../technologies/celts/civbonus_celts_wooden_struct.json     | 1 +
 .../hellenes/civbonus_hellenic_architecture.json             | 1 +
 .../data/technologies/persians/persian_architecture.json     | 5 +++--
 .../successors/special_hellenistic_metropolis.json           | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/binaries/data/mods/public/simulation/components/Capturable.js b/binaries/data/mods/public/simulation/components/Capturable.js
index 7eda0b0c98..bdf3c62041 100644
--- a/binaries/data/mods/public/simulation/components/Capturable.js
+++ b/binaries/data/mods/public/simulation/components/Capturable.js
@@ -229,7 +229,7 @@ Capturable.prototype.OnValueModification = function(msg)
 		return;
 
 	var oldMaxCp = this.GetMaxCapturePoints();
-	this.maxCp = ApplyValueModificationsToEntity("Capturable/CapturePoints", +this.template.CapturePoints, this.entity);
+	this.maxCp = Math.round(ApplyValueModificationsToEntity("Capturable/CapturePoints", +this.template.CapturePoints, this.entity));
 	if (oldMaxCp == this.maxCp)
 		return;
 
diff --git a/binaries/data/mods/public/simulation/data/technologies/celts/civbonus_celts_wooden_struct.json b/binaries/data/mods/public/simulation/data/technologies/celts/civbonus_celts_wooden_struct.json
index b8f5387e45..c6cee96e7d 100644
--- a/binaries/data/mods/public/simulation/data/technologies/celts/civbonus_celts_wooden_struct.json
+++ b/binaries/data/mods/public/simulation/data/technologies/celts/civbonus_celts_wooden_struct.json
@@ -5,6 +5,7 @@
 	"requirements": {"any": [{"civ": "brit"},{"civ": "gaul"}]},
 	"modifications": [
 		{"value": "Health/Max", "multiply": 0.8},
+		{"value": "Capturable/CapturePoints", "multiply": 0.8},
 		{"value": "Cost/BuildTime", "multiply": 0.8}
 	],
 	"affects": ["Structure"]
diff --git a/binaries/data/mods/public/simulation/data/technologies/hellenes/civbonus_hellenic_architecture.json b/binaries/data/mods/public/simulation/data/technologies/hellenes/civbonus_hellenic_architecture.json
index c186aa843f..a1e73090d4 100644
--- a/binaries/data/mods/public/simulation/data/technologies/hellenes/civbonus_hellenic_architecture.json
+++ b/binaries/data/mods/public/simulation/data/technologies/hellenes/civbonus_hellenic_architecture.json
@@ -5,6 +5,7 @@
 	"requirements": {"any": [{"civ": "athen"},{"civ": "mace"},{"civ": "spart"}]},
 	"modifications": [
 		{"value": "Health/Max", "multiply": 1.1},
+		{"value": "Capturable/CapturePoints", "multiply": 1.1},
 		{"value": "Cost/BuildTime", "multiply": 1.1}
 	],
 	"affects": ["Structure"]
diff --git a/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json b/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
index 48f588e900..5adb669d16 100644
--- a/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
+++ b/binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json
@@ -5,11 +5,12 @@
 	"requirements": {"all": [{"tech": "phase_village"}, {"civ": "pers"}]},
 	"icon": "stone_blocks.png",
 	"researchTime": 60,
-	"tooltip": "All Persian structures +25% health, but also +20% build time.",
+	"tooltip": "All Persian structures +25% health and capture points, but also +20% build time.",
 	"modifications": [
 		{"value": "Cost/BuildTime", "multiply": 1.20},
+		{"value": "Capturable/CapturePoints", "multiply": 1.25},
 		{"value": "Health/Max", "multiply": 1.25}
 	],
 	"affects": ["Structure"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
\ No newline at end of file
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/successors/special_hellenistic_metropolis.json b/binaries/data/mods/public/simulation/data/technologies/successors/special_hellenistic_metropolis.json
index 6a75366e96..e476fb72b6 100644
--- a/binaries/data/mods/public/simulation/data/technologies/successors/special_hellenistic_metropolis.json
+++ b/binaries/data/mods/public/simulation/data/technologies/successors/special_hellenistic_metropolis.json
@@ -6,9 +6,10 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "statue_face_stone.png",
 	"researchTime": 60,
-	"tooltip": "Civic centers +100% health and double default arrows.",
+	"tooltip": "Civic centers +100% health and capture points and double default arrows.",
 	"modifications": [
 		{"value": "BuildingAI/DefaultArrowCount", "multiply": 2.0},
+		{"value": "Capturable/CapturePoints", "multiply": 2.0},
 		{"value": "Health/Max", "multiply": 2.0}
 	],
 	"affects": ["CivCentre"],