OC 3 Mats (#1899)

Fate-Grand-Automata · Nov 21, 2024 · d07cda6 · d07cda6
1 parent f8a64a6
commit d07cda6
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 12 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
@@ -218,6 +218,8 @@ val MaterialEnum.drawable
         MaterialEnum.AmnestyBell -> R.drawable.mat_amnesty_bell
         MaterialEnum.CeremonialBlade -> R.drawable.mat_ceremonial_blade
         MaterialEnum.UnforgettableAshes -> R.drawable.mat_ashes
+        MaterialEnum.ObsidianEdge -> R.drawable.mat_obsidian_edge
+        MaterialEnum.VestigeOfMadness -> R.drawable.mat_vestige
 
         MaterialEnum.Seed -> R.drawable.mat_seed
         MaterialEnum.GhostLantern -> R.drawable.mat_ghost_lantern
@@ -240,6 +242,10 @@ val MaterialEnum.drawable
         MaterialEnum.DivineSpiritParticle -> R.drawable.mat_particle
         MaterialEnum.RainbowThreadBall -> R.drawable.mat_thread
         MaterialEnum.FantasyScales -> R.drawable.mat_fantasy_scales
+        MaterialEnum.Sunscale -> R.drawable.mat_sunscale
+        MaterialEnum.Converger -> R.drawable.mat_converger
+        MaterialEnum.FlowerOfTheEnd -> R.drawable.mat_flower_of_the_end
+        MaterialEnum.UniversalCube -> R.drawable.mat_universal_cube
 
         MaterialEnum.Claw -> R.drawable.mat_claw
         MaterialEnum.Heart -> R.drawable.mat_heart
@@ -259,12 +265,8 @@ val MaterialEnum.drawable
         MaterialEnum.StarShard -> R.drawable.mat_star_shard
         MaterialEnum.FruitOfEternity -> R.drawable.mat_fruit
         MaterialEnum.DemonFlameLantern -> R.drawable.mat_demon_lantern
-        MaterialEnum.ObsidianEdge -> R.drawable.mat_obsidian_edge
-        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.MoonlightNucleus -> R.drawable.mat_moonlight_nucleus
 
         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
@@ -122,6 +122,8 @@ val MaterialEnum.stringRes: Int
         MaterialEnum.Converger -> R.string.mat_converger
         MaterialEnum.FlowerOfTheEnd -> R.string.mat_flower_of_the_end
         MaterialEnum.GoldenCauldron -> R.string.mat_golden_cauldron
+        MaterialEnum.UniversalCube -> R.string.mat_universal_cube
+        MaterialEnum.MoonlightNucleus -> R.string.mat_moonlight_nucleus
 
         MaterialEnum.MonumentSaber -> R.string.mat_monument_saber
         MaterialEnum.MonumentArcher -> R.string.mat_monument_archer

diff --git a/app/src/main/res/drawable/mat_moonlight_nucleus.png b/app/src/main/res/drawable/mat_moonlight_nucleus.png
diff --git a/app/src/main/res/drawable/mat_universal_cube.png b/app/src/main/res/drawable/mat_universal_cube.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
@@ -325,6 +325,10 @@ 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_universal_cube">"宇宙立方体"</string>
+    <string name="mat_moonlight_nucleus">"月光核"</string>
     <string name="mat_monument_saber">"剑阶金像"</string>
     <string name="mat_monument_archer">"弓阶金像"</string>
     <string name="mat_monument_lancer">"枪阶金像"</string>
@@ -418,6 +422,4 @@ Order Change"</string>
     <string name="note"></string>
     <string name="p_hide_sq_in_resource"></string>
     <string name="p_hide_sq_in_resource_summary"></string>
-    <string name="mat_flower_of_the_end">"终之花"</string>
-    <string name="mat_golden_cauldron">"黄金釜"</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+TW/localized.xml b/app/src/main/res/values-b+zh+TW/localized.xml
@@ -321,6 +321,10 @@ 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_universal_cube">"宇宙立方體"</string>
+    <string name="mat_moonlight_nucleus">"月光核"</string>
     <string name="mat_monument_saber">"劍階金像"</string>
     <string name="mat_monument_archer">"弓階金像"</string>
     <string name="mat_monument_lancer">"槍階金像"</string>
@@ -414,6 +418,4 @@ Order Change"</string>
     <string name="note"></string>
     <string name="p_hide_sq_in_resource"></string>
     <string name="p_hide_sq_in_resource_summary"></string>
-    <string name="mat_flower_of_the_end">"終之花"</string>
-    <string name="mat_golden_cauldron">"黃金釜"</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values-ja/localized.xml b/app/src/main/res/values-ja/localized.xml
@@ -331,6 +331,10 @@
     <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_universal_cube">"ユニバーサルキューブ"</string>
+    <string name="mat_moonlight_nucleus">"月光核"</string>
     <string name="mat_monument_saber">"セイバー モニュメント"</string>
     <string name="mat_monument_archer">"アーチャー モニュメント"</string>
     <string name="mat_monument_lancer">"ランサー モニュメント"</string>
@@ -428,7 +432,5 @@
     <string name="note"></string>
     <string name="p_hide_sq_in_resource"></string>
     <string name="p_hide_sq_in_resource_summary"></string>
-    <string name="mat_flower_of_the_end">"終の花"</string>
-    <string name="mat_golden_cauldron">"黄金釜"</string>
 
 </resources>
diff --git a/app/src/main/res/values/localized.xml b/app/src/main/res/values/localized.xml
@@ -321,6 +321,8 @@ Please turn on accessibility for this app from System settings. If it is already
     <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_universal_cube">Universal Cube</string>
+    <string name="mat_moonlight_nucleus">Moonlight Nucleus</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
@@ -40,6 +40,7 @@ enum class MaterialEnum {
     Sunscale,
     Converger,
     FlowerOfTheEnd,
+    UniversalCube,
 
     Claw,
     Heart,
@@ -60,6 +61,7 @@ enum class MaterialEnum {
     FruitOfEternity,
     DemonFlameLantern,
     GoldenCauldron,
+    MoonlightNucleus,
 
     MonumentSaber,
     MonumentArcher,