Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. *Read more...*
Download (7.18 KB)

Feature #751193 ยป extra.patch

Sveinung Kvilhaugsvik, 2018-05-04 02:06 PM

View differences:

server/actiontools.c
}
/**********************************************************************//**
Returns TRUE iff, from the point of view of the owner of the actor unit,
it looks like the actor unit may be able to do any action to the target
extra located at the target tile.
If the owner of the actor unit doesn't have the knowledge needed to know
for sure if the unit can act TRUE will be returned.
If the only action(s) that can be performed against a target has the
rare_pop_up property the target will only be considered valid if the
accept_all_actions argument is TRUE.
**************************************************************************/
static bool may_unit_act_vs_tile_extra(const struct unit *actor,
const struct tile *tgt_tile,
const struct extra_type *tgt_extra,
bool accept_all_actions)
{
if (actor == NULL || tgt_tile == NULL || tgt_extra == NULL) {
/* Can't do any actions if actor or target are missing. */
return FALSE;
}
action_iterate(act) {
if (!(action_id_get_actor_kind(act) == AAK_UNIT
&& action_id_get_target_kind(act) == ATK_TILE
&& action_requires_details(act))) {
/* Not a relevant action. */
continue;
}
if (action_id_is_rare_pop_up(act) && !accept_all_actions) {
/* Not relevant since not accepted here. */
continue;
}
if (action_prob_possible(action_prob_vs_tile(actor, act,
tgt_tile, tgt_extra))) {
/* The actor unit may be able to do this action to the target
* extra. */
return TRUE;
}
} action_iterate_end;
return FALSE;
}
/**********************************************************************//**
Find an extra to target for an action at the specified tile.
Returns the first extra found that the actor may act against at the tile
or NULL if no proper target is found. (Note that some actions requires
the absence of an extra since they result in its creation while other
requires its presence.)
If the only action(s) that can be performed against a target has the
rare_pop_up property the target will only be considered valid if the
accept_all_actions argument is TRUE.
**************************************************************************/
struct extra_type *action_tgt_tile_extra(const struct unit *actor,
const struct tile *target_tile,
bool accept_all_actions)
{
extra_active_type_iterate(target) {
if (may_unit_act_vs_tile_extra(actor, target_tile, target,
accept_all_actions)) {
return target;
}
} extra_active_type_iterate_end;
return NULL;
}
/**********************************************************************//**
Returns the action auto performer that the specified cause can force the
specified actor to perform. Returns NULL if no such action auto performer
exists.
server/actiontools.h
const struct extra_type *target_extra,
bool accept_all_actions);
struct extra_type *action_tgt_tile_extra(const struct unit *actor,
const struct tile *target_tile,
bool accept_all_actions);
const struct action_auto_perf *
action_auto_perf_unit_sel(const enum action_auto_perf_cause cause,
const struct unit *actor,
server/unithand.c
const int actor_unit_id,
const int target_unit_id_client,
const int target_tile_id,
const int target_extra_id,
const int target_extra_id_client,
const bool disturb_player)
{
struct player *actor_player;
......
struct extra_type *target_extra;
int actor_target_distance;
const struct player_tile *plrtile;
int target_extra_id = target_extra_id_client;
/* No potentially legal action is known yet. If none is found the player
* should get an explanation. */
......
actor_player = pc->playing;
actor_unit = game_unit_by_number(actor_unit_id);
target_tile = index_to_tile(&(wld.map), target_tile_id);
if (target_extra_id != EXTRA_NONE) {
target_extra = extra_by_number(target_extra_id);
} else {
target_extra = NULL;
}
/* Initialize the action probabilities. */
action_iterate(act) {
......
return;
}
if (target_extra_id_client == EXTRA_NONE) {
/* See if a target extra can be found. */
target_extra = action_tgt_tile_extra(actor_unit, target_tile, TRUE);
} else {
/* Use the client selected target extra. */
target_extra = extra_by_number(target_extra_id_client);
}
/* The player may have outdated information about the target tile.
* Limiting the player knowledge look up to the target tile is OK since
* all targets must be located at it. */
......
target_unit_id = target_unit->id;
break;
case ATK_TILE:
/* The target tile isn't selected here so it hasn't changed. */
fc_assert(target_tile != NULL);
if (action_requires_details(act)) {
/* The target extra may have been set here. */
target_extra_id = target_extra->id;
}
case ATK_UNITS:
/* The target tile isn't selected here so it hasn't changed. */
fc_assert(target_tile != NULL);
    (1-1/1)