Author: jtn
Date: Tue Feb 10 09:45:29 2015
New Revision: 28074

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

See gna bug #23255.

Modified:
    branches/S2_5/data/civ2civ3/effects.ruleset

Modified: branches/S2_5/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/effects.ruleset?rev=28074&r1=28073&r2=28074&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_5/data/civ2civ3/effects.ruleset Tue Feb 10 09:45:29 2015
@@ -715,31 +715,26 @@
 ;      "Gov", "Fundamentalism", "Player"
 ;      "Gov", "Federation", "Player"
 ;      "Gov", "Republic", "Player"
-;      "Gov", "Democracy", "Player"
-    }
-
+      "Gov", "Democracy", "Player"
+    }
+
+; exclusive with above
 [effect_unit_unhappiness_democracy]
 type    = "Unhappy_Factor"
-value   = 1
+value   = 2
 reqs    =
     { "type", "name", "range"
       "Gov", "Democracy", "Player"
     }
-nreqs    =
+
+; ...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"
-    }
-
-[effect_unit_unhappiness_democracy_1]
-type    = "Make_Content_Mil"
-value   = 1
-reqs    =
-    { "type", "name", "range"
       "Gov", "Democracy", "Player"
-    }
-nreqs    =
-    { "type", "name", "range"
-      "Building", "Women's Suffrage", "Player"
     }
 
 [effect_upkeep_free_mil_1]
@@ -755,7 +750,7 @@
       "Gov", "Fundamentalism", "Player"
       "Gov", "Federation", "Player"
 ;      "Gov", "Republic", "Player"
-;      "Gov", "Democracy", "Player"
+      "Gov", "Democracy", "Player"
     }
 
 [effect_upkeep_free_mil_2]
@@ -771,7 +766,7 @@
 ;      "Gov", "Fundamentalism", "Player"
 ;      "Gov", "Federation", "Player"
       "Gov", "Republic", "Player"
-      "Gov", "Democracy", "Player"
+;      "Gov", "Democracy", "Player"
     }
 
 [effect_upkeep_free_mil_3]
@@ -790,6 +785,17 @@
       "Gov", "Democracy", "Player"
     }
 
+; 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]
 type    = "Unit_Upkeep_Free_Per_City"
 value   = 2


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

Reply via email to