diff --git a/public/images/facility/100401.png b/public/images/facility/100401.png index 53cb37bd..0646fc2c 100644 Binary files a/public/images/facility/100401.png and b/public/images/facility/100401.png differ diff --git a/public/images/facility/100401.webp b/public/images/facility/100401.webp index f5c3141e..d8c3a60a 100644 Binary files a/public/images/facility/100401.webp and b/public/images/facility/100401.webp differ diff --git a/public/images/facility/100402.png b/public/images/facility/100402.png index 7f5e6fa5..4f5c4d71 100644 Binary files a/public/images/facility/100402.png and b/public/images/facility/100402.png differ diff --git a/public/images/facility/100402.webp b/public/images/facility/100402.webp index c9a16c14..cee2a2c3 100644 Binary files a/public/images/facility/100402.webp and b/public/images/facility/100402.webp differ diff --git a/public/images/facility/100403.png b/public/images/facility/100403.png index 4ebfc5a2..8d04111b 100644 Binary files a/public/images/facility/100403.png and b/public/images/facility/100403.png differ diff --git a/public/images/facility/100403.webp b/public/images/facility/100403.webp index 1ee08df2..6b56ca70 100644 Binary files a/public/images/facility/100403.webp and b/public/images/facility/100403.webp differ diff --git a/public/images/facility/100404.png b/public/images/facility/100404.png index decf18e0..04fd9c83 100644 Binary files a/public/images/facility/100404.png and b/public/images/facility/100404.png differ diff --git a/public/images/facility/100404.webp b/public/images/facility/100404.webp index 7709ee98..cfac8661 100644 Binary files a/public/images/facility/100404.webp and b/public/images/facility/100404.webp differ diff --git a/public/images/facility/100405.png b/public/images/facility/100405.png index b91ac9e7..036311ee 100644 Binary files a/public/images/facility/100405.png and b/public/images/facility/100405.png differ diff --git a/public/images/facility/100405.webp b/public/images/facility/100405.webp index 616bcd37..7801ea29 100644 Binary files a/public/images/facility/100405.webp and b/public/images/facility/100405.webp differ diff --git a/public/images/facility/100601.png b/public/images/facility/100601.png index c75f16bd..1643dde5 100644 Binary files a/public/images/facility/100601.png and b/public/images/facility/100601.png differ diff --git a/public/images/facility/100601.webp b/public/images/facility/100601.webp index bf143ad3..3e0355f4 100644 Binary files a/public/images/facility/100601.webp and b/public/images/facility/100601.webp differ diff --git a/public/images/facility/100602.png b/public/images/facility/100602.png index d9dfe937..eef6a444 100644 Binary files a/public/images/facility/100602.png and b/public/images/facility/100602.png differ diff --git a/public/images/facility/100602.webp b/public/images/facility/100602.webp index 9e16864a..708cb3ae 100644 Binary files a/public/images/facility/100602.webp and b/public/images/facility/100602.webp differ diff --git a/public/images/facility/100603.png b/public/images/facility/100603.png index 1f34983f..7f265420 100644 Binary files a/public/images/facility/100603.png and b/public/images/facility/100603.png differ diff --git a/public/images/facility/100603.webp b/public/images/facility/100603.webp index 8c2d162a..727b1c95 100644 Binary files a/public/images/facility/100603.webp and b/public/images/facility/100603.webp differ diff --git a/public/images/facility/100604.png b/public/images/facility/100604.png index 0d7ee8df..fa10e7c2 100644 Binary files a/public/images/facility/100604.png and b/public/images/facility/100604.png differ diff --git a/public/images/facility/100604.webp b/public/images/facility/100604.webp index 92825dc4..bb026c27 100644 Binary files a/public/images/facility/100604.webp and b/public/images/facility/100604.webp differ diff --git a/public/images/facility/100605.png b/public/images/facility/100605.png index bbcf4b44..bcf1ad99 100644 Binary files a/public/images/facility/100605.png and b/public/images/facility/100605.png differ diff --git a/public/images/facility/100605.webp b/public/images/facility/100605.webp index a58a50e6..c4e427ce 100644 Binary files a/public/images/facility/100605.webp and b/public/images/facility/100605.webp differ diff --git a/public/images/facility/102301.png b/public/images/facility/102301.png index 45808627..1d50d368 100644 Binary files a/public/images/facility/102301.png and b/public/images/facility/102301.png differ diff --git a/public/images/facility/102301.webp b/public/images/facility/102301.webp index 9503837c..b175a4c8 100644 Binary files a/public/images/facility/102301.webp and b/public/images/facility/102301.webp differ diff --git a/public/images/facility/102302.png b/public/images/facility/102302.png new file mode 100644 index 00000000..a1550bf5 Binary files /dev/null and b/public/images/facility/102302.png differ diff --git a/public/images/facility/102302.webp b/public/images/facility/102302.webp new file mode 100644 index 00000000..c738ddf2 Binary files /dev/null and b/public/images/facility/102302.webp differ diff --git a/public/images/facility/102303.webp b/public/images/facility/102303.webp new file mode 100644 index 00000000..519501c5 Binary files /dev/null and b/public/images/facility/102303.webp differ diff --git a/public/images/facility/102501.png b/public/images/facility/102501.png new file mode 100644 index 00000000..6ec01a1f Binary files /dev/null and b/public/images/facility/102501.png differ diff --git a/public/images/facility/102501.webp b/public/images/facility/102501.webp new file mode 100644 index 00000000..82510452 Binary files /dev/null and b/public/images/facility/102501.webp differ diff --git a/public/images/material/201017011.png b/public/images/material/201017011.png new file mode 100644 index 00000000..299669f9 Binary files /dev/null and b/public/images/material/201017011.png differ diff --git a/public/images/material/201017011.webp b/public/images/material/201017011.webp new file mode 100644 index 00000000..7cb05d27 Binary files /dev/null and b/public/images/material/201017011.webp differ diff --git a/public/images/material/201017012.png b/public/images/material/201017012.png new file mode 100644 index 00000000..1b456823 Binary files /dev/null and b/public/images/material/201017012.png differ diff --git a/public/images/material/201017012.webp b/public/images/material/201017012.webp new file mode 100644 index 00000000..9c96826c Binary files /dev/null and b/public/images/material/201017012.webp differ diff --git a/public/images/material/201017021.webp b/public/images/material/201017021.webp new file mode 100644 index 00000000..4f4f57d8 Binary files /dev/null and b/public/images/material/201017021.webp differ diff --git a/public/images/material/201017022.webp b/public/images/material/201017022.webp new file mode 100644 index 00000000..ab1cabfd Binary files /dev/null and b/public/images/material/201017022.webp differ diff --git a/public/images/material/201017041.webp b/public/images/material/201017041.webp new file mode 100644 index 00000000..6f60a9e3 Binary files /dev/null and b/public/images/material/201017041.webp differ diff --git a/public/images/material/201017042.webp b/public/images/material/201017042.webp new file mode 100644 index 00000000..bc8aa0e9 Binary files /dev/null and b/public/images/material/201017042.webp differ diff --git a/src/data/facility.js b/src/data/facility.js index 277e8991..e441e4d0 100644 --- a/src/data/facility.js +++ b/src/data/facility.js @@ -198,6 +198,16 @@ export const MATERIAL = { { rupies: 120000, maskFragment1: 35, maskFragment2: 5 }, { rupies: 130000, maskFragment1: 35, maskFragment2: 5 }, { rupies: 140000, maskFragment1: 35, maskFragment2: 5 }, + { rupies: 160000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 180000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 200000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 220000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 240000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 260000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 280000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 300000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 320000, maskFragment1: 40, maskFragment2: 10 }, + { rupies: 340000, maskFragment1: 40, maskFragment2: 10 }, ], dracolith: [ { rupies: 0 }, @@ -220,6 +230,16 @@ export const MATERIAL = { { rupies: 30000, sphere1: 250, scale1: 100, talonstone: 10 }, { rupies: 32000, sphere1: 300, scale1: 120, talonstone: 10 }, { rupies: 34000, sphere1: 350, scale1: 140, talonstone: 10 }, + { rupies: 50000, sphere2: 10, scale2: 28, talonstone: 14 }, + { rupies: 74000, sphere2: 14, scale2: 31, talonstone: 19 }, + { rupies: 110000, sphere2: 20, scale2: 34, talonstone: 26 }, + { rupies: 160000, sphere2: 29, scale2: 37, talonstone: 35 }, + { rupies: 240000, sphere2: 41, scale2: 40, talonstone: 48 }, + { rupies: 360000, sphere2: 60, scale2: 45, talonstone: 66 }, + { rupies: 520000, sphere2: 86, scale2: 50, talonstone: 91 }, + { rupies: 780000, sphere2: 122, scale2: 60, talonstone: 124 }, + { rupies: 1150000, sphere2: 174, scale2: 66, talonstone: 170 }, + { rupies: 1700000, sphere2: 250, scale2: 72, talonstone: 233 }, ], fafnir: [ { rupies: 0 }, @@ -384,11 +404,13 @@ const MATERIAL_KEY = { }, maskFragment1: { Flame: '201017031', + Water: '201017011', Wind: '201017021', Shadow: '201017041', }, maskFragment2: { Flame: '201017032', + Water: '201017012', Wind: '201017022', Shadow: '201017042', }, @@ -418,6 +440,7 @@ const MATERIAL_KEY = { }, tree: { Flame: '102301', + Water: '102302', Wind: '102303', Shadow: '102305', }, diff --git a/src/data/halidom.js b/src/data/halidom.js index 05138f43..add83ee0 100644 --- a/src/data/halidom.js +++ b/src/data/halidom.js @@ -9,6 +9,7 @@ const initHalidom = { adventurer_Water_eventE_0: { id: '101601', type: 'eventE', level: 35 }, adventurer_Water_eventE_1: { id: '101801', type: 'eventE', level: 35 }, adventurer_Water_slime_0: { id: '101902', type: 'slime', level: 15 }, + adventurer_Water_tree_0: { id: '102302', type: 'tree', level: 15 }, adventurer_Wind_altar_0: { id: '100403', type: 'altar', level: 35 }, adventurer_Wind_altar_1: { id: '100403', type: 'altar', level: 35 }, adventurer_Wind_eventE_0: { id: '101101', type: 'eventE', level: 35 }, @@ -16,7 +17,7 @@ const initHalidom = { adventurer_Wind_tree_0: { id: '102303', type: 'tree', level: 15 }, adventurer_Light_altar_0: { id: '100404', type: 'altar', level: 35 }, adventurer_Light_altar_1: { id: '100404', type: 'altar', level: 35 }, - adventurer_Light_eventE_0: { id: '100901', type: 'eventE', level: 30 }, + adventurer_Light_eventE_0: { id: '100901', type: 'eventE', level: 35 }, adventurer_Light_eventE_1: { id: '101501', type: 'eventE', level: 35 }, adventurer_Light_slime_0: { id: '101904', type: 'slime', level: 15 }, adventurer_Shadow_altar_0: { id: '100405', type: 'altar', level: 35 }, @@ -42,6 +43,7 @@ const initHalidom = { Staff_dojo_1: { id: '100508', type: 'dojo', level: 35 }, Dagger_Bow_eventW_0: { id: '101301', type: 'eventW', level: 30 }, Blade_Wand_eventW_0: { id: '102401', type: 'eventW', level: 30 }, + Sword_Lance_eventW_0: { id: '102501', type: 'eventW', level: 30 }, dragon_Flame_fafnir_0: { id: '101001', type: 'fafnir', level: 30 }, dragon_Water_fafnir_0: { id: '101002', type: 'fafnir', level: 30 }, dragon_Wind_fafnir_0: { id: '101003', type: 'fafnir', level: 30 }, @@ -285,5 +287,15 @@ export const HALIDOM_VALUES = { [14, 14], [15, 15], [16, 16], + [17, 17], + [18, 18], + [19, 19], + [20, 20], + [21, 21], + [22, 22], + [23, 23], + [24, 24], + [25, 25], + [26, 26], ], }; diff --git a/src/locales/halidom.js b/src/locales/halidom.js index b68b6639..c449abd9 100644 --- a/src/locales/halidom.js +++ b/src/locales/halidom.js @@ -159,6 +159,11 @@ const facility = { ja: '覚醒の炎樹', zh: '觉醒之炎树', }, + '102302': { + en: 'Water Tree', + ja: '覚醒の流樹', + zh: '觉醒之流树', + }, '102303': { en: 'Wind Tree', ja: '覚醒の嵐樹', @@ -174,6 +179,11 @@ const facility = { ja: 'キュイジーヌスタジアム', zh: '美食工坊', }, + '102501': { + en: 'Festival Stage', + ja: 'お祭りやぐら', + zh: '孟兰盆祭坛', + }, }; export default facility; diff --git a/src/pages/Facility/Facility.jsx b/src/pages/Facility/Facility.jsx index 2172a2a4..51fbd48a 100644 --- a/src/pages/Facility/Facility.jsx +++ b/src/pages/Facility/Facility.jsx @@ -78,7 +78,7 @@ function Facility() { array = WEAPON_TYPES; break; case 'tree': - array = ['Flame', 'Wind', 'Shadow']; + array = ['Flame', 'Water', 'Wind', 'Shadow']; break; default: array = ELEMENT_TYPES; @@ -177,7 +177,7 @@ function Facility() { useEffect(() => { const { type, field } = state; - if (type === 'tree' && !['Flame', 'Wind', 'Shadow'].includes(field)) { + if (type === 'tree' && !['Flame', 'Water', 'Wind', 'Shadow'].includes(field)) { setState(prev => ({ ...prev, field: 'Flame' })); return; } diff --git a/src/utils/getLimit.js b/src/utils/getLimit.js index d7d398f4..991f973a 100644 --- a/src/utils/getLimit.js +++ b/src/utils/getLimit.js @@ -7,10 +7,10 @@ const LIMIT = { augments: 100, altar: 40, dojo: 35, - dracolith: 20, + dracolith: 30, event: 35, slime: 15, - tree: 15, + tree: 25, dragon: { '3': [20, 30, 40, 50, 60], '4': [30, 40, 50, 65, 80], @@ -56,7 +56,7 @@ const getLimit = (key, rarity, unbind = 4) => { export const getFacilityMaxLevel = facility => { const { id, type } = facility; - const lv35 = ['101501', '101601', '102001', '101101', '101801']; + const lv35 = ['100901', '101501', '101601', '102001', '101101', '101801']; if (lv35.includes(id)) { return 35;