From f1f91b53f7c71312ca3b50511fc09b486c7b39de Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Wed, 24 Mar 2021 12:17:58 +0100 Subject: [PATCH] non allied -> non-allied See osdn #41875 --- client/goto.c | 2 +- common/actions.c | 4 ++-- common/movement.c | 4 ++-- common/player.c | 2 +- data/sandbox/README.sandbox | 2 +- data/sandbox/game.ruleset | 2 +- data/sandbox/terrain.ruleset | 2 +- doc/README.actions | 18 +++++++++--------- server/rssanity.c | 2 +- server/unittools.c | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/client/goto.c b/client/goto.c index 39ce245637..f832e2e097 100644 --- a/client/goto.c +++ b/client/goto.c @@ -1435,7 +1435,7 @@ static void make_path_orders(struct unit *punit, struct pf_path *path, * caller hope that the situation would change before the unit got * there? */ - /* It's currently illegal to walk into tiles with non allied units or + /* It's currently illegal to walk into tiles with non-allied units or * cities. Some actions causes the actor to enter the target tile but * that is a part of the action it self, not a regular pre action * move. */ diff --git a/common/actions.c b/common/actions.c index 48de3fd556..ec7e2ba7ef 100644 --- a/common/actions.c +++ b/common/actions.c @@ -685,7 +685,7 @@ static void hard_code_oblig_hard_reqs(void) * * This makes an implicit rule explicit: * 1. A unit must move into a city to conquer it. - * 2. It can't move into the city if the tile contains a non allied + * 2. It can't move into the city if the tile contains a non-allied * unit (see unit_move_to_tile_test()). * 3. A city could, at the time this rule was made explicit, only * contain units allied to its owner. @@ -1198,7 +1198,7 @@ static void hard_code_actions(void) unit_action_new(ACTION_ATTACK, ACTRES_ATTACK, FALSE, TRUE, /* Tries a forced move if the target unit's tile has - * no non allied units and the occupychance dice roll + * no non-allied units and the occupychance dice roll * tells it to move. */ MAK_FORCED, 1, 1, FALSE); diff --git a/common/movement.c b/common/movement.c index 2a0d4ed49d..1f5abb7054 100644 --- a/common/movement.c +++ b/common/movement.c @@ -570,8 +570,8 @@ bool unit_can_move_to_tile(const struct civ_map *nmap, 5) Animals cannot move out from home terrains 6) Unit can move to a tile where it can't survive on its own if there is free transport capacity. - 7) There are no peaceful but non allied units on the target tile. - 8) There is not a non allied city on the target tile when + 7) There are no peaceful but non-allied units on the target tile. + 8) There is not a non-allied city on the target tile when enter_enemy_city is false. When enter_enemy_city is true a non peaceful city is also accepted. 9) There is no non-allied unit blocking (zoc) [or igzoc is true]. diff --git a/common/player.c b/common/player.c index 407c2b4c16..2183e4b3fa 100644 --- a/common/player.c +++ b/common/player.c @@ -966,7 +966,7 @@ bool can_player_see_hypotetic_units_at(const struct player *pplayer, return FALSE; } - /* Can't see non allied units in transports. */ + /* Can't see non-allied units in transports. */ unit_list_iterate(ptile->units, punit) { if (unit_type_get(punit)->transport_capacity > 0 && unit_owner(punit) != pplayer) { diff --git a/data/sandbox/README.sandbox b/data/sandbox/README.sandbox index eb03ef4d3f..44f4f5a221 100644 --- a/data/sandbox/README.sandbox +++ b/data/sandbox/README.sandbox @@ -68,7 +68,7 @@ Map Stealing: Spies can steal other player's world map Spy elimination: -A Spy can eliminate non allied spies and diplomats out in the open without +A Spy can eliminate non-allied spies and diplomats out in the open without also trying to perform any other action. Border Vision: diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 6930281c18..fc167f52a1 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -1289,7 +1289,7 @@ target_reqs = ; A pacifist wanting to end violence or a neocon looking forward to the ; Casus Belli against terrorist states once Treuga Dei is finished may wish -; to help a non allied player to complete Treuga Dei. +; to help a non-allied player to complete Treuga Dei. [actionenabler_help_build_wonder_treuga_dei] action = "Help Wonder" actor_reqs = diff --git a/data/sandbox/terrain.ruleset b/data/sandbox/terrain.ruleset index 29ec8df839..681309ecb0 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -1768,7 +1768,7 @@ An Ancient Transport Hub can transport units to any other Ancient Transport \ Hub on the map.\ "), _("\ Using an Ancient Transport Hub to move to an Ancient Transport Hub known \ -to exist, to be free from non allied units and on native terrain should be \ +to exist, to be free from non-allied units and on native terrain should be \ reasonably safe.\ ") diff --git a/doc/README.actions b/doc/README.actions index e5246183e1..50128b5afe 100644 --- a/doc/README.actions +++ b/doc/README.actions @@ -824,8 +824,8 @@ Actions done by a unit against a tile * kills the actor unit if the target tile has a terrain type the actor unit can't exist on and - if paradrop_to_transport is set - it couldn't load into a transport at the target tile. - * kills the actor unit if the target tile has a non allied unit - * kills the actor unit if the target tile has a non allied city + * kills the actor unit if the target tile has a non-allied unit + * kills the actor unit if the target tile has a non-allied city * the distance between actor and target is from 1 to paratroopers_range * the actor unit hasn't paradropped this turn * the actor unit isn't transporting another unit (!) @@ -846,7 +846,7 @@ Actions done by a unit against a tile * kills the actor unit if the target tile has a terrain type the actor unit can't exist on and - if paradrop_to_transport is set - it couldn't load into a transport at the target tile. - * kills the actor unit if the target tile has a non allied unit + * kills the actor unit if the target tile has a non-allied unit * can result in the conquest of the city at the target tile if the target tile has a city * can result in the conquest of the extras at the target tile if @@ -881,8 +881,8 @@ Actions done by a unit against a tile * kills the actor unit if the target tile has a terrain type the actor unit can't exist on and - if paradrop_to_transport is set - it couldn't load into a transport at the target tile. - * kills the actor unit if the target tile has a non allied unit - * kills the actor unit if the target tile has a non allied city + * kills the actor unit if the target tile has a non-allied unit + * kills the actor unit if the target tile has a non-allied city * can result in hut frightening if - the target tile has an extra with "Enter" in its rmcauses (a Hut) - the target tile's Hut's rmreqs are fulfilled @@ -907,7 +907,7 @@ Actions done by a unit against a tile * kills the actor unit if the target tile has a terrain type the actor unit can't exist on and - if paradrop_to_transport is set - it couldn't load into a transport at the target tile. - * kills the actor unit if the target tile has a non allied unit + * kills the actor unit if the target tile has a non-allied unit * can result in the conquest of the city at the target tile if the target tile has a city * can result in the conquest of the extras at the target tile if @@ -946,8 +946,8 @@ Actions done by a unit against a tile * kills the actor unit if the target tile has a terrain type the actor unit can't exist on and - if paradrop_to_transport is set - it couldn't load into a transport at the target tile. - * kills the actor unit if the target tile has a non allied unit - * kills the actor unit if the target tile has a non allied city + * kills the actor unit if the target tile has a non-allied unit + * kills the actor unit if the target tile has a non-allied city * can result in hut entry if - the target tile has an extra with "Enter" in its rmcauses (a Hut) - the target tile's Hut's rmreqs are fulfilled @@ -971,7 +971,7 @@ Actions done by a unit against a tile * kills the actor unit if the target tile has a terrain type the actor unit can't exist on and - if paradrop_to_transport is set - it couldn't load into a transport at the target tile. - * kills the actor unit if the target tile has a non allied unit + * kills the actor unit if the target tile has a non-allied unit * can result in the conquest of the city at the target tile if the target tile has a city * can result in the conquest of the extras at the target tile if diff --git a/server/rssanity.c b/server/rssanity.c index 917c8807ef..c120d9f834 100644 --- a/server/rssanity.c +++ b/server/rssanity.c @@ -1388,7 +1388,7 @@ bool autoadjust_ruleset_data(void) /* Hard code that the ability to perform a regular attack blocks * extras conquest. Is redundant as long as the requirement that the - * target tile has no non allied units remains hard coded. Kept "just + * target tile has no non-allied units remains hard coded. Kept "just * in case" that changes. */ { ACTRES_CONQUER_EXTRAS, ACTRES_ATTACK }, diff --git a/server/unittools.c b/server/unittools.c index 8e6cefb759..7721ee7801 100644 --- a/server/unittools.c +++ b/server/unittools.c @@ -1293,7 +1293,7 @@ void bounce_unit(struct unit *punit, bool verbose) /**********************************************************************//** - Throw pplayer's units from non allied cities + Throw pplayer's units from non-allied cities If verbose is true, pplayer gets messages about where each units goes. **************************************************************************/ -- 2.20.1