Author: cazfi
Date: Tue Feb  3 07:08:16 2015
New Revision: 27938

URL: http://svn.gna.org/viewcvs/freeciv?rev=27938&view=rev
Log:
Added full upkeep icon set for amplio2.

Art by GriffonSpade

See patch #4486

Added:
    branches/S2_6/data/amplio2/upkeep.png   (with props)
    branches/S2_6/data/amplio2/upkeep.spec
Modified:
    branches/S2_6/data/amplio2.tilespec
    branches/S2_6/data/amplio2/Makefile.am
    branches/S2_6/data/amplio2/tiles.spec
    branches/S2_6/data/cimpletoon.tilespec

Modified: branches/S2_6/data/amplio2.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2.tilespec?rev=27938&r1=27937&r2=27938&view=diff
==============================================================================
--- branches/S2_6/data/amplio2.tilespec (original)
+++ branches/S2_6/data/amplio2.tilespec Tue Feb  3 07:08:16 2015
@@ -69,6 +69,7 @@
   "amplio2/ocean.spec",
   "amplio2/water.spec",
   "amplio2/tiles.spec",
+  "amplio2/upkeep.spec",
   "amplio2/fog.spec",
   "misc/small.spec",
   "misc/events.spec",

Modified: branches/S2_6/data/amplio2/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/Makefile.am?rev=27938&r1=27937&r2=27938&view=diff
==============================================================================
--- branches/S2_6/data/amplio2/Makefile.am      (original)
+++ branches/S2_6/data/amplio2/Makefile.am      Tue Feb  3 07:08:16 2015
@@ -37,6 +37,8 @@
        tiles.spec              \
        units.png               \
        units.spec              \
+       upkeep.png              \
+       upkeep.spec             \
        veterancy.png           \
        veterancy.spec          \
        water.png               \

Modified: branches/S2_6/data/amplio2/tiles.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/tiles.spec?rev=27938&r1=27937&r2=27938&view=diff
==============================================================================
--- branches/S2_6/data/amplio2/tiles.spec       (original)
+++ branches/S2_6/data/amplio2/tiles.spec       Tue Feb  3 07:08:16 2015
@@ -127,18 +127,6 @@
   6, 18, "city.t_trade_8"
   6, 19, "city.t_trade_9"
 
-; Unit upkeep in city dialog:
-; These should probably be handled differently and have
-; a different size...
-
-  7, 12, "upkeep.gold"
-  7, 13, "upkeep.gold2"
-  7, 15, "upkeep.food"
-  7, 16, "upkeep.food2"
-  7, 17, "upkeep.unhappy"
-  7, 18, "upkeep.unhappy2"
-  7, 19, "upkeep.shield"
-
 ; Base building activities
   8, 15, "unit.fortress"
   8, 16, "unit.airbase"

Added: branches/S2_6/data/amplio2/upkeep.png
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/upkeep.png?rev=27938&view=auto
==============================================================================
Binary file - no diff available.

Propchange: branches/S2_6/data/amplio2/upkeep.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/S2_6/data/amplio2/upkeep.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/upkeep.spec?rev=27938&view=auto
==============================================================================
--- branches/S2_6/data/amplio2/upkeep.spec      (added)
+++ branches/S2_6/data/amplio2/upkeep.spec      Tue Feb  3 07:08:16 2015
@@ -0,0 +1,70 @@
+
+[spec]
+
+; Format and options of this spec file:
+options = "+Freeciv-spec-Devel-2013.Feb.13"
+
+[info]
+
+artists = "
+    GriffonSpade
+"
+
+[file]
+gfx = "amplio2/upkeep"
+
+[grid_main]
+
+x_top_left = 1
+y_top_left = 1
+dx = 96
+dy = 19
+pixel_border = 1
+
+tiles = { "row", "column", "tag"
+; Unit upkeep in city dialog:
+
+ 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"
+}

Modified: branches/S2_6/data/cimpletoon.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/cimpletoon.tilespec?rev=27938&r1=27937&r2=27938&view=diff
==============================================================================
--- branches/S2_6/data/cimpletoon.tilespec      (original)
+++ branches/S2_6/data/cimpletoon.tilespec      Tue Feb  3 07:08:16 2015
@@ -69,6 +69,7 @@
   "amplio2/ocean.spec",
   "amplio2/water.spec",
   "amplio2/tiles.spec",
+  "amplio2/upkeep.spec",
   "amplio2/fog.spec",
   "misc/small.spec",
   "misc/events.spec",


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to