From 602f74c1f2c59f33dc4ac341a24e8d78e32fb458 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 13 Feb 2022 11:21:50 +0200 Subject: [PATCH 30/30] Remove trailing spaces and tabs from all ruleset files See osdn #43846 Signed-off-by: Marko Lindqvist --- data/alien/game.ruleset | 6 +++--- data/civ1/buildings.ruleset | 4 ++-- data/civ1/effects.ruleset | 2 +- data/civ2/buildings.ruleset | 4 ++-- data/civ2/effects.ruleset | 12 ++++++------ data/civ2civ3/effects.ruleset | 8 ++++---- data/civ2civ3/units.ruleset | 4 ++-- data/classic/buildings.ruleset | 4 ++-- data/classic/effects.ruleset | 2 +- data/classic/units.ruleset | 2 +- data/goldkeep/buildings.ruleset | 4 ++-- data/goldkeep/effects.ruleset | 2 +- data/goldkeep/units.ruleset | 2 +- data/granularity/cities.ruleset | 2 +- data/granularity/game.ruleset | 6 +++--- data/multiplayer/effects.ruleset | 10 +++++----- data/multiplayer/units.ruleset | 8 ++++---- data/nation/chrobatian.ruleset | 4 ++-- data/nation/dryad.ruleset | 2 +- data/nation/illyrian.ruleset | 2 +- data/nation/lippe.ruleset | 2 +- data/nation/tuareg.ruleset | 2 +- data/nation/venetian.ruleset | 2 +- data/sandbox/effects.ruleset | 8 ++++---- data/sandbox/units.ruleset | 2 +- data/stub/cities.ruleset | 2 +- data/stub/effects.ruleset | 2 +- data/stub/game.ruleset | 6 +++--- data/webperimental/buildings.ruleset | 4 ++-- data/webperimental/effects.ruleset | 2 +- data/webperimental/units.ruleset | 2 +- 31 files changed, 62 insertions(+), 62 deletions(-) diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 1e3e983264..f87ae91690 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -209,10 +209,10 @@ illness_trade_infection = 0 illness_pollution_factor = 0 [incite_cost] -; city_incite_cost = +; city_incite_cost = ; total_factor * (city_size) * -; (base_incite_cost + (units_cost) * unit_factor + -; (improvements_cost) * improvement_factor) +; (base_incite_cost + (units_cost) * unit_factor + +; (improvements_cost) * improvement_factor) ; / (distance * 100) ; See city_incite_cost() for more details base_incite_cost = 1000 diff --git a/data/civ1/buildings.ruleset b/data/civ1/buildings.ruleset index c40ae5c8c8..9c0223a227 100644 --- a/data/civ1/buildings.ruleset +++ b/data/civ1/buildings.ruleset @@ -1217,8 +1217,8 @@ Allows you to choose any government, including those that have not yet\ been researched by your civilization, and without the transition\ period of Anarchy.\ ") -; NOTE: -; This does not match Civ1 or Civ2, but diplomatic effects are +; NOTE: +; This does not match Civ1 or Civ2, but diplomatic effects are ; not very effective in multiplayer, and hitpoints effects do not ; apply for Civ1. Note in Civ1 Pyramids have a gov-change effect, ; but become obsolete, and the Statue of Liberty does not exist. diff --git a/data/civ1/effects.ruleset b/data/civ1/effects.ruleset index 3a1802eb3d..852bfd265e 100644 --- a/data/civ1/effects.ruleset +++ b/data/civ1/effects.ruleset @@ -1177,7 +1177,7 @@ reqs = { "type", "name", "range" "Tech", "Flight", "Player" } - + [effect_railroad_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -585 diff --git a/data/civ2/buildings.ruleset b/data/civ2/buildings.ruleset index b2af2b763f..4afc4ecb09 100644 --- a/data/civ2/buildings.ruleset +++ b/data/civ2/buildings.ruleset @@ -1699,8 +1699,8 @@ sound_alt = "w_generic" helptext = _("\ All your units regain two extra hitpoints per turn.\ ") -; NOTE: -; This does not match Civ1 or Civ2, but diplomatic effects are +; NOTE: +; This does not match Civ1 or Civ2, but diplomatic effects are ; not very effective in multiplayer, and hitpoints effects do not ; apply for Civ1. Note in Civ1 Pyramids have a gov-change effect, ; but become obsolete, and the Statue of Liberty does not exist. diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index 68f69b4f15..81bb9a3646 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -2134,7 +2134,7 @@ reqs = { "type", "name", "range" "Tech", "Flight", "Player" } - + [effect_railroad_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -585 @@ -2158,11 +2158,11 @@ type = "Trade_Revenue_Bonus" value = 1585 [effect_tithes_fundamentalism] -type = "Happiness_To_Gold" -value = 1 -reqs = - { "type", "name", "range" - "Gov", "Fundamentalism", "Player" +type = "Happiness_To_Gold" +value = 1 +reqs = + { "type", "name", "range" + "Gov", "Fundamentalism", "Player" } ; This calendar is based on civ2 "King" level diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index 9ce9ed114d..57f34631fa 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -1656,9 +1656,9 @@ reqs = } [effect_tithes_fundamentalism] -type = "Happiness_To_Gold" -value = 1 -reqs = +type = "Happiness_To_Gold" +value = 1 +reqs = { "type", "name", "range", "quiet" "Gov", "Fundamentalism", "Player", TRUE } @@ -3805,7 +3805,7 @@ reqs = { "type", "name", "range" "Building", "Women's Suffrage", "City" } -;pow(2, value/1000) -> Base = 50% +;pow(2, value/1000) -> Base = 50% [effect_base_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -1000 diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 0942373a9d..a7b33b8123 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -440,7 +440,7 @@ flags = "Unreachable", "DoesntOccupyTile", "CanPillage", ; "Explorer" = unit to use for exploring ; "Hut" = can be found in a hut ; "HutTech" = can be found in a hut, but its techs required -; "Partisan" = can be created as a partisan (only one unit can have this +; "Partisan" = can be created as a partisan (only one unit can have this ; flag), see end of this file for its tech requirements option ; "DefendOk" = AI hint: ok for defending with ; "DefendGood" = AI hint: good for defending with @@ -2547,7 +2547,7 @@ uk_happy = 0 uk_shield = 0 uk_food = 0 uk_gold = 0 -flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy", +flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy", "EvacuateFirst", "Unbribable", "GameLoss", "Unique", "Provoking" ; No veteran levels (level name is never displayed) diff --git a/data/classic/buildings.ruleset b/data/classic/buildings.ruleset index d26b981d94..7d83801ed4 100644 --- a/data/classic/buildings.ruleset +++ b/data/classic/buildings.ruleset @@ -1756,8 +1756,8 @@ sound_alt = "w_generic" helptext = _("\ All your units regain two extra hitpoints per turn.\ ") -; NOTE: -; This does not match Civ1 or Civ2, but diplomatic effects are +; NOTE: +; This does not match Civ1 or Civ2, but diplomatic effects are ; not very effective in multiplayer, and hitpoints effects do not ; apply for Civ1. Note in Civ1 Pyramids have a gov-change effect, ; but become obsolete, and the Statue of Liberty does not exist. diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 33e0f6eda3..ab0b075899 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -2192,7 +2192,7 @@ reqs = { "type", "name", "range" "Tech", "Flight", "Player" } - + [effect_railroad_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -585 diff --git a/data/classic/units.ruleset b/data/classic/units.ruleset index d5b2d455cb..33010fccbd 100644 --- a/data/classic/units.ruleset +++ b/data/classic/units.ruleset @@ -2305,7 +2305,7 @@ uk_happy = 0 uk_shield = 0 uk_food = 0 uk_gold = 0 -flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", +flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", "EvacuateFirst", "Unbribable", "GameLoss", "Unique", "Provoking" ; No veteran levels (level name is never displayed) diff --git a/data/goldkeep/buildings.ruleset b/data/goldkeep/buildings.ruleset index 62eee5e8cc..361895ffca 100644 --- a/data/goldkeep/buildings.ruleset +++ b/data/goldkeep/buildings.ruleset @@ -1819,8 +1819,8 @@ sound_alt = "w_generic" helptext = _("\ All your units regain two extra hitpoints per turn.\ ") -; NOTE: -; This does not match Civ1 or Civ2, but diplomatic effects are +; NOTE: +; This does not match Civ1 or Civ2, but diplomatic effects are ; not very effective in multiplayer, and hitpoints effects do not ; apply for Civ1. Note in Civ1 Pyramids have a gov-change effect, ; but become obsolete, and the Statue of Liberty does not exist. diff --git a/data/goldkeep/effects.ruleset b/data/goldkeep/effects.ruleset index e0cf93a8cf..b5d95e4ac4 100644 --- a/data/goldkeep/effects.ruleset +++ b/data/goldkeep/effects.ruleset @@ -2447,7 +2447,7 @@ reqs = { "type", "name", "range" "Tech", "Flight", "Player" } - + [effect_railroad_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -585 diff --git a/data/goldkeep/units.ruleset b/data/goldkeep/units.ruleset index 4ad5601a24..4106eeb47e 100644 --- a/data/goldkeep/units.ruleset +++ b/data/goldkeep/units.ruleset @@ -2337,7 +2337,7 @@ uk_happy = 0 uk_shield = 0 uk_food = 0 uk_gold = 0 -flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", +flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", "EvacuateFirst", "Unbribable", "GameLoss", "Unique", "Provoking" ; No veteran levels (level name is never displayed) diff --git a/data/granularity/cities.ruleset b/data/granularity/cities.ruleset index f7654da427..16fb306d59 100644 --- a/data/granularity/cities.ruleset +++ b/data/granularity/cities.ruleset @@ -12,7 +12,7 @@ description = "Granularity cities data for Freeciv" options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" format_version = 30 -; /* <-- avoid gettext warnings +; /* <-- avoid gettext warnings ; ; A specialist is a city citizen who is not a tile worker. Usually the ; player can control what specialist each citizen is, so long as the diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index 143342cc34..ccfb74294e 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -205,10 +205,10 @@ illness_trade_infection = 50 illness_pollution_factor = 50 [incite_cost] -; city_incite_cost = +; city_incite_cost = ; total_factor * (city_size) * -; (base_incite_cost + (units_cost) * unit_factor + -; (improvements_cost) * improvement_factor) +; (base_incite_cost + (units_cost) * unit_factor + +; (improvements_cost) * improvement_factor) ; / (distance * 100) ; See city_incite_cost() for more details base_incite_cost = 100000 diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index fcce8d1dd8..0a047c1987 100644 --- a/data/multiplayer/effects.ruleset +++ b/data/multiplayer/effects.ruleset @@ -2227,11 +2227,11 @@ reqs = } [effect_tithes_fundamentalism] -type = "Happiness_To_Gold" -value = 1 -reqs = - { "type", "name", "range" - "Gov", "Fundamentalism", "Player" +type = "Happiness_To_Gold" +value = 1 +reqs = + { "type", "name", "range" + "Gov", "Fundamentalism", "Player" } [effect_max_rates_fundamentalism] diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset index 2f15ebb26a..0facf80eee 100644 --- a/data/multiplayer/units.ruleset +++ b/data/multiplayer/units.ruleset @@ -9,7 +9,7 @@ ; You should sort role units from worst to better, as often the best ; available role unit of a given sort will be picked by choosing ; the first available (not obsolete) such unit, or by picking the last -; such unit directly. When determining starting units, the first +; such unit directly. When determining starting units, the first ; unit with the relevant role that the player can build will be chosen. ; If no such unit can be found (eg Explorers that require Seafaring), ; then the first unit with this role will be chosen. @@ -1531,7 +1531,7 @@ attack = 8 defense = 4 hitpoints = 20 firepower = 2 -move_rate = 28 +move_rate = 28 vision_radius_sq = 8 transport_cap = 0 fuel = 1 @@ -1571,7 +1571,7 @@ attack = 18 defense = 5 hitpoints = 20 firepower = 2 -move_rate = 24 +move_rate = 24 vision_radius_sq = 8 transport_cap = 0 fuel = 2 @@ -2392,7 +2392,7 @@ uk_happy = 0 uk_shield = 0 uk_food = 0 uk_gold = 0 -flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", +flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", "EvacuateFirst", "Unbribable", "GameLoss", "Unique", "Provoking" ; No veteran levels (level name is never displayed) diff --git a/data/nation/chrobatian.ruleset b/data/nation/chrobatian.ruleset index c14fbe7c04..077e31c1c2 100644 --- a/data/nation/chrobatian.ruleset +++ b/data/nation/chrobatian.ruleset @@ -42,8 +42,8 @@ civilwar_nations = "czech", "vistulan", "silesian", "moravian" cities = "Libice nad Cidlinou", - "Krakov", ;Kraków - "Kouřim", + "Krakov", ;Kraków + "Kouřim", "Svidnice", ;Świdnica "Kladsko", ;Kłodzko "Tĕšin", ;Cieszyn diff --git a/data/nation/dryad.ruleset b/data/nation/dryad.ruleset index ffd6b4a84d..2a4fefbb96 100644 --- a/data/nation/dryad.ruleset +++ b/data/nation/dryad.ruleset @@ -59,7 +59,7 @@ cities = "Baikushev's Pine", ; Pine in Bulgaria - 1,300 years old "Stelmužė Oak", ; Oak in Lithuania - 1,500 years old "One Hundred Horses", ; Chestnut in Italy - 4,000 years old - "Merlin's Oak", + "Merlin's Oak", "Glastonbury Thorn", ; Hawthorn "Thor's Oak", "Royal Oak", diff --git a/data/nation/illyrian.ruleset b/data/nation/illyrian.ruleset index 8b9e28b4d3..0efb53501f 100644 --- a/data/nation/illyrian.ruleset +++ b/data/nation/illyrian.ruleset @@ -90,7 +90,7 @@ cities = ; |Apollonia "Scampa (mountains, plains, river)", ;+100 41:06N 20:04E ; |Elbasan - "Dimal (hills, river, !ocean)", + "Dimal (hills, river, !ocean)", ; |Dimallium "Colchinium (hills, ocean)", ;-500 41:55N 19:12E ; |Olcinium|Dulcinium|Dulcigno|Ulcinj diff --git a/data/nation/lippe.ruleset b/data/nation/lippe.ruleset index 9dc12358a2..7cb915cdd8 100644 --- a/data/nation/lippe.ruleset +++ b/data/nation/lippe.ruleset @@ -50,7 +50,7 @@ cities = "Horn", "Schwalenberg", "Augustdorf", - "Extertal", + "Extertal", "Dörentrup", "Kalletal", "Schlangen", diff --git a/data/nation/tuareg.ruleset b/data/nation/tuareg.ruleset index ca7e9f082d..104c10e7aa 100644 --- a/data/nation/tuareg.ruleset +++ b/data/nation/tuareg.ruleset @@ -49,7 +49,7 @@ civilwar_nations = "songhai", "malian", "nigerien", "algerian", "libyan", "burki cities = "Agadez", - "Kidal", + "Kidal", "Ghadames", "Ghat", "Nalut", diff --git a/data/nation/venetian.ruleset b/data/nation/venetian.ruleset index 551d64e7c7..7f50c98c0c 100644 --- a/data/nation/venetian.ruleset +++ b/data/nation/venetian.ruleset @@ -51,7 +51,7 @@ cities = "Famagosta", ; Famagusta "Canea", ; Chania "Atene", ; Athens - "Verona", + "Verona", "Padoa", ; Padua "Corfù", ; Corfu "Durazo", ; Durrës diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index 68dc62f89e..2beb8280f0 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -1764,9 +1764,9 @@ reqs = } [effect_tithes_fundamentalism] -type = "Happiness_To_Gold" -value = 1 -reqs = +type = "Happiness_To_Gold" +value = 1 +reqs = { "type", "name", "range", "quiet" "Gov", "Fundamentalism", "Player", TRUE } @@ -3937,7 +3937,7 @@ reqs = { "type", "name", "range" "Building", "Women's Suffrage", "City" } -;pow(2, value/1000) -> Base = 50% +;pow(2, value/1000) -> Base = 50% [effect_base_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -1000 diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 37c789e48d..2b0cc058a1 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -2713,7 +2713,7 @@ uk_happy = 0 uk_shield = 0 uk_food = 0 uk_gold = 0 -flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy", +flags = "IgZOC", "NonMil", "NoBuild", "NoHome", "SuperSpy", "EvacuateFirst", "Unbribable", "GameLoss", "Unique", "Provoking", "FleshBased" ; No veteran levels (level name is never displayed) diff --git a/data/stub/cities.ruleset b/data/stub/cities.ruleset index 72ca5dc1d5..402cb2dd6f 100644 --- a/data/stub/cities.ruleset +++ b/data/stub/cities.ruleset @@ -6,7 +6,7 @@ description = " cities data for Freeciv" options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" format_version = 30 -; /* <-- avoid gettext warnings +; /* <-- avoid gettext warnings ; ; A specialist is a city citizen who is not a tile worker. Usually the ; player can control what specialist each citizen is, so long as the diff --git a/data/stub/effects.ruleset b/data/stub/effects.ruleset index c138e9d76c..c418f2e5b5 100644 --- a/data/stub/effects.ruleset +++ b/data/stub/effects.ruleset @@ -52,7 +52,7 @@ value = 1 [effect_tech_cost_base] type = "Tech_Cost_Factor" value = 1 - + ; Cities can always work tiles [effect_tile_workable] type = "Tile_Workable" diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index c98eda6d79..6f3263c6e2 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -197,10 +197,10 @@ illness_trade_infection = 50 illness_pollution_factor = 50 [incite_cost] -; city_incite_cost = +; city_incite_cost = ; total_factor * (city_size) * -; (base_incite_cost + (units_cost) * unit_factor + -; (improvements_cost) * improvement_factor) +; (base_incite_cost + (units_cost) * unit_factor + +; (improvements_cost) * improvement_factor) ; / (distance * 100) ; See city_incite_cost() for more details base_incite_cost = 1000 diff --git a/data/webperimental/buildings.ruleset b/data/webperimental/buildings.ruleset index f1868fc48e..8fbedae627 100644 --- a/data/webperimental/buildings.ruleset +++ b/data/webperimental/buildings.ruleset @@ -1764,8 +1764,8 @@ sound_alt = "w_generic" helptext = _("\ All your units regain two extra hitpoints per turn.\ ") -; NOTE: -; This does not match Civ1 or Civ2, but diplomatic effects are +; NOTE: +; This does not match Civ1 or Civ2, but diplomatic effects are ; not very effective in multiplayer, and hitpoints effects do not ; apply for Civ1. Note in Civ1 Pyramids have a gov-change effect, ; but become obsolete, and the Statue of Liberty does not exist. diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index d6ae5171ad..357c886411 100644 --- a/data/webperimental/effects.ruleset +++ b/data/webperimental/effects.ruleset @@ -2218,7 +2218,7 @@ reqs = { "type", "name", "range" "Tech", "Flight", "Player" } - + [effect_railroad_trade_revenue_reduce] type = "Trade_Revenue_Bonus" value = -585 diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset index 7f164e3f24..c97ad932af 100644 --- a/data/webperimental/units.ruleset +++ b/data/webperimental/units.ruleset @@ -2330,7 +2330,7 @@ uk_happy = 0 uk_shield = 0 uk_food = 0 uk_gold = 0 -flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", +flags = "IgZOC", "NonMil", "HasNoZOC", "NoBuild", "NoHome", "SuperSpy", "EvacuateFirst", "Unbribable", "GameLoss", "Unique", "Provoking", "LightWeight" ; No veteran levels (level name is never displayed) -- 2.34.1