Author: cazfi
Date: Mon Jan 25 15:24:02 2016
New Revision: 31590

URL: http://svn.gna.org/viewcvs/freeciv?rev=31590&view=rev
Log:
Added Oil Platform extra to civ2civ3 ruleset. Mines are available on all land 
tiles,
and Oil Wells now act as an upgrade to them on certain terrains.

Patch by David Fernandez <bardo>

See patch #5915

Modified:
    branches/S2_6/data/civ2civ3/README.civ2civ3
    branches/S2_6/data/civ2civ3/effects.ruleset
    branches/S2_6/data/civ2civ3/techs.ruleset
    branches/S2_6/data/civ2civ3/terrain.ruleset

Modified: branches/S2_6/data/civ2civ3/README.civ2civ3
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/README.civ2civ3?rev=31590&r1=31589&r2=31590&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/README.civ2civ3 (original)
+++ branches/S2_6/data/civ2civ3/README.civ2civ3 Mon Jan 25 15:24:02 2016
@@ -200,12 +200,15 @@
   obtained by irrigating the Swamp.
 
 - Hills receive 1 Shield for free, and +2 from mines, same as civ3,
-  (was 0 and +3).
+  (was 0 and +3). Mountains receive +2 Shields from mines too (was +1).
 
 - Mountains give extra vision range. Cities can not be placed over
   Mountains. Land units starting the turn on unroaded Mountains receive a -1
   penalty to movement (this way it is not so good for cavalry to end the
   turn on Mountains).
+
+- The discovery of Refining allows to upgrade the mines placed on
+  Deserts and Glaciers to Oil Wells (+2 Shields).
 
 - Lake tiles receive for free +1 Food (2/0/2), while Harbours and
   Offshore Platforms do not affect them. Lakes do not enable wonders
@@ -227,20 +230,20 @@
 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  Grass(36)
-Lake     *2/0/2  NO         NO         NO     2/0/2  2/0/2  Grass(36)
+Lake     *2/0/2  NO         NO         NO     2/0/2  2/1/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)
+Glacier   0/0/0  NO         +1(10)     +0(4)  0/1/0  0/3/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)
+Desert    0/1/0  +1(5)      +1(5)      +1(2)  0/2/1  0/4/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)
+Mountains 0/1/0  NO        *+2(10)     +0(6)  0/3/0  0/4/0  Hills(36)
 
 F/P/T = Food/Production/Trade; (t) = turns
-MAX1 = irrigated/mined/roaded/harbour; MAX2 = farmland/railroad/offshore.
+MAX1 = irrigated/mined/roaded/harbour; MAX2 = farmland/railroad/oil well.
 * = Changes compared to classic ruleset. Most affected are Jungles,
     Swamps and Tundras.
 
@@ -920,6 +923,9 @@
   Lake.
   It is still possible to transform any terrain to Hills by changing
   them to Forest first.
+- Mountains receive +2 Shields from mines, same than Hills. The tech
+  Refining allows to upgrade the mines placed on Deserts and Glaciers
+  to Oil Wells (+2 Shields).
 - Deep ocean tiles must be mined in order to take advantage of the
   shield bonus from Offshore Platforms (buoys are no longer needed).
 - Readjusted transformations caused by global warming and nuclear

Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=31590&r1=31589&r2=31590&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Mon Jan 25 15:24:02 2016
@@ -2362,20 +2362,20 @@
 value   = 1
 reqs    =
     { "type", "name", "range"
-      "Terrain", "Ocean", "Local"
+      "TerrainClass", "Oceanic", "Local"
       "Building", "Offshore Platform", "City"
       "OutputType", "Shield", "Local"
     }
 
 [effect_offshore_platform_1]
 type    = "Output_Add_Tile"
