From d854387e260ec82dcaf39bbd5b19b209dbc4302a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 24 Sep 2023 02:03:15 +0300 Subject: [PATCH 35/35] Rename unit type flag "Settlers" as "Workers" See osdn #48647 Signed-off-by: Marko Lindqvist --- ai/default/aiferry.c | 4 +- ai/default/daicity.c | 14 +- ai/default/daicity.h | 6 +- ai/default/daidata.c | 2 +- ai/default/daidomestic.c | 4 +- ai/default/daisettler.c | 2 +- ai/default/daitools.c | 2 +- ai/default/daiunit.c | 2 +- ai/tex/texaicity.c | 4 +- client/control.c | 2 +- client/gui-gtk-3.22/menu.c | 6 +- client/gui-gtk-4.0/menu.c | 6 +- client/gui-qt/menu.cpp | 4 +- client/gui-sdl2/dialogs.c | 2 +- client/helpdata.c | 2 +- common/oblig_reqs.c | 4 +- common/unittype.c | 14 ++ common/unittype.h | 9 +- data/alien/actions.ruleset | 28 ++-- data/alien/terrain.ruleset | 16 +-- data/alien/units.ruleset | 10 +- data/civ1/actions.ruleset | 104 +++++++------- data/civ1/terrain.ruleset | 6 +- data/civ1/units.ruleset | 4 +- data/civ2/actions.ruleset | 86 +++++------ data/civ2/terrain.ruleset | 6 +- data/civ2/units.ruleset | 6 +- data/civ2civ3/actions.ruleset | 34 ++--- data/civ2civ3/terrain.ruleset | 12 +- data/civ2civ3/units.ruleset | 12 +- data/classic/actions.ruleset | 94 ++++++------ data/classic/terrain.ruleset | 6 +- data/classic/units.ruleset | 8 +- data/goldkeep/actions.ruleset | 128 ++++++++--------- data/goldkeep/terrain.ruleset | 36 ++--- data/goldkeep/units.ruleset | 8 +- data/granularity/actions.ruleset | 4 +- data/granularity/units.ruleset | 6 +- data/multiplayer/actions.ruleset | 114 +++++++-------- data/multiplayer/terrain.ruleset | 26 ++-- data/multiplayer/units.ruleset | 8 +- data/ruledit/comments-3.3.txt | 2 +- data/sandbox/actions.ruleset | 220 ++++++++++++++--------------- data/sandbox/terrain.ruleset | 14 +- data/sandbox/units.ruleset | 12 +- data/stub/units.ruleset | 4 +- data/webperimental/actions.ruleset | 140 +++++++++--------- data/webperimental/terrain.ruleset | 6 +- data/webperimental/units.ruleset | 8 +- server/advisors/advruleset.c | 2 +- server/advisors/autoworkers.c | 8 +- server/rscompat.c | 12 ++ server/rscompat.h | 1 + server/rssanity.c | 4 +- server/ruleset.c | 5 + server/unittools.c | 2 +- 56 files changed, 663 insertions(+), 628 deletions(-) diff --git a/ai/default/aiferry.c b/ai/default/aiferry.c index 293cbb866b..aed679dfed 100644 --- a/ai/default/aiferry.c +++ b/ai/default/aiferry.c @@ -1193,9 +1193,9 @@ void dai_manage_ferryboat(struct ai_type *ait, struct player *pplayer, fc_assert_ret(NULL != boss); - if (unit_has_type_flag(boss, UTYF_SETTLERS) + if (unit_has_type_flag(boss, UTYF_WORKERS) || unit_is_cityfounder(boss)) { - /* Temporary hack: settlers all go in the end, forcing them + /* Temporary hack: workers all go in the end, forcing them * earlier might mean uninitialised cache, so just wait for them */ return; } diff --git a/ai/default/daicity.c b/ai/default/daicity.c index 07cb4195f5..da102b9c39 100644 --- a/ai/default/daicity.c +++ b/ai/default/daicity.c @@ -293,9 +293,9 @@ static void dai_city_choose_build(struct ai_type *ait, struct player *pplayer, &(city_data->choice), 0)) { adv_choice_set_use(&(city_data->choice), "fallback defender"); CITY_LOG(LOG_DEBUG, pcity, "Building fallback defender"); - } else if (best_role_unit(pcity, UTYF_SETTLERS)) { + } else if (best_role_unit(pcity, UTYF_WORKERS)) { city_data->choice.value.utype - = dai_role_utype_for_terrain_class(pcity, UTYF_SETTLERS, TC_LAND); + = dai_role_utype_for_terrain_class(pcity, UTYF_WORKERS, TC_LAND); city_data->choice.type = CT_CIVILIAN; adv_choice_set_use(&(city_data->choice), "fallback worker"); } else { @@ -742,7 +742,7 @@ static int unit_foodbox_cost(struct unit *punit) Estimates the want for a terrain improver (aka worker) by creating a virtual unit and feeding it to settler_evaluate_improvements(). - TODO: AI does not ship UTYF_SETTLERS around, only UTYF_CITIES - Per + TODO: AI does not ship UTYF_WORKERS around, only UTYF_CITIES - Per **************************************************************************/ static void contemplate_terrain_improvements(struct ai_type *ait, struct city *pcity) @@ -769,10 +769,10 @@ static void contemplate_terrain_improvements(struct ai_type *ait, city_data->worker_want = 0; /* Make sure old want does not stay if we don't want now */ - utype = dai_role_utype_for_terrain_class(pcity, UTYF_SETTLERS, TC_LAND); + utype = dai_role_utype_for_terrain_class(pcity, UTYF_WORKERS, TC_LAND); if (utype == NULL) { - log_debug("No UTYF_SETTLERS role unit available"); + log_debug("No UTYF_WORKERS role unit available"); return; } @@ -836,12 +836,12 @@ static void contemplate_terrain_improvements(struct ai_type *ait, fc_assert(want >= 0); city_data->worker_want = want; - city_data->worker_type = dai_role_utype_for_terrain_class(pcity, UTYF_SETTLERS, + city_data->worker_type = dai_role_utype_for_terrain_class(pcity, UTYF_WORKERS, place >= 0 ? TC_LAND : TC_OCEAN); } /**********************************************************************//** - One of the top level AI functions. It does (by calling other functions): + One of the top level AI functions. It does (by calling other functions): worker allocations, build choices, extra gold spending. diff --git a/ai/default/daicity.h b/ai/default/daicity.h index 2a1633a32d..c8a207f215 100644 --- a/ai/default/daicity.h +++ b/ai/default/daicity.h @@ -58,11 +58,11 @@ struct ai_city { bool diplomat_threat; /* enemy diplomat or spy is near the city */ bool has_diplomat; /* this city has diplomat or spy defender */ - /* These values are for builder (UTYF_SETTLERS) and founder (UTYF_CITIES) units. + /* These values are for builder (UTYF_WORKERS) and founder (UTYF_CITIES) units. * Negative values indicate that the city needs a boat first; * -value is the degree of want in that case. */ - bool founder_boat; /* city founder will need a boat */ - int founder_turn; /* only recalculate every Nth turn */ + bool founder_boat; /* City founder will need a boat */ + int founder_turn; /* Only recalculate every Nth turn */ int founder_want; int worker_want; struct unit_type *worker_type; diff --git a/ai/default/daidata.c b/ai/default/daidata.c index 0e5a413bc5..3b072ade5b 100644 --- a/ai/default/daidata.c +++ b/ai/default/daidata.c @@ -208,7 +208,7 @@ void dai_data_phase_begin(struct ai_type *ait, struct player *pplayer, unit_list_iterate(pplayer->units, punit) { struct tile *ptile = unit_tile(punit); - if (unit_has_type_flag(punit, UTYF_SETTLERS)) { + if (unit_has_type_flag(punit, UTYF_WORKERS)) { Continent_id cont = tile_continent(ptile); if (is_ocean_tile(ptile)) { diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index 364a503302..628573941c 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -522,14 +522,14 @@ struct adv_choice *domestic_advisor_choose_build(struct ai_type *ait, "desires terrain improvers with passion " ADV_WANT_PRINTF, worker_want); dai_choose_role_unit(ait, pplayer, pcity, choice, CT_CIVILIAN, - UTYF_SETTLERS, worker_want, FALSE); + UTYF_WORKERS, worker_want, FALSE); adv_choice_set_use(choice, "worker"); } /* Terrain improvers don't use boats (yet) */ } else if (worker_type == NULL && worker_want > 0) { /* Can't build workers. Lets stimulate science */ - dai_wants_role_unit(ait, pplayer, pcity, UTYF_SETTLERS, worker_want); + dai_wants_role_unit(ait, pplayer, pcity, UTYF_WORKERS, worker_want); } /* Find out desire for city founders */ diff --git a/ai/default/daisettler.c b/ai/default/daisettler.c index d0c76b07e9..a0affb09e0 100644 --- a/ai/default/daisettler.c +++ b/ai/default/daisettler.c @@ -1079,7 +1079,7 @@ BUILD_CITY: /*** Try find some work ***/ - if (unit_has_type_flag(punit, UTYF_SETTLERS)) { + if (unit_has_type_flag(punit, UTYF_WORKERS)) { struct worker_task *best_task; TIMING_LOG(AIT_WORKERS, TIMER_START); diff --git a/ai/default/daitools.c b/ai/default/daitools.c index 623cb195fd..585df192d4 100644 --- a/ai/default/daitools.c +++ b/ai/default/daitools.c @@ -542,7 +542,7 @@ void dai_fill_unit_param(struct ai_type *ait, struct pf_parameter *parameter, parameter->get_zoc = NULL; } - if (unit_has_type_flag(punit, UTYF_SETTLERS)) { + if (unit_has_type_flag(punit, UTYF_WORKERS)) { parameter->get_TB = no_fights; } else if (long_path && unit_is_cityfounder(punit)) { /* Default tile behaviour; diff --git a/ai/default/daiunit.c b/ai/default/daiunit.c index 178b3b3556..e163a73477 100644 --- a/ai/default/daiunit.c +++ b/ai/default/daiunit.c @@ -2671,7 +2671,7 @@ void dai_manage_unit(struct ai_type *ait, struct player *pplayer, dai_manage_diplomat(ait, pplayer, punit); TIMING_LOG(AIT_DIPLOMAT, TIMER_STOP); return; - } else if (unit_has_type_flag(punit, UTYF_SETTLERS) + } else if (unit_has_type_flag(punit, UTYF_WORKERS) || unit_is_cityfounder(punit)) { dai_manage_settler(ait, pplayer, punit); return; diff --git a/ai/tex/texaicity.c b/ai/tex/texaicity.c index db92e1b764..29bc6fe8f3 100644 --- a/ai/tex/texaicity.c +++ b/ai/tex/texaicity.c @@ -184,7 +184,7 @@ static void texai_tile_worker_task_select(struct player *pplayer, /* Do not request activities that already are under way. */ unit_list_iterate(ptile->units, punit) { if (unit_owner(punit) == pplayer - && unit_has_type_flag(punit, UTYF_SETTLERS) + && unit_has_type_flag(punit, UTYF_WORKERS) && punit->activity == action_id_get_activity(act)) { consider = FALSE; break; @@ -317,7 +317,7 @@ static void texai_tile_worker_task_select(struct player *pplayer, /* Do not request activities that already are under way. */ unit_list_iterate(ptile->units, punit) { if (unit_owner(punit) == pplayer - && unit_has_type_flag(punit, UTYF_SETTLERS) + && unit_has_type_flag(punit, UTYF_WORKERS) && punit->activity == action_get_activity(paction)) { consider = FALSE; break; diff --git a/client/control.c b/client/control.c index a9b2554b79..e95c59820d 100644 --- a/client/control.c +++ b/client/control.c @@ -1426,7 +1426,7 @@ bool can_unit_do_connect(struct unit *punit, case ACTIVITY_IRRIGATE: /* Special case for irrigation: only irrigate to make S_IRRIGATION, * never to transform tiles. */ - if (!unit_has_type_flag(punit, UTYF_SETTLERS)) { + if (!unit_has_type_flag(punit, UTYF_WORKERS)) { return FALSE; } if (tile_has_extra(ptile, tgt)) { diff --git a/client/gui-gtk-3.22/menu.c b/client/gui-gtk-3.22/menu.c index 3a3cfacd13..e9717470a7 100644 --- a/client/gui-gtk-3.22/menu.c +++ b/client/gui-gtk-3.22/menu.c @@ -2684,7 +2684,7 @@ void real_menus_update(void) if (units_can_do_action(punits, ACTION_TRADE_ROUTE, TRUE)) { menus_rename("BUILD_ROAD", action_get_ui_name_mnemonic(ACTION_TRADE_ROUTE, "_")); - } else if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + } else if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { char road_item[500]; struct extra_type *pextra = NULL; @@ -2755,7 +2755,7 @@ void real_menus_update(void) pterrain = tile_terrain(unit_tile(first)); - if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { struct extra_type *pextra = NULL; /* FIXME: this overloading doesn't work well with multiple focus @@ -2787,7 +2787,7 @@ void real_menus_update(void) sz_strlcpy(cultext, _("_Cultivate")); } - if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { struct extra_type *pextra = NULL; /* FIXME: this overloading doesn't work well with multiple focus diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c index 32425f48cb..e6f5d8bcea 100644 --- a/client/gui-gtk-4.0/menu.c +++ b/client/gui-gtk-4.0/menu.c @@ -3939,7 +3939,7 @@ void real_menus_update(void) if (units_can_do_action(punits, ACTION_TRADE_ROUTE, TRUE)) { menus_rename("BUILD_ROAD", action_get_ui_name_mnemonic(ACTION_TRADE_ROUTE, "_")); - } else if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + } else if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { char road_item[500]; struct extra_type *pextra = NULL; @@ -4009,7 +4009,7 @@ void real_menus_update(void) pterrain = tile_terrain(unit_tile(first)); - if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { struct extra_type *pextra = NULL; /* FIXME: this overloading doesn't work well with multiple focus @@ -4041,7 +4041,7 @@ void real_menus_update(void) sz_strlcpy(cultext, _("_Cultivate")); } - if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { struct extra_type *pextra = NULL; /* FIXME: this overloading doesn't work well with multiple focus diff --git a/client/gui-qt/menu.cpp b/client/gui-qt/menu.cpp index a6cad0590f..09ecebf7a8 100644 --- a/client/gui-qt/menu.cpp +++ b/client/gui-qt/menu.cpp @@ -2153,7 +2153,7 @@ void mr_menu::menus_sensitive() } if (units_all_same_tile) { - if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { struct extra_type *pextra = NULL; /* FIXME: this overloading doesn't work well with multiple focus @@ -2186,7 +2186,7 @@ void mr_menu::menus_sensitive() i.value()->setEnabled(true); } if (units_all_same_tile) { - if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) { + if (units_have_type_flag(punits, UTYF_WORKERS, TRUE)) { struct extra_type *pextra = NULL; /* FIXME: this overloading doesn't work well with multiple focus diff --git a/client/gui-sdl2/dialogs.c b/client/gui-sdl2/dialogs.c index 4fd1fef204..c751716547 100644 --- a/client/gui-sdl2/dialogs.c +++ b/client/gui-sdl2/dialogs.c @@ -1865,7 +1865,7 @@ void popup_advanced_terrain_dialog(struct tile *ptile, /* ----------- */ #if 0 /* FIXME: specific connect buttons */ - if (unit_has_type_flag(focus_unit, UTYF_SETTLERS)) { + if (unit_has_type_flag(focus_unit, UTYF_WORKERS)) { create_active_iconlabel(buf, pwindow->dst->surface, pstr, _("Connect here"), connect_here_callback); buf->data.cont = cont; diff --git a/client/helpdata.c b/client/helpdata.c index 6db0fd566d..1c25328486 100644 --- a/client/helpdata.c +++ b/client/helpdata.c @@ -3171,7 +3171,7 @@ char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer, BULLET); } } - if (utype_has_flag(utype, UTYF_SETTLERS)) { + if (utype_has_flag(utype, UTYF_WORKERS)) { CATLSTR(buf, bufsz, /* TRANS: indented; preserve leading spaces */ _(" %s Veterans work faster.\n"), BULLET); diff --git a/common/oblig_reqs.c b/common/oblig_reqs.c index 5ce16daf85..3ffe36499c 100644 --- a/common/oblig_reqs.c +++ b/common/oblig_reqs.c @@ -404,11 +404,11 @@ void hard_code_oblig_hard_reqs(void) * unit type flag. */ oblig_hard_req_register(req_from_values(VUT_UTFLAG, REQ_RANGE_LOCAL, FALSE, FALSE, TRUE, - UTYF_SETTLERS), + UTYF_WORKERS), FALSE, N_("All action enablers for %s must require" " that the actor has" - " the Settlers utype flag."), + " the Workers utype flag."), ACTRES_TRANSFORM_TERRAIN, ACTRES_CULTIVATE, ACTRES_PLANT, diff --git a/common/unittype.c b/common/unittype.c index 4363779350..ec192c964e 100644 --- a/common/unittype.c +++ b/common/unittype.c @@ -2995,3 +2995,17 @@ bool utype_flag_is_in_use(enum unit_type_flag_id uflag) /* No users detected. */ return FALSE; } + +/**********************************************************************//** + Specenum callback to update old enum names to current ones. +**************************************************************************/ +const char *unit_type_flag_id_name_update_cb(const char *old_name) +{ + if (is_ruleset_compat_mode()) { + if (!strcasecmp("Settlers", old_name)) { + return "Workers"; + } + } + + return old_name; +} diff --git a/common/unittype.h b/common/unittype.h index 271a91c925..edc3602016 100644 --- a/common/unittype.h +++ b/common/unittype.h @@ -174,6 +174,8 @@ struct unit_class { } cache; }; +const char *unit_type_flag_id_name_update_cb(const char *old_name); + /* Unit "special effects" flags: * Note this is now an enumerated type, and not power-of-two integers * for bits, though unit_type.flags is still a bitfield, and code @@ -205,8 +207,8 @@ struct unit_class { #define SPECENUM_VALUE6 UTYF_NEVER_PROTECTS #define SPECENUM_VALUE6NAME N_("?unitflag:NeverProtects") /* Does not include ability to found cities */ -#define SPECENUM_VALUE7 UTYF_SETTLERS -#define SPECENUM_VALUE7NAME N_("?unitflag:Settlers") +#define SPECENUM_VALUE7 UTYF_WORKERS +#define SPECENUM_VALUE7NAME N_("?unitflag:Workers") #define SPECENUM_VALUE8 UTYF_DIPLOMAT #define SPECENUM_VALUE8NAME N_("?unitflag:Diplomat") /* Can't leave the coast */ @@ -335,6 +337,7 @@ struct unit_class { #define UTYF_LAST_USER_FLAG UTYF_USER_FLAG_51 #define MAX_NUM_USER_UNIT_FLAGS (UTYF_LAST_USER_FLAG - UTYF_USER_FLAG_1 + 1) #define SPECENUM_NAMEOVERRIDE +#define SPECENUM_NAME_UPDATER #define SPECENUM_BITVECTOR bv_unit_type_flags #include "specenum_gen.h" @@ -344,7 +347,7 @@ struct unit_class { but determine which units are used (mainly by the server or AI) in various circumstances, or "roles". Note that in some cases flags can act as roles, eg, we don't need - a role for "settlers", because we can just use UTYF_SETTLERS. + a role for "workers", because we can just use UTYF_WORKERS. (Now have to consider ACTION_FOUND_CITY too) So we make sure flag values and role values are distinct, so some functions can use them interchangably. diff --git a/data/alien/actions.ruleset b/data/alien/actions.ruleset index 5103fe9bf5..0b68e2d209 100644 --- a/data/alien/actions.ruleset +++ b/data/alien/actions.ruleset @@ -726,14 +726,14 @@ actor_reqs = action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_pillage] @@ -747,7 +747,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -774,7 +774,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -785,7 +785,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -796,7 +796,7 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range", "present" @@ -808,7 +808,7 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Burrowing", "Player" } target_reqs = @@ -820,7 +820,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers" , "Local" + "UnitFlag", "Workers", "Local" "Tech", "Manufacturing", "Player" } target_reqs = @@ -833,7 +833,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Manufacturing", "Player" } target_reqs = @@ -846,7 +846,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Manufacturing", "Player" } target_reqs = @@ -859,7 +859,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Water Flow", "Player" } target_reqs = @@ -872,7 +872,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Water Flow", "Player" } target_reqs = @@ -885,7 +885,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Water Flow", "Player" } target_reqs = @@ -898,7 +898,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Deep Pumping", "Player" } target_reqs = diff --git a/data/alien/terrain.ruleset b/data/alien/terrain.ruleset index a29674dd58..b4952d88ef 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -979,7 +979,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Strong Force", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1007,7 +1007,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Force Channeling", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1034,7 +1034,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Commercial Antigravity", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1060,7 +1060,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 0 @@ -1091,7 +1091,7 @@ reqs = { "type", "name", "range" "Tech", "Brute Force", "Player" "Extra", "Road", "Tile" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 3 @@ -1120,7 +1120,7 @@ reqs = { "type", "name", "range" "Tech", "Maglev", "Player" "Extra", "Highway", "Tile" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 3 @@ -1151,7 +1151,7 @@ rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Strong Resistance", "Player" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainFlag", "Radiating", "Tile" "TerrainClass", "Land", "Tile" ; Needed explicitly for automatic move type assignment } @@ -1182,7 +1182,7 @@ rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Burrowing", "Player" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Oceanic", "Tile" } build_time = 3 diff --git a/data/alien/units.ruleset b/data/alien/units.ruleset index 8bd1e95aeb..e98644d122 100644 --- a/data/alien/units.ruleset +++ b/data/alien/units.ruleset @@ -327,7 +327,7 @@ flags = "Missile", "DoesntOccupyTile" ; less ; "FieldUnit" = cause unhappiness even when not being aggressive ; "AttackAny" = can attack unreachable units -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -540,7 +540,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil" +flags = "Workers", "Cant_Fortify", "NonMil" roles = "Settlers", "WorkerStartUnit" helptext = _("\ This is Earth technology engineer.\ @@ -576,7 +576,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil" +flags = "Workers", "Cant_Fortify", "NonMil" roles = "Settlers" helptext = _("\ Native version of the Engineer unit.\ @@ -613,7 +613,7 @@ uk_food = 0 uk_gold = 0 city_size = 2 tp_defense = "Alight" -flags = "Cities", "Settlers", "Cant_Fortify", "NonMil" +flags = "Cities", "Workers", "Cant_Fortify", "NonMil" roles = "Settlers" helptext = _("\ Amphibious Engineer that can also establish new cities on Ocean. \ @@ -1001,7 +1001,7 @@ uk_food = 0 uk_gold = 0 tp_defense = "Alight" targets = "Antigravity", "Burrowing" -flags = "Settlers", "Capturer", "NeverProtects" +flags = "Workers", "Capturer", "NeverProtects" roles = "Hunter" helptext = _("\ Burrowing unit that also has capability to attack Antigravity units with \ diff --git a/data/civ1/actions.ruleset b/data/civ1/actions.ruleset index a231645dd6..9a0bb18d9c 100644 --- a/data/civ1/actions.ruleset +++ b/data/civ1/actions.ruleset @@ -353,7 +353,7 @@ quiet_actions = "Enter Hut 2", "Unit Move" ; */ <-- avoid gettext warnings [actionenabler_sabotage_city] -action = "Sabotage City" +action = "Sabotage City" actor_reqs = { "type", "name", "range" "UnitFlag", "Diplomat", "Local" @@ -363,7 +363,7 @@ actor_reqs = } [actionenabler_establish_embassy] -action = "Establish Embassy Stay" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -372,13 +372,13 @@ actor_reqs = "DiplRel", "Foreign", "Local", TRUE "DiplRel", "Has real embassy", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "NationGroup", "Barbarian", "Player", FALSE } [actionenabler_investigate_city] -action = "Investigate City Spend Unit" +action = "Investigate City Spend Unit" actor_reqs = { "type", "name", "range" "UnitFlag", "Diplomat", "Local" @@ -388,7 +388,7 @@ actor_reqs = } [actionenabler_steal_tech_random] -action = "Steal Tech" +action = "Steal Tech" actor_reqs = { "type", "name", "range" "UnitFlag", "Diplomat", "Local" @@ -396,13 +396,13 @@ actor_reqs = "MinMoveFrags", "1", "Local" "DiplRel", "Foreign", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "NationGroup", "Barbarian", "Player", FALSE } [actionenabler_incite_city] -action = "Incite City" +action = "Incite City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -412,14 +412,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Gov", "Democracy", "Player", FALSE "Building", "Palace", "City", FALSE } [actionenabler_bribe_unit] -action = "Bribe Unit" +action = "Bribe Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -429,7 +429,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE "Gov", "Democracy", "Player", FALSE @@ -437,7 +437,7 @@ target_reqs = } [actionenabler_trade_route] -action = "Establish Trade Route" +action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "TradeRoute", "Local", TRUE @@ -445,7 +445,7 @@ actor_reqs = } [actionenabler_marketplace] -action = "Enter Marketplace" +action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "TradeRoute", "Local", TRUE @@ -453,19 +453,19 @@ actor_reqs = } [actionenabler_help_build_wonder] -action = "Help Wonder" +action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Foreign", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range" "BuildingGenus", "GreatWonder", "Local" } [actionenabler_disband_unit_recover] -action = "Disband Unit Recover" +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "DiplRel", "War", "Local", FALSE @@ -475,24 +475,24 @@ actor_reqs = } [actionenabler_disband_unit] -action = "Disband Unit" +action = "Disband Unit" [actionenabler_build_city_pioneer] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", FALSE "TerrainFlag","NoCities","Tile",FALSE } [actionenabler_build_city_domestic] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Cities", "Local", TRUE @@ -500,14 +500,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "NoCities", "Tile", FALSE } [actionenabler_join_city] -action = "Join City" +action = "Join City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "AddToCity", "Local", TRUE @@ -516,15 +516,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = +action = "Explode Nuclear" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -532,20 +532,20 @@ actor_reqs = } [actionenabler_nuke_units] -action = "Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE } [actionenabler_attack_from_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -556,7 +556,7 @@ actor_reqs = } [actionenabler_attack_uclass_sea] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -567,7 +567,7 @@ actor_reqs = } [actionenabler_explode_missile] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -577,7 +577,7 @@ actor_reqs = } [actionenabler_conquer_city_native] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -586,13 +586,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitState", "HasHomeCity", "Local", TRUE @@ -603,14 +603,14 @@ actor_reqs = action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } target_reqs = { "type", "name", "range", "present" @@ -628,7 +628,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -655,7 +655,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -666,7 +666,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -677,9 +677,9 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainAlter", "CanMine", "Tile" } @@ -688,9 +688,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -700,9 +700,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "River", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -712,9 +712,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "Irrigation", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -727,7 +727,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -749,7 +749,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -776,15 +776,15 @@ actor_reqs = "DiplRel", "Peace", "Local", FALSE "DiplRel", "Never met", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" ; use "Transport Board" from inside the city "CityTile", "Center", "Tile", FALSE } [actionenabler_regular_move] -action = "Unit Move" -actor_reqs = +action = "Unit Move" +actor_reqs = { "type", "name", "range", "present" "MinMoveFrags", "1", "Local", TRUE "UnitState", "Transported", "Local", FALSE diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset index 051d53f38b..25cbb5c62d 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -1128,7 +1128,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1160,7 +1160,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 0 @@ -1195,7 +1195,7 @@ reqs = { "type", "name", "range", "present" "Tech", "Railroad", "Player", TRUE "Extra", "Road", "Tile", TRUE - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "TerrainClass", "Land", "Tile", TRUE "CityTile", "Center", "Tile", FALSE } diff --git a/data/civ1/units.ruleset b/data/civ1/units.ruleset index 4dd2a2419d..b20238ab5c 100644 --- a/data/civ1/units.ruleset +++ b/data/civ1/units.ruleset @@ -302,7 +302,7 @@ flags = "Missile", "Unreachable", "HutNothing" ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -456,7 +456,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "AddToCity", "Cities", "NoVeteran" +flags = "Workers", "Cant_Fortify", "NonMil", "AddToCity", "Cities", "NoVeteran" roles = "Settlers", "WorkerStartUnit", "CitiesStartUnit" helptext = _("\ Settlers are one of the key units in the game, as they are your main \ diff --git a/data/civ2/actions.ruleset b/data/civ2/actions.ruleset index 966c67154a..e4977154f0 100644 --- a/data/civ2/actions.ruleset +++ b/data/civ2/actions.ruleset @@ -683,7 +683,7 @@ target_reqs = } [actionenabler_join_city] -action = "Join City" +action = "Join City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "AddToCity", "Local", TRUE @@ -692,15 +692,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = +action = "Explode Nuclear" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -708,20 +708,20 @@ actor_reqs = } [actionenabler_nuke_units] -action = "Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE } [actionenabler_attack_from_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -732,7 +732,7 @@ actor_reqs = } [actionenabler_attack_marines] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -743,7 +743,7 @@ actor_reqs = } [actionenabler_attack_uclass_sea] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -754,7 +754,7 @@ actor_reqs = } [actionenabler_explode_missile] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -764,7 +764,7 @@ actor_reqs = } [actionenabler_conquer_city_native] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -773,13 +773,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_conquer_city_marines] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -788,13 +788,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitFlag", "Marines", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitState", "HasHomeCity", "Local", TRUE @@ -802,7 +802,7 @@ actor_reqs = } [actionenabler_paradrop_base_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -819,7 +819,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -834,7 +834,7 @@ target_reqs = } [actionenabler_paradrop_base_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -852,7 +852,7 @@ target_reqs = } [actionenabler_paradrop_city_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -869,7 +869,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -884,7 +884,7 @@ target_reqs = } [actionenabler_paradrop_city_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -902,7 +902,7 @@ target_reqs = } [actionenabler_airlift_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClass", "Land", "Local", TRUE @@ -916,21 +916,21 @@ action = "Transform Terrain" actor_reqs = { "type", "name", "range" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_pillage] @@ -944,7 +944,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -971,7 +971,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -982,7 +982,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -993,9 +993,9 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainAlter", "CanMine", "Tile" } @@ -1004,9 +1004,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1016,9 +1016,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "River", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1028,9 +1028,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "Irrigation", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1043,7 +1043,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -1065,7 +1065,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -1092,15 +1092,15 @@ actor_reqs = "DiplRel", "Peace", "Local", FALSE "DiplRel", "Never met", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" ; use "Transport Board" from inside the city "CityTile", "Center", "Tile", FALSE } [actionenabler_regular_move] -action = "Unit Move" -actor_reqs = +action = "Unit Move" +actor_reqs = { "type", "name", "range", "present" "MinMoveFrags", "1", "Local", TRUE "UnitState", "Transported", "Local", FALSE diff --git a/data/civ2/terrain.ruleset b/data/civ2/terrain.ruleset index fff69ff177..53e41d39c6 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -1233,7 +1233,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1299,7 +1299,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 0 @@ -1334,7 +1334,7 @@ reqs = { "type", "name", "range" "Tech", "Railroad", "Player" "Extra", "Road", "Tile" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 3 diff --git a/data/civ2/units.ruleset b/data/civ2/units.ruleset index 269be0ff75..fb89bbffaa 100644 --- a/data/civ2/units.ruleset +++ b/data/civ2/units.ruleset @@ -320,7 +320,7 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -465,7 +465,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "Airbase", +flags = "Workers", "Cant_Fortify", "NonMil", "Airbase", "AddToCity", "Cities", "NoVeteran" roles = "Settlers", "WorkerStartUnit", "CitiesStartUnit" helptext = _("\ @@ -508,7 +508,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "Transform", +flags = "Workers", "Cant_Fortify", "NonMil", "Transform", "Airbase", "AddToCity", "Cities", "NoVeteran" roles = "Settlers", "WorkerStartUnit", "CitiesStartUnit" helptext = _("\ diff --git a/data/civ2civ3/actions.ruleset b/data/civ2civ3/actions.ruleset index a884b7e76a..420ab75213 100644 --- a/data/civ2civ3/actions.ruleset +++ b/data/civ2civ3/actions.ruleset @@ -1086,14 +1086,14 @@ actor_reqs = { "type", "name", "range" "Tech", "Fusion Power", "Player" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -1101,7 +1101,7 @@ actor_reqs = action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -1116,7 +1116,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -1143,7 +1143,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1154,7 +1154,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1165,7 +1165,7 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = @@ -1178,7 +1178,7 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Miniaturization", "Player" } target_reqs = @@ -1199,7 +1199,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "Tech", "Electricity", "Player", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -1213,7 +1213,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = @@ -1227,7 +1227,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = @@ -1241,7 +1241,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "Tech", "Electricity", "Player", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -1255,7 +1255,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = @@ -1269,7 +1269,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = @@ -1283,7 +1283,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "Tech", "Electricity", "Player", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -1297,7 +1297,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = @@ -1311,7 +1311,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } target_reqs = diff --git a/data/civ2civ3/terrain.ruleset b/data/civ2civ3/terrain.ruleset index d6ea3f1fcf..e60437d6f2 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -1625,7 +1625,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 0 @@ -1668,7 +1668,7 @@ reqs = "Extra", "Airstrip", "Tile", TRUE, FALSE "Tech", "Radio", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE "Extra", "River", "Tile", FALSE, FALSE } @@ -1710,7 +1710,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE "TerrainClass", "Oceanic", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1763,7 +1763,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitClass", "Sea", "Local", FALSE, TRUE "TerrainClass", "Land", "Tile", TRUE, FALSE } @@ -1801,7 +1801,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Railroad", "Player", TRUE, FALSE "Extra", "Road", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitClass", "Sea", "Local", FALSE, TRUE "TerrainClass", "Land", "Tile", TRUE, FALSE } @@ -1841,7 +1841,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Superconductors", "Player", TRUE, FALSE "Extra", "Railroad", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitClass", "Sea", "Local", FALSE, TRUE "TerrainClass", "Land", "Tile", TRUE, FALSE } diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index d19822a6aa..55e2ef92c7 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -362,7 +362,7 @@ flags = "Unreachable", "DoesntOccupyTile", "CanPillage", ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -507,7 +507,7 @@ uk_shield = 0 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities", "Fortress" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -555,7 +555,7 @@ uk_shield = 0 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Capturable", "Fortress" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -599,7 +599,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress" +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -641,7 +641,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform" +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform" veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert") veteran_base_raise_chance = 50, 33, 20, 0 veteran_work_raise_chance = 3, 2, 1, 0 @@ -2273,7 +2273,7 @@ uk_food = 1 uk_gold = 1 tp_defense = "Alight" cargo = "Land", "Small Land", "Big Land", "Merchant" -flags = "Settlers", "BadCityDefender", "HasNoZOC", +flags = "Workers", "BadCityDefender", "HasNoZOC", "Provoking", "NonMil" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 diff --git a/data/classic/actions.ruleset b/data/classic/actions.ruleset index 12ff867115..c35847417f 100644 --- a/data/classic/actions.ruleset +++ b/data/classic/actions.ruleset @@ -846,13 +846,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_conquer_city_marines] -action = "Conquer City 2" +action = "Conquer City 2" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -862,13 +862,13 @@ actor_reqs = "UnitFlag", "Marines", "Local", TRUE "UnitState", "OnLivableTile", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NoHome", "Local", FALSE @@ -877,7 +877,7 @@ actor_reqs = } [actionenabler_paradrop_base_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -894,7 +894,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -910,7 +910,7 @@ target_reqs = } [actionenabler_paradrop_base_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -928,7 +928,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -945,7 +945,7 @@ target_reqs = } [actionenabler_paradrop_city_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -962,7 +962,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -978,7 +978,7 @@ target_reqs = } [actionenabler_paradrop_city_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -996,7 +996,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1013,14 +1013,14 @@ target_reqs = } [actionenabler_upgrade_unit] -action = "Upgrade Unit" +action = "Upgrade Unit" actor_reqs = { "type", "name", "range", "present" "DiplRel", "Foreign", "Local", FALSE } [actionenabler_airlift_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClass", "Land", "Local", TRUE @@ -1034,21 +1034,21 @@ action = "Transform Terrain" actor_reqs = { "type", "name", "range" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_pillage] @@ -1062,7 +1062,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -1089,44 +1089,44 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = - { "type", "name", "range" - "TerrainAlter", "CanRoad", "Tile" + { "type", "name", "range" + "TerrainAlter", "CanRoad", "Tile" } [actionenabler_base] action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = - { "type", "name", "range" - "TerrainAlter", "CanBase", "Tile" + { "type", "name", "range" + "TerrainAlter", "CanBase", "Tile" } [actionenabler_mining] action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = - { "type", "name", "range", "present" - "TerrainFlag", "Oil", "Tile", FALSE - "TerrainAlter", "CanMine", "Tile", TRUE +target_reqs = + { "type", "name", "range", "present" + "TerrainFlag", "Oil", "Tile", FALSE + "TerrainAlter", "CanMine", "Tile", TRUE } [actionenabler_desert_oil] action = "Build Mine" actor_reqs = - { "type", "name", "range" - "UnitFlag", "Settlers", "Local" - "Tech", "Construction", "Player" + { "type", "name", "range" + "UnitFlag", "Workers", "Local" + "Tech", "Construction", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Desert", "Tile" } @@ -1135,10 +1135,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Refining", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Glacier", "Tile" } @@ -1147,9 +1147,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1159,9 +1159,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "River", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1171,9 +1171,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "Irrigation", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1186,7 +1186,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -1208,7 +1208,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -1245,8 +1245,8 @@ actor_reqs = } [actionenabler_regular_move] -action = "Unit Move" -actor_reqs = +action = "Unit Move" +actor_reqs = { "type", "name", "range", "present" "MinMoveFrags", "1", "Local", TRUE "UnitState", "Transported", "Local", FALSE @@ -1313,7 +1313,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnNativeTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -1325,7 +1325,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnNativeTile", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } diff --git a/data/classic/terrain.ruleset b/data/classic/terrain.ruleset index ab977a75e9..16297f6688 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/terrain.ruleset @@ -1480,7 +1480,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1600,7 +1600,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 0 @@ -1635,7 +1635,7 @@ reqs = { "type", "name", "range" "Tech", "Railroad", "Player" "Extra", "Road", "Tile" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 3 diff --git a/data/classic/units.ruleset b/data/classic/units.ruleset index 9bbedae406..b9a451c41d 100644 --- a/data/classic/units.ruleset +++ b/data/classic/units.ruleset @@ -330,7 +330,7 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -475,7 +475,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities" +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -524,7 +524,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase" +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -569,7 +569,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Transform", "Airbase" +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Transform", "Airbase" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 diff --git a/data/goldkeep/actions.ruleset b/data/goldkeep/actions.ruleset index b5eb694f00..63c4f597de 100644 --- a/data/goldkeep/actions.ruleset +++ b/data/goldkeep/actions.ruleset @@ -655,14 +655,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Gov", "Democracy", "Player", FALSE "Building", "Palace", "City", FALSE } [actionenabler_bribe_unit] -action = "Bribe Unit" +action = "Bribe Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -672,7 +672,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitFlag", "Unbribable", "Local", FALSE "CityTile", "Center", "Tile", FALSE @@ -680,7 +680,7 @@ target_reqs = } [actionenabler_sabotage_unit] -action = "Sabotage Unit Escape" +action = "Sabotage Unit Escape" actor_reqs = { "type", "name", "range" "UnitFlag", "Spy", "Local" @@ -688,14 +688,14 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE "MinHitPoints", "2", "Local", TRUE } [actionenabler_trade_route] -action = "Establish Trade Route" +action = "Establish Trade Route" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "TradeRoute", "Local", TRUE @@ -703,7 +703,7 @@ actor_reqs = } [actionenabler_marketplace] -action = "Enter Marketplace" +action = "Enter Marketplace" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "TradeRoute", "Local", TRUE @@ -711,19 +711,19 @@ actor_reqs = } [actionenabler_help_build_wonder] -action = "Help Wonder" +action = "Help Wonder" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "HelpWonder", "Local", TRUE "DiplRel", "Foreign", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range" "BuildingGenus", "GreatWonder", "Local" } [actionenabler_disband_unit_recover] -action = "Disband Unit Recover" +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE @@ -734,28 +734,28 @@ actor_reqs = } [actionenabler_disband_unit] -action = "Disband Unit" +action = "Disband Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE } [actionenabler_build_city_pioneer] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", FALSE "TerrainFlag","NoCities","Tile",FALSE } [actionenabler_build_city_domestic] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Cities", "Local", TRUE @@ -763,14 +763,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "NoCities", "Tile", FALSE } [actionenabler_join_city] -action = "Join City" +action = "Join City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "AddToCity", "Local", TRUE @@ -779,15 +779,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = +action = "Explode Nuclear" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -795,20 +795,20 @@ actor_reqs = } [actionenabler_nuke_units] -action = "Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE } [actionenabler_attack_from_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -819,7 +819,7 @@ actor_reqs = } [actionenabler_attack_marines] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -830,7 +830,7 @@ actor_reqs = } [actionenabler_attack_att_from_non_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -841,7 +841,7 @@ actor_reqs = } [actionenabler_explode_missile] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -851,7 +851,7 @@ actor_reqs = } [actionenabler_conquer_city_native] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -860,13 +860,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_conquer_city_marines] -action = "Conquer City 2" +action = "Conquer City 2" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -876,13 +876,13 @@ actor_reqs = "UnitFlag", "Marines", "Local", TRUE "UnitState", "OnLivableTile", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NoHome", "Local", FALSE @@ -891,7 +891,7 @@ actor_reqs = } [actionenabler_paradrop_base_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -908,7 +908,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -924,7 +924,7 @@ target_reqs = } [actionenabler_paradrop_base_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -942,7 +942,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -959,7 +959,7 @@ target_reqs = } [actionenabler_paradrop_city_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -976,7 +976,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -992,7 +992,7 @@ target_reqs = } [actionenabler_paradrop_city_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1010,7 +1010,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1027,14 +1027,14 @@ target_reqs = } [actionenabler_upgrade_unit] -action = "Upgrade Unit" +action = "Upgrade Unit" actor_reqs = { "type", "name", "range", "present" "DiplRel", "Foreign", "Local", FALSE } [actionenabler_airlift_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "Airliftable", "Local", TRUE @@ -1048,21 +1048,21 @@ action = "Transform Terrain" actor_reqs = { "type", "name", "range" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_pillage] @@ -1076,7 +1076,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -1103,7 +1103,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1114,7 +1114,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1125,9 +1125,9 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainFlag", "Oil", "Tile", FALSE "TerrainAlter", "CanMine", "Tile", TRUE @@ -1137,10 +1137,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Construction", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Desert", "Tile" } @@ -1149,10 +1149,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Refining", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Glacier", "Tile" } @@ -1161,9 +1161,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1173,7 +1173,7 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1185,9 +1185,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "Irrigation", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1200,7 +1200,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -1222,7 +1222,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -1367,7 +1367,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnNativeTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -1379,7 +1379,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "CityTile", "Center", "Tile", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -1392,7 +1392,7 @@ actor_reqs = "UnitState", "OnNativeTile", "Local", FALSE "CityTile", "Center", "Tile", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } diff --git a/data/goldkeep/terrain.ruleset b/data/goldkeep/terrain.ruleset index 16c87433b7..bdc7c56d40 100644 --- a/data/goldkeep/terrain.ruleset +++ b/data/goldkeep/terrain.ruleset @@ -1452,11 +1452,11 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range", "present", "quiet" - "Tech", "Construction", "Player", TRUE, FALSE - "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE - "CityTile", "Center", "Tile", FALSE, TRUE + { "type", "name", "range", "present", "quiet" + "Tech", "Construction", "Player", TRUE, FALSE + "TerrainClass", "Land", "Tile", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE + "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 removal_time = 0 @@ -1574,9 +1574,9 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range" - "UnitFlag", "Settlers", "Local" - "TerrainClass", "Land", "Tile" + { "type", "name", "range" + "UnitFlag", "Workers", "Local" + "TerrainClass", "Land", "Tile" } build_time = 0 removal_time = 0 @@ -1609,11 +1609,11 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range" - "Tech", "Railroad", "Player" - "Extra", "Road", "Tile" - "UnitFlag", "Settlers", "Local" - "TerrainClass", "Land", "Tile" + { "type", "name", "range" + "Tech", "Railroad", "Player" + "Extra", "Road", "Tile" + "UnitFlag", "Workers", "Local" + "TerrainClass", "Land", "Tile" } build_time = 3 removal_time = 0 @@ -1648,11 +1648,11 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range" - "Tech", "Superconductors", "Player" - "Extra", "Railroad", "Tile" - "UnitFlag", "Settlers", "Local" - "TerrainClass", "Land", "Tile" + { "type", "name", "range" + "Tech", "Superconductors", "Player" + "Extra", "Railroad", "Tile" + "UnitFlag", "Workers", "Local" + "TerrainClass", "Land", "Tile" } build_time = 3 removal_time = 0 diff --git a/data/goldkeep/units.ruleset b/data/goldkeep/units.ruleset index 8a607efdb4..3d0d5fa62e 100644 --- a/data/goldkeep/units.ruleset +++ b/data/goldkeep/units.ruleset @@ -342,7 +342,7 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -487,7 +487,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities" +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -536,7 +536,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "NonMil", "HasNoZOC", "Airbase" +flags = "Workers", "NonMil", "HasNoZOC", "Airbase" veteran_names = ; /* TRANS: Worker veteran level */ _("?worker_level:apprentice"), @@ -586,7 +586,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "NonMil", "HasNoZOC", "Transform", "Airbase", "Shield2Gold" +flags = "Workers", "NonMil", "HasNoZOC", "Transform", "Airbase", "Shield2Gold" veteran_names = ; /* TRANS: Worker veteran level */ _("?worker_level:apprentice"), diff --git a/data/granularity/actions.ruleset b/data/granularity/actions.ruleset index 4c3d6d8930..e541dd1301 100644 --- a/data/granularity/actions.ruleset +++ b/data/granularity/actions.ruleset @@ -242,14 +242,14 @@ target_reqs = action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_deboard] diff --git a/data/granularity/units.ruleset b/data/granularity/units.ruleset index 96c73b4b30..089f3d48f8 100644 --- a/data/granularity/units.ruleset +++ b/data/granularity/units.ruleset @@ -269,7 +269,7 @@ flags = "TerrainSpeed" ; less ; "FieldUnit" = cause unhappiness even when not being aggressive ; "AttackAny" = can attack unreachable units -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can do diplomat actions (see diplchance server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also ; "CoastStrict" = (sea only) cannot leave coast @@ -413,7 +413,7 @@ uk_shield = 0 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cities" +flags = "Workers", "Cities" roles = "ExplorerStartUnit", "Firstbuild", "CitiesStartUnit" helptext = _("\ Nomads can both fight and found new cities, but unlike specialized\ @@ -589,7 +589,7 @@ uk_shield = 100 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "NonMil" +flags = "Workers", "NonMil" roles = "Settlers", "WorkerStartUnit" helptext = _("\ Workers have the ability to transform terrain by cutting and planting trees\ diff --git a/data/multiplayer/actions.ruleset b/data/multiplayer/actions.ruleset index 4a4f1ef697..d96dd9b4c4 100644 --- a/data/multiplayer/actions.ruleset +++ b/data/multiplayer/actions.ruleset @@ -697,7 +697,7 @@ target_reqs = } [actionenabler_disband_unit_recover] -action = "Disband Unit Recover" +action = "Disband Unit Recover" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE @@ -708,28 +708,28 @@ actor_reqs = } [actionenabler_disband_unit] -action = "Disband Unit" +action = "Disband Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "EvacuateFirst", "Local", FALSE } [actionenabler_build_city_pioneer] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", FALSE "TerrainFlag","NoCities","Tile",FALSE } [actionenabler_build_city_domestic] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Cities", "Local", TRUE @@ -737,14 +737,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "NoCities", "Tile", FALSE } [actionenabler_join_city] -action = "Join City" +action = "Join City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "AddToCity", "Local", TRUE @@ -753,15 +753,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = +action = "Explode Nuclear" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -769,20 +769,20 @@ actor_reqs = } [actionenabler_nuke_units] -action = "Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE } [actionenabler_attack_from_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -793,7 +793,7 @@ actor_reqs = } [actionenabler_attack_marines] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -804,7 +804,7 @@ actor_reqs = } [actionenabler_attack_att_from_non_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -815,7 +815,7 @@ actor_reqs = } [actionenabler_explode_missile] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -825,7 +825,7 @@ actor_reqs = } [actionenabler_conquer_city_native] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -834,13 +834,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_conquer_city_marines] -action = "Conquer City 2" +action = "Conquer City 2" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -850,13 +850,13 @@ actor_reqs = "UnitFlag", "Marines", "Local", TRUE "UnitState", "OnLivableTile", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NoHome", "Local", FALSE @@ -865,7 +865,7 @@ actor_reqs = } [actionenabler_paradrop_base_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -882,7 +882,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -898,7 +898,7 @@ target_reqs = } [actionenabler_paradrop_base_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -916,7 +916,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -933,7 +933,7 @@ target_reqs = } [actionenabler_paradrop_city_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -950,7 +950,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -966,7 +966,7 @@ target_reqs = } [actionenabler_paradrop_city_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -984,7 +984,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1001,14 +1001,14 @@ target_reqs = } [actionenabler_upgrade_unit] -action = "Upgrade Unit" +action = "Upgrade Unit" actor_reqs = { "type", "name", "range", "present" "DiplRel", "Foreign", "Local", FALSE } [actionenabler_airlift_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClass", "Land", "Local", TRUE @@ -1022,21 +1022,21 @@ action = "Transform Terrain" actor_reqs = { "type", "name", "range" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_pillage] @@ -1050,7 +1050,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -1077,7 +1077,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1088,7 +1088,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1099,9 +1099,9 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainFlag", "Oil", "Tile", FALSE "TerrainAlter", "CanMine", "Tile", TRUE @@ -1111,10 +1111,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Construction", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Desert", "Tile" } @@ -1123,10 +1123,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Refining", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Glacier", "Tile" } @@ -1135,9 +1135,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1147,9 +1147,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "River", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1159,9 +1159,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "Irrigation", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1174,7 +1174,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -1196,7 +1196,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -1269,8 +1269,8 @@ actor_reqs = } [actionenabler_regular_move] -action = "Unit Move" -actor_reqs = +action = "Unit Move" +actor_reqs = { "type", "name", "range", "present" "MinMoveFrags", "1", "Local", TRUE "UnitState", "Transported", "Local", FALSE @@ -1301,7 +1301,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnNativeTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -1313,7 +1313,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnNativeTile", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } diff --git a/data/multiplayer/terrain.ruleset b/data/multiplayer/terrain.ruleset index c71df034fc..a4422faadd 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/terrain.ruleset @@ -1449,11 +1449,11 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range", "present", "quiet" - "Tech", "Construction", "Player", TRUE, FALSE - "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE - "CityTile", "Center", "Tile", FALSE, TRUE + { "type", "name", "range", "present", "quiet" + "Tech", "Construction", "Player", TRUE, FALSE + "TerrainClass", "Land", "Tile", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE + "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 removal_time = 0 @@ -1571,9 +1571,9 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range" - "UnitFlag", "Settlers", "Local" - "TerrainClass", "Land", "Tile" + { "type", "name", "range" + "UnitFlag", "Workers", "Local" + "TerrainClass", "Land", "Tile" } build_time = 0 removal_time = 0 @@ -1604,11 +1604,11 @@ rmact_gfx = "None" rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = - { "type", "name", "range" - "Tech", "Railroad", "Player" - "Extra", "Road", "Tile" - "UnitFlag", "Settlers", "Local" - "TerrainClass", "Land", "Tile" + { "type", "name", "range" + "Tech", "Railroad", "Player" + "Extra", "Road", "Tile" + "UnitFlag", "Workers", "Local" + "TerrainClass", "Land", "Tile" } build_time = 3 removal_time = 0 diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset index 0b27011070..0002740e62 100644 --- a/data/multiplayer/units.ruleset +++ b/data/multiplayer/units.ruleset @@ -330,7 +330,7 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -475,7 +475,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "AddToCity", "Cities", "Cant_Fortify" +flags = "Workers", "Infra", "NonMil", "HasNoZOC", "AddToCity", "Cities", "Cant_Fortify" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -525,7 +525,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "Airbase", "Cant_Fortify" +flags = "Workers", "Infra", "NonMil", "HasNoZOC", "Airbase", "Cant_Fortify" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 @@ -570,7 +570,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "Transform", "Airbase", "Cant_Fortify" +flags = "Workers", "Infra", "NonMil", "HasNoZOC", "Transform", "Airbase", "Cant_Fortify" ; No veteran levels (level name is never displayed) veteran_names = _("green") veteran_base_raise_chance = 0 diff --git a/data/ruledit/comments-3.3.txt b/data/ruledit/comments-3.3.txt index 74bc19a77e..cd7e3ebb3e 100644 --- a/data/ruledit/comments-3.3.txt +++ b/data/ruledit/comments-3.3.txt @@ -444,7 +444,7 @@ utypes = "\ ; rather than terrain/road etc cost, unless terrain cost is\n\ ; less\n\ ; \"FieldUnit\" = cause unhappiness even when not being aggressive\n\ -; \"Settlers\" = can irrigate and build roads\n\ +; \"Workers\" = can irrigate and build roads\n\ ; \"Diplomat\" = can defend against diplomat actions (see diplchance\n\ ; server option)\n\ ; \"Spy\" = strong in diplomatic battles. _Must_ be \"Diplomat\" also\n\ diff --git a/data/sandbox/actions.ruleset b/data/sandbox/actions.ruleset index 91f821e38c..78ff7de1d6 100644 --- a/data/sandbox/actions.ruleset +++ b/data/sandbox/actions.ruleset @@ -1153,7 +1153,7 @@ actor_reqs = } [actionenabler_capture] -action = "Capture Units" +action = "Capture Units" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Capturer", "Local", TRUE @@ -1162,7 +1162,7 @@ actor_reqs = "DiplRel", "Foreign", "Local", TRUE "Building", "Treuga Dei", "World", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitFlag", "Capturable", "Local", TRUE "UnitState", "Transporting", "Local", FALSE @@ -1170,7 +1170,7 @@ target_reqs = } [actionenabler_capture_despite_treuga_dei] -action = "Capture Units" +action = "Capture Units" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Capturer", "Local", TRUE, FALSE @@ -1179,7 +1179,7 @@ actor_reqs = "DiplRel", "Foreign", "Local", TRUE, FALSE "Tech", "Communism", "World", TRUE, TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitFlag", "Capturable", "Local", TRUE "UnitState", "Transporting", "Local", FALSE @@ -1187,7 +1187,7 @@ target_reqs = } [actionenabler_bombard_city] -action = "Bombard" +action = "Bombard" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Bombarder", "Local", TRUE @@ -1196,14 +1196,14 @@ actor_reqs = "DiplRel", "War", "Local", TRUE "Building", "Treuga Dei", "World", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "Tile", FALSE "DiplRelTileOther", "War", "Local", TRUE } [actionenabler_bombard_no_city] -action = "Bombard" +action = "Bombard" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Bombarder", "Local", TRUE @@ -1211,14 +1211,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "War", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "Tile", FALSE "CityTile", "Center", "Tile", FALSE } [actionenabler_bombard_city_despite_treuga_dei] -action = "Bombard" +action = "Bombard" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Bombarder", "Local", TRUE, FALSE @@ -1227,14 +1227,14 @@ actor_reqs = "DiplRel", "War", "Local", TRUE, FALSE "Tech", "Communism", "World", TRUE, TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "Tile", FALSE "DiplRelTileOther", "War", "Local", TRUE } [actionenabler_bombard_no_city_despite_treuga_dei] -action = "Bombard" +action = "Bombard" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Bombarder", "Local", TRUE, FALSE @@ -1243,28 +1243,28 @@ actor_reqs = "DiplRel", "War", "Local", TRUE, FALSE "Tech", "Communism", "World", TRUE, TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "Tile", FALSE "CityTile", "Center", "Tile", FALSE } [actionenabler_build_city_pioneer] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", FALSE "TerrainFlag","NoCities","Tile",FALSE } [actionenabler_build_city_domestic] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Cities", "Local", TRUE @@ -1272,14 +1272,14 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "DiplRel", "Foreign", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "NoCities", "Tile", FALSE } [actionenabler_join_city] -action = "Join City" +action = "Join City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "AddToCity", "Local", TRUE @@ -1288,7 +1288,7 @@ actor_reqs = } [actionenabler_border_police] -action = "Expel Unit" +action = "Expel Unit" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "BorderPolice", "Local", TRUE @@ -1299,14 +1299,14 @@ actor_reqs = "DiplRel", "War", "Local", FALSE "MinMoveFrags", "1", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitClassFlag", "Expellable", "Local", TRUE "DiplRelTile", "Foreign", "Local", TRUE } [actionenabler_nuke] -action = "Explode Nuclear" +action = "Explode Nuclear" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NuclearOP", "Local", TRUE @@ -1314,7 +1314,7 @@ actor_reqs = } [actionenabler_nuke_despite_treuga_dei] -action = "Explode Nuclear" +action = "Explode Nuclear" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "NuclearOP", "Local", TRUE, FALSE @@ -1322,8 +1322,8 @@ actor_reqs = } [actionenabler_nuke_city] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE "MinMoveFrags", "1", "Local", TRUE @@ -1331,8 +1331,8 @@ actor_reqs = } [actionenabler_nuke_city_despite_treuga_dei] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Nuclear", "Local", TRUE, FALSE "MinMoveFrags", "1", "Local", TRUE, FALSE @@ -1340,8 +1340,8 @@ actor_reqs = } [actionenabler_nuke_units] -action = "Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "TacticalNuke", "Local", TRUE "Tech", "Rocketry", "Player", TRUE @@ -1351,8 +1351,8 @@ actor_reqs = } [actionenabler_nuke_units_despite_treuga_dei] -action = "Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "TacticalNuke", "Local", TRUE, FALSE "Tech", "Rocketry", "Player", TRUE, FALSE @@ -1362,7 +1362,7 @@ actor_reqs = } [actionenabler_suitcase_nuke] -action = "Suitcase Nuke" +action = "Suitcase Nuke" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Spy", "Local", TRUE @@ -1377,7 +1377,7 @@ actor_reqs = } [actionenabler_suitcase_nuke_despite_treuga_dei] -action = "Suitcase Nuke" +action = "Suitcase Nuke" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Spy", "Local", TRUE, FALSE @@ -1392,7 +1392,7 @@ actor_reqs = } [actionenabler_suitcase_nuke_escape] -action = "Suitcase Nuke Escape" +action = "Suitcase Nuke Escape" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Spy", "Local", TRUE @@ -1407,7 +1407,7 @@ actor_reqs = } [actionenabler_suitcase_nuke_escape_despite_treuga_dei] -action = "Suitcase Nuke Escape" +action = "Suitcase Nuke Escape" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Spy", "Local", TRUE, FALSE @@ -1438,7 +1438,7 @@ actor_reqs = ; TODO: create an international incident (set the Casus_Belli_Success ; effect value to 1000) if "Destroy City" still is overpowered. [actionenabler_scorched_earth] -action = "Destroy City" +action = "Destroy City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "GameLoss", "Local", TRUE @@ -1449,7 +1449,7 @@ actor_reqs = } [actionenabler_scorched_earth_despite_treuga_dei] -action = "Destroy City" +action = "Destroy City" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "GameLoss", "Local", TRUE, FALSE @@ -1460,7 +1460,7 @@ actor_reqs = } [actionenabler_attack_from_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1472,7 +1472,7 @@ actor_reqs = } [actionenabler_attack_from_native_despite_treuga_dei] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "NonMil", "Local", FALSE, FALSE @@ -1484,7 +1484,7 @@ actor_reqs = } [actionenabler_attack_marines] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1496,7 +1496,7 @@ actor_reqs = } [actionenabler_attack_marines_despite_treuga_dei] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "NonMil", "Local", FALSE, FALSE @@ -1508,7 +1508,7 @@ actor_reqs = } [actionenabler_attack_att_from_non_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1520,7 +1520,7 @@ actor_reqs = } [actionenabler_attack_att_from_non_native_despite_treuga_dei] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "NonMil", "Local", FALSE, FALSE @@ -1532,7 +1532,7 @@ actor_reqs = } [actionenabler_explode_missile] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1543,7 +1543,7 @@ actor_reqs = } [actionenabler_explode_missile_despite_treuga_dei] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "NonMil", "Local", FALSE, FALSE @@ -1554,8 +1554,8 @@ actor_reqs = } [actionenabler_wipe_units] -action = "Wipe Units" -actor_reqs = +action = "Wipe Units" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE "DiplRel", "War", "Local", TRUE @@ -1564,8 +1564,8 @@ actor_reqs = } [actionenabler_wipe_units_communism] -action = "Wipe Units" -actor_reqs = +action = "Wipe Units" +actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "NonMil", "Local", FALSE, FALSE "DiplRel", "War", "Local", TRUE, FALSE @@ -1644,7 +1644,7 @@ target_reqs = } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NoHome", "Local", FALSE @@ -1653,7 +1653,7 @@ actor_reqs = } [actionenabler_change_home_city_diplo] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -1661,7 +1661,7 @@ actor_reqs = } [actionenabler_no_home_city] -action = "Unit Make Homeless" +action = "Unit Make Homeless" actor_reqs = { "type", "name", "range", "present" "UnitState", "HasHomeCity", "Local", TRUE @@ -1669,7 +1669,7 @@ actor_reqs = } [actionenabler_paradrop_base_to_claimed_not_forest] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1680,14 +1680,14 @@ actor_reqs = "DiplRel", "War", "Local", FALSE "UnitClassFlag", "HutFrighten", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "DifficultLanding", "Tile", FALSE } [actionenabler_paradrop_base_to_unclaimed_not_forest] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1696,7 +1696,7 @@ actor_reqs = "ExtraFlag", "ParadropFrom", "Tile", TRUE "UnitClassFlag", "HutFrighten", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainFlag", "DifficultLanding", "Tile", FALSE "Extra", "Castle", "Tile", FALSE @@ -1786,7 +1786,7 @@ target_reqs = } [actionenabler_paradrop_veteran_base_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1804,7 +1804,7 @@ target_reqs = } [actionenabler_paradrop_veteran_base_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1903,7 +1903,7 @@ target_reqs = } [actionenabler_paradrop_city_to_claimed_not_forest] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1914,14 +1914,14 @@ actor_reqs = "DiplRel", "War", "Local", FALSE "UnitClassFlag", "HutFrighten", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "DifficultLanding", "Tile", FALSE } [actionenabler_paradrop_city_to_unclaimed_not_forest] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1930,7 +1930,7 @@ actor_reqs = "CityTile", "Center", "Tile", TRUE "UnitClassFlag", "HutFrighten", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", FALSE "Extra", "Castle", "Tile", FALSE @@ -2020,7 +2020,7 @@ target_reqs = } [actionenabler_paradrop_veteran_city_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -2038,7 +2038,7 @@ target_reqs = } [actionenabler_paradrop_veteran_city_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -2097,7 +2097,7 @@ target_reqs = } [actionenabler_paradrop_veteran_city_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -2116,7 +2116,7 @@ target_reqs = } [actionenabler_paradrop_veteran_city_to_unclaimed_base_despite_treuga_dei] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present", "survives" "UnitFlag", "Paratroopers", "Local", TRUE, FALSE @@ -2135,14 +2135,14 @@ target_reqs = } [actionenabler_upgrade_unit] -action = "Upgrade Unit" +action = "Upgrade Unit" actor_reqs = { "type", "name", "range", "present" "DiplRel", "Foreign", "Local", FALSE } [actionenabler_airlift_light_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "LightWeight", "Local", TRUE @@ -2152,7 +2152,7 @@ actor_reqs = } [actionenabler_airlift_medium_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "MediumWeight", "Local", TRUE @@ -2162,13 +2162,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "CityTile", "Center", "Tile", TRUE } -target_reqs = +target_reqs = { "type", "name", "range" "Building", "Airport", "City" } [actionenabler_airlift_heavy_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "HeavyWeight", "Local", TRUE @@ -2178,7 +2178,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "CityTile", "Center", "Tile", TRUE } -target_reqs = +target_reqs = { "type", "name", "range" "Building", "Airport", "City" } @@ -2189,14 +2189,14 @@ actor_reqs = { "type", "name", "range" "Tech", "Fusion Power", "Player" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -2204,7 +2204,7 @@ actor_reqs = action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } @@ -2219,7 +2219,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -2246,7 +2246,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -2257,7 +2257,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -2268,10 +2268,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Terrain", "Deep Ocean", "Tile", FALSE "TerrainAlter", "CanMine", "Tile", TRUE @@ -2281,10 +2281,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Miniaturization", "Player" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Terrain", "Deep Ocean", "Tile", TRUE } @@ -2384,7 +2384,7 @@ actor_reqs = "UnitState", "OnNativeTile", "Local", TRUE "Building", "Treuga Dei", "World", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -2398,7 +2398,7 @@ actor_reqs = "UnitState", "OnNativeTile", "Local", TRUE, FALSE "Tech", "Communism", "World", TRUE, TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -2412,7 +2412,7 @@ actor_reqs = "CityTile", "Center", "Tile", TRUE "Building", "Treuga Dei", "World", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -2426,7 +2426,7 @@ actor_reqs = "CityTile", "Center", "Tile", TRUE, FALSE "Tech", "Communism", "World", TRUE, TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -2441,7 +2441,7 @@ actor_reqs = "CityTile", "Center", "Tile", FALSE "Building", "Treuga Dei", "World", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -2456,7 +2456,7 @@ actor_reqs = "CityTile", "Center", "Tile", FALSE, FALSE "Tech", "Communism", "World", TRUE, TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } @@ -2474,11 +2474,11 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "Tech", "Electricity", "Player", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Extra", "Irrigation", "Tile", FALSE "TerrainAlter", "CanIrrigate", "Tile", TRUE @@ -2488,10 +2488,10 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "CAdjacent", TRUE "Extra", "Irrigation", "Tile", FALSE @@ -2502,10 +2502,10 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "ExtraFlag", "IrrigationSource", "CAdjacent", TRUE "Extra", "Irrigation", "Tile", FALSE @@ -2516,11 +2516,11 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "Tech", "Electricity", "Player", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Terrain", "Desert", "Tile", FALSE "TerrainAlter", "CanIrrigate", "Tile", TRUE @@ -2530,10 +2530,10 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "CAdjacent", TRUE "Terrain", "Desert", "Tile", FALSE @@ -2544,10 +2544,10 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "ExtraFlag", "IrrigationSource", "CAdjacent", TRUE "Terrain", "Desert", "Tile", FALSE @@ -2558,11 +2558,11 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "Tech", "Electricity", "Player", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "Terrain", "Desert", "Tile", TRUE "ExtraFlag", "AllowsFarmlandOnDesert", "Tile", TRUE @@ -2572,10 +2572,10 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainClass", "Oceanic", "CAdjacent", TRUE "Terrain", "Desert", "Tile", TRUE @@ -2586,10 +2586,10 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE "UnitClass", "Sea", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "ExtraFlag", "IrrigationSource", "CAdjacent", TRUE "Terrain", "Desert", "Tile", TRUE @@ -2603,7 +2603,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -2639,7 +2639,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -2655,7 +2655,7 @@ actor_reqs = "DiplRel", "Peace", "Local", FALSE "DiplRel", "Never met", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitState", "Transported", "Local", FALSE } @@ -2671,7 +2671,7 @@ actor_reqs = "DiplRel", "Peace", "Local", FALSE "DiplRel", "Never met", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitState", "Transported", "Local", TRUE } @@ -2731,8 +2731,8 @@ actor_reqs = } [actionenabler_regular_move] -action = "Unit Move" -actor_reqs = +action = "Unit Move" +actor_reqs = { "type", "name", "range", "present" "MinMoveFrags", "1", "Local", TRUE "UnitState", "Transported", "Local", FALSE diff --git a/data/sandbox/terrain.ruleset b/data/sandbox/terrain.ruleset index 896099310b..66652ff90d 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -1660,7 +1660,7 @@ reqs = "Tech", "Construction", "Player", TRUE, FALSE "Tech", "Feudalism", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitFlag", "Fortress", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE "Extra", "River", "Tile", FALSE, FALSE @@ -1699,7 +1699,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 0 @@ -1742,7 +1742,7 @@ reqs = "Extra", "Airstrip", "Tile", TRUE, FALSE "Tech", "Radio", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE "Extra", "River", "Tile", FALSE, FALSE } @@ -1785,7 +1785,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE "TerrainClass", "Oceanic", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } visibility_req = "Radio" @@ -1869,7 +1869,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitClass", "Sea", "Local", FALSE, TRUE "TerrainClass", "Land", "Tile", TRUE, FALSE } @@ -1909,7 +1909,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Railroad", "Player", TRUE, FALSE "Extra", "Road", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitClass", "Sea", "Local", FALSE, TRUE "TerrainClass", "Land", "Tile", TRUE, FALSE } @@ -1949,7 +1949,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Superconductors", "Player", TRUE, FALSE "Extra", "Railroad", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "UnitClass", "Sea", "Local", FALSE, TRUE "TerrainClass", "Land", "Tile", TRUE, FALSE } diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 2e4fe35c1c..cda6821223 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -375,7 +375,7 @@ flags = "Unreachable", "DoesntOccupyTile", "CanPillage", ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -520,7 +520,7 @@ uk_shield = 0 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities", "Fortress", "FleshBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -568,7 +568,7 @@ uk_shield = 0 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Capturable", "Fortress", "FleshBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -612,7 +612,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "FleshBased" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -655,7 +655,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 1 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Fortress", "Transform", "IronBased" veteran_names = _("beginner"), _("seasoned"), _("senior"), _("expert") veteran_base_raise_chance = 50, 33, 20, 0 @@ -2381,7 +2381,7 @@ uk_food = 1 uk_gold = 1 tp_defense = "Alight" cargo = "Land", "Small Land", "Big Land", "Merchant" -flags = "Settlers", "BadCityDefender", "HasNoZOC", +flags = "Workers", "BadCityDefender", "HasNoZOC", "Provoking", "IronBased", "NonMil" veteran_names = _("green"), _("veteran"), _("hardened"), _("elite") veteran_base_raise_chance = 50, 33, 20, 0 diff --git a/data/stub/units.ruleset b/data/stub/units.ruleset index 298738912e..9e9c138661 100644 --- a/data/stub/units.ruleset +++ b/data/stub/units.ruleset @@ -251,7 +251,7 @@ flags = "" ; less ; "FieldUnit" = cause unhappiness even when not being aggressive ; "AttackAny" = can attack unreachable units -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can do diplomat actions (see diplchance server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also ; "CoastStrict" = (sea only) cannot leave coast @@ -395,7 +395,7 @@ uk_shield = 0 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers" +flags = "Workers" roles = "ExplorerStartUnit", "Firstbuild", "CitiesStartUnit" helptext = _("\ This is the only land unit type you can build.\ diff --git a/data/webperimental/actions.ruleset b/data/webperimental/actions.ruleset index 7a898029c0..9259ef0401 100644 --- a/data/webperimental/actions.ruleset +++ b/data/webperimental/actions.ruleset @@ -878,21 +878,21 @@ actor_reqs = } [actionenabler_build_city_pioneer] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", FALSE "TerrainFlag","NoCities","Tile",FALSE } [actionenabler_build_city_occupied] -action = "Found City" +action = "Found City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Cities", "Local", TRUE @@ -904,14 +904,14 @@ actor_reqs = "DiplRel", "Alliance", "Local", FALSE "DiplRel", "Team", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Claimed", "Tile", TRUE "TerrainFlag", "NoCities", "Tile", FALSE } [actionenabler_join_city] -action = "Join City" +action = "Join City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "AddToCity", "Local", TRUE @@ -920,7 +920,7 @@ actor_reqs = } [actionenabler_royal_sapper] -action = "Surgical Strike Building" +action = "Surgical Strike Building" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "GameLoss", "Local", TRUE @@ -929,7 +929,7 @@ actor_reqs = } [actionenabler_heal] -action = "Heal Unit" +action = "Heal Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "GameLoss", "Local", TRUE @@ -941,13 +941,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitFlag", "LightWeight", "Local", TRUE } [actionenabler_convert_to_leader_yatch] -action = "Convert Unit" +action = "Convert Unit" actor_reqs = { "type", "name", "range" "UnitFlag", "GameLoss", "Local" @@ -957,7 +957,7 @@ actor_reqs = ; It is always legal to convert back again. [actionenabler_convert_from_leader_yatch] -action = "Convert Unit" +action = "Convert Unit" actor_reqs = { "type", "name", "range" "UnitType", "Leader Yacht", "Local" @@ -965,7 +965,7 @@ actor_reqs = } [actionenabler_border_police] -action = "Expel Unit" +action = "Expel Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "BorderPolice", "Local", TRUE @@ -976,7 +976,7 @@ actor_reqs = "DiplRel", "War", "Local", FALSE "MinMoveFrags", "1", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "UnitFlag", "Expellable", "Local", TRUE "DiplRelTileOther", "Foreign", "Local", FALSE @@ -999,7 +999,7 @@ target_reqs = ; TODO: create an international incident (set the Casus_Belli_Success ; effect value to 1000) if "Destroy City" still is overpowered. [actionenabler_scorched_earth] -action = "Destroy City" +action = "Destroy City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "GameLoss", "Local", TRUE @@ -1009,15 +1009,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = +action = "Explode Nuclear" +actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action = "Nuke City" -actor_reqs = +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -1025,46 +1025,46 @@ actor_reqs = } [actionenabler_nuke_units] -action ="Nuke Units" -actor_reqs = +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE } [actionenabler_bombard_city] -action = "Bombard" +action = "Bombard" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Bombarder", "Local", TRUE "MinMoveFrags", "1", "Local", TRUE "DiplRel", "War", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "DiplRelTileOther", "War", "Local", TRUE } [actionenabler_bombard_no_city] -action = "Bombard" +action = "Bombard" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Bombarder", "Local", TRUE "MinMoveFrags", "1", "Local", TRUE "DiplRel", "War", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Tile", FALSE } [actionenabler_attack_from_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1075,7 +1075,7 @@ actor_reqs = } [actionenabler_attack_marines] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1086,7 +1086,7 @@ actor_reqs = } [actionenabler_attack_att_from_non_native] -action = "Attack" +action = "Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1097,7 +1097,7 @@ actor_reqs = } [actionenabler_explode_missile] -action = "Suicide Attack" +action = "Suicide Attack" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NonMil", "Local", FALSE @@ -1107,7 +1107,7 @@ actor_reqs = } [actionenabler_conquer_city_native] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -1116,13 +1116,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitState", "OnLivableTile", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_conquer_city_marines] -action = "Conquer City" +action = "Conquer City" actor_reqs = { "type", "name", "range", "present" "UnitClassFlag", "CanOccupyCity", "Local", TRUE @@ -1131,13 +1131,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitFlag", "Marines", "Local", TRUE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "MaxUnitsOnTile", "0", "Tile", TRUE } [actionenabler_change_home_city] -action = "Home City" +action = "Home City" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "NoHome", "Local", FALSE @@ -1145,7 +1145,7 @@ actor_reqs = } [actionenabler_paradrop_base_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1162,7 +1162,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1178,7 +1178,7 @@ target_reqs = } [actionenabler_paradrop_base_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1196,7 +1196,7 @@ target_reqs = } [actionenabler_paradrop_base_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1213,7 +1213,7 @@ target_reqs = } [actionenabler_paradrop_city_to_claimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1230,7 +1230,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed] -action = "Paradrop Unit Enter" +action = "Paradrop Unit Enter" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1246,7 +1246,7 @@ target_reqs = } [actionenabler_paradrop_city_to_war_conquer] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1264,7 +1264,7 @@ target_reqs = } [actionenabler_paradrop_city_to_unclaimed_base] -action = "Paradrop Unit Enter Conquer" +action = "Paradrop Unit Enter Conquer" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Paratroopers", "Local", TRUE @@ -1281,14 +1281,14 @@ target_reqs = } [actionenabler_upgrade_unit] -action = "Upgrade Unit" +action = "Upgrade Unit" actor_reqs = { "type", "name", "range", "present" "DiplRel", "Foreign", "Local", FALSE } [actionenabler_airlift_light_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "LightWeight", "Local", TRUE @@ -1298,7 +1298,7 @@ actor_reqs = } [actionenabler_airlift_medium_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "MediumWeight", "Local", TRUE @@ -1308,13 +1308,13 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "CityTile", "Center", "Tile", TRUE } -target_reqs = +target_reqs = { "type", "name", "range" "Building", "Airport", "City" } [actionenabler_airlift_heavy_unit] -action = "Airlift Unit" +action = "Airlift Unit" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "HeavyWeight", "Local", TRUE @@ -1324,7 +1324,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "CityTile", "Center", "Tile", TRUE } -target_reqs = +target_reqs = { "type", "name", "range" "Building", "Airport", "City" } @@ -1334,21 +1334,21 @@ action = "Transform Terrain" actor_reqs = { "type", "name", "range" "UnitFlag", "Transform", "Local" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } [actionenabler_cultivate] action = "Cultivate" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_plant] action = "Plant" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_pillage] @@ -1362,7 +1362,7 @@ actor_reqs = action = "Clean" actor_reqs = { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE + "UnitFlag", "Workers", "Local", TRUE } [actionenabler_fortify_terrain] @@ -1389,7 +1389,7 @@ actor_reqs = action = "Build Road" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1400,7 +1400,7 @@ target_reqs = action = "Build Base" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } target_reqs = { "type", "name", "range" @@ -1411,9 +1411,9 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range", "present" "TerrainFlag", "Oil", "Tile", FALSE "TerrainAlter", "CanMine", "Tile", TRUE @@ -1423,10 +1423,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Construction", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Desert", "Tile" } @@ -1435,10 +1435,10 @@ target_reqs = action = "Build Mine" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "Tech", "Refining", "Player" } -target_reqs = +target_reqs = { "type", "name", "range" "Terrain", "Glacier", "Tile" } @@ -1447,9 +1447,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1459,9 +1459,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "River", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1471,9 +1471,9 @@ target_reqs = action = "Build Irrigation" actor_reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "Extra", "Irrigation", "CAdjacent" "TerrainAlter", "CanIrrigate", "Tile" @@ -1486,7 +1486,7 @@ actor_reqs = "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } @@ -1508,7 +1508,7 @@ actor_reqs = { "type", "name", "range" "UnitState", "Transporting", "Local" } -target_reqs = +target_reqs = { "type", "name", "range" "UnitState", "OnLivableTile", "Local" "UnitState", "Transported", "Local" @@ -1535,8 +1535,8 @@ actor_reqs = } [actionenabler_regular_move] -action = "Unit Move" -actor_reqs = +action = "Unit Move" +actor_reqs = { "type", "name", "range", "present" "MinMoveFrags", "1", "Local", TRUE "UnitState", "Transported", "Local", FALSE @@ -1574,7 +1574,7 @@ actor_reqs = "MinMoveFrags", "1", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE } -target_reqs = +target_reqs = { "type", "name", "range", "present" "CityTile", "Extras Owned", "Tile", FALSE } diff --git a/data/webperimental/terrain.ruleset b/data/webperimental/terrain.ruleset index 03cf81a50c..2ae233a195 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/terrain.ruleset @@ -1479,7 +1479,7 @@ reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE "TerrainClass", "Land", "Tile", TRUE, FALSE - "UnitFlag", "Settlers", "Local", TRUE, FALSE + "UnitFlag", "Workers", "Local", TRUE, FALSE "CityTile", "Center", "Tile", FALSE, TRUE } build_time = 3 @@ -1599,7 +1599,7 @@ rmact_gfx_alt = "-" rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 0 @@ -1634,7 +1634,7 @@ reqs = { "type", "name", "range" "Tech", "Railroad", "Player" "Extra", "Road", "Tile" - "UnitFlag", "Settlers", "Local" + "UnitFlag", "Workers", "Local" "TerrainClass", "Land", "Tile" } build_time = 3 diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset index f0dbea587f..3debc6ed46 100644 --- a/data/webperimental/units.ruleset +++ b/data/webperimental/units.ruleset @@ -334,7 +334,7 @@ flags = "Unreachable", "DoesntOccupyTile", "HutFrighten" ; rather than terrain/road etc cost, unless terrain cost is ; less ; "FieldUnit" = cause unhappiness even when not being aggressive -; "Settlers" = can irrigate and build roads +; "Workers" = can irrigate and build roads ; "Diplomat" = can defend against diplomat actions (see diplchance ; server option) ; "Spy" = strong in diplomatic battles. _Must_ be "Diplomat" also @@ -479,7 +479,7 @@ uk_shield = 1 uk_food = 1 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity", "Cities", "Expellable", "LightWeight" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -529,7 +529,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase", "Expellable", "LightWeight" ; No veteran levels (level name is never displayed) veteran_names = _("green") @@ -575,7 +575,7 @@ uk_shield = 1 uk_food = 0 uk_gold = 0 tp_defense = "Alight" -flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", +flags = "Workers", "Cant_Fortify", "NonMil", "HasNoZOC", "Transform", "Airbase", "Expellable", "MediumWeight" ; No veteran levels (level name is never displayed) veteran_names = _("green") diff --git a/server/advisors/advruleset.c b/server/advisors/advruleset.c index ea0b1d0c19..1a544f1791 100644 --- a/server/advisors/advruleset.c +++ b/server/advisors/advruleset.c @@ -104,7 +104,7 @@ void adv_units_ruleset_init(void) } unit_class_iterate_end; } - ptype->adv.worker = utype_has_flag(ptype, UTYF_SETTLERS); + ptype->adv.worker = utype_has_flag(ptype, UTYF_WORKERS); } unit_type_iterate_end; /* Initialize autoworkers actions */ diff --git a/server/advisors/autoworkers.c b/server/advisors/autoworkers.c index e527e5680b..99a113ba0d 100644 --- a/server/advisors/autoworkers.c +++ b/server/advisors/autoworkers.c @@ -489,7 +489,7 @@ adv_want worker_evaluate_improvements(const struct civ_map *nmap, unit_list_iterate(ptile->units, aunit) { if (unit_owner(aunit) == pplayer && aunit->id != punit->id - && unit_has_type_flag(aunit, UTYF_SETTLERS)) { + && unit_has_type_flag(aunit, UTYF_WORKERS)) { consider = FALSE; } } unit_list_iterate_end; @@ -859,7 +859,7 @@ struct city *worker_evaluate_city_requests(struct unit *punit, unit_list_iterate(ptask->ptile->units, aunit) { if (unit_owner(aunit) == pplayer && aunit->id != punit->id - && unit_has_type_flag(aunit, UTYF_SETTLERS)) { + && unit_has_type_flag(aunit, UTYF_WORKERS)) { consider = FALSE; } } unit_list_iterate_end; @@ -955,7 +955,7 @@ void auto_worker_findwork(const struct civ_map *nmap, fc_assert_ret(pplayer && punit); fc_assert_ret(unit_is_cityfounder(punit) - || unit_has_type_flag(punit, UTYF_SETTLERS)); + || unit_has_type_flag(punit, UTYF_WORKERS)); /* Have nearby cities requests? */ @@ -985,7 +985,7 @@ void auto_worker_findwork(const struct civ_map *nmap, /*** Try find some work ***/ - if (unit_has_type_flag(punit, UTYF_SETTLERS)) { + if (unit_has_type_flag(punit, UTYF_WORKERS)) { TIMING_LOG(AIT_WORKERS, TIMER_START); worker_evaluate_improvements(nmap, punit, &best_act, &best_target, &best_tile, &path, state); diff --git a/server/rscompat.c b/server/rscompat.c index 998eb0ae94..65c0943490 100644 --- a/server/rscompat.c +++ b/server/rscompat.c @@ -433,3 +433,15 @@ static int first_free_unit_type_user_flag(void) /* All unit type user flags are taken. */ return MAX_NUM_USER_UNIT_FLAGS; } + +/**********************************************************************//** + Convert 3.2 unit type flag name to 3.3 one. +**************************************************************************/ +const char *rscompat_utype_flag_name_3_3(const char *old_name) +{ + if (!strcasecmp("Settlers", old_name)) { + return "Workers"; + } + + return old_name; +} diff --git a/server/rscompat.h b/server/rscompat.h index 546afcdb0b..e459a0a9bd 100644 --- a/server/rscompat.h +++ b/server/rscompat.h @@ -57,6 +57,7 @@ struct requirement_vector *lookup_req_list(struct section_file *file, const char *rfor); /* Functions specific to 3.2 -> 3.3 transition */ +const char *rscompat_utype_flag_name_3_3(const char *old_name); #ifdef __cplusplus } diff --git a/server/rssanity.c b/server/rssanity.c index 6885e124d4..1ca196d82c 100644 --- a/server/rssanity.c +++ b/server/rssanity.c @@ -694,8 +694,8 @@ static bool rs_barbarian_units(rs_conversion_logger logger) static bool rs_common_units(rs_conversion_logger logger) { /* Check some required flags and roles etc: */ - if (num_role_units(UTYF_SETTLERS) == 0) { - ruleset_error(logger, LOG_ERROR, "No flag Settler units"); + if (num_role_units(UTYF_WORKERS) == 0) { + ruleset_error(logger, LOG_ERROR, "No flag Worker units"); return FALSE; } if (num_role_units(L_START_EXPLORER) == 0) { diff --git a/server/ruleset.c b/server/ruleset.c index b29bf6e2b8..46331c5363 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -2122,6 +2122,11 @@ static bool load_ruleset_units(struct section_file *file, if (strcmp(sval, "") == 0) { continue; } + + if (compat->compat_mode && compat->version < RSFORMAT_3_3) { + sval = rscompat_utype_flag_name_3_3(sval); + } + ival = unit_class_flag_id_by_name(sval, fc_strcasecmp); if (!unit_class_flag_id_is_valid(ival)) { ok = FALSE; diff --git a/server/unittools.c b/server/unittools.c index 0ac120a028..3367d2f67c 100644 --- a/server/unittools.c +++ b/server/unittools.c @@ -260,7 +260,7 @@ static bool maybe_become_veteran_real(struct unit *punit, int base_chance, * For example with a base chance of 50% for green units and a modifier * of +50% the end chance is 75%. */ chance = vlevel->base_raise_chance * mod / 100; - } else if (settler && unit_has_type_flag(punit, UTYF_SETTLERS)) { + } else if (settler && unit_has_type_flag(punit, UTYF_WORKERS)) { chance = base_chance * vlevel->work_raise_chance / 100; } else { /* No battle and no work done. */ -- 2.40.1