Author: sveinung
Date: Thu Apr 20 23:18:34 2017
New Revision: 35268

URL: http://svn.gna.org/viewcvs/freeciv?rev=35268&view=rev
Log:
civ2civ3: import some game options from sandbox.

- Avoid overpowered diplomats at the start of the game. Remove reduced bribe
  cost of settlers.
- Remove Illegal_Action_Move_Cost.
- Allow explorers to establish embassies like in sandbox. Allow explorers to
  investigate cities. Restore explorer cost from 20 to 30, so they cost the
  same as diplomats who can also perform those actions. Update the help text
  of Explorer. The ability to perform those actions means that the Partisan
  no longer obsoletes the Explorer.
- Allow the harmless actions "Establish Embassy" and "Investigate City"
  while the actor unit is inside a ship.
- Allow using a caravan to help a team mate build a wonder (like sandbox).
- Make caravan actions coherent by having them require some movement left
  like actions as suggested by Sveinung.
- Sync sandbox with the new changes. (Includes making "Enter Marketplace"
  coherent even if it doesn't appear in civ2civ3)
- sandbox: remove the Writing requirement for the Explorer to establish an
  embassy. The rule permitting explorers to establish embassies was imported
  to the civ2civ3 based sandbox from the classic based experimental. In
  classic (and therefore experimental) Writing is required to build a
  Diplomat. But in civ2civ3 (and therefore sandbox) a Diplomat can be built
  once Alphabet is known.

Patch by David Fernandez <bardo@gna>

See hrm Feature #650794

Modified:
    trunk/data/civ2civ3/README.civ2civ3
    trunk/data/civ2civ3/effects.ruleset
    trunk/data/civ2civ3/game.ruleset
    trunk/data/civ2civ3/units.ruleset
    trunk/data/sandbox/README.sandbox
    trunk/data/sandbox/effects.ruleset
    trunk/data/sandbox/game.ruleset
    trunk/data/sandbox/units.ruleset

Modified: trunk/data/civ2civ3/README.civ2civ3
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/README.civ2civ3?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/civ2civ3/README.civ2civ3 (original)
+++ trunk/data/civ2civ3/README.civ2civ3 Thu Apr 20 23:18:34 2017
@@ -598,6 +598,10 @@
   Jungles and Swamps, unless they are travelling on a road. They do not
   get defensive bonuses from the terrain, can not perform pillage, and
   need Galleons or Transports to travel by sea.
+
+- Units can establish embassies or investigate cities directly from boats
+  without disembarking. Explorers can also perform those two actions, same
+  as Diplomats. Increased vision range of Explorers and Partisans.
 
 - Added Elephants from civ2, available with Polytheism:
   (at/def/mov-hp,cost) = (3/2/2-10,30). Obsolete by Dragoons.
@@ -980,7 +984,11 @@
   the movements of enemy units.
 - Diplomats and Spies are invisible like submarines, but they pay upkeep
   costs like all other units.
-- Increased vision of Explorer and Partisan. 
+- Units can establish embassies or investigate cities directly from boats
+  without disembarking. Explorers can also perform those two actions, same
+  as Diplomats. Cost of Explorers restored to 30.
+- Increased vision range of Explorers and Partisans.
+- Caravans and Freights can help allies to build wonder.
 - Cheating AI level gets +50% defense bonus for units placed in land
   tiles outside cities/fortresses.
 

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Thu Apr 20 23:18:34 2017
@@ -4244,23 +4244,6 @@
       "Extra", "Pollution", "Local"
     }
 
-[effect_unit_bribe_cost_settlers]
-type   = "Unit_Bribe_Cost_Pct"
-value  = -50
-reqs   =
-    { "type", "name", "range"
-      "UnitFlag", "Cities", "Local"
-    }
-
-[effect_illegal_action_move_cost_base]
-type   = "Illegal_Action_Move_Cost"
-value  = 1
-reqs   =
-    { "type", "name", "range", "present"
-      "Action", "Found City", "Local", FALSE
-      "Action", "Join City", "Local", FALSE
-    }
-
 [effect_incident_caught_steal_tech]
 type   = "Casus_Belli_Caught"
 value  = 1

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset    (original)
+++ trunk/data/civ2civ3/game.ruleset    Thu Apr 20 23:18:34 2017
@@ -363,7 +363,6 @@
 actor_reqs    =
     { "type",   "name", "range"
       "UnitFlag", "Diplomat", "Local"
-      "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
       "DiplRel", "Foreign", "Local"
     }
