From b6aeff4c613b71128c2a5e767bd791b820d4657b Mon Sep 17 00:00:00 2001
From: dftec <dftec.es@gmail.com>
Date: Wed, 12 May 2021 17:25:33 +0200
Subject: [PATCH] civ2civ3: uk_happy disabled for ships with attack 0, enabled
 for fighters with fuel > 1.

Galleon, Transport and Carrier (ships with attack = 0) no longer cause unhappiness (when they end the turn outside national borders). Fighter units (with fuel > 1) can now cause unhappiness due to military activity.

Updated readme, that did not include the old exception about Fighters. Updated Sandbox ruleset with same changes.

Requested by chippo

See osdn #42078
---
 data/civ2civ3/README.civ2civ3 |  6 +++---
 data/civ2civ3/units.ruleset   | 10 +++++-----
 data/sandbox/units.ruleset    | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/civ2civ3/README.civ2civ3 b/data/civ2civ3/README.civ2civ3
index 5f7dba08a9..7374d3399d 100644
--- a/data/civ2civ3/README.civ2civ3
+++ b/data/civ2civ3/README.civ2civ3
@@ -730,9 +730,9 @@ Howitzer        12   2   *1   *1(2) 30  *80  *Wheeled,*CityBuster
                          
 Trireme         1    1    3    1    10  *20   Cargo 2, Coastal
 Caravel        *1   *2    3    1    10  *30   Cargo 3
-Galleon         0    2    4    1    20   40   Cargo 4
-Transport       0    3    5    1    30   50   Cargo 8
-Carrier        *0    9    5   *1    40  *150  Cargo 8
+Galleon         0    2    4    1    20   40   Cargo 4,*No unhappy
+Transport       0    3    5    1    30   50   Cargo 8,*No unhappy
+Carrier        *0    9    5   *1    40  *150  Cargo 8,*No unhappy
                          
 Frigate        *3    2    4    1    20  *40  *No Cargo
 Ironclad        4   *3    4    1   *20  *50
diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset
index 5221e1696a..7c9ceebcd5 100644
--- a/data/civ2civ3/units.ruleset
+++ b/data/civ2civ3/units.ruleset
@@ -1500,7 +1500,7 @@ move_rate     = 10
 vision_radius_sq = 8
 transport_cap = 0
 fuel          = 2
-uk_happy      = 0
+uk_happy      = 1
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -1625,7 +1625,7 @@ move_rate     = 14
 vision_radius_sq = 8
 transport_cap = 0
 fuel          = 2
-uk_happy      = 0
+uk_happy      = 1
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -1762,7 +1762,7 @@ move_rate     = 4
 vision_radius_sq = 2
 transport_cap = 4
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -2034,7 +2034,7 @@ move_rate     = 5
 vision_radius_sq = 8
 transport_cap = 8
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -2074,7 +2074,7 @@ move_rate     = 5
 vision_radius_sq = 8
 transport_cap = 8
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset
index 329894a198..76a7d6b1d4 100644
--- a/data/sandbox/units.ruleset
+++ b/data/sandbox/units.ruleset
@@ -1556,7 +1556,7 @@ move_rate     = 10
 vision_radius_sq = 8
 transport_cap = 0
 fuel          = 2
-uk_happy      = 0
+uk_happy      = 1
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -1682,7 +1682,7 @@ move_rate     = 14
 vision_radius_sq = 8
 transport_cap = 0
 fuel          = 2
-uk_happy      = 0
+uk_happy      = 1
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -1821,7 +1821,7 @@ move_rate     = 4
 vision_radius_sq = 2
 transport_cap = 4
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -2133,7 +2133,7 @@ move_rate     = 5
 vision_radius_sq = 8
 transport_cap = 8
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -2176,7 +2176,7 @@ move_rate     = 5
 vision_radius_sq = 8
 transport_cap = 8
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
-- 
2.25.1