Author: cazfi
Date: Tue Mar 31 22:31:38 2015
New Revision: 28675

URL: http://svn.gna.org/viewcvs/freeciv?rev=28675&view=rev
Log:
Updated isotrident with maglev, inaccessible terrain, full unitcost sprite set.

Art by GriffonSpade

See patch #5962

Added:
    branches/S2_5/data/isotrident/unitcost.png   (with props)
    branches/S2_5/data/isotrident/unitcost.spec
Modified:
    branches/S2_5/data/isotrident.tilespec
    branches/S2_5/data/isotrident/Makefile.am
    branches/S2_5/data/isotrident/terrain1.png
    branches/S2_5/data/isotrident/terrain1.spec

Modified: branches/S2_5/data/isotrident.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/isotrident.tilespec?rev=28675&r1=28674&r2=28675&view=diff
==============================================================================
--- branches/S2_5/data/isotrident.tilespec      (original)
+++ branches/S2_5/data/isotrident.tilespec      Tue Mar 31 22:31:38 2015
@@ -64,6 +64,7 @@
   "isotrident/terrain1.spec",
   "isotrident/terrain2.spec",
   "isotrident/tiles.spec",
+  "isotrident/unitcost.spec",
   "isotrident/grid.spec",
   "misc/small.spec",
   "misc/governments.spec",
@@ -118,6 +119,12 @@
 
 ; Land graphics referenced by terrain.ruleset
 ;
+[tile_inaccessible]
+blend_layer = 0
+num_layers = 1
+layer0_match_type = "land"
+mine_sprite = "tx.oil_mine"
+
 [tile_arctic]
 blend_layer = 1
 num_layers = 1
@@ -189,5 +196,6 @@
     { "name", "style"
       "road.road",  "AllSeparate"
       "road.rail",  "AllSeparate"
+      "road.maglev",  "AllSeparate"
       "road.river", "River"
     }

Modified: branches/S2_5/data/isotrident/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/isotrident/Makefile.am?rev=28675&r1=28674&r2=28675&view=diff
==============================================================================
--- branches/S2_5/data/isotrident/Makefile.am   (original)
+++ branches/S2_5/data/isotrident/Makefile.am   Tue Mar 31 22:31:38 2015
@@ -22,6 +22,8 @@
        terrain2.spec   \
        tiles.png       \
        tiles.spec      \
+       unitcost.png    \
+       unitcost.spec   \
        unitextras.png  \
        unitextras.spec
 

Modified: branches/S2_5/data/isotrident/terrain1.png
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/isotrident/terrain1.png?rev=28675&r1=28674&r2=28675&view=diff
==============================================================================
Binary files - no diff available.

Modified: branches/S2_5/data/isotrident/terrain1.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/isotrident/terrain1.spec?rev=28675&r1=28674&r2=28675&view=diff
==============================================================================
--- branches/S2_5/data/isotrident/terrain1.spec (original)
+++ branches/S2_5/data/isotrident/terrain1.spec Tue Mar 31 22:31:38 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: branches/S2_5/data/isotrident/unitcost.png
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/isotrident/unitcost.png?rev=28675&view=auto
==============================================================================
Binary file - no diff available.

Propchange: branches/S2_5/data/isotrident/unitcost.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/S2_5/data/isotrident/unitcost.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/isotrident/unitcost.spec?rev=28675&view=auto
==============================================================================
--- branches/S2_5/data/isotrident/unitcost.spec (added)
+++ branches/S2_5/data/isotrident/unitcost.spec Tue Mar 31 22:31:38 2015
@@ -0,0 +1,68 @@
+
+[spec]
+
+; Format and options of this spec file:
+options = "+Freeciv-2.5-spec"
+
+[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

Reply via email to