Make the NoHome utype flag mean "built homeless".

Limit the meaning of the NoHome unit type flag to "built without a home city". Make it up to the ruleset author if the action "Home City" (sometimes) should be permitted for units with the NoHome utype flag. See osdn #41621
freeciv · Feb 22, 2021 · 83ab99c · 83ab99c
1 parent acbd1b6
commit 83ab99c
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 29 deletions.
diff --git a/client/helpdata.c b/client/helpdata.c
@@ -1954,7 +1954,11 @@ char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer,
     }
   }
   if (utype_has_flag(utype, UTYF_NOHOME)) {
-    CATLSTR(buf, bufsz, _("* Never has a home city.\n"));
+    if (utype_can_do_action_result(utype, ACTRES_HOME_CITY)) {
+      CATLSTR(buf, bufsz, _("* Built without a home city.\n"));
+    } else {
+      CATLSTR(buf, bufsz, _("* Never has a home city.\n"));
+    }
   }
   if (utype_has_flag(utype, UTYF_GAMELOSS)) {
     CATLSTR(buf, bufsz, _("* Losing this unit will lose you the game!\n"));

diff --git a/common/actions.c b/common/actions.c
@@ -486,17 +486,6 @@ static void hard_code_oblig_hard_reqs(void)
                           ACTRES_MARKETPLACE,
                           ACTRES_NONE);
 
-  /* Why this is a hard requirement: Preserve semantics of NoHome
-   * flag. Need to replace other uses in game engine before this can
-   * be demoted to a regular unit flag. */
-  oblig_hard_req_register(req_from_values(VUT_UTFLAG, REQ_RANGE_LOCAL,
-                                          FALSE, TRUE, TRUE, UTYF_NOHOME),
-                          FALSE,
-                          N_("All action enablers for %s must require"
-                             " that the actor doesn't have"
-                             " the NoHome utype flag."),
-                          ACTRES_HOME_CITY, ACTRES_NONE);
-
   /* Why this is a hard requirement:
    * - preserve the semantics of the NonMil unit type flag. */
   oblig_hard_req_reg(req_contradiction_or(

diff --git a/data/alien/units.ruleset b/data/alien/units.ruleset
@@ -337,7 +337,7 @@ flags         = "Missile", "DoesntOccupyTile"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset
@@ -368,7 +368,7 @@ flags         = "Unreachable", "DoesntOccupyTile", "CanPillage", "Airliftable"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/classic/units.ruleset b/data/classic/units.ruleset
@@ -344,7 +344,7 @@ flags         = "Unreachable", "DoesntOccupyTile"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/experimental/units.ruleset b/data/experimental/units.ruleset
@@ -356,7 +356,7 @@ flags         = "Unreachable", "DoesntOccupyTile"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/granularity/units.ruleset b/data/granularity/units.ruleset
@@ -281,7 +281,7 @@ flags         = "TerrainSpeed"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset
@@ -344,7 +344,7 @@ flags         = "Unreachable", "DoesntOccupyTile"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/ruledit/comments-3.2.txt b/data/ruledit/comments-3.2.txt
@@ -458,7 +458,7 @@ utypes = "\
 ;                 it encounters another SuperSpy, in which case defender wins;\n\
 ;                 can also be used on non-diplomat units, in which case it can\n\
 ;                 protect cities from diplomats; also 100% spy survival chance\n\
-; \"NoHome\"    = this unit has no homecity and will be free of all upkeep, and\n\
+; \"NoHome\"    = this unit is built with no homecity, free of all upkeep, and\n\
 ;                 therefore will not revolt along with its city of origin should\n\
 ;                 it be incited\n\
 ; \"NoVeteran\"   = this unit cannot gain veteran levels through experience\n\

diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset
@@ -380,7 +380,7 @@ flags         = "Unreachable", "DoesntOccupyTile", "CanPillage", "MediumWeight"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/stub/units.ruleset b/data/stub/units.ruleset
@@ -265,7 +265,7 @@ flags         = ""
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset
@@ -349,7 +349,7 @@ flags         = "Unreachable", "DoesntOccupyTile"
 ;		  it encounters another SuperSpy, in which case defender wins;
 ;		  can also be used on non-diplomat units, in which case it can
 ;		  protect cities from diplomats; also 100% spy survival chance
-; "NoHome"	= this unit has no homecity and will be free of all upkeep, and
+; "NoHome"	= this unit is built with no homecity, free of all upkeep, and
 ;		  therefore will not revolt along with its city of origin should
 ;		  it be incited
 ; "NoVeteran"   = this unit cannot gain veteran levels through experience

diff --git a/doc/README.actions b/doc/README.actions
@@ -478,7 +478,6 @@ Actions done by a unit against a city
  * UI name can be set using ui_name_home_city
  * actor must be aware that the target exists
  * actor must be on the same tile as the target
- * actor must not have the "NoHome" unit type flag. (!)
  * can't set existing home city as new home city
  * target city has enough unused unit maintenance slots to support the actor
    unit. (No problem if the actor unit spends 0 city slots)

diff --git a/server/unithand.c b/server/unithand.c
@@ -3589,12 +3589,7 @@ void unit_change_homecity_handling(struct unit *punit, struct city *new_pcity,
   }
 
   if (rehome) {
-    fc_assert(!unit_has_type_flag(punit, UTYF_NOHOME));
-
-    /* Remove from old city first and add to new city only after that.
-     * This is more robust in case old_city == new_city (currently
-     * prohibited by fc_assert in the beginning of the function).
-     */
+    /* Remove from old city first and add to new city only after that. */
     if (old_pcity) {
       /* Even if unit is dead, we have to unlink unit pointer (punit). */
       unit_list_remove(old_pcity->units_supported, punit);