[Freeciv-Dev] Civ2 quickies - patches

[Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx>]

Hi!

I had a look a new roadmap and it lists (amongst others)
Civ 2 Matters:

-  In Civ2, there is "Waste"

If waste is the same thing as the corruption, but applied to
shield production, waste_diff is a patch that does it.

-  In the Demographics report, Civ2 shows who is
   first & their amount, if have embassy with
   them.

dem_diff is a patch that does this. It might be nice to test it
a bit more.


-  In Civ2: Fighters don't cause unhappiness. 
   Other air units always cause unhappiness
   (even when in city).

This should do it:

--- freeciv/server/cityturn.c   Fri Oct  8 12:45:45 1999
+++ freeciv-b/server/cityturn.c Thu Oct 28 16:23:18 1999
@@ -400,13 +404,18 @@
 under a Republic or Democracy.
 A unit is *not* aggressive if one or more of following is true:
 - zero attack strength
-- inside a city
+- inside a city, except for non-fighter air units in Civ2
 - inside a fortress within 3 squares of a friendly city (new)
+- fighters in Civ2,
 **************************************************************************/
 int unit_being_aggressive(struct unit *punit)
 {
   if (get_unit_type(punit->type)->attack_strength==0)
     return 0;
+  if (game.civstyle == 2 && unit_flag(punit->type,F_FIGHTER))
+    return 0;
+  if (game.civstyle == 2 && is_air_unit(punit))
+    return 1;
   if (map_get_city(punit->x,punit->y))
     return 0;
   if (map_get_special(punit->x,punit->y)&S_FORTRESS) {





-  Civ2 will provide a Food for you (in the city
   square) if you build a city on a Mountain.  Civ1
   does not.

If so, this should do it:

--- freeciv/common/city.c       Sun Oct 24 18:00:17 1999
+++ freeciv-b/common/city.c     Thu Oct 28 17:40:40 1999
@@ -695,6 +695,9 @@
   if (spec_t & S_POLLUTION)
     f-=(f*terrain_control.pollution_food_penalty)/100; /* The food here is 
yucky */
 
+  if( game.civstyle == 2 && tile_t == T_MOUNTAINS && x==2 && y==2 )
+    f++;
+
   return f;
 }
 

/Jerzy

Q: What about checking in the "special near rivers" thing?

dem_diff
Description: dem_diff

waste_diff
Description: waste_diff