Author: cazfi
Date: Thu Aug 18 21:20:17 2016
New Revision: 33642
URL: http://svn.gna.org/viewcvs/freeciv?rev=33642&view=rev
Log:
Updated hexemplio actions icons from ampliohexbig-2.6.00
See patch #7618
Added:
branches/S2_6/data/hexemplio/activities.png (with props)
branches/S2_6/data/hexemplio/activities.spec
Modified:
branches/S2_6/data/alio.tilespec
branches/S2_6/data/hexemplio.tilespec
branches/S2_6/data/hexemplio/Makefile.am
branches/S2_6/data/hexemplio/unitextras.png
branches/S2_6/data/hexemplio/unitextras.spec
branches/S2_6/data/toonhex.tilespec
Modified: branches/S2_6/data/alio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alio.tilespec?rev=33642&r1=33641&r2=33642&view=diff
==============================================================================
--- branches/S2_6/data/alio.tilespec (original)
+++ branches/S2_6/data/alio.tilespec Thu Aug 18 21:20:17 2016
@@ -59,8 +59,8 @@
unit_offset_y = 38
; offset of the normal activity icons
-activity_offset_x = 0
-activity_offset_y = 0
+activity_offset_x = 74
+activity_offset_y = 28
; offset the cities by this amount
city_offset_x = 15
@@ -119,6 +119,7 @@
"amplio2/nuke.spec",
"amplio2/explosions.spec",
"amplio2/cities.spec",
+ "hexemplio/activities.spec",
"hexemplio/bases.spec",
"hexemplio/terrain1.spec",
"hexemplio/terrain2.spec",
Modified: branches/S2_6/data/hexemplio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio.tilespec?rev=33642&r1=33641&r2=33642&view=diff
==============================================================================
--- branches/S2_6/data/hexemplio.tilespec (original)
+++ branches/S2_6/data/hexemplio.tilespec Thu Aug 18 21:20:17 2016
@@ -55,8 +55,8 @@
unit_offset_y = 38
; offset of the normal activity icons
-activity_offset_x = 0
-activity_offset_y = 0
+activity_offset_x = 74
+activity_offset_y = 28
; offset the cities by this amount
city_offset_x = 15
@@ -115,6 +115,7 @@
"amplio2/nuke.spec",
"amplio2/explosions.spec",
"amplio2/cities.spec",
+ "hexemplio/activities.spec",
"hexemplio/bases.spec",
"hexemplio/terrain1.spec",
"hexemplio/terrain2.spec",
Modified: branches/S2_6/data/hexemplio/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio/Makefile.am?rev=33642&r1=33641&r2=33642&view=diff
==============================================================================
--- branches/S2_6/data/hexemplio/Makefile.am (original)
+++ branches/S2_6/data/hexemplio/Makefile.am Thu Aug 18 21:20:17 2016
@@ -4,6 +4,8 @@
pkgdatadir = $(datadir)/$(PACKAGE)/hexemplio
pkgdata_DATA = \
+ activities.png \
+ activities.spec \
bases.png \
bases.spec \
grid.png \
Added: branches/S2_6/data/hexemplio/activities.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio/activities.png?rev=33642&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/S2_6/data/hexemplio/activities.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/S2_6/data/hexemplio/activities.spec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio/activities.spec?rev=33642&view=auto
==============================================================================
--- branches/S2_6/data/hexemplio/activities.spec (added)
+++ branches/S2_6/data/hexemplio/activities.spec Thu Aug 18 21:20:17 2016
@@ -0,0 +1,72 @@
+
+[spec]
+
+; Format and options of this spec file:
+options = "+Freeciv-2.6-spec"
+
+[info]
+
+artists = "
+ Hogne HÃ¥skjold <ho...@freeciv.org>[HH]
+ Eleazar[El]
+ GriffonSpade[GS]
+"
+
+[file]
+gfx = "hexemplio/activities"
+
+[grid_main]
+
+x_top_left = 1
+y_top_left = 1
+dx = 31
+dy = 25
+pixel_border = 1
+
+tiles = { "row", "column", "tag"
+
+; Unit activity letters: unit commands
+
+ 0, 0, "unit.fortified" ;[HH]
+ 0, 1, "unit.fortifying" ;[GS]
+ 0, 2, "unit.auto_explore" ;[?]
+ 0, 3, "unit.sentry" ;[?]
+ 0, 4, "unit.goto" ;[?]
+ 0, 5, "unit.patrol" ;[?]
+ 0, 6, "unit.convert" ;[?][GS]
+
+; Unit activity letters: tile commands
+
+ 1, 0, "unit.rest" ;[?]
+ 1, 1, "unit.irrigate" ;[?]
+ 1, 2, "unit.plant" ;[?]
+ 1, 3, "unit.transform" ;[?]
+ 1, 4, "unit.pillage" ;[?]
+ 1, 5, "unit.pollution" ;[?]
+ 1, 6, "unit.fallout" ;[?]
+ 1, 7, "unit.farm" ;[?]
+
+; Unit Activities: roads
+
+ 2, 0, "unit.road" ;[GS]
+ 2, 1, "unit.rail" ;[GS]
+; 2, 2, "unit.highway" ;[GS]
+ 2, 3, "unit.maglev" ;[GS]
+
+; Unit activities: bases
+
+ 2, 4, "unit.outpost" ;[GS]
+ 2, 5, "unit.fortress" ;[GS]
+ 2, 6, "unit.airstrip" ;[GS]
+ 2, 7, "unit.airbase" ;[GS]
+ 3, 5, "unit.buoy" ;[GS][El]
+
+; Unit activities: other extras
+
+ 3, 0, "unit.irrigation" ;[GS]
+ 3, 1, "unit.farmland" ;[GS]
+ 3, 2, "unit.mine" ;[GS]
+ 3, 3, "unit.oil_mine" ;[GS]
+ 3, 4, "unit.oil_rig" ;[GS]
+
+}
Modified: branches/S2_6/data/hexemplio/unitextras.png
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio/unitextras.png?rev=33642&r1=33641&r2=33642&view=diff
==============================================================================
Binary files - no diff available.
Modified: branches/S2_6/data/hexemplio/unitextras.spec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio/unitextras.spec?rev=33642&r1=33641&r2=33642&view=diff
==============================================================================
--- branches/S2_6/data/hexemplio/unitextras.spec (original)
+++ branches/S2_6/data/hexemplio/unitextras.spec Thu Aug 18 21:20:17 2016
@@ -61,51 +61,6 @@
; 2, 3, "unit.lowfuel"
2, 4, "unit.lowfuel"
2, 5, "unit.connect"
- 2, 6, "unit.auto_attack",
- "unit.auto_settler"
-
-; Unit activity letters: unit commands
-
- 3, 0, "unit.fortified"
- 3, 1, "unit.fortifying"
- 3, 2, "unit.auto_explore"
- 3, 3, "unit.sentry"
- 3, 4, "unit.goto"
- 3, 5, "unit.patrol"
- 3, 6, "unit.convert"
-
-; Unit activity letters: tile commands
-
- 4, 0, "unit.rest"
- 4, 1, "unit.irrigate"
- 4, 2, "unit.plant"
- 4, 3, "unit.transform"
- 4, 4, "unit.pillage"
- 4, 5, "unit.pollution"
- 4, 6, "unit.fallout"
- 4, 7, "unit.farm"
-
-; Unit Activities: roads
-
- 5, 0, "unit.road"
- 5, 1, "unit.rail"
- 5, 2, "unit.pave"
- 5, 3, "unit.maglev"
-
-; Unit activities: bases
-
- 5, 4, "unit.outpost"
- 5, 5, "unit.fortress"
- 5, 6, "unit.airstrip"
- 5, 7, "unit.airbase"
- 5, 8, "unit.buoy"
-
-; Unit activities: other extras
-
- 6, 0, "unit.irrigation"
- 6, 1, "unit.farmland"
- 6, 2, "unit.mine"
- 6, 3, "unit.oil_mine"
- 6, 4, "unit.oil_rig"
-
+ 2, 6, "unit.auto_attack"
+ 2, 6, "unit.auto_settler"
}
Modified: branches/S2_6/data/toonhex.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/toonhex.tilespec?rev=33642&r1=33641&r2=33642&view=diff
==============================================================================
--- branches/S2_6/data/toonhex.tilespec (original)
+++ branches/S2_6/data/toonhex.tilespec Thu Aug 18 21:20:17 2016
@@ -56,8 +56,8 @@
unit_offset_y = 38
; offset of the normal activity icons
-activity_offset_x = 0
-activity_offset_y = 0
+activity_offset_x = 74
+activity_offset_y = 28
; offset the cities by this amount
city_offset_x = 15
@@ -116,6 +116,7 @@
"amplio2/nuke.spec",
"amplio2/explosions.spec",
"amplio2/cities.spec",
+ "hexemplio/activities.spec",
"hexemplio/bases.spec",
"hexemplio/terrain1.spec",
"hexemplio/terrain2.spec",
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
