From c8031aa5cf9a08022330950baa87afaf16ab4f68 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 17 Jul 2022 12:55:37 +0300 Subject: [PATCH 48/48] Remove trailing spaces from tileset files See osdn #44697 Signed-off-by: Marko Lindqvist --- data/3d.tilespec | 10 ++-- data/alio.tilespec | 6 +- data/alio/riversbrown.spec | 2 +- data/alio/riversgreen.spec | 2 +- data/alio/tunnels.spec | 2 +- data/amplio.tilespec | 6 +- data/amplio/ancientcities.spec | 14 ++--- data/amplio/medievalcities.spec | 8 +-- data/amplio/moderncities.spec | 8 +-- data/amplio/tiles.spec | 2 +- data/amplio/units.spec | 2 +- data/amplio/water.spec | 8 +-- data/amplio2.tilespec | 6 +- data/amplio2/units.spec | 2 +- data/amplio2/veterancy.spec | 2 +- data/amplio2/water.spec | 8 +-- data/cimpletoon.tilespec | 8 +-- data/hex2t.tilespec | 6 +- data/hex2t/items.spec | 12 ++-- data/hex2t/overlays.spec | 6 +- data/hexemplio.tilespec | 6 +- data/hexemplio/bases.spec | 2 +- data/hexemplio/rivers.spec | 2 +- data/hexemplio/terrain.spec | 6 +- data/isophex.tilespec | 8 +-- data/isophex/darkness.spec | 2 +- data/isophex/rivers.spec | 2 +- data/isophex/terrain1.spec | 2 +- data/isophex/terrain2.spec | 12 ++-- data/isotrident.tilespec | 8 +-- data/isotrident/cities.spec | 10 ++-- data/isotrident/morecities.spec | 4 +- data/isotrident/terrain2.spec | 6 +- data/isotrident/tiles.spec | 2 +- data/misc/buildings.spec | 6 +- data/misc/colors.tilespec | 2 +- data/misc/cursors.spec | 2 +- data/misc/editor.spec | 22 +++---- data/misc/events.spec | 2 +- data/misc/flags-large.spec | 2 +- data/misc/flags.spec | 16 ++--- data/misc/icons.spec | 2 +- data/misc/small.spec | 8 +-- data/misc/techs.spec | 30 +++++----- data/toonhex.tilespec | 6 +- data/trident.tilespec | 10 ++-- data/trident/tiles.spec | 100 ++++++++++++++++---------------- 47 files changed, 200 insertions(+), 200 deletions(-) diff --git a/data/3d.tilespec b/data/3d.tilespec index d9eb7f30ec..61783c975b 100644 --- a/data/3d.tilespec +++ b/data/3d.tilespec @@ -14,7 +14,7 @@ priority = 5 summary = _("Basic small overhead tileset.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -35,7 +35,7 @@ fog_style = "Darkness" ; Was darkness style "CardinalFull" (15 sprites) darkness_style = "Corner" - + ; offset the flags by this amount when drawing units unit_flag_offset_x = 0 unit_flag_offset_y = 0 @@ -45,7 +45,7 @@ city_flag_offset_y = 0 ; offset the city occupied sprite by this amount occupied_offset_x = 0 occupied_offset_y = 0 - + ; offset the units by this amount unit_offset_x = 0 unit_offset_y = 0 @@ -135,8 +135,8 @@ unit_upkeep_small_offset_y = 20 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/alio.tilespec b/data/alio.tilespec index 6379c49a9e..cf9c304bf7 100644 --- a/data/alio.tilespec +++ b/data/alio.tilespec @@ -21,7 +21,7 @@ Tileset containing graphics suitable for playing with alien ruleset.\ ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -145,8 +145,8 @@ layer_order = ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). diff --git a/data/alio/riversbrown.spec b/data/alio/riversbrown.spec index add94b10ca..4b2b5a46fa 100644 --- a/data/alio/riversbrown.spec +++ b/data/alio/riversbrown.spec @@ -23,7 +23,7 @@ dy = 64 pixel_border = 1 tiles = { "row", "column","tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 0, 0, "road.brown_river_s_n0e0se0s0w0nw0" diff --git a/data/alio/riversgreen.spec b/data/alio/riversgreen.spec index 5625ad8aec..497d072ac1 100644 --- a/data/alio/riversgreen.spec +++ b/data/alio/riversgreen.spec @@ -23,7 +23,7 @@ dy = 64 pixel_border = 1 tiles = { "row", "column","tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 0, 0, "road.green_river_s_n0e0se0s0w0nw0" diff --git a/data/alio/tunnels.spec b/data/alio/tunnels.spec index 129d4ec0c1..3b3f21df03 100644 --- a/data/alio/tunnels.spec +++ b/data/alio/tunnels.spec @@ -22,7 +22,7 @@ dy = 64 pixel_border = 1 tiles = { "row", "column","tag" -; Tunnels (as special type), and whether north, south, east, west +; Tunnels (as special type), and whether north, south, east, west 2, 0, "road.tunnel_n0e0se0s0w0nw0" 2, 1, "road.tunnel_n1e0se0s0w0nw0" diff --git a/data/amplio.tilespec b/data/amplio.tilespec index 89e2149857..a7d80a2ac2 100644 --- a/data/amplio.tilespec +++ b/data/amplio.tilespec @@ -15,7 +15,7 @@ priority = 20 summary = _("Older variant of the current default tileset, Amplio2") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -132,8 +132,8 @@ tilelabel_offset_y = 15 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/amplio/ancientcities.spec b/data/amplio/ancientcities.spec index 1e0d348330..33e286fdbe 100644 --- a/data/amplio/ancientcities.spec +++ b/data/amplio/ancientcities.spec @@ -68,36 +68,36 @@ tiles = { "row", "column", "tag" 0, 1, "city.asian_city_1" 0, 2, "city.asian_city_2" 0, 3, "city.asian_city_3" - 0, 4, "city.asian_city_4" + 0, 4, "city.asian_city_4" 0, 5, "city.asian_wall_0" 0, 6, "city.asian_wall_1" 0, 7, "city.asian_wall_2" 0, 8, "city.asian_wall_3" - 0, 9, "city.asian_wall_4" - + 0, 9, "city.asian_wall_4" + 1, 0, "city.tropical_city_0" 1, 1, "city.tropical_city_1" 1, 2, "city.tropical_city_2" 1, 3, "city.tropical_city_3" - 1, 4, "city.tropical_city_4" + 1, 4, "city.tropical_city_4" 1, 5, "city.tropical_wall_0" 1, 6, "city.tropical_wall_1" 1, 7, "city.tropical_wall_2" 1, 8, "city.tropical_wall_3" - 1, 9, "city.tropical_wall_4" + 1, 9, "city.tropical_wall_4" 2, 0, "city.celtic_city_0" 2, 1, "city.celtic_city_1" 2, 2, "city.celtic_city_2" 2, 3, "city.celtic_city_3" - 2, 4, "city.celtic_city_4" + 2, 4, "city.celtic_city_4" 2, 5, "city.celtic_wall_0" 2, 6, "city.celtic_wall_1" 2, 7, "city.celtic_wall_2" 2, 8, "city.celtic_wall_3" - 2, 9, "city.celtic_wall_4" + 2, 9, "city.celtic_wall_4" 3, 0, "city.classical_city_0" diff --git a/data/amplio/medievalcities.spec b/data/amplio/medievalcities.spec index 9bf3cf2840..5caeae4bca 100644 --- a/data/amplio/medievalcities.spec +++ b/data/amplio/medievalcities.spec @@ -62,22 +62,22 @@ tiles = { "row", "column", "tag" 0, 1, "city.european_city_1" 0, 2, "city.european_city_2" 0, 3, "city.european_city_3" - 0, 4, "city.european_city_4" + 0, 4, "city.european_city_4" 0, 5, "city.european_wall_0" 0, 6, "city.european_wall_1" 0, 7, "city.european_wall_2" 0, 8, "city.european_wall_3" 0, 9, "city.european_wall_4" - + 1, 0, "city.industrial_city_0" 1, 1, "city.industrial_city_1" 1, 2, "city.industrial_city_2" 1, 3, "city.industrial_city_3" - 1, 4, "city.industrial_city_4" + 1, 4, "city.industrial_city_4" 1, 5, "city.industrial_wall_0" 1, 6, "city.industrial_wall_1" 1, 7, "city.industrial_wall_2" 1, 8, "city.industrial_wall_3" - 1, 9, "city.industrial_wall_4" + 1, 9, "city.industrial_wall_4" } diff --git a/data/amplio/moderncities.spec b/data/amplio/moderncities.spec index fb5322e842..bcdc0db88c 100644 --- a/data/amplio/moderncities.spec +++ b/data/amplio/moderncities.spec @@ -82,12 +82,12 @@ tiles = { "row", "column", "tag" 2, 1, "city.electricage_city_1" 2, 2, "city.electricage_city_2" 2, 3, "city.electricage_city_3" - 2, 4, "city.electricage_city_4" + 2, 4, "city.electricage_city_4" 2, 5, "city.electricage_wall_0" 2, 6, "city.electricage_wall_1" 2, 7, "city.electricage_wall_2" 2, 8, "city.electricage_wall_3" - 2, 9, "city.electricage_wall_4" + 2, 9, "city.electricage_wall_4" 3, 0, "city.modern_city_0" @@ -106,11 +106,11 @@ tiles = { "row", "column", "tag" 4, 1, "city.postmodern_city_1" 4, 2, "city.postmodern_city_2" 4, 3, "city.postmodern_city_3" - 4, 4, "city.postmodern_city_4" + 4, 4, "city.postmodern_city_4" 4, 5, "city.postmodern_wall_0" 4, 6, "city.postmodern_wall_1" 4, 7, "city.postmodern_wall_2" 4, 8, "city.postmodern_wall_3" - 4, 9, "city.postmodern_wall_4" + 4, 9, "city.postmodern_wall_4" } diff --git a/data/amplio/tiles.spec b/data/amplio/tiles.spec index c770d3da4b..89a230e8b3 100644 --- a/data/amplio/tiles.spec +++ b/data/amplio/tiles.spec @@ -145,7 +145,7 @@ tiles = { "row", "column", "tag" ; 7, 18, "upkeep.unhappy2" ; 7, 19, "upkeep.shield" -; Nuclear explosion: this could maybe now be handled as one +; Nuclear explosion: this could maybe now be handled as one ; big graphic (?), but for now is done old way as 3 by 3: 0, 0, "explode.nuke_00" diff --git a/data/amplio/units.spec b/data/amplio/units.spec index efd5b41190..f66436b947 100644 --- a/data/amplio/units.spec +++ b/data/amplio/units.spec @@ -11,7 +11,7 @@ options = "+Freeciv-spec-Devel-2019-Jul-03" ; Special thanks go to: ; Alex Mor and Captain Nemo for their excellent graphics work -; in the scenarios 2194 days war, Red Front, 2nd front and other misc graphics. +; in the scenarios 2194 days war, Red Front, 2nd front and other misc graphics. ; Fairline for his huge collection of original Civ2 unit spanning centuries ; Bebro for his collection of mediveal units and ships diff --git a/data/amplio/water.spec b/data/amplio/water.spec index d2c11e0150..494076a855 100644 --- a/data/amplio/water.spec +++ b/data/amplio/water.spec @@ -27,7 +27,7 @@ pixel_border = 1 tiles = { "row", "column", "tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 2, 0, "road.river_s_n0e0s0w0" @@ -74,7 +74,7 @@ tiles = { "row", "column", "tag" 0, 10, "t.l1.coast_cell_u_i_w_i" 0, 12, "t.l1.coast_cell_u_w_i_i" 0, 14, "t.l1.coast_cell_u_i_i_i" - + 1, 0, "t.l1.coast_cell_d_w_w_w" ;vacant cell 1, 2, "t.l1.coast_cell_d_i_w_w" 1, 4, "t.l1.coast_cell_d_w_i_w" @@ -111,7 +111,7 @@ tiles = { "row", "column", "tag" 0, 10, "t.l1.floor_cell_u_i_w_i" 0, 12, "t.l1.floor_cell_u_w_i_i" 0, 14, "t.l1.floor_cell_u_i_i_i" - + 1, 0, "t.l1.floor_cell_d_w_w_w" ;vacant cell 1, 2, "t.l1.floor_cell_d_i_w_w" 1, 4, "t.l1.floor_cell_d_w_i_w" @@ -148,7 +148,7 @@ tiles = { "row", "column", "tag" 9, 10, "t.l0.lake_cell_u_l_s_l" 9, 12, "t.l0.lake_cell_u_s_l_l" 9, 14, "t.l0.lake_cell_u_l_l_l" - + 10, 0, "t.l0.lake_cell_d_s_s_s" ;vacant cell 10, 2, "t.l0.lake_cell_d_l_s_s" 10, 4, "t.l0.lake_cell_d_s_l_s" diff --git a/data/amplio2.tilespec b/data/amplio2.tilespec index 9d27436979..ff22d364d6 100644 --- a/data/amplio2.tilespec +++ b/data/amplio2.tilespec @@ -15,7 +15,7 @@ priority = 25 summary = _("Large isometric tileset.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -132,8 +132,8 @@ tilelabel_offset_y = 15 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/amplio2/units.spec b/data/amplio2/units.spec index 93212e16ba..eab790b7dc 100644 --- a/data/amplio2/units.spec +++ b/data/amplio2/units.spec @@ -11,7 +11,7 @@ options = "+Freeciv-spec-Devel-2019-Jul-03" ; Special thanks go to: ; Alex Mor and Captain Nemo for their excellent graphics work -; in the scenarios 2194 days war, Red Front, 2nd front and other misc graphics. +; in the scenarios 2194 days war, Red Front, 2nd front and other misc graphics. ; Fairline for his huge collection of original Civ2 unit spanning centuries ; Bebro for his collection of mediveal units and ships diff --git a/data/amplio2/veterancy.spec b/data/amplio2/veterancy.spec index f99f4c33ea..96b50f1414 100644 --- a/data/amplio2/veterancy.spec +++ b/data/amplio2/veterancy.spec @@ -11,7 +11,7 @@ options = "+Freeciv-spec-Devel-2019-Jul-03" ; Special thanks go to: ; Alex Mor and Captain Nemo for their excellent graphics work -; in the scenarios 2194 days war, Red Front, 2nd front and other misc graphics. +; in the scenarios 2194 days war, Red Front, 2nd front and other misc graphics. ; Fairline for his huge collection of original Civ2 unit spanning centuries ; Bebro for his collection of mediveal units and ships diff --git a/data/amplio2/water.spec b/data/amplio2/water.spec index c1b30def59..5ef23d70ea 100644 --- a/data/amplio2/water.spec +++ b/data/amplio2/water.spec @@ -27,7 +27,7 @@ pixel_border = 1 tiles = { "row", "column", "tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 2, 0, "road.river_s_n0e0s0w0" @@ -74,7 +74,7 @@ tiles = { "row", "column", "tag" 0, 10, "t.l1.coast_cell_u_i_w_i" 0, 12, "t.l1.coast_cell_u_w_i_i" 0, 14, "t.l1.coast_cell_u_i_i_i" - + 1, 0, "t.l1.coast_cell_d_w_w_w" ;vacant cell 1, 2, "t.l1.coast_cell_d_i_w_w" 1, 4, "t.l1.coast_cell_d_w_i_w" @@ -111,7 +111,7 @@ tiles = { "row", "column", "tag" 0, 10, "t.l1.floor_cell_u_i_w_i" 0, 12, "t.l1.floor_cell_u_w_i_i" 0, 14, "t.l1.floor_cell_u_i_i_i" - + 1, 0, "t.l1.floor_cell_d_w_w_w" ;vacant cell 1, 2, "t.l1.floor_cell_d_i_w_w" 1, 4, "t.l1.floor_cell_d_w_i_w" @@ -148,7 +148,7 @@ tiles = { "row", "column", "tag" 9, 10, "t.l0.lake_cell_u_l_s_l" 9, 12, "t.l0.lake_cell_u_s_l_l" 9, 14, "t.l0.lake_cell_u_l_l_l" - + 10, 0, "t.l0.lake_cell_d_s_s_s" ;vacant cell 10, 2, "t.l0.lake_cell_d_l_s_s" 10, 4, "t.l0.lake_cell_d_s_l_s" diff --git a/data/cimpletoon.tilespec b/data/cimpletoon.tilespec index 280378f516..d8c55e635f 100644 --- a/data/cimpletoon.tilespec +++ b/data/cimpletoon.tilespec @@ -18,7 +18,7 @@ direction the unit is facing.\ ") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -37,7 +37,7 @@ is_hex = FALSE ; Blended fog fog_style = "Darkness" darkness_style = "Corner" - + ; offset the flags by this amount when drawing units unit_flag_offset_x = 25 unit_flag_offset_y = 16 @@ -135,8 +135,8 @@ unit_default_orientation = "s" ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/hex2t.tilespec b/data/hex2t.tilespec index 2928cc046b..47440d2d88 100644 --- a/data/hex2t.tilespec +++ b/data/hex2t.tilespec @@ -15,7 +15,7 @@ priority = 5 summary = _("Small hex tileset.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -135,8 +135,8 @@ tilelabel_offset_y = 28 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/hex2t/items.spec b/data/hex2t/items.spec index 5cda720897..c58601dfeb 100644 --- a/data/hex2t/items.spec +++ b/data/hex2t/items.spec @@ -61,7 +61,7 @@ tiles = { "row", "column", "tag" 2, 5, "city.european_wall_0" 2, 6, "city.european_wall_1" 2, 7, "city.european_wall_2" - + 3, 0, "city.industrial_city_0" 3, 1, "city.industrial_city_1" 3, 2, "city.industrial_city_2" @@ -70,7 +70,7 @@ tiles = { "row", "column", "tag" 3, 5, "city.industrial_wall_0" 3, 6, "city.industrial_wall_1" 3, 7, "city.industrial_wall_2" - + 9, 0, "city.electricage_city_0" 9, 1, "city.electricage_city_1" 9, 2, "city.electricage_city_2" @@ -79,7 +79,7 @@ tiles = { "row", "column", "tag" 9, 5, "city.electricage_wall_0" 9, 6, "city.electricage_wall_1" 9, 7, "city.electricage_wall_2" - + 4, 0, "city.modern_city_0" 4, 1, "city.modern_city_1" 4, 2, "city.modern_city_2" @@ -88,7 +88,7 @@ tiles = { "row", "column", "tag" 4, 5, "city.modern_wall_0" 4, 6, "city.modern_wall_1" 4, 7, "city.modern_wall_2" - + 5, 0, "city.postmodern_city_0" 5, 1, "city.postmodern_city_1" 5, 2, "city.postmodern_city_2" @@ -106,7 +106,7 @@ tiles = { "row", "column", "tag" 6, 5, "city.classical_wall_0" 6, 6, "city.classical_wall_1" 6, 7, "city.classical_wall_2" - + 7, 0, "city.asian_city_0" 7, 1, "city.asian_city_1" 7, 2, "city.asian_city_2" @@ -115,7 +115,7 @@ tiles = { "row", "column", "tag" 7, 5, "city.asian_wall_0" 7, 6, "city.asian_wall_1" 7, 7, "city.asian_wall_2" - + 8, 0, "city.tropical_city_0" 8, 1, "city.tropical_city_1" diff --git a/data/hex2t/overlays.spec b/data/hex2t/overlays.spec index 4d67f50e3a..3e83c73c2a 100644 --- a/data/hex2t/overlays.spec +++ b/data/hex2t/overlays.spec @@ -24,7 +24,7 @@ pixel_border = 2 tiles = { "row", "column","tag" ; All matched Overlays go in this file. ; This includes rivers, hills, mountains, forest and beaches. -; +; ; Note that for matching a hex2 tileset ; the directions are classed as follows: ; @@ -375,7 +375,7 @@ tiles = { "row", "column","tag" 0, 5, "t.l0.coast_cell_u101" 0, 6, "t.l0.coast_cell_u011" 0, 7, "t.l0.coast_cell_u111" - + 1, 0, "t.l0.coast_cell_r000" 1, 1, "t.l0.coast_cell_r100" 1, 2, "t.l0.coast_cell_r010" @@ -412,7 +412,7 @@ tiles = { "row", "column","tag" 4, 5, "t.l0.floor_cell_u101" 4, 6, "t.l0.floor_cell_u011" 4, 7, "t.l0.floor_cell_u111" - + 5, 0, "t.l0.floor_cell_r000" 5, 1, "t.l0.floor_cell_r100" 5, 2, "t.l0.floor_cell_r010" diff --git a/data/hexemplio.tilespec b/data/hexemplio.tilespec index b6a146b34a..d13e88c650 100644 --- a/data/hexemplio.tilespec +++ b/data/hexemplio.tilespec @@ -17,7 +17,7 @@ priority = 30 summary = _("Large iso-hex tileset, similar to Amplio.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -137,8 +137,8 @@ layer_order = ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). diff --git a/data/hexemplio/bases.spec b/data/hexemplio/bases.spec index 613ac41b93..f06553f611 100644 --- a/data/hexemplio/bases.spec +++ b/data/hexemplio/bases.spec @@ -51,7 +51,7 @@ pixel_border = 1 tiles = { "row", "column", "tag" ;[HH][GS] - 0, 0, "base.airstrip_mg" + 0, 0, "base.airstrip_mg" 1, 0, "tx.airstrip_full" ;[HH][GS] 0, 1, "base.airbase_mg" diff --git a/data/hexemplio/rivers.spec b/data/hexemplio/rivers.spec index 216e14068c..976d66720a 100644 --- a/data/hexemplio/rivers.spec +++ b/data/hexemplio/rivers.spec @@ -23,7 +23,7 @@ dy = 64 pixel_border = 1 tiles = { "row", "column","tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 0, 0, "road.river_s_n0e0se0s0w0nw0" diff --git a/data/hexemplio/terrain.spec b/data/hexemplio/terrain.spec index 9d38d5a918..1443850dad 100644 --- a/data/hexemplio/terrain.spec +++ b/data/hexemplio/terrain.spec @@ -108,7 +108,7 @@ tiles = { "row", "column","tag" ;misc 5, 5, "mask.tile" - 5, 1, "t.dither_tile" + 5, 1, "t.dither_tile" 5, 1, "tx.darkness" ;[DS][?][GS] 0, 0, "t.coast_color" ;[?] ; 0, 0, "t.floor_color" ;[?] @@ -131,7 +131,7 @@ tiles = { "row", "column","tag" 6, 2, "path.normal" ; tip of path with MP remaining 6, 3, "path.waypoint" -; Irrigation (as special type), and whether north, south, east, west +; Irrigation (as special type), and whether north, south, east, west 4, 3, "tx.irrigation_s_n0e0se0s0w0nw0" 4, 3, "tx.irrigation_s_n1e0se0s0w0nw0" @@ -198,7 +198,7 @@ tiles = { "row", "column","tag" 4, 3, "tx.irrigation_s_n0e1se1s1w1nw1" 4, 3, "tx.irrigation_s_n1e1se1s1w1nw1" -; Farmland (as special type), and whether north, south, east, west +; Farmland (as special type), and whether north, south, east, west 4, 4, "tx.farmland_s_n0e0se0s0w0nw0" 4, 4, "tx.farmland_s_n1e0se0s0w0nw0" diff --git a/data/isophex.tilespec b/data/isophex.tilespec index d10f400a86..31acabdf9c 100644 --- a/data/isophex.tilespec +++ b/data/isophex.tilespec @@ -15,7 +15,7 @@ priority = 3 summary = _("Small iso-hex tileset.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -37,7 +37,7 @@ fog_style = "Auto" ; Was darkness style "IsoRect" (single-sprite) darkness_style = "CardinalSingle" - + ; offset the flags by this amount when drawing units unit_flag_offset_x = 17 unit_flag_offset_y = 11 @@ -135,8 +135,8 @@ tilelabel_offset_y = 10 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/isophex/darkness.spec b/data/isophex/darkness.spec index c932d7dcc9..8ae644915f 100644 --- a/data/isophex/darkness.spec +++ b/data/isophex/darkness.spec @@ -9,7 +9,7 @@ options = "+Freeciv-spec-Devel-2019-Jul-03" artists = " Tim F. Smith Andreas Røsdal (hex mode) - Daniel Speyer + Daniel Speyer " [file] diff --git a/data/isophex/rivers.spec b/data/isophex/rivers.spec index 0c16148008..a34e15c404 100644 --- a/data/isophex/rivers.spec +++ b/data/isophex/rivers.spec @@ -28,7 +28,7 @@ pixel_border = 1 tiles = { "row", "column","tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 0, 0, "road.river_s_n0e0se0s0w0nw0" diff --git a/data/isophex/terrain1.spec b/data/isophex/terrain1.spec index 8a3c002b07..e110373256 100644 --- a/data/isophex/terrain1.spec +++ b/data/isophex/terrain1.spec @@ -124,7 +124,7 @@ tiles = { "row", "column","tag" 4, 5, "tx.fallout" 4, 6, "tx.pollution" 4, 7, "tx.village" - + ; misc 5, 0, "t.coast_color" diff --git a/data/isophex/terrain2.spec b/data/isophex/terrain2.spec index f75d775a67..514737697f 100644 --- a/data/isophex/terrain2.spec +++ b/data/isophex/terrain2.spec @@ -48,7 +48,7 @@ tiles = { "row", "column","tag" ; The below sprites are duplicates of the previous sprites, ; since there aren't yet graphics for the extra hex directions. - + 0, 0, "t.l1.forest_n0e0se0s0w0nw1" 0, 1, "t.l1.forest_n1e0se0s0w0nw1" 0, 2, "t.l1.forest_n0e1se0s0w0nw1" @@ -119,7 +119,7 @@ tiles = { "row", "column","tag" ; The below sprites are duplicates of the previous sprites, ; since there aren't yet graphics for the extra hex directions. - + 2, 0, "t.l1.mountains_n0e0se0s0w0nw1" 2, 1, "t.l1.mountains_n1e0se0s0w0nw1" 2, 2, "t.l1.mountains_n0e1se0s0w0nw1" @@ -190,7 +190,7 @@ tiles = { "row", "column","tag" ; The below sprites are duplicates of the previous sprites, ; since there aren't yet graphics for the extra hex directions. - + 4, 0, "t.l1.hills_n0e0se0s0w0nw1" 4, 1, "t.l1.hills_n1e0se0s0w0nw1" 4, 2, "t.l1.hills_n0e1se0s0w0nw1" @@ -272,7 +272,7 @@ tiles = { "row", "column","tag" 0, 10, "t.l0.lake_cell_u101" 0, 12, "t.l0.lake_cell_u011" 0, 14, "t.l0.lake_cell_u111" - + 1, 0, "t.l0.lake_cell_d000" 1, 2, "t.l0.lake_cell_d100" 1, 4, "t.l0.lake_cell_d010" @@ -310,7 +310,7 @@ tiles = { "row", "column","tag" 3, 10, "t.l0.coast_cell_u101" 3, 12, "t.l0.coast_cell_u011" 3, 14, "t.l0.coast_cell_u111" - + 4, 0, "t.l0.coast_cell_d000" 4, 2, "t.l0.coast_cell_d100" 4, 4, "t.l0.coast_cell_d010" @@ -348,7 +348,7 @@ tiles = { "row", "column","tag" 6, 10, "t.l0.floor_cell_u101" 6, 12, "t.l0.floor_cell_u011" 6, 14, "t.l0.floor_cell_u111" - + 7, 0, "t.l0.floor_cell_d000" 7, 2, "t.l0.floor_cell_d100" 7, 4, "t.l0.floor_cell_d010" diff --git a/data/isotrident.tilespec b/data/isotrident.tilespec index 4088d296fa..5cc9aef78c 100644 --- a/data/isotrident.tilespec +++ b/data/isotrident.tilespec @@ -15,7 +15,7 @@ priority = 10 summary = _("Isometric tileset based on Trident tileset.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -36,7 +36,7 @@ fog_style = "Darkness" ; Was darkness style "IsoRect" (single-sprite) darkness_style = "Corner" - + ; offset the flags by this amount when drawing units unit_flag_offset_x = 17 unit_flag_offset_y = 11 @@ -134,8 +134,8 @@ tilelabel_offset_y = 10 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/isotrident/cities.spec b/data/isotrident/cities.spec index 2fb5df6ed2..4ef33d638f 100644 --- a/data/isotrident/cities.spec +++ b/data/isotrident/cities.spec @@ -84,7 +84,7 @@ tiles = { "row", "column", "tag" 1, 5, "city.european_wall_0" 1, 6, "city.european_wall_1" 1, 7, "city.european_wall_2" - + 5, 0, "city.classical_city_0" 5, 1, "city.classical_city_1" @@ -94,7 +94,7 @@ tiles = { "row", "column", "tag" 5, 5, "city.classical_wall_0" 5, 6, "city.classical_wall_1" 5, 7, "city.classical_wall_2" - + 2, 0, "city.industrial_city_0" 2, 1, "city.industrial_city_1" 2, 2, "city.industrial_city_2" @@ -112,7 +112,7 @@ tiles = { "row", "column", "tag" 6, 5, "city.electricage_wall_0" 6, 6, "city.electricage_wall_1" 6, 7, "city.electricage_wall_2" - + 3, 0, "city.modern_city_0" 3, 1, "city.modern_city_1" 3, 2, "city.modern_city_2" @@ -121,7 +121,7 @@ tiles = { "row", "column", "tag" 3, 5, "city.modern_wall_0" 3, 6, "city.modern_wall_1" 3, 7, "city.modern_wall_2" - + 4, 0, "city.postmodern_city_0" 4, 1, "city.postmodern_city_1" 4, 2, "city.postmodern_city_2" @@ -130,5 +130,5 @@ tiles = { "row", "column", "tag" 4, 5, "city.postmodern_wall_0" 4, 6, "city.postmodern_wall_1" 4, 7, "city.postmodern_wall_2" - + } diff --git a/data/isotrident/morecities.spec b/data/isotrident/morecities.spec index b145fc5a4c..2c0b3aa2cb 100644 --- a/data/isotrident/morecities.spec +++ b/data/isotrident/morecities.spec @@ -61,7 +61,7 @@ tiles = { "row", "column", "tag" 0, 5, "city.asian_wall_0" 0, 6, "city.asian_wall_1" 0, 7, "city.asian_wall_2" - + 1, 0, "city.tropical_city_0" 1, 1, "city.tropical_city_1" @@ -71,5 +71,5 @@ tiles = { "row", "column", "tag" 1, 5, "city.tropical_wall_0" 1, 6, "city.tropical_wall_1" 1, 7, "city.tropical_wall_2" - + } diff --git a/data/isotrident/terrain2.spec b/data/isotrident/terrain2.spec index e89e50b8bf..f6d314e570 100644 --- a/data/isotrident/terrain2.spec +++ b/data/isotrident/terrain2.spec @@ -23,7 +23,7 @@ pixel_border = 1 tiles = { "row", "column","tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 2, 0, "road.river_s_n0e0s0w0" @@ -129,7 +129,7 @@ tiles = { "row", "column","tag" 0, 10, "t.l0.coast_cell_u101" 0, 12, "t.l0.coast_cell_u011" 0, 14, "t.l0.coast_cell_u111" - + 1, 0, "t.l0.coast_cell_d000" 1, 2, "t.l0.coast_cell_d100" 1, 4, "t.l0.coast_cell_d010" @@ -166,7 +166,7 @@ tiles = { "row", "column","tag" 0, 10, "t.l0.floor_cell_u101" 0, 12, "t.l0.floor_cell_u011" 0, 14, "t.l0.floor_cell_u111" - + 1, 16, "t.l0.floor_cell_d000" 1, 2, "t.l0.floor_cell_d100" 1, 4, "t.l0.floor_cell_d010" diff --git a/data/isotrident/tiles.spec b/data/isotrident/tiles.spec index 31b6e7fa81..caeed665fc 100644 --- a/data/isotrident/tiles.spec +++ b/data/isotrident/tiles.spec @@ -45,7 +45,7 @@ tiles = { "row", "column", "tag" 1, 14, "unit.oil_mine" 1, 15, "unit.oil_rig" 1, 16, "unit.buoy" - + 1, 17, "unit.loaded" 1, 18, "unit.connect" 1, 19, "unit.auto_explore" diff --git a/data/misc/buildings.spec b/data/misc/buildings.spec index 2e066079c0..fc83c1e5f0 100644 --- a/data/misc/buildings.spec +++ b/data/misc/buildings.spec @@ -80,7 +80,7 @@ tiles = { "row", "column", "tag" 5, 5, "b.cure_for_cancer" 5, 6, "b.darwins_voyage" 5, 7, "b.eiffel_tower" - + 6, 0, "b.great_library" 6, 1, "b.great_wall" 6, 2, "b.hanging_gardens" @@ -89,7 +89,7 @@ tiles = { "row", "column", "tag" 6, 5, "b.js_bachs_cathedral" 6, 6, "b.king_richards_crusade" 6, 7, "b.leonardos_workshop" - + 7, 0, "b.lighthouse" 7, 1, "b.magellans_expedition" 7, 2, "b.manhattan_project" @@ -98,7 +98,7 @@ tiles = { "row", "column", "tag" 7, 5, "b.oracle" 7, 6, "b.pyramids" 7, 7, "b.seti_program" - + 8, 0, "b.shakespeares_theatre" 8, 1, "b.space_component" 8, 2, "b.space_modules" diff --git a/data/misc/colors.tilespec b/data/misc/colors.tilespec index d1835e37e2..7fecada889 100644 --- a/data/misc/colors.tilespec +++ b/data/misc/colors.tilespec @@ -124,7 +124,7 @@ reqtree_text = {"r", "g", "b" reqtree_edge = {"r", "g", "b" 127, 127, 127 } - + ; Player dialog playerdlg_background = {"r", "g", "b" 0, 0, 0 diff --git a/data/misc/cursors.spec b/data/misc/cursors.spec index 1b79b2bad1..1c5c866197 100644 --- a/data/misc/cursors.spec +++ b/data/misc/cursors.spec @@ -12,7 +12,7 @@ artists = " edit_paint cursor take from GIMP Hourglass and Add from Bluecurve theme in redhat-artwork - + " [file] diff --git a/data/misc/editor.spec b/data/misc/editor.spec index b3f0a541aa..92eff454a2 100644 --- a/data/misc/editor.spec +++ b/data/misc/editor.spec @@ -60,17 +60,17 @@ dy = 16 pixel_border = 1 tiles = { "row", "column", "tag" - 0, 0, "editor.mini_p" - 0, 1, "editor.mini_m" - 0, 2, "editor.mini_d" - 0, 3, "editor.mini_g" - 0, 4, "editor.mini_o" - 0, 5, "editor.mini_h" - 0, 6, "editor.mini_r" - 0, 7, "editor.mini_s" - 0, 8, "editor.mini_f" - 0, 9, "editor.mini_t" - 0, 10, "editor.mini_j" + 0, 0, "editor.mini_p" + 0, 1, "editor.mini_m" + 0, 2, "editor.mini_d" + 0, 3, "editor.mini_g" + 0, 4, "editor.mini_o" + 0, 5, "editor.mini_h" + 0, 6, "editor.mini_r" + 0, 7, "editor.mini_s" + 0, 8, "editor.mini_f" + 0, 9, "editor.mini_t" + 0, 10, "editor.mini_j" 0, 11, "editor.mini_gl" 0, 12, "editor.mini_erase" 0, 13, "editor.mini_freeciv" diff --git a/data/misc/events.spec b/data/misc/events.spec index 5cc1e5736b..0d45b1c2a3 100644 --- a/data/misc/events.spec +++ b/data/misc/events.spec @@ -81,7 +81,7 @@ tiles = { "row", "column", "tag" 2, 10, "e_tech_lost" 2, 11, "e_tech_embassy" 2, 11, "e_tech_goal" - + 3, 0, "e_unit_lost_att" 3, 1, "e_unit_win_att" 3, 1, "e_unit_action_actor_success" diff --git a/data/misc/flags-large.spec b/data/misc/flags-large.spec index ff29c9cb39..316c24d130 100644 --- a/data/misc/flags-large.spec +++ b/data/misc/flags-large.spec @@ -491,7 +491,7 @@ sprites = "f.spain", "flags/spain-large" "f.srilanka", "flags/srilanka-large" "f.srivijaya", "flags/srivijaya-large" -; "f.stpatrick", "flags/stpatrick-large" ; Alternate Irish +; "f.stpatrick", "flags/stpatrick-large" ; Alternate Irish "f.sudan", "flags/sudan-large" "f.suebian", "flags/suebian-large" "f.sumeria", "flags/sumeria-large" diff --git a/data/misc/flags.spec b/data/misc/flags.spec index bf62c66a50..5fc05c0f11 100644 --- a/data/misc/flags.spec +++ b/data/misc/flags.spec @@ -84,7 +84,7 @@ artists = " Brasil Cezary Biele Britannia J.M. Maalderink Brittany Lexicon - Brunei Gustav Broberg + Brunei Gustav Broberg Bulgaria Daniel McRae Burgundic Andrzej G. Burgundy Daniel Markstedt @@ -101,7 +101,7 @@ artists = " Cantonese Cezary Biele and J.M. Maalderink Cape Verde Open Clip Art CAR Vzb83 (Wikimedia Commons) - Carantanian Andrzej M. Gorzym + Carantanian Andrzej M. Gorzym Cartago Daniel Markstedt and Matt Jecrell Catalan Xavier Conde Rueda Celtiberian J.M. Maalderink @@ -120,7 +120,7 @@ artists = " China Stephen Silver Choctaw Daniel Markstedt Chola Dan Cottrell and Daniel Markstedt - Chrobatian Andrzej M. Gorzym + Chrobatian Andrzej M. Gorzym Chumash Daniel Markstedt Chuvashia Urmas (Wikimedia Commons) Clatsop Euku (Wikimedia Commons) @@ -142,8 +142,8 @@ artists = " Cyrenaica Daniel Markstedt and J.M. Maalderink Czech Lauris Kaplinski Czechoslovakia Tlusťa (Wikimedia Commons) - Dacian Andrzej M. Gorzym - Dahomey Daniel Markstedt + Dacian Andrzej M. Gorzym + Dahomey Daniel Markstedt Darfur Daniel Markstedt DDR Jwnabd (Wikimedia Commons) Denmark Jens Bech Madsen @@ -443,7 +443,7 @@ artists = " Samoa Vzb83 (Wikimedia Commons) Samogitia Daniel Markstedt and Jarno Vasamaa San Marino Tobias Jakobs - S. Tome and Principe Vzb83 (Wikimedia Commons) + S. Tome and Principe Vzb83 (Wikimedia Commons) Sapmi Dean Tersigni Sardinia Patricia Fidi and J.M. Maalderink Sarmatia Andrzej G. @@ -478,7 +478,7 @@ artists = " Slovenia Matthew Gatto Solomon Islands SKopp (Wikimedia Commons) Somalia J.M. Maalderink - Somaliland Cezary Biele and J.M. Maalderink + Somaliland Cezary Biele and J.M. Maalderink Songhai Daniel Markstedt South Africa Farrel Lifson Southern Cross Crotalus horridus @@ -1061,7 +1061,7 @@ sprites = "f.spain", "flags/spain" "f.srilanka", "flags/srilanka" "f.srivijaya", "flags/srivijaya" -; "f.stpatrick", "flags/stpatrick" ; Alternate Irish +; "f.stpatrick", "flags/stpatrick" ; Alternate Irish "f.sudan", "flags/sudan" "f.suebian", "flags/suebian" "f.sumeria", "flags/sumeria" diff --git a/data/misc/icons.spec b/data/misc/icons.spec index 250d12b226..e6fd0f7a9e 100644 --- a/data/misc/icons.spec +++ b/data/misc/icons.spec @@ -12,7 +12,7 @@ artists = " " [extra] -sprites = +sprites = { "tag", "file" "icon.freeciv", "misc/civicon" "icon.citydlg", "misc/cityicon" diff --git a/data/misc/small.spec b/data/misc/small.spec index 1783a603d6..bbac9757b0 100644 --- a/data/misc/small.spec +++ b/data/misc/small.spec @@ -69,10 +69,10 @@ tiles = { "row", "column", "tag" 0, 20, "citizen.content_1" 0, 21, "citizen.happy_0" 0, 22, "citizen.happy_1" - 0, 23, "citizen.unhappy_0" - 0, 24, "citizen.unhappy_1" - 0, 25, "citizen.angry_0" - 0, 26, "citizen.angry_1" + 0, 23, "citizen.unhappy_0" + 0, 24, "citizen.unhappy_1" + 0, 25, "citizen.angry_0" + 0, 26, "citizen.angry_1" ; Right arrow icon: diff --git a/data/misc/techs.spec b/data/misc/techs.spec index aeeebf81ce..cbcdd08743 100644 --- a/data/misc/techs.spec +++ b/data/misc/techs.spec @@ -2,7 +2,7 @@ options = "+Freeciv-spec-Devel-2019-Jul-03" [info] artists = " - Frederic Rodrigo + Frederic Rodrigo a.atomic_theory a.explosives a.monotheism a.automobile a.fusion_power a.mysticism a.chemistry a.genetic_engineering a.plastics @@ -18,7 +18,7 @@ artists = " a.advanced_flight a.industrialization a.polytheism a.alphabet a.navigation a.stealth a.combustion a.physics a.the_corporation - + feler404 a.construction a.nuclear_power a.sanitation a.engineering a.robotics a.warrior_code @@ -36,11 +36,11 @@ artists = " Dan Gerhards a.astronomy - + Philippe Verdy a.medicine - - Xuacu + + Xuacu a.monarchy Jim Fitzpatrick @@ -48,11 +48,11 @@ artists = " Patricia Fidi a.seafaring - - Cosmin Stroe + + Cosmin Stroe a.nuclear_fission - - Multimotyl + + Multimotyl a.philosophy Michael Reeve @@ -87,16 +87,16 @@ artists = " Chris Buckley a.recycling - + Liquid_2003 a.democracy - + Mpalacios a.bridge_building - + Jose-Manuel Benito Alvarez a.pottery - + Adrian Pingstone a.conscription @@ -105,11 +105,11 @@ artists = " Oliver Wolters a.fundamentalism - + PD - Unknown author a.communism a.flight a.refining a.chivalry a.leadership a.writing - a.feudalism a.mass_production + a.feudalism a.mass_production " diff --git a/data/toonhex.tilespec b/data/toonhex.tilespec index abe280dacc..bf70a0f934 100644 --- a/data/toonhex.tilespec +++ b/data/toonhex.tilespec @@ -19,7 +19,7 @@ summary = _("Large iso-hex tileset combining Hexemplio's terrains \ and Cimpletoon's units with orientation.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -139,8 +139,8 @@ layer_order = ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). diff --git a/data/trident.tilespec b/data/trident.tilespec index 9fe5f6eabe..fc3f9565da 100644 --- a/data/trident.tilespec +++ b/data/trident.tilespec @@ -14,7 +14,7 @@ priority = 5 summary = _("Small overhead tileset.") ;description = "" -; TODO: add more overall information fields on tiles, +; TODO: add more overall information fields on tiles, ; eg, authors, colors, etc. ; What is the primary ruleset this tileset is meant for. @@ -35,7 +35,7 @@ fog_style = "Darkness" ; Was darkness style "CardinalFull" (15 sprites) darkness_style = "Corner" - + ; offset the flags by this amount when drawing units unit_flag_offset_x = 0 unit_flag_offset_y = 0 @@ -45,7 +45,7 @@ city_flag_offset_y = 0 ; offset the city occupied sprite by this amount occupied_offset_x = 0 occupied_offset_y = 0 - + ; offset the units by this amount unit_offset_x = 0 unit_offset_y = 0 @@ -135,8 +135,8 @@ unit_upkeep_small_offset_y = 20 ; This is special because it gets freed and reloaded as required: main_intro_file = "misc/intro" -; Below, the graphics spec files; must be somewhere (anywhere) in -; the data path. Order may be important for color allocation on +; Below, the graphics spec files; must be somewhere (anywhere) in +; the data path. Order may be important for color allocation on ; low-color systems, and if there are any duplicate tags (lattermost ; tag is used). files = diff --git a/data/trident/tiles.spec b/data/trident/tiles.spec index bcdc495d43..56118ad366 100644 --- a/data/trident/tiles.spec +++ b/data/trident/tiles.spec @@ -28,7 +28,7 @@ dy = 30 tiles = { "row", "column", "tag" -; Grassland, and whether terrain to north, south, east, west +; Grassland, and whether terrain to north, south, east, west ; is more grassland: 0, 2, "t.l0.grassland1" @@ -60,67 +60,67 @@ tiles = { "row", "column", "tag" ; re-use values but provide for future expansion; current sets ; effectively ignore N/S terrain. -; Hills, and whether terrain to north, south, east, west +; Hills, and whether terrain to north, south, east, west ; is more hills. 0, 4, "t.l0.hills_n0e0s0w0", ; not-hills E and W - "t.l0.hills_n0e0s1w0", - "t.l0.hills_n1e0s0w0", - "t.l0.hills_n1e0s1w0" + "t.l0.hills_n0e0s1w0", + "t.l0.hills_n1e0s0w0", + "t.l0.hills_n1e0s1w0" 0, 5, "t.l0.hills_n0e1s0w0", ; hills E - "t.l0.hills_n0e1s1w0", - "t.l0.hills_n1e1s0w0", - "t.l0.hills_n1e1s1w0" + "t.l0.hills_n0e1s1w0", + "t.l0.hills_n1e1s0w0", + "t.l0.hills_n1e1s1w0" 0, 6, "t.l0.hills_n0e1s0w1", ; hills E and W - "t.l0.hills_n0e1s1w1", - "t.l0.hills_n1e1s0w1", - "t.l0.hills_n1e1s1w1" + "t.l0.hills_n0e1s1w1", + "t.l0.hills_n1e1s0w1", + "t.l0.hills_n1e1s1w1" 0, 7, "t.l0.hills_n0e0s0w1", ; hills W - "t.l0.hills_n0e0s1w1", - "t.l0.hills_n1e0s0w1", - "t.l0.hills_n1e0s1w1" + "t.l0.hills_n0e0s1w1", + "t.l0.hills_n1e0s0w1", + "t.l0.hills_n1e0s1w1" -; Forest, and whether terrain to north, south, east, west +; Forest, and whether terrain to north, south, east, west ; is more forest. 0, 8, "t.l0.forest_n0e0s0w0", ; not-forest E and W - "t.l0.forest_n0e0s1w0", - "t.l0.forest_n1e0s0w0", - "t.l0.forest_n1e0s1w0" + "t.l0.forest_n0e0s1w0", + "t.l0.forest_n1e0s0w0", + "t.l0.forest_n1e0s1w0" 0, 9, "t.l0.forest_n0e1s0w0", ; forest E - "t.l0.forest_n0e1s1w0", - "t.l0.forest_n1e1s0w0", - "t.l0.forest_n1e1s1w0" + "t.l0.forest_n0e1s1w0", + "t.l0.forest_n1e1s0w0", + "t.l0.forest_n1e1s1w0" 0, 10, "t.l0.forest_n0e1s0w1", ; forest E and W - "t.l0.forest_n0e1s1w1", - "t.l0.forest_n1e1s0w1", - "t.l0.forest_n1e1s1w1" + "t.l0.forest_n0e1s1w1", + "t.l0.forest_n1e1s0w1", + "t.l0.forest_n1e1s1w1" 0, 11, "t.l0.forest_n0e0s0w1", ; forest W - "t.l0.forest_n0e0s1w1", - "t.l0.forest_n1e0s0w1", - "t.l0.forest_n1e0s1w1" + "t.l0.forest_n0e0s1w1", + "t.l0.forest_n1e0s0w1", + "t.l0.forest_n1e0s1w1" -; Mountains, and whether terrain to north, south, east, west +; Mountains, and whether terrain to north, south, east, west ; is more mountains. 0, 12, "t.l0.mountains_n0e0s0w0", ; not-mountains E and W - "t.l0.mountains_n0e0s1w0", - "t.l0.mountains_n1e0s0w0", - "t.l0.mountains_n1e0s1w0" + "t.l0.mountains_n0e0s1w0", + "t.l0.mountains_n1e0s0w0", + "t.l0.mountains_n1e0s1w0" 0, 13, "t.l0.mountains_n0e1s0w0", ; mountains E - "t.l0.mountains_n0e1s1w0", - "t.l0.mountains_n1e1s0w0", - "t.l0.mountains_n1e1s1w0" + "t.l0.mountains_n0e1s1w0", + "t.l0.mountains_n1e1s0w0", + "t.l0.mountains_n1e1s1w0" 0, 14, "t.l0.mountains_n0e1s0w1", ; mountains E and W - "t.l0.mountains_n0e1s1w1", - "t.l0.mountains_n1e1s0w1", - "t.l0.mountains_n1e1s1w1" + "t.l0.mountains_n0e1s1w1", + "t.l0.mountains_n1e1s0w1", + "t.l0.mountains_n1e1s1w1" 0, 15, "t.l0.mountains_n0e0s0w1", ; mountains W - "t.l0.mountains_n0e0s1w1", - "t.l0.mountains_n1e0s0w1", - "t.l0.mountains_n1e0s1w1" + "t.l0.mountains_n0e0s1w1", + "t.l0.mountains_n1e0s0w1", + "t.l0.mountains_n1e0s1w1" -; Desert, and whether terrain to north, south, east, west +; Desert, and whether terrain to north, south, east, west ; is more desert: 1, 0, "t.l0.desert_n1e1s1w1" @@ -140,7 +140,7 @@ tiles = { "row", "column", "tag" 1, 14, "t.l0.desert_n1e0s0w0" 1, 15, "t.l0.desert_n0e0s0w0" -; Arctic, and whether terrain to north, south, east, west +; Arctic, and whether terrain to north, south, east, west ; is more arctic: 6, 0, "t.l0.arctic_n1e1s1w1" @@ -177,7 +177,7 @@ tiles = { "row", "column", "tag" 2, 14, "t.l1.arctic_n1e0s0w0" 2, 15, "t.l1.arctic_n0e0s0w0" -; Jungle, and whether terrain to north, south, east, west +; Jungle, and whether terrain to north, south, east, west ; is more jungle: 3, 0, "t.l0.jungle_n1e1s1w1" @@ -197,7 +197,7 @@ tiles = { "row", "column", "tag" 3, 14, "t.l0.jungle_n1e0s0w0" 3, 15, "t.l0.jungle_n0e0s0w0" -; Plains, and whether terrain to north, south, east, west +; Plains, and whether terrain to north, south, east, west ; is more plains: 4, 0, "t.l0.plains_n1e1s1w1" @@ -217,7 +217,7 @@ tiles = { "row", "column", "tag" 4, 14, "t.l0.plains_n1e0s0w0" 4, 15, "t.l0.plains_n0e0s0w0" -; Swamp, and whether terrain to north, south, east, west +; Swamp, and whether terrain to north, south, east, west ; is more swamp: 5, 0, "t.l0.swamp_n1e1s1w1" @@ -237,7 +237,7 @@ tiles = { "row", "column", "tag" 5, 14, "t.l0.swamp_n1e0s0w0" 5, 15, "t.l0.swamp_n0e0s0w0" -; Tundra, and whether terrain to north, south, east, west +; Tundra, and whether terrain to north, south, east, west ; is more tundra: 6, 0, "t.l0.tundra_n1e1s1w1" @@ -257,7 +257,7 @@ tiles = { "row", "column", "tag" 6, 14, "t.l0.tundra_n1e0s0w0" 6, 15, "t.l0.tundra_n0e0s0w0" -; Ocean, and whether terrain to north, south, east, west +; Ocean, and whether terrain to north, south, east, west ; is more ocean (else shoreline) 10, 0, "t.l1.coast_n1e1s1w1" @@ -401,7 +401,7 @@ tiles = { "row", "column", "tag" 11, 14, "t.l2.inaccessible_n1e0s0w0" 11, 15, "t.l2.inaccessible_n0e0s0w0" -; Darkness (unexplored) to north, south, east, west +; Darkness (unexplored) to north, south, east, west 12, 0, "mask.tile" 12, 1, "tx.darkness_n1e0s0w0" @@ -423,7 +423,7 @@ tiles = { "row", "column", "tag" -; Rivers (as special type), and whether north, south, east, west +; Rivers (as special type), and whether north, south, east, west ; also has river or is ocean: 13, 0, "road.river_s_n0e0s0w0" @@ -443,7 +443,7 @@ tiles = { "row", "column", "tag" 13, 14, "road.river_s_n0e1s1w1" 13, 15, "road.river_s_n1e1s1w1" -; River outlets, river to north, south, east, west +; River outlets, river to north, south, east, west 14, 12, "road.river_outlet_n" 14, 13, "road.river_outlet_w" -- 2.35.1