<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40368 >
> [EMAIL PROTECTED] - Wed Jul 09 02:01:59 2008]:
>
> Madeline Book wrote:
> > <URL: http://bugs.freeciv.org/Ticket/Display.html?id=40368 >
> >
> > What is the purpose of having resources defined in the
> > civ1 terrain ruleset, but with 'name' field set to "unused"?
> > It seems completely unnecessary, and in fact S2_1 does not
> > have such "dummy" entries.
> >
> > I bring this up because they annoyingly litter the editor's
> > resource selection list.
> >
> > If nobody knows the intended purpose of these unused
> > resource definitions, and I find that nothing of value
> > is lost by removing them, I'll submit a patch to do so
> > shortly.
>
> At one point the terrain types were enumerated in the code. It
> was then necessary to keep every terrain (and improvement, etc)
> in the same order. Thus the unused entries were needed to mark
> a terrain type that wasn't present in civ1.
>
> Unless I'm very wrong, they are not needed anymore.
It seems that way to me too. Patch attached.
---------------------------------------------------------------------
ももビールをもう一本くれ！
diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset
index 00f7bdc..dd7c8a6 100644
--- a/data/civ1/terrain.ruleset
+++ b/data/civ1/terrain.ruleset
@@ -570,13 +570,6 @@ update22one = "H"
trade = 6
# mountains.
-[resource_iron]
-name = "unused"
-graphic = "ts.iron"
-graphic_alt = "-"
-identifier = "/"
-# unused
-
[resource_game]
name = _("?animals:Game")
graphic = "ts.tundra_game"
@@ -586,14 +579,6 @@ update22two = "e"
food = 2
# forest, tundra.
-[resource_furs]
-name = "unused"
-graphic = "ts.furs"
-graphic_alt = "-"
-identifier = "b"
-update22two = "u"
-# unused
-
[resource_coal]
name = _("Coal")
graphic = "ts.coal"
@@ -612,13 +597,6 @@ update22two = "y"
food = 2
# ocean.
-[resource_fruit]
-name = "unused"
-graphic = "ts.fruit"
-graphic_alt = "-"
-identifier = "f"
-# unused
-
[resource_gems]
name = _("Gems")
graphic = "ts.gems"
@@ -637,13 +615,6 @@ update22two = "b"
shield = 2
# plains (horses => buffalo => cattle).
-[resource_wheat]
-name = "unused"
-graphic = "ts.wheat"
-graphic_alt = "-"
-identifier = "j"
-# unused
-
[resource_oasis]
name = _("Oasis")
graphic = "ts.oasis"
@@ -662,13 +633,6 @@ update22two = "a"
shield = 4
# swamp (petroleum => peat => petroleum).
-[resource_pheasant]
-name = "unused"
-graphic = "ts.pheasant"
-graphic_alt = "-"
-identifier = "p"
-# unused
-
[resource_bonus]
name = _("Resources")
graphic = "ts.grassland_resources"
@@ -687,49 +651,6 @@ update22two = "i"
food = 2
# arctic (seals => walrus).
-[resource_silk]
-name = "unused"
-graphic = "ts.silk"
-graphic_alt = "-"
-identifier = "s"
-# unused
-
-[resource_spice]
-name = "unused"
-graphic = "ts.spice"
-graphic_alt = "-"
-identifier = "t"
-# unused
-
-[resource_whales]
-name = "unused"
-graphic = "ts.whales"
-graphic_alt = "-"
-identifier = "v"
-# unused
-
-[resource_wine]
-name = "unused"
-graphic = "ts.wine"
-graphic_alt = "-"
-identifier = "w"
-# unused
-
-[resource_icy_oil]
-name = "unused"
-graphic = "ts.oil"
-graphic_alt = "-"
-identifier = "x"
-# unused
-
-[resource_desert_oil]
-name = "unused"
-graphic = "ts.oil"
-graphic_alt = "-"
-identifier = "X"
-update22two = "P"
-# unused
-
; Exactly two base types:
; [fortress] and [airbase].
;
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
