awk

xorus · Feb 4, 2023 · 7fff2fa · 7fff2fa
1 parent c1566bd
commit 7fff2fa
Show file tree

Hide file tree

Showing 99 changed files with 32 additions and 3 deletions.
diff --git 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
diff --git a/Data/numbers/awk/1.png b/Data/numbers/awk/1.png
diff --git a/Data/numbers/awk/2.png b/Data/numbers/awk/2.png
diff --git a/Data/numbers/awk/3.png b/Data/numbers/awk/3.png
diff --git a/Data/numbers/awk/4.png b/Data/numbers/awk/4.png
diff --git a/Data/numbers/awk/5.png b/Data/numbers/awk/5.png
diff --git a/Data/numbers/awk/6.png b/Data/numbers/awk/6.png
diff --git a/Data/numbers/awk/7.png b/Data/numbers/awk/7.png
diff --git a/Data/numbers/awk/8.png b/Data/numbers/awk/8.png
diff --git a/Data/numbers/awk/9.png b/Data/numbers/awk/9.png
diff --git a/Data/numbers/awk/settings.json b/Data/numbers/awk/settings.json
@@ -0,0 +1,5 @@
+{
+  "NumberNegativeMargin": 0,
+  "NumberNegativeMarginMono": 0,
+  "NumberBottomMargin": 0
+}
diff --git a/Data/numbers/default/0.png b/Data/numbers/default/0.png
diff --git a/Data/numbers/default/1.png b/Data/numbers/default/1.png
diff --git a/Data/numbers/default/2.png b/Data/numbers/default/2.png
diff --git a/Data/numbers/default/3.png b/Data/numbers/default/3.png
diff --git a/Data/numbers/default/4.png b/Data/numbers/default/4.png
diff --git a/Data/numbers/default/5.png b/Data/numbers/default/5.png
diff --git a/Data/numbers/default/6.png b/Data/numbers/default/6.png
diff --git a/Data/numbers/default/7.png b/Data/numbers/default/7.png
diff --git a/Data/numbers/default/8.png b/Data/numbers/default/8.png
diff --git a/Data/numbers/default/9.png b/Data/numbers/default/9.png
diff --git a/Data/numbers/misaligned/0.png b/Data/numbers/misaligned/0.png
diff --git a/Data/numbers/misaligned/1.png b/Data/numbers/misaligned/1.png
diff --git a/Data/numbers/misaligned/2.png b/Data/numbers/misaligned/2.png
diff --git a/Data/numbers/misaligned/3.png b/Data/numbers/misaligned/3.png
diff --git a/Data/numbers/misaligned/4.png b/Data/numbers/misaligned/4.png
diff --git a/Data/numbers/misaligned/5.png b/Data/numbers/misaligned/5.png
diff --git a/Data/numbers/misaligned/6.png b/Data/numbers/misaligned/6.png
diff --git a/Data/numbers/misaligned/7.png b/Data/numbers/misaligned/7.png
diff --git a/Data/numbers/misaligned/8.png b/Data/numbers/misaligned/8.png
diff --git a/Data/numbers/misaligned/9.png b/Data/numbers/misaligned/9.png
diff --git a/Data/numbers/moire/0.png b/Data/numbers/moire/0.png
diff --git a/Data/numbers/moire/1.png b/Data/numbers/moire/1.png
diff --git a/Data/numbers/moire/2.png b/Data/numbers/moire/2.png
diff --git a/Data/numbers/moire/3.png b/Data/numbers/moire/3.png
diff --git a/Data/numbers/moire/4.png b/Data/numbers/moire/4.png
diff --git a/Data/numbers/moire/5.png b/Data/numbers/moire/5.png
diff --git a/Data/numbers/moire/6.png b/Data/numbers/moire/6.png
diff --git a/Data/numbers/moire/7.png b/Data/numbers/moire/7.png
diff --git a/Data/numbers/moire/8.png b/Data/numbers/moire/8.png
diff --git a/Data/numbers/moire/9.png b/Data/numbers/moire/9.png
diff --git a/Data/numbers/moire/settings.json b/Data/numbers/moire/settings.json
@@ -0,0 +1,5 @@
+{
+  "NumberNegativeMargin": 0,
+  "NumberNegativeMarginMono": 0,
+  "NumberBottomMargin": 0
+}
diff --git a/Data/numbers/mspaint/0.png b/Data/numbers/mspaint/0.png
diff --git a/Data/numbers/mspaint/1.png b/Data/numbers/mspaint/1.png
diff --git a/Data/numbers/mspaint/2.png b/Data/numbers/mspaint/2.png
diff --git a/Data/numbers/mspaint/3.png b/Data/numbers/mspaint/3.png
diff --git a/Data/numbers/mspaint/4.png b/Data/numbers/mspaint/4.png
diff --git a/Data/numbers/mspaint/5.png b/Data/numbers/mspaint/5.png
diff --git a/Data/numbers/mspaint/6.png b/Data/numbers/mspaint/6.png
diff --git a/Data/numbers/mspaint/7.png b/Data/numbers/mspaint/7.png
diff --git a/Data/numbers/mspaint/8.png b/Data/numbers/mspaint/8.png
diff --git a/Data/numbers/mspaint/9.png b/Data/numbers/mspaint/9.png
diff --git a/Data/numbers/mspaint/settings.json b/Data/numbers/mspaint/settings.json
@@ -0,0 +1,4 @@
+{
+  "NumberNegativeMargin": 25,
+  "NumberBottomMargin": 20
+}
diff --git a/Data/numbers/pixel/0.png b/Data/numbers/pixel/0.png
diff --git a/Data/numbers/pixel/1.png b/Data/numbers/pixel/1.png
diff --git a/Data/numbers/pixel/2.png b/Data/numbers/pixel/2.png
diff --git a/Data/numbers/pixel/3.png b/Data/numbers/pixel/3.png
diff --git a/Data/numbers/pixel/4.png b/Data/numbers/pixel/4.png
diff --git a/Data/numbers/pixel/5.png b/Data/numbers/pixel/5.png
diff --git a/Data/numbers/pixel/6.png b/Data/numbers/pixel/6.png
diff --git a/Data/numbers/pixel/7.png b/Data/numbers/pixel/7.png
diff --git a/Data/numbers/pixel/8.png b/Data/numbers/pixel/8.png
diff --git a/Data/numbers/pixel/9.png b/Data/numbers/pixel/9.png
diff --git a/Data/numbers/pixel/settings.json b/Data/numbers/pixel/settings.json
@@ -0,0 +1,5 @@
+{
+  "NumberNegativeMargin": 0,
+  "NumberNegativeMarginMono": 0,
+  "NumberBottomMargin": 0
+}
diff --git a/Data/numbers/tall/0.png b/Data/numbers/tall/0.png
diff --git a/Data/numbers/tall/1.png b/Data/numbers/tall/1.png
diff --git a/Data/numbers/tall/2.png b/Data/numbers/tall/2.png
diff --git a/Data/numbers/tall/3.png b/Data/numbers/tall/3.png
diff --git a/Data/numbers/tall/4.png b/Data/numbers/tall/4.png
diff --git a/Data/numbers/tall/5.png b/Data/numbers/tall/5.png
diff --git a/Data/numbers/tall/6.png b/Data/numbers/tall/6.png
diff --git a/Data/numbers/tall/7.png b/Data/numbers/tall/7.png
diff --git a/Data/numbers/tall/8.png b/Data/numbers/tall/8.png
diff --git a/Data/numbers/tall/9.png b/Data/numbers/tall/9.png
diff --git a/Data/numbers/tall/settings.json b/Data/numbers/tall/settings.json
@@ -0,0 +1,5 @@
+{
+  "NumberNegativeMargin": 10,
+  "NumberNegativeMarginMono": 10,
+  "NumberBottomMargin": 0
+}
diff --git a/Data/numbers/wow/0.png b/Data/numbers/wow/0.png
diff --git a/Data/numbers/wow/1.png b/Data/numbers/wow/1.png
diff --git a/Data/numbers/wow/2.png b/Data/numbers/wow/2.png
diff --git a/Data/numbers/wow/3.png b/Data/numbers/wow/3.png
diff --git a/Data/numbers/wow/4.png b/Data/numbers/wow/4.png
diff --git a/Data/numbers/wow/5.png b/Data/numbers/wow/5.png
diff --git a/Data/numbers/wow/6.png b/Data/numbers/wow/6.png
diff --git a/Data/numbers/wow/7.png b/Data/numbers/wow/7.png
diff --git a/Data/numbers/wow/8.png b/Data/numbers/wow/8.png
diff --git a/Data/numbers/wow/9.png b/Data/numbers/wow/9.png
diff --git a/Data/numbers/yellow/0.png b/Data/numbers/yellow/0.png
diff --git a/Data/numbers/yellow/1.png b/Data/numbers/yellow/1.png
diff --git a/Data/numbers/yellow/2.png b/Data/numbers/yellow/2.png
diff --git a/Data/numbers/yellow/3.png b/Data/numbers/yellow/3.png
diff --git a/Data/numbers/yellow/4.png b/Data/numbers/yellow/4.png
diff --git a/Data/numbers/yellow/5.png b/Data/numbers/yellow/5.png
diff --git a/Data/numbers/yellow/6.png b/Data/numbers/yellow/6.png
diff --git a/Data/numbers/yellow/7.png b/Data/numbers/yellow/7.png
diff --git a/Data/numbers/yellow/8.png b/Data/numbers/yellow/8.png
diff --git a/Data/numbers/yellow/9.png b/Data/numbers/yellow/9.png
diff --git a/EngageTimer.csproj b/EngageTimer.csproj
@@ -8,7 +8,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-        <AssemblyVersion>2.2.5.0</AssemblyVersion>
+        <AssemblyVersion>2.2.5.1</AssemblyVersion>
         <Deterministic>false</Deterministic>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git 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
@@ -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;