Author: cazfi
Date: Wed Feb 10 13:18:20 2016
New Revision: 31861
URL: http://svn.gna.org/viewcvs/freeciv?rev=31861&view=rev
Log:
Updated terrain gfx tag documentation comments in supplied terrain.ruleset
files.
See bug #24239
Modified:
trunk/data/alien/terrain.ruleset
trunk/data/civ1/terrain.ruleset
trunk/data/civ2/terrain.ruleset
trunk/data/civ2civ3/terrain.ruleset
trunk/data/classic/terrain.ruleset
trunk/data/experimental/terrain.ruleset
trunk/data/multiplayer/terrain.ruleset
trunk/data/sandbox/terrain.ruleset
trunk/data/stub/terrain.ruleset
Modified: trunk/data/alien/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/alien/terrain.ruleset (original)
+++ trunk/data/alien/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -77,11 +77,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred base graphics tag in tilespec; must have
-; tags with extensions _n0s0e0e0 etc.
-; graphic_alt = alternate graphics tag if preferred is not found;
-; should be a standard tag if preferred is not;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/civ1/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/civ1/terrain.ruleset (original)
+++ trunk/data/civ1/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -71,9 +71,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/civ2/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/civ2/terrain.ruleset (original)
+++ trunk/data/civ2/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -71,9 +71,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -76,9 +76,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/classic/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/classic/terrain.ruleset (original)
+++ trunk/data/classic/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -76,9 +76,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/experimental/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/experimental/terrain.ruleset (original)
+++ trunk/data/experimental/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -78,9 +78,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/multiplayer/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/multiplayer/terrain.ruleset (original)
+++ trunk/data/multiplayer/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -76,9 +76,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/sandbox/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/sandbox/terrain.ruleset (original)
+++ trunk/data/sandbox/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -76,9 +76,11 @@
; present, 'name' is used. Since the name used in
; savegames must not change, use this when renaming a
; terrain after a ruleset has been released.
-; graphic = preferred graphic [tile_*] in tilespec.
-; graphic_alt = alternate graphic [tile_*] when preferred is not
found;
-; otherwise may be "-"
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
Modified: trunk/data/stub/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/terrain.ruleset?rev=31861&r1=31860&r2=31861&view=diff
==============================================================================
--- trunk/data/stub/terrain.ruleset (original)
+++ trunk/data/stub/terrain.ruleset Wed Feb 10 13:18:20 2016
@@ -47,22 +47,29 @@
; There is no resources in the middle of the oceans, only near coast
ocean_resources = FALSE
-; Below: The individual terrain types, one per section.
-; For now, the number of such sections must be kept the same (=12).
-; Also, terrains should be in the same order as defined in common/map.h,
-; and have similar roles/effects, as some things are still hardwired.
-; The actual tag used (the * in [terrain_*]) does not matter, except
-; it must be unique for each terrain, and it may be used in debug
-; output when reading this file.
+; /* <-- avoid gettext warnings
+;
+; The individual terrain types, one per section.
+; Roughly sorted by identifier.
+; The actual tag used (the * in [terrain_*]) must be unique for each terrain,
+; should contain the specific strings found in the nation city_name lists,
+; and may be used in debug output when reading this file.
+; Some have been chosen to avoid the city_name lists (_peaks, _water).
;
; Notes:
;
-; name = name as seen by user; if "unused", it is not used
-; graphic = preferred base graphics tag in tilespec; must have
-; tags with extensions _n0s0e0e0 etc.
-; graphic_alt = alternate graphics tag if preferred is not found;
-; should be a standard tag if preferred is not;
-; otherwise may be "-"
+; name = translatable name as seen by user; if "unused", it is
+; not used, but is included for conversion and/or the
+; editor.
+; rule_name = (optional) name for savegames, rulesets etc; if not
+; present, 'name' is used. Since the name used in
+; savegames must not change, use this when renaming a
+; terrain after a ruleset has been released.
+; graphic = preferred graphic; Tilespec [tile_*] section
+; with 'tag' matching this will be used.
+; graphic_alt = alternate graphic. When no tilespec 'tag' matching
+; preferred graphic is not found, this will be used.
+; Otherwise may be "-"
; identifier = single-character identifier used in savegames. This
; must be unique for each terrain, and changing it will
; break savegame compatibility.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
