Author: sveinung
Date: Wed Dec 24 14:41:50 2014
New Revision: 27399
URL: http://svn.gna.org/viewcvs/freeciv?rev=27399&view=rev
Log:
civ2civ3: simplify ocean/land terrain transformations
Patch by David Fernandez <bardo@gna>
See patch #5596
Modified:
trunk/data/civ2civ3/terrain.ruleset
trunk/doc/README.ruleset_civ2civ3
Modified: trunk/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=27399&r1=27398&r2=27399&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Wed Dec 24 14:41:50 2014
@@ -236,16 +236,16 @@
mining_result = "no"
mining_shield_incr = 0
mining_time = 0
-transform_result = "Swamp"
+transform_result = "Grassland"
transform_time = 36
pillage_time = 1
clean_pollution_time = 3
clean_fallout_time = 3
animal = "None"
warmer_wetter_result = "Swamp"
-warmer_drier_result = "Swamp"
+warmer_drier_result = "no"
cooler_wetter_result = "Glacier"
-cooler_drier_result = "Glacier"
+cooler_drier_result = "no"
native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "NoCities", "NoPollution", "FreshWater", "NoZoc",
"NoFortify"
property_ocean_depth = 0
@@ -279,7 +279,7 @@
mining_result = "no"
mining_shield_incr = 0
mining_time = 0
-transform_result = "Swamp"
+transform_result = "Grassland"
transform_time = 36
pillage_time = 1
clean_pollution_time = 3
@@ -367,7 +367,7 @@
mining_result = "yes"
mining_shield_incr = 1
mining_time = 10
-transform_result = "Tundra"
+transform_result = "Lake"
transform_time = 24
pillage_time = 1
clean_pollution_time = 3
@@ -516,7 +516,7 @@
clean_fallout_time = 3
animal = "None"
warmer_wetter_result = "Swamp"
-warmer_drier_result = "Desert"
+warmer_drier_result = "Swamp"
cooler_wetter_result = "Swamp"
cooler_drier_result = "Tundra"
native_to = "Land", "Small Land", "Big Land", "Air", "Missile",
"Helicopter"
@@ -688,8 +688,8 @@
mining_result = "Forest"
mining_shield_incr = 0
mining_time = 10
-transform_result = "Grassland"
-transform_time = 24
+transform_result = "Lake"
+transform_time = 36
pillage_time = 1
clean_pollution_time = 3
clean_fallout_time = 3
Modified: trunk/doc/README.ruleset_civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=27399&r1=27398&r2=27399&view=diff
==============================================================================
--- trunk/doc/README.ruleset_civ2civ3 (original)
+++ trunk/doc/README.ruleset_civ2civ3 Wed Dec 24 14:41:50 2014
@@ -102,18 +102,18 @@
TILE F/P/T IRRIG(t) MINE(t) ROAD MAX1 MAX2 TRANSFORM
Deep 1/0/2 NO NO NO 2/0/2 2/1/2 No
-Ocean 1/0/2 NO NO NO 2/0/2 2/1/2 Swamp
-Lake *2/0/2 NO NO NO 2/0/2 2/0/2 Swamp
-Swamp 1/0/0 *+1(5) *NO +0(4) 2/0/0 3/0/0 *Grass
-Glacier 0/0/0 NO +1(10) +0(4) 0/1/0 0/1/0 Tundra
-Tundra 1/0/0 *NO *+1(5) *+1(2) 1/1/1 1/1/1 *Plains
-Desert 0/1/0 +1(5) +1(5) +1(2) 0/2/1 0/3/1 Plains
-Plains 1/1/0 +1(5) Forest(10) +1(2) 2/1/1 3/1/1 Grass
-Grassland 2/0/0 +1(5) Forest(15) +1(2) 3/0/1 4/0/1 *Lake
-Jungle *1/1/0 *Swamp(10) *NO +0(4) 1/1/0 1/1/0 *Forest
-Forest 1/2/0 Plain(10) *Grass(15) +0(4) 1/2/0 1/3/0 *Hills
-Hills *1/1/0 +1(10) *+2(10) +0(4) 1/3/0 1/4/0 Plains
-Mountains 0/1/0 NO +1(10) +0(6) 0/2/0 0/3/0 Hills
+Ocean 1/0/2 NO NO NO 2/0/2 2/1/2 Grass(36)
+Lake *2/0/2 NO NO NO 2/0/2 2/0/2 Grass(36)
+Swamp 1/0/0 *+1(5) *NO +0(4) 2/0/0 3/0/0 *Grass(24)
+Glacier 0/0/0 NO +1(10) +0(4) 0/1/0 0/1/0 *Lake(24)
+Tundra 1/0/0 *NO *+1(5) *+1(2) 1/1/1 1/1/1 *Plains(24)
+Desert 0/1/0 +1(5) +1(5) +1(2) 0/2/1 0/3/1 Plains(24)
+Plains 1/1/0 +1(5) Forest(10) +1(2) 2/1/1 3/1/1 *Lake(36)
+Grassland 2/0/0 +1(5) Forest(15) +1(2) 3/0/1 4/0/1 *Lake(36)
+Jungle *1/1/0 *Swamp(10) *NO +0(4) 1/1/0 1/1/0 *Forest(24)
+Forest 1/2/0 Plain(10) *Grass(15) +0(4) 1/2/0 1/3/0 *Hills(24)
+Hills *1/1/0 +1(10) *+2(10) +0(4) 1/3/0 1/4/0 Plains(24)
+Mountains 0/1/0 NO +1(10) +0(6) 0/2/0 0/3/0 Hills(36)
F/P/T = Food/Production/Trade; (t) = turns
MAX1 = irrigated/mined/roaded/harbour; MAX2 = farmland/railroad/offshore.
@@ -466,7 +466,7 @@
- Allowed early transformation from Forest to Grassland, so it is possible to
transform Grass->Forest->Plain, and also Plain->Forest->Grass, with same
working time (25).
- Restored Food output of Deep oceans, so Global warming does not affect
Oceans that much. Now oceans transformed to deep ocean would only lose their
specials.
- Harbors and Offshore Platform can be built adjacent to any oceanic tile
again (same as classic rules), so Global warming does not affect them.
-- Reduced irrigation times in Swamps and Jungles. They represent the drainage
of wetlands.
+- Reduced irrigation times in Swamps. They represent the drainage of wetlands.
- Re-enabled terraforming from Mountains to Hills, and from Grassland to Lake.
It is still possible to transform any terrain to Hills by changing them to
Forest first.
- Deep ocean tiles must be mined in order to take advantage of the shield
bonus from Offshore Platforms (buoys are no longer needed).
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
