Author: cazfi
Date: Tue May 3 22:11:36 2016
New Revision: 32564
URL: http://svn.gna.org/viewcvs/freeciv?rev=32564&view=rev
Log:
Updated civ2civ3 Merchants behavior
- They no longer require River or Road, but can move on any land
- Bonus on traderoute creation disabled
- They can't do Enter Marketplace action
- They are subject to ZOC
- Trade routes to enemy cities are not possible
See patch #7137
Modified:
trunk/data/civ2civ3/README.civ2civ3
trunk/data/civ2civ3/game.ruleset
trunk/data/civ2civ3/techs.ruleset
trunk/data/civ2civ3/terrain.ruleset
trunk/data/civ2civ3/units.ruleset
Modified: trunk/data/civ2civ3/README.civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/README.civ2civ3?rev=32564&r1=32563&r2=32564&view=diff
==============================================================================
--- trunk/data/civ2civ3/README.civ2civ3 (original)
+++ trunk/data/civ2civ3/README.civ2civ3 Tue May 3 22:11:36 2016
@@ -65,9 +65,9 @@
tiles worked in the newly created city.
- Disabled national Trade Routes: it is still possible to create Trade
- Routes, but only to foreign cities (max 2 per city). Caravans and
- Freights can only travel on roads, rivers or ships. Halved the
- revenues.
+ Routes, but only to foreign cities that you are not at war with.
+ Each city can support a maximum of 2 trade routes. Removed the one
+ time revenues.
- Every unit pays some kind of Upkeep cost. Under some governments, this
upkeep is changed from Shields to Gold (similar to civ3).
@@ -579,8 +579,8 @@
Control that would affect the movements of enemy units.
- Created a new unit class for Caravans and Freights ("Merchant") that
- can only travel on roads, railroads, rivers or ships. They can only
- establish Trade Routes to foreign cities. And they can be captured.
+ doesn't get the unlimited movement from Maglev, and can be captured.
+ They can only establish Trade Routes to foreign cities.
- Land units can capture enemy Migrants (as slaves) and
Caravans/Freights (as loot).
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=32564&r1=32563&r2=32564&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Tue May 3 22:11:36 2016
@@ -451,13 +451,6 @@
"UnitFlag", "TradeRoute", "Local", TRUE
}
-[actionenabler_marketplace]
-action = "Enter Marketplace"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "TradeRoute", "Local", TRUE
- }
-
[actionenabler_help_build_wonder]
action = "Help Wonder"
actor_reqs =
@@ -884,16 +877,16 @@
[trade]
settings =
{ "type", "pct", "cancelling", "bonus"
- "National", 0, "Cancel", "Both"
- "NationalIC", 0, "Cancel", "Both"
- "IN", 100, "Cancel", "Both"
- "INIC", 200, "Cancel", "Both"
- "Ally", 100, "Cancel", "Both"
- "AllyIC", 200, "Cancel", "Both"
- "Enemy", 100, "Cancel", "Both"
- "EnemyIC", 200, "Cancel", "Both"
- "Team", 100, "Cancel", "Both"
- "TeamIC", 200, "Cancel", "Both"
+ "National", 0, "Cancel", "None"
+ "NationalIC", 0, "Cancel", "None"
+ "IN", 100, "Cancel", "None"
+ "INIC", 200, "Cancel", "None"
+ "Ally", 100, "Cancel", "None"
+ "AllyIC", 200, "Cancel", "None"
+ "Enemy", 0, "Cancel", "None"
+ "EnemyIC", 0, "Cancel", "None"
+ "Team", 100, "Cancel", "None"
+ "TeamIC", 200, "Cancel", "None"
}
; /* <-- avoid gettext warnings
Modified: trunk/data/civ2civ3/techs.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/techs.ruleset?rev=32564&r1=32563&r2=32564&view=diff
==============================================================================
--- trunk/data/civ2civ3/techs.ruleset (original)
+++ trunk/data/civ2civ3/techs.ruleset Tue May 3 22:11:36 2016
@@ -699,8 +699,6 @@
Allows Settlers, Migrants, Workers and Engineers to upgrade roads to \
railroads.\
"), _("\
-Halves one-time revenue from new trade routes.\
-"), _("\
For Despotism or Tribal governments, cancels the penalty to worked \
tiles with output greater than 2 (as if all your cities were always \
celebrating).\
Modified: trunk/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=32564&r1=32563&r2=32564&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Tue May 3 22:11:36 2016
@@ -406,7 +406,7 @@
warmer_drier_result = "Tundra"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "NoBarbs", "NoCities", "CanHaveRiver", "Oil", "Frozen"
property_frozen = 100
color.r = 232
@@ -451,7 +451,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "Tundra"
cooler_drier_result = "Tundra"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "CanHaveRiver", "Oil"
property_dry = 100
property_tropical = 50
@@ -501,7 +501,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "Starter", "CanHaveRiver", "NoPollution"
property_cold = 20
property_wet = 20
@@ -548,7 +548,7 @@
warmer_drier_result = "Swamp"
cooler_wetter_result = "Swamp"
cooler_drier_result = "Tundra"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "Starter", "CanHaveRiver"
property_green = 50
property_temperate = 50
@@ -592,7 +592,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "Starter", "CanHaveRiver"
property_green = 50
property_mountainous = 30
@@ -640,7 +640,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "Forest"
-native_to = "Land", "Small Land", "Air", "Missile", "Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Air", "Missile",
"Helicopter"
flags = "CanHaveRiver", "NoPollution"
property_foliage = 50
property_tropical = 50
@@ -687,7 +687,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Land", "Small Land", "Air", "Missile", "Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Air", "Missile",
"Helicopter"
flags = "NoCities", "CanHaveRiver"
property_mountainous = 70
color.r = 129
@@ -736,7 +736,7 @@
warmer_drier_result = "Desert"
cooler_wetter_result = "Desert"
cooler_drier_result = "Desert"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "Starter", "CanHaveRiver"
property_green = 50
property_temperate = 50
@@ -781,7 +781,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "Tundra"
cooler_drier_result = "Desert"
-native_to = "Land", "Small Land", "Air", "Missile", "Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Air", "Missile",
"Helicopter"
flags = "CanHaveRiver"
property_wet = 100
property_tropical = 10
@@ -829,7 +829,7 @@
warmer_drier_result = "Swamp"
cooler_wetter_result = "Glacier"
cooler_drier_result = "Desert"
-native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
+native_to = "Land", "Small Land", "Merchant", "Big Land", "Air",
"Missile", "Helicopter"
flags = "NoBarbs", "CanHaveRiver"
property_cold = 50
color.r = 188
@@ -1297,7 +1297,7 @@
}
build_time = 2
removal_time = 0
-native_to = "Land", "Small Land", "Big Land"
+native_to = "Land", "Small Land", "Merchant", "Big Land"
conflicts = "Airstrip", "Airbase"
hidden_by = "Fortress"
flags = "NativeTile", "DiplomatDefense"
@@ -1332,7 +1332,7 @@
}
build_time = 2
removal_time = 0
-native_to = "Land", "Small Land", "Big Land"
+native_to = "Land", "Small Land", "Merchant", "Big Land"
conflicts = "Airstrip", "Airbase"
flags = "NativeTile", "DiplomatDefense"
helptext = _("\
@@ -1502,11 +1502,9 @@
hidden_by = "Railroad", "Maglev"
flags = "NativeTile", "AutoOnCityCenter"
helptext = _("\
-Roads allow your land units to move more quickly, allow wheeled\
+Roads allow your land units to move more quickly, and allow wheeled\
Big Land units such as Chariots and Catapults to travel through\
- otherwise difficult terrain (Mountains, Jungle, and Swamp), and\
- Merchant units (Caravans and Freight) can only travel on roads,\
- railroads, rivers or ships.\
+ otherwise difficult terrain (Mountains, Jungle, and Swamp).\
"), _("\
On some terrains, roads also provide a trade bonus.\
"), _("\
@@ -1613,10 +1611,8 @@
trade to the resources produced by that tile. It also increases a\
tile's defense factor by 25%.\
"), _("\
-Land units may move along rivers for faster travel (but not diagonally),\
- and Merchant units (Caravans and Freight) may require rivers to travel\
- along in the absence of roads. Triremes may also travel up rivers\
- (although later boats cannot).\
+Land units may move along rivers for faster travel (but not diagonally).\
+ Triremes may also travel up rivers (although later boats cannot).\
"), _("\
Roads and railroads can only be built on River tiles if your\
civilization has learned Bridge Building technology. Fortresses and\
Modified: trunk/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=32564&r1=32563&r2=32564&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset (original)
+++ trunk/data/civ2civ3/units.ruleset Tue May 3 22:11:36 2016
@@ -179,7 +179,7 @@
min_speed = 1
hp_loss_pct = 0
flags = "BuildAnywhere", "DoesntOccupyTile",
- "TerrainDefense", "TerrainSpeed", "Airliftable"
+ "ZOC", "TerrainDefense", "TerrainSpeed", "Airliftable"
[unitclass_sea]
; /* TRANS: Unit class: used adjectivally */
@@ -2395,11 +2395,10 @@
A Caravan carries goods or material for trading with other nations,\
or to help build wonders in your own cities.\
"), _("\
-Caravans can only travel on roads, railroads, rivers or ships.\
- (Caravans cannot take advantage of maglevs, but may travel on\
- the railroads that accompany them.)\
-"), _("\
-A Caravan sent to a foreign city (even one owned by an enemy) can\
+Caravans cannot take advantage of maglevs, but may travel on\
+ the railroads that accompany them.\
+"), _("\
+A Caravan sent to a foreign city (one not owned by an enemy) can\
establish a trade route. The route's ongoing revenue is doubled\
if the two cities involved are on different continents. Each city\
can support a maximum of two trade routes.\
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
