Skip to content
This repository has been archived by the owner on Dec 14, 2022. It is now read-only.

Some Facility Updates #21

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/images/facility/100401.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100401.webp
Binary file not shown.
Binary file modified public/images/facility/100402.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100402.webp
Binary file not shown.
Binary file modified public/images/facility/100403.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100403.webp
Binary file not shown.
Binary file modified public/images/facility/100404.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100404.webp
Binary file not shown.
Binary file modified public/images/facility/100405.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100405.webp
Binary file not shown.
Binary file modified public/images/facility/100601.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100601.webp
Binary file not shown.
Binary file modified public/images/facility/100602.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100602.webp
Binary file not shown.
Binary file modified public/images/facility/100603.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100603.webp
Binary file not shown.
Binary file modified public/images/facility/100604.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100604.webp
Binary file not shown.
Binary file modified public/images/facility/100605.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/100605.webp
Binary file not shown.
Binary file modified public/images/facility/102301.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/facility/102301.webp
Binary file not shown.
Binary file added public/images/facility/102302.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/facility/102302.webp
Binary file not shown.
Binary file added public/images/facility/102303.webp
Binary file not shown.
Binary file added public/images/facility/102501.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/facility/102501.webp
Binary file not shown.
Binary file added public/images/material/201017011.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/material/201017011.webp
Binary file not shown.
Binary file added public/images/material/201017012.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/material/201017012.webp
Binary file not shown.
Binary file added public/images/material/201017021.webp
Binary file not shown.
Binary file added public/images/material/201017022.webp
Binary file not shown.
Binary file added public/images/material/201017041.webp
Binary file not shown.
Binary file added public/images/material/201017042.webp
Binary file not shown.
23 changes: 23 additions & 0 deletions src/data/facility.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -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 },
Expand Down Expand Up @@ -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',
},
Expand Down Expand Up @@ -418,6 +440,7 @@ const MATERIAL_KEY = {
},
tree: {
Flame: '102301',
Water: '102302',
Wind: '102303',
Shadow: '102305',
},
Expand Down
14 changes: 13 additions & 1 deletion src/data/halidom.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ 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 },
adventurer_Wind_slime_0: { id: '101903', type: 'slime', level: 15 },
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 },
Expand All @@ -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 },
Expand Down Expand Up @@ -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],
],
};
10 changes: 10 additions & 0 deletions src/locales/halidom.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ const facility = {
ja: '覚醒の炎樹',
zh: '觉醒之炎树',
},
'102302': {
en: 'Water Tree',
ja: '覚醒の流樹',
zh: '觉醒之流树',
},
'102303': {
en: 'Wind Tree',
ja: '覚醒の嵐樹',
Expand All @@ -174,6 +179,11 @@ const facility = {
ja: 'キュイジーヌスタジアム',
zh: '美食工坊',
},
'102501': {
en: 'Festival Stage',
ja: 'お祭りやぐら',
zh: '孟兰盆祭坛',
},
};

export default facility;
4 changes: 2 additions & 2 deletions src/pages/Facility/Facility.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/utils/getLimit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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;
Expand Down