From 3faf50d40a0fdcc8a46fa71823f2d968072c6851 Mon Sep 17 00:00:00 2001 From: Dino Date: Thu, 2 Apr 2026 21:33:15 -0400 Subject: [PATCH] client help: move NeverProtects help text to correct place RM #1976 --- client/helpdata.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/client/helpdata.c b/client/helpdata.c index 19e856f065..2e415c5241 100644 --- a/client/helpdata.c +++ b/client/helpdata.c @@ -1957,13 +1957,6 @@ void helptext_unitclass(struct unit_class *pclass, char *buf, size_t bufsz) CATLSTR(buf, bufsz, _(" %s Slowed down while damaged.\n"), BULLET); } - if (uclass_has_flag(pclass, UCF_UNREACHABLE)) { - CATLSTR(buf, bufsz, - /* TRANS: indented unit class property, preserve leading spaces */ - _(" %s Is unreachable. Most units cannot attack this one.\n"), - BULLET); - } - if (uclass_has_flag(pclass, UCF_DOESNT_OCCUPY_TILE)) { CATLSTR(buf, bufsz, /* TRANS: Indented unit class property, preserve leading spaces */ @@ -2046,12 +2039,17 @@ char *helptext_unit(char *buf, size_t bufsz, struct player *pplayer, BULLET, bonus); } } - if (uclass_has_flag(pclass, UCF_UNREACHABLE) - && utype_has_flag(utype, UTYF_NEVER_PROTECTS)) { + if (uclass_has_flag(pclass, UCF_UNREACHABLE)) { CATLSTR(buf, bufsz, - /* TRANS: Indented twice; preserve leading spaces */ - _(" %s Doesn't prevent enemy units from attacking other " - "units on its tile.\n"), BULLET); + /* TRANS: indented unit class property, preserve leading spaces */ + _(" %s Is unreachable. Most units cannot attack this one.\n"), + BULLET); + if (utype_has_flag(utype, UTYF_NEVER_PROTECTS)) { + CATLSTR(buf, bufsz, + /* TRANS: Indented twice; preserve leading spaces */ + _(" %s Doesn't prevent enemy units from attacking other " + "units on its tile.\n"), BULLET); + } } if (can_attack_non_native(utype)) { -- 2.31.0