Author: jtn
Date: Mon May 30 12:52:26 2016
New Revision: 32773

URL: http://svn.gna.org/viewcvs/freeciv?rev=32773&view=rev
Log:
Remove descriptions of plague building effects from classic/multiplayer.

(The effects are there, but you have to hand-edit the ruleset to enable
illness before they are relevant, so the text was just confusing.)

Reported by fomalhaut on the forums.

See gna bug #24689.

Modified:
    branches/S2_6/data/classic/buildings.ruleset
    branches/S2_6/data/classic/game.ruleset
    branches/S2_6/data/multiplayer/buildings.ruleset
    branches/S2_6/data/multiplayer/game.ruleset

Modified: branches/S2_6/data/classic/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/buildings.ruleset?rev=32773&r1=32772&r2=32773&view=diff
==============================================================================
--- branches/S2_6/data/classic/buildings.ruleset        (original)
+++ branches/S2_6/data/classic/buildings.ruleset        Mon May 30 12:52:26 2016
@@ -102,11 +102,11 @@
 sound          = "b_aqueduct"
 sound_alt      = "b_generic"
 helptext       = _("\
-Allows a city to grow larger than size 8 and reduces the chance of plague\
- within the city. A Sewer System is required for a city to grow larger\
- than size 12.\
-")
-; NB: plague (illness) has to be activated in the ruleset
+Allows a city to grow larger than size 8.  A Sewer System is also\
+ required for a city to grow larger than size 12.\
+")
+; There's also an effect to reduce the chance of plague, but you have to
+; enable illness in game.ruleset for that to be relevant.
 
 [building_bank]
 name           = _("Bank")
@@ -864,11 +864,11 @@
 sound          = "b_sewer_system"
 sound_alt      = "b_generic"
 helptext       = _("\
-Allows a city to grow larger than size 12. Pre-requirement is an Aqueduct\
- for a city to grow larger than size 8. The Sewer System further reduces\
- the chance of a plague.\
-")
-; NB: plague (illness) has to be activated in the ruleset
+Allows a city to grow larger than size 12.  An Aqueduct is first\
+ required for a city to grow larger than size 8.\
+")
+; There's also an effect to reduce the chance of plague, but you have to
+; enable illness in game.ruleset for that to be relevant.
 
 [building_solar_plant]
 name           = _("Solar Plant")
@@ -1229,11 +1229,11 @@
 helptext       = _("\
 This stunning technological achievement makes one unhappy\
  citizen content in each of your cities (including citizens unhappy\
- about military activity). It further reduces the possibility for\
- an illness in the city.\
-")
+ about military activity).\
+")
+; There's also an effect to reduce the chance of plague, but you have to
+; enable illness in game.ruleset for that to be relevant.
 ; NB: In Civ2 this makes 1 content citizen happy in all cities.
-; NB: plague (illness) has to be activated in the ruleset
 
 [building_darwins_voyage]
 name           = _("Darwin's Voyage")

Modified: branches/S2_6/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=32773&r1=32772&r2=32773&view=diff
==============================================================================
--- branches/S2_6/data/classic/game.ruleset     (original)
+++ branches/S2_6/data/classic/game.ruleset     Mon May 30 12:52:26 2016
@@ -138,6 +138,8 @@
 
 [illness]
 ; Whether plagues (illness) are possible
+; There are some latent building effects in effects.ruleset which affect
+; health, if you enable plague here.
 illness_on = FALSE
 
 ; the base factor for illness (of percent)

Modified: branches/S2_6/data/multiplayer/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/buildings.ruleset?rev=32773&r1=32772&r2=32773&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/buildings.ruleset    (original)
+++ branches/S2_6/data/multiplayer/buildings.ruleset    Mon May 30 12:52:26 2016
@@ -128,11 +128,11 @@
 sound          = "b_aqueduct"
 sound_alt      = "b_generic"
 helptext       = _("\
-Allows a city to grow larger than size 8 and reduces the chance of plague\
- within the city. A Sewer System is required for a city to grow larger\
- than size 12.\
-")
-; NB: plague (illness) has to be activated in the ruleset
+Allows a city to grow larger than size 8.  A Sewer System is also\
+ required for a city to grow larger than size 12.\
+")
+; There's also an effect to reduce the chance of plague, but you have to
+; enable illness in game.ruleset for that to be relevant.
 
 [building_bank]
 name           = _("Bank")
@@ -841,11 +841,11 @@
 sound          = "b_sewer_system"
 sound_alt      = "b_generic"
 helptext       = _("\
-Allows a city to grow larger than size 12. Pre-requirement is an Aqueduct\
- for a city to grow larger than size 8. The Sewer System further reduces\
- the chance of a plague.\
-")
-; NB: plague (illness) has to be activated in the ruleset
+Allows a city to grow larger than size 12.  An Aqueduct is first\
+ required for a city to grow larger than size 8.\
+")
+; There's also an effect to reduce the chance of plague, but you have to
+; enable illness in game.ruleset for that to be relevant.
 
 [building_solar_plant]
 name           = _("Solar Plant")

Modified: branches/S2_6/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/game.ruleset?rev=32773&r1=32772&r2=32773&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/game.ruleset (original)
+++ branches/S2_6/data/multiplayer/game.ruleset Mon May 30 12:52:26 2016
@@ -142,6 +142,8 @@
 
 [illness]
 ; Whether plagues (illness) are possible
+; There are some latent building effects in effects.ruleset which affect
+; health, if you enable plague here.
 illness_on = FALSE
 
 ; the base factor for illness (of percent)


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

Reply via email to