Skip to content

Commit 8f245f2

Browse files
committed
feat(overlay): add trinkets support
1 parent 5cbf3d0 commit 8f245f2

File tree

2 files changed

+51
-6
lines changed

2 files changed

+51
-6
lines changed

src/twitch-hdt.d.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ export interface BoardStatePlayer {
7070
*/
7171
weapon?: number;
7272

73+
/**
74+
* The dbfId of the first trinket, if any.
75+
*/
76+
first_trinket?: number;
77+
78+
/**
79+
* The dbfId of the second trinket, if any.
80+
*/
81+
second_trinket?: number;
82+
7383
/**
7484
* The dbfIds of secrets.
7585
*/

src/viewer/overlay/Overlay.tsx

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,16 @@ const Weapon = styled(OverlayElement)`
146146
clip-path: circle(50% at 50% 50%);
147147
`;
148148

149+
const Trinket = styled(OverlayElement)`
150+
top: ${(props) => props.top || "unset"};
151+
left: ${(props) => props.left || "unset"};
152+
bottom: ${(props) => props.bottom || "unset"};
153+
154+
height: 9.5vh;
155+
width: 9.5vh;
156+
clip-path: circle(50% at 50% 50%);
157+
`;
158+
149159
const BattlegroundsAnomaly = styled(OverlayElement)`
150160
top: ${(props) => props.top || "unset"};
151161
right: ${(props) => props.right || "unset"};
@@ -559,12 +569,37 @@ class Overlay extends React.Component<Props & TwitchExtProps, State> {
559569
<HeroPower bottom={"16.9vh"} right={"65.6vh"}>
560570
<Entity dbfId={player.hero_power || null} />
561571
</HeroPower>
562-
<Weapon top={"15.5vh"} left={"65.8vh"}>
563-
<Entity dbfId={opponent.weapon || null} />
564-
</Weapon>
565-
<Weapon bottom={"16.8vh"} left={"64.25vh"}>
566-
<Entity dbfId={player.weapon || null} />
567-
</Weapon>
572+
573+
{opponent.first_trinket || opponent.second_trinket ? (
574+
<>
575+
<Trinket top={"10.7vh"} left={"72.7vh"}>
576+
<Entity dbfId={opponent.first_trinket || null} />
577+
</Trinket>
578+
<Trinket top={"16.7vh"} left={"65.3vh"}>
579+
<Entity dbfId={opponent.second_trinket || null} />
580+
</Trinket>
581+
</>
582+
) : (
583+
<Weapon top={"15.5vh"} left={"65.8vh"}>
584+
<Entity dbfId={opponent.weapon || null} />
585+
</Weapon>
586+
)}
587+
588+
{player.first_trinket || player.second_trinket ? (
589+
<>
590+
<Trinket bottom={"14.3vh"} left={"71.6vh"}>
591+
<Entity dbfId={player.first_trinket || null} />
592+
</Trinket>
593+
<Trinket bottom={"21vh"} left={"64.6vh"}>
594+
<Entity dbfId={player.second_trinket || null} />
595+
</Trinket>
596+
</>
597+
) : (
598+
<Weapon bottom={"16.8vh"} left={"64.25vh"}>
599+
<Entity dbfId={player.weapon || null} />
600+
</Weapon>
601+
)}
602+
568603
{!ignoreDeck ? (
569604
<>
570605
<Deck top={"24vh"} right={"24vh"}>

0 commit comments

Comments
 (0)