Author: cazfi Date: Thu Aug 4 19:43:06 2016 New Revision: 33458 URL: http://svn.gna.org/viewcvs/freeciv?rev=33458&view=rev Log: Changed AI not to want move caravans toward cities of other players only because they could help building wonder there.
See bug #24662 Modified: branches/S2_5/common/aicore/caravan.c Modified: branches/S2_5/common/aicore/caravan.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/aicore/caravan.c?rev=33458&r1=33457&r2=33458&view=diff ============================================================================== --- branches/S2_5/common/aicore/caravan.c (original) +++ branches/S2_5/common/aicore/caravan.c Thu Aug 4 19:43:06 2016 @@ -422,7 +422,7 @@ double discount = parameter->discount; struct player *pplayer_src = city_owner(src); struct player *pplayer_dest = city_owner(dest); - + /* if no foreign trade is allowed, just quit. */ if (!parameter->allow_foreign_trade && pplayer_src != pplayer_dest) { caravan_result_init_zero(result); @@ -436,13 +436,17 @@ return; } } - + trade = trade_benefit(pplayer_src, src, dest, parameter); windfall = windfall_benefit(src, dest, parameter); - wonder = wonder_benefit(caravan, arrival_time, dest, parameter); - /* we want to aid for wonder building */ - wonder *= 2; - + if (pplayer_src == pplayer_dest) { + wonder = wonder_benefit(caravan, arrival_time, dest, parameter); + /* we want to aid for wonder building */ + wonder *= 2; + } else { + wonder = 0; + } + if (parameter->horizon == FC_INFINITY) { trade = perpetuity(trade, discount); } else { @@ -452,7 +456,7 @@ windfall = presentvalue(windfall, arrival_time, discount); wonder = presentvalue(wonder, arrival_time, discount); - if(trade + windfall >= wonder) { + if (trade + windfall >= wonder) { result->value = trade + windfall; result->help_wonder = FALSE; } else { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits