Merge commit '6d0f6243bb79ddf1401d9e418d02ac9086dd4503'

LinLin00000000 · Mar 16, 2024 · 45dd65e · 45dd65e
2 parents 7fef20d + 6d0f624
commit 45dd65e
Show file tree

Hide file tree

Showing 15 changed files with 222 additions and 70 deletions.
diff --git a/public/maps/ground-zero-3d.jpg b/public/maps/ground-zero-3d.jpg
diff --git a/public/maps/streets-2d.jpg b/public/maps/streets-2d.jpg
diff --git a/public/maps/streets-3d-caches.jpg b/public/maps/streets-3d-caches.jpg
diff --git a/public/maps/streets-3d-lexos.jpg b/public/maps/streets-3d-lexos.jpg
diff --git a/public/maps/streets-3d.jpg b/public/maps/streets-3d.jpg
diff --git a/src/features/achievements/do-fetch-achievements.mjs b/src/features/achievements/do-fetch-achievements.mjs
@@ -13,6 +13,8 @@ class AchievementsQuery extends APIQuery {
                 description
                 hidden
                 playersCompletedPercent
+                normalizedRarity
+                rarity
             }
         }`;
 

diff --git a/src/pages/achievements/index.css b/src/pages/achievements/index.css
@@ -0,0 +1,7 @@
+.rare {
+    color: #8c6edf;
+}
+
+.legendary {
+    color: #ffe084;
+}
diff --git a/src/pages/achievements/index.js b/src/pages/achievements/index.js
@@ -10,6 +10,14 @@ import DataTable from '../../components/data-table/index.js';
 
 import useAchievementsData from '../../features/achievements/index.js';
 
+import './index.css';
+
+const raritySort = {
+    "common": 0,
+    "rare": 1,
+    "legendary": 2
+}
+
 function Achievements() {
     const { t } = useTranslation();
 
@@ -23,21 +31,17 @@ function Achievements() {
         () => [
             {
                 Header: () => (
-                    <div
-                      style={{
-                        textAlign:'left'
-                      }}
-                    >{t('Name')}</div>),
+                    <div style={{textAlign:'left', paddingLeft:'10px'}}>
+                        {t('Name')}
+                    </div>),
                 id: 'name',
                 accessor: 'name',
             },
             {
                 Header: () => (
-                    <div
-                      style={{
-                        textAlign:'left'
-                      }}
-                    >{t('Description')}</div>),
+                    <div style={{textAlign:'left', paddingLeft:'10px'}}>
+                        {t('Description')}
+                    </div>),
                 id: 'description',
                 accessor: 'description',
             },
@@ -51,7 +55,12 @@ function Achievements() {
                     );
                 },
                 sortType: (rowA, rowB) => {
-                    return (+ rowA.values.hidden) - (+ rowB.values.hidden);
+                    let rowAhidden = rowA.original.hidden ? 1 : 0
+                    let rowBhidden = rowB.original.hidden ? 1 : 0
+                    if (rowAhidden === rowBhidden) {
+                        return rowB.original.playersCompletedPercent - rowA.original.playersCompletedPercent
+                    }
+                    return rowAhidden - rowBhidden;
                 },
             },
             {
@@ -66,6 +75,26 @@ function Achievements() {
                     );
                 },
             },
+            {
+                Header: t('Rarity'),
+                id: 'rarity',
+                accessor: 'rarity',
+                Cell: (props) => {
+                    return (
+                        <div className={`center-content ${props.row.original.normalizedRarity}`}>
+                            {props.value}
+                        </div>
+                    );
+                },
+                sortType: (rowA, rowB) => {
+                    let rowAr = raritySort[rowA.original.normalizedRarity];
+                    let rowBr = raritySort[rowB.original.normalizedRarity];
+                    if (rowAr === rowBr) {
+                        return rowB.original.playersCompletedPercent - rowA.original.playersCompletedPercent
+                    }
+                    return rowAr - rowBr;
+                },
+            }
         ],
         [t],
     );

diff --git a/src/pages/bitcoin-farm-calculator/index.js b/src/pages/bitcoin-farm-calculator/index.js
@@ -14,6 +14,7 @@ import StationSkillTraderSetting from '../../components/station-skill-trader-set
 
 import formatPrice from '../../modules/format-price.js';
 import { averageWipeLength, currentWipeLength } from '../../modules/wipe-length.js';
+import useHideoutData from '../../features/hideout/index.js';
 
 import {
     BitcoinItemId,
@@ -32,6 +33,9 @@ import './index.css';
 const BitcoinFarmCalculator = () => {
     const { t } = useTranslation();
 
+    const { data: hideout } = useHideoutData();
+    const solar = hideout.find(station => station.normalizedName === 'solar-power');
+
     const [graphicCardsCount, setGraphicCardsCount] = useStateWithLocalStorage(
         'num-graphic-cards',
         MaxNumGraphicsCards,
@@ -110,8 +114,9 @@ const BitcoinFarmCalculator = () => {
                         type="skill"
                     />
                     <StationSkillTraderSetting
-                        stateKey={'solar-power'}
+                        stateKey={solar.normalizedName}
                         type="station"
+                        image={solar.imageLink}
                     />
                     <ToggleFilter
                         label={t('Use fuel cost: {{price}}/day', {

diff --git a/src/pages/player/index.css b/src/pages/player/index.css
@@ -42,3 +42,11 @@ ul.favorite-item-list li {
     display: inline-block;
     padding-left: 2px;
 }
+
+.rare {
+    color: #8c6edf;
+}
+
+.legendary {
+    color: #ffe084;
+}