Author: jtn
Date: Mon Oct 3 12:01:38 2016
New Revision: 33968
URL: http://svn.gna.org/viewcvs/freeciv?rev=33968&view=rev
Log:
Import rules from experimental to sandbox ruleset:
- Explorers establishing embassies once Writing is known
- Spies can sabotage units in stacks
- "Personal Freedom" custom policy
See patch #7744.
Modified:
trunk/data/sandbox/README.sandbox
trunk/data/sandbox/effects.ruleset
trunk/data/sandbox/game.ruleset
trunk/data/sandbox/governments.ruleset
trunk/data/sandbox/units.ruleset
Modified: trunk/data/sandbox/README.sandbox
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/README.sandbox?rev=33968&r1=33967&r2=33968&view=diff
==============================================================================
--- trunk/data/sandbox/README.sandbox (original)
+++ trunk/data/sandbox/README.sandbox Mon Oct 3 12:01:38 2016
@@ -82,9 +82,16 @@
the maximum distance corruption is the same regardless of the size of
the world.
+Explorers establishing embassies:
+Explorers can establish embassies once Writing is known. The Explorer
+unit is used up by this.
+
Establish Embassy from sea:
Units can establish embassies directly from boats without
disembarking.
+
+Units can be bribed/sabotaged if not along on their tile:
+Being part of a unit stack won't protect against spy actions.
Merchant movement restrictions:
Caravans and Freight can only moves on roads and rivers (as in older
@@ -95,3 +102,7 @@
routes, and can get revenue even when a trade route exists
('Enter Marketplace'), as in older versions of civ2civ3; however,
this latter action really requires a Marketplace building in the city.
+
+Custom policy "Personal Freedom":
+You can trade off a science bonus against extra unhappiness from your
+aggressive military units.
Modified: trunk/data/sandbox/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/effects.ruleset?rev=33968&r1=33967&r2=33968&view=diff
==============================================================================
--- trunk/data/sandbox/effects.ruleset (original)
+++ trunk/data/sandbox/effects.ruleset Mon Oct 3 12:01:38 2016
@@ -850,6 +850,23 @@
"Gov", "Democracy", "Player"
}
+[effect_personal_freedom_unit_unhappiness]
+type = "Unhappy_Factor"
+value = 1
+multiplier = "Personal Freedom"
+reqs =
+ { "type", "name", "range"
+ }
+
+[effect_personal_freedom_science_bonus]
+type = "Output_Bonus_2"
+value = 10
+multiplier = "Personal Freedom"
+reqs =
+ { "type", "name", "range"
+ "OutputType", "Science", "Local"
+ }
+
; Govs with 1 free unit
[effect_upkeep_free_mil_1]
type = "Make_Content_Mil"
Modified: trunk/data/sandbox/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=33968&r1=33967&r2=33968&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset (original)
+++ trunk/data/sandbox/game.ruleset Mon Oct 3 12:01:38 2016
@@ -362,6 +362,21 @@
"NationGroup", "Barbarian", "Player", FALSE
}
+[actionenabler_explorer_establish_embassy]
+action = "Establish Embassy"
+actor_reqs =
+ { "type", "name", "range"
+ "UnitType", "Explorer", "Local"
+ "Tech", "Writing", "Player"
+ "UnitState", "OnLivableTile", "Local"
+ "MinMoveFrags", "1", "Local"
+ "DiplRel", "Is foreign", "Local"
+ }
+target_reqs =
+ { "type", "name", "range", "present"
+ "NationGroup", "Barbarian", "Player", FALSE
+ }
+
[actionenabler_investigate_city]
action = "Investigate City"
actor_reqs =
@@ -465,7 +480,6 @@
"CityTile", "Center", "Local", FALSE
"Gov", "Republic", "Player", FALSE
"Gov", "Democracy", "Player", FALSE
- "MaxUnitsOnTile", "1", "Local", TRUE
}
[actionenabler_sabotage_unit]
@@ -481,7 +495,6 @@
{ "type", "name", "range", "present"
"CityTile", "Center", "Local", FALSE
"MinHitPoints", "2", "Local", TRUE
- "MaxUnitsOnTile", "1", "Local", TRUE
}
[actionenabler_traderoute]
Modified: trunk/data/sandbox/governments.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/governments.ruleset?rev=33968&r1=33967&r2=33968&view=diff
==============================================================================
--- trunk/data/sandbox/governments.ruleset (original)
+++ trunk/data/sandbox/governments.ruleset Mon Oct 3 12:01:38 2016
@@ -396,3 +396,16 @@
; newlines so that xgettext parsing works
;
; */ <-- avoid gettext warnings
+
+[multiplier_personal_freedom]
+name = _("Personal Freedom")
+start = 0
+stop = 5
+step = 1
+default = 0
+; /* xgettext:no-c-format */
+helptext = _("\
+Each step of personal freedom you allow your citizens yields a 10% \
+increase in science output, but makes an additional citizen unhappy \
+for every aggressively deployed military unit.\
+")
Modified: trunk/data/sandbox/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=33968&r1=33967&r2=33968&view=diff
==============================================================================
--- trunk/data/sandbox/units.ruleset (original)
+++ trunk/data/sandbox/units.ruleset Mon Oct 3 12:01:38 2016
@@ -2498,6 +2498,10 @@
helptext = _("\
Explorers are brave individuals that are very useful for\
mapping unknown territory.\
+"), _("\
+An explorer can be ordered to remain in a foreign city as an ambassador\
+ after Writing is discovered. This gives permanent contact with the city's\
+ owner, as well as intelligence on their tax rates and technology.\
")
[unit_leader]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
