From 2f6e2cd3e56d46e652b9acb4034705cfc7a67ef1 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Sat, 6 Feb 2021 21:28:30 +0100 Subject: [PATCH 7/7] Make "Pillage" extras targeted by default. Set default action target kind for pillage to tile extras. It makes more sense since an extra can have a different owner than the tile. See osdn #41499 --- common/actions.c | 2 +- doc/README.actions | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/common/actions.c b/common/actions.c index bfa428bbda..0b5137fa59 100644 --- a/common/actions.c +++ b/common/actions.c @@ -7564,7 +7564,6 @@ action_target_kind_default(enum action_result result) case ACTRES_TRANSFORM_TERRAIN: case ACTRES_CULTIVATE: case ACTRES_PLANT: - case ACTRES_PILLAGE: case ACTRES_CLEAN_POLLUTION: case ACTRES_CLEAN_FALLOUT: case ACTRES_ROAD: @@ -7573,6 +7572,7 @@ action_target_kind_default(enum action_result result) case ACTRES_IRRIGATE: case ACTRES_TRANSPORT_DISEMBARK: return ATK_TILE; + case ACTRES_PILLAGE: case ACTRES_CONQUER_EXTRAS: return ATK_EXTRAS; case ACTRES_DISBAND_UNIT: diff --git a/doc/README.actions b/doc/README.actions index 512379f667..e0fe8ae422 100644 --- a/doc/README.actions +++ b/doc/README.actions @@ -775,24 +775,6 @@ Actions done by a unit against a tile * the actor unit has "Settlers" flag (!) * terrain type must be one on which units can plant -"Pillage" - Pillage extra from tile - * UI name can be set using ui_name_pillage - * target kind can be changed with pillage_target_kind - * terrain type must be one where pillaging is possible - * the target extra must be present at the target tile - * the terrain of the target tile must have a non 0 pillage_time - * no other unit can be pillaging the target extra - * the target extra must have the Pillage removal cause - * the target extra's rmreqs must be fulfilled - * the target extra can't be a dependency of another extra present at the - target tile - * the target extra can't have the AlwaysOnCityCenter extra flag if the - target tile has a city - * the target extra can't have the AutoOnCityCenter extra flag if the - target tile has a city and the city's owner can rebuild it - * the target extra must be the rule chosen extra if the civstyle section's - pillage_select is FALSE - "Clean Pollution" - clean extra from the target tile. * UI name can be set using ui_name_clean_pollution * actor must be on the same tile as the target. @@ -928,6 +910,24 @@ Actions done by a unit against a tile Actions done by a unit against all extras at a tile =================================================== +"Pillage" - Pillage extra from tile + * UI name can be set using ui_name_pillage + * target kind can be changed with pillage_target_kind + * terrain type must be one where pillaging is possible + * the target extra must be present at the target tile + * the terrain of the target tile must have a non 0 pillage_time + * no other unit can be pillaging the target extra + * the target extra must have the Pillage removal cause + * the target extra's rmreqs must be fulfilled + * the target extra can't be a dependency of another extra present at the + target tile + * the target extra can't have the AlwaysOnCityCenter extra flag if the + target tile has a city + * the target extra can't have the AutoOnCityCenter extra flag if the + target tile has a city and the city's owner can rebuild it + * the target extra must be the rule chosen extra if the civstyle section's + pillage_select is FALSE + "Conquer Extras" - Claim ownership of an extra. * UI name can be set using ui_name_conquer_extras * the actor unit must be on a tile next to the target. -- 2.20.1