Author: sveinung
Date: Tue May  2 14:47:39 2017
New Revision: 35369

URL: http://svn.gna.org/viewcvs/freeciv?rev=35369&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:
    trunk/ai/default/aicity.c
    trunk/ai/default/aidata.c
    trunk/ai/default/aidiplomat.c
    trunk/client/gui-gtk-3.0/action_dialog.c
    trunk/client/gui-gtk-3.22/action_dialog.c
    trunk/client/gui-gtk-4.0/action_dialog.c
    trunk/client/gui-qt/dialogs.cpp
    trunk/client/gui-qt/menu.cpp
    trunk/client/gui-sdl2/action_dialog.c
    trunk/client/packhand.c
    trunk/common/actions.c
    trunk/common/actions.h
    trunk/common/aicore/pf_tools.c
    trunk/data/civ1/game.ruleset
    trunk/data/civ2/game.ruleset
    trunk/data/civ2civ3/game.ruleset
    trunk/data/classic/game.ruleset
    trunk/data/experimental/game.ruleset
    trunk/data/multiplayer/game.ruleset
    trunk/data/sandbox/game.ruleset
    trunk/data/webperimental/game.ruleset
    trunk/doc/README.actions
    trunk/fc_version
    trunk/server/advisors/advdata.c
    trunk/server/diplomats.c
    trunk/server/diplomats.h
    trunk/server/ruleset.c
    trunk/server/savegame3.c
    trunk/server/unithand.c
    trunk/tools/ruleutil/rulesave.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/ai/default/aicity.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/ai/default/aidata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aidata.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/ai/default/aidiplomat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aidiplomat.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/gui-gtk-3.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/gui-gtk-3.22/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/action_dialog.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/gui-gtk-4.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/action_dialog.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/gui-sdl2/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/common/actions.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/common/actions.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.h?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/common/aicore/pf_tools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/pf_tools.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/data/webperimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/game.ruleset?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/doc/README.actions
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.actions?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/server/advisors/advdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/advdata.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/server/diplomats.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/diplomats.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/server/diplomats.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/diplomats.h?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/server/unithand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=35369&r1=35368&r2=35369&view=diff

Modified: trunk/tools/ruleutil/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleutil/rulesave.c?rev=35369&r1=35368&r2=35369&view=diff


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to