From 03df0668b13a14eff3903d87db0d96862f1fdf89 Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Mon, 23 Sep 2024 14:31:37 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=200.46.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- public/assets/data/meta.json | 4 +- .../images/contributors/goodGuysFree.png | Bin 0 -> 18108 bytes public/assets/images/special/fishing-both.png | Bin 1177 -> 944 bytes public/assets/images/special/fishing-day.png | Bin 999 -> 453 bytes .../assets/images/special/fishing-night.png | Bin 1474 -> 3182 bytes public/assets/images/special/storm.png | Bin 1135 -> 522 bytes public/assets/json/de/Cooking.lang.json | 363 +++++++---- public/assets/json/de/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/de/Fishing.lang.json | 427 ++++++------- public/assets/json/de/Others.lang.json | 16 +- public/assets/json/de/Products.lang.json | 3 +- public/assets/json/de/RawMaterials.lang.json | 36 +- public/assets/json/en-us/Cooking.lang.json | 363 +++++++---- public/assets/json/en-us/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/en-us/Fishing.lang.json | 105 +--- public/assets/json/en-us/Others.lang.json | 16 +- public/assets/json/en-us/Products.lang.json | 3 +- .../assets/json/en-us/RawMaterials.lang.json | 36 +- public/assets/json/en/Cooking.lang.json | 363 +++++++---- public/assets/json/en/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/en/Fishing.lang.json | 105 +--- public/assets/json/en/Others.lang.json | 16 +- public/assets/json/en/Products.lang.json | 3 +- public/assets/json/en/RawMaterials.lang.json | 36 +- public/assets/json/es-la/Cooking.lang.json | 363 +++++++---- public/assets/json/es-la/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/es-la/Fishing.lang.json | 427 ++++++------- public/assets/json/es-la/Others.lang.json | 16 +- public/assets/json/es-la/Products.lang.json | 3 +- .../assets/json/es-la/RawMaterials.lang.json | 36 +- public/assets/json/es/Cooking.lang.json | 363 +++++++---- public/assets/json/es/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/es/Fishing.lang.json | 427 ++++++------- public/assets/json/es/Others.lang.json | 16 +- public/assets/json/es/Products.lang.json | 3 +- public/assets/json/es/RawMaterials.lang.json | 36 +- public/assets/json/fr/Cooking.lang.json | 363 +++++++---- public/assets/json/fr/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/fr/Fishing.lang.json | 427 ++++++------- public/assets/json/fr/Others.lang.json | 16 +- public/assets/json/fr/Products.lang.json | 3 +- public/assets/json/fr/RawMaterials.lang.json | 36 +- public/assets/json/it/Cooking.lang.json | 363 +++++++---- public/assets/json/it/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/it/Fishing.lang.json | 427 ++++++------- public/assets/json/it/Others.lang.json | 16 +- public/assets/json/it/Products.lang.json | 3 +- public/assets/json/it/RawMaterials.lang.json | 36 +- public/assets/json/ja/Cooking.lang.json | 363 +++++++---- public/assets/json/ja/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/ja/Fishing.lang.json | 469 +++++++-------- public/assets/json/ja/Others.lang.json | 16 +- public/assets/json/ja/Products.lang.json | 3 +- public/assets/json/ja/RawMaterials.lang.json | 36 +- public/assets/json/ko/Cooking.lang.json | 363 +++++++---- public/assets/json/ko/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/ko/Fishing.lang.json | 469 +++++++-------- public/assets/json/ko/Others.lang.json | 16 +- public/assets/json/ko/Products.lang.json | 3 +- public/assets/json/ko/RawMaterials.lang.json | 36 +- public/assets/json/nl/Cooking.lang.json | 363 +++++++---- public/assets/json/nl/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/nl/Fishing.lang.json | 427 ++++++------- public/assets/json/nl/Others.lang.json | 16 +- public/assets/json/nl/Products.lang.json | 3 +- public/assets/json/nl/RawMaterials.lang.json | 36 +- public/assets/json/pl/Cooking.lang.json | 363 +++++++---- public/assets/json/pl/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/pl/Fishing.lang.json | 469 +++++++-------- public/assets/json/pl/Others.lang.json | 16 +- public/assets/json/pl/Products.lang.json | 3 +- public/assets/json/pl/RawMaterials.lang.json | 36 +- public/assets/json/pt-br/Cooking.lang.json | 363 +++++++---- public/assets/json/pt-br/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/pt-br/Fishing.lang.json | 427 ++++++------- public/assets/json/pt-br/Others.lang.json | 16 +- public/assets/json/pt-br/Products.lang.json | 3 +- .../assets/json/pt-br/RawMaterials.lang.json | 36 +- public/assets/json/pt/Cooking.lang.json | 363 +++++++---- public/assets/json/pt/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/pt/Fishing.lang.json | 427 ++++++------- public/assets/json/pt/Others.lang.json | 16 +- public/assets/json/pt/Products.lang.json | 3 +- public/assets/json/pt/RawMaterials.lang.json | 36 +- public/assets/json/ru/Cooking.lang.json | 363 +++++++---- public/assets/json/ru/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/ru/Fishing.lang.json | 469 +++++++-------- public/assets/json/ru/Others.lang.json | 16 +- public/assets/json/ru/Products.lang.json | 3 +- public/assets/json/ru/RawMaterials.lang.json | 36 +- public/assets/json/zh-hans/Cooking.lang.json | 363 +++++++---- .../assets/json/zh-hans/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/zh-hans/Fishing.lang.json | 469 +++++++-------- public/assets/json/zh-hans/Others.lang.json | 16 +- public/assets/json/zh-hans/Products.lang.json | 3 +- .../json/zh-hans/RawMaterials.lang.json | 36 +- public/assets/json/zh-hant/Cooking.lang.json | 363 +++++++---- .../assets/json/zh-hant/Curiosity.lang.json | 564 ++++++++++++------ public/assets/json/zh-hant/Fishing.lang.json | 469 +++++++-------- public/assets/json/zh-hant/Others.lang.json | 16 +- public/assets/json/zh-hant/Products.lang.json | 3 +- .../json/zh-hant/RawMaterials.lang.json | 36 +- .../fishingTile/fishingDataListTile.tsx | 12 +- src/constants/UsageKey.ts | 3 + .../catalogue/catalogueItem.Components.tsx | 21 + .../catalogue/catalogueItemContainer.tsx | 16 +- .../catalogue/catalogueItemPresenter.tsx | 6 +- 108 files changed, 13299 insertions(+), 8917 deletions(-) create mode 100644 public/assets/images/contributors/goodGuysFree.png diff --git a/package.json b/package.json index c187ed00b008..d49fedfbeab5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nms-web-app", - "version": "0.46.0", + "version": "0.46.1", "private": true, "scripts": { "start": "env-cmd --file ./.env.development react-scripts start", diff --git a/public/assets/data/meta.json b/public/assets/data/meta.json index 40b2a3e7d22c..5eec774b0b00 100644 --- a/public/assets/data/meta.json +++ b/public/assets/data/meta.json @@ -1,5 +1,5 @@ { "GameVersion": "5.12", - "GameBuildNumber": 15663204, - "GeneratedDate": "2024-09-16" + "GameBuildNumber": 15728657, + "GeneratedDate": "2024-09-23" } \ No newline at end of file diff --git a/public/assets/images/contributors/goodGuysFree.png b/public/assets/images/contributors/goodGuysFree.png new file mode 100644 index 0000000000000000000000000000000000000000..5214db8c749756ab90e22875e4728ca0ab563c3d GIT binary patch literal 18108 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 bd;fm{Lno|Eg+Vpb00000NkvXXu0mjfDrngB literal 0 HcmV?d00001 diff --git a/public/assets/images/special/fishing-both.png b/public/assets/images/special/fishing-both.png index 6d15b88a9be6a767735b040072f95cb4007de682..050f239bee290f0e4a0c133c379352027afc4855 100644 GIT binary patch literal 944 zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4pjZFj@!rgt)pF_?#Vf;LMpbWcUe9 z7aAASz!^uU90rDFMoExgFvBnZBZAFO`G0F~yk{d@qV;4)0`s1;{RMmvITpRD*t*|% z$#auOU!@gS8$~;0nhGqf0e+f+vDlt7~*k!@71eehaCji9_-JZvg-jK zYuE1G-WMOe`>_ANaKXit;7h)TM61mwzkf6HjE`T#e>>rq8~0!0dH;@iA``=mhZYPE zQcgze<;-C|@TP=^p^v}#UfI+d@kY6)4?DkaU4D$c;pa+E)(iI+9j`k&k8$Hvfy!X3 zrgiLlA}=aXXklY3WA7_rB(F?-JUHx1g_ zwB#3SPQLE4?~fgxJr#eWJK@O$(V6#c%F}W>q!|`i`%k)Fw!$ct>A*ofhB-yff|qg> zPj+Xv(v zKQa!5eA(B?v9k9>hS8GCPx`@h3F>y4dBoGI&B^T_)*9LMk99%X&8hlF?_e;zDl zE3(THLQ($YFUy0J^}&`G*|KCQDM|_1lOlx&_m2{V2m4ZFD}S=*^PO|%Z)Wbyy>s2U ze<`2(_B-dyoHM^UbI$LaGpYY1Oo_EsLPbSIYs@ZmqO`Phn^PE*YSva21JMvP7pL=j zc2OL~iAFXV9-s+9Cq>a_J&rWvfiG;jFGfS57pkc;&^1MXb=>!rd(^9X(f6`JiXNVDU@Ybk zs^Ju5auSV`vnCr(QNt5Xw!-X2QBH~xXsJm?lc=NVbbq?KO}b1+jZHEuWxSMc%+i+6 zw?rIO&!O`rB_+49n|X*kq%=0;&>VGAg8F??nzn9X=c-I3)uZjvAk-0!=OJ}f2(FET zd#@&3De8@h{;Bi(@`GOAEU7+tJx{m(D(|Q&VV|a2-=+NvbwLu!gm(f11Kf&s{ zLRl^HTCFmObd-uMFq_bLr{Fi`G^PO`3iY~R&VQnoNXui+&q|$Un8!#9Lue<2j!`Q1 zz+6Q^Cl_UN(lQCjNzLMeD)2(v^*nLbfi|`7yF2~`+>^1N&2ZHAi1v*di(W3%;0Bw{ z#vZf=4dMRVPKkxKyJ7ATXZ59gaIf~L^U-Y5Z=FI9zBi+xIv9 z)2fpfm7g9*M`IMA!+420hmD=8!u#nJC!=VB+!*>-@H*PT+Awr{7;2J#2d|^fnI#M5 z43Av*_~8E4sHe>qgxAq;)<&VDtWKD*z<(z_4ISB-h6DR^^(@yHVYZuG z%2~?`#XIY@GHf)toap>5N6w(rQr%p6eOHjVU;5r&W z{j|v@hi^X`gh-$t0V|P~&uq~^#|Z7vx8USwrzByrI_hFW*I=Y0ie|W+*6+c4NE7A) i4(k8rfBq3tsb6rxLk!%Nne+ev00{s|MNUMnLSTZ^);MPX diff --git a/public/assets/images/special/fishing-day.png b/public/assets/images/special/fishing-day.png index 580737edcecc5e85f8cf18be308950394839a100..d42318655820043a94afce7e91df1182a83cc509 100644 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s9sxcfuI>ds=fU9IxpP1oPM(2* zvuDr#{|F?Y049u}ArcWrs?tC+#Y=+xf*Ax1>>d0A;u8w$8yY6eU$Fnc`3n!;e~9?b z@Q;CkQPk7LF{I+w-O!st%?dmsu3G}$Px|wJzL<^#zsTH;`p-BIwaw8vS=^d^R$ns1 zrS>F4@1N@o0uNp0HJLF?*-{{S<5_3wi)EK&UL=UPRUFuSwVsLXklc#3`!-c=e7?&j zD1UDFJB8_MudO{Zx3$Z}_U%Q_`SUUxkIXz_5%b#+@%X4Ch;K{;uuD*7K##wV3^JRyG4S%T#7Q zXC)V#m*4lM`m)WQlRw9|)WTG%^jJjLf49f)9?sTzRMD07;e(+=XwSGFU+=K`}kB9Y|J;$j0T1wgQu&X J%Q~loCII@j+baM7 delta 988 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 e@EuMDqW=NC`te_L;LUyj0000=Mb3r-)a zFrXqqY)hgIH=&FKkQ+-yqRK#AxJ^{Vbr8dKxWq(#mL5IwE4$ial^*N`^ z5~ozzQ$}P3*HNimJ}XOHPp5QF)i1hb_`IMzyKYI z`0&>AxBrQEi3U5zU#WEnq>Wt_5QafdF~UEV*6gFi3>8M3$AI3KXo zm}4b`QoVFxRE%EFh|GCX&r+Kgkl!&nKVQ0d={v}S0CN_x5Tbeb^5Nu%?fGv$uwE|i zi~UK?_VEcBkY@v;MoABn-^Jpg8K7xkB`IsWYZFudPJjJKqkNOIdeJx#2X`+|U;c^p zfslFzp46W#=45WwFpLS#>P4d|nqOR0H>{ASB={X_;->(%unowua5 zU6?6+&VOo8Fxu{}XOFz0_j>%QQFZa_DDT}dr7-QAK?KzKL?aJcxz=44LvcF~AX5$` zmEq~E!mqn^RliX;Vg|5a;q$CULL<8~J3Twg>d>G?+#C2kb{ke>k><>XnqpgXQWipq z^ME+)U8ondXjfu(8y_w6@wPj~Zrbe<-NfDD<9{Fnf|tM@mb~k0Rui!|vbV$HP;q8J z@5T6;-=F^$avE+--S~$^$1P+z&Vdxk?gQOr)P2C20lhomrzUC(kkg<#tuCV7!kCM5 zAccQt0=?{U%ivnFtah)!B1Tk6r+NlvQIy9^6n)0Jd_tm|!2sz&3K%dZ#!`qr=Fy*zimVQefB{D# z-_C!}V&8dQf4+jaj8z9y)FefN*tnAH#nG6CS$tN1whUP{7T+Z974Eg&K6q=QO?uW| zrdht}4Lu;6Vurk)6gt_LEifyxD{!T-#(%m^!o9-1w%Z3S{Qj3bpOG17X5G+(!g7)W zE<~eoPaT}v zdivsNd`PlnSm=p1OsA+jF2*ZuPe9qLZ>E^@`#uH0eGAHRR_%SR{p5`O7Z@op41MDWmubq zi-j*)4JC30G_OZr-$H||4jfzy*JL%4L^GhFc>F%?QmNh-r6uiOQmG68ynnFoli2Tv z_y#T5TX8<$O(GZaf(yJFdv&g#iyNbkHq&+jeEv67zg@HeaP^$g9}4&r%)#P7xX?SB1#);9x=i_~l2r18H2$BPjE Z0iA{KG#UjCEC2ui07*qoLds=V9R7xpNTa86k8}=VKf8qXv_aCf--0m|l zF#37AIEGZ*x*L++-=e^?Me9*@cue@m|Nk%Sezf>N(#_pDMJLZLZ}iEu&h_}GxgaDf zHY9pk{>jUAwt>zu`qQo++T8K-=_^OKd*+KGyI5R|mE(=J#RmJA&ao0Myz73?Za?cS zt=$JYZny5avpe_AX};i=Zp$-s?qt7N%<)oQe4UB7spgee>lzm1_FI{=uivT3yY!y0 zc0u07xrT3!T7Etwz20vo!z}ih*9{+wD7)Qx$#(uw@Xs_$A(_aOiSFr3vTYnJww-ae zTgIR6&X!{(w?H;}`WJT9#$%D27+>YgiV61VtJ*v@$R}-DF5kgl#hYh0TLuIgzIbbR zO7L=e-MuznBZmbcmOc-UA9qu!?|5syLgw6~x<9c;BEPh^S#+POk$+IY_vwnj^9eKG zZ)KmoneFWF_Mqm&@gH`{8C%TZ-Z{71&Bo3w^K<{Jdh=%opUF#n7N6>Dt{548b~-Tp O89ZJ6T-G@yGywqfuLG9= delta 1125 zcmV-r1e*Jb1n&rt8Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01mA;4aoY zw95$HN3QJC{66d%!hH{f)2Avq;ZorG`ua1Ib#x$n%euuQR^Bcf&nVJCkrTTdag4`G zEdrC2Qh->O#rCHp>H(9>vZcAYx{{~Ho{$&t-m+bmW`C*z=JFpjvzB4vTPAkLu!W)O z!$<3C;Ki@rRVkaqHo-Z~S#Hh7{4^Br2p_CI7;8`fJ!CyV*qk##+b%~uavWi)F6VBQ zq?-gIwGmoI8iPk~IGt*a_4W0OVQ-$K0;wcZsIXFW5W2Q)fQ9HEyNqDYE^{iZvWAKj zu+ZsEu75H-=z=&edZQLd=DszPFt;kUl#pj4q8vc@Xo=(j?&Ym6B#UxUhPAGMNC9pr zt|&)!hD{Mw>(N2n53062Za)t|CWTsZ%MvNT&4B_uaIVdk2gN!^*TVH+*gK}9q__5% z)H1qa=Ml-+dudb{i=My>vlWoLtoi1UdqH(ap?}#5FsQg=th`gKfui?|(UAkJ;U*9>#-Ifj8;v|cm2N>~JslJ=c{jnW~M!$M2% z&&8^l{K(}UKZ~hJTn4>p6orA~oG{+;vwxUN0p4e|#V8h+>=!og_%c*hfKtE1DVSI_ zgVjU*5#I4-sgwf<6Ma^fFsd1;g5w?U!R-N(Q1PqJjR6SQvu1#Iycd@TYy}CvXHJ4u zWz9n@JNWy^JAT;f!yQ5rij_oht0TG5L$G^c*lEiE0C(DSn|wM reW#80;!+@2O<6&b!g$B~X*B) ( - - +interface IProps extends FishingData { + isCatalogueMode?: boolean; +} + +export const FishingDataListTile = (props: IProps) => ( + +
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)}