Refactor crop achievement logic and props

JorchCortez · JorchCortez · commit 99a3186ad29d · 2025-10-04T00:27:58.000-07:00
Simplifies Crops component by using precomputed achievement data and updates its props. Refactors crop achievement calculation in Utility.tsx to centralize logic, add maxMono and achievement flags, and improve maintainability.
diff --git a/src/Components/AchieveTabs/Crops.tsx b/src/Components/AchieveTabs/Crops.tsx
@@ -1,71 +1,29 @@
 import React, { useState, useEffect } from 'react'
 import type { cropsShippedType } from 'types/savefile';
 
-interface CropsProps {
+interface CropsShippedWrapperType {
     cropsShipped: cropsShippedType;
 }
 
-const Crops= ({ cropsShipped }: CropsProps) => {
-    const [maxShipped, setMaxShipped] = useState<{name: string, times: number}>({name: '', times: 0});
-
-    const timesShipped = (arr: cropsShippedType) => {
-        let maxPoly = arr.poly_crops.sort((a, b) => {
-            const aTimes = a.shipped ? a.shipped : 0;
-            const bTimes = b.shipped ? b.shipped : 0;
-            return bTimes - aTimes; // Sort in descending order
-        });
-        let maxMono = arr.mono_extras.sort((a, b) => {
-            const aTimes = a.shipped ? a.shipped : 0;
-            const bTimes = b.shipped ? b.shipped : 0;
-            return bTimes - aTimes; // Sort in descending order
-        });
-        console.log('maxPoly', maxPoly)
-        if ((maxPoly === undefined || maxPoly.length === 0) && (maxMono === undefined || maxMono.length === 0)) {
-            setMaxShipped({name: 'None', times: 0});
-            return;
-        } else {
-            const polyShipped = maxPoly[0]?.shipped || 0;
-            const monoShipped = maxMono[0]?.shipped || 0;
-            if (polyShipped > monoShipped) {
-                setMaxShipped({
-                    name: maxPoly[0]?.name || 'Unknown',
-                    times: maxPoly[0]?.shipped || 0
-                });
-            } else {
-                setMaxShipped({
-                    name: maxMono[0]?.name || 'Unknown',
-                    times: maxMono[0]?.shipped || 0
-                });
-            }
-        }
-    };
-
-    useEffect(() => { 
-        console.log('cs', cropsShipped)
-        timesShipped(cropsShipped);
-    }, [cropsShipped]);
-
-    console.log(maxShipped)
-    let _monocultureAchieved = maxShipped.times >= 300;
-    let _totalShipped = 0 //cropsShipped.poly_crops.reduce((acc, crop) => acc + (crop.shipped ? crop.shipped : 0), 0);
-    let _polycultureAchieved = _totalShipped >= 15;
-    let _monocultureText = _monocultureAchieved ? "You already have the 'Monoculture' Achievement" : `You've shipped ${ maxShipped.name } the most and you require ${300 - maxShipped.times} more of it to get the 'Monoculture' Achievement`;
-    let _polycultureText = _polycultureAchieved ? "You already have the 'Polyculture' Achievement" : `You need to ship ${15 - _totalShipped} more crops to get the 'Polyculture' achievement`;
-
+const Crops= (cropsShipped : CropsShippedWrapperType) => {
+    console.log('CropsShipped', cropsShipped);
+    let _monocultureText = cropsShipped.cropsShipped.hasMonoculture ? "You already have the 'Monoculture' Achievement" : `You've shipped ${ cropsShipped.cropsShipped.maxMono?.name } the most and you require ${300 - cropsShipped.cropsShipped.maxMono?.shipped} more of it to get the 'Monoculture' Achievement`;
+    let _polycultureText = cropsShipped.cropsShipped.hasPolyculture ? "You already have the 'Polyculture' Achievement" : `You need to ship 15 crops for each polyculture crop to get the 'Polyculture' achievement`;
+    
     return ( 
         <div className="progress-container">  
-            <span className="a-title"><h1>{_monocultureAchieved ? `You've shipped ${ maxShipped.name } the most and you require ${300 - maxShipped.times} more of it to get the 'Monoculture' Achievement` : <span className="completed">`You already have the 'Monoculture' Achievement`</span> }</h1></span>
+            {/* <span className="a-title"><h1>{_monocultureAchieved ? `You've shipped ${ maxShipped.name } the most and you require ${300 - maxShipped.times} more of it to get the 'Monoculture' Achievement` : <span className="completed">`You already have the 'Monoculture' Achievement`</span> }</h1></span> */}
             <br />
             <h2>Farming Achievements</h2>
             <ul className="a-List"> 
-                <li>Monoculture: <span className={_monocultureAchieved ? "completed" : "pending"}>{_monocultureText}</span> </li>
-                <li>Polyculture: <span className={_polycultureAchieved ? "completed" : "pending"}>{_polycultureText}</span></li>
+                <li>Monoculture: <span className={cropsShipped.cropsShipped.hasMonoculture ? "completed" : "pending"}>{_monocultureText}</span> </li>
+                <li>Polyculture: <span className={cropsShipped.cropsShipped.hasPolyculture ? "completed" : "pending"}>{_polycultureText}</span></li>
             </ul>
             <span className="a-title"><p>Ship 15 of the following crops to get the 'Polyculture' achievement</p></span>
-            {cropsShipped.poly_crops.map((crop, i) =><a href={`https://stardewvalleywiki.com/${crop.image}`} target="blank" key={i}> <img key={i} src={`https://stardew-tracker.s3.amazonaws.com/Crops/${crop.image}.png`} alt={crop.name} className={ (crop.shipped !== undefined) ? ((crop.shipped >= 15) ? "done" : "known" ): "" } title={(crop.shipped !== undefined) ? (crop.shipped >= 15) ? `You have shipped  ${crop.name}  ${crop.shipped} times` : `You have to ship ${ 15 - crop.shipped} more ${crop.name} ` : `You haven't shipped ${crop.name}`} ></img></a>)}
+            {cropsShipped.cropsShipped.poly_crops.map((crop, i) =><a href={`https://stardewvalleywiki.com/${crop.image}`} target="blank" key={i}> <img key={i} src={`https://stardew-tracker.s3.amazonaws.com/Crops/${crop.image}.png`} alt={crop.name} className={ (crop.shipped !== undefined) ? ((crop.shipped >= 15) ? "done" : "known" ): "" } title={(crop.shipped !== undefined) ? (crop.shipped >= 15) ? `You have shipped  ${crop.name}  ${crop.shipped} times` : `You have to ship ${ 15 - crop.shipped} more ${crop.name} ` : `You haven't shipped ${crop.name}`} ></img></a>)}
 
             <span className="a-title"><p>This crops are not counted for the 'Polyculture' achievement</p></span>
-            {cropsShipped.mono_extras.map((crop, i) =><a href={`https://stardewvalleywiki.com/${crop.image}`} target="blank" key={i}> <img key={i} src={`https://stardew-tracker.s3.amazonaws.com/Crops/${crop.image}.png`} alt={crop.name} className={ (crop.shipped !== undefined) ? ((crop.shipped > 0) ? "done" : "known" ): "" } title={(crop.shipped !== undefined) ? `You have shipped  ${crop.name}  ${crop.shipped} times` : `You haven't shipped ${crop.name}`} ></img></a>)}
+            {cropsShipped.cropsShipped.mono_extras.map((crop, i) =><a href={`https://stardewvalleywiki.com/${crop.image}`} target="blank" key={i}> <img key={i} src={`https://stardew-tracker.s3.amazonaws.com/Crops/${crop.image}.png`} alt={crop.name} className={ (crop.shipped !== undefined) ? ((crop.shipped > 0) ? "done" : "known" ): "" } title={(crop.shipped !== undefined) ? `You have shipped  ${crop.name}  ${crop.shipped} times` : `You haven't shipped ${crop.name}`} ></img></a>)}
         </div>
     );
 };
diff --git a/src/Components/Utility/Utility.tsx b/src/Components/Utility/Utility.tsx
@@ -23,6 +23,7 @@ import type {
     itemFoundType, 
     itemsType, 
     itemType, 
+    maxMonoType, 
     playerType, 
     professionsType, 
     questType, 
@@ -69,7 +70,8 @@ const GetDetailedInfo = ({playerData , collectionStatus, specialRequests, availa
     if(Array.isArray(playerData)){
         playerData.forEach(p => { 
             let playerFull = {
-                ...p, ...parseData({playerData: p, collectionStatus, specialRequests, availableSpecialRequests})
+                //...p, 
+                ...parseData({playerData: p, collectionStatus, specialRequests, availableSpecialRequests})
             }
             fullPlayerData.push(playerFull)
         }) 
@@ -90,7 +92,7 @@ const parseData = ({playerData, collectionStatus, specialRequests, availableSpec
         moneyEarned: playerData.totalMoneyEarned || 0, //DONE
         professions: GetProfessionData(playerData.professions.int) , //DONE?
         shippedItems: GetShippedItems(playerData.basicShipped) || [],//DONE
-        cropsShipped: GetShippedCrops(playerData.basicShipped?.item),//DONE
+        cropsShipped: GetCropsAchievements(playerData.basicShipped?.item),//DONE
         mineralsFound: GetArrayData(playerData.mineralsFound?.item) || [], //DONE
         cookedItems: GetCookingData(playerData.recipesCooked, playerData.cookingRecipes.item) || [], //DONE
         fishCaught: GetFishes(playerData.fishCaught.item) || [], 
@@ -185,38 +187,58 @@ const GetShippedItems = (allShipped: itemType) :generalFormatedItemType[] => {
     return data;
 }
 
-const GetShippedCrops = (allShipped: itemsType[]) : cropsShippedType => { 
+/* Crop Related Achievements */
+const GetCropsAchievements = (allShipped: itemsType[]) : cropsShippedType => { 
     const poly_crops: generalFormatedItemType[] = [] 
     const mono_extras: generalFormatedItemType[] = []
-    
-    // Process poly crops
-    ShipCrops.poly_crops.forEach(polycropItem => {  
-        const shippedItem = (allShipped && allShipped.length > 0) ? 
-            allShipped.find(i => i.key.int === polycropItem.id) : null;
-            
-        poly_crops.push({
-            name: polycropItem.name,
-            image: GetImages(polycropItem.name),
-            id: polycropItem.id,
-            shipped: shippedItem?.value?.int || 0
-        });
-    });
-    
-    // Process mono extras
-    ShipCrops.mono_extras.forEach(monoCropItem => {
-        const shippedItem = (allShipped && allShipped.length > 0) ?
-            allShipped.find(i => i.key.int === monoCropItem.id) : null;
-            
-        mono_extras.push({
-            name: monoCropItem.name,
-            image: GetImages(monoCropItem.name),
-            id: monoCropItem.id,
-            shipped: shippedItem?.value?.int || 0
-        });
+    let polycultureCount = 0;
+    let maxMono: maxMonoType = { name: "undefined", shipped: 0 };
+
+    ShipCrops.forEach(cropItem => {
+        const shippedCount = getShippedCount(allShipped, cropItem.id);
+        const cropData = createCropData(cropItem, shippedCount);
+
+        if (!maxMono || shippedCount > maxMono.shipped) {
+            maxMono = {
+                name: cropItem.name,
+                shipped: shippedCount
+            };
+        }
+
+        if (cropItem.isPolyCrop) {
+            if (shippedCount >= 15) polycultureCount++;
+            poly_crops.push(cropData);
+        } else {
+            mono_extras.push(cropData);
+        }
     });
-    
-    return { poly_crops, mono_extras };
+
+    const cropsAchievements = {
+        hasPolyculture: polycultureCount === 28,
+        hasMonoculture: maxMono ? maxMono?.shipped >= 300 : false,
+        maxMono,
+        poly_crops,
+        mono_extras 
+    };
+
+    return cropsAchievements;
 }
+
+const getShippedCount = (allShipped: itemsType[], cropId: number): number => {
+    if (!allShipped?.length) return 0;
+    const shippedItem = allShipped.find(item => item.key.int === cropId);
+    return shippedItem?.value?.int || 0;
+};
+
+const createCropData = (cropItem: any, shippedCount: number): generalFormatedItemType => ({
+        name: cropItem.name,
+        image: GetImages(cropItem.name),
+        id: cropItem.id,
+        shipped: shippedCount
+    });
+
+/* End of Crop Related Achievements */
+
 const GetFishes = (allFished: itemsType[]) => { 
     let data: generalFormatedItemType[] = []
 
