Author: cazfi
Date: Sun May 14 01:18:14 2017
New Revision: 35569
URL: http://svn.gna.org/viewcvs/freeciv?rev=35569&view=rev
Log:
Remove hard limitation that AI wonder cities never build settlers
See hrm Bug #660089
Modified:
branches/S2_6/ai/default/daidomestic.c
Modified: branches/S2_6/ai/default/daidomestic.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daidomestic.c?rev=35569&r1=35568&r2=35569&view=diff
==============================================================================
--- branches/S2_6/ai/default/daidomestic.c (original)
+++ branches/S2_6/ai/default/daidomestic.c Sun May 14 01:18:14 2017
@@ -460,11 +460,14 @@
settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
if (adv->wonder_city == pcity->id) {
- settler_want /= 5;
+ if (!settler_type || settler_type->pop_cost > 0) {
+ settler_want /= 5;
+ } else {
+ settler_want /= 2;
+ }
}
if (settler_type
- && (pcity->id != adv->wonder_city || settler_type->pop_cost == 0)
&& pcity->surplus[O_FOOD] > utype_upkeep_cost(settler_type,
pplayer, O_FOOD)) {
if (settler_want > 0) {
@@ -489,7 +492,11 @@
founder_want = city_data->founder_want;
if (adv->wonder_city == pcity->id) {
- founder_want /= 5;
+ if (founder_type->pop_cost > 0) {
+ founder_want /= 5;
+ } else {
+ founder_want /= 2;
+ }
}
if (adv->max_num_cities <= city_list_size(pplayer->cities)) {
@@ -501,8 +508,6 @@
/ TRAIT_DEFAULT_VALUE;
if (founder_type
- && (pcity->id != adv->wonder_city
- || founder_type->pop_cost == 0)
&& pcity->surplus[O_FOOD] >= utype_upkeep_cost(founder_type,
pplayer, O_FOOD)) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
