Tweak happiness and health

yairm210 · Nov 5, 2024 · 86aa926 · 86aa926
1 parent 0593d59
commit 86aa926
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/jsons/Buildings.json b/jsons/Buildings.json
@@ -1524,18 +1524,19 @@
 
 	{
 		"name": "Revolution",
-		"cost": 1,
+		"cost": 100,
 		"maintenance": 0,
 		"isNationalWonder": true,
 		"happiness": -5,
 		"uniques": [
 			"Comment [Allows selecting new Policies/Civics]",
-			"[-2 Happiness] [in your cities] <for [2] turns>",
+			"[-5 Happiness] [in your cities] <for [2] turns>",
+			"Unavailable <when below [0] Happiness>",
 			"Remove [Revolution] [in this city] <hidden from users>",
 			"Only available <in [in capital] cities>",
 			"Only available <for [Human player] Civilizations> <hidden from users>", // Disable for AI players for now
-			"Cannot be hurried",
-			"Cannot be purchased",
+			"Cannot be hurried <hidden from users>",
+			"Cannot be purchased <hidden from users>",
 			"Free Social Policy <hidden from users>",
 			"Free Social Policy <hidden from users>",
 			"Free Social Policy <hidden from users>",

diff --git a/jsons/Difficulties.json b/jsons/Difficulties.json
@@ -11,7 +11,7 @@
 		"unitSupplyBase": 24, // iFreeUnits
 		"unitSupplyPerCity": 3,
 		"buildingCostModifier": 0.5,
-		"policyCostModifier": 0.5,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.2, // iNumCitiesMaintenancePercent / 2
 		"barbarianBonus": 0.75,
 		"barbarianSpawnDelay": 8,
@@ -41,7 +41,7 @@
 		"unitSupplyBase": 18,
 		"unitSupplyPerCity": 3,
 		"buildingCostModifier": 0.67,
-		"policyCostModifier": 0.67,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.25,
 		"barbarianBonus": 0.5,
 		"barbarianSpawnDelay": 5,
@@ -71,7 +71,7 @@
 		"unitSupplyBase": 12,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 0.85,
-		"policyCostModifier": 0.85,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.3,
 		"barbarianBonus": 0.4,
 		"barbarianSpawnDelay": 3,
@@ -101,7 +101,7 @@
 		"unitSupplyBase": 8,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 0.92,
-		"policyCostModifier": 0.92,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.35,
 		"barbarianBonus": 0.38,
 		"barbarianSpawnDelay": 0,
@@ -131,7 +131,7 @@
 		"unitSupplyBase": 6,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 1,
-		"policyCostModifier": 1,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.4,
 		"barbarianBonus": 0.33,
 		"barbarianSpawnDelay": 0,
@@ -161,7 +161,7 @@
 		"unitSupplyBase": 4,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 1,
-		"policyCostModifier": 1,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.425,
 		"barbarianBonus": 0.25,
 		"barbarianSpawnDelay": 0,
@@ -191,7 +191,7 @@
 		"unitSupplyBase": 3,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 1,
-		"policyCostModifier": 1,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.45,
 		"barbarianBonus": 0.2,
 		"barbarianSpawnDelay": 0,
@@ -221,7 +221,7 @@
 		"unitSupplyBase": 2,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 1,
-		"policyCostModifier": 1,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.475,
 		"barbarianBonus": 0.1,
 		"barbarianSpawnDelay": 0,
@@ -251,7 +251,7 @@
 		"unitSupplyBase": 1,
 		"unitSupplyPerCity": 2,
 		"buildingCostModifier": 1,
-		"policyCostModifier": 1,
+		"policyCostModifier": 0,
 		"unhappinessModifier": 0.5,
 		"barbarianBonus": 0,
 		"barbarianSpawnDelay": 0,

diff --git a/jsons/GlobalUniques.json b/jsons/GlobalUniques.json
@@ -2,18 +2,20 @@
     "name": "Global uniques",
     "uniques": [
 		// Happiness
-		"[+7 Happiness] [in your cities]", // Baseline
-        "[-1 Happiness] per [1] population [in all cities]",
-		"[+1 Happiness] [in all cities] <with a garrison>",
+		// https://civilization.fandom.com/wiki/Happiness_(Civ4)
+		"[+6 Happiness] [in your cities]", // Baseline
+		"[-1 Happiness] per [1] population [in all cities]", // Overpopulation
+		"[+1 Happiness] [in all cities] <with a garrison>", // Undefended
 		// TODO: Unhappiness makes civilians not work
+		// TODO: Cultural Inferiority: A city will become unhappy if it is being "culturally dominated" by a nearby foreign city (see Borders).
+		// TODO: Add War Weariness
+		// TODO: Slavery and the Draft: Citizens are unhappy if you work them to death (see the Nationhood civic).
+		// TODO: Block We Love The King Day when Unhealthy
 
 		// TODO: Healthy: Each point of pop eats 2 Food Food per turn, or 3 Food Food each for unhealthy pop.
         "[-1 Food] per [2] population [in all cities] <when above [0] [Health]>",
         "[-1 Food] per [1] population [in all cities] <when below [1] [Health]>",
 
-		// Unhealthiness
-		"[-1 Happiness] per [1] population [in all cities] <when below [1] [Health]>",
-
 		// Population: Each point of pop adds to a city's Unhealthiness (Civ4) Unhealthiness.
         "Provides [6] [Health]", // Baseline
         "Provides [-1] [Health] <in cities with at least [1] [Population]>",
@@ -63,9 +65,6 @@
         // Speed Adjustments
         "[+25]% Production when constructing [All] units [in all cities] <on [Marathon] game speed>",
 
-		// TODO: Add War Weariness
-		"[-25]% [Happiness] [in your cities] <when at war>",
-
 		// Adopt all Civic Branches/Policies
 		"Adopt [Government] <hidden from users>",
 		"Adopt [Legal] <hidden from users>",