Author: jtn
Date: Tue Feb 24 09:36:53 2015
New Revision: 28303
URL: http://svn.gna.org/viewcvs/freeciv?rev=28303&view=rev
Log:
Updated Trident tiles with support for various new game elements.
roads.spec/png:
- Added new maglev graphics (palette swapped railroad: rails changed to
sea blue, brown changed to grey)
- Reverted patch #5598 (so Trident rails are now back as they were
in 2.4)
tiles.spec/png:
- Added full set of unit upkeep icons
- Added airstrip (single lane, original-coloured airbase); airbase
monochromed to create contrast with it, similar to amplio
- Added outpost (shortened, gape-walled fortress)
- Added individual unit activity icons for roads/bases (replacing
'R', 'A', 'F')
- Change fortifying from "F" to yellow hollow tower; tweak "fortified" --
'tower' trunk widened by 2 pixels and a second window spot added,
cosmetic improvement and brings it in line with new fortifying icon
- "C" now used for convert (right side placement); connect now uses new
arrow graphics
- Autoexplore - 'X' moved to the right side to uncover shield, despite
being an advisor control, does not call other activities
- Change Inaccessible terrain to high contrast monochrome ocean, and
use oceanic shore layers
- Add extra strategic resources for modpacks:
- aluminum: colour inverted and adjusted, horizontally flipped iron
- uranium: monochromed gold
- saltpeter: colour inverted, horizontally and vertically flipped,
placement adjusted coal
- elephant: monochromed, edited buffalo ("my lolephant isn't the
greatest, but it's recognisably an elephant")
By GriffonSpade on the forum.
See gna patch #5856.
Modified:
branches/S2_5/data/trident.tilespec
branches/S2_5/data/trident/roads.png
branches/S2_5/data/trident/roads.spec
branches/S2_5/data/trident/tiles.png
branches/S2_5/data/trident/tiles.spec
Modified: branches/S2_5/data/trident.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident.tilespec?rev=28303&r1=28302&r2=28303&view=diff
==============================================================================
--- branches/S2_5/data/trident.tilespec (original)
+++ branches/S2_5/data/trident.tilespec Tue Feb 24 09:36:53 2015
@@ -126,8 +126,13 @@
;
[tile_inaccessible]
blend_layer = 0
-num_layers = 1
-layer0_match_type = "plains"
+num_layers = 3
+layer0_match_type = "water"
+layer1_match_type = "water"
+layer1_match_with = "water"
+layer2_match_type = "water"
+layer2_match_with = "water"
+layer2_sprite_type = "corner"
[tile_arctic]
blend_layer = 0
Modified: branches/S2_5/data/trident/roads.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident/roads.png?rev=28303&r1=28302&r2=28303&view=diff
==============================================================================
Binary files - no diff available.
Modified: branches/S2_5/data/trident/roads.spec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident/roads.spec?rev=28303&r1=28302&r2=28303&view=diff
==============================================================================
--- branches/S2_5/data/trident/roads.spec (original)
+++ branches/S2_5/data/trident/roads.spec Tue Feb 24 09:36:53 2015
@@ -1,166 +1,175 @@
-
-[spec]
-
-; Format and options of this spec file:
-options = "+Freeciv-2.5-spec"
-
-[info]
-
-artists = "
- Tatu Rissanen <tatu.rissa...@hut.fi>
- David Pfitzner <d...@mso.anu.edu.au> (original design)
-"
-
-[file]
-gfx = "trident/roads"
-
-[grid_roads]
-
-x_top_left = 0
-y_top_left = 0
-dx = 30
-dy = 30
-
-tiles = { "row", "column", "tag"
-
- 0, 0, "road.road_isolated"
-
-; Cardinal roads, connections north, south, east, west:
-
- 0, 1, "road.road_c_n1e0s0w0"
- 0, 2, "road.road_c_n0e1s0w0"
- 0, 3, "road.road_c_n1e1s0w0"
- 0, 4, "road.road_c_n0e0s1w0"
- 0, 5, "road.road_c_n1e0s1w0"
- 0, 6, "road.road_c_n0e1s1w0"
- 0, 7, "road.road_c_n1e1s1w0"
- 0, 8, "road.road_c_n0e0s0w1"
- 0, 9, "road.road_c_n1e0s0w1"
- 0, 10, "road.road_c_n0e1s0w1"
- 0, 11, "road.road_c_n1e1s0w1"
- 0, 12, "road.road_c_n0e0s1w1"
- 0, 13, "road.road_c_n1e0s1w1"
- 0, 14, "road.road_c_n0e1s1w1"
- 0, 15, "road.road_c_n1e1s1w1"
-
-; Diagonal roads, connections same, rotated 45 degrees clockwise:
-
- 1, 1, "road.road_d_ne1se0sw0nw0"
- 1, 2, "road.road_d_ne0se1sw0nw0"
- 1, 3, "road.road_d_ne1se1sw0nw0"
- 1, 4, "road.road_d_ne0se0sw1nw0"
- 1, 5, "road.road_d_ne1se0sw1nw0"
- 1, 6, "road.road_d_ne0se1sw1nw0"
- 1, 7, "road.road_d_ne1se1sw1nw0"
- 1, 8, "road.road_d_ne0se0sw0nw1"
- 1, 9, "road.road_d_ne1se0sw0nw1"
- 1, 10, "road.road_d_ne0se1sw0nw1"
- 1, 11, "road.road_d_ne1se1sw0nw1"
- 1, 12, "road.road_d_ne0se0sw1nw1"
- 1, 13, "road.road_d_ne1se0sw1nw1"
- 1, 14, "road.road_d_ne0se1sw1nw1"
- 1, 15, "road.road_d_ne1se1sw1nw1"
-}
-
-[grid_rails]
-
-x_top_left = 0
-y_top_left = 60
-dx = 30
-dy = 30
-
-tiles = { "row", "column", "tag"
-
- 0, 0, "road.rail_isolated"
-
-; Cardinal rails, connections north, south, east, west:
-
- 0, 1, "road.rail_c_n1e0s0w0"
- 0, 2, "road.rail_c_n0e1s0w0"
- 0, 3, "road.rail_c_n1e1s0w0"
- 0, 4, "road.rail_c_n0e0s1w0"
- 0, 5, "road.rail_c_n1e0s1w0"
- 0, 6, "road.rail_c_n0e1s1w0"
- 0, 7, "road.rail_c_n1e1s1w0"
- 0, 8, "road.rail_c_n0e0s0w1"
- 0, 9, "road.rail_c_n1e0s0w1"
- 0, 10, "road.rail_c_n0e1s0w1"
- 0, 11, "road.rail_c_n1e1s0w1"
- 0, 12, "road.rail_c_n0e0s1w1"
- 0, 13, "road.rail_c_n1e0s1w1"
- 0, 14, "road.rail_c_n0e1s1w1"
- 0, 15, "road.rail_c_n1e1s1w1"
-
-; Diagonal rails, connections same, rotated 45 degrees clockwise:
-
- 1, 1, "road.rail_d_ne1se0sw0nw0"
- 1, 2, "road.rail_d_ne0se1sw0nw0"
- 1, 3, "road.rail_d_ne1se1sw0nw0"
- 1, 4, "road.rail_d_ne0se0sw1nw0"
- 1, 5, "road.rail_d_ne1se0sw1nw0"
- 1, 6, "road.rail_d_ne0se1sw1nw0"
- 1, 7, "road.rail_d_ne1se1sw1nw0"
- 1, 8, "road.rail_d_ne0se0sw0nw1"
- 1, 9, "road.rail_d_ne1se0sw0nw1"
- 1, 10, "road.rail_d_ne0se1sw0nw1"
- 1, 11, "road.rail_d_ne1se1sw0nw1"
- 1, 12, "road.rail_d_ne0se0sw1nw1"
- 1, 13, "road.rail_d_ne1se0sw1nw1"
- 1, 14, "road.rail_d_ne0se1sw1nw1"
- 1, 15, "road.rail_d_ne1se1sw1nw1"
-
-; Rail corners
-
- 0, 16, "road.rail_c_nw"
- 0, 17, "road.rail_c_ne"
- 1, 16, "road.rail_c_sw"
- 1, 17, "road.rail_c_se"
-
-; Maglevs
-
- 2, 0, "road.maglev_isolated"
-
-; Cardinal maglevs, connections north, south, east, west:
-
- 2, 1, "road.maglev_c_n1e0s0w0"
- 2, 2, "road.maglev_c_n0e1s0w0"
- 2, 3, "road.maglev_c_n1e1s0w0"
- 2, 4, "road.maglev_c_n0e0s1w0"
- 2, 5, "road.maglev_c_n1e0s1w0"
- 2, 6, "road.maglev_c_n0e1s1w0"
- 2, 7, "road.maglev_c_n1e1s1w0"
- 2, 8, "road.maglev_c_n0e0s0w1"
- 2, 9, "road.maglev_c_n1e0s0w1"
- 2, 10, "road.maglev_c_n0e1s0w1"
- 2, 11, "road.maglev_c_n1e1s0w1"
- 2, 12, "road.maglev_c_n0e0s1w1"
- 2, 13, "road.maglev_c_n1e0s1w1"
- 2, 14, "road.maglev_c_n0e1s1w1"
- 2, 15, "road.maglev_c_n1e1s1w1"
-
-; Diagonal maglevs, connections same, rotated 45 degrees clockwise:
-
- 3, 1, "road.maglev_d_ne1se0sw0nw0"
- 3, 2, "road.maglev_d_ne0se1sw0nw0"
- 3, 3, "road.maglev_d_ne1se1sw0nw0"
- 3, 4, "road.maglev_d_ne0se0sw1nw0"
- 3, 5, "road.maglev_d_ne1se0sw1nw0"
- 3, 6, "road.maglev_d_ne0se1sw1nw0"
- 3, 7, "road.maglev_d_ne1se1sw1nw0"
- 3, 8, "road.maglev_d_ne0se0sw0nw1"
- 3, 9, "road.maglev_d_ne1se0sw0nw1"
- 3, 10, "road.maglev_d_ne0se1sw0nw1"
- 3, 11, "road.maglev_d_ne1se1sw0nw1"
- 3, 12, "road.maglev_d_ne0se0sw1nw1"
- 3, 13, "road.maglev_d_ne1se0sw1nw1"
- 3, 14, "road.maglev_d_ne0se1sw1nw1"
- 3, 15, "road.maglev_d_ne1se1sw1nw1"
-
-; Maglev corners
-
- 2, 16, "road.maglev_c_nw"
- 2, 17, "road.maglev_c_ne"
- 3, 16, "road.maglev_c_sw"
- 3, 17, "road.maglev_c_se"
-
-}
+
+[spec]
+
+; Format and options of this spec file:
+options = "+Freeciv-2.5-spec"
+
+[info]
+
+artists = "
+ Tatu Rissanen <tatu.rissa...@hut.fi>
+ David Pfitzner <d...@mso.anu.edu.au> (original design)
+"
+
+[file]
+gfx = "trident/roads"
+
+[grid_roads]
+
+x_top_left = 0
+y_top_left = 0
+dx = 30
+dy = 30
+
+tiles = { "row", "column", "tag"
+
+ 0, 0, "road.road_isolated"
+
+; Cardinal roads, connections north, south, east, west:
+
+ 0, 1, "road.road_c_n1e0s0w0"
+ 0, 2, "road.road_c_n0e1s0w0"
+ 0, 3, "road.road_c_n1e1s0w0"
+ 0, 4, "road.road_c_n0e0s1w0"
+ 0, 5, "road.road_c_n1e0s1w0"
+ 0, 6, "road.road_c_n0e1s1w0"
+ 0, 7, "road.road_c_n1e1s1w0"
+ 0, 8, "road.road_c_n0e0s0w1"
+ 0, 9, "road.road_c_n1e0s0w1"
+ 0, 10, "road.road_c_n0e1s0w1"
+ 0, 11, "road.road_c_n1e1s0w1"
+ 0, 12, "road.road_c_n0e0s1w1"
+ 0, 13, "road.road_c_n1e0s1w1"
+ 0, 14, "road.road_c_n0e1s1w1"
+ 0, 15, "road.road_c_n1e1s1w1"
+
+; Diagonal roads, connections same, rotated 45 degrees clockwise:
+
+ 1, 1, "road.road_d_ne1se0sw0nw0"
+ 1, 2, "road.road_d_ne0se1sw0nw0"
+ 1, 3, "road.road_d_ne1se1sw0nw0"
+ 1, 4, "road.road_d_ne0se0sw1nw0"
+ 1, 5, "road.road_d_ne1se0sw1nw0"
+ 1, 6, "road.road_d_ne0se1sw1nw0"
+ 1, 7, "road.road_d_ne1se1sw1nw0"
+ 1, 8, "road.road_d_ne0se0sw0nw1"
+ 1, 9, "road.road_d_ne1se0sw0nw1"
+ 1, 10, "road.road_d_ne0se1sw0nw1"
+ 1, 11, "road.road_d_ne1se1sw0nw1"
+ 1, 12, "road.road_d_ne0se0sw1nw1"
+ 1, 13, "road.road_d_ne1se0sw1nw1"
+ 1, 14, "road.road_d_ne0se1sw1nw1"
+ 1, 15, "road.road_d_ne1se1sw1nw1"
+}
+
+[grid_rails]
+
+x_top_left = 0
+y_top_left = 60 ; Change to 0 for original trident rails, 60 for
dwp-style
+dx = 30
+dy = 30
+
+tiles = { "row", "column", "tag"
+
+ 2, 0, "road.rail_isolated"
+
+; Cardinal rails, connections north, south, east, west:
+
+ 2, 1, "road.rail_c_n1e0s0w0"
+ 2, 2, "road.rail_c_n0e1s0w0"
+ 2, 3, "road.rail_c_n1e1s0w0"
+ 2, 4, "road.rail_c_n0e0s1w0"
+ 2, 5, "road.rail_c_n1e0s1w0"
+ 2, 6, "road.rail_c_n0e1s1w0"
+ 2, 7, "road.rail_c_n1e1s1w0"
+ 2, 8, "road.rail_c_n0e0s0w1"
+ 2, 9, "road.rail_c_n1e0s0w1"
+ 2, 10, "road.rail_c_n0e1s0w1"
+ 2, 11, "road.rail_c_n1e1s0w1"
+ 2, 12, "road.rail_c_n0e0s1w1"
+ 2, 13, "road.rail_c_n1e0s1w1"
+ 2, 14, "road.rail_c_n0e1s1w1"
+ 2, 15, "road.rail_c_n1e1s1w1"
+
+; Diagonal rails, connections same, rotated 45 degrees clockwise:
+
+ 3, 1, "road.rail_d_ne1se0sw0nw0"
+ 3, 2, "road.rail_d_ne0se1sw0nw0"
+ 3, 3, "road.rail_d_ne1se1sw0nw0"
+ 3, 4, "road.rail_d_ne0se0sw1nw0"
+ 3, 5, "road.rail_d_ne1se0sw1nw0"
+ 3, 6, "road.rail_d_ne0se1sw1nw0"
+ 3, 7, "road.rail_d_ne1se1sw1nw0"
+ 3, 8, "road.rail_d_ne0se0sw0nw1"
+ 3, 9, "road.rail_d_ne1se0sw0nw1"
+ 3, 10, "road.rail_d_ne0se1sw0nw1"
+ 3, 11, "road.rail_d_ne1se1sw0nw1"
+ 3, 12, "road.rail_d_ne0se0sw1nw1"
+ 3, 13, "road.rail_d_ne1se0sw1nw1"
+ 3, 14, "road.rail_d_ne0se1sw1nw1"
+ 3, 15, "road.rail_d_ne1se1sw1nw1"
+
+; Rail corners
+
+ 2, 16, "road.rail_c_nw"
+ 2, 17, "road.rail_c_ne"
+ 3, 16, "road.rail_c_sw"
+ 3, 17, "road.rail_c_se"
+
+}
+
+[grid_maglev]
+
+x_top_left = 0
+y_top_left = 180
+dx = 30
+dy = 30
+
+tiles = { "row", "column", "tag"
+
+ 0, 0, "road.maglev_isolated"
+
+; Cardinal maglevs, connections north, south, east, west:
+
+ 0, 1, "road.maglev_c_n1e0s0w0"
+ 0, 2, "road.maglev_c_n0e1s0w0"
+ 0, 3, "road.maglev_c_n1e1s0w0"
+ 0, 4, "road.maglev_c_n0e0s1w0"
+ 0, 5, "road.maglev_c_n1e0s1w0"
+ 0, 6, "road.maglev_c_n0e1s1w0"
+ 0, 7, "road.maglev_c_n1e1s1w0"
+ 0, 8, "road.maglev_c_n0e0s0w1"
+ 0, 9, "road.maglev_c_n1e0s0w1"
+ 0, 10, "road.maglev_c_n0e1s0w1"
+ 0, 11, "road.maglev_c_n1e1s0w1"
+ 0, 12, "road.maglev_c_n0e0s1w1"
+ 0, 13, "road.maglev_c_n1e0s1w1"
+ 0, 14, "road.maglev_c_n0e1s1w1"
+ 0, 15, "road.maglev_c_n1e1s1w1"
+
+; Diagonal maglevs, connections same, rotated 45 degrees clockwise:
+
+ 1, 1, "road.maglev_d_ne1se0sw0nw0"
+ 1, 2, "road.maglev_d_ne0se1sw0nw0"
+ 1, 3, "road.maglev_d_ne1se1sw0nw0"
+ 1, 4, "road.maglev_d_ne0se0sw1nw0"
+ 1, 5, "road.maglev_d_ne1se0sw1nw0"
+ 1, 6, "road.maglev_d_ne0se1sw1nw0"
+ 1, 7, "road.maglev_d_ne1se1sw1nw0"
+ 1, 8, "road.maglev_d_ne0se0sw0nw1"
+ 1, 9, "road.maglev_d_ne1se0sw0nw1"
+ 1, 10, "road.maglev_d_ne0se1sw0nw1"
+ 1, 11, "road.maglev_d_ne1se1sw0nw1"
+ 1, 12, "road.maglev_d_ne0se0sw1nw1"
+ 1, 13, "road.maglev_d_ne1se0sw1nw1"
+ 1, 14, "road.maglev_d_ne0se1sw1nw1"
+ 1, 15, "road.maglev_d_ne1se1sw1nw1"
+
+; maglev corners
+
+ 0, 16, "road.maglev_c_nw"
+ 0, 17, "road.maglev_c_ne"
+ 1, 16, "road.maglev_c_sw"
+ 1, 17, "road.maglev_c_se"
+
+}
Modified: branches/S2_5/data/trident/tiles.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident/tiles.png?rev=28303&r1=28302&r2=28303&view=diff
==============================================================================
Binary files - no diff available.
Modified: branches/S2_5/data/trident/tiles.spec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident/tiles.spec?rev=28303&r1=28302&r2=28303&view=diff
==============================================================================
--- branches/S2_5/data/trident/tiles.spec (original)
+++ branches/S2_5/data/trident/tiles.spec Tue Feb 24 09:36:53 2015
@@ -12,7 +12,6 @@
Eleazar (buoy)
Vincent Croisier <vincent.crois...@advalvas.be> (ruins)
Michael Johnson <justaguest> (nuke explosion)
- The Square Cow (inaccessible terrain)
"
[file]
@@ -230,6 +229,23 @@
10, 14, "t.l0.inaccessible1"
+ 9, 0, "t.l1.inaccessible_n1e1s1w1"
+ 9, 1, "t.l1.inaccessible_n0e1s1w1"
+ 9, 2, "t.l1.inaccessible_n1e0s1w1"
+ 9, 3, "t.l1.inaccessible_n0e0s1w1"
+ 9, 4, "t.l1.inaccessible_n1e1s0w1"
+ 9, 5, "t.l1.inaccessible_n0e1s0w1"
+ 9, 6, "t.l1.inaccessible_n1e0s0w1"
+ 9, 7, "t.l1.inaccessible_n0e0s0w1"
+ 9, 8, "t.l1.inaccessible_n1e1s1w0"
+ 9, 9, "t.l1.inaccessible_n0e1s1w0"
+ 9, 10, "t.l1.inaccessible_n1e0s1w0"
+ 9, 11, "t.l1.inaccessible_n0e0s1w0"
+ 9, 12, "t.l1.inaccessible_n1e1s0w0"
+ 9, 13, "t.l1.inaccessible_n0e1s0w0"
+ 9, 14, "t.l1.inaccessible_n1e0s0w0"
+ 9, 15, "t.l1.inaccessible_n0e0s0w0"
+
; For hills, forest and mountains don't currently have a full set,
; re-use values but provide for future expansion; current sets
; effectively ignore N/S terrain.
@@ -349,6 +365,13 @@
7, 18, "ts.silk"
7, 19, "ts.wine"
+; Terrain Strategic Resources
+
+ 12, 0, "ts.aluminum"
+ 12, 1, "ts.uranium"
+ 12, 2, "ts.saltpeter"
+ 12, 3, "ts.elephant"
+
; Terrain improvements and similar:
12, 7, "tx.farmland"
@@ -365,23 +388,27 @@
13, 17, "tx.fog"
13, 18, "tx.fallout"
+ 15, 10, "base.airstrip_mg"
+ 15, 11, "base.outpost_mg"
+
+
; Unit activity letters: (note unit icons have just "u.")
9, 18, "unit.auto_attack",
"unit.auto_settler"
9, 19, "unit.stack"
- 10, 18, "unit.connect"
+; 10, 18, "unit.connect"
10, 19, "unit.auto_explore"
11, 12, "unit.transform"
11, 13, "unit.sentry"
11, 14, "unit.goto"
11, 15, "unit.mine"
11, 16, "unit.pollution"
- 11, 17, "unit.road"
+; 11, 17, "unit.road"
11, 18, "unit.irrigate"
- 11, 19, "unit.fortifying",
- "unit.fortress"
- 12, 16, "unit.airbase"
+; 11, 19, "unit.fortifying",
+; "unit.fortress"
+; 12, 16, "unit.airbase"
12, 17, "unit.pillage"
12, 18, "unit.fortified"
12, 19, "unit.fallout"
@@ -389,7 +416,24 @@
19, 16, "unit.lowfuel"
19, 16, "unit.tired"
19, 17, "unit.loaded"
- 10, 18, "unit.convert"
+; 10, 18, "unit.convert"
+
+; Unit Activities
+
+ 15, 12, "unit.airstrip"
+ 15, 13, "unit.outpost"
+ 15, 14, "unit.airbase"
+ 15, 15, "unit.fortress"
+ 15, 16, "unit.buoy"
+ 15, 17, "unit.fortifying"
+ 15, 18, "unit.convert"
+ 15, 19, "unit.connect"
+
+; Road Activities
+
+ 12, 4, "unit.road"
+ 12, 5, "unit.rail"
+ 12, 6, "unit.maglev"
; Unit hit-point bars: approx percent of hp remaining
@@ -488,13 +532,57 @@
; These should probably be handled differently and have
; a different size...
- 17, 12, "upkeep.gold"
- 17, 13, "upkeep.gold2"
- 17, 15, "upkeep.food"
- 17, 16, "upkeep.food2"
- 17, 17, "upkeep.unhappy"
- 17, 18, "upkeep.unhappy2"
- 17, 19, "upkeep.shield"
+; 17, 12, "upkeep.gold"
+; 17, 13, "upkeep.gold2"
+; 17, 15, "upkeep.food"
+; 17, 16, "upkeep.food2"
+; 17, 17, "upkeep.unhappy"
+; 17, 18, "upkeep.unhappy2"
+; 17, 19, "upkeep.shield"
+
+ 20, 0, "upkeep.shield"
+ 20, 1, "upkeep.shield2"
+ 20, 2, "upkeep.shield3"
+ 20, 3, "upkeep.shield4"
+ 20, 4, "upkeep.shield5"
+ 20, 5, "upkeep.shield6"
+ 20, 6, "upkeep.shield7"
+ 20, 7, "upkeep.shield8"
+ 20, 8, "upkeep.shield9"
+ 20, 9, "upkeep.shield10"
+
+ 20, 10, "upkeep.unhappy"
+ 20, 11, "upkeep.unhappy2"
+ 20, 12, "upkeep.unhappy3"
+ 20, 13, "upkeep.unhappy4"
+ 20, 14, "upkeep.unhappy5"
+ 20, 15, "upkeep.unhappy6"
+ 20, 16, "upkeep.unhappy7"
+ 20, 17, "upkeep.unhappy8"
+ 20, 18, "upkeep.unhappy9"
+ 20, 19, "upkeep.unhappy10"
+
+ 21, 0, "upkeep.food"
+ 21, 1, "upkeep.food2"
+ 21, 2, "upkeep.food3"
+ 21, 3, "upkeep.food4"
+ 21, 4, "upkeep.food5"
+ 21, 5, "upkeep.food6"
+ 21, 6, "upkeep.food7"
+ 21, 7, "upkeep.food8"
+ 21, 8, "upkeep.food9"
+ 21, 9, "upkeep.food10"
+
+ 21, 10, "upkeep.gold"
+ 21, 11, "upkeep.gold2"
+ 21, 12, "upkeep.gold3"
+ 21, 13, "upkeep.gold4"
+ 21, 14, "upkeep.gold5"
+ 21, 15, "upkeep.gold6"
+ 21, 16, "upkeep.gold7"
+ 21, 17, "upkeep.gold8"
+ 21, 18, "upkeep.gold9"
+ 21, 19, "upkeep.gold10"
; Misc:
@@ -597,4 +685,41 @@
0, 2, "t.l2.floor_cell_d110"
0, 2, "t.l2.floor_cell_d111"
+; Inaccessible fallback to Ocean tiles
+ 0, 0, "t.l2.inaccessible_cell_u010"
+ 0, 1, "t.l2.inaccessible_cell_r010"
+ 1, 0, "t.l2.inaccessible_cell_l010"
+ 1, 1, "t.l2.inaccessible_cell_d010"
+
+ 0, 2, "t.l2.inaccessible_cell_u000"
+ 0, 2, "t.l2.inaccessible_cell_u001"
+ 0, 2, "t.l2.inaccessible_cell_u011"
+ 0, 2, "t.l2.inaccessible_cell_u100"
+ 0, 2, "t.l2.inaccessible_cell_u101"
+ 0, 2, "t.l2.inaccessible_cell_u110"
+ 0, 2, "t.l2.inaccessible_cell_u111"
+
+ 0, 2, "t.l2.inaccessible_cell_l000"
+ 0, 2, "t.l2.inaccessible_cell_l001"
+ 0, 2, "t.l2.inaccessible_cell_l011"
+ 0, 2, "t.l2.inaccessible_cell_l100"
+ 0, 2, "t.l2.inaccessible_cell_l101"
+ 0, 2, "t.l2.inaccessible_cell_l110"
+ 0, 2, "t.l2.inaccessible_cell_l111"
+
+ 0, 2, "t.l2.inaccessible_cell_r000"
+ 0, 2, "t.l2.inaccessible_cell_r001"
+ 0, 2, "t.l2.inaccessible_cell_r011"
+ 0, 2, "t.l2.inaccessible_cell_r100"
+ 0, 2, "t.l2.inaccessible_cell_r101"
+ 0, 2, "t.l2.inaccessible_cell_r110"
+ 0, 2, "t.l2.inaccessible_cell_r111"
+
+ 0, 2, "t.l2.inaccessible_cell_d000"
+ 0, 2, "t.l2.inaccessible_cell_d001"
+ 0, 2, "t.l2.inaccessible_cell_d011"
+ 0, 2, "t.l2.inaccessible_cell_d100"
+ 0, 2, "t.l2.inaccessible_cell_d101"
+ 0, 2, "t.l2.inaccessible_cell_d110"
+ 0, 2, "t.l2.inaccessible_cell_d111"
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
![[Freeciv-commits] r28303 - in /branches/S2_5/data: trident.tilespec trident/roads.png trident/roads.spec trident/tiles.png trident/tiles.spec](/search?l=freeciv-commits@gna.org&q=subject:%22%5C%5BFreeciv%5C-commits%5C%5D+r28303+%5C-+in+%5C%2Fbranches%5C%2FS2_5%5C%2Fdata%5C%3A+trident.tilespec+trident%5C%2Froads.png+trident%5C%2Froads.spec+trident%5C%2Ftiles.png+trident%5C%2Ftiles.spec%22&o=newest){kind=link}
