Skip to content

Commit 6c2a0d7

Browse files
authored
feat: OC4 Mats (#1983)
* feat: oc4 mats, no images * chore: added the images and image loader mapping
1 parent 8e64c6b commit 6c2a0d7

File tree

7 files changed

+10
-0
lines changed

7 files changed

+10
-0
lines changed

app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ val MaterialEnum.drawable
246246
MaterialEnum.Converger -> R.drawable.mat_converger
247247
MaterialEnum.FlowerOfTheEnd -> R.drawable.mat_flower_of_the_end
248248
MaterialEnum.UniversalCube -> R.drawable.mat_universal_cube
249+
MaterialEnum.DivineLens -> R.drawable.mat_divine_lens
250+
MaterialEnum.HolyWaterOfDestiny -> R.drawable.mat_holy_water_of_destiny
249251

250252
MaterialEnum.Claw -> R.drawable.mat_claw
251253
MaterialEnum.Heart -> R.drawable.mat_heart

app/src/main/java/io/github/fate_grand_automata/util/LocalizationExtensions.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ val MaterialEnum.stringRes: Int
124124
MaterialEnum.GoldenCauldron -> R.string.mat_golden_cauldron
125125
MaterialEnum.UniversalCube -> R.string.mat_universal_cube
126126
MaterialEnum.MoonlightNucleus -> R.string.mat_moonlight_nucleus
127+
MaterialEnum.DivineLens -> R.string.mat_divine_lens
128+
MaterialEnum.HolyWaterOfDestiny -> R.string.mat_holy_water_of_destiny
127129

128130
MaterialEnum.MonumentSaber -> R.string.mat_monument_saber
129131
MaterialEnum.MonumentArcher -> R.string.mat_monument_archer
16.9 KB
Loading
16.8 KB
Loading

app/src/main/res/values-ja/localized.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@
335335
<string name="mat_golden_cauldron">"黄金釜"</string>
336336
<string name="mat_universal_cube">"ユニバーサルキューブ"</string>
337337
<string name="mat_moonlight_nucleus">"月光核"</string>
338+
<string name="mat_divine_lens">"神彩のレンズ"</string>
339+
<string name="mat_holy_water_of_destiny">"天命の聖水"</string>
338340
<string name="mat_monument_saber">"セイバー モニュメント"</string>
339341
<string name="mat_monument_archer">"アーチャー モニュメント"</string>
340342
<string name="mat_monument_lancer">"ランサー モニュメント"</string>

app/src/main/res/values/localized.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,8 @@ Please turn on accessibility for this app from System settings. If it is already
323323
<string name="mat_golden_cauldron">Golden Cauldron</string>
324324
<string name="mat_universal_cube">Universal Cube</string>
325325
<string name="mat_moonlight_nucleus">Moonlight Nucleus</string>
326+
<string name="mat_divine_lens">Divine Lens</string>
327+
<string name="mat_holy_water_of_destiny">Holy Water of Destiny</string>
326328
<string name="mat_monument_saber">"Saber Monument"</string>
327329
<string name="mat_monument_archer">"Archer Monument"</string>
328330
<string name="mat_monument_lancer">"Lancer Monument"</string>

scripts/src/main/java/io/github/fate_grand_automata/scripts/enums/MaterialEnum.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ enum class MaterialEnum {
4141
Converger,
4242
FlowerOfTheEnd,
4343
UniversalCube,
44+
DivineLens,
4445

4546
Claw,
4647
Heart,
@@ -62,6 +63,7 @@ enum class MaterialEnum {
6263
DemonFlameLantern,
6364
GoldenCauldron,
6465
MoonlightNucleus,
66+
HolyWaterOfDestiny,
6567

6668
MonumentSaber,
6769
MonumentArcher,

0 commit comments

Comments
 (0)