diff --git a/packages/frontend/src/components/descriptions/DefencesPopover.tsx b/packages/frontend/src/components/descriptions/DefencesPopover.tsx index b30cd0a..022e2f3 100644 --- a/packages/frontend/src/components/descriptions/DefencesPopover.tsx +++ b/packages/frontend/src/components/descriptions/DefencesPopover.tsx @@ -1,5 +1,5 @@ -import React from 'react' -import { DefencesStats } from '../../constants/Stats' +import React from 'react'; +import { DefencesStats } from '../../constants/Stats'; import { PopoverBox, PopoverHeaderDiv, @@ -8,21 +8,21 @@ import { PopoverGridContainer, PopoverRequirements, PopoverInfoData, - PopoverLabel -} from '../../shared/styled/PopoverStyle' + PopoverLabel, +} from '../../shared/styled/PopoverStyle'; -import blasterImg from '../../assets/gameElements/defences/blaster4.webp' -import beamImg from '../../assets/gameElements/defences/beam4.webp' -import astralLauncherImg from '../../assets/gameElements/defences/astral4.webp' -import plasmaImg from '../../assets/gameElements/defences/plasma4.webp' +import blasterImg from '../../assets/gameElements/defences/blaster4.webp'; +import beamImg from '../../assets/gameElements/defences/beam4.webp'; +import astralLauncherImg from '../../assets/gameElements/defences/astral4.webp'; +import plasmaImg from '../../assets/gameElements/defences/plasma4.webp'; // Component props interface DescriptionComponentProps { - title: string - image: string - description: React.ReactNode - stats: React.ReactNode - requirements: React.ReactNode + title: string; + image: string; + description: React.ReactNode; + stats: React.ReactNode; + requirements: React.ReactNode; } const DescriptionComponent = ({ @@ -30,7 +30,7 @@ const DescriptionComponent = ({ image, description, stats, - requirements + requirements, }: DescriptionComponentProps) => { return ( @@ -40,7 +40,7 @@ const DescriptionComponent = ({ display: 'flex', flexDirection: 'row', alignItems: 'flex-start', - marginBottom: '24px' + marginBottom: '24px', }} > {/* Image */} @@ -59,16 +59,16 @@ const DescriptionComponent = ({ {/* Stats */} {stats} - ) -} + ); +}; interface StatsProps { - cargo?: number - speed?: number - consumption?: number - hull: number - shield: number - weapon: number + cargo?: number; + speed?: number; + consumption?: number; + hull: number; + shield: number; + weapon: number; } const StatsComponent = ({ @@ -77,40 +77,34 @@ const StatsComponent = ({ consumption, hull, shield, - weapon + weapon, }: StatsProps) => { return ( - {cargo - ? ( + {cargo ? ( <> Cargo Capacity: {cargo} - ) - : null} - {speed - ? ( + ) : null} + {speed ? ( <> Base Speed: {speed} - ) - : null} - {consumption - ? ( + ) : null} + {consumption ? ( <> Consumption: {consumption} - ) - : null} + ) : null} Base Hull: {hull} @@ -124,8 +118,8 @@ const StatsComponent = ({ {weapon} - ) -} + ); +}; export const BlasterDescription = () => ( ( } /> -) +); export const BeamDescription = () => ( ( stats={StatsComponent(DefencesStats.beam)} requirements={ <> -
  • Dockyar level 2
  • -
  • Energy Innovation level 2
  • -
  • Beam Tech level 3
  • +
  • Dockyar level 4
  • +
  • Energy Innovation level 3
  • +
  • Beam Tech level 6
  • } /> -) +); export const AstralDescription = () => ( ( } /> -) +); export const PlasmaDescription = () => ( ( } /> -) +); diff --git a/packages/frontend/src/panels/DefencesTab.tsx b/packages/frontend/src/panels/DefencesTab.tsx index 512206b..6dba763 100755 --- a/packages/frontend/src/panels/DefencesTab.tsx +++ b/packages/frontend/src/panels/DefencesTab.tsx @@ -6,7 +6,7 @@ import { blasterImg, BuildType, blasterRequirements, - BeamDescription, + BeamCannonDescription, beamImg, beamRequirements, AstralDescription, @@ -39,7 +39,7 @@ export const DefenceTabPanel = ({ requirements: blasterRequirements(dockyardLevel), }, { - description: , + description: , img: beamImg, title: 'Beam', functionCallName: BuildType.Beam, diff --git a/packages/frontend/src/shared/utils/index.ts b/packages/frontend/src/shared/utils/index.ts index c162b36..d4db239 100644 --- a/packages/frontend/src/shared/utils/index.ts +++ b/packages/frontend/src/shared/utils/index.ts @@ -226,7 +226,7 @@ export const beamRequirements = ( return dockyardLevel ? dockyardLevel >= 2 && techs ? techs.energy >= 2 && techs - ? techs.beam >= 3 + ? techs.beam >= 6 : false : false : false;