Author: cazfi Date: Sat Apr 4 11:21:40 2015 New Revision: 28704 URL: http://svn.gna.org/viewcvs/freeciv?rev=28704&view=rev Log: Updated hex2t with maglev, inaccessible terrain, full unitcost sprite set.
Art by GriffonSpade See patch #5980 Added: trunk/data/hex2t/unitcost.png (with props) trunk/data/hex2t/unitcost.spec Modified: trunk/data/hex2t.tilespec trunk/data/hex2t/Makefile.am trunk/data/hex2t/tiles.png trunk/data/hex2t/tiles.spec Modified: trunk/data/hex2t.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t.tilespec?rev=28704&r1=28703&r2=28704&view=diff ============================================================================== --- trunk/data/hex2t.tilespec (original) +++ trunk/data/hex2t.tilespec Sat Apr 4 11:21:40 2015 @@ -80,6 +80,7 @@ "misc/overlays.spec", "misc/citybar.spec", "hex2t/tiles.spec", + "hex2t/unitcost.spec", "hex2t/overlays.spec", "trident/units.spec", "hex2t/select.spec", @@ -130,6 +131,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 @@ -192,6 +198,7 @@ { "name", "style" "road.road", "RoadAllSeparate" "road.rail", "RoadAllSeparate" + "road.maglev", "RoadAllSeparate" "road.river", "River" "tx.irrigation", "Cardinals" "tx.farmland", "Cardinals" Modified: trunk/data/hex2t/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t/Makefile.am?rev=28704&r1=28703&r2=28704&view=diff ============================================================================== --- trunk/data/hex2t/Makefile.am (original) +++ trunk/data/hex2t/Makefile.am Sat Apr 4 11:21:40 2015 @@ -13,6 +13,8 @@ select.png \ select.spec \ tiles.png \ - tiles.spec + tiles.spec \ + unitcost.png \ + unitcost.spec EXTRA_DIST = $(pkgdata_DATA) Modified: trunk/data/hex2t/tiles.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t/tiles.png?rev=28704&r1=28703&r2=28704&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/data/hex2t/tiles.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t/tiles.spec?rev=28704&r1=28703&r2=28704&view=diff ============================================================================== --- trunk/data/hex2t/tiles.spec (original) +++ trunk/data/hex2t/tiles.spec Sat Apr 4 11:21:40 2015 @@ -18,11 +18,11 @@ [grid_main] -x_top_left = 2 -y_top_left = 2 +x_top_left = 1 +y_top_left = 1 dx = 40 dy = 72 -pixel_border = 2 +pixel_border = 1 tiles = { "row", "column","tag" @@ -53,103 +53,130 @@ 1, 8, "road.rail_isolated" +; Maglevs + + 2, 0, "road.maglev_n" + 2, 1, "road.maglev_ne" + 2, 2, "road.maglev_e" + 2, 7, "road.maglev_se" + 2, 3, "road.maglev_s" + 2, 4, "road.maglev_sw" + 2, 5, "road.maglev_w" + 2, 6, "road.maglev_nw" + + 2, 8, "road.maglev_isolated" + ; terrain : if more t.whateverN are given it picks one randomly for each tile. ; for example with t.desert1 and t.desert2. ; ... actually in this tileset it doesn't even use these ; as the second ocean layer is drawn over the top of them ; but it's useful to know ... - 2, 0, "t.l0.desert1" - 6, 6, "t.l0.desert2" - 6, 7, "t.l0.desert3" + 3, 0, "t.l0.desert1" + 7, 6, "t.l0.desert2" + 7, 7, "t.l0.desert3" - 2, 1, "t.l0.plains1" - 2, 2, "t.l0.grassland1" - 2, 3, "t.l0.forest1" - 2, 4, "t.l0.hills1" - 2, 5, "t.l0.mountains1" - 2, 6, "t.l0.tundra1" - 2, 7, "t.l0.arctic1" - 2, 8, "t.l0.swamp1" + 3, 1, "t.l0.plains1" + 3, 2, "t.l0.grassland1" + 3, 3, "t.l0.forest1" + 3, 4, "t.l0.hills1" + 3, 5, "t.l0.mountains1" + 3, 6, "t.l0.tundra1" + 3, 7, "t.l0.arctic1" + 3, 8, "t.l0.swamp1" + + 7, 9, "t.l0.inaccessible1" ; FIXME: The same sprite is drawn twice on top of each other here. - 2, 9, "t.l0.jungle1" - 2, 9, "t.l1.jungle1" + 3, 3, "t.l0.jungle1" + 3, 9, "t.l1.jungle1" ; more ocean in overlays -; 2, 10, "t.l0.coast1" -; 6, 8, "t.l0.coast2" -; 2, 11, "t.l0.floor1" +; 3, 10, "t.l0.coast1" +; 7, 8, "t.l0.coast2" +; 3, 11, "t.l0.floor1" ; Terrain special resources: - 3, 0, "ts.oasis" - 4, 0, "ts.oil" - 3, 1, "ts.buffalo" - 4, 1, "ts.wheat" - 4, 2, "ts.grassland_resources", "ts.river_resources" - 3, 3, "ts.pheasant" - 4, 3, "ts.silk" - 3, 4, "ts.coal" - 4, 4, "ts.wine" - 3, 5, "ts.gold" - 4, 5, "ts.iron" - 3, 6, "ts.tundra_game" - 4, 6, "ts.furs" - 3, 7, "ts.arctic_ivory" - 4, 7, "ts.arctic_oil" - 3, 8, "ts.peat" - 4, 8, "ts.spice" - 3, 9, "ts.gems" - 4, 9, "ts.fruit" - 3, 10, "ts.fish" - 4, 10, "ts.whales" + 4, 0, "ts.oasis" + 5, 0, "ts.oil" + 4, 1, "ts.buffalo" + 5, 1, "ts.wheat" + 5, 2, "ts.grassland_resources", "ts.river_resources" + 4, 3, "ts.pheasant" + 5, 3, "ts.silk" + 4, 4, "ts.coal" + 5, 4, "ts.wine" + 4, 5, "ts.gold" + 5, 5, "ts.iron" + 4, 6, "ts.tundra_game" + 5, 6, "ts.furs" + 4, 7, "ts.arctic_ivory" + 5, 7, "ts.arctic_oil" + 4, 8, "ts.peat" + 5, 8, "ts.spice" + 4, 9, "ts.gems" + 5, 9, "ts.fruit" + 4, 10, "ts.fish" + 5, 10, "ts.whales" - 5, 7, "ts.seals" - 5, 8, "ts.forest_game" - 5, 9, "ts.horses" + 6, 7, "ts.seals" + 6, 8, "ts.forest_game" + 6, 9, "ts.horses" ; extras - 5, 0, "tx.oil_mine" - 5, 1, "tx.mine" - 5, 2, "tx.irrigation" - 5, 3, "tx.farmland" - 5, 4, "tx.pollution" - 5, 5, "tx.fallout" - 5, 6, "tx.village" + 6, 0, "tx.oil_mine" + 6, 1, "tx.mine" + 6, 2, "tx.irrigation" + 6, 3, "tx.farmland" + 6, 4, "tx.pollution" + 6, 5, "tx.fallout" + 6, 6, "tx.village" ; random stuff - 6, 0, "t.dither_tile" - 6, 0, "tx.darkness" - 6, 2, "mask.tile" - 6, 3, "t.coast_color" + 7, 0, "t.dither_tile" + 7, 0, "tx.darkness" + 7, 2, "mask.tile" + 7, 3, "t.coast_color" - 6, 4, "user.attention" - 6, 5, "tx.fog" + 7, 4, "user.attention" + 7, 5, "tx.fog" ; darkness - 7, 0, "tx.darkness_n" - 7, 1, "tx.darkness_ne" - 7, 2, "tx.darkness_e" - 7, 3, "tx.darkness_s" - 7, 4, "tx.darkness_sw" - 7, 5, "tx.darkness_w" + 8, 0, "tx.darkness_n" + 8, 1, "tx.darkness_ne" + 8, 2, "tx.darkness_e" + 8, 3, "tx.darkness_s" + 8, 4, "tx.darkness_sw" + 8, 5, "tx.darkness_w" + +} + +[grid_upkeep] + +x_top_left = 452 +y_top_left = 455 +dx = 40 +dy = 28 +pixel_border = 1 + +tiles = { "row", "column","tag" ; Unit upkeep in city dialog: ; These should probably be handled differently and have ; a different size... - 8, 0, "upkeep.gold" - 8, 1, "upkeep.gold2" - 8, 2, "upkeep.shield" - 8, 3, "upkeep.food" - 8, 4, "upkeep.food2" - 8, 5, "upkeep.unhappy" - 8, 6, "upkeep.unhappy2" + 0, 0, "upkeep.shield" + 1, 0, "upkeep.gold" + 2, 0, "upkeep.gold2" + 3, 0, "upkeep.food" + 4, 0, "upkeep.food2" + 5, 0, "upkeep.unhappy" + 6, 0, "upkeep.unhappy2" } Added: trunk/data/hex2t/unitcost.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t/unitcost.png?rev=28704&view=auto ============================================================================== Binary file - no diff available. Propchange: trunk/data/hex2t/unitcost.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/data/hex2t/unitcost.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t/unitcost.spec?rev=28704&view=auto ============================================================================== --- trunk/data/hex2t/unitcost.spec (added) +++ trunk/data/hex2t/unitcost.spec Sat Apr 4 11:21:40 2015 @@ -0,0 +1,70 @@ + +[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) + Tommy <yob...@hotmail.com> (hex mode) + Daniel Markstedt <himasa...@spray.se> (added dithering) + GriffinSpade (UnitCosts) +" + +[file] +gfx = "hex2t/unitcost" + +[grid_upkeep] + +x_top_left = 1 +y_top_left = 1 +dx = 40 +dy = 28 +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.food" +; 1, 1, "upkeep.food2" + 1, 2, "upkeep.food3" + 1, 3, "upkeep.food4" + 1, 4, "upkeep.food5" + 1, 5, "upkeep.food6" + 1, 6, "upkeep.food7" + 1, 7, "upkeep.food8" + 1, 8, "upkeep.food9" + 1, 9, "upkeep.food10" +; 2, 0, "upkeep.unhappy" +; 2, 1, "upkeep.unhappy2" + 2, 2, "upkeep.unhappy3" + 2, 3, "upkeep.unhappy4" + 2, 4, "upkeep.unhappy5" + 2, 5, "upkeep.unhappy6" + 2, 6, "upkeep.unhappy7" + 2, 7, "upkeep.unhappy8" + 2, 8, "upkeep.unhappy9" + 2, 9, "upkeep.unhappy10" +; 3, 0, "upkeep.gold" +; 3, 1, "upkeep.gold2" + 3, 2, "upkeep.gold3" + 3, 3, "upkeep.gold4" + 3, 4, "upkeep.gold5" + 3, 5, "upkeep.gold6" + 3, 6, "upkeep.gold7" + 3, 7, "upkeep.gold8" + 3, 8, "upkeep.gold9" + 3, 9, "upkeep.gold10" +} _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits