Android build v1.1.5
This commit is contained in:
+19
-8
@@ -22,6 +22,7 @@ import {
|
||||
} from './input'
|
||||
import { ControllerBindingLabel } from './components/ControllerIcons'
|
||||
import { PartyMemberFrame } from './components/PartyFrames'
|
||||
import { barFillStyle } from './components/barStyles'
|
||||
import { groupFloatingTextsByMember } from './combat/combatPresentation'
|
||||
|
||||
const STORAGE_KEY = 'ashen-halls-dual-screen-enabled'
|
||||
@@ -480,7 +481,7 @@ export function DualScreenBottomDisplay() {
|
||||
<strong>{Math.max(0, Math.floor(state.opponentEnemyHealth ?? 0))} / {state.encounterMaxHealth}</strong>
|
||||
</div>
|
||||
<div className="bar enemy-health boss-bar">
|
||||
<span style={{ width: `${Math.max(0, ((state.opponentEnemyHealth ?? 0) / state.encounterMaxHealth) * 100)}%` }} />
|
||||
<span style={barFillStyle(((state.opponentEnemyHealth ?? 0) / state.encounterMaxHealth) * 100)} />
|
||||
</div>
|
||||
{typeof state.opponentResource === 'number' && state.opponentMaxResource ? (
|
||||
<>
|
||||
@@ -489,7 +490,7 @@ export function DualScreenBottomDisplay() {
|
||||
<strong>{Math.floor(state.opponentResource)} / {state.opponentMaxResource}</strong>
|
||||
</div>
|
||||
<div className="bar mana-bar">
|
||||
<span style={{ width: `${Math.max(0, (state.opponentResource / state.opponentMaxResource) * 100)}%` }} />
|
||||
<span style={barFillStyle((state.opponentResource / state.opponentMaxResource) * 100)} />
|
||||
</div>
|
||||
</>
|
||||
) : null}
|
||||
@@ -527,7 +528,7 @@ export function DualScreenBottomDisplay() {
|
||||
<span>{state.resourceName} {Math.floor(state.resource)} / {state.maxResource}</span>
|
||||
{state.speedMultiplier === 2 && <strong className="speed-badge">2x speed</strong>}
|
||||
<div className="bar mana-bar">
|
||||
<span style={{ width: `${(state.resource / state.maxResource) * 100}%` }} />
|
||||
<span style={barFillStyle((state.resource / state.maxResource) * 100)} />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -678,13 +679,23 @@ export function DualScreenTopCombat({
|
||||
<span>{Math.ceil(state.encounterHealth)} / {state.encounterMaxHealth}</span>
|
||||
</div>
|
||||
<div className="bar enemy-health">
|
||||
<span style={{ width: `${enemyPercent}%` }} />
|
||||
<span style={barFillStyle(enemyPercent)} />
|
||||
</div>
|
||||
<p>{state.encounterDescription}</p>
|
||||
{state.opponentParty && (
|
||||
<div className="dual-top-resource">
|
||||
<strong>{state.resourceName} {Math.floor(state.resource)} / {state.maxResource}</strong>
|
||||
<div className="bar mana-bar">
|
||||
<span style={barFillStyle((state.resource / state.maxResource) * 100)} />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{!state.opponentParty && <p>{state.encounterDescription}</p>}
|
||||
</div>
|
||||
{state.opponentParty && (
|
||||
<div className="dual-top-cooldowns" aria-label="Cooldowns">
|
||||
{spellButtons}
|
||||
<div className="dual-top-side-status">
|
||||
<div className="dual-top-cooldowns" aria-label="Cooldowns">
|
||||
{spellButtons}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
@@ -720,7 +731,7 @@ export function DualScreenTopCombat({
|
||||
<div className="dual-top-resource">
|
||||
<strong>{state.resourceName} {Math.floor(state.resource)} / {state.maxResource}</strong>
|
||||
<div className="bar mana-bar">
|
||||
<span style={{ width: `${(state.resource / state.maxResource) * 100}%` }} />
|
||||
<span style={barFillStyle((state.resource / state.maxResource) * 100)} />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
Reference in New Issue
Block a user