Author: sveinung
Date: Tue May 2 14:58:48 2017
New Revision: 35370
URL: http://svn.gna.org/viewcvs/freeciv?rev=35370&view=rev
Log:
Split "Establish Embassy".
Stop relying on the Spy unit type flag to decide if "Establish Embassy"
consumes the actor unit. Split "Establish Embassy" in an actor unit
consuming and in a non actor unit consuming version.
This makes it possible to create a ruleset where all actor units, including
those with the Spy utype flag, are consumed during embassy establishing. It
makes a ruleset where no actor units, including those without the Spy utype
flag, are consumed during embassy establishing possible. It also makes more
complex rules, like "establishing an embassy during war consumes the actor
unit", possible.
See hrm Feature #656188
Modified:
branches/S3_0/ai/default/aicity.c
branches/S3_0/ai/default/aidata.c
branches/S3_0/ai/default/aidiplomat.c
branches/S3_0/client/gui-gtk-2.0/action_dialog.c
branches/S3_0/client/gui-gtk-3.0/action_dialog.c
branches/S3_0/client/gui-gtk-3.22/action_dialog.c
branches/S3_0/client/gui-qt/dialogs.cpp
branches/S3_0/client/gui-qt/menu.cpp
branches/S3_0/client/gui-sdl2/action_dialog.c
branches/S3_0/client/packhand.c
branches/S3_0/common/actions.c
branches/S3_0/common/actions.h
branches/S3_0/common/aicore/pf_tools.c
branches/S3_0/data/civ1/game.ruleset
branches/S3_0/data/civ2/game.ruleset
branches/S3_0/data/civ2civ3/game.ruleset
branches/S3_0/data/classic/game.ruleset
branches/S3_0/data/experimental/game.ruleset
branches/S3_0/data/multiplayer/game.ruleset
branches/S3_0/data/sandbox/game.ruleset
branches/S3_0/data/webperimental/game.ruleset
branches/S3_0/doc/README.actions
branches/S3_0/fc_version
branches/S3_0/server/advisors/advdata.c
branches/S3_0/server/diplomats.c
branches/S3_0/server/diplomats.h
branches/S3_0/server/rscompat.c
branches/S3_0/server/ruleset.c
branches/S3_0/server/savegame3.c
branches/S3_0/server/unithand.c
branches/S3_0/tools/ruleutil/rulesave.c
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/S3_0/ai/default/aicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/aicity.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/ai/default/aidata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/aidata.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/ai/default/aidiplomat.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/ai/default/aidiplomat.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-gtk-2.0/action_dialog.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-gtk-3.0/action_dialog.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/gui-gtk-3.22/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-gtk-3.22/action_dialog.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/dialogs.cpp?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/menu.cpp?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/gui-sdl2/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-sdl2/action_dialog.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/packhand.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/common/actions.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/actions.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/common/actions.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/actions.h?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/common/aicore/pf_tools.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/common/aicore/pf_tools.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ1/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2civ3/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/classic/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/experimental/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/multiplayer/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/sandbox/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/sandbox/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/data/webperimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/webperimental/game.ruleset?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/doc/README.actions
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/doc/README.actions?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/fc_version?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/advisors/advdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/advisors/advdata.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/diplomats.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/diplomats.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/diplomats.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/diplomats.h?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/rscompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/rscompat.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/ruleset.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/savegame3.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/savegame3.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/unithand.c?rev=35370&r1=35369&r2=35370&view=diff
Modified: branches/S3_0/tools/ruleutil/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/tools/ruleutil/rulesave.c?rev=35370&r1=35369&r2=35370&view=diff
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
