diff --git a/components/weapon/WeaponConflictModal/index.tsx b/components/weapon/WeaponConflictModal/index.tsx
index cb5c750b..ce1fe8d6 100644
--- a/components/weapon/WeaponConflictModal/index.tsx
+++ b/components/weapon/WeaponConflictModal/index.tsx
@@ -56,7 +56,7 @@ const WeaponConflictModal = (props: Props) => {
const series = props.incomingWeapon.series
const seriesSlug = t(`series.${mapWeaponSeries(series)}`)
- return [2, 3].includes(series) ? (
+ return [2, 3, 34].includes(series) ? (
) : (
diff --git a/components/weapon/WeaponKeySelect/index.tsx b/components/weapon/WeaponKeySelect/index.tsx
index f5e26b80..94ef8b03 100644
--- a/components/weapon/WeaponKeySelect/index.tsx
+++ b/components/weapon/WeaponKeySelect/index.tsx
@@ -32,11 +32,12 @@ const gauphNames = [
{ en: 'Ultima Key', jp: 'ガフスキーΩ' },
{ en: 'Gate of Omnipotence', jp: 'ガフスキー' },
]
+const providenceNames = [{ en: 'Providence Teluma', jp: 'オリジンステルマ' }]
const emptyWeaponKey: WeaponKey = {
id: 'no-key',
granblue_id: '-1',
- series: 0,
+ series: [0],
slot: 0,
slug: '',
group: 0,
@@ -71,7 +72,7 @@ const WeaponKeySelect = React.forwardRef(
function filterWeaponKeys(weaponKeys: WeaponKey[]) {
// Filter weapon keys based on the series and slot provided
return weaponKeys.filter(
- (key) => key.series == series && key.slot == slot
+ (key) => key.series.includes(series) && key.slot == slot
)
}
@@ -114,7 +115,7 @@ const WeaponKeySelect = React.forwardRef(
let name: { [key: string]: string } = {}
if (series == 2 && index == 0) name = pendulumNames[0]
else if (series == 2 && slot == 1 && index == 1) name = pendulumNames[1]
- else if (series === 3) name = telumaNames[0]
+ else if (series === 3 || series === 34) name = telumaNames[0]
else if (series === 17) name = gauphNames[slot]
else if (series === 24) name = emblemNames[index]
@@ -139,7 +140,7 @@ const WeaponKeySelect = React.forwardRef(
const emptyOption = () => {
let name = ''
if (series === 2) name = pendulumNames[0].en
- else if (series === 3) name = telumaNames[0].en
+ else if (series === 3 || series === 34) name = telumaNames[0].en
else if (series === 17) name = gauphNames[slot].en
else if (series === 24) name = emblemNames[0].en
diff --git a/components/weapon/WeaponModal/index.tsx b/components/weapon/WeaponModal/index.tsx
index 18cf3f4b..4bb99219 100644
--- a/components/weapon/WeaponModal/index.tsx
+++ b/components/weapon/WeaponModal/index.tsx
@@ -155,11 +155,11 @@ const WeaponModal = ({
if (gridWeapon.object.element == 0) object.weapon.element = element
- if ([2, 3, 17, 24].includes(gridWeapon.object.series) && weaponKey1) {
+ if ([2, 3, 17, 24, 34].includes(gridWeapon.object.series) && weaponKey1) {
object.weapon.weapon_key1_id = weaponKey1.id
}
- if ([2, 3, 17].includes(gridWeapon.object.series) && weaponKey2)
+ if ([2, 3, 17, 34].includes(gridWeapon.object.series) && weaponKey2)
object.weapon.weapon_key2_id = weaponKey2.id
if (gridWeapon.object.series == 17 && weaponKey3)
@@ -353,7 +353,7 @@ const WeaponModal = ({
const keySelect = (
{t('modals.weapon.subtitles.weapon_keys')}
- {[2, 3, 17, 22].includes(gridWeapon.object.series) ? (
+ {[2, 3, 17, 22, 34].includes(gridWeapon.object.series) ? (
{gridWeapon.object.element == 0 && elementSelect}
- {[2, 3, 17, 24].includes(gridWeapon.object.series) && keySelect}
+ {[2, 3, 17, 24, 34].includes(gridWeapon.object.series) && keySelect}
{gridWeapon.object.ax && axSelect}
{gridWeapon.object.awakenings && awakeningSelect}
diff --git a/components/weapon/WeaponUnit/index.tsx b/components/weapon/WeaponUnit/index.tsx
index 12b3574e..91d620b2 100644
--- a/components/weapon/WeaponUnit/index.tsx
+++ b/components/weapon/WeaponUnit/index.tsx
@@ -90,7 +90,7 @@ const WeaponUnit = ({
return (
weapon.ax ||
weapon.awakenings ||
- (weapon.series && [2, 3, 17, 22, 24].includes(weapon.series))
+ (weapon.series && [2, 3, 17, 22, 24, 34].includes(weapon.series))
)
}