Skip to content

Commit 130f1ab

Browse files
committed
Update full grid master board
1 parent f5e3f60 commit 130f1ab

15 files changed

+270
-131
lines changed

src/components/GridMasterBoard.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { GridMasterTile } from '../types/grid-master';
88

99
export default function GridMasterBoard() {
1010
const { tiles } = useGridMasterContext();
11+
console.log(tiles);
1112
return (
1213
<div className="grid-master__board">
1314
{tiles.map(tile => {
@@ -37,7 +38,7 @@ function GridMasterTaskTile({ tile }: { tile: GridMasterTile }) {
3738
className="grid-master__cell"
3839
tooltip={
3940
flipped && !unknown && tile.rewardDescription ? (
40-
<Text style={{ maxWidth: '360px' }}>
41+
<div style={{ maxWidth: '360px' }}>
4142
<Text type="body-md" weight="500">
4243
{tile.reward}
4344
</Text>
@@ -49,7 +50,7 @@ function GridMasterTaskTile({ tile }: { tile: GridMasterTile }) {
4950
</React.Fragment>
5051
))}
5152
</Text>
52-
</Text>
53+
</div>
5354
) : (
5455
<Text type="body-sm">
5556
{((!unknown && (flipped ? tile.reward : tile.task)) || 'Unknown')
@@ -97,7 +98,7 @@ function GridMasterRewardTile({ tile }: { tile: GridMasterTile }) {
9798
className="grid-master__cell"
9899
tooltip={
99100
!unknown && tile.rewardDescription ? (
100-
<Text style={{ maxWidth: '360px' }}>
101+
<div style={{ maxWidth: '360px' }}>
101102
<Text type="body-md" weight="500">
102103
{tile.reward}
103104
</Text>
@@ -109,7 +110,7 @@ function GridMasterRewardTile({ tile }: { tile: GridMasterTile }) {
109110
</React.Fragment>
110111
))}
111112
</Text>
112-
</Text>
113+
</div>
113114
) : (
114115
<Text type="body-sm">{(!unknown && tile.reward) || 'Unknown'}</Text>
115116
)

src/components/GridMasterHeader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default function GridMasterHeader() {
1414
{context.flipped ? 'Rewards' : 'Tasks'}
1515
</Text>
1616
<Stack align="center">
17-
<TooltipWrapper
17+
{/* <TooltipWrapper
1818
tooltip={
1919
context.hideUnconfirmed ? 'Show Unconfirmed' : 'Hide Unconfirmed'
2020
}
@@ -25,7 +25,7 @@ export default function GridMasterHeader() {
2525
onClick={() => context.setHideUnconfirmed(state => !state)}
2626
variant="text"
2727
/>
28-
</TooltipWrapper>
28+
</TooltipWrapper> */}
2929
<TooltipWrapper tooltip="Flip Board">
3030
<Button
3131
icon="flip"

src/components/GridMasterTileImage.tsx

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
import classNames from 'classnames';
22
import React from 'react';
33
import WikiIcon from './WikiIcon';
4+
import relicBankHeist from '../images/grid-master-relic-bank-heist.png';
5+
import relicBankersNote from '../images/grid-master-relic-bankers-note.png';
6+
import relicBottomlessBrew from '../images/grid-master-relic-bottomless-brew.png';
7+
import relicCornerCutter from '../images/grid-master-relic-corner-cutter.png';
48
import relicCorruptedShark from '../images/grid-master-relic-corrupted-shark.png';
9+
import relicDodgyDeals from '../images/grid-master-relic-dodgy-deals.png';
510
import relicFairyFlight from '../images/grid-master-relic-fairy-flight.png';
11+
import relicFarmersFortune from '../images/grid-master-relic-farmers-fortune.png';
612
import relicFriendlyForager from '../images/grid-master-relic-friendly-forager.png';
713
import relicGathering from '../images/grid-master-relic-gathering.png';
814
import relicGoldenGod from '../images/grid-master-relic-golden-god.png';
15+
import relicGrimoire from '../images/grid-master-relic-grimoire.png';
916
import relicGuardian from '../images/grid-master-relic-guardian.png';
17+
import relicLastStand from '../images/grid-master-relic-last-stand.png';
1018
import relicMinimumPotential from '../images/grid-master-relic-minimum-potential.png';
1119
import relicProductionMaster from '../images/grid-master-relic-production-master.png';
12-
import relicScarab from '../images/grid-master-relic-scarab.png';
20+
import relicSpikeyAura from '../images/grid-master-relic-spikey-aura.png';
1321
import relicSlayerMaster from '../images/grid-master-relic-slayer-master.png';
22+
import relicSpecialist from '../images/grid-master-relic-specialist.png';
1423
import relicTotalRecall from '../images/grid-master-relic-total-recall.png';
15-
import rewardCombatStyles from '../images/grid-master-reward-combat-styles.png';
24+
import rewardCombatMasteries from '../images/grid-master-reward-combat-masteries.png';
1625
import rewardTirannwnUnlock from '../images/grid-master-reward-tirannwn-unlock.png';
1726
import rewardUnknown from '../images/grid-master-reward-unknown.png';
1827
import rewardXp from '../images/grid-master-reward-xp.png';
@@ -87,22 +96,40 @@ const tasks: Record<string, any> = {
8796
};
8897

8998
const rewards: Record<string, any> = {
99+
R3: rewardCombatMasteries,
90100
R4: rewardXpMultiplier,
101+
R5: rewardCombatMasteries,
91102
A3: relicGoldenGod,
92103
A4: relicProductionMaster,
104+
A5: relicGrimoire,
105+
B1: relicSpecialist,
106+
B2: rewardXpMultiplier,
107+
B3: rewardXpMultiplier,
108+
B4: relicDodgyDeals,
109+
C3: relicBankHeist,
110+
C4: relicCornerCutter,
93111
C6: relicTotalRecall,
94-
C7: relicScarab,
112+
C7: relicSpikeyAura,
113+
C8: rewardCombatMasteries,
95114
D2: rewardXp,
96115
D3: relicGathering,
97116
D4: relicGathering,
98117
D5: relicGathering,
99-
D6: rewardCombatStyles,
118+
D6: rewardCombatMasteries,
100119
D7: relicMinimumPotential,
101120
D8: rewardXpMultiplier,
102121
E1: relicSlayerMaster,
103122
E2: relicCorruptedShark,
123+
E3: rewardCombatMasteries,
104124
E4: relicFairyFlight,
125+
E6: relicFarmersFortune,
126+
E7: rewardXp,
127+
E8: rewardCombatMasteries,
128+
F1: relicLastStand,
105129
F3: rewardTirannwnUnlock,
130+
F5: relicBottomlessBrew,
131+
F7: rewardXpMultiplier,
106132
G2: relicGuardian,
133+
G3: relicBankersNote,
107134
G4: relicFriendlyForager,
108135
};

0 commit comments

Comments
 (0)