Re: [Freeciv-Dev] hydro locations?

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

I wrote:
> 
> In Civ1, you can build a Hydro Plant (or Hoover) in a city which is
> next to a river, or next to mountains.  In freeciv, the condition
> is next to a river, or next to ocean.  
> 
> Could this be deliberate (eg, Civ2?) or should this be fixed?
> 
> (Hmm, I noticed this isn't covered in the help text.)

The attached patch makes the change and adds some help text.
Any objections?

-- David

diff -u -r --exclude-from exclude freeciv-cvs/common/city.c 
freeciv-mod/common/city.c
--- freeciv-cvs/common/city.c   Sun Oct 25 14:59:47 1998
+++ freeciv-mod/common/city.c   Sun Nov  1 12:12:17 1998
@@ -548,7 +548,9 @@
     return 0;
   if ((id==B_HARBOUR || id==B_COASTAL || id == B_OFFSHORE || id == B_PORT) && 
!is_terrain_near_tile(pcity->x, pcity->y, T_OCEAN))
     return 0;
-  if ((id == B_HYDRO || id == B_HOOVER) && (!is_terrain_near_tile(pcity->x, 
pcity->y, T_OCEAN) && !is_terrain_near_tile(pcity->x, pcity->y, T_RIVER)))
+  if ((id == B_HYDRO || id == B_HOOVER)
+      && !is_terrain_near_tile(pcity->x, pcity->y, T_MOUNTAINS)
+      && !is_terrain_near_tile(pcity->x, pcity->y, T_RIVER))
     return 0;
   if(improvement_obsolete(p, id)) return 0;
   if (is_wonder(id) && game.global_wonders[id])
diff -u -r --exclude-from exclude freeciv-cvs/data/helpdata.txt 
freeciv-mod/data/helpdata.txt
--- freeciv-cvs/data/helpdata.txt       Sun Oct 25 13:27:04 1998
+++ freeciv-mod/data/helpdata.txt       Sun Nov  1 12:08:48 1998
@@ -611,6 +611,8 @@
 city by 50%.
 A city can only have one Hydro Plant, or a Power Plant, or a 
 Nuclear Plant.
+A city can only build a Hydro Plant if it is next to (or on) a 
+Mountains or River tile.
 ---
 # Library
 Increases the knowledge production in a city by 50%
@@ -932,6 +934,8 @@
 # Hoover Dam
 Works as if you had a Hydro Plant in every city.  (This boosts
 production by 50% and halves pollution on all city squares).
+Like a Hydro Plant, the Hoover Dam can only build in a city which
+is next to (or on) a Mountains or River tile.
 ---
 # Isaac Newton's College
 Boosts science output by 100% in the city it is in.