[Freeciv-commits] r27398 - in /trunk: data/civ2civ3/effects.ruleset doc/README.ruleset_civ2civ3
Author: sveinung
Date: Wed Dec 24 14:41:30 2014
New Revision: 27398
URL: http://svn.gna.org/viewcvs/freeciv?rev=27398view=rev
Log:
civ2civ3: adjust Federation and Fundamentalism governments
Make Fundamentalism a good government to maximize the production of
gold/money, even in the middle of the game.
Make Federation a good alternative to Democracy in some cases, even at small
maps.
Patch by David Fernandez bardo@gna
See patch #5592
Modified:
trunk/data/civ2civ3/effects.ruleset
trunk/doc/README.ruleset_civ2civ3
Modified: trunk/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=27398r1=27397r2=27398view=diff
==
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Wed Dec 24 14:41:30 2014
@@ -1617,8 +1617,18 @@
Nation, Pirate, Player, FALSE
}
+[effect_lux_federation]
+type= Output_Add_Tile
+value = 1
+reqs=
+{ type, name, range
+ Gov, Federation, Player
+ CityTile, Center, Local
+ OutputType, Luxury, Local
+}
+
[effect_bad_lux_anarchy]
-type= Output_Bonus_2
+type= Output_Bonus
value = -50
reqs=
{ type, name, range
@@ -1627,7 +1637,7 @@
}
[effect_bad_sci_fundamentalism]
-type= Output_Bonus_2
+type= Output_Bonus
value = -50
reqs=
{ type, name, range
Modified: trunk/doc/README.ruleset_civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=27398r1=27397r2=27398view=diff
==
--- trunk/doc/README.ruleset_civ2civ3 (original)
+++ trunk/doc/README.ruleset_civ2civ3 Wed Dec 24 14:41:30 2014
@@ -177,7 +177,7 @@
Empire Size 0/14 /10 /12 /20 /16 /32
/24 /28
Special +NoUpkeep +Veteran +75%Gold +50%Gold +Tithes +Bribe
+Brib/Sub +Subvert +NoUpkeep
-50%Lux (Land/Mil)(Palace) (Palace) -50%Sci -Revolt
-Rev/Sen -Senate (Cost=1)
- -NoTaxes +Fanatic
+Partisan +Partisan
+ -NoTaxes +Fanatic
+Partisan +Luxury +Partisan
Base Corruption 0% 30% 20% 10% 15% 25% 5%
0% 30%
Corrup by Dist * 1111111
00
@@ -200,10 +200,11 @@
- The bonus +1 Trade under Republic and Democracy does not affect oceanic
tiles. This way, oceanic tiles are more even to land tiles under any government.
- Republic receives Revolution_When_Unhappy and has unbribable units,
Federation receives Has_senate and has unincitable cities (Democracy receives
all them).
-- Tribal government increases by half the chance of land units getting the
next veteran level after a battle. They are tribal warriors, maintained with
Shields instead of Gold.
+- Spies built under Communism or Federation will start at the first veteran
level. Federation grants +1 Luxury per city.
- Under Communism you do not pay upkeep for buildings that cost 1 Gold.
Communism cancels the bonus from Mysticism and Theology (to Temples and
Cathedrals).
- Under Fundamentalism you receive extra Gold from Tithes, but -50% to Science.
- The Bonus to production at Palace (under Despotism and Monarchy) switched
from Shields to Gold.
+- Tribal government increases by half the chance of land units getting the
next veteran level after a battle. They are tribal warriors, maintained with
Shields instead of Gold.
TIP: There is some hurry to get Monarchy or Republic (or to build Pyramids),
in order to avoid the initial penalty to output per tile. However, the
Corruption and Waste are evened for all governments, so there are no big
differences, and every government could be used at any technological age. The
choice depends on the role of your civilization.
@@ -458,6 +459,7 @@
- Added Fort and Airstrip bases, as pre-requisite for Fortress and Airbase, in
order to prevent the construction of full bases in one single turn. Airbases
and Fortresses can be built on river tiles again.
- Introduced Maglev, available with Superconductors, that allows unlimited
movement for Land units (except Big Land and Merchant classes).
- Wonders become obsolete by techs researched by the owner (not affected by
the researches of other players).
+- A little boost to Federation (+1 Luxury per city, so it is easier to
celebrate), and Fundamentalism (-50% to science, instead of total science
output halved).
Terrain:
- Readjusted terrain transformations. Designed so all useful alterations can
be finished in 1 or 2 steps, and all effects from Global warming can be
reversibly with terraforming.
[Freeciv-commits] r27399 - in /trunk: data/civ2civ3/terrain.ruleset doc/README.ruleset_civ2civ3
Author: sveinung Date: Wed Dec 24 14:41:50 2014 New Revision: 27399 URL: http://svn.gna.org/viewcvs/freeciv?rev=27399view=rev Log: civ2civ3: simplify ocean/land terrain transformations Patch by David Fernandez bardo@gna See patch #5596 Modified: trunk/data/civ2civ3/terrain.ruleset trunk/doc/README.ruleset_civ2civ3 Modified: trunk/data/civ2civ3/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=27399r1=27398r2=27399view=diff == --- trunk/data/civ2civ3/terrain.ruleset (original) +++ trunk/data/civ2civ3/terrain.ruleset Wed Dec 24 14:41:50 2014 @@ -236,16 +236,16 @@ mining_result= no mining_shield_incr = 0 mining_time = 0 -transform_result = Swamp +transform_result = Grassland transform_time = 36 pillage_time = 1 clean_pollution_time = 3 clean_fallout_time = 3 animal = None warmer_wetter_result = Swamp -warmer_drier_result = Swamp +warmer_drier_result = no cooler_wetter_result = Glacier -cooler_drier_result = Glacier +cooler_drier_result = no native_to= Sea, Air, Missile, Helicopter, Trireme flags= NoCities, NoPollution, FreshWater, NoZoc, NoFortify property_ocean_depth = 0 @@ -279,7 +279,7 @@ mining_result= no mining_shield_incr = 0 mining_time = 0 -transform_result = Swamp +transform_result = Grassland transform_time = 36 pillage_time = 1 clean_pollution_time = 3 @@ -367,7 +367,7 @@ mining_result= yes mining_shield_incr = 1 mining_time = 10 -transform_result = Tundra +transform_result = Lake transform_time = 24 pillage_time = 1 clean_pollution_time = 3 @@ -516,7 +516,7 @@ clean_fallout_time = 3 animal = None warmer_wetter_result = Swamp -warmer_drier_result = Desert +warmer_drier_result = Swamp cooler_wetter_result = Swamp cooler_drier_result = Tundra native_to= Land, Small Land, Big Land, Air, Missile, Helicopter @@ -688,8 +688,8 @@ mining_result= Forest mining_shield_incr = 0 mining_time = 10 -transform_result = Grassland -transform_time = 24 +transform_result = Lake +transform_time = 36 pillage_time = 1 clean_pollution_time = 3 clean_fallout_time = 3 Modified: trunk/doc/README.ruleset_civ2civ3 URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=27399r1=27398r2=27399view=diff == --- trunk/doc/README.ruleset_civ2civ3 (original) +++ trunk/doc/README.ruleset_civ2civ3 Wed Dec 24 14:41:50 2014 @@ -102,18 +102,18 @@ TILE F/P/T IRRIG(t) MINE(t)ROAD MAX1 MAX2 TRANSFORM Deep 1/0/2 NO NO NO 2/0/2 2/1/2 No -Ocean 1/0/2 NO NO NO 2/0/2 2/1/2 Swamp -Lake *2/0/2 NO NO NO 2/0/2 2/0/2 Swamp -Swamp 1/0/0 *+1(5) *NO +0(4) 2/0/0 3/0/0 *Grass -Glacier 0/0/0 NO +1(10) +0(4) 0/1/0 0/1/0 Tundra -Tundra1/0/0 *NO*+1(5) *+1(2) 1/1/1 1/1/1 *Plains -Desert0/1/0 +1(5) +1(5) +1(2) 0/2/1 0/3/1 Plains -Plains1/1/0 +1(5) Forest(10) +1(2) 2/1/1 3/1/1 Grass -Grassland 2/0/0 +1(5) Forest(15) +1(2) 3/0/1 4/0/1 *Lake -Jungle *1/1/0 *Swamp(10) *NO +0(4) 1/1/0 1/1/0 *Forest -Forest1/2/0 Plain(10) *Grass(15) +0(4) 1/2/0 1/3/0 *Hills -Hills*1/1/0 +1(10)*+2(10) +0(4) 1/3/0 1/4/0 Plains -Mountains 0/1/0 NO +1(10) +0(6) 0/2/0 0/3/0 Hills +Ocean 1/0/2 NO NO NO 2/0/2 2/1/2 Grass(36) +Lake *2/0/2 NO NO NO 2/0/2 2/0/2 Grass(36) +Swamp 1/0/0 *+1(5) *NO +0(4) 2/0/0 3/0/0 *Grass(24) +Glacier 0/0/0 NO +1(10) +0(4) 0/1/0 0/1/0 *Lake(24) +Tundra1/0/0 *NO*+1(5) *+1(2) 1/1/1 1/1/1 *Plains(24) +Desert0/1/0 +1(5) +1(5) +1(2) 0/2/1 0/3/1 Plains(24) +Plains1/1/0 +1(5) Forest(10) +1(2) 2/1/1 3/1/1 *Lake(36) +Grassland 2/0/0 +1(5) Forest(15) +1(2) 3/0/1 4/0/1 *Lake(36) +Jungle *1/1/0 *Swamp(10) *NO +0(4) 1/1/0 1/1/0 *Forest(24) +Forest1/2/0 Plain(10) *Grass(15) +0(4) 1/2/0 1/3/0 *Hills(24) +Hills*1/1/0 +1(10)*+2(10) +0(4) 1/3/0 1/4/0 Plains(24) +Mountains 0/1/0 NO +1(10) +0(6) 0/2/0 0/3/0 Hills(36) F/P/T = Food/Production/Trade; (t) = turns MAX1 = irrigated/mined/roaded/harbour; MAX2 = farmland/railroad/offshore. @@ -466,7 +466,7 @@ - Allowed early transformation from Forest to Grassland, so it is possible to transform Grass-Forest-Plain, and also Plain-Forest-Grass, with same working time (25). - Restored Food output of Deep oceans, so Global warming does not affect Oceans that much. Now oceans
[Freeciv-commits] r27400 - in /trunk/client: gui-sdl/menu.c gui-sdl2/menu.c
Author: sveinung
Date: Wed Dec 24 14:45:54 2014
New Revision: 27400
URL: http://svn.gna.org/viewcvs/freeciv?rev=27400view=rev
Log:
SDL clients: Enable the trade route button based on ability to trade
A unit may have the TradeRoute unit flag and not be able to establish a
trade route. Another unit may not have the TradeRoute unit flag and still be
able to establish a trade route. Check for the ability to establish a trade
route in stead of the TradeRoute flag when deciding if the establish trade
route button should be shown or not.
See patch #5599
Modified:
trunk/client/gui-sdl/menu.c
trunk/client/gui-sdl2/menu.c
Modified: trunk/client/gui-sdl/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/menu.c?rev=27400r1=27399r2=27400view=diff
==
--- trunk/client/gui-sdl/menu.c (original)
+++ trunk/client/gui-sdl/menu.c Wed Dec 24 14:45:54 2014
@@ -1140,8 +1140,9 @@
set_wflag(pOrder_Road_Button, WF_HIDDEN);
}
- /* unit_can_est_trade_route_here(pUnit) */
- if (pCity unit_has_type_flag(pUnit, UTYF_TRADE_ROUTE)
+ /* unit_can_est_trade_route_here(pUnit) */
+ if (pCity utype_can_do_action(unit_type(pUnit),
+ ACTION_TRADE_ROUTE)
(pHomecity = game_city_by_number(pUnit-homecity))
can_cities_trade(pHomecity, pCity)) {
int revenue = get_caravan_enter_city_trade_bonus(pHomecity, pCity);
Modified: trunk/client/gui-sdl2/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=27400r1=27399r2=27400view=diff
==
--- trunk/client/gui-sdl2/menu.c(original)
+++ trunk/client/gui-sdl2/menu.cWed Dec 24 14:45:54 2014
@@ -1131,7 +1131,8 @@
}
/* unit_can_est_trade_route_here(pUnit) */
- if (pCity unit_has_type_flag(pUnit, UTYF_TRADE_ROUTE)
+ if (pCity utype_can_do_action(unit_type(pUnit),
+ ACTION_TRADE_ROUTE)
(pHomecity = game_city_by_number(pUnit-homecity))
can_cities_trade(pHomecity, pCity)) {
int revenue = get_caravan_enter_city_trade_bonus(pHomecity, pCity);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27401 - in /trunk/client/gui-sdl2: graphics.c graphics.h sprite.c widget.c widget_icon.c
Author: cazfi
Date: Wed Dec 24 20:59:09 2014
New Revision: 27401
URL: http://svn.gna.org/viewcvs/freeciv?rev=27401view=rev
Log:
Added new create_frame() function for sdl2-client to be used in the future
where putframe()
has been used in sdl-client but cannot be used in sdl2-client.
See patch #5589
Modified:
trunk/client/gui-sdl2/graphics.c
trunk/client/gui-sdl2/graphics.h
trunk/client/gui-sdl2/sprite.c
trunk/client/gui-sdl2/widget.c
trunk/client/gui-sdl2/widget_icon.c
Modified: trunk/client/gui-sdl2/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.c?rev=27401r1=27400r2=27401view=diff
==
--- trunk/client/gui-sdl2/graphics.c(original)
+++ trunk/client/gui-sdl2/graphics.cWed Dec 24 20:59:09 2014
@@ -38,6 +38,7 @@
#include tilespec.h
/* gui-sdl2 */
+#include colors.h
#include gui_tilespec.h
#include mapview.h
#include themebackgrounds.h
@@ -3391,3 +3392,34 @@
{
/* nothing */
}
+
+/**
+ Create colored frame
+**/
+void create_frame(SDL_Surface *dest, Sint16 left, Sint16 top,
+ Sint16 width, Sint16 height,
+ SDL_Color *pcolor)
+{
+ struct color gsdl2_color = { .color = pcolor };
+ struct sprite *vertical = create_sprite(1, height, gsdl2_color);
+ struct sprite *horizontal = create_sprite(width, 1, gsdl2_color);
+ SDL_Rect tmp,dst = { left, top, 0, 0 };
+
+ tmp = dst;
+ alphablit(vertical-psurface, NULL, dest, tmp, 255);
+
+ dst.x += width - 1;
+ tmp = dst;
+ alphablit(vertical-psurface, NULL, dest, tmp, 255);
+
+ dst.x = left;
+ tmp = dst;
+ alphablit(horizontal-psurface, NULL, dest, tmp, 255);
+
+ dst.y += height - 1;
+ tmp = dst;
+ alphablit(horizontal-psurface, NULL, dest, tmp, 255);
+
+ free_sprite(horizontal);
+ free_sprite(vertical);
+}
Modified: trunk/client/gui-sdl2/graphics.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.h?rev=27401r1=27400r2=27401view=diff
==
--- trunk/client/gui-sdl2/graphics.h(original)
+++ trunk/client/gui-sdl2/graphics.hWed Dec 24 20:59:09 2014
@@ -277,6 +277,10 @@
((Uint32) pcolor-b 8) |
((Uint32) pcolor-a));
}
+
+void create_frame(SDL_Surface *dest, Sint16 left, Sint16 top,
+ Sint16 right, Sint16 bottom,
+ SDL_Color *pcolor);
/* SDL */
void init_sdl(int f);
Modified: trunk/client/gui-sdl2/sprite.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/sprite.c?rev=27401r1=27400r2=27401view=diff
==
--- trunk/client/gui-sdl2/sprite.c (original)
+++ trunk/client/gui-sdl2/sprite.c Wed Dec 24 20:59:09 2014
@@ -53,7 +53,7 @@
entire image file, which may later be broken up into individual sprites
with crop_sprite.
/
-struct sprite * load_gfxfile(const char *filename)
+struct sprite *load_gfxfile(const char *filename)
{
SDL_Surface *pNew = NULL;
SDL_Surface *pBuf = NULL;
@@ -123,19 +123,25 @@
struct sprite *create_sprite(int width, int height, struct color *pcolor)
{
SDL_Surface *mypixbuf = NULL;
- /* SDL_Surface *pmask = NULL; */
fc_assert_ret_val(width 0, NULL);
fc_assert_ret_val(height 0, NULL);
fc_assert_ret_val(pcolor != NULL, NULL);
mypixbuf = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32,
- 0x00ff, 0xff00, 0x00ff,
- 0xff00);
-#if 0
- pmask = SDL_DisplayFormatAlpha(mypixbuf);
- SDL_FillRect(mypixbuf, NULL, map_rgba(pmask-format, *pcolor-color));
-#endif /* 0 */
+#if SDL_BYTEORDER != SDL_LIL_ENDIAN
+0xFF00, 0x00FF, 0xFF00, 0x00FF
+#else
+0x00FF, 0xFF00, 0x00FF, 0xFF00
+#endif
+ );
+
+ SDL_FillRect(mypixbuf, NULL,
+ SDL_MapRGBA(mypixbuf-format,
+ pcolor-color-r,
+ pcolor-color-g,
+ pcolor-color-b,
+ 255));
return ctor_sprite(mypixbuf);
}
@@ -164,7 +170,7 @@
/**
Create a sprite struct and fill it with SDL_Surface pointer
**/
-static struct sprite * ctor_sprite(SDL_Surface *pSurface)
+static struct sprite *ctor_sprite(SDL_Surface *pSurface)
{
struct sprite *result = fc_malloc(sizeof(struct sprite));
Modified: trunk/client/gui-sdl2/widget.c
URL:
[Freeciv-commits] r27402 - /trunk/server/ruleset.c
Author: cazfi
Date: Thu Dec 25 02:01:38 2014
New Revision: 27402
URL: http://svn.gna.org/viewcvs/freeciv?rev=27402view=rev
Log:
Read script.lua and default.lua in in right order, so the script.lua has
control over
default.lua.
See bug #23101
Modified:
trunk/server/ruleset.c
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=27402r1=27401r2=27402view=diff
==
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Thu Dec 25 02:01:38 2014
@@ -6601,17 +6601,17 @@
}
if (ok) {
+char **buffer = save_script ? script_buffer : NULL;
+
script_server_free();
script_server_init();
+ok = openload_script_file(script, rsdir, buffer);
+ }
+
+ if (ok) {
ok = openload_script_file(default, rsdir, NULL);
- }
-
- if (ok) {
-char **buffer = save_script ? script_buffer : NULL;
-
-ok = openload_script_file(script, rsdir, buffer);
}
if (ok act) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27403 - /branches/S2_5/server/ruleset.c
Author: cazfi
Date: Thu Dec 25 02:01:45 2014
New Revision: 27403
URL: http://svn.gna.org/viewcvs/freeciv?rev=27403view=rev
Log:
Read script.lua and default.lua in in right order, so the script.lua has
control over
default.lua.
See bug #23101
Modified:
branches/S2_5/server/ruleset.c
Modified: branches/S2_5/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/ruleset.c?rev=27403r1=27402r2=27403view=diff
==
--- branches/S2_5/server/ruleset.c (original)
+++ branches/S2_5/server/ruleset.c Thu Dec 25 02:01:45 2014
@@ -6173,8 +6173,8 @@
script_server_init();
-ok = openload_script_file(default, rsdir)
- openload_script_file(script, rsdir);
+ok = openload_script_file(script, rsdir)
+ openload_script_file(default, rsdir);
}
if (ok) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27404 - /trunk/tools/ruledit/ruledit.cpp
Author: cazfi
Date: Thu Dec 25 03:59:52 2014
New Revision: 27404
URL: http://svn.gna.org/viewcvs/freeciv?rev=27404view=rev
Log:
Added win32 post-crash debugger support for ruledit
See patch #5594
Modified:
trunk/tools/ruledit/ruledit.cpp
Modified: trunk/tools/ruledit/ruledit.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit.cpp?rev=27404r1=27403r2=27404view=diff
==
--- trunk/tools/ruledit/ruledit.cpp (original)
+++ trunk/tools/ruledit/ruledit.cpp Thu Dec 25 03:59:52 2014
@@ -46,6 +46,17 @@
{
enum log_level loglevel = LOG_NORMAL;
int ui_options;
+
+ /* Load win32 post-crash debugger */
+#ifdef WIN32_NATIVE
+# ifndef NDEBUG
+ if (LoadLibrary(exchndl.dll) == NULL) {
+# ifdef DEBUG
+fprintf(stderr, exchndl.dll could not be loaded, no crash debugger\n);
+# endif /* DEBUG */
+ }
+# endif /* NDEBUG */
+#endif /* WIN32_NATIVE */
init_nls();
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27405 - in /trunk/translations: freeciv/pl.po nations/pl.po ruledit/pl.po
Author: cazfi Date: Thu Dec 25 05:45:16 2014 New Revision: 27405 URL: http://svn.gna.org/viewcvs/freeciv?rev=27405view=rev Log: Updated Polish translation by Hubert Kowalewski (hubkow@gna). Pulled from https://www.dropbox.com/sh/71c35xdmxe53y2d/SycNW254Ga. freeciv: 6547 translated messages, 132 fuzzy translations, 26 untranslated messages. nations: 1844 translated messages. ruledit: 27 translated messages, 5 fuzzy translations, 23 untranslated messages. Modified: trunk/translations/freeciv/pl.po trunk/translations/nations/pl.po trunk/translations/ruledit/pl.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/translations/freeciv/pl.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/pl.po?rev=27405r1=27404r2=27405view=diff Modified: trunk/translations/nations/pl.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/pl.po?rev=27405r1=27404r2=27405view=diff Modified: trunk/translations/ruledit/pl.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/pl.po?rev=27405r1=27404r2=27405view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27406 - /trunk/ai/default/advmilitary.c
Author: cazfi
Date: Thu Dec 25 06:30:48 2014
New Revision: 27406
URL: http://svn.gna.org/viewcvs/freeciv?rev=27406view=rev
Log:
AI wonder city may build defenders for itself.
See patch #5588
Modified:
trunk/ai/default/advmilitary.c
Modified: trunk/ai/default/advmilitary.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advmilitary.c?rev=27406r1=27405r2=27406view=diff
==
--- trunk/ai/default/advmilitary.c (original)
+++ trunk/ai/default/advmilitary.c Thu Dec 25 06:30:48 2014
@@ -1406,10 +1406,6 @@
* of small units -- Syela */
/* It has to be AFTER assess_danger thanks to wallvalue. */
our_def = assess_defense_quadratic(ait, pcity);
-
- if (pcity-id == ai-wonder_city city_data-grave_danger == 0) {
-return; /* Other cities can build our defenders, thank you! */
- }
dai_choose_diplomat_defensive(ait, pplayer, pcity, choice, our_def);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27407 - /branches/S2_5/ai/default/advmilitary.c
Author: cazfi
Date: Thu Dec 25 06:30:57 2014
New Revision: 27407
URL: http://svn.gna.org/viewcvs/freeciv?rev=27407view=rev
Log:
AI wonder city may build defenders for itself.
See patch #5588
Modified:
branches/S2_5/ai/default/advmilitary.c
Modified: branches/S2_5/ai/default/advmilitary.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ai/default/advmilitary.c?rev=27407r1=27406r2=27407view=diff
==
--- branches/S2_5/ai/default/advmilitary.c (original)
+++ branches/S2_5/ai/default/advmilitary.c Thu Dec 25 06:30:57 2014
@@ -1403,10 +1403,6 @@
* of small units -- Syela */
/* It has to be AFTER assess_danger thanks to wallvalue. */
our_def = assess_defense_quadratic(ait, pcity);
-
- if (pcity-id == ai-wonder_city city_data-grave_danger == 0) {
-return; /* Other cities can build our defenders, thank you! */
- }
dai_choose_diplomat_defensive(ait, pplayer, pcity, choice, our_def);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