@@ -372,12 +371,33 @@
       "NationGroup", "Barbarian", "Player", FALSE
     }
 
+[actionenabler_establish_embassy_explorer]
+action       = "Establish Embassy"
+actor_reqs    =
+    { "type",   "name", "range"
+      "UnitType", "Explorer", "Local"
+      "MinMoveFrags", "1", "Local"
+      "DiplRel", "Foreign", "Local"
+    }
+target_reqs  =
+    { "type",   "name", "range", "present"
+      "NationGroup", "Barbarian", "Player", FALSE
+    }
+
 [actionenabler_investigate_city]
 action       = "Investigate City"
 actor_reqs    =
     { "type",   "name", "range"
       "UnitFlag", "Diplomat", "Local"
-      "UnitState", "OnLivableTile", "Local"
+      "MinMoveFrags", "1", "Local"
+      "DiplRel", "Foreign", "Local"
+    }
+
+[actionenabler_investigate_city_explorer]
+action       = "Investigate City"
+actor_reqs    =
+    { "type",   "name", "range"
+      "UnitType", "Explorer", "Local"
       "MinMoveFrags", "1", "Local"
       "DiplRel", "Foreign", "Local"
     }
@@ -485,6 +505,7 @@
 actor_reqs    =
     { "type",   "name", "range", "present"
       "UnitFlag", "TradeRoute", "Local", TRUE
+      "MinMoveFrags", "1", "Local", TRUE
     }
 
 [actionenabler_help_build_wonder]
@@ -492,7 +513,11 @@
 actor_reqs    =
     { "type",   "name", "range", "present"
       "UnitFlag", "HelpWonder", "Local", TRUE
-      "DiplRel", "Foreign", "Local", FALSE
+      "DiplRel", "Armistice", "Local", FALSE
+      "DiplRel", "War", "Local", FALSE
+      "DiplRel", "Cease-fire", "Local", FALSE
+      "DiplRel", "Peace", "Local", FALSE
+      "MinMoveFrags", "1", "Local", TRUE
     }
 target_reqs    =
     { "type",   "name", "range"

Modified: trunk/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset   (original)
+++ trunk/data/civ2civ3/units.ruleset   Thu Apr 20 23:18:34 2017
@@ -2459,14 +2459,14 @@
 name          = _("Explorer")
 class         = "Small Land"
 tech_req      = "Seafaring"
-obsolete_by   = "Partisan"
+obsolete_by   = "None"
 graphic       = "u.explorer"
 graphic_alt   = "-"
 sound_move    = "m_explorer"
 sound_move_alt = "m_generic"
 sound_fight   = "f_explorer"
 sound_fight_alt = "f_generic"
-build_cost    = 20
+build_cost    = 30
 pop_cost      = 0
 attack        = 0
 defense       = 1
@@ -2485,6 +2485,19 @@
 helptext      = _("\
 Explorers are brave individuals that are very useful for\
  mapping unknown territory.\
+"), _("\
+Explorers can also perform some actions in another player's city, although\
+ the unit disappears after the action is complete.\
+"), _("\
+ - \"Establish Embassy\": This action always succeeds, and gives\
+ permanent contact with the city's owner, as well as intelligence\
+ on their tax rates and technology. Each player you have an embassy\
+ with that knows a technology reduces that technology's research\
+ cost to you.\
+"), _("\
+ - \"Investigate City\": Your unit attempts to report detailed\
+ information about the city: its status, what buildings and units are\
+ within, and what it is currently producing.\
 ")
 
 [unit_leader]

Modified: trunk/data/sandbox/README.sandbox
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/README.sandbox?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/sandbox/README.sandbox   (original)
+++ trunk/data/sandbox/README.sandbox   Thu Apr 20 23:18:34 2017
@@ -34,9 +34,6 @@
 
 Border Vision:
 Border Vision is gained mid-game once Electricity is known
-
-Allied Wonder Building:
-One can help allies to build wonder.
 
 Destroy City:
 Leader unit can destroy domestic cities.
@@ -82,14 +79,6 @@
 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 alone on their tile:
 Being part of a unit stack won't protect against spy actions.
 

Modified: trunk/data/sandbox/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/effects.ruleset?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/sandbox/effects.ruleset  (original)
+++ trunk/data/sandbox/effects.ruleset  Thu Apr 20 23:18:34 2017
@@ -4278,23 +4278,6 @@
       "Extra", "Pollution", "Local"
     }
 
-[effect_unit_bribe_cost_settlers]
-type   = "Unit_Bribe_Cost_Pct"
-value  = -50
-reqs   =
-    { "type", "name", "range"
-      "UnitFlag", "Cities", "Local"
-    }
-
-[effect_illegal_action_move_cost_base]
-type   = "Illegal_Action_Move_Cost"
-value  = 1
-reqs   =
-    { "type", "name", "range", "present"
-      "Action", "Found City", "Local", FALSE
-      "Action", "Join City", "Local", FALSE
-    }
-
 [effect_incident_caught_steal_maps]
 type   = "Casus_Belli_Caught"
 value  = 1

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset     (original)
+++ trunk/data/sandbox/game.ruleset     Thu Apr 20 23:18:34 2017
@@ -374,13 +374,11 @@
       "NationGroup", "Barbarian", "Player", FALSE
     }
 
-[actionenabler_explorer_establish_embassy]
+[actionenabler_establish_embassy_explorer]
 action       = "Establish Embassy"
 actor_reqs    =
     { "type",   "name", "range"
       "UnitType", "Explorer", "Local"
-      "Tech", "Writing", "Player"
-      "UnitState", "OnLivableTile", "Local"
       "MinMoveFrags", "1", "Local"
       "DiplRel", "Foreign", "Local"
     }
@@ -394,7 +392,15 @@
 actor_reqs    =
     { "type",   "name", "range"
       "UnitFlag", "Diplomat", "Local"
-      "UnitState", "OnLivableTile", "Local"
+      "MinMoveFrags", "1", "Local"
+      "DiplRel", "Foreign", "Local"
+    }
+
+[actionenabler_investigate_city_explorer]
+action       = "Investigate City"
+actor_reqs    =
+    { "type",   "name", "range"
+      "UnitType", "Explorer", "Local"
       "MinMoveFrags", "1", "Local"
       "DiplRel", "Foreign", "Local"
     }
@@ -514,6 +520,7 @@
 actor_reqs    =
     { "type",   "name", "range", "present"
       "UnitFlag", "TradeRoute", "Local", TRUE
+      "MinMoveFrags", "1", "Local", TRUE
     }
 
 [actionenabler_marketplace]
@@ -521,6 +528,7 @@
 actor_reqs    =
     { "type",   "name", "range", "present"
       "UnitFlag", "TradeRoute", "Local", TRUE
+      "MinMoveFrags", "1", "Local", TRUE
     }
 target_reqs  =
     { "type",     "name",        "range"
@@ -536,6 +544,7 @@
       "DiplRel",  "War",        "Local", FALSE
       "DiplRel",  "Cease-fire", "Local", FALSE
       "DiplRel",  "Peace",      "Local", FALSE
+      "MinMoveFrags", "1", "Local", TRUE
     }
 target_reqs    =
     { "type",   "name", "range"

Modified: trunk/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=35268&r1=35267&r2=35268&view=diff
==============================================================================
--- trunk/data/sandbox/units.ruleset    (original)
+++ trunk/data/sandbox/units.ruleset    Thu Apr 20 23:18:34 2017
@@ -2479,14 +2479,14 @@
 name          = _("Explorer")
 class         = "Small Land"
 tech_req      = "Seafaring"
-obsolete_by   = "Partisan"
+obsolete_by   = "None"
 graphic       = "u.explorer"
 graphic_alt   = "-"
 sound_move    = "m_explorer"
 sound_move_alt = "m_generic"
 sound_fight   = "f_explorer"
 sound_fight_alt = "f_generic"
-build_cost    = 20
+build_cost    = 30
 pop_cost      = 0
 attack        = 0
 defense       = 1
@@ -2506,9 +2506,18 @@
 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.\
+Explorers can also perform some actions in another player's city, although\
+ the unit disappears after the action is complete.\
+"), _("\
+ - \"Establish Embassy\": This action always succeeds, and gives\
+ permanent contact with the city's owner, as well as intelligence\
+ on their tax rates and technology. Each player you have an embassy\
+ with that knows a technology reduces that technology's research\
+ cost to you.\
+"), _("\
+ - \"Investigate City\": Your unit attempts to report detailed\
+ information about the city: its status, what buildings and units are\
+ within, and what it is currently producing.\
 ")
 
 [unit_leader]


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

Reply via email to