-value   = 1
-reqs    =
-    { "type", "name", "range"
-      "Terrain", "Deep Ocean", "Local"
-      "Building", "Offshore Platform", "City"
-      "Extra", "Oil Well", "Local"
-      "OutputType", "Shield", "Local"
+value   = -1
+reqs    =
+    { "type", "name", "range", "present"
+      "Terrain", "Deep Ocean", "Local", TRUE
+      "Building", "Offshore Platform", "City", TRUE
+      "Extra", "Oil Platform", "Local", FALSE
+      "OutputType", "Shield", "Local", TRUE
     }
 
 [effect_offshore_platform_2]
@@ -2874,42 +2874,6 @@
       "Building", "Super Highways", "City"
     }
 
-[effect_mine]
-type    = "Mining_Pct"
-value   = 100
-reqs    =
-    { "type", "name", "range"
-      "Extra", "Mine", "Local"
-    }
-
-[effect_oil_well]
-type    = "Mining_Pct"
-value   = 100
-reqs    =
-    { "type", "name", "range"
-      "Extra", "Oil Well", "Local"
-    }
-
-[effect_irrigation]
-type    = "Irrigation_Pct"
-value   = 100
-reqs    =
-    { "type", "name", "range", "present"
-      "Extra", "Irrigation", "Local", TRUE
-      "CityTile", "Center", "Local", FALSE
-    }
-
-[effect_irrigation_2]
-type    = "Irrigation_Pct"
-value  = 100
-reqs   =
-    { "type", "name", "range", "present"
-      "CityTile", "Center", "Local", TRUE
-      "TerrainAlter", "CanIrrigate", "Local", TRUE
-      "Extra", "Mine", "Local", FALSE
-      "Extra", "Oil Well", "Local", FALSE
-    }
-
 [effect_supermarket]
 type    = "Output_Per_Tile"
 value   = 50
@@ -3614,6 +3578,91 @@
       "MinYear", "1900", "World"
     }
 
+; No base pop pollution; buildings will increase it
+[effect_pollu_pop]
+type    = "Pollu_Pop_Pct"
+value   = -100
+
+; tech_upkeep_divider = 6000, Max tech upkeep = 13
+[effect_upkeep_tech_base]
+type    = "Tech_Upkeep_Free"
+value   = 3
+
+[effect_tech_cost_base]
+type    = "Tech_Cost_Factor"
+value   = 3
+
+; Cities can always work tiles
+[effect_tile_workable]
+type    = "Tile_Workable"
+value   = 1
+reqs    =
+    { "type", "name", "range", "present"
+      "Terrain", "Inaccessible", "Local", FALSE
+    }
+
+; each city has at least one slot to build units
+[effect_city_build_slots_basic]
+type    = "City_Build_Slots"
+value   = 1
+reqs   =
+    { "type", "name", "range", "present"
+      "Building", "Mfg. Plant", "City", FALSE
+    }
+
+; Mfg. Plant => 2 slots total
+[effect_city_build_slots_mfg_plant]
+type    = "City_Build_Slots"
+value   = 2
+reqs    =
+    { "type", "name", "range"
+      "Building", "Mfg. Plant", "City"
+    }
+
+; free granary, etc, runs out
+[effect_city_image_1]
+type    = "City_Image"
+value   = 1
+reqs    =
+    { "type", "name", "range"
+      "MinSize", "5", "City"
+    }
+
+; needs Aqueduct
+[effect_city_image_2]
+type    = "City_Image"
+value   = 1
+reqs    =
+    { "type", "name", "range"
+      "MinSize", "9", "City"
+    }
+
+[effect_city_image_3]
+type    = "City_Image"
+value   = 1
+reqs    =
+    { "type", "name", "range"
+      "MinSize", "13", "City"
+    }
+
+; needs Sewer System
+[effect_city_image_4]
+type    = "City_Image"
+value   = 1
+reqs    =
+    { "type", "name", "range"
+      "MinSize", "17", "City"
+    }
+
+[effect_city_shield]
+type    = "Output_Add_Tile"
+value   = 1
+reqs    =
+    { "type", "name", "range"
+      "CityTile", "Center", "Local"
+      "OutputType", "Shield", "Local"
+    }
+
 [effect_river_food_desert]
 type    = "Output_Inc_Tile"
 value   = 1
@@ -3625,89 +3674,41 @@
       "Resource", "Oasis", "Local", FALSE
     }
 
