Author: cazfi
Date: Tue Mar 31 22:31:19 2015
New Revision: 28673
URL: http://svn.gna.org/viewcvs/freeciv?rev=28673&view=rev
Log:
Updated isotrident with maglev, inaccessible terrain, full unitcost sprite set.
Art by GriffonSpade
See patch #5962
Added:
trunk/data/isotrident/unitcost.png (with props)
trunk/data/isotrident/unitcost.spec
Modified:
trunk/data/isotrident.tilespec
trunk/data/isotrident/Makefile.am
trunk/data/isotrident/terrain1.png
trunk/data/isotrident/terrain1.spec
Modified: trunk/data/isotrident.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident.tilespec?rev=28673&r1=28672&r2=28673&view=diff
==============================================================================
--- trunk/data/isotrident.tilespec (original)
+++ trunk/data/isotrident.tilespec Tue Mar 31 22:31:19 2015
@@ -71,6 +71,7 @@
"isotrident/terrain1.spec",
"isotrident/terrain2.spec",
"isotrident/tiles.spec",
+ "isotrident/unitcost.spec",
"isotrident/grid.spec",
"misc/small.spec",
"misc/events.spec",
@@ -124,6 +125,11 @@
; Land graphics referenced by terrain.ruleset
;
+[tile_inaccessible]
+blend_layer = 0
+num_layers = 1
+layer0_match_type = "land"
+
[tile_arctic]
blend_layer = 1
num_layers = 1
@@ -185,6 +191,7 @@
{ "name", "style"
"road.road", "RoadAllSeparate"
"road.rail", "RoadAllSeparate"
+ "road.maglev", "RoadAllSeparate"
"road.river", "River"
"tx.irrigation", "Cardinals"
"tx.farmland", "Cardinals"
Modified: trunk/data/isotrident/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident/Makefile.am?rev=28673&r1=28672&r2=28673&view=diff
==============================================================================
--- trunk/data/isotrident/Makefile.am (original)
+++ trunk/data/isotrident/Makefile.am Tue Mar 31 22:31:19 2015
@@ -22,6 +22,8 @@
terrain2.spec \
tiles.png \
tiles.spec \
+ unitcost.png \
+ unitcost.spec \
unitextras.png \
unitextras.spec
Modified: trunk/data/isotrident/terrain1.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident/terrain1.png?rev=28673&r1=28672&r2=28673&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/isotrident/terrain1.spec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident/terrain1.spec?rev=28673&r1=28672&r2=28673&view=diff
==============================================================================
--- trunk/data/isotrident/terrain1.spec (original)
+++ trunk/data/isotrident/terrain1.spec Tue Mar 31 22:31:19 2015
@@ -50,6 +50,8 @@
9, 0, "t.l0.jungle1"
+ 10, 0, "t.l0.inaccessible1"
+
; Terrain special resources:
0, 2, "ts.oasis"
@@ -57,6 +59,9 @@
1, 2, "ts.buffalo"
1, 3, "ts.wheat"
+
+ 2, 2, "ts.fish"
+ 2, 3, "ts.whales"
7, 7, "ts.grassland_resources", "ts.river_resources"
@@ -80,12 +85,20 @@
9, 2, "ts.gems"
9, 3, "ts.fruit"
+ 9, 4, "ts.horses"
9, 5, "ts.seals"
9, 6, "ts.forest_game"
- 10, 2, "ts.fish"
- 10, 3, "ts.whales"
- 10, 5, "ts.horses"
+
+; Maglevs
+ 10, 1, "road.maglev_n"
+ 10, 2, "road.maglev_ne"
+ 10, 3, "road.maglev_e"
+ 10, 4, "road.maglev_se"
+ 10, 5, "road.maglev_s"
+ 10, 6, "road.maglev_sw"
+ 10, 7, "road.maglev_w"
+ 10, 8, "road.maglev_nw"
; Roads
11, 1, "road.road_n"
@@ -149,4 +162,6 @@
tiles = { "row", "column","tag"
0, 0, "road.road_isolated"
1, 0, "road.rail_isolated"
+ 2, 0, "road.maglev_isolated"
}
+
Added: trunk/data/isotrident/unitcost.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident/unitcost.png?rev=28673&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/isotrident/unitcost.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/isotrident/unitcost.spec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident/unitcost.spec?rev=28673&view=auto
==============================================================================
--- trunk/data/isotrident/unitcost.spec (added)
+++ trunk/data/isotrident/unitcost.spec Tue Mar 31 22:31:19 2015
@@ -0,0 +1,67 @@
+
+[spec]
+
+; Format and options of this spec file:
+options = "+Freeciv-spec-Devel-2015-Mar-25"
+
+[info]
+
+artists = "
+ Tatu Rissanen <tatu.rissa...@hut.fi>
+ Jeff Mallatt <j...@codewell.com> (miscellaneous)
+ GriffonSpade
+"
+
+[file]
+gfx = "isotrident/unitcost"
+
+[grid_main]
+
+x_top_left = 1
+y_top_left = 1
+dx = 63
+dy = 23
+pixel_border = 1
+
+tiles = { "row", "column", "tag"
+; 0, 0, "upkeep.shield"
+ 0, 1, "upkeep.shield2"
+ 0, 2, "upkeep.shield3"
+ 0, 3, "upkeep.shield4"
+ 0, 4, "upkeep.shield5"
+ 0, 5, "upkeep.shield6"
+ 0, 6, "upkeep.shield7"
+ 0, 7, "upkeep.shield8"
+ 0, 8, "upkeep.shield9"
+ 0, 9, "upkeep.shield10"
+; 1, 0, "upkeep.gold"
+; 1, 1, "upkeep.gold2"
+ 1, 2, "upkeep.gold3"
+ 1, 3, "upkeep.gold4"
+ 1, 4, "upkeep.gold5"
+ 1, 5, "upkeep.gold6"
+ 1, 6, "upkeep.gold7"
+ 1, 7, "upkeep.gold8"
+ 1, 8, "upkeep.gold9"
+ 1, 9, "upkeep.gold10"
+; 2, 0, "upkeep.food"
+; 2, 1, "upkeep.food2"
+ 2, 2, "upkeep.food3"
+ 2, 3, "upkeep.food4"
+ 2, 4, "upkeep.food5"
+ 2, 5, "upkeep.food6"
+ 2, 6, "upkeep.food7"
+ 2, 7, "upkeep.food8"
+ 2, 8, "upkeep.food9"
+ 2, 9, "upkeep.food10"
+; 3, 0, "upkeep.unhappy"
+; 3, 1, "upkeep.unhappy2"
+ 3, 2, "upkeep.unhappy3"
+ 3, 3, "upkeep.unhappy4"
+ 3, 4, "upkeep.unhappy5"
+ 3, 5, "upkeep.unhappy6"
+ 3, 6, "upkeep.unhappy7"
+ 3, 7, "upkeep.unhappy8"
+ 3, 8, "upkeep.unhappy9"
+ 3, 9, "upkeep.unhappy10"
+}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
