Author: sveinung
Date: Fri Jun 17 01:59:17 2016
New Revision: 32877

URL: http://svn.gna.org/viewcvs/freeciv?rev=32877&view=rev
Log:
Action enabler control regular attacks.

Make regular attacks action enabler controlled via the new "Attack" action.
It had to be tile targeted. Making it units targeted would allow any unit at
a tile to forbid the action. (See the unreachable_protects server setting)

More rules, like attack from non native tile, should hopefully move to the
ruleset in follow up patches. Stronger "attack as action" integration is
also expected in follow up patches.

The actions "Capture Units", "Bombard" and "Explode Nuclear" have already
been split from regular attack. The fact that the regular attack now is an
enabler controlled action doesn't mean that it shouldn't be further split.

Note that action forcing still can block the non enabler controlled action
Occupy City. This makes it necessary to keep the force_* system internally.

See patch #7260

Modified:
    trunk/ai/default/aicity.c
    trunk/ai/default/aitools.c
    trunk/client/gui-gtk-2.0/action_dialog.c
    trunk/client/gui-gtk-3.0/action_dialog.c
    trunk/client/gui-gtk-3.x/action_dialog.c
    trunk/client/gui-qt/dialogs.cpp
    trunk/client/gui-sdl2/action_dialog.c
    trunk/client/packhand.c
    trunk/common/actions.c
    trunk/common/actions.h
    trunk/data/alien/game.ruleset
    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/doc/README.actions
    trunk/fc_version
    trunk/server/advisors/advdata.c
    trunk/server/rscompat.c
    trunk/server/rssanity.c
    trunk/server/ruleset.c
    trunk/server/unithand.c
    trunk/server/unittools.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=32877&r1=32876&r2=32877&view=diff

Modified: trunk/ai/default/aitools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aitools.c?rev=32877&r1=32876&r2=32877&view=diff

Modified: trunk/client/gui-gtk-2.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=32877&r1=32876&r2=32877&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=32877&r1=32876&r2=32877&view=diff

Modified: trunk/client/gui-gtk-3.x/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/action_dialog.c?rev=32877&r1=32876&r2=32877&view=diff

Modified: trunk/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=32877&r1=32876&r2=32877&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=32877&r1=32876&r2=32877&view=diff

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

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

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

Modified: trunk/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=32877&r1=32876&r2=32877&view=diff

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

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

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

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

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

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

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

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

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

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

Modified: trunk/server/rscompat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=32877&r1=32876&r2=32877&view=diff

Modified: trunk/server/rssanity.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=32877&r1=32876&r2=32877&view=diff

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

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

Modified: trunk/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=32877&r1=32876&r2=32877&view=diff

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


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

Reply via email to