[Freeciv-Dev] [bug #23255] civ2civ3: Democracy military unhappiness help is misleading

2015-02-10 Thread Jacob Nevins
Update of bug #23255 (project freeciv):

  Status:  Ready For Test = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?23255

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #23255] civ2civ3: Democracy military unhappiness help is misleading

2015-02-08 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?23255

 Summary: civ2civ3: Democracy military unhappiness help is
misleading
 Project: Freeciv
Submitted by: jtn
Submitted on: Sun 08 Feb 2015 13:42:49 UTC
Category: rulesets
Severity: 3 - Normal
Priority: 5 - Normal
  Status: In Progress
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: Any
 Planned Release: 2.5.0, 2.6.0, 3.0.0

___

Details:

Autogenerated help says:


* Military units away from home and field units will each cause 1 citizen to
become unhappy.
* Each of your cities will avoid 1 unhappiness caused by units.


This is wrong: the base unhappiness is 2 per unit, and free unhappiness is
also 2 per city (== 1 unit).

helptext_government() assumes that effects without additional requirements are
the ones it should report, but the Women's Suffrage discounts are factored
into the main effects so it gets confused.

Refactor requirements in the ruleset so it gets the right idea. (Also might be
easier for maintainers to understand; it took me ages to get my head around
these effects when documenting them.)

Net result:


* Military units away from home and field units will each cause 2 citizens to
become unhappy.


(It doesn't mention the free upkeep, because that's actually expressed as
nreqs for not-Democracy; this will have to be handwritten. But at least it
doesn't lie. Fixing this would probably involve adding nreq-for-gov-X effects
to the effects cache as reqs for all-govs-except-X.)




___

Reply to this item at:

  http://gna.org/bugs/?23255

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #23255] civ2civ3: Democracy military unhappiness help is misleading

2015-02-08 Thread Jacob Nevins
Update of bug #23255 (project freeciv):

  Status: In Progress = Ready For Test 

___

Additional Item Attachment:

File name: trunk-S2_6-civ2civ3-democracy-refactor.patch Size:2 KB
File name: S2_5-civ2civ3-democracy-refactor.patch Size:2 KB


___

Reply to this item at:

  http://gna.org/bugs/?23255

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev