From 09421092f7f45f87834a22909f427b148d476805 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 19 Mar 2022 09:13:30 +0200 Subject: [PATCH 45/45] Rename "Recycle Unit" as "Disband Unit Recover" Requested by log65536 See osdn #42959 Signed-off-by: Marko Lindqvist --- ai/default/daicity.c | 10 ++--- ai/default/daidiplomacy.c | 2 +- client/control.c | 2 +- client/gui-qt/dialogs.cpp | 10 ++--- client/packhand.c | 2 +- client/text.c | 2 +- common/actions.c | 54 ++++++++++++------------- common/actions.h | 4 +- common/aicore/aisupport.c | 2 +- common/fc_types.h | 4 +- common/unittype.c | 2 +- data/alien/cities.ruleset | 2 +- data/alien/effects.ruleset | 4 +- data/alien/game.ruleset | 10 ++--- data/civ1/cities.ruleset | 2 +- data/civ1/effects.ruleset | 4 +- data/civ1/game.ruleset | 10 ++--- data/civ2/cities.ruleset | 2 +- data/civ2/effects.ruleset | 4 +- data/civ2/game.ruleset | 10 ++--- data/civ2civ3/cities.ruleset | 2 +- data/civ2civ3/effects.ruleset | 4 +- data/civ2civ3/game.ruleset | 10 ++--- data/classic/cities.ruleset | 2 +- data/classic/effects.ruleset | 4 +- data/classic/game.ruleset | 10 ++--- data/goldkeep/cities.ruleset | 2 +- data/goldkeep/effects.ruleset | 4 +- data/goldkeep/game.ruleset | 10 ++--- data/granularity/cities.ruleset | 2 +- data/multiplayer/cities.ruleset | 2 +- data/multiplayer/game.ruleset | 10 ++--- data/sandbox/cities.ruleset | 6 +-- data/sandbox/effects.ruleset | 4 +- data/sandbox/game.ruleset | 14 +++---- data/stub/cities.ruleset | 2 +- data/webperimental/cities.ruleset | 2 +- data/webperimental/effects.ruleset | 4 +- data/webperimental/game.ruleset | 6 +-- doc/README.actions | 10 ++--- doc/README.effects | 2 +- server/actiontools.c | 2 +- server/advisors/advdata.c | 2 +- server/rssanity.c | 30 +++++++------- server/savegame/savecompat.c | 64 ++++++++++++++++++++++++++++++ server/savegame/savegame2.c | 6 +-- server/unithand.c | 14 +++---- 47 files changed, 218 insertions(+), 154 deletions(-) diff --git a/ai/default/daicity.c b/ai/default/daicity.c index 577aef20a9..e7f947d009 100644 --- a/ai/default/daicity.c +++ b/ai/default/daicity.c @@ -482,18 +482,18 @@ static void unit_do_disband_trad(struct player *owner, struct unit *punit, /* Disbanding a unit inside a city gives it 50% of the shields used to * produce the unit. */ - if (unit_can_do_action(punit, ACTION_RECYCLE_UNIT)) { + if (unit_can_do_action(punit, ACTION_DISBAND_UNIT_RECOVER)) { struct city *tgt_city; /* Only a city at the same tile as the unit can benefit. */ tgt_city = tile_city(unit_tile(punit)); if (tgt_city - && is_action_enabled_unit_on_city(ACTION_RECYCLE_UNIT, + && is_action_enabled_unit_on_city(ACTION_DISBAND_UNIT_RECOVER, punit, tgt_city)) { if (unit_perform_action(owner, punit->id, tgt_city->id, - 0, NULL, ACTION_RECYCLE_UNIT, requester)) { - /* The unit did Recycle Unit. 50% of the shields wasted. */ + 0, NULL, ACTION_DISBAND_UNIT_RECOVER, requester)) { + /* The unit did Disband Unit Recover. 50% of the shields wasted. */ return; } } @@ -1260,7 +1260,7 @@ static int action_target_neg_util(action_id act_id, case ACTRES_TRADE_ROUTE: case ACTRES_HELP_WONDER: case ACTRES_JOIN_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_HOME_CITY: case ACTRES_UPGRADE_UNIT: case ACTRES_AIRLIFT: diff --git a/ai/default/daidiplomacy.c b/ai/default/daidiplomacy.c index 2464c83a3e..ca5b7658c6 100644 --- a/ai/default/daidiplomacy.c +++ b/ai/default/daidiplomacy.c @@ -1992,7 +1992,7 @@ void dai_incident(struct ai_type *ait, enum incident_type type, case ACTRES_MARKETPLACE: case ACTRES_HELP_WONDER: case ACTRES_JOIN_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: diff --git a/client/control.c b/client/control.c index 7b1ce3684c..9f5fd2f5e9 100644 --- a/client/control.c +++ b/client/control.c @@ -68,7 +68,7 @@ struct client_disband_unit_data { * user configurable client option? */ static int disband_unit_alternatives[3] = { ACTION_DISBAND_UNIT, - ACTION_RECYCLE_UNIT, + ACTION_DISBAND_UNIT_RECOVER, ACTION_HELP_WONDER, }; diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp index db8c40d509..a7bea25c66 100644 --- a/client/gui-qt/dialogs.cpp +++ b/client/gui-qt/dialogs.cpp @@ -111,7 +111,7 @@ static void diplomat_bribe(QVariant data1, QVariant data2); static void caravan_marketplace(QVariant data1, QVariant data2); static void caravan_establish_trade(QVariant data1, QVariant data2); static void caravan_help_build(QVariant data1, QVariant data2); -static void unit_recycle(QVariant data1, QVariant data2); +static void unit_disband_recover(QVariant data1, QVariant data2); static void capture_units(QVariant data1, QVariant data2); static void nuke_units(QVariant data1, QVariant data2); static void wipe_units(QVariant data1, QVariant data2); @@ -237,7 +237,7 @@ static const QHash af_map_init(void) action_function[ACTION_SPY_NUKE_ESC] = spy_nuke_city_esc; action_function[ACTION_SPY_ESCAPE] = spy_escape; action_function[ACTION_DESTROY_CITY] = destroy_city; - action_function[ACTION_RECYCLE_UNIT] = unit_recycle; + action_function[ACTION_DISBAND_UNIT_RECOVER] = unit_disband_recover; action_function[ACTION_HOME_CITY] = unit_home_city; action_function[ACTION_UPGRADE_UNIT] = unit_upgrade; action_function[ACTION_AIRLIFT] = airlift; @@ -1760,16 +1760,16 @@ static void caravan_help_build(QVariant data1, QVariant data2) } /***********************************************************************//** - Action Recycle Unit for choice dialog + Action Disband Unit Recover for choice dialog ***************************************************************************/ -static void unit_recycle(QVariant data1, QVariant data2) +static void unit_disband_recover(QVariant data1, QVariant data2) { int actor_id = data1.toInt(); int tgt_city_id = data2.toInt(); if (NULL != game_unit_by_number(actor_id) && NULL != game_city_by_number(tgt_city_id)) { - request_do_action(ACTION_RECYCLE_UNIT, + request_do_action(ACTION_DISBAND_UNIT_RECOVER, actor_id, tgt_city_id, 0, ""); } } diff --git a/client/packhand.c b/client/packhand.c index a1714aed22..49c4e318e9 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -183,7 +183,7 @@ const action_id auto_attack_blockers[] = { ACTION_SPY_NUKE, ACTION_SPY_NUKE_ESC, ACTION_DESTROY_CITY, ACTION_EXPEL_UNIT, - ACTION_RECYCLE_UNIT, + ACTION_DISBAND_UNIT_RECOVER, ACTION_HOME_CITY, ACTION_HOMELESS, ACTION_UPGRADE_UNIT, diff --git a/client/text.c b/client/text.c index 6a6545a11f..66fc6173d3 100644 --- a/client/text.c +++ b/client/text.c @@ -1741,7 +1741,7 @@ const char *get_act_sel_action_custom_text(struct action *paction, return NULL; } } else if ((action_has_result(paction, ACTRES_HELP_WONDER) - || action_has_result(paction, ACTRES_RECYCLE_UNIT)) + || action_has_result(paction, ACTRES_DISBAND_UNIT_RECOVER)) && city_owner(target_city) == client.conn.playing) { /* Can only give remaining production for domestic and existing * cities. */ diff --git a/common/actions.c b/common/actions.c index 7204c13740..923b31cfb7 100644 --- a/common/actions.c +++ b/common/actions.c @@ -1144,8 +1144,8 @@ static void hard_code_actions(void) unit_action_new(ACTION_EXPEL_UNIT, ACTRES_EXPEL_UNIT, FALSE, TRUE, MAK_STAYS, 0, 1, FALSE); - actions[ACTION_RECYCLE_UNIT] = - unit_action_new(ACTION_RECYCLE_UNIT, ACTRES_RECYCLE_UNIT, + actions[ACTION_DISBAND_UNIT_RECOVER] = + unit_action_new(ACTION_DISBAND_UNIT_RECOVER, ACTRES_DISBAND_UNIT_RECOVER, TRUE, TRUE, MAK_STAYS, /* Illegal to perform to a target on another tile to * keep the rules exactly as they were for now. */ @@ -2317,7 +2317,7 @@ bool action_creates_extra(const struct action *paction, case ACTRES_NUKE_UNITS: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: @@ -2405,7 +2405,7 @@ bool action_removes_extra(const struct action *paction, case ACTRES_NUKE_UNITS: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: @@ -3144,7 +3144,7 @@ tgt_city_local_utype(const struct city *target_city) different target kind. The target tile could therefore be missing. Example: The ATK_SELF action ACTION_DISBAND_UNIT can be blocked by the - ATK_CITY action ACTION_RECYCLE_UNIT. + ATK_CITY action ACTION_DISBAND_UNIT_RECOVER. **************************************************************************/ static const struct tile * blocked_find_target_tile(const struct action *act, @@ -3199,7 +3199,7 @@ blocked_find_target_tile(const struct action *act, missing. Example: The ATK_SELF action ACTION_DISBAND_UNIT can be blocked by the - ATK_CITY action ACTION_RECYCLE_UNIT. + ATK_CITY action ACTION_DISBAND_UNIT_RECOVER. **************************************************************************/ static const struct city * blocked_find_target_city(const struct action *act, @@ -3512,7 +3512,7 @@ action_actor_utype_hard_reqs_ok_full(const struct action *paction, case ACTRES_NUKE_UNITS: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: @@ -3699,7 +3699,7 @@ action_hard_reqs_actor(const struct action *paction, case ACTRES_NUKE_UNITS: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_UPGRADE_UNIT: @@ -3941,7 +3941,7 @@ is_action_possible(const action_id wanted_action, break; case ACTRES_HELP_WONDER: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: /* It is only possible to help the production if the production needs * the help. (If not it would be possible to add shields for something * that can't legally receive help if it is build later) */ @@ -5718,7 +5718,7 @@ action_prob(const action_id wanted_action, /* No battle is fought first. */ chance = ACTPROB_CERTAIN; break; - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: /* No battle is fought first. */ chance = ACTPROB_CERTAIN; break; @@ -7092,7 +7092,7 @@ int action_dice_roll_initial_odds(const struct action *paction) case ACTRES_NUKE_UNITS: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: @@ -7614,8 +7614,8 @@ const char *action_ui_name_ruleset_var_name(int act) return "ui_name_nuke_units"; case ACTION_DESTROY_CITY: return "ui_name_destroy_city"; - case ACTION_RECYCLE_UNIT: - return "ui_name_recycle_unit"; + case ACTION_DISBAND_UNIT_RECOVER: + return "ui_name_disband_unit_recover"; case ACTION_DISBAND_UNIT: return "ui_name_disband_unit"; case ACTION_HOME_CITY: @@ -7902,7 +7902,7 @@ const char *action_ui_name_default(int act) case ACTION_DESTROY_CITY: /* TRANS: Destroy _City (100% chance of success). */ return N_("Destroy %sCity%s"); - case ACTION_RECYCLE_UNIT: + case ACTION_DISBAND_UNIT_RECOVER: /* TRANS: Dis_band recovering production (100% chance of success). */ return N_("Dis%sband recovering production%s"); case ACTION_DISBAND_UNIT: @@ -8124,7 +8124,7 @@ const char *action_min_range_ruleset_var_name(int act) case ACTION_SPY_NUKE: case ACTION_SPY_NUKE_ESC: case ACTION_DESTROY_CITY: - case ACTION_RECYCLE_UNIT: + case ACTION_DISBAND_UNIT_RECOVER: case ACTION_DISBAND_UNIT: case ACTION_HOME_CITY: case ACTION_HOMELESS: @@ -8249,7 +8249,7 @@ int action_min_range_default(enum action_result result) case ACTRES_SPY_NUKE: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: @@ -8416,8 +8416,8 @@ const char *action_max_range_ruleset_var_name(int act) return NULL; case ACTION_HELP_WONDER: return "help_wonder_max_range"; - case ACTION_RECYCLE_UNIT: - return "recycle_unit_max_range"; + case ACTION_DISBAND_UNIT_RECOVER: + return "disband_unit_recover_max_range"; case ACTION_BOMBARD: return "bombard_max_range"; case ACTION_BOMBARD2: @@ -8518,7 +8518,7 @@ int action_max_range_default(enum action_result result) fc_assert_msg(FALSE, "Probably wrong value."); return RS_DEFAULT_ACTION_MAX_RANGE; case ACTRES_HELP_WONDER: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: return RS_DEFAULT_ACTION_MAX_RANGE; case ACTRES_BOMBARD: return RS_DEFAULT_ACTION_MAX_RANGE; @@ -8582,7 +8582,7 @@ const char *action_target_kind_ruleset_var_name(int act) case ACTION_SPY_NUKE_ESC: case ACTION_NUKE_UNITS: case ACTION_DESTROY_CITY: - case ACTION_RECYCLE_UNIT: + case ACTION_DISBAND_UNIT_RECOVER: case ACTION_DISBAND_UNIT: case ACTION_HOME_CITY: case ACTION_HOMELESS: @@ -8704,7 +8704,7 @@ action_target_kind_default(enum action_result result) case ACTRES_STEAL_MAPS: case ACTRES_SPY_NUKE: case ACTRES_DESTROY_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_HOME_CITY: case ACTRES_UPGRADE_UNIT: case ACTRES_AIRLIFT: @@ -8795,7 +8795,7 @@ bool action_result_legal_target_kind(enum action_result result, case ACTRES_STEAL_MAPS: case ACTRES_SPY_NUKE: case ACTRES_DESTROY_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_HOME_CITY: case ACTRES_UPGRADE_UNIT: case ACTRES_AIRLIFT: @@ -8896,7 +8896,7 @@ action_sub_target_kind_default(enum action_result result) case ACTRES_STEAL_MAPS: case ACTRES_SPY_NUKE: case ACTRES_DESTROY_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: case ACTRES_UPGRADE_UNIT: @@ -8991,7 +8991,7 @@ action_target_compl_calc(enum action_result result, case ACTRES_STEAL_MAPS: case ACTRES_SPY_NUKE: case ACTRES_DESTROY_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: case ACTRES_UPGRADE_UNIT: @@ -9101,7 +9101,7 @@ const char *action_actor_consuming_always_ruleset_var_name(action_id act) case ACTION_SPY_NUKE: case ACTION_SPY_NUKE_ESC: case ACTION_DESTROY_CITY: - case ACTION_RECYCLE_UNIT: + case ACTION_DISBAND_UNIT_RECOVER: case ACTION_DISBAND_UNIT: case ACTION_HOME_CITY: case ACTION_HOMELESS: @@ -9284,7 +9284,7 @@ const char *action_blocked_by_ruleset_var_name(const struct action *act) case ACTION_SPY_NUKE: case ACTION_SPY_NUKE_ESC: case ACTION_DESTROY_CITY: - case ACTION_RECYCLE_UNIT: + case ACTION_DISBAND_UNIT_RECOVER: case ACTION_DISBAND_UNIT: case ACTION_HOME_CITY: case ACTION_HOMELESS: @@ -9425,7 +9425,7 @@ action_post_success_forced_ruleset_var_name(const struct action *act) case ACTION_SPY_NUKE: case ACTION_SPY_NUKE_ESC: case ACTION_DESTROY_CITY: - case ACTION_RECYCLE_UNIT: + case ACTION_DISBAND_UNIT_RECOVER: case ACTION_DISBAND_UNIT: case ACTION_HOME_CITY: case ACTION_HOMELESS: diff --git a/common/actions.h b/common/actions.h index 5cb17d75db..bdb3481e08 100644 --- a/common/actions.h +++ b/common/actions.h @@ -146,8 +146,8 @@ extern "C" { #define SPECENUM_VALUE39NAME "Destroy City" #define SPECENUM_VALUE40 ACTION_EXPEL_UNIT #define SPECENUM_VALUE40NAME "Expel Unit" -#define SPECENUM_VALUE41 ACTION_RECYCLE_UNIT -#define SPECENUM_VALUE41NAME "Recycle Unit" +#define SPECENUM_VALUE41 ACTION_DISBAND_UNIT_RECOVER +#define SPECENUM_VALUE41NAME "Disband Unit Recover" #define SPECENUM_VALUE42 ACTION_DISBAND_UNIT #define SPECENUM_VALUE42NAME "Disband Unit" #define SPECENUM_VALUE43 ACTION_HOME_CITY diff --git a/common/aicore/aisupport.c b/common/aicore/aisupport.c index 9da40e39ef..906795839b 100644 --- a/common/aicore/aisupport.c +++ b/common/aicore/aisupport.c @@ -133,7 +133,7 @@ int city_gold_worth(struct city *pcity) if (punittype && can_city_build_unit_direct(pcity, punittype)) { /* obsolete, candidate for disbanding */ worth += unit_shield_value(punit, unit_type_get(punit), - action_by_number(ACTION_RECYCLE_UNIT)); + action_by_number(ACTION_DISBAND_UNIT_RECOVER)); } else { worth += unit_build_shield_cost(pcity, punit); /* good stuff */ } diff --git a/common/fc_types.h b/common/fc_types.h index 0c700b515c..4e21d986a1 100644 --- a/common/fc_types.h +++ b/common/fc_types.h @@ -223,8 +223,8 @@ enum output_type_id { #define SPECENUM_VALUE23NAME "Unit Destroy City" #define SPECENUM_VALUE24 ACTRES_EXPEL_UNIT #define SPECENUM_VALUE24NAME "Unit Expel Unit" -#define SPECENUM_VALUE25 ACTRES_RECYCLE_UNIT -#define SPECENUM_VALUE25NAME "Unit Recycle" +#define SPECENUM_VALUE25 ACTRES_DISBAND_UNIT_RECOVER +#define SPECENUM_VALUE25NAME "Unit Disband Recover" #define SPECENUM_VALUE26 ACTRES_DISBAND_UNIT #define SPECENUM_VALUE26NAME "Unit Disband" #define SPECENUM_VALUE27 ACTRES_HOME_CITY diff --git a/common/unittype.c b/common/unittype.c index 624a0a4dd8..3400f593ed 100644 --- a/common/unittype.c +++ b/common/unittype.c @@ -341,7 +341,7 @@ static bool action_is_hostile(action_id act_id) case ACTRES_HELP_WONDER: case ACTRES_FOUND_CITY: case ACTRES_JOIN_CITY: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: diff --git a/data/alien/cities.ruleset b/data/alien/cities.ruleset index 1c3c6c9c5f..d5477fdc15 100644 --- a/data/alien/cities.ruleset +++ b/data/alien/cities.ruleset @@ -131,5 +131,5 @@ food_wipe = TRUE gold_wipe = TRUE ; shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/alien/effects.ruleset b/data/alien/effects.ruleset index 58191d047f..70eedda4e7 100644 --- a/data/alien/effects.ruleset +++ b/data/alien/effects.ruleset @@ -1111,8 +1111,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index f87ae91690..d734ed9b10 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -372,12 +372,12 @@ escape_city = "Transport Embark", "Enter Hut", "Enter Hut 2", "Unit Move" help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -500,7 +500,7 @@ ui_name_enter_marketplace = _("Monetize %sContainers%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -741,8 +741,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "DiplRel", "War", "Local", FALSE diff --git a/data/civ1/cities.ruleset b/data/civ1/cities.ruleset index 415bcaf5b1..afda100e9a 100644 --- a/data/civ1/cities.ruleset +++ b/data/civ1/cities.ruleset @@ -131,5 +131,5 @@ food_wipe = TRUE gold_wipe = TRUE ; shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/civ1/effects.ruleset b/data/civ1/effects.ruleset index 852bfd265e..cf27cbde68 100644 --- a/data/civ1/effects.ruleset +++ b/data/civ1/effects.ruleset @@ -1540,6 +1540,6 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 266a2d14bd..a83cd455b3 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -358,12 +358,12 @@ escape_city = "Transport Embark", "Enter Hut", "Enter Hut 2", "Unit Move" help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -482,7 +482,7 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -723,8 +723,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "DiplRel", "War", "Local", FALSE diff --git a/data/civ2/cities.ruleset b/data/civ2/cities.ruleset index 415bcaf5b1..afda100e9a 100644 --- a/data/civ2/cities.ruleset +++ b/data/civ2/cities.ruleset @@ -131,5 +131,5 @@ food_wipe = TRUE gold_wipe = TRUE ; shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index 81bb9a3646..b5c9a4f021 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -2621,8 +2621,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 6389257737..97c58430c8 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -357,12 +357,12 @@ poison_empties_food_stock = FALSE help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -521,7 +521,7 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -895,8 +895,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "DiplRel", "War", "Local", FALSE diff --git a/data/civ2civ3/cities.ruleset b/data/civ2civ3/cities.ruleset index e5cc63a60a..a15aa3daf3 100644 --- a/data/civ2civ3/cities.ruleset +++ b/data/civ2civ3/cities.ruleset @@ -135,5 +135,5 @@ food_wipe = TRUE gold_wipe = TRUE shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index 57f34631fa..01116d11d9 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -4646,8 +4646,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 1d15c3c1ba..404340d294 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -399,12 +399,12 @@ poison_empties_food_stock = FALSE help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -560,7 +560,7 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -997,8 +997,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE diff --git a/data/classic/cities.ruleset b/data/classic/cities.ruleset index 06bf606fd1..22b65a0298 100644 --- a/data/classic/cities.ruleset +++ b/data/classic/cities.ruleset @@ -132,5 +132,5 @@ food_wipe = TRUE gold_wipe = TRUE shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index ab0b075899..a9fb06eb2c 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -2685,8 +2685,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index 84383121a1..29e773f4d3 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -383,12 +383,12 @@ poison_empties_food_stock = FALSE help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -544,7 +544,7 @@ ui_name_enter_marketplace = _("Sell %sGoods%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -963,8 +963,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE diff --git a/data/goldkeep/cities.ruleset b/data/goldkeep/cities.ruleset index e0465e5691..61dc0baf08 100644 --- a/data/goldkeep/cities.ruleset +++ b/data/goldkeep/cities.ruleset @@ -134,5 +134,5 @@ food_wipe = TRUE gold_wipe = TRUE shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/goldkeep/effects.ruleset b/data/goldkeep/effects.ruleset index b5d95e4ac4..4ac372e47e 100644 --- a/data/goldkeep/effects.ruleset +++ b/data/goldkeep/effects.ruleset @@ -3068,8 +3068,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index c9881be4ea..25fc4e5814 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -383,12 +383,12 @@ poison_empties_food_stock = FALSE help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -544,7 +544,7 @@ ui_name_enter_marketplace = _("Sell %sGoods%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -977,8 +977,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE diff --git a/data/granularity/cities.ruleset b/data/granularity/cities.ruleset index 16fb306d59..28e3973a49 100644 --- a/data/granularity/cities.ruleset +++ b/data/granularity/cities.ruleset @@ -96,5 +96,5 @@ conquest_convert_pct = 0 ; percentage which converts to the new nation ; gold_wipe = TRUE ; shield_protected = "EvacuateFirst" -; shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +; shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" ; shield_wipe = FALSE diff --git a/data/multiplayer/cities.ruleset b/data/multiplayer/cities.ruleset index 386ae6ad52..fe63eafbe0 100644 --- a/data/multiplayer/cities.ruleset +++ b/data/multiplayer/cities.ruleset @@ -131,5 +131,5 @@ food_wipe = TRUE gold_wipe = TRUE shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index bc528cb1df..2a06c1adc0 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -383,12 +383,12 @@ poison_empties_food_stock = FALSE help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -538,7 +538,7 @@ ui_name_investigate_city_spend_unit = _("%sInvestigate City (spends the unit)%s" ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -954,8 +954,8 @@ target_reqs = "Building", "Palace", "Local", FALSE } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE diff --git a/data/sandbox/cities.ruleset b/data/sandbox/cities.ruleset index 44c11f6e54..6b36b6ffcf 100644 --- a/data/sandbox/cities.ruleset +++ b/data/sandbox/cities.ruleset @@ -127,17 +127,17 @@ conquest_convert_pct = 25 ; percentage which converts to the new nation food_protected = "GameLoss" food_unit_act = "Explode Nuclear", "Help Wonder", "Join City", "Establish Trade Route", "Enter Marketplace", - "Recycle Unit" + "Disband Unit Recover" food_wipe = TRUE gold_protected = "GameLoss" gold_unit_act = "Explode Nuclear", "Help Wonder", "Join City", "Establish Trade Route", "Enter Marketplace", - "Recycle Unit" + "Disband Unit Recover" gold_wipe = TRUE shield_protected = "GameLoss" shield_unit_act = "Explode Nuclear", "Help Wonder", "Join City", "Establish Trade Route", "Enter Marketplace", - "Recycle Unit" + "Disband Unit Recover" shield_wipe = TRUE diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index 2beb8280f0..92c2743e32 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -5361,8 +5361,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 72a630098b..06f2e3bde5 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -410,12 +410,12 @@ steal_maps_reveals_all_cities = TRUE help_wonder_max_range = 1 ; The maximum distance from the actor unit to the target of the -; "Recycle Unit" action. The value 0 means that the target`s tile must be the +; "Disband Unit Recover" action. The value 0 means that the target`s tile must be the ; tile of the actor unit. The value 1 means that the city must be on a tile ; adjacent to the actor unit. The special value "unlimited" lifts the ; maximum distance restriction. The maximum distance can`t be smaller than ; the minimum distance. -recycle_unit_max_range = 1 +disband_unit_recover_max_range = 1 ; The maximum distance from the actor unit to the target of the "Bombard" ; action. The value 1 means that the targets must be on a tile adjacent to @@ -577,7 +577,7 @@ ui_name_enter_marketplace = _("Enter %sMarketplace%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -1382,8 +1382,8 @@ target_reqs = "Building", "Treuga Dei", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE @@ -1394,8 +1394,8 @@ actor_reqs = "DiplRel", "Peace", "Local", FALSE } -[actionenabler_recycle_unit_consensus] -action = "Recycle Unit" +[actionenabler_disband_unit_recover_consensus] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE diff --git a/data/stub/cities.ruleset b/data/stub/cities.ruleset index 402cb2dd6f..e8a28b2108 100644 --- a/data/stub/cities.ruleset +++ b/data/stub/cities.ruleset @@ -90,5 +90,5 @@ conquest_convert_pct = 0 ; percentage which converts to the new nation ; gold_wipe = TRUE ; shield_protected = "EvacuateFirst" -; shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +; shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" ; shield_wipe = FALSE diff --git a/data/webperimental/cities.ruleset b/data/webperimental/cities.ruleset index 5c15327335..6f59cc3f84 100644 --- a/data/webperimental/cities.ruleset +++ b/data/webperimental/cities.ruleset @@ -132,5 +132,5 @@ food_wipe = TRUE gold_wipe = TRUE shield_protected = "EvacuateFirst" -shield_unit_act = "Help Wonder", "Recycle Unit", "Disband Unit" +shield_unit_act = "Help Wonder", "Disband Unit Recover", "Disband Unit" shield_wipe = FALSE diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index 357c886411..1f3d70da98 100644 --- a/data/webperimental/effects.ruleset +++ b/data/webperimental/effects.ruleset @@ -2971,8 +2971,8 @@ reqs = type = "Unit_Shield_Value_Pct" value = -50 reqs = - { "type", "name", "range", "present" - "Action", "Recycle Unit", "Local", TRUE + { "type", "name", "range", "present" + "Action", "Disband Unit Recover", "Local", TRUE } [effect_unit_shield_value_in_upgrade_price_calc] diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 7f753557ba..ce473fa5fa 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -532,7 +532,7 @@ ui_name_enter_marketplace = _("Sell %sGoods%s") ui_name_help_wonder = _("Help %sbuild Wonder%s") ; /* TRANS: Dis_band recovering production (100% chance of success). */ -ui_name_recycle_unit = _("Dis%sband recovering production%s") +ui_name_disband_unit_recover = _("Dis%sband recovering production%s") ; /* TRANS: Dis_band without recovering production (100% chance of success). */ ui_name_disband_unit = _("Dis%sband without recovering production%s") @@ -1118,8 +1118,8 @@ target_reqs = "BuildingGenus", "GreatWonder", "Local" } -[actionenabler_recycle_unit] -action = "Recycle Unit" +[actionenabler_disband_unit_recover] +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE diff --git a/doc/README.actions b/doc/README.actions index 84b7f68492..bed9b5a82b 100644 --- a/doc/README.actions +++ b/doc/README.actions @@ -471,14 +471,14 @@ Actions done by a unit against a city help_wonder_max_range is 1) * target city must need the extra shields to complete its production. -"Recycle Unit" - Add half the shields used to build the unit to target - * UI name can be set using ui_name_recycle_unit +"Disband Unit Recover" - Add half the shields used to build the unit to target + * UI name can be set using ui_name_disband_unit_recover * adjustable with the Unit_Shield_Value_Pct effect * actor must be aware that the target exists * "Help Wonder" must be impossible * actor must be on the same tile as the target unless - recycle_unit_max_range allows it to be further away. (Default - recycle_unit_max_range is 1) + disband_unit_recover_max_range allows it to be further away. (Default + disband_unit_recover_max_range is 1) * target city must need the extra shields to complete its production. "Join City" - Add the actor to the target city's population. @@ -1450,7 +1450,7 @@ Actions done by a unit to it self to the shield stock of any city even if the unit is located inside it. * UI name can be set using ui_name_disband_unit * "Help Wonder" must be impossible - * "Recycle Unit" must be impossible + * "Disband Unit Recover" must be impossible "Fortify" - Fortify at tile * UI name can be set using ui_name_fortify diff --git a/doc/README.effects b/doc/README.effects index 8bc9472461..ec40fcc5bb 100644 --- a/doc/README.effects +++ b/doc/README.effects @@ -655,7 +655,7 @@ Unit_Recover Unit_Shield_Value_Pct Increase the unit's value in shields by amount percent. When this effect is used to determine how many shields the player gets for the actions - "Recycle Unit" and "Help Wonder" it gets access to unit state. When it is + "Disband Unit Recover" and "Help Wonder" it gets access to unit state. When it is used to influence the gold cost of "Upgrade Unit" it only has access to unit type. diff --git a/server/actiontools.c b/server/actiontools.c index 9aae537ab9..1d9c11c8da 100644 --- a/server/actiontools.c +++ b/server/actiontools.c @@ -46,7 +46,7 @@ static void action_success_actor_consume(struct action *paction, if (unit_is_alive(actor_id) && utype_is_consumed_by_action(paction, unit_type_get(actor))) { if (action_has_result(paction, ACTRES_DISBAND_UNIT) - || action_has_result(paction, ACTRES_RECYCLE_UNIT)) { + || action_has_result(paction, ACTRES_DISBAND_UNIT_RECOVER)) { wipe_unit(actor, ULR_DISBANDED, NULL); } else if (action_has_result(paction, ACTRES_NUKE) || action_has_result(paction, ACTRES_NUKE_UNITS)) { diff --git a/server/advisors/advdata.c b/server/advisors/advdata.c index 0d8943e44f..8aa5be9d37 100644 --- a/server/advisors/advdata.c +++ b/server/advisors/advdata.c @@ -896,7 +896,7 @@ adv_want adv_gov_action_immunity_want(struct government *gov) case ACTRES_TRADE_ROUTE: case ACTRES_JOIN_CITY: case ACTRES_HELP_WONDER: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: case ACTRES_UPGRADE_UNIT: diff --git a/server/rssanity.c b/server/rssanity.c index 8640b1b0e4..0260a724a9 100644 --- a/server/rssanity.c +++ b/server/rssanity.c @@ -1401,34 +1401,34 @@ bool autoadjust_ruleset_data(void) const enum action_result blocked; const enum action_result blocker; } must_block[] = { - /* Hard code that Help Wonder blocks Recycle Unit. This must be done + /* Hard code that Help Wonder blocks Disband Unit Recover. This must be done * because caravan_shields makes it possible to avoid the - * consequences of choosing to do Recycle Unit rather than having it + * consequences of choosing to do Disband Unit Recover rather than having it * do Help Wonder. * - * Explanation: Recycle Unit adds 50% of the shields used to produce + * Explanation: Disband Unit Recover adds 50% of the shields used to produce * the unit to the production of the city where it is located. Help - * Wonder adds 100%. If a unit that can do Help Wonder is recycled in - * a city and the production later is changed to something that can - * receive help from Help Wonder the remaining 50% of the shields are - * added. This can be done because the city remembers them in - * caravan_shields. + * Wonder adds 100%. If a unit that can do Help Wonder is disbanded with + * production recovery in a city and the production later is changed + * to something that can receive help from Help Wonder the remaining 50% + * of the shields are added. This can be done because the city remembers + * them in caravan_shields. * - * If a unit that can do Help Wonder intentionally is recycled rather - * than making it do Help Wonder its shields will still be + * If a unit that can do Help Wonder intentionally is disbanded with recovery + * rather than making it do Help Wonder its shields will still be * remembered. The target city that got 50% of the shields can * therefore get 100% of them by changing its production. This trick - * makes the ability to select Recycle Unit when Help Wonder is legal + * makes the ability to select Disband Unit Recover when Help Wonder is legal * pointless. */ - { ACTRES_RECYCLE_UNIT, ACTRES_HELP_WONDER }, + { ACTRES_DISBAND_UNIT_RECOVER, ACTRES_HELP_WONDER }, /* Allowing regular disband when ACTION_HELP_WONDER or - * ACTION_RECYCLE_UNIT is legal while ACTION_HELP_WONDER always - * blocks ACTION_RECYCLE_UNIT doesn't work well with the force_* + * ACTION_DISBAND_UNIT_RECOVER is legal while ACTION_HELP_WONDER always + * blocks ACTION_DISBAND_UNIT_RECOVER doesn't work well with the force_* * semantics. Should move to the ruleset once it has blocked_by * semantics. */ { ACTRES_DISBAND_UNIT, ACTRES_HELP_WONDER }, - { ACTRES_DISBAND_UNIT, ACTRES_RECYCLE_UNIT }, + { ACTRES_DISBAND_UNIT, ACTRES_DISBAND_UNIT_RECOVER }, /* Hard code that the ability to perform a regular attack blocks city * conquest. Is redundant as long as the requirement that the target diff --git a/server/savegame/savecompat.c b/server/savegame/savecompat.c index 9b0eeb5326..f39f3730d0 100644 --- a/server/savegame/savecompat.c +++ b/server/savegame/savecompat.c @@ -1559,6 +1559,38 @@ static void compat_load_030100(struct loaddata *loading, } } player_slots_iterate_end; + { + int action_count; + + action_count = secfile_lookup_int_default(loading->file, 0, + "savefile.action_size"); + + if (action_count > 0) { + const char **modname; + const char **savemod; + int j; + const char *dur_name = "Disband Unit Recover"; + + modname = secfile_lookup_str_vec(loading->file, &loading->action.size, + "savefile.action_vector"); + + savemod = fc_calloc(action_count, sizeof(*savemod)); + + for (j = 0; j < action_count; j++) { + if (!strcasecmp("Recycle Unit", modname[j])) { + savemod[j] = dur_name; + } else { + savemod[j] = modname[j]; + } + } + + secfile_replace_str_vec(loading->file, savemod, action_count, + "savefile.action_vector"); + + free(savemod); + } + } + /* Server setting migration. */ { int set_count; @@ -2339,6 +2371,38 @@ static void compat_load_dev(struct loaddata *loading) } } } + + { + int action_count; + + action_count = secfile_lookup_int_default(loading->file, 0, + "savefile.action_size"); + + if (action_count > 0) { + const char **modname; + const char **savemod; + int j; + const char *dur_name = "Disband Unit Recover"; + + modname = secfile_lookup_str_vec(loading->file, &loading->action.size, + "savefile.action_vector"); + + savemod = fc_calloc(action_count, sizeof(*savemod)); + + for (j = 0; j < action_count; j++) { + if (!strcasecmp("Recycle Unit", modname[j])) { + savemod[j] = dur_name; + } else { + savemod[j] = modname[j]; + } + } + + secfile_replace_str_vec(loading->file, savemod, action_count, + "savefile.action_vector"); + + free(savemod); + } + } } /* Version < 3.1.92 */ #endif /* FREECIV_DEV_SAVE_COMPAT_3_2 */ diff --git a/server/savegame/savegame2.c b/server/savegame/savegame2.c index b8fd1872d9..d7c411ff1a 100644 --- a/server/savegame/savegame2.c +++ b/server/savegame/savegame2.c @@ -3789,9 +3789,9 @@ static int sg_order_to_action(int order, struct unit *act_unit, * that anyone that intended to order Help Wonder used Help Wonder. */ /* Could in theory be intended as an order to disband in the field. Why * would the player give a unit an order to go to a non city location - * and disband there? Assume the intention was to recycle the unit - * until a non recycle disband order is found. */ - return ACTION_RECYCLE_UNIT; + * and disband there? Assume the intention was to recover production + * until a non recovering disband order is found. */ + return ACTION_DISBAND_UNIT_RECOVER; case ORDER_OLD_HOMECITY: return ACTION_HOME_CITY; } diff --git a/server/unithand.c b/server/unithand.c index 975042addd..90ac93e0de 100644 --- a/server/unithand.c +++ b/server/unithand.c @@ -1037,7 +1037,7 @@ static struct player *need_war_player_hlp(const struct unit *actor, case ACTRES_NUKE_UNITS: case ACTRES_DESTROY_CITY: case ACTRES_EXPEL_UNIT: - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: case ACTRES_DISBAND_UNIT: case ACTRES_HOME_CITY: case ACTRES_HOMELESS: @@ -2790,7 +2790,7 @@ void illegal_action_msg(struct player *pplayer, notify_player(pplayer, unit_tile(actor), event, ftc_server, - /* TRANS: Freight ... Recycle Unit ... Help Wonder ... */ + /* TRANS: Freight ... Disband Unit Recover ... Help Wonder ... */ _("Your %s can't do %s when %s is legal."), unit_name_translation(actor), stop_act_name, @@ -3676,7 +3676,7 @@ bool unit_perform_action(struct player *pplayer, actor_unit, pcity, paction)); break; - case ACTRES_RECYCLE_UNIT: + case ACTRES_DISBAND_UNIT_RECOVER: ACTION_PERFORM_UNIT_CITY(action_type, actor_unit, pcity, unit_do_help_build(pplayer, actor_unit, pcity, paction)); @@ -5536,7 +5536,7 @@ static bool unit_do_help_build(struct player *pplayer, &pcity_dest->production)); pcity_dest->caravan_shields += shields; } else { - fc_assert(action_has_result(paction, ACTRES_RECYCLE_UNIT)); + fc_assert(action_has_result(paction, ACTRES_DISBAND_UNIT_RECOVER)); /* Add the shields from recycling the unit to the city's current * production. */ pcity_dest->shield_stock += shields; @@ -5554,10 +5554,10 @@ static bool unit_do_help_build(struct player *pplayer, * the result of their donation. */ prod = city_production_name_translation(pcity_dest); } else { - fc_assert(action_has_result(paction, ACTRES_RECYCLE_UNIT)); - /* TRANS: Your Caravan does "Recycle Unit" to help build the + fc_assert(action_has_result(paction, ACTRES_DISBAND_UNIT_RECOVER)); + /* TRANS: Your Caravan does "Disband Unit Recover" to help build the * current production in Bergen (4 surplus). - * "Recycle Unit" says "current production" rather than its name. */ + * "Disband Unit Recover" says "current production" rather than its name. */ prod = _("current production"); } -- 2.35.1