Split "Establish Embassy".
commitc6a0e1156d1705f33e3cc34a0c39f72b337bfd8e
authorsveinung <sveinung@a0f10bec-cc02-0410-94fc-a9cfff90b4cd>
Tue, 2 May 2017 12:47:39 +0000 (2 12:47 +0000)
committersveinung <sveinung@a0f10bec-cc02-0410-94fc-a9cfff90b4cd>
Tue, 2 May 2017 12:47:39 +0000 (2 12:47 +0000)
tree1722ac29b33205d5ae50e223e94865415813b556
parent84ea5bda8bd647ec82132ea5d061aab99cfb6cd2
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

git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@35369 a0f10bec-cc02-0410-94fc-a9cfff90b4cd
30 files changed:
ai/default/aicity.c
ai/default/aidata.c
ai/default/aidiplomat.c
client/gui-gtk-3.0/action_dialog.c
client/gui-gtk-3.22/action_dialog.c
client/gui-gtk-4.0/action_dialog.c
client/gui-qt/dialogs.cpp
client/gui-qt/menu.cpp
client/gui-sdl2/action_dialog.c
client/packhand.c
common/actions.c
common/actions.h
common/aicore/pf_tools.c
data/civ1/game.ruleset
data/civ2/game.ruleset
data/civ2civ3/game.ruleset
data/classic/game.ruleset
data/experimental/game.ruleset
data/multiplayer/game.ruleset
data/sandbox/game.ruleset
data/webperimental/game.ruleset
doc/README.actions
fc_version
server/advisors/advdata.c
server/diplomats.c
server/diplomats.h
server/ruleset.c
server/savegame3.c
server/unithand.c
tools/ruleutil/rulesave.c