diff -Nurd -Xfreeciv/diff_ignore freeciv/common/city.c freeciv+rapturedelay/common/city.c --- freeciv/common/city.c Tue May 7 23:07:52 2002 +++ freeciv+rapturedelay/common/city.c Sat May 11 07:52:27 2002 @@ -1035,8 +1035,8 @@ bool city_rapture_grow(struct city *pcity) { struct government *g = get_gov_pcity(pcity); - return (pcity->rapture>0 && pcity->food_surplus>0 && - government_has_flag(g, G_RAPTURE_CITY_GROWTH)); + return (pcity->rapture>0 && pcity->rapture%game.rapturedelay==0 && + pcity->food_surplus>0 && government_has_flag(g, G_RAPTURE_CITY_GROWTH)); } /************************************************************************** diff -Nurd -Xfreeciv/diff_ignore freeciv/common/game.c freeciv+rapturedelay/common/game.c --- freeciv/common/game.c Tue Apr 30 05:52:54 2002 +++ freeciv+rapturedelay/common/game.c Sat May 11 07:52:27 2002 @@ -673,6 +673,7 @@ game.cityfactor = GAME_DEFAULT_CITYFACTOR; game.citymindist = GAME_DEFAULT_CITYMINDIST; game.civilwarsize= GAME_DEFAULT_CIVILWARSIZE; + game.rapturedelay= GAME_DEFAULT_RAPTUREDELAY; game.savepalace = GAME_DEFAULT_SAVEPALACE; game.natural_city_names = GAME_DEFAULT_NATURALCITYNAMES; game.unhappysize = GAME_DEFAULT_UNHAPPYSIZE; diff -Nurd -Xfreeciv/diff_ignore freeciv/common/game.h freeciv+rapturedelay/common/game.h --- freeciv/common/game.h Tue Apr 30 05:52:54 2002 +++ freeciv+rapturedelay/common/game.h Sat May 11 07:52:27 2002 @@ -79,6 +79,7 @@ int cityfactor; int citymindist; int civilwarsize; + int rapturedelay; int min_players, max_players, nplayers; int aifill; int notradesize, fulltradesize; @@ -333,6 +334,10 @@ #define GAME_DEFAULT_CIVILWARSIZE 10 #define GAME_MIN_CIVILWARSIZE 6 #define GAME_MAX_CIVILWARSIZE 1000 + +#define GAME_DEFAULT_RAPTUREDELAY 1 +#define GAME_MIN_RAPTUREDELAY 1 +#define GAME_MAX_RAPTUREDELAY 99 #define GAME_DEFAULT_SAVEPALACE TRUE diff -Nurd -Xfreeciv/diff_ignore freeciv/server/savegame.c freeciv+rapturedelay/server/savegame.c --- freeciv/server/savegame.c Thu Apr 25 07:09:38 2002 +++ freeciv+rapturedelay/server/savegame.c Sat May 11 07:52:27 2002 @@ -1745,6 +1745,9 @@ game.citymindist = secfile_lookup_int_default(file, GAME_DEFAULT_CITYMINDIST, "game.citymindist"); + game.rapturedelay = secfile_lookup_int_default(file, + GAME_DEFAULT_RAPTUREDELAY, "game.rapturedelay"); + if (has_capability("watchtower", savefile_options)) { game.watchtower_extra_vision = secfile_lookup_int(file, "game.watchtower_extra_vision"); @@ -2084,6 +2087,7 @@ secfile_insert_int(file, game.cityfactor, "game.cityfactor"); secfile_insert_int(file, game.citymindist, "game.citymindist"); secfile_insert_int(file, game.civilwarsize, "game.civilwarsize"); + secfile_insert_int(file, game.rapturedelay, "game.rapturedelay"); secfile_insert_int(file, game.diplcost, "game.diplcost"); secfile_insert_int(file, game.freecost, "game.freecost"); secfile_insert_int(file, game.conquercost, "game.conquercost"); diff -Nurd -Xfreeciv/diff_ignore freeciv/server/stdinhand.c freeciv+rapturedelay/server/stdinhand.c --- freeciv/server/stdinhand.c Tue May 7 22:36:40 2002 +++ freeciv+rapturedelay/server/stdinhand.c Sat May 11 09:18:42 2002 @@ -462,7 +462,7 @@ GAME_MIN_CITYFACTOR, GAME_MAX_CITYFACTOR, GAME_DEFAULT_CITYFACTOR) GEN_INT("citymindist", game.citymindist, SSET_RULES, SSET_TO_CLIENT, - N_("Minimum distance between cities (move distance)"), + N_("Minimum move distance between cities"), N_("When a player founds a new city, it is checked if there is " "no other city in citymindist distance. For example, if " "citymindist is 3, there have to be at least two empty " @@ -472,11 +472,14 @@ GAME_MIN_CITYMINDIST, GAME_MAX_CITYMINDIST, GAME_DEFAULT_CITYMINDIST) - GEN_INT("razechance", game.razechance, SSET_RULES, SSET_TO_CLIENT, - N_("Chance for conquered building destruction"), - N_("When a player conquers a city, each City Improvement has this " - "percentage chance to be destroyed."), NULL, - GAME_MIN_RAZECHANCE, GAME_MAX_RAZECHANCE, GAME_DEFAULT_RAZECHANCE) + GEN_INT("rapturedelay", game.rapturedelay, SSET_RULES, SSET_TO_CLIENT, + N_("Number of turns between rapture growth"), + N_("Number of turns between possible growth of a city " + "caused by it being in the state of rapture, " + "in which \"We love the ... day\" is celebrated. " + "Whether the city will actually grow also depends on " + "other conditions, such as available food."), NULL, + GAME_MIN_RAPTUREDELAY, GAME_MAX_RAPTUREDELAY, GAME_DEFAULT_RAPTUREDELAY) GEN_INT("civstyle", game.civstyle, SSET_RULES, SSET_TO_CLIENT, N_("Style of Civ rules"),