From 747d5dae99f415cc22a0a2b6f699724f153a55a6 Mon Sep 17 00:00:00 2001 From: dingo Date: Thu, 10 Sep 2026 13:51:58 -0400 Subject: [PATCH] Tossing in changes before ready --- client/src/character-panel.ts | 38 ++++++++++++------- client/src/crafting-panel.ts | 6 +++ client/src/item-icon.ts | 13 +++++++ client/src/main.ts | 30 ++++++++------- client/src/player-drawer.css | 16 ++++++++ client/src/player-drawer.ts | 69 +++++++++++++++++++++++++++++++++++ client/src/power-panel.ts | 18 +++++---- 7 files changed, 155 insertions(+), 35 deletions(-) create mode 100644 client/src/item-icon.ts create mode 100644 client/src/player-drawer.css create mode 100644 client/src/player-drawer.ts diff --git a/client/src/character-panel.ts b/client/src/character-panel.ts index 45a4fdc..a5819d3 100644 --- a/client/src/character-panel.ts +++ b/client/src/character-panel.ts @@ -1,41 +1,51 @@ import type { Character } from './generated'; +import { itemIcon } from './item-icon'; +import { experienceText, permanentTitles } from './progression'; import { equipmentSlots, itemDetails, modifiersView, node, numberText, primaryStats, statLabel, statsBreakdown } from './character-stats'; type Send = (op:string,target?:string,x?:number,z?:number,slot?:string)=>void; -const root=node('section','','character-panel'),resources=node('p','','character-resources'),nav=node('div','','character-sections'),body=node('div'); -root.append(resources,nav,body); -let selected='bag',latest:Character,sendIntent:Send,signature=''; +const root=node('section','','character-panel'),resources=node('p','','character-resources'),body=node('div'); +root.append(resources,body); +let selected='bag',latest:Character,sendIntent:Send,signature='',selectedItem=''; const rings=new Map(); -for(const [key,label] of [['character','Character'],['equipment','Equipment'],['bag','Bag']]){const b=node('button',label);b.type='button';b.dataset.section=key;b.onclick=()=>{selected=key;signature='';render()};nav.append(b);} function active(){return latest.entity.state==='alive'&&latest.remainingSeconds>0;} function button(label:string,key:string,fn:()=>void,disabled=false){const b=node('button',label);b.type='button';b.dataset.focusKey=key;b.disabled=disabled;b.onclick=fn;return b;} function request(op:string,target:string,slot=''){sendIntent(op,target,0,0,slot);} function render(){ - for(const b of nav.querySelectorAll('button'))b.setAttribute('aria-pressed',String(b.dataset.section===selected)); - const next=JSON.stringify([selected,latest.entity.state,latest.remainingSeconds>0,latest.statPoints,latest.pendingVitalChoices,latest.allocatedStats,latest.stats,latest.items,latest.equipment,latest.inventory,latest.craftedStacks,latest.carryWeight,latest.gathering,latest.gatheringEffects,latest.consumables]); + const next=JSON.stringify([selected,selectedItem,latest.entity.name,latest.level,latest.experience,latest.experienceToNextLevel,latest.titles,latest.entity.state,latest.remainingSeconds>0,latest.statPoints,latest.pendingVitalChoices,latest.allocatedStats,latest.stats,latest.items,latest.equipment,latest.inventory,latest.stackNames,latest.craftedStacks,latest.carryWeight,latest.gathering,latest.gatheringEffects,latest.consumables,latest.crafting,latest.weapons,latest.powers]); if(next===signature)return;signature=next; const focus=root.contains(document.activeElement)?(document.activeElement as HTMLElement).dataset.focusKey:undefined; const opened=new Set(Array.from(body.querySelectorAll('details[open]')).map(d=>d.dataset.key));body.replaceChildren(); const c=latest; if(selected==='character'){ + body.append(node('h3',c.entity.name),node('p',`Level ${c.level} · ${experienceText(c)}`,'progression-note')); body.append(node('p',`${c.statPoints??0} stat points available`,'stat-bank'),node('p','Each level adds 10 stat points, 5 stamina, and a choice of 5 maximum health or mana.','progression-note')); if(c.pendingVitalChoices>0){const choices=node('div','','vital-choice');choices.append(node('p',`${c.pendingVitalChoices} level reward choice(s) remaining`),button('+5 health','choose-health',()=>request('choose-vital','health'),!active()),button('+5 mana','choose-mana',()=>request('choose-vital','mana'),!active()));body.append(choices);} - for(const key of primaryStats){const row=node('div','','allocated-stat'),label=node('div');label.append(node('strong',statLabel(key)),node('small',`${c.allocatedStats?.[key]??0} points allocated`,'progression-note'));const add=button('+1',`allocate-${key}`,()=>request('allocate-stat',key),!active()||!(c.statPoints>0));add.setAttribute('aria-label',`Allocate one point to ${statLabel(key)}`);row.append(label,node('b',numberText(c.stats?.[key]?.final)),add);body.append(row);} + for(const key of primaryStats){const row=node('div','','allocated-stat'),label=node('div');label.append(node('strong',statLabel(key)),node('small',`${c.allocatedStats?.[key]??0} allocated · Base ${numberText(c.stats?.[key]?.base)}`,'progression-note'));const add=button('+1',`allocate-${key}`,()=>request('allocate-stat',key),!active()||!(c.statPoints>0));add.setAttribute('aria-label',`Allocate one point to ${statLabel(key)}`);const total=node('b',numberText(c.stats?.[key]?.final));total.title='Total after modifiers';row.append(label,total,add);body.append(row);} const details=node('details','','stat-inspection');details.dataset.key='stats';details.append(node('summary','Inspect all stats'),statsBreakdown(c));body.append(details); + const titles=node('details','','stat-inspection');titles.dataset.key='titles';titles.append(node('summary',`Titles (${c.titles?.length??0})`),permanentTitles(c.titles));body.append(titles); } else if(selected==='equipment'){ const grid=node('div','','equipment-grid'); - for(const slot of equipmentSlots){const item=c.items?.find(i=>i.id===c.equipment?.[slot]),card=node('article','','equipment-slot');card.append(node('small',statLabel(slot)),node('strong',item?.name??'Empty'));if(item)card.append(modifiersView(item.modifiers),button('Unequip',`unequip-${slot}`,()=>request('unequip',slot),!active()));grid.append(card);}body.append(grid); + for(const slot of equipmentSlots){const item=c.items?.find(i=>i.id===c.equipment?.[slot]),card=node('article','','equipment-slot');card.append(itemIcon(slot.startsWith('ring')?'ring':slot),node('small',statLabel(slot)),node('strong',item?.name??'Empty'));if(item){const inspect=node('details');inspect.dataset.key=`gear-${slot}`;inspect.append(node('summary','Inspect'),itemDetails(item,c));card.append(inspect,button('Unequip',`unequip-${slot}`,()=>request('unequip',slot),!active()));}grid.append(card);}body.append(grid); + const effects=node('details','','stat-inspection');effects.dataset.key='equipment-effects';effects.append(node('summary','Equipment modifiers')); + for(const item of c.items??[])if(Object.values(c.equipment??{}).includes(item.id))effects.append(node('h3',item.name),modifiersView(item.modifiers));body.append(effects); } else { body.append(node('p',`Carry weight ${numberText(c.carryWeight)} / ${numberText(c.stats?.carryCapacity?.final)} (advisory)`,'progression-note')); - const held=new Set(Object.values(c.equipment??{})),grid=node('div','','gear-list'); + const held=new Set(Object.values(c.equipment??{})),grid=node('div','','bag-grid'),inspection=node('div','','bag-inspection'); + grid.setAttribute('aria-label','Bag items'); + function tile(id:string,name:string,count:number,category:string){const b=button('',`item-${id}`,()=>{selectedItem=selectedItem===id?'':id;signature='';render()});b.className='bag-slot';b.title=name;b.setAttribute('aria-label',`${name} × ${count}`);b.setAttribute('aria-pressed',String(selectedItem===id));b.append(itemIcon(category),node('span',name,'bag-name'),node('b',String(count),'bag-count'));grid.append(b);return selectedItem===id;} for(const item of c.items??[])if(!held.has(item.id)){ + if(!tile(item.id,item.name,1,item.houseId?'key':item.slot))continue; const card=itemDetails(item,c),actions=node('div','','gear-actions');let slot=item.slot; if(slot==='ring'){const label=node('label','Ring slot'),select=node('select');select.dataset.focusKey=`ring-${item.id}`;select.setAttribute('aria-label',`Ring slot for ${item.name}`);for(let n=1;n<=8;n++)select.append(new Option(`Ring ${n}${c.equipment?.[`ring${n}`]?' · Occupied':' · Empty'}`,`ring${n}`));select.value=rings.get(item.id)??equipmentSlots.find(s=>s.startsWith('ring')&&!c.equipment?.[s])??'ring1';slot=select.value;select.onchange=()=>{slot=select.value;rings.set(item.id,slot)};label.append(select);actions.append(label);} - actions.append(button('Equip',`equip-${item.id}`,()=>request('equip',item.id,slot),!active()||!item.equippable),button('Drop',`drop-${item.id}`,()=>request('drop',item.id),!active()));card.append(actions);grid.append(card); + if(!item.houseId)actions.append(button('Equip',`equip-${item.id}`,()=>request('equip',item.id,slot),!active()||!item.equippable)); + actions.append(button('Drop',`drop-${item.id}`,()=>request('drop',item.id),!active()));card.append(actions);inspection.append(card); } - for(const [key,count] of Object.entries(c.inventory??{}))if(count>0){const card=node('article','','stack-card');card.append(node('span',`${c.stackNames?.[key]??statLabel(key)} × ${count}`),button('Drop one',`drop-stack-${key}`,()=>request('drop',key),!active()));const consumable=c.consumables?.find(v=>v.id===key);if(consumable)card.append(node('p',`${consumable.description} · ${consumable.seconds}s`),modifiersView(consumable.modifiers),button('Use',`consume-${key}`,()=>request('consume',key),!active()));for(const batch of c.craftedStacks??[])if(batch.item===key)card.append(node('small',`${batch.quantity} crafted by ${batch.provenance.crafterName} in ${batch.provenance.worldId}`));grid.append(card);} - if(!grid.children.length)grid.append(node('p','Your bag is empty.'));body.append(grid); + for(const [key,count] of Object.entries(c.inventory??{}))if(count>0){const consumable=c.consumables?.find(v=>v.id===key);if(!tile(key,c.stackNames?.[key]??statLabel(key),count,consumable||key==='bandage'?'consumable':key.startsWith('book_')?'book':key))continue;const card=node('article','','stack-card');card.append(node('strong',`${c.stackNames?.[key]??statLabel(key)} × ${count}`),button('Drop one',`drop-stack-${key}`,()=>request('drop',key),!active()));if(consumable)card.append(node('p',`${consumable.description} · ${consumable.seconds}s`),modifiersView(consumable.modifiers),button('Use',`consume-${key}`,()=>request('consume',key),!active()));for(const batch of c.craftedStacks??[])if(batch.item===key)card.append(node('small',`${batch.quantity} crafted by ${batch.provenance.crafterName} in ${batch.provenance.worldId}`));inspection.append(card);} + if(!grid.children.length)body.append(node('p','Your bag is empty.','progression-note')); + else body.append(node('p','Select an item to inspect it and see available actions.','progression-note')); + body.append(grid,inspection); } for(const d of body.querySelectorAll('details'))d.open=opened.has(d.dataset.key); - if(focus)Array.from(body.querySelectorAll('[data-focus-key]')).find(e=>e.dataset.focusKey===focus)?.focus({preventScroll:true}); + if(focus)(Array.from(body.querySelectorAll('[data-focus-key]')).find(e=>e.dataset.focusKey===focus)??body.querySelector('button:not([disabled])'))?.focus({preventScroll:true}); } -export function characterPanel(c:Character,send:Send){latest=c;sendIntent=send;resources.textContent=`Health ${numberText(c.entity.hp)} / ${numberText(c.entity.maxHp)} · Mana ${numberText(c.mana)} / ${numberText(c.stats?.manaPoints?.final)} · Stamina ${numberText(c.stamina)} / ${numberText(c.stats?.stamina?.final)}`;render();return root;} +export function characterPanel(c:Character,send:Send,section='bag'){if(latest?.entity.id!==c.entity.id){selectedItem='';signature='';rings.clear();}selected=section;latest=c;sendIntent=send;resources.textContent=`Health ${numberText(c.entity.hp)} / ${numberText(c.entity.maxHp)} · Mana ${numberText(c.mana)} / ${numberText(c.stats?.manaPoints?.final)} · Stamina ${numberText(c.stamina)} / ${numberText(c.stats?.stamina?.final)}`;render();return root;} diff --git a/client/src/crafting-panel.ts b/client/src/crafting-panel.ts index 935c414..a6cbf28 100644 --- a/client/src/crafting-panel.ts +++ b/client/src/crafting-panel.ts @@ -43,3 +43,9 @@ export function craftingPanel(c:Character,worldPrefix:string){ attempt.disabled=busy||c.entity.state!=='alive'||c.remainingSeconds<=0;attempt.textContent=pending?'Retry pending attempt':'Attempt craft';profession.disabled=add.disabled=!!pending;rows.inert=!!pending; return root; } + +export function selectCraftProfession(id:string){ + if(busy||pending||!latest.crafting?.[id]){status.textContent='Finish or retry the current craft before changing profession.';return;} + profession.value=id;updateSummary();profession.focus(); + root.scrollIntoView({block:'start'}); +} diff --git a/client/src/item-icon.ts b/client/src/item-icon.ts new file mode 100644 index 0000000..c27fcc9 --- /dev/null +++ b/client/src/item-icon.ts @@ -0,0 +1,13 @@ +import { createElement, Package, Sword, Shield, Shirt, Gem, FlaskConical, Leaf, TreePine, Hammer, KeyRound, BookOpen, Axe, Fish, Flame } from 'lucide'; + +// Category symbols until content has authored inventory artwork. +export function itemIcon(category: string) { + const icon = category === 'key' ? KeyRound : category === 'book' ? BookOpen + : category === 'axe' ? Axe : category === 'fishing_pole' ? Fish : category === 'flint_and_steel' ? Flame + : category === 'weapon' ? Sword : category === 'offhand' ? Shield + : ['ring','earrings','necklace','ore','gem'].includes(category) ? Gem + : category === 'consumable' ? FlaskConical : category === 'herb' ? Leaf + : category === 'wood' ? TreePine : category === 'building' ? Hammer + : ['helmet','mask','chest','shoulders','pants','boots','gloves','cape','bag'].includes(category) ? Shirt : Package; + const svg = createElement(icon); svg.setAttribute('aria-hidden', 'true'); return svg; +} diff --git a/client/src/main.ts b/client/src/main.ts index ab3de11..7d2c736 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -2,13 +2,12 @@ import './style.css'; import { showTravel } from './travel'; import { createHousingPanel } from './housing-panel'; import { buildingPanel } from './building-panel'; -import { craftingPanel } from './crafting-panel'; +import { createPlayerDrawer } from './player-drawer'; import { createPowerPanel, revivalPanel } from './power-panel'; import { createIcons, Crosshair, Settings2, X, Flame, LogOut, Hourglass, Swords, Pickaxe, HeartPulse, Gem, Backpack, ChevronUp, ChevronDown, ChevronLeft, ChevronRight, ArrowRight, RefreshCw } from 'lucide'; import { WorldView } from './world-view'; import type { Character, Chunk, Entity, Intent, Snapshot } from './generated'; -import { experienceText, permanentTitles, statPointsText, updateExperienceMeter } from './progression'; -import { characterPanel } from './character-panel'; +import { experienceText, statPointsText, updateExperienceMeter } from './progression'; import { InputActions, isEditing, type InputAction } from './input-actions'; import { hasOpenMenu, registerMenu } from './menu-focus'; @@ -54,6 +53,7 @@ let requestedClose = false; let input: InputActions; let powers:ReturnType; let housing:ReturnType; +let drawer:ReturnType; let placement:{id:string;rotation:string;range:number}|undefined; let view: WorldView; const selectedWorld = new URLSearchParams(location.search).get('world'); @@ -99,6 +99,8 @@ function action(op: string) { } function connect() { requestedClose = false; sequence = 0; snapshot = undefined; + powers.hotbar.hidden = true; + visible('game-controls',false); visible('movement',false); visible('inventory',false); const ending = $('ending'); ending.close(); ws = new WebSocket(`${location.protocol === 'https:' ? 'wss:' : 'ws:'}//${location.host}${worldPrefix}/ws`); ws.onopen = () => { $('connection-status').textContent = 'Synchronizing world'; }; @@ -118,6 +120,8 @@ function connect() { } else if (value.self.remainingSeconds <= 0 && !ending.open) showEnding('Rest until tomorrow.', 'Your daily play time is complete. Your keystone will return you to your previous location after 00:00 UTC.', false); }; ws.onclose = async () => { + powers.hotbar.hidden = true; + visible('game-controls',false); visible('movement',false); visible('inventory',false); $('connection-status').textContent = 'Disconnected'; $('connection-dot').parentElement!.classList.add('offline'); input.clear(); walkTo = undefined; if (requestedClose || $('ending').open) return; let detail = 'The connection ended. Your character state is held by the server.'; @@ -127,6 +131,8 @@ function connect() { } function showEnding(title: string, detail: string, survivor: boolean) { input.clear(); walkTo = undefined; pendingAction = undefined; + if(powers)powers.hotbar.hidden=true; + visible('game-controls',false);visible('movement',false);visible('inventory',false); $('ending-title').textContent = title; $('ending-detail').textContent = detail; $('ending-eyebrow').textContent = survivor ? 'WORLD SURVIVED' : 'JOURNEY PAUSED'; if (snapshot?.self.entity.state === 'dead') $('ending-eyebrow').textContent = 'JOURNEY ENDED'; @@ -141,14 +147,7 @@ function showEnding(title: string, detail: string, survivor: boolean) { $('ending').show(); } function inventory(c: Character) { - - $('earned-titles').replaceChildren(permanentTitles(c.titles)); - const parent = $('inventory-items'), panel = characterPanel(c, send); - if (panel.parentElement !== parent) parent.replaceChildren(panel); - const recipes=$('recipes'),workbench=craftingPanel(c,worldPrefix);if(workbench.parentElement!==recipes)recipes.replaceChildren(workbench); - const skills = $('skills'); skills.replaceChildren(); - for(const g of Object.values(c.gathering??{})){const label=document.createElement('span');label.textContent=`${g.name} · Level ${g.level} (effective ${g.effectiveLevel})`;const amount=document.createElement('b');amount.textContent=`${g.xp} XP · ${g.xpToNextLevel} to next`;label.append(amount);skills.append(label);} - for (const skill of ['crafting', 'combat']) { const label = document.createElement('span'); label.textContent = pretty(skill); const amount = document.createElement('b'); amount.textContent = `${c.skills[skill] ?? 0} XP`; label.append(amount); skills.append(label); } + drawer.update(c); } function minimap(s: Snapshot) { const canvas = $('minimap'), ctx = canvas.getContext('2d')!; @@ -166,7 +165,9 @@ function updateHUD(s: Snapshot) { const c = s.self, w = s.world; housing?.update(c); powers?.update(c); - visible('game-controls', true); visible('movement', ['alive','eligible'].includes(c.entity.state) && $('inventory').hidden && $('settings').hidden); + const playable=['alive','eligible'].includes(c.entity.state)&&c.remainingSeconds>0; + powers.hotbar.hidden=!playable; + visible('game-controls', playable); visible('movement', playable && !hasOpenMenu()); $('character-name').textContent = c.entity.name; $('character-level').textContent = `Level ${c.level || 1}`; $('character-experience').textContent = experienceText(c); @@ -271,8 +272,9 @@ async function boot() { }, 50); const [loadedConfig, chunks] = await Promise.all([api('/api/config'), api('/api/preview'), view.load()]); config = loadedConfig; - housing=createHousingPanel(()=>snapshot?.self,worldPrefix,()=>config.kind==='hub',()=>{input.clear();walkTo=undefined;pendingAction=undefined;placement=undefined;visible('inventory',false);selection()});$('recipes').after(housing.root);$('hud').append(housing.toolbar); - powers=createPowerPanel((op,target,x,z,slot)=>{if(op==='cast'){input.clear();walkTo=undefined;pendingAction=undefined;send('move')}send(op,target,x,z,slot)},()=>view.selected,notice,worldPrefix);$('recipes').after(powers.root);$('hud').append(powers.hotbar);$('settings').append(input.settings());$('recipes').after(buildingPanel(()=>snapshot?.self,(id,rotation,range)=>{placement={id,rotation,range};input.clear();walkTo=undefined;pendingAction=undefined;send('move');$('inventory-toggle').click();notice('Click clear ground to build. Esc cancels.');},worldPrefix)); + housing=createHousingPanel(()=>snapshot?.self,worldPrefix,()=>config.kind==='hub',()=>{input.clear();walkTo=undefined;pendingAction=undefined;placement=undefined;visible('inventory',false);selection()});$('hud').append(housing.toolbar); + powers=createPowerPanel((op,target,x,z,slot)=>{if(op==='cast'){input.clear();walkTo=undefined;pendingAction=undefined;send('move')}send(op,target,x,z,slot)},()=>view.selected,notice,worldPrefix);$('hud').append(powers.hotbar);$('settings').append(input.settings()); + drawer=createPlayerDrawer($('inventory'),powers,send,worldPrefix,housing.root,buildingPanel(()=>snapshot?.self,(id,rotation,range)=>{placement={id,rotation,range};input.clear();walkTo=undefined;pendingAction=undefined;send('move');$('inventory-toggle').click();notice('Click clear ground to build. Esc cancels.');},worldPrefix)); const travelButton=document.createElement('button');travelButton.id='travel';travelButton.textContent='Travel';travelButton.title='World travel';$('inventory-toggle').before(travelButton); travelButton.onclick=()=>{if(!snapshot)return;input.clear();walkTo=undefined;pendingAction=undefined;send('move');void showTravel({worldId:config.worldId,route:config.kind==='hub'?'hub':snapshot.world.phase==='won'?'portal':'escape',beforeTravel:()=>{requestedClose=true;},afterTravel:departed=>{requestedClose=departed;}});}; $('zoom').value = String(view.distance); diff --git a/client/src/player-drawer.css b/client/src/player-drawer.css new file mode 100644 index 0000000..565680d --- /dev/null +++ b/client/src/player-drawer.css @@ -0,0 +1,16 @@ +#inventory.inventory{width:min(460px,calc(100vw - 36px));right:18px;top:86px;bottom:auto;max-height:calc(100dvh - 110px);padding:18px;background:#12201df5;border-color:#84987c66;box-shadow:0 16px 64px #0006} +#inventory .panel-title{margin-bottom:12px}#inventory h2{font:24px Georgia,serif;color:#e0e8cb} +.drawer-nav{display:grid;grid-template-columns:repeat(6,minmax(0,1fr));gap:5px;position:sticky;top:-18px;background:#12201d;z-index:1;padding:8px 0;border-bottom:1px solid #778c6c55;margin-bottom:16px} +.drawer-nav button{position:relative;padding:9px 4px;min-width:0;min-height:44px;background:#22332c} +.drawer-nav button[aria-pressed=true],.bag-slot[aria-pressed=true]{border-color:#ccda9a;background:#45543a;color:#f2f3d7} +.drawer-tooltip{display:none;position:absolute;top:100%;margin-top:7px;background:#101c18;border:1px solid #718264;border-radius:4px;padding:6px;font-size:11px;z-index:2;pointer-events:none} +.drawer-nav button:hover .drawer-tooltip,.drawer-nav button:focus-visible .drawer-tooltip{display:block} +.drawer-content{min-width:0;min-height:180px}.drawer-content h3{margin-top:18px}.drawer-content>section{min-width:0} +.bag-grid{display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:6px;margin:14px 0} +.bag-slot{position:relative;min-width:0;min-height:74px;padding:9px 3px 18px;display:flex;flex-direction:column;gap:5px;background:linear-gradient(145deg,#2d4134,#1a2a23);border-color:#71856866} +.bag-slot svg{width:25px;height:25px;color:#d1dfac}.bag-name{font-size:10px;line-height:1.2;display:block;width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.bag-count{position:absolute;right:5px;bottom:3px;font-size:10px;color:#e3ecd1}.bag-inspection .stack-card{display:flex;flex-wrap:wrap}.bag-inspection .stack-card>strong,.bag-inspection .stack-card>p,.bag-inspection .stack-card>small{flex-basis:100%} +.skill-list{display:grid;gap:8px}.skill-card{padding:12px;border:1px solid #72896844;border-radius:4px;background:#ffffff04;font-size:12px}.skill-card p{margin:5px 0}.skill-card small{color:#b0c59e} +#inventory>section:last-child{border-top:1px solid #72896844;margin-top:18px;padding-top:14px}.equipment-slot>svg{float:right;color:#c6d8a8}.equipment-slot details>summary{cursor:pointer;padding:8px 0;font-size:12px}.equipment-slot .gear-card{padding:6px;border:0} +@media(max-width:800px){#inventory.inventory{top:80px;max-height:calc(100dvh - 98px);padding:14px}.drawer-nav{top:-14px}.bag-grid{gap:4px}.bag-slot{min-height:70px}.drawer-content .equipment-grid{grid-template-columns:repeat(2,minmax(0,1fr))}} +@media(max-height:520px){#inventory.inventory{top:66px;max-height:calc(100dvh - 78px)}} diff --git a/client/src/player-drawer.ts b/client/src/player-drawer.ts new file mode 100644 index 0000000..e023e80 --- /dev/null +++ b/client/src/player-drawer.ts @@ -0,0 +1,69 @@ +import { createElement, Backpack, UserRound, Shirt, Pickaxe, Swords, BookOpen } from 'lucide'; +import type { Character } from './generated'; +import { characterPanel } from './character-panel'; +import { craftingPanel, selectCraftProfession } from './crafting-panel'; +import { node } from './character-stats'; +import type { createPowerPanel } from './power-panel'; +import './player-drawer.css'; + +export function createPlayerDrawer(root: HTMLElement, powers: ReturnType, + send: Parameters[1], prefix: string, housing: HTMLElement, building: HTMLElement) { + const title = root.querySelector('h2')!; + const nav = node('nav', '', 'drawer-nav'); nav.setAttribute('aria-label', 'Character menus'); + const content = node('div', '', 'drawer-content'), character = node('div'), skills = node('section'); + character.id = 'inventory-items'; + const skillList = node('div', '', 'skill-list'), workbench = node('div'); + skills.append(skillList, workbench, building); + content.append(character, skills, powers.abilities, powers.root); + root.append(nav, content, housing); + const views = [ + ['bag', 'Bag', Backpack, character], ['character', 'Character', UserRound, character], + ['equipment', 'Equipment', Shirt, character], ['skills', 'Skills', Pickaxe, skills], + ['abilities', 'Abilities', Swords, powers.abilities], ['spells', 'Spells', BookOpen, powers.root], + ] as const; + let selected = 'bag', latest: Character | undefined, skillSignature = ''; + for (const [id, label, icon] of views) { + const button = node('button'); button.type = 'button'; button.dataset.view = id; + button.title = label; button.setAttribute('aria-label', label); + const svg = createElement(icon); svg.setAttribute('aria-hidden', 'true'); + button.append(svg, node('span', label, 'drawer-tooltip')); + button.onclick = () => { selected = id; refresh(); }; + nav.append(button); + } + function refresh() { + for (const [, , , panel] of views) panel.hidden = true; + for (const [id, label, , panel] of views) if (id === selected) { panel.hidden = false; title.textContent = label; } + for (const b of nav.querySelectorAll('button')) b.setAttribute('aria-pressed', String(b.dataset.view === selected)); + if (!latest) return; + if (['bag', 'character', 'equipment'].includes(selected)) { + const panel = characterPanel(latest, send, selected); + if (panel.parentElement !== character) character.replaceChildren(panel); + } + if (selected === 'skills') { + const panel = craftingPanel(latest, prefix); + if (panel.parentElement !== workbench) workbench.replaceChildren(panel); + const signature = JSON.stringify([latest.gathering, latest.crafting, latest.weapons]); + if (signature !== skillSignature) { + skillSignature = signature; skillList.replaceChildren(node('h3', 'Gathering professions')); + for (const g of Object.values(latest.gathering ?? {})) { + const card = node('article', '', 'skill-card'); + card.append(node('strong', g.name), node('p', `Level ${g.level} · Effective ${g.effectiveLevel}`), node('small', `${g.xp} XP · ${g.xpToNextLevel} to next`)); + skillList.append(card); + } + skillList.append(node('h3', 'Crafting professions')); + for (const p of Object.values(latest.crafting ?? {})) { + const card = node('article', '', 'skill-card'); + card.append(node('strong', p.name), node('p', `Level ${p.level} · ${p.xp} XP · ${p.xpToNextLevel} to next`)); + const craft = node('button', 'Craft'); craft.type = 'button'; + craft.setAttribute('aria-label', `Craft with ${p.name}`); + craft.onclick = () => selectCraftProfession(p.id); card.append(craft); + skillList.append(card); + } + if (Object.keys(latest.weapons ?? {}).length) skillList.append(node('h3', 'Weapon proficiency')); + for (const w of Object.values(latest.weapons ?? {})) skillList.append(node('p', `${w.name} · Level ${w.level} · ${w.xp} XP · ${w.xpToNextLevel} to next`)); + } + } + } + refresh(); + return { update(c: Character) { latest = c; refresh(); } }; +} diff --git a/client/src/power-panel.ts b/client/src/power-panel.ts index 536bea7..5461df2 100644 --- a/client/src/power-panel.ts +++ b/client/src/power-panel.ts @@ -3,20 +3,24 @@ import {node,statLabel} from './character-stats'; import {api} from './portal-shared'; export function createPowerPanel(send:(op:string,target?:string,x?:number,z?:number,slot?:string)=>void,target:()=>Entity|undefined,notice:(s:string)=>void,prefix:string){ - const root=node('section','','power-panel'),hotbar=node('div','','power-hotbar'),bookList=node('div'),known=node('div'),casting=node('p');root.append(node('h3','Spells and abilities'),casting,bookList,known); + const root=node('section','','power-panel'),abilities=node('section','','power-panel'),hotbar=node('div','','power-hotbar'),bookList=node('div'),known=node('div'),casting=node('p'),abilityList=node('div');root.append(casting,bookList,known);abilities.append(node('p','Train a weapon to unlock abilities, then assign them to action slots.'),abilityList);hotbar.hidden=true; let latest:Character,signature='',slots:string[]=[],character='',busy=false; const use=async(id:string)=>{if(!latest||busy)return;const power=latest.powers?.[id];if(!power&&id!=='item')return;const selected=target();if(id==='item'||power?.definition.resurrection){if(selected?.kind!=='corpse'){notice('Select a player corpse and stand next to it.');return}busy=true;try{await api(prefix+'/api/revive',{corpse:selected.id,power:id});notice('Player revived.')}catch(e){notice((e as Error).message)}finally{busy=false}}else {const aim=power!.definition.targeting;if(aim==='target'&&!selected){notice('Select a target first.');return}send('cast',aim==='target'?selected!.id:latest.entity.id,0,0,id)}}; const buttons=Array.from({length:8},(_,i)=>{const b=node('button',String(i+1));b.type='button';b.onclick=()=>void use(slots[i]);hotbar.append(b);return b}); function refreshSlots(){buttons.forEach((b,i)=>{const p=latest.powers?.[slots[i]];b.textContent=p?`${i+1} · ${p.definition.name}`:`${i+1} · Empty`;b.disabled=!p||!['alive','eligible'].includes(latest.entity.state);b.title=p?`${p.definition.mana} mana · ${p.definition.cooldown}s cooldown`:'Assign a learned power in Inventory';})} - const save=()=>{try{localStorage.setItem('aeternalis.slots.'+character,JSON.stringify(slots))}catch{};refreshSlots()}; + const save=()=>{try{localStorage.setItem('aeternalis.slots.'+character,JSON.stringify(slots))}catch{};signature='';refreshSlots()}; function update(c:Character){latest=c;if(character!==c.entity.id){character=c.entity.id;signature='';slots=[];try{slots=JSON.parse(localStorage.getItem('aeternalis.slots.'+character)??'[]');if(!Array.isArray(slots))slots=[]}catch{slots=[]}} - casting.textContent=`Mana ${Math.floor(c.mana??0)} / ${Math.floor(c.stats?.manaPoints?.final??0)} · Stamina ${Math.floor(c.stamina??0)}${c.casting?' · '+c.casting:''}`;refreshSlots();const sig=JSON.stringify([c.powers,c.weapons,c.inventory]);if(sig===signature)return;signature=sig;known.replaceChildren();bookList.replaceChildren(); + casting.textContent=`Mana ${Math.floor(c.mana??0)} / ${Math.floor(c.stats?.manaPoints?.final??0)} · Stamina ${Math.floor(c.stamina??0)}${c.casting?' · '+c.casting:''}`;refreshSlots();const sig=JSON.stringify([c.powers,c.weapons,c.inventory]);if(sig===signature)return;signature=sig; + const open=new Set(Array.from([...known.querySelectorAll('details[open]'),...abilityList.querySelectorAll('details[open]')]).map(e=>(e as HTMLElement).dataset.power)); + const focus=(document.activeElement as HTMLElement)?.dataset.powerFocus; + known.replaceChildren();abilityList.replaceChildren();bookList.replaceChildren(); for(const [id,n] of Object.entries(c.inventory)){if(n<1)continue;if(id.startsWith('book_')){const b=node('button',`Learn from ${c.stackNames?.[id]??statLabel(id)} (${n})`);b.type='button';b.onclick=()=>send('learn',id);bookList.append(b)}if(id==='revival_stone'){const b=node('button',`Use revival stone (${n})`);b.type='button';b.onclick=()=>void use('item');bookList.append(b)}} - for(const v of Object.values(c.weapons??{}))known.append(node('p',`${v.name} · Level ${v.level} · ${v.xp} XP · ${v.xpToNextLevel} to next`)); - for(const v of Object.values(c.powers??{})){const d=v.definition,detail=node('details'),assign=node('select'),activate=node('button','Use '+d.name);assign.setAttribute('aria-label','Action slot for '+d.name);assign.append(new Option('Not assigned',''));for(let i=0;i<8;i++)assign.append(new Option('Slot '+(i+1),String(i)));const at=slots.indexOf(d.id);assign.value=at<0?'':String(at);assign.onchange=()=>{slots=slots.map(id=>id===d.id?'':id);if(assign.value!=='')slots[Number(assign.value)]=d.id;save()};activate.type='button';activate.onclick=()=>void use(d.id);detail.append(node('summary',`${d.name} · ${'Rank '+v.level}`),node('p',`${v.xp} XP · ${v.xpToNextLevel} to next · ${d.mana} mana · ${d.castSeconds}s cast · ${d.cooldown}s cooldown`),node('p',`${d.targeting}${d.resurrection?' · corpse revival':` · ${v.attack.effect} · ${v.attack.range}m range`}`),assign,activate);known.append(detail)} - if(!Object.keys(c.powers??{}).length)known.append(node('p','Use a spell book or train a weapon to unlock powers.')); + for(const v of Object.values(c.powers??{})){const d=v.definition,detail=node('details'),assign=node('select'),activate=node('button','Use '+d.name);detail.dataset.power=d.id;detail.open=open.has(d.id);assign.dataset.powerFocus='assign-'+d.id;activate.dataset.powerFocus='use-'+d.id;assign.setAttribute('aria-label','Action slot for '+d.name);assign.append(new Option('Not assigned',''));for(let i=0;i<8;i++)assign.append(new Option('Slot '+(i+1),String(i)));const at=slots.indexOf(d.id);assign.value=at<0?'':String(at);assign.onchange=()=>{slots=slots.map(id=>id===d.id?'':id);if(assign.value!=='')slots[Number(assign.value)]=d.id;save()};activate.type='button';activate.onclick=()=>void use(d.id);detail.append(node('summary',`${d.name} · ${'Rank '+v.level}`),node('p',d.description),node('p',`${v.xp} XP · ${v.xpToNextLevel} to next · ${d.mana} mana · ${d.castSeconds}s cast · ${d.cooldown}s cooldown`),node('p',`${d.targeting}${d.resurrection?' · corpse revival':` · ${v.attack.effect} · ${v.attack.range}m range`}`),node('p',`Requires level ${d.requirements.level}${d.weapon?' · '+statLabel(d.weapon)+' '+d.weaponLevel:''}${Object.entries(d.requirements.stats??{}).map(([stat,n])=>' · '+statLabel(stat)+' '+n).join('')}${(d.requirements.titles??[]).map(id=>' · Title: '+(c.titles.find(t=>t.id===id)?.name??id)).join('')}`),assign,activate);(d.kind==='ability'?abilityList:known).append(detail)} + if(!known.children.length)known.append(node('p','No spells learned yet. Find a spell book to begin.')); + if(!abilityList.children.length)abilityList.append(node('p','No abilities learned yet.')); + if(focus)Array.from([...known.querySelectorAll('[data-power-focus]'),...abilityList.querySelectorAll('[data-power-focus]')]).find(e=>e.dataset.powerFocus===focus)?.focus({preventScroll:true}); } - return {root,hotbar,update,useSlot:(i:number)=>void use(slots[i])}; + return {root,abilities,hotbar,update,useSlot:(i:number)=>void use(slots[i])}; } export function revivalPanel(prefix:string){