diff --git a/Configuration.cs b/Configuration.cs index 68291ef..b077e29 100644 --- a/Configuration.cs +++ b/Configuration.cs @@ -19,7 +19,7 @@ public enum TextAlign public const string DefaultCombatTimePrefix = "【 "; public const string DefaultCombatTimeSuffix = "】"; - public static readonly string[] BundledTextures = { "default", "yellow", "wow" }; + public static readonly string[] BundledTextures = { "default", "yellow", "wow", "awk", "tall", "misaligned", "pixel", "moire", "mspaint" }; // Dtr bar [NonSerialized] private bool _dtrCombatTimeEnabled; diff --git a/Data/numbers/awk/0.png b/Data/numbers/awk/0.png new file mode 100644 index 0000000..6320127 Binary files /dev/null and b/Data/numbers/awk/0.png differ diff --git a/Data/numbers/awk/1.png b/Data/numbers/awk/1.png new file mode 100644 index 0000000..43f4dd9 Binary files /dev/null and b/Data/numbers/awk/1.png differ diff --git a/Data/numbers/awk/2.png b/Data/numbers/awk/2.png new file mode 100644 index 0000000..b079afb Binary files /dev/null and b/Data/numbers/awk/2.png differ diff --git a/Data/numbers/awk/3.png b/Data/numbers/awk/3.png new file mode 100644 index 0000000..47be9b7 Binary files /dev/null and b/Data/numbers/awk/3.png differ diff --git a/Data/numbers/awk/4.png b/Data/numbers/awk/4.png new file mode 100644 index 0000000..b31f286 Binary files /dev/null and b/Data/numbers/awk/4.png differ diff --git a/Data/numbers/awk/5.png b/Data/numbers/awk/5.png new file mode 100644 index 0000000..12a96dd Binary files /dev/null and b/Data/numbers/awk/5.png differ diff --git a/Data/numbers/awk/6.png b/Data/numbers/awk/6.png new file mode 100644 index 0000000..0adaec0 Binary files /dev/null and b/Data/numbers/awk/6.png differ diff --git a/Data/numbers/awk/7.png b/Data/numbers/awk/7.png new file mode 100644 index 0000000..d67c31f Binary files /dev/null and b/Data/numbers/awk/7.png differ diff --git a/Data/numbers/awk/8.png b/Data/numbers/awk/8.png new file mode 100644 index 0000000..ca646c7 Binary files /dev/null and b/Data/numbers/awk/8.png differ diff --git a/Data/numbers/awk/9.png b/Data/numbers/awk/9.png new file mode 100644 index 0000000..1bb0182 Binary files /dev/null and b/Data/numbers/awk/9.png differ diff --git a/Data/numbers/awk/settings.json b/Data/numbers/awk/settings.json new file mode 100644 index 0000000..c7050a4 --- /dev/null +++ b/Data/numbers/awk/settings.json @@ -0,0 +1,5 @@ +{ + "NumberNegativeMargin": 0, + "NumberNegativeMarginMono": 0, + "NumberBottomMargin": 0 +} \ No newline at end of file diff --git a/Data/numbers/default/0.png b/Data/numbers/default/0.png index d5bd05a..e3e883b 100644 Binary files a/Data/numbers/default/0.png and b/Data/numbers/default/0.png differ diff --git a/Data/numbers/default/1.png b/Data/numbers/default/1.png index 80cf765..c513864 100644 Binary files a/Data/numbers/default/1.png and b/Data/numbers/default/1.png differ diff --git a/Data/numbers/default/2.png b/Data/numbers/default/2.png index bd6d3eb..ed30e69 100644 Binary files a/Data/numbers/default/2.png and b/Data/numbers/default/2.png differ diff --git a/Data/numbers/default/3.png b/Data/numbers/default/3.png index 9160da4..8ea3c62 100644 Binary files a/Data/numbers/default/3.png and b/Data/numbers/default/3.png differ diff --git a/Data/numbers/default/4.png b/Data/numbers/default/4.png index cdc393c..04f1569 100644 Binary files a/Data/numbers/default/4.png and b/Data/numbers/default/4.png differ diff --git a/Data/numbers/default/5.png b/Data/numbers/default/5.png index da0fd32..7021560 100644 Binary files a/Data/numbers/default/5.png and b/Data/numbers/default/5.png differ diff --git a/Data/numbers/default/6.png b/Data/numbers/default/6.png index 5f36805..dde2856 100644 Binary files a/Data/numbers/default/6.png and b/Data/numbers/default/6.png differ diff --git a/Data/numbers/default/7.png b/Data/numbers/default/7.png index 7afa8da..1b6a118 100644 Binary files a/Data/numbers/default/7.png and b/Data/numbers/default/7.png differ diff --git a/Data/numbers/default/8.png b/Data/numbers/default/8.png index fba5d6c..ff7f1b5 100644 Binary files a/Data/numbers/default/8.png and b/Data/numbers/default/8.png differ diff --git a/Data/numbers/default/9.png b/Data/numbers/default/9.png index 95d9761..afed755 100644 Binary files a/Data/numbers/default/9.png and b/Data/numbers/default/9.png differ diff --git a/Data/numbers/misaligned/0.png b/Data/numbers/misaligned/0.png new file mode 100644 index 0000000..785660f Binary files /dev/null and b/Data/numbers/misaligned/0.png differ diff --git a/Data/numbers/misaligned/1.png b/Data/numbers/misaligned/1.png new file mode 100644 index 0000000..5b2a6fa Binary files /dev/null and b/Data/numbers/misaligned/1.png differ diff --git a/Data/numbers/misaligned/2.png b/Data/numbers/misaligned/2.png new file mode 100644 index 0000000..b53a4ec Binary files /dev/null and b/Data/numbers/misaligned/2.png differ diff --git a/Data/numbers/misaligned/3.png b/Data/numbers/misaligned/3.png new file mode 100644 index 0000000..69d43b2 Binary files /dev/null and b/Data/numbers/misaligned/3.png differ diff --git a/Data/numbers/misaligned/4.png b/Data/numbers/misaligned/4.png new file mode 100644 index 0000000..d906a9d Binary files /dev/null and b/Data/numbers/misaligned/4.png differ diff --git a/Data/numbers/misaligned/5.png b/Data/numbers/misaligned/5.png new file mode 100644 index 0000000..efdaf6b Binary files /dev/null and b/Data/numbers/misaligned/5.png differ diff --git a/Data/numbers/misaligned/6.png b/Data/numbers/misaligned/6.png new file mode 100644 index 0000000..9270104 Binary files /dev/null and b/Data/numbers/misaligned/6.png differ diff --git a/Data/numbers/misaligned/7.png b/Data/numbers/misaligned/7.png new file mode 100644 index 0000000..29b4d51 Binary files /dev/null and b/Data/numbers/misaligned/7.png differ diff --git a/Data/numbers/misaligned/8.png b/Data/numbers/misaligned/8.png new file mode 100644 index 0000000..d6545b4 Binary files /dev/null and b/Data/numbers/misaligned/8.png differ diff --git a/Data/numbers/misaligned/9.png b/Data/numbers/misaligned/9.png new file mode 100644 index 0000000..65f4026 Binary files /dev/null and b/Data/numbers/misaligned/9.png differ diff --git a/Data/numbers/moire/0.png b/Data/numbers/moire/0.png new file mode 100644 index 0000000..27ca749 Binary files /dev/null and b/Data/numbers/moire/0.png differ diff --git a/Data/numbers/moire/1.png b/Data/numbers/moire/1.png new file mode 100644 index 0000000..5a233de Binary files /dev/null and b/Data/numbers/moire/1.png differ diff --git a/Data/numbers/moire/2.png b/Data/numbers/moire/2.png new file mode 100644 index 0000000..eb472a7 Binary files /dev/null and b/Data/numbers/moire/2.png differ diff --git a/Data/numbers/moire/3.png b/Data/numbers/moire/3.png new file mode 100644 index 0000000..4d368e1 Binary files /dev/null and b/Data/numbers/moire/3.png differ diff --git a/Data/numbers/moire/4.png b/Data/numbers/moire/4.png new file mode 100644 index 0000000..324e20b Binary files /dev/null and b/Data/numbers/moire/4.png differ diff --git a/Data/numbers/moire/5.png b/Data/numbers/moire/5.png new file mode 100644 index 0000000..5c03916 Binary files /dev/null and b/Data/numbers/moire/5.png differ diff --git a/Data/numbers/moire/6.png b/Data/numbers/moire/6.png new file mode 100644 index 0000000..cf54852 Binary files /dev/null and b/Data/numbers/moire/6.png differ diff --git a/Data/numbers/moire/7.png b/Data/numbers/moire/7.png new file mode 100644 index 0000000..2637aef Binary files /dev/null and b/Data/numbers/moire/7.png differ diff --git a/Data/numbers/moire/8.png b/Data/numbers/moire/8.png new file mode 100644 index 0000000..a430945 Binary files /dev/null and b/Data/numbers/moire/8.png differ diff --git a/Data/numbers/moire/9.png b/Data/numbers/moire/9.png new file mode 100644 index 0000000..8365344 Binary files /dev/null and b/Data/numbers/moire/9.png differ diff --git a/Data/numbers/moire/settings.json b/Data/numbers/moire/settings.json new file mode 100644 index 0000000..c7050a4 --- /dev/null +++ b/Data/numbers/moire/settings.json @@ -0,0 +1,5 @@ +{ + "NumberNegativeMargin": 0, + "NumberNegativeMarginMono": 0, + "NumberBottomMargin": 0 +} \ No newline at end of file diff --git a/Data/numbers/mspaint/0.png b/Data/numbers/mspaint/0.png new file mode 100644 index 0000000..7bad2b6 Binary files /dev/null and b/Data/numbers/mspaint/0.png differ diff --git a/Data/numbers/mspaint/1.png b/Data/numbers/mspaint/1.png new file mode 100644 index 0000000..200c353 Binary files /dev/null and b/Data/numbers/mspaint/1.png differ diff --git a/Data/numbers/mspaint/2.png b/Data/numbers/mspaint/2.png new file mode 100644 index 0000000..f7eda19 Binary files /dev/null and b/Data/numbers/mspaint/2.png differ diff --git a/Data/numbers/mspaint/3.png b/Data/numbers/mspaint/3.png new file mode 100644 index 0000000..a77e20a Binary files /dev/null and b/Data/numbers/mspaint/3.png differ diff --git a/Data/numbers/mspaint/4.png b/Data/numbers/mspaint/4.png new file mode 100644 index 0000000..9ff0ac3 Binary files /dev/null and b/Data/numbers/mspaint/4.png differ diff --git a/Data/numbers/mspaint/5.png b/Data/numbers/mspaint/5.png new file mode 100644 index 0000000..921d274 Binary files /dev/null and b/Data/numbers/mspaint/5.png differ diff --git a/Data/numbers/mspaint/6.png b/Data/numbers/mspaint/6.png new file mode 100644 index 0000000..f767ea4 Binary files /dev/null and b/Data/numbers/mspaint/6.png differ diff --git a/Data/numbers/mspaint/7.png b/Data/numbers/mspaint/7.png new file mode 100644 index 0000000..bcc02e5 Binary files /dev/null and b/Data/numbers/mspaint/7.png differ diff --git a/Data/numbers/mspaint/8.png b/Data/numbers/mspaint/8.png new file mode 100644 index 0000000..ab40b78 Binary files /dev/null and b/Data/numbers/mspaint/8.png differ diff --git a/Data/numbers/mspaint/9.png b/Data/numbers/mspaint/9.png new file mode 100644 index 0000000..ccf340c Binary files /dev/null and b/Data/numbers/mspaint/9.png differ diff --git a/Data/numbers/mspaint/settings.json b/Data/numbers/mspaint/settings.json new file mode 100644 index 0000000..3fa0932 --- /dev/null +++ b/Data/numbers/mspaint/settings.json @@ -0,0 +1,4 @@ +{ + "NumberNegativeMargin": 25, + "NumberBottomMargin": 20 +} \ No newline at end of file diff --git a/Data/numbers/pixel/0.png b/Data/numbers/pixel/0.png new file mode 100644 index 0000000..e300094 Binary files /dev/null and b/Data/numbers/pixel/0.png differ diff --git a/Data/numbers/pixel/1.png b/Data/numbers/pixel/1.png new file mode 100644 index 0000000..6dfb175 Binary files /dev/null and b/Data/numbers/pixel/1.png differ diff --git a/Data/numbers/pixel/2.png b/Data/numbers/pixel/2.png new file mode 100644 index 0000000..0d7df2d Binary files /dev/null and b/Data/numbers/pixel/2.png differ diff --git a/Data/numbers/pixel/3.png b/Data/numbers/pixel/3.png new file mode 100644 index 0000000..c6a838b Binary files /dev/null and b/Data/numbers/pixel/3.png differ diff --git a/Data/numbers/pixel/4.png b/Data/numbers/pixel/4.png new file mode 100644 index 0000000..ff8a3b7 Binary files /dev/null and b/Data/numbers/pixel/4.png differ diff --git a/Data/numbers/pixel/5.png b/Data/numbers/pixel/5.png new file mode 100644 index 0000000..b1c6adc Binary files /dev/null and b/Data/numbers/pixel/5.png differ diff --git a/Data/numbers/pixel/6.png b/Data/numbers/pixel/6.png new file mode 100644 index 0000000..f876a09 Binary files /dev/null and b/Data/numbers/pixel/6.png differ diff --git a/Data/numbers/pixel/7.png b/Data/numbers/pixel/7.png new file mode 100644 index 0000000..77fd8e3 Binary files /dev/null and b/Data/numbers/pixel/7.png differ diff --git a/Data/numbers/pixel/8.png b/Data/numbers/pixel/8.png new file mode 100644 index 0000000..be48eab Binary files /dev/null and b/Data/numbers/pixel/8.png differ diff --git a/Data/numbers/pixel/9.png b/Data/numbers/pixel/9.png new file mode 100644 index 0000000..fee9fbc Binary files /dev/null and b/Data/numbers/pixel/9.png differ diff --git a/Data/numbers/pixel/settings.json b/Data/numbers/pixel/settings.json new file mode 100644 index 0000000..c7050a4 --- /dev/null +++ b/Data/numbers/pixel/settings.json @@ -0,0 +1,5 @@ +{ + "NumberNegativeMargin": 0, + "NumberNegativeMarginMono": 0, + "NumberBottomMargin": 0 +} \ No newline at end of file diff --git a/Data/numbers/tall/0.png b/Data/numbers/tall/0.png new file mode 100644 index 0000000..ed7eb63 Binary files /dev/null and b/Data/numbers/tall/0.png differ diff --git a/Data/numbers/tall/1.png b/Data/numbers/tall/1.png new file mode 100644 index 0000000..d8f02c2 Binary files /dev/null and b/Data/numbers/tall/1.png differ diff --git a/Data/numbers/tall/2.png b/Data/numbers/tall/2.png new file mode 100644 index 0000000..8a5eaff Binary files /dev/null and b/Data/numbers/tall/2.png differ diff --git a/Data/numbers/tall/3.png b/Data/numbers/tall/3.png new file mode 100644 index 0000000..df5f72e Binary files /dev/null and b/Data/numbers/tall/3.png differ diff --git a/Data/numbers/tall/4.png b/Data/numbers/tall/4.png new file mode 100644 index 0000000..df3dd50 Binary files /dev/null and b/Data/numbers/tall/4.png differ diff --git a/Data/numbers/tall/5.png b/Data/numbers/tall/5.png new file mode 100644 index 0000000..ef5d1b2 Binary files /dev/null and b/Data/numbers/tall/5.png differ diff --git a/Data/numbers/tall/6.png b/Data/numbers/tall/6.png new file mode 100644 index 0000000..b34fe4a Binary files /dev/null and b/Data/numbers/tall/6.png differ diff --git a/Data/numbers/tall/7.png b/Data/numbers/tall/7.png new file mode 100644 index 0000000..d13a61b Binary files /dev/null and b/Data/numbers/tall/7.png differ diff --git a/Data/numbers/tall/8.png b/Data/numbers/tall/8.png new file mode 100644 index 0000000..fef31d1 Binary files /dev/null and b/Data/numbers/tall/8.png differ diff --git a/Data/numbers/tall/9.png b/Data/numbers/tall/9.png new file mode 100644 index 0000000..987edd4 Binary files /dev/null and b/Data/numbers/tall/9.png differ diff --git a/Data/numbers/tall/settings.json b/Data/numbers/tall/settings.json new file mode 100644 index 0000000..5b19dc9 --- /dev/null +++ b/Data/numbers/tall/settings.json @@ -0,0 +1,5 @@ +{ + "NumberNegativeMargin": 10, + "NumberNegativeMarginMono": 10, + "NumberBottomMargin": 0 +} \ No newline at end of file diff --git a/Data/numbers/wow/0.png b/Data/numbers/wow/0.png index 93ae48a..23da406 100644 Binary files a/Data/numbers/wow/0.png and b/Data/numbers/wow/0.png differ diff --git a/Data/numbers/wow/1.png b/Data/numbers/wow/1.png index eb5d736..744104a 100644 Binary files a/Data/numbers/wow/1.png and b/Data/numbers/wow/1.png differ diff --git a/Data/numbers/wow/2.png b/Data/numbers/wow/2.png index 798539f..802f25e 100644 Binary files a/Data/numbers/wow/2.png and b/Data/numbers/wow/2.png differ diff --git a/Data/numbers/wow/3.png b/Data/numbers/wow/3.png index 217c9bb..0023c78 100644 Binary files a/Data/numbers/wow/3.png and b/Data/numbers/wow/3.png differ diff --git a/Data/numbers/wow/4.png b/Data/numbers/wow/4.png index 98ebbf3..ce4d3d2 100644 Binary files a/Data/numbers/wow/4.png and b/Data/numbers/wow/4.png differ diff --git a/Data/numbers/wow/5.png b/Data/numbers/wow/5.png index 0f54e60..326857e 100644 Binary files a/Data/numbers/wow/5.png and b/Data/numbers/wow/5.png differ diff --git a/Data/numbers/wow/6.png b/Data/numbers/wow/6.png index 95e1e74..9efaccf 100644 Binary files a/Data/numbers/wow/6.png and b/Data/numbers/wow/6.png differ diff --git a/Data/numbers/wow/7.png b/Data/numbers/wow/7.png index 3cf3a16..b826609 100644 Binary files a/Data/numbers/wow/7.png and b/Data/numbers/wow/7.png differ diff --git a/Data/numbers/wow/8.png b/Data/numbers/wow/8.png index 33b14ef..4760054 100644 Binary files a/Data/numbers/wow/8.png and b/Data/numbers/wow/8.png differ diff --git a/Data/numbers/wow/9.png b/Data/numbers/wow/9.png index be607cd..76d128a 100644 Binary files a/Data/numbers/wow/9.png and b/Data/numbers/wow/9.png differ diff --git a/Data/numbers/yellow/0.png b/Data/numbers/yellow/0.png index 254e7d1..c248d2a 100644 Binary files a/Data/numbers/yellow/0.png and b/Data/numbers/yellow/0.png differ diff --git a/Data/numbers/yellow/1.png b/Data/numbers/yellow/1.png index b1a4769..56abaf8 100644 Binary files a/Data/numbers/yellow/1.png and b/Data/numbers/yellow/1.png differ diff --git a/Data/numbers/yellow/2.png b/Data/numbers/yellow/2.png index dc01c94..e947da9 100644 Binary files a/Data/numbers/yellow/2.png and b/Data/numbers/yellow/2.png differ diff --git a/Data/numbers/yellow/3.png b/Data/numbers/yellow/3.png index 0754bc0..f75023f 100644 Binary files a/Data/numbers/yellow/3.png and b/Data/numbers/yellow/3.png differ diff --git a/Data/numbers/yellow/4.png b/Data/numbers/yellow/4.png index e87e050..642ae53 100644 Binary files a/Data/numbers/yellow/4.png and b/Data/numbers/yellow/4.png differ diff --git a/Data/numbers/yellow/5.png b/Data/numbers/yellow/5.png index 4c0b124..7e608cb 100644 Binary files a/Data/numbers/yellow/5.png and b/Data/numbers/yellow/5.png differ diff --git a/Data/numbers/yellow/6.png b/Data/numbers/yellow/6.png index f263d05..0ea70b6 100644 Binary files a/Data/numbers/yellow/6.png and b/Data/numbers/yellow/6.png differ diff --git a/Data/numbers/yellow/7.png b/Data/numbers/yellow/7.png index f26be9a..2d50be7 100644 Binary files a/Data/numbers/yellow/7.png and b/Data/numbers/yellow/7.png differ diff --git a/Data/numbers/yellow/8.png b/Data/numbers/yellow/8.png index 2fe02fb..2a3dbd6 100644 Binary files a/Data/numbers/yellow/8.png and b/Data/numbers/yellow/8.png differ diff --git a/Data/numbers/yellow/9.png b/Data/numbers/yellow/9.png index 96a7d89..6461e04 100644 Binary files a/Data/numbers/yellow/9.png and b/Data/numbers/yellow/9.png differ diff --git a/EngageTimer.csproj b/EngageTimer.csproj index a6a2942..2d961f5 100644 --- a/EngageTimer.csproj +++ b/EngageTimer.csproj @@ -8,7 +8,7 @@ true false false - 2.2.5.0 + 2.2.5.1 false true true diff --git a/Ui/Settings.cs b/Ui/Settings.cs index 7f6033d..1a56675 100644 --- a/Ui/Settings.cs +++ b/Ui/Settings.cs @@ -752,7 +752,7 @@ private void CountdownNumberStyle() var currentTexture = choices.Count(); for (var i = 0; i < choices.Count(); i++) { - choiceString += TransId("Settings_CountdownTab_Texture_" + choices[i]) + "\0"; + choiceString += _tr.TransId("Settings_CountdownTab_Texture_" + choices[i], choices[i]) + "\0"; if (_configuration.CountdownTexturePreset == choices[i]) currentTexture = i; } diff --git a/Ui/Translator.cs b/Ui/Translator.cs index be1ccea..8c42669 100644 --- a/Ui/Translator.cs +++ b/Ui/Translator.cs @@ -29,6 +29,11 @@ public string TransId(string id) return $"{Resources.ResourceManager.GetString(id, Resources.Culture) ?? id}###EngageTimer_{id}"; } + public string TransId(string id, string fallback) + { + return $"{Resources.ResourceManager.GetString(id, Resources.Culture) ?? fallback}###EngageTimer_{id}"; + } + public string Trans(string id) { return Resources.ResourceManager.GetString(id, Resources.Culture) ?? id;