Android build v1.1.4

src/dualScreen.tsx

@@ -47,6 +47,9 @@ export type DualScreenCombatState = {
   opponentClassName?: string
   opponentParty?: PartyMember[]
   opponentEnemyHealth?: number
+  opponentResource?: number
+  opponentMaxResource?: number
+  opponentResourceName?: string
   opponentBuffSummary?: string
   opponentDebuffSummary?: string
   floatingTexts: Array<{
@@ -479,6 +482,17 @@ export function DualScreenBottomDisplay() {
               <div className="bar enemy-health boss-bar">
                 <span style={{ width: `${Math.max(0, ((state.opponentEnemyHealth ?? 0) / state.encounterMaxHealth) * 100)}%` }} />
               </div>
+              {typeof state.opponentResource === 'number' && state.opponentMaxResource ? (
+                <>
+                  <div>
+                    <p className="eyebrow">{state.opponentResourceName ?? state.resourceName}</p>
+                    <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)}%` }} />
+                  </div>
+                </>
+              ) : null}
             </section>
           )}
 
@@ -626,8 +640,34 @@ export function DualScreenTopCombat({
     [state.floatingTexts],
   )
 
+  const spellButtons = state.spells.map((spell, slotIndex) => {
+    if (!spell) return <div className="dual-top-spell empty" key={`empty-${slotIndex}`} />
+    const percent = spell.remaining > 0
+      ? Math.min(100, (spell.remaining / Math.max(1, spell.cooldown)) * 100)
+      : 0
+    return (
+      <button
+        className="dual-top-spell"
+        disabled={
+          !state.playerIsAlive
+          || state.resource < spell.cost
+          || spell.remaining > 0
+          || state.status !== 'playing'
+          || state.paused
+        }
+        key={spell.id}
+        onClick={() => onCastSpell?.(spell)}
+        type="button"
+      >
+        <span className={`spell-icon spell-${spell.kind}`}>{spell.glyph}</span>
+        {spell.remaining > 0 && <i style={{ height: `${percent}%` }} />}
+        {spell.remaining > 0 && <small>{spell.remaining.toFixed(0)}</small>}
+      </button>
+    )
+  })
+
   return (
-    <div className="dual-top-main">
+    <div className={`dual-top-main ${state.opponentParty ? 'pvp-roguelike-dual-top' : ''}`}>
       <section className="dual-top-enemy">
         <div className="enemy-portrait" aria-hidden="true">
           {state.encounterIsBoss ? 'B' : 'M'}
@@ -642,6 +682,11 @@ export function DualScreenTopCombat({
           </div>
           <p>{state.encounterDescription}</p>
         </div>
+        {state.opponentParty && (
+          <div className="dual-top-cooldowns" aria-label="Cooldowns">
+            {spellButtons}
+          </div>
+        )}
       </section>
 
       <section className="dual-top-party">
@@ -669,39 +714,17 @@ export function DualScreenTopCombat({
         </div>
       </section>
 
-      <section className="dual-top-spell-strip">
-        {state.spells.map((spell, slotIndex) => {
-          if (!spell) return <div className="dual-top-spell empty" key={`empty-${slotIndex}`} />
-          const percent = spell.remaining > 0
-            ? Math.min(100, (spell.remaining / Math.max(1, spell.cooldown)) * 100)
-            : 0
-          return (
-            <button
-              className="dual-top-spell"
-              disabled={
-                !state.playerIsAlive
-                || state.resource < spell.cost
-                || spell.remaining > 0
-                || state.status !== 'playing'
-                || state.paused
-              }
-              key={spell.id}
-              onClick={() => onCastSpell?.(spell)}
-              type="button"
-            >
-              <span className={`spell-icon spell-${spell.kind}`}>{spell.glyph}</span>
-              {spell.remaining > 0 && <i style={{ height: `${percent}%` }} />}
-              {spell.remaining > 0 && <small>{spell.remaining.toFixed(0)}</small>}
-            </button>
-          )
-        })}
-        <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}%` }} />
+      {!state.opponentParty && (
+        <section className="dual-top-spell-strip">
+          {spellButtons}
+          <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}%` }} />
+            </div>
           </div>
-        </div>
-      </section>
+        </section>
+      )}
 
     </div>
   )