Reformat strings

This commit is contained in:
Sezz 2022-11-05 00:57:31 +11:00
parent bf45aa0580
commit 1162405860
5 changed files with 212 additions and 1439 deletions

File diff suppressed because it is too large Load diff

View file

@ -66,15 +66,15 @@ namespace TEN::Gui
{ ID_CLOCKWORK_BEETLE_COMBO1, 18, 0.5f, EulerAngles::Zero, OPT_COMBINABLE, STRING_CLOCKWORK_BEETLE_COMBO1, NO_JOINT_BITS, INV_ROT_Y },
{ ID_CLOCKWORK_BEETLE_COMBO2, 14, 0.5f, EulerAngles::Zero, OPT_COMBINABLE, STRING_CLOCKWORK_BEETLE_COMBO2, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_EMPTY, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_EMPTY, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_1, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_1, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_2, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_2, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_3, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_3, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_1, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_1L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_2, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_2L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN1_3, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_SMALL_3L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_EMPTY, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_EMPTY, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_1, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_1, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_2, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_2, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_3, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_3, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_4, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_4, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_5, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_5, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_1, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_1L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_2, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_2L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_3, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_3L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_4, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_4L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_WATERSKIN2_5, 2, 0.5f, EulerAngles(ANGLE(285.0f), 0, 0), OPT_USE | OPT_COMBINABLE, STRING_WATERSKIN_LARGE_5L, NO_JOINT_BITS, INV_ROT_Y },
{ ID_DIARY_OPEN, 0, 0.9f, EulerAngles(0, ANGLE(90.0f), 0), 0, 0, 0},
// Puzzles

View file

@ -13,7 +13,7 @@
#define STRING_EXIT_GAME "exit_game"
#define STRING_EXIT_TO_TITLE "exit_to_title"
#define STRING_OPTIONS "options"
#define STRING_UZI "uzi"
#define STRING_UZI "uzis"
#define STRING_PISTOLS "pistols"
#define STRING_SHOTGUN "shotgun"
#define STRING_REVOLVER "revolver"
@ -28,7 +28,7 @@
#define STRING_HK_AMMO "hk_ammo"
#define STRING_REVOLVER_AMMO "revolver_ammo"
#define STRING_UZI_AMMO "uzi_ammo"
#define STRING_PISTOLS_AMMO "pistols_ammo"
#define STRING_PISTOLS_AMMO "pistol_ammo"
#define STRING_LASERSIGHT "lasersight"
#define STRING_SILENCER "silencer"
#define STRING_LARGE_MEDIPACK "large_medipack"
@ -44,18 +44,18 @@
#define STRING_CHOOSE_AMMO "choose_ammo"
#define STRING_SELECT_LEVEL "select_level"
#define STRING_GRENADE_LAUNCHER "grenade_launcher"
#define STRING_GRENADE_AMMO1 "grenade_launcher_ammo1"
#define STRING_GRENADE_AMMO2 "grenade_launcher_ammo2"
#define STRING_GRENADE_AMMO3 "grenade_launcher_ammo3"
#define STRING_GRENADE_AMMO1 "grenade_launcher_normal_ammo"
#define STRING_GRENADE_AMMO2 "grenade_launcher_super_ammo"
#define STRING_GRENADE_AMMO3 "grenade_launcher_flash_ammo"
#define STRING_HARPOON_GUN "harpoon_gun"
#define STRING_HARPOON_AMMO "harpoon_ammo"
#define STRING_HARPOON_AMMO "harpoon_gun_ammo"
#define STRING_ROCKET_LAUNCHER "rocket_launcher"
#define STRING_ROCKET_AMMO "rocket_ammo"
#define STRING_ROCKET_AMMO "rocket_launcher_ammo"
#define STRING_CROSSBOW "crossbow"
#define STRING_CROSSBOW_LASER "crossbow_laser"
#define STRING_CROSSBOW_AMMO1 "crossbow_ammo1"
#define STRING_CROSSBOW_AMMO2 "crossbow_ammo2"
#define STRING_CROSSBOW_AMMO3 "crossbow_ammo3"
#define STRING_CROSSBOW_AMMO1 "crossbow_normal_ammo"
#define STRING_CROSSBOW_AMMO2 "crossbow_poison_ammo"
#define STRING_CROSSBOW_AMMO3 "crossbow_explosive_ammo"
#define STRING_DIARY "diary"
#define STRING_ENABLED "enabled"
#define STRING_DISABLED "disabled"
@ -129,15 +129,15 @@
#define STRING_USED_AMMOS "used_ammos"
#define STRING_SECRETS_FOUND "secrets_found"
#define STRING_WATERSKIN_SMALL_EMPTY "waterskin_small_empty"
#define STRING_WATERSKIN_SMALL_1 "waterskin_small_1"
#define STRING_WATERSKIN_SMALL_2 "waterskin_small_2"
#define STRING_WATERSKIN_SMALL_3 "waterskin_small_3"
#define STRING_WATERSKIN_SMALL_1L "waterskin_small_1l"
#define STRING_WATERSKIN_SMALL_2L "waterskin_small_2l"
#define STRING_WATERSKIN_SMALL_3L "waterskin_small_3l"
#define STRING_WATERSKIN_LARGE_EMPTY "waterskin_large_empty"
#define STRING_WATERSKIN_LARGE_1 "waterskin_large_1"
#define STRING_WATERSKIN_LARGE_2 "waterskin_large_2"
#define STRING_WATERSKIN_LARGE_3 "waterskin_large_3"
#define STRING_WATERSKIN_LARGE_4 "waterskin_large_4"
#define STRING_WATERSKIN_LARGE_5 "waterskin_large_5"
#define STRING_WATERSKIN_LARGE_1L "waterskin_large_1l"
#define STRING_WATERSKIN_LARGE_2L "waterskin_large_2l"
#define STRING_WATERSKIN_LARGE_3L "waterskin_large_3l"
#define STRING_WATERSKIN_LARGE_4L "waterskin_large_4l"
#define STRING_WATERSKIN_LARGE_5L "waterskin_large_5l"
#define STRING_TORCH "torch"
#define STRING_CLOCKWORK_BEETLE "clockwork_beetle"
#define STRING_CLOCKWORK_BEETLE_COMBO1 "clockwork_beetle_combo1"

View file

@ -5,6 +5,12 @@
namespace TEN::Utils
{
std::string ToUpper(std::string source)
{
std::transform(source.begin(), source.end(), source.begin(), [](unsigned char c) { return std::toupper(c); });
return source;
}
std::string ToLower(std::string source)
{
std::transform(source.begin(), source.end(), source.begin(), [](unsigned char c) { return std::tolower(c); });
@ -28,7 +34,7 @@ namespace TEN::Utils
{
std::vector<std::string> strings;
// String is single-line; exit early.
// String is single line; exit early.
if (source.find('\n') == std::string::npos)
{
strings.push_back(source);

View file

@ -3,6 +3,7 @@
namespace TEN::Utils
{
std::string ToUpper(std::string source);
std::string ToLower(std::string source);
std::string FromWchar(const wchar_t* source);
std::wstring FromChar(const char* source);