-[effect_city_shield]
-type    = "Output_Add_Tile"
-value   = 1
-reqs    =
-    { "type", "name", "range"
-      "CityTile", "Center", "Local"
+[effect_oil_well]
+type    = "Output_Inc_Tile"
+value   = 1
+reqs    =
+    { "type", "name", "range"
+      "Extra", "Oil Well", "Local"
       "OutputType", "Shield", "Local"
     }
 
-; No base pop pollution; buildings will increase it
-[effect_pollu_pop]
-type    = "Pollu_Pop_Pct"
-value   = -100
-
-; tech_upkeep_divider = 6000, Max tech upkeep = 13
-[effect_upkeep_tech_base]
-type    = "Tech_Upkeep_Free"
-value   = 3
-
-[effect_tech_cost_base]
-type    = "Tech_Cost_Factor"
-value   = 3
-
-; Cities can always work tiles
-[effect_tile_workable]
-type    = "Tile_Workable"
-value   = 1
-reqs    =
-    { "type", "name", "range", "present"
-      "Terrain", "Inaccessible", "Local", FALSE
-    }
-
-; each city has at least one slot to build units
-[effect_city_build_slots_basic]
-type    = "City_Build_Slots"
-value   = 1
-reqs   =
-    { "type", "name", "range", "present"
-      "Building", "Mfg. Plant", "City", FALSE
-    }
-
-; Mfg. Plant => 2 slots total
-[effect_city_build_slots_mfg_plant]
-type    = "City_Build_Slots"
-value   = 2
-reqs    =
-    { "type", "name", "range"
-      "Building", "Mfg. Plant", "City"
-    }
-
-; free granary, etc, runs out
-[effect_city_image_1]
-type    = "City_Image"
-value   = 1
-reqs    =
-    { "type", "name", "range"
-      "MinSize", "5", "City"
-    }
-
-; needs Aqueduct
-[effect_city_image_2]
-type    = "City_Image"
-value   = 1
-reqs    =
-    { "type", "name", "range"
-      "MinSize", "9", "City"
-    }
-
-[effect_city_image_3]
-type    = "City_Image"
-value   = 1
-reqs    =
-    { "type", "name", "range"
-      "MinSize", "13", "City"
-    }
-
-; needs Sewer System
-[effect_city_image_4]
-type    = "City_Image"
-value   = 1
-reqs    =
-    { "type", "name", "range"
-      "MinSize", "17", "City"
+[effect_mine]
+type    = "Mining_Pct"
+value   = 100
+reqs    =
+    { "type", "name", "range"
+      "Extra", "Mine", "Local"
+    }
+
+[effect_irrigation]
+type    = "Irrigation_Pct"
+value   = 100
+reqs    =
+    { "type", "name", "range", "present"
+      "Extra", "Irrigation", "Local", TRUE
+      "CityTile", "Center", "Local", FALSE
+    }
+
+[effect_irrigation_2]
+type    = "Irrigation_Pct"
+value  = 100
+reqs   =
+    { "type", "name", "range", "present"
+      "CityTile", "Center", "Local", TRUE
+      "TerrainAlter", "CanIrrigate", "Local", TRUE
+      "Extra", "Mine", "Local", FALSE
+      "Extra", "Oil Well", "Local", FALSE
     }
 
 ; "Sea" nreq is for Transports, which are only supposed to clean pollution

Modified: branches/S2_6/data/civ2civ3/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/techs.ruleset?rev=31590&r1=31589&r2=31590&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/techs.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/techs.ruleset   Mon Jan 25 15:24:02 2016
@@ -544,6 +544,10 @@
 flags    = ""
 graphic     = "a.miniaturization"
 graphic_alt = "-"
+helptext = _("\
+Allows Settlers, Migrants, Workers, Engineers and Transports to build \
+mines on deep ocean, required to get the bonus from Offshore Platforms.\
+")
 cost     = 480
 
 [advance_mobile_warfare]
@@ -705,6 +709,10 @@
 flags    = ""
 graphic     = "a.refining"
 graphic_alt = "-"
+helptext = _("\
+Allows Settlers, Migrants, Workers and Engineers to upgrade \
+mines to oil wells on desert and glacier.\
+")
 cost     = 400
 
 [advance_refrigeration]
@@ -714,11 +722,11 @@
 flags    = ""
 graphic     = "a.refrigeration"
 graphic_alt = "-"
-cost     = 350
 helptext = _("\
 Allows Settlers, Migrants, Workers and Engineers to upgrade \
 irrigation systems to farmland.\
 ")
+cost     = 350
 
 [advance_robotics]
 name     = _("Robotics")

Modified: branches/S2_6/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/terrain.ruleset?rev=31590&r1=31589&r2=31590&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_6/data/civ2civ3/terrain.ruleset Mon Jan 25 15:24:02 2016
@@ -21,7 +21,7 @@
 ; helptxt       = displayed in the help for terrains with this flag (optional)
 flags =
   { "name", "helptxt"
-    _("Oil"), _("Has Oil Well instead of Mine.")
+    _("Oil"), _("Mine can be upgraded to Oil Well.")
     _("NoPollution"), _("No Pollution nor Fallout appear here.")
   }
 
@@ -335,7 +335,7 @@
 cooler_wetter_result = "no"
 cooler_drier_result  = "no"
 native_to            = "Sea", "Air", "Missile", "Helicopter"
-flags                = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", 
"Oil", "NoFortify"
+flags                = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", 
"NoFortify"
 property_ocean_depth = 87
 color.r              = 0
 color.g              = 33
@@ -647,7 +647,7 @@
 irrigation_food_incr = 0
 irrigation_time      = 0
 mining_result        = "yes"
-mining_shield_incr   = 1
+mining_shield_incr   = 2
 mining_time          = 10
 transform_result     = "Hills"
 transform_time       = 36
@@ -802,7 +802,7 @@
 cooler_wetter_result = "Glacier"
 cooler_drier_result  = "Desert"
 native_to            = "Land", "Small Land", "Big Land", "Air", "Missile", 
"Helicopter"
-flags                = "NoBarbs", "CanHaveRiver", "Oil"
+flags                = "NoBarbs", "CanHaveRiver"
 property_cold        = 50
 color.r              = 188
 color.g              = 188
@@ -1131,12 +1131,13 @@
 rmact_gfx_alt  = "-"
 reqs           =
     { "type", "name", "range", "present"
-      "TerrainFlag", "Oil", "Local", FALSE
+      "TerrainClass", "Oceanic", "Local", FALSE
       "UnitClass", "Sea", "Local", FALSE
     }
 build_time     = 0
 removal_time   = 0
 conflicts      = "Irrigation", "Farmland"
+hidden_by      = "Oil Well"
 
 [extra_oil_well]
 name           = _("Oil Well")
@@ -1150,12 +1151,33 @@
 rmact_gfx      = "None"
 rmact_gfx_alt  = "-"
 reqs           =
-    { "type", "name", "range"
-      "TerrainFlag", "Oil", "Local"
+    { "type", "name", "range", "present"
+      "Tech", "Refining", "Player", TRUE
+      "TerrainFlag", "Oil", "Local", TRUE
+      "Extra", "Mine", "Local", TRUE
+      "UnitClass", "Sea", "Local", FALSE
     }
 build_time     = 0
 removal_time   = 0
 conflicts      = "Irrigation", "Farmland"
+
+[extra_oil_platform]
+name           = _("Oil Platform")
+category       = "Infra"
+causes         = "Mine"
+rmcauses       = "Pillage"
+graphic        = "tx.oil_mine"
+graphic_alt    = "tx.mine"
+activity_gfx   = "unit.oil_mine"
+act_gfx_alt    = "unit.plant"
+rmact_gfx      = "None"
+rmact_gfx_alt  = "-"
+reqs           =
+    { "type", "name", "range"
+      "TerrainClass", "Oceanic", "Local"
+    }
+build_time     = 0
+removal_time   = 0
 
 [extra_pollution]
 name           = _("Pollution")


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

Reply via email to