diff --git a/src/constants/UsageKey.ts b/src/constants/UsageKey.ts
index 682c66a70b2c..0a65e580e035 100644
--- a/src/constants/UsageKey.ts
+++ b/src/constants/UsageKey.ts
@@ -14,6 +14,9 @@ export const UsageKey = {
isRewardFromShipScrap: 'IsRewardFromShipScrap',
isAddedInTrackedUpdate: 'IsAddedInTrackedUpdate',
hasCreatureHarvest: 'HasCreatureHarvest',
+ hasFishingLocation: 'HasFishingLocation',
+ hasFishingBait: 'HasFishingBait',
+ hasGoodGuysFreeBait: 'HasGoodGuysFreeBait',
isExpeditionSeason: 'IsExpeditionSeason{0}Reward',
isTwitchCampaign: 'IsTwitchCampaign{0}Reward',
diff --git a/src/pages/catalogue/catalogueItem.Components.tsx b/src/pages/catalogue/catalogueItem.Components.tsx
index 05ab1f14338c..c6516c88a81b 100644
--- a/src/pages/catalogue/catalogueItem.Components.tsx
+++ b/src/pages/catalogue/catalogueItem.Components.tsx
@@ -6,6 +6,7 @@ import { GenericListPresenter } from '../../components/common/genericListPresent
import { PatreonBlock } from '../../components/common/patreon/patreonBlock';
import { EggTraitListTile } from '../../components/tilePresenter/eggTraitTile/eggTraitListTile';
import { BaitDataListTile } from '../../components/tilePresenter/fishingTile/baitDataListTile';
+import { FishingDataListTile } from '../../components/tilePresenter/fishingTile/fishingDataListTile';
import { GgfBaitDataListTileForCatalogue } from '../../components/tilePresenter/fishingTile/ggfBaitDataListTile';
import { GenericItemWithRequirementsListTile } from '../../components/tilePresenter/genericItemListTile/genericItemWithRequirementsListTile';
import { CronusCookingListTile } from '../../components/tilePresenter/processorItemListTile/cronusCookingTile';
@@ -28,6 +29,7 @@ import { UsageKey } from '../../constants/UsageKey';
import { BaitData } from '../../contracts/data/baitData';
import { CreatureHarvest } from '../../contracts/data/creatureHarvest';
import { EggNeuralTrait } from '../../contracts/data/eggNeuralTrait';
+import { FishingData } from '../../contracts/data/fishingData';
import { MajorUpdateItem } from '../../contracts/data/majorUpdateItem';
import { StarshipScrap } from '../../contracts/data/starshipScrap';
import { CurrencyType } from '../../contracts/enum/CurrencyType';
@@ -266,6 +268,25 @@ export const displayFromUpdate = (addedInUpdateArray: Array
) =>
);
};
+export const displayFishData = (fishData: Array) => {
+ if (fishData == null || fishData.length < 1) return null;
+
+ return (
+
+ }
+ isCentered={shouldListBeCentered(fishData.length)}
+ />
+ }
+ />
+
+ );
+};
+
export const displayBaitData = (
itemId: string,
apiService: ApiService,
diff --git a/src/pages/catalogue/catalogueItemContainer.tsx b/src/pages/catalogue/catalogueItemContainer.tsx
index 86cb0235fe72..5ab6a566724f 100644
--- a/src/pages/catalogue/catalogueItemContainer.tsx
+++ b/src/pages/catalogue/catalogueItemContainer.tsx
@@ -13,6 +13,7 @@ import { BaitData } from '../../contracts/data/baitData';
import { PlatformControlMapping } from '../../contracts/data/controlMapping';
import { CreatureHarvest } from '../../contracts/data/creatureHarvest';
import { EggNeuralTrait } from '../../contracts/data/eggNeuralTrait';
+import { FishingData } from '../../contracts/data/fishingData';
import { MajorUpdateItem } from '../../contracts/data/majorUpdateItem';
import { StarshipScrap } from '../../contracts/data/starshipScrap';
import { BlueprintSource, blueprintToLocalKey } from '../../contracts/enum/BlueprintSource';
@@ -64,6 +65,7 @@ interface IState {
creatureHarvests: Array;
addedInUpdate: Array;
baitData: Array;
+ fishData: Array;
additionalData: Array;
}
@@ -86,6 +88,7 @@ const CatalogueItemContainerUnconnected: React.FC = (props: IProps) => {
creatureHarvests: [],
addedInUpdate: [],
baitData: [],
+ fishData: anyObject,
additionalData: [],
};
@@ -142,9 +145,11 @@ const CatalogueItemContainerUnconnected: React.FC = (props: IProps) => {
const scrapDataTask = optionalTask(usages, UsageKey.isRewardFromShipScrap, () => getScrapDataForItem(itemId));
const creatureHarvestsTask = optionalTask(usages, UsageKey.hasCreatureHarvest, () => getCreatureHarvestsForItem(itemId));
+ const fishDataTask = optionalListTask(usages, UsageKey.hasFishingLocation, () => getFishData(itemId));
+ const baitDataTask = optionalListTask(usages, UsageKey.hasFishingBait, () => getBaitData(itemId));
+
const addedInUpdateTask = optionalListTask(usages, UsageKey.isAddedInTrackedUpdate, () => getAddedInUpdateForItem(itemId));
const eggTraitTask = optionalListTask(['true'], 'true', () => getEggTrait(itemId));
- const baitDataTask = optionalListTask(['true'], 'true', () => getBaitData(itemId));
const controlLookupTask = optionalListTask(['true'], 'true', () => getControlLookup(props.controlPlatform));
const newMeta: IState = {
@@ -163,6 +168,7 @@ const CatalogueItemContainerUnconnected: React.FC = (props: IProps) => {
creatureHarvests: await creatureHarvestsTask,
addedInUpdate: await addedInUpdateTask,
baitData: await baitDataTask,
+ fishData: await fishDataTask,
additionalData: await getAdditionalData(item),
};
setItemMeta(newMeta);
@@ -247,6 +253,12 @@ const CatalogueItemContainerUnconnected: React.FC = (props: IProps) => {
return majorUpdates.value;
};
+ const getFishData = async (itemId: string) => {
+ const fishData = await props.gameItemService.getFishingForItem(itemId);
+ if (!fishData.isSuccess) return [];
+ return [fishData.value];
+ };
+
const getBaitData = async (itemId: string) => {
const baitData = await props.dataJsonService.getBaitDataForItem(itemId);
if (!baitData.isSuccess) return [];
@@ -386,6 +398,7 @@ const CatalogueItemContainerUnconnected: React.FC = (props: IProps) => {
starshipScrapItems,
creatureHarvests,
addedInUpdate,
+ fishData,
baitData,
additionalData,
} = itemMeta;
@@ -407,6 +420,7 @@ const CatalogueItemContainerUnconnected: React.FC = (props: IProps) => {
starshipScrapItems={starshipScrapItems}
creatureHarvests={creatureHarvests}
addedInUpdate={addedInUpdate}
+ fishData={fishData}
baitData={baitData}
additionalData={additionalData}
networkState={networkState}
diff --git a/src/pages/catalogue/catalogueItemPresenter.tsx b/src/pages/catalogue/catalogueItemPresenter.tsx
index 2e1d345ef5ae..0e54b80379ab 100644
--- a/src/pages/catalogue/catalogueItemPresenter.tsx
+++ b/src/pages/catalogue/catalogueItemPresenter.tsx
@@ -21,6 +21,7 @@ import { BaitData } from '../../contracts/data/baitData';
import { PlatformControlMapping } from '../../contracts/data/controlMapping';
import { CreatureHarvest } from '../../contracts/data/creatureHarvest';
import { EggNeuralTrait } from '../../contracts/data/eggNeuralTrait';
+import { FishingData } from '../../contracts/data/fishingData';
import { MajorUpdateItem } from '../../contracts/data/majorUpdateItem';
import { StarshipScrap } from '../../contracts/data/starshipScrap';
import { ControllerPlatformType } from '../../contracts/enum/ControllerPlatformType';
@@ -28,6 +29,7 @@ import { Recharge } from '../../contracts/recharge/recharge';
import { anyObject } from '../../helper/typescriptHacks';
import { LocaleKey } from '../../localization/LocaleKey';
import { translate } from '../../localization/Translate';
+import { ApiService } from '../../services/api/ApiService';
import { DataJsonService } from '../../services/json/DataJsonService';
import { ToastService } from '../../services/toastService';
import {
@@ -35,6 +37,7 @@ import {
displayCookItems,
displayEggTraits,
displayExtraDetailsSection,
+ displayFishData,
displayFromUpdate,
displayObsoleteTech,
displayProceduralStatBonuses,
@@ -50,7 +53,6 @@ import {
} from './catalogueItem.Components';
import { IReduxProps } from './catalogueItem.Redux';
import { DevDetailsBottomModalSheet } from './devDetailsBottomModalSheet';
-import { ApiService } from '../../services/api/ApiService';
interface IProps extends IReduxProps {
// Container State
@@ -68,6 +70,7 @@ interface IProps extends IReduxProps {
starshipScrapItems: Array;
creatureHarvests: Array;
addedInUpdate: Array;
+ fishData: Array;
baitData: Array;
additionalData: Array;
@@ -164,6 +167,7 @@ export const CatalogueItemPresenter: React.FC = (props: IProps) => {
{displayProceduralStatBonuses(props.item.NumStatsMin, props.item.NumStatsMax, props.item.ProceduralStatBonuses)}
{displayRewardFrom(props.item, props.starshipScrapItems, props.creatureHarvests)}
{displayEggTraits(props.eggTrait)}
+ {displayFishData(props.fishData)}
{displayBaitData(props.item.Id, props.apiService, props.baitData, props.selectedLanguage)}
{displayFromUpdate(props.addedInUpdate)}