From cd0e4e1c45d010880f0666be26ee951e8351bd39 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Tue, 16 Feb 2021 16:53:09 +0100 Subject: [PATCH] ruleset: distinguish action name when punished. The hut popping actions with (potential for) the loss of all MP ended up with the same ended up with the same UI name as the non punished version. Add the reason for the potential punishment to the UI name like for other punished actions. This makes the user interface a bit more consistent, helps explain why the unit lost all its MP and is nice to have in case the punished actions becomes non quiet in the future and when they show up in the autohelp. See osdn #41592 --- data/alien/game.ruleset | 4 ++-- data/civ1/game.ruleset | 4 ++-- data/civ2civ3/game.ruleset | 8 ++++---- data/classic/game.ruleset | 8 ++++---- data/experimental/game.ruleset | 8 ++++---- data/sandbox/game.ruleset | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 59c0079945..aee9e4675e 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -498,8 +498,8 @@ ui_name_transport_embark = _("%sEmbark%s") ; /* TRANS: Enter _Hut (100% chance of success). */ ui_name_enter_hut = _("Enter %sHut%s") -; /* TRANS: Enter _Hut (100% chance of success). */ -ui_name_enter_hut_2 = _("Enter %sHut%s") +; /* TRANS: Enter _Hut from non native (100% chance of success). */ +ui_name_enter_hut_2 = _("Enter %sHut from non native%s") ; /* TRANS: Regular _Move (100% chance of success). */ ui_name_unit_move = _("%sKeep moving%s") diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 08881977eb..372a7ff097 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -465,8 +465,8 @@ ui_name_transport_embark = _("%sEmbark%s") ; /* TRANS: Enter _Hut (100% chance of success). */ ui_name_enter_hut = _("Enter %sHut%s") -; /* TRANS: Enter _Hut (100% chance of success). */ -ui_name_enter_hut_2 = _("Enter %sHut%s") +; /* TRANS: Enter _Hut from transport (100% chance of success). */ +ui_name_enter_hut_2 = _("Enter %sHut from transport%s") ; /* TRANS: Regular _Move (100% chance of success). */ ui_name_unit_move = _("%sKeep moving%s") diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 455c07ed80..3df0e2db98 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -569,14 +569,14 @@ ui_name_transport_embark = _("%sEmbark%s") ; /* TRANS: Enter _Hut (100% chance of success). */ ui_name_enter_hut = _("Enter %sHut%s") -; /* TRANS: Enter _Hut (100% chance of success). */ -ui_name_enter_hut_2 = _("Enter %sHut%s") +; /* TRANS: Enter _Hut from non native (100% chance of success). */ +ui_name_enter_hut_2 = _("Enter %sHut from non native%s") ; /* TRANS: Frighten _Hut (100% chance of success). */ ui_name_frighten_hut = _("Frighten %sHut%s") -; /* TRANS: Frighten _Hut (100% chance of success). */ -ui_name_frighten_hut_2 = _("Frighten %sHut%s") +; /* TRANS: Frighten _Hut from non native (100% chance of success). */ +ui_name_frighten_hut_2 = _("Frighten %sHut from non native%s") ; /* TRANS: Regular _Move (100% chance of success). */ ui_name_unit_move = _("%sKeep moving%s") diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index 11049826c3..48665d6cf4 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -552,14 +552,14 @@ ui_name_transport_embark = _("%sEmbark%s") ; /* TRANS: Enter _Hut (100% chance of success). */ ui_name_enter_hut = _("Enter %sHut%s") -; /* TRANS: Enter _Hut (100% chance of success). */ -ui_name_enter_hut_2 = _("Enter %sHut%s") +; /* TRANS: Enter _Hut from non native (100% chance of success). */ +ui_name_enter_hut_2 = _("Enter %sHut from non native%s") ; /* TRANS: Frighten _Hut (100% chance of success). */ ui_name_frighten_hut = _("Frighten %sHut%s") -; /* TRANS: Frighten _Hut (100% chance of success). */ -ui_name_frighten_hut_2 = _("Frighten %sHut%s") +; /* TRANS: Frighten _Hut from non native (100% chance of success). */ +ui_name_frighten_hut_2 = _("Frighten %sHut from non native%s") ; /* TRANS: Regular _Move (100% chance of success). */ ui_name_unit_move = _("%sKeep moving%s") diff --git a/data/experimental/game.ruleset b/data/experimental/game.ruleset index 21cae80bb0..a2a098d32e 100644 --- a/data/experimental/game.ruleset +++ b/data/experimental/game.ruleset @@ -557,14 +557,14 @@ ui_name_transport_embark = _("%sEmbark%s") ; /* TRANS: Enter _Hut (100% chance of success). */ ui_name_enter_hut = _("Enter %sHut%s") -; /* TRANS: Enter _Hut (100% chance of success). */ -ui_name_enter_hut_2 = _("Enter %sHut%s") +; /* TRANS: Enter _Hut from non native (100% chance of success). */ +ui_name_enter_hut_2 = _("Enter %sHut from non native%s") ; /* TRANS: Frighten _Hut (100% chance of success). */ ui_name_frighten_hut = _("Frighten %sHut%s") -; /* TRANS: Frighten _Hut (100% chance of success). */ -ui_name_frighten_hut_2 = _("Frighten %sHut%s") +; /* TRANS: Frighten _Hut from non native (100% chance of success). */ +ui_name_frighten_hut_2 = _("Frighten %sHut from non native%s") ; /* TRANS: Regular _Move (100% chance of success). */ ui_name_unit_move = _("%sKeep moving%s") diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 6744f3e18b..ed9a721e34 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -588,14 +588,14 @@ spread_plague_actor_consuming_always = TRUE ; /* TRANS: Enter _Hut (100% chance of success). */ ui_name_enter_hut = _("Enter %sHut%s") -; /* TRANS: Enter _Hut (100% chance of success). */ -ui_name_enter_hut_2 = _("Enter %sHut%s") +; /* TRANS: Enter _Hut from non native (100% chance of success). */ +ui_name_enter_hut_2 = _("Enter %sHut from non native%s") ; /* TRANS: Frighten _Hut (100% chance of success). */ ui_name_frighten_hut = _("Frighten %sHut%s") -; /* TRANS: Frighten _Hut (100% chance of success). */ -ui_name_frighten_hut_2 = _("Frighten %sHut%s") +; /* TRANS: Frighten _Hut from non native (100% chance of success). */ +ui_name_frighten_hut_2 = _("Frighten %sHut from non native%s") ; /* TRANS: Regular _Move (100% chance of success). */ ui_name_unit_move = _("%sKeep moving%s") -- 2.20.1