Author: jtn
Date: Tue Feb 10 09:43:55 2015
New Revision: 28072

URL: http://svn.gna.org/viewcvs/freeciv?rev=28072&view=rev
Log:
Refactor civ2civ3 Democracy unit happiness effects to fix
autogenerated help.

See gna bug #23255.

Modified:
    trunk/data/civ2civ3/effects.ruleset

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=28072&r1=28071&r2=28072&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Tue Feb 10 09:43:55 2015
@@ -759,25 +759,26 @@
 ;      "Gov", "Fundamentalism", "Player", FALSE
 ;      "Gov", "Federation", "Player", FALSE
 ;      "Gov", "Republic", "Player", FALSE
-;      "Gov", "Democracy", "Player", FALSE
-    }
-
+      "Gov", "Democracy", "Player", FALSE
+    }
+
+; exclusive with above
 [effect_unit_unhappiness_democracy]
 type    = "Unhappy_Factor"
-value   = 1
-reqs    =
-    { "type", "name", "range", "present"
-      "Gov", "Democracy", "Player", TRUE
-      "Building", "Women's Suffrage", "Player", FALSE
-    }
-
-[effect_unit_unhappiness_democracy_1]
-type    = "Make_Content_Mil"
-value   = 1
-reqs    =
-    { "type", "name", "range", "present"
-      "Gov", "Democracy", "Player", TRUE
-      "Building", "Women's Suffrage", "Player", FALSE
+value   = 2
+reqs    =
+    { "type", "name", "range"
+      "Gov", "Democracy", "Player"
+    }
+
+; ...except Women's Suffrage reduces it back to Republic levels
+[effect_womens_suffrage_1]
+type    = "Unhappy_Factor"
+value   = -1
+reqs    =
+    { "type", "name", "range"
+      "Building", "Women's Suffrage", "Player"
+      "Gov", "Democracy", "Player"
     }
 
 [effect_upkeep_free_mil_1]
@@ -793,7 +794,7 @@
       "Gov", "Fundamentalism", "Player", FALSE
       "Gov", "Federation", "Player", FALSE
 ;      "Gov", "Republic", "Player", FALSE
-;      "Gov", "Democracy", "Player", FALSE
+      "Gov", "Democracy", "Player", FALSE
     }
 
 [effect_upkeep_free_mil_2]
@@ -809,7 +810,7 @@
 ;      "Gov", "Fundamentalism", "Player", FALSE
 ;      "Gov", "Federation", "Player", FALSE
       "Gov", "Republic", "Player", FALSE
-      "Gov", "Democracy", "Player", FALSE
+;      "Gov", "Democracy", "Player", FALSE
     }
 
 [effect_upkeep_free_mil_3]
@@ -826,6 +827,17 @@
       "Gov", "Federation", "Player", FALSE
       "Gov", "Republic", "Player", FALSE
       "Gov", "Democracy", "Player", FALSE
+    }
+
+; normally 2 for Democracy, but 1 of these not needed with Women's Suffrage
+; due to reduced Unhappy_Factor
+[effect_womens_suffrage_2]
+type    = "Make_Content_Mil"
+value   = -1
+reqs    =
+    { "type", "name", "range"
+      "Building", "Women's Suffrage", "Player"
+      "Gov", "Democracy", "Player"
     }
 
 [effect_upkeep_free_units_anarchy]


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

Reply via email to