granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename unique canonical keys to generic object

Browse source
This commit is contained in:
Justin Edmund 2022-02-23 13:57:38 -08:00
parent 99a2474cbb
commit 2909da98eb
7 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/SummonGrid/index.tsx
View file

@ -107,13 +107,13 @@ const SummonGrid = (props: Props) => {
} }
function populateSummons(list: [GridSummon]) { function populateSummons(list: [GridSummon]) {
list.forEach((object: GridSummon) => { list.forEach((gridObject: GridSummon) => {
if (object.main) if (gridObject.main)
state.grid.summons.mainSummon = object state.grid.summons.mainSummon = gridObject
else if (object.friend) else if (gridObject.friend)
state.grid.summons.friendSummon = object state.grid.summons.friendSummon = gridObject
else if (!object.main && !object.friend && object.position != null) else if (!gridObject.main && !gridObject.friend && gridObject.position != null)
state.grid.summons.allSummons[object.position] = object state.grid.summons.allSummons[gridObject.position] = gridObject
}) })
} }

8
components/SummonUnit/index.tsx
View file

@ -29,7 +29,7 @@ const SummonUnit = (props: Props) => {
}) })
const gridSummon = props.gridSummon const gridSummon = props.gridSummon
const summon = gridSummon?.summon const summon = gridSummon?.object
useEffect(() => { useEffect(() => {
generateImageUrl() generateImageUrl()
@ -38,7 +38,7 @@ const SummonUnit = (props: Props) => {
function generateImageUrl() { function generateImageUrl() {
let imgSrc = "" let imgSrc = ""
if (props.gridSummon) { if (props.gridSummon) {
const summon = props.gridSummon.summon! const summon = props.gridSummon.object!
// Generate the correct source for the summon // Generate the correct source for the summon
if (props.unitType == 0 || props.unitType == 2) if (props.unitType == 0 || props.unitType == 2)
@ -72,8 +72,8 @@ const SummonUnit = (props: Props) => {
{ (gridSummon) ? { (gridSummon) ?
<UncapIndicator <UncapIndicator
type="summon" type="summon"
ulb={gridSummon.summon.uncap.ulb || false} ulb={gridSummon.object.uncap.ulb || false}
flb={gridSummon.summon.uncap.flb || false} flb={gridSummon.object.uncap.flb || false}
uncapLevel={gridSummon.uncap_level} uncapLevel={gridSummon.uncap_level}
updateUncap={passUncapData} updateUncap={passUncapData}
special={false} special={false}

16
components/WeaponGrid/index.tsx
View file

@ -104,14 +104,12 @@ const WeaponGrid = (props: Props) => {
} }
function populateWeapons(list: [GridWeapon]) { function populateWeapons(list: [GridWeapon]) {
let weapons: GridArray<GridWeapon> = {} list.forEach((gridObject: GridWeapon) => {
if (gridObject.mainhand) {
list.forEach((object: GridWeapon) => { state.grid.weapons.mainWeapon = gridObject
if (object.mainhand) { state.party.element = gridObject.object.element
state.grid.weapons.mainWeapon = object } else if (!gridObject.mainhand && gridObject.position != null) {
state.party.element = object.weapon.element state.grid.weapons.allWeapons[gridObject.position] = gridObject
} else if (!object.mainhand && object.position != null) {
state.grid.weapons.allWeapons[object.position] = object
} }
}) })
} }
@ -159,7 +157,7 @@ const WeaponGrid = (props: Props) => {
function storeGridWeapon(gridWeapon: GridWeapon) { function storeGridWeapon(gridWeapon: GridWeapon) {
if (gridWeapon.position == -1) { if (gridWeapon.position == -1) {
state.grid.weapons.mainWeapon = gridWeapon state.grid.weapons.mainWeapon = gridWeapon
state.party.element = gridWeapon.weapon.element state.party.element = gridWeapon.object.element
} else { } else {
// Store the grid unit at the correct position // Store the grid unit at the correct position
state.grid.weapons.allWeapons[gridWeapon.position] = gridWeapon state.grid.weapons.allWeapons[gridWeapon.position] = gridWeapon

8
components/WeaponUnit/index.tsx
View file

@ -28,7 +28,7 @@ const WeaponUnit = (props: Props) => {
}) })
const gridWeapon = props.gridWeapon const gridWeapon = props.gridWeapon
const weapon = gridWeapon?.weapon const weapon = gridWeapon?.object
useEffect(() => { useEffect(() => {
generateImageUrl() generateImageUrl()
@ -37,7 +37,7 @@ const WeaponUnit = (props: Props) => {
function generateImageUrl() { function generateImageUrl() {
let imgSrc = "" let imgSrc = ""
if (props.gridWeapon) { if (props.gridWeapon) {
const weapon = props.gridWeapon.weapon! const weapon = props.gridWeapon.object!
if (props.unitType == 0) if (props.unitType == 0)
imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-main/${weapon.granblue_id}.jpg` imgSrc = `${process.env.NEXT_PUBLIC_SIERO_IMG_URL}/weapon-main/${weapon.granblue_id}.jpg`
@ -70,8 +70,8 @@ const WeaponUnit = (props: Props) => {
{ (gridWeapon) ? { (gridWeapon) ?
<UncapIndicator <UncapIndicator
type="weapon" type="weapon"
ulb={gridWeapon.weapon.uncap.ulb || false} ulb={gridWeapon.object.uncap.ulb || false}
flb={gridWeapon.weapon.uncap.flb || false} flb={gridWeapon.object.uncap.flb || false}
uncapLevel={gridWeapon.uncap_level} uncapLevel={gridWeapon.uncap_level}
updateUncap={passUncapData} updateUncap={passUncapData}
special={false} special={false}

2
types/GridCharacter.d.ts vendored
View file

@ -1,6 +1,6 @@
interface GridCharacter { interface GridCharacter {
id: string id: string
position: number position: number
character: Character object: Character
uncap_level: number uncap_level: number
} }

2
types/GridSummon.d.ts vendored
View file

@ -3,6 +3,6 @@ interface GridSummon {
main: boolean main: boolean
friend: boolean friend: boolean
position: number position: number
summon: Summon object: Summon
uncap_level: number uncap_level: number
} }

2
types/GridWeapon.d.ts vendored
View file

@ -2,6 +2,6 @@ interface GridWeapon {
id: string id: string
mainhand: boolean mainhand: boolean
position: number position: number
weapon: Weapon object: Weapon
uncap_level: number uncap_level: number
} }