File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ export function useStationMarker({
1818 battle_pokemon_gender,
1919 battle_pokemon_id,
2020 battle_pokemon_bread_mode,
21+ battle_end,
2122 start_time,
2223 end_time,
2324} ) {
@@ -50,8 +51,9 @@ export function useStationMarker({
5051 ]
5152 } , basicEqualFn )
5253 const [ stationMod , battleMod ] = Icons . getModifiers ( 'station' , 'dynamax' )
53- const dynamicOpacity = useOpacity ( 'stations' ) ( end_time )
54- const opacity = isInactive ? 0.3 : dynamicOpacity
54+ const getOpacity = useOpacity ( 'stations' )
55+ const stationOpacity = isInactive ? 0.3 : getOpacity ( end_time )
56+ const battleOpacity = getOpacity ( battle_end )
5557 const isActive =
5658 ! isInactive &&
5759 ! ! battle_pokemon_id &&
@@ -75,7 +77,7 @@ export function useStationMarker({
7577 style="
7678 width: ${ baseSize } px;
7779 height: ${ baseSize } px;
78- opacity: ${ opacity } ;
80+ opacity: ${ stationOpacity } ;
7981 bottom: ${ 2 + stationMod . offsetY } px;
8082 left: ${ stationMod . offsetX * 50 } %;
8183 transform: translateX(-50%);
@@ -88,7 +90,7 @@ export function useStationMarker({
8890 src="${ battleIcon } "
8991 alt="${ battleIcon } "
9092 style="
91- opacity: ${ opacity } ;
93+ opacity: ${ battleOpacity } ;
9294 width: ${ battleSize } px;
9395 height: ${ battleSize } px;
9496 bottom: ${ baseSize * 0.8 * battleMod . offsetY } px;
You can’t perform that action at this time.
0 commit comments