OC2 mats (#1857)

Fate-Grand-Automata · Aug 11, 2024 · a1736b7 · a1736b7
1 parent 3a594e0
commit a1736b7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 0 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt b/app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt
@@ -263,6 +263,8 @@ val MaterialEnum.drawable
         MaterialEnum.VestigeOfMadness -> R.drawable.mat_vestige
         MaterialEnum.Sunscale -> R.drawable.mat_sunscale
         MaterialEnum.Converger -> R.drawable.mat_converger
+        MaterialEnum.FlowerOfTheEnd -> R.drawable.mat_flower_of_the_end
+        MaterialEnum.GoldenCauldron -> R.drawable.mat_golden_cauldron
 
         MaterialEnum.MonumentSaber -> R.drawable.mat_monument_saber
         MaterialEnum.MonumentArcher -> R.drawable.mat_monument_archer

diff --git a/app/src/main/java/io/github/fate_grand_automata/util/LocalizationExtensions.kt b/app/src/main/java/io/github/fate_grand_automata/util/LocalizationExtensions.kt
@@ -120,6 +120,8 @@ val MaterialEnum.stringRes: Int
         MaterialEnum.VestigeOfMadness -> R.string.mat_vestige_of_madness
         MaterialEnum.Sunscale -> R.string.mat_sunscale
         MaterialEnum.Converger -> R.string.mat_converger
+        MaterialEnum.FlowerOfTheEnd -> R.string.mat_flower_of_the_end
+        MaterialEnum.GoldenCauldron -> R.string.mat_golden_cauldron
 
         MaterialEnum.MonumentSaber -> R.string.mat_monument_saber
         MaterialEnum.MonumentArcher -> R.string.mat_monument_archer

diff --git a/app/src/main/res/drawable/mat_flower_of_the_end.png b/app/src/main/res/drawable/mat_flower_of_the_end.png
diff --git a/app/src/main/res/drawable/mat_golden_cauldron.png b/app/src/main/res/drawable/mat_golden_cauldron.png
diff --git a/app/src/main/res/values-b+zh+CN/localized.xml b/app/src/main/res/values-b+zh+CN/localized.xml
@@ -317,6 +317,8 @@ Order Change"</string>
     <string name="mat_vestige_of_madness">"疯狂的残渣（暂译）"</string>
     <string name="mat_sunscale">"太阳皮（暂译）"</string>
     <string name="mat_converger">"以太蓄光体（暂译）"</string>
+    <string name="mat_flower_of_the_end">"终之花"</string>
+    <string name="mat_golden_cauldron">"黄金釜"</string>
     <string name="mat_monument_saber">"剑阶金像"</string>
     <string name="mat_monument_archer">"弓阶金像"</string>
     <string name="mat_monument_lancer">"枪阶金像"</string>

diff --git a/app/src/main/res/values-b+zh+TW/localized.xml b/app/src/main/res/values-b+zh+TW/localized.xml
@@ -351,6 +351,8 @@
     <string name="mat_vestige_of_madness">瘋狂的殘渣（暫譯）</string>
     <string name="mat_sunscale">太陽皮（暫譯）</string>
     <string name="mat_converger">乙太蓄光體（暫譯）</string>
+    <string name="mat_flower_of_the_end">"終之花"</string>
+    <string name="mat_golden_cauldron">"黃金釜"</string>
     <string name="mat_monument_saber">劍階金像</string>
     <string name="mat_monument_archer">弓階金像</string>
     <string name="mat_monument_lancer">槍階金像</string>

diff --git a/app/src/main/res/values-ja/localized.xml b/app/src/main/res/values-ja/localized.xml
@@ -323,6 +323,8 @@
     <string name="mat_vestige_of_madness">"狂気の残滓"</string>
     <string name="mat_sunscale">"太陽皮"</string>
     <string name="mat_converger">"エーテル収光体"</string>
+    <string name="mat_flower_of_the_end">"終の花"</string>
+    <string name="mat_golden_cauldron">"黄金釜"</string>
     <string name="mat_monument_saber">"セイバー モニュメント"</string>
     <string name="mat_monument_archer">"アーチャー モニュメント"</string>
     <string name="mat_monument_lancer">"ランサー モニュメント"</string>

diff --git a/app/src/main/res/values/localized.xml b/app/src/main/res/values/localized.xml
@@ -319,6 +319,8 @@ Please turn on accessibility for this app from System settings. If it is already
     <string name="mat_vestige_of_madness">"Vestige of Madness"</string>
     <string name="mat_sunscale">"Sunscale"</string>
     <string name="mat_converger">"Ether Proton Converger"</string>
+    <string name="mat_flower_of_the_end">Flower of the End</string>
+    <string name="mat_golden_cauldron">Golden Cauldron</string>
     <string name="mat_monument_saber">"Saber Monument"</string>
     <string name="mat_monument_archer">"Archer Monument"</string>
     <string name="mat_monument_lancer">"Lancer Monument"</string>

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/enums/MaterialEnum.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/enums/MaterialEnum.kt
@@ -39,6 +39,7 @@ enum class MaterialEnum {
     FantasyScales,
     Sunscale,
     Converger,
+    FlowerOfTheEnd,
 
     Claw,
     Heart,
@@ -58,6 +59,7 @@ enum class MaterialEnum {
     StarShard,
     FruitOfEternity,
     DemonFlameLantern,
+    GoldenCauldron,
 
     MonumentSaber,
     MonumentArcher,