From e9322acb527450f30bf9fd1a1d6e3cefc9934a82 Mon Sep 17 00:00:00 2001
From: Dino <macwiz23@comcast.net>
Date: Mon, 25 Jul 2022 13:09:13 -0400
Subject: [PATCH] See osdn#45225

---
 data/civ2civ3/units.ruleset | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset
index 8c32427397..b591031e2f 100644
--- a/data/civ2civ3/units.ruleset
+++ b/data/civ2civ3/units.ruleset
@@ -1696,7 +1696,7 @@ sound_fight   = "f_trireme"
 sound_fight_alt = "f_generic"
 build_cost    = 20
 pop_cost      = 0
-attack        = 1
+attack        = 0
 defense       = 1
 hitpoints     = 10
 firepower     = 1
@@ -1704,17 +1704,16 @@ move_rate     = 3
 vision_radius_sq = 2
 transport_cap = 2
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Small Land", "Merchant"
-flags         = "BadCityDefender", "HasNoZOC", "Provoking"
+flags         = "BadCityDefender", "HasNoZOC", "Provoking","NonMil"
 roles         = "Ferryboat", "FerryStartUnit"
 helptext      = _("\
 The Trireme is your first boat unit. It can act\
- as a transport ship and has rudimentary offensive\
- capabilities, and unlike later boats can travel on\
+ as a transport ship, and unlike later boats can travel on\
  rivers, but it may not enter deep ocean tiles.\
 ")
 
@@ -1731,7 +1730,7 @@ sound_fight   = "f_caravel"
 sound_fight_alt = "f_generic"
 build_cost    = 30
 pop_cost      = 0
-attack        = 1
+attack        = 0
 defense       = 2
 hitpoints     = 10
 firepower     = 1
@@ -1739,13 +1738,13 @@ move_rate     = 3
 vision_radius_sq = 2
 transport_cap = 3
 fuel          = 0
-uk_happy      = 1
+uk_happy      = 0
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Small Land", "Merchant"
 flags         = "BadCityDefender", "Only_Native_Attack", "HasNoZOC",
-                "Provoking"
+                "Provoking","NonMil"
 roles         = "Ferryboat", "FerryStartUnit", "BarbarianBoat"
 helptext      = _("\
 The Caravel is a sailing ship that can enter\
@@ -1778,7 +1777,7 @@ uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Small Land", "Big Land", "Merchant"
-flags         = "BadCityDefender", "HasNoZOC", "Provoking"
+flags         = "BadCityDefender", "HasNoZOC", "Provoking","NonMil"
 roles         = "Ferryboat", "FerryStartUnit", "BarbarianBoat"
 helptext      = _("\
 The Galleon is a pure transport ship, the first which can\
@@ -2009,7 +2008,7 @@ move_rate     = 5
 vision_radius_sq = 8
 transport_cap = 8
 fuel          = 0
-uk_happy      = 0
+uk_happy      = 1
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
@@ -2045,12 +2044,12 @@ move_rate     = 5
 vision_radius_sq = 8
 transport_cap = 8
 fuel          = 0
-uk_happy      = 0
+uk_happy      = 1
 uk_shield     = 1
 uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Air", "Missile", "Helicopter"
-flags         = "BadCityDefender", "HasNoZOC", "Provoking"
+flags         = "BadCityDefender", "HasNoZOC", "Provoking","FieldUnit"
 roles         = "DefendGood", "DefendGoodStartUnit"
 helptext      = _("\
 The Carrier is a mobile airport.\
@@ -2091,7 +2090,7 @@ uk_food       = 1
 uk_gold       = 1
 cargo         = "Land", "Small Land", "Big Land", "Merchant"
 flags         = "Settlers", "BadCityDefender", "HasNoZOC",
-                "Provoking"
+                "Provoking","NonMil"
 veteran_names = _("green"), _("veteran"), _("hardened"), _("elite")
 veteran_base_raise_chance      = 50, 33, 20, 0
 veteran_work_raise_chance = 0, 0, 0, 0
-- 
2.31.0