[Freeciv-commits] r35700 - /trunk/ai/default/aicity.c
Author: cazfi
Date: Wed May 24 07:31:34 2017
New Revision: 35700
URL: http://svn.gna.org/viewcvs/freeciv?rev=35700=rev
Log:
Make AI less likely to stop building wonder
See hrm Feature #662556
Modified:
trunk/ai/default/aicity.c
Modified: trunk/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=35700=35699=35700=diff
==
--- trunk/ai/default/aicity.c (original)
+++ trunk/ai/default/aicity.c Wed May 24 07:31:34 2017
@@ -1880,6 +1880,13 @@
/* Not only would we get the wonder, but we would also prevent
* opponents from getting it. */
pcity->server.adv->building_want[idx] *= 1.5;
+
+if (pcity->production.kind == VUT_IMPROVEMENT
+&& is_great_wonder(pcity->production.value.building)) {
+ /* If we already are building a great wonder, prefer continuing
+ * to do so over stopping it */
+ pcity->server.adv->building_want[idx] *= 1.25;
+}
}
/* If I am not an expansionist, I want buildings more than units */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r35702 - /branches/S2_6/ai/default/aicity.c
Author: cazfi
Date: Wed May 24 07:31:48 2017
New Revision: 35702
URL: http://svn.gna.org/viewcvs/freeciv?rev=35702=rev
Log:
Make AI less likely to stop building wonder
See hrm Feature #662556
Modified:
branches/S2_6/ai/default/aicity.c
Modified: branches/S2_6/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aicity.c?rev=35702=35701=35702=diff
==
--- branches/S2_6/ai/default/aicity.c (original)
+++ branches/S2_6/ai/default/aicity.c Wed May 24 07:31:48 2017
@@ -1765,6 +1765,13 @@
/* Not only would we get the wonder, but we would also prevent
* opponents from getting it. */
pcity->server.adv->building_want[idx] *= 1.5;
+
+if (pcity->production.kind == VUT_IMPROVEMENT
+&& is_great_wonder(pcity->production.value.building)) {
+ /* If we already are building a great wonder, prefer continuing
+ * to do so over stopping it */
+ pcity->server.adv->building_want[idx] *= 1.25;
+}
}
/* If I am not an expansionist, I want buildings more than units */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r35701 - /branches/S3_0/ai/default/aicity.c
Author: cazfi
Date: Wed May 24 07:31:41 2017
New Revision: 35701
URL: http://svn.gna.org/viewcvs/freeciv?rev=35701=rev
Log:
Make AI less likely to stop building wonder
See hrm Feature #662556
Modified:
branches/S3_0/ai/default/aicity.c
Modified: branches/S3_0/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/aicity.c?rev=35701=35700=35701=diff
==
--- branches/S3_0/ai/default/aicity.c (original)
+++ branches/S3_0/ai/default/aicity.c Wed May 24 07:31:41 2017
@@ -1880,6 +1880,13 @@
/* Not only would we get the wonder, but we would also prevent
* opponents from getting it. */
pcity->server.adv->building_want[idx] *= 1.5;
+
+if (pcity->production.kind == VUT_IMPROVEMENT
+&& is_great_wonder(pcity->production.value.building)) {
+ /* If we already are building a great wonder, prefer continuing
+ * to do so over stopping it */
+ pcity->server.adv->building_want[idx] *= 1.25;
+}
}
/* If I am not an expansionist, I want buildings more than units */
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r35699 - in /trunk: data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ data/experimental/ data/multiplayer/ data...
Author: cazfi Date: Tue May 23 19:11:08 2017 New Revision: 35699 URL: http://svn.gna.org/viewcvs/freeciv?rev=35699=rev Log: Add 'parser.lua' to rulesets See hrm Feature #661644 Added: trunk/data/alien/parser.lua trunk/data/civ1/parser.lua trunk/data/civ2/parser.lua trunk/data/civ2civ3/parser.lua trunk/data/classic/parser.lua trunk/data/experimental/parser.lua trunk/data/multiplayer/parser.lua trunk/data/sandbox/parser.lua trunk/data/stub/parser.lua trunk/data/webperimental/parser.lua Modified: trunk/data/alien/Makefile.am trunk/data/civ1/Makefile.am trunk/data/civ2/Makefile.am trunk/data/civ2civ3/Makefile.am trunk/data/classic/Makefile.am trunk/data/multiplayer/Makefile.am trunk/data/sandbox/Makefile.am trunk/server/ruleset.c trunk/server/ruleset.h trunk/tools/ruleutil/rulesave.c Modified: trunk/data/alien/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/Makefile.am?rev=35699=35698=35699=diff == --- trunk/data/alien/Makefile.am(original) +++ trunk/data/alien/Makefile.amTue May 23 19:11:08 2017 @@ -9,6 +9,7 @@ effects.ruleset \ nation_effects.ruleset \ script.lua \ + parser.lua \ styles.ruleset \ game.ruleset\ governments.ruleset \ Added: trunk/data/alien/parser.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/parser.lua?rev=35699=auto == --- trunk/data/alien/parser.lua (added) +++ trunk/data/alien/parser.lua Tue May 23 19:11:08 2017 @@ -0,0 +1,13 @@ +-- Freeciv - Copyright (C) 2007 - The Freeciv Project +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2, or (at your option) +-- any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. + +-- This file is for lua-functionality for parsing luadata.txt +-- of this ruleset. Modified: trunk/data/civ1/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/Makefile.am?rev=35699=35698=35699=diff == --- trunk/data/civ1/Makefile.am (original) +++ trunk/data/civ1/Makefile.am Tue May 23 19:11:08 2017 @@ -8,6 +8,7 @@ cities.ruleset \ effects.ruleset \ script.lua \ + parser.lua \ styles.ruleset \ game.ruleset\ governments.ruleset \ Added: trunk/data/civ1/parser.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/parser.lua?rev=35699=auto == --- trunk/data/civ1/parser.lua (added) +++ trunk/data/civ1/parser.lua Tue May 23 19:11:08 2017 @@ -0,0 +1,13 @@ +-- Freeciv - Copyright (C) 2007 - The Freeciv Project +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2, or (at your option) +-- any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. + +-- This file is for lua-functionality for parsing luadata.txt +-- of this ruleset. Modified: trunk/data/civ2/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/Makefile.am?rev=35699=35698=35699=diff == --- trunk/data/civ2/Makefile.am (original) +++ trunk/data/civ2/Makefile.am Tue May 23 19:11:08 2017 @@ -8,6 +8,7 @@ cities.ruleset \ effects.ruleset \ script.lua \ + parser.lua \ styles.ruleset \ game.ruleset\ governments.ruleset \ Added: trunk/data/civ2/parser.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/parser.lua?rev=35699=auto == --- trunk/data/civ2/parser.lua (added) +++ trunk/data/civ2/parser.lua Tue May 23 19:11:08 2017 @@ -0,0 +1,13 @@ +-- Freeciv - Copyright (C) 2007 - The Freeciv Project +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2, or (at
[Freeciv-commits] r35698 - in /trunk: common/fc_types.h fc_version
Author: cazfi Date: Tue May 23 18:43:56 2017 New Revision: 35698 URL: http://svn.gna.org/viewcvs/freeciv?rev=35698=rev Log: Increase max number of regular players to 250 Requested by Andreas Røsdal See hrm Feature #654973 Modified: trunk/common/fc_types.h trunk/fc_version Modified: trunk/common/fc_types.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=35698=35697=35698=diff == --- trunk/common/fc_types.h (original) +++ trunk/common/fc_types.h Tue May 23 18:43:56 2017 @@ -29,10 +29,10 @@ * Nothing in this file should require anything else from the common/ * directory! */ -#define MAX_NUM_PLAYER_SLOTS 160 /* Used in the network protocol. */ +#define MAX_NUM_PLAYER_SLOTS 256 /* Used in the network protocol. */ /* Must be divisable by 32 or iterations * in savegame2.c needs to be changed */ -#define MAX_NUM_BARBARIANS 10 /* 3, but slots reserved for future use. */ +#define MAX_NUM_BARBARIANS 6 /* 3, but slots reserved for future use. */ #define MAX_NUM_PLAYERS MAX_NUM_PLAYER_SLOTS - MAX_NUM_BARBARIANS /* Used in the network protocol. */ #define MAX_NUM_CONNECTIONS (2 * (MAX_NUM_PLAYER_SLOTS)) Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=35698=35697=35698=diff == --- trunk/fc_version(original) +++ trunk/fc_versionTue May 23 18:43:56 2017 @@ -56,7 +56,7 @@ # - Avoid adding a new mandatory capability to the development branch for # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. -NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2017.May.19" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2017.May.23" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
