From 422d0fde0adb00d40408741ab424a48578b31e00 Mon Sep 17 00:00:00 2001 From: Alina Lenk Date: Tue, 30 Aug 2022 19:43:37 +0200 Subject: [PATCH] civ2civ3: Fix which naval units are military and cause unhappiness See osdn#45225 Original patch by ddeanbrown Signed-off-by: Alina Lenk --- data/civ2civ3/units.ruleset | 30 +++++++++++++++--------------- data/sandbox/units.ruleset | 32 +++++++++++++++++--------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 5ac6516562..5398a84a00 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -1824,7 +1824,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 @@ -1832,19 +1832,20 @@ 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 tp_defense = "Alight" 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\ - rivers, but it may not enter deep ocean tiles.\ + as a transport ship, and unlike later boats can\ + travel on rivers, but it may not enter deep ocean\ + tiles. It cannot attack other ships, though it\ + may still defend itself when attacked.\ ") [unit_caravel] @@ -1863,7 +1864,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 @@ -1871,14 +1872,14 @@ 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 tp_defense = "Alight" 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\ @@ -1915,12 +1916,11 @@ uk_food = 1 uk_gold = 1 tp_defense = "Alight" 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\ - transport large wheeled units. It cannot attack other ships, though\ - it may still defend itself when attacked.\ +The Galleon is a big transport ship, the first which can\ + transport large wheeled units.\ ") [unit_frigate] @@ -2173,7 +2173,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 @@ -2264,7 +2264,7 @@ uk_gold = 1 tp_defense = "Alight" 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 diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 3ccf05d6cf..d78561a56d 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -1882,7 +1882,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 @@ -1890,19 +1890,21 @@ 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 tp_defense = "Alight" cargo = "Land", "Small Land", "Merchant" -flags = "BadCityDefender", "HasNoZOC", "Provoking", "IronBased" +flags = "BadCityDefender", "HasNoZOC", "Provoking", "IronBased", + "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\ - rivers, but it may not enter deep ocean tiles.\ + as a transport ship, and unlike later boats can\ + travel on rivers, but it may not enter deep ocean\ + tiles. It cannot attack other ships, though it\ + may still defend itself when attacked.\ ") [unit_caravel] @@ -1921,7 +1923,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 @@ -1929,14 +1931,14 @@ move_rate = 3 vision_radius_sq = 2 transport_cap = 3 fuel = 3 -uk_happy = 1 +uk_happy = 0 uk_shield = 1 uk_food = 1 uk_gold = 1 tp_defense = "Alight" cargo = "Land", "Small Land", "Merchant" flags = "BadCityDefender", "Only_Native_Attack", "HasNoZOC", - "Provoking", "Coast", "IronBased" + "Provoking", "Coast", "IronBased", "NonMil" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ The Caravel is a sailing ship that can enter\ @@ -1974,12 +1976,12 @@ uk_food = 1 uk_gold = 1 tp_defense = "Alight" cargo = "Land", "Small Land", "Big Land", "Merchant" -flags = "BadCityDefender", "HasNoZOC", "Provoking", "IronBased" +flags = "BadCityDefender", "HasNoZOC", "Provoking", "IronBased", + "NonMil" roles = "Ferryboat", "FerryStartUnit", "BarbarianBoat" helptext = _("\ -The Galleon is a pure transport ship, the first which can\ - transport large wheeled units. It cannot attack other ships, though\ - it may still defend itself when attacked.\ +The Galleon is a big transport ship, the first which can\ + transport large wheeled units.\ ") [unit_frigate] @@ -2236,7 +2238,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 @@ -2370,7 +2372,7 @@ uk_gold = 1 tp_defense = "Alight" cargo = "Land", "Small Land", "Big Land", "Merchant" flags = "Settlers", "BadCityDefender", "HasNoZOC", - "Provoking", "IronBased" + "Provoking", "IronBased", "NonMil" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 0, 0, 0, 0 -- 2.34.1