Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions webapp/js/mods/section.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { makeItemColorButton } from '../wardrobe/color-picker.js?v=31';
import { bindTileDrag } from '../wardrobe/tiles.js?v=31';
import { makeItemColorButton } from '../wardrobe/color-picker.js?v=32';
import { bindTileDrag } from '../wardrobe/tiles.js?v=32';
import { modItemKey } from '../wardrobe/worn.js?v=29';
import { itemThumbUrl } from './layers.js?v=18';
import { ensureLoaded, followsHerColors, importZip, isEquipped, modState, mods, removeMod, setColor, setEquipped, setFollowsHerColors } from './engine.js?v=28';
Expand All @@ -23,23 +23,39 @@ export function buildWardrobeSection(body) {
bar.style.cssText = 'display:flex;gap:8px;align-items:center;margin:4px 0 8px';
bar.innerHTML = `<button class="ghost" data-mod-load>Load mod (.zip)</button>
<span data-mod-msg style="font-size:12px;opacity:.7">Mods stay in your browser - nothing is uploaded</span>
<input type="file" accept=".zip" hidden>`;
<input type="file" accept=".zip" multiple hidden>`;
const input = bar.querySelector('input');
const msg = bar.querySelector('[data-mod-msg]');
bar.querySelector('[data-mod-load]').addEventListener('click', () => input.click());
input.addEventListener('change', async () => {
const f = input.files[0];
// copy first: clearing the value also empties the live FileList
const files = [...input.files];
input.value = '';
if (!f) return;
msg.textContent = 'Loading…';
try {
const mod = await importZip(await f.arrayBuffer());
msg.textContent = `Loaded "${mod.name}" - click an item to equip it`;
renderMods();
} catch (e) {
console.error(e);
msg.textContent = 'Failed: ' + e.message;
if (!files.length) return;
const loaded = [], failed = [];
for (const [n, f] of files.entries()) {
msg.textContent = files.length > 1 ? `Loading ${n + 1}/${files.length}…` : 'Loading…';
// one at a time: importZip rewrites the shared mod list and state,
// and one bad zip must not stop the rest
try {
const mod = await importZip(await f.arrayBuffer());
loaded.push(mod.name);
renderMods();
} catch (e) {
console.error(e);
failed.push({ file: f.name, error: e.message });
}
}
if (files.length === 1) {
msg.textContent = loaded.length
? `Loaded "${loaded[0]}" - click an item to equip it`
: 'Failed: ' + failed[0].error;
return;
}
const parts = [];
if (loaded.length) parts.push(`Loaded ${loaded.length} mod${loaded.length > 1 ? 's' : ''} - click an item to equip it`);
if (failed.length) parts.push('Failed: ' + failed.map(x => `${x.file} (${x.error})`).join(', '));
msg.textContent = parts.join('. ');
});
const list = document.createElement('div');
list.dataset.modList = '1';
Expand Down
2 changes: 1 addition & 1 deletion webapp/js/wardrobe.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as Scene from './trip/scene.js?v=1';
import { startSkybox } from './trip/skybox.js?v=2';
import * as TripLoader from './trip/trip-loader.js?v=1';
import { armCurtains } from './wardrobe/curtains.js?v=17';
import { openWardrobe } from './wardrobe/panel.js?v=31';
import { openWardrobe } from './wardrobe/panel.js?v=32';

const status = document.getElementById('stageStatus');
const HEAD_HOME_ICON = '<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="19" y1="12" x2="5" y2="12"/><polyline points="12 19 5 12 12 5"/></svg>';
Expand Down
2 changes: 1 addition & 1 deletion webapp/js/wardrobe/color-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as MobileViewport from '../core/viewport.js?v=1';
import { colorGroup } from '../outfit/catalog.js?v=4';
import { colors } from '../outfit/current.js?v=4';
import { hexToHsv, hsvToHex, normalizeHex } from '../outfit/colors.js?v=1';
import { optPopEl, positionOptionsPopup } from './tiles.js?v=31';
import { optPopEl, positionOptionsPopup } from './tiles.js?v=32';
import { setColor } from '../outfit/apply.js?v=28';

function paintColorButton(button) {
Expand Down
2 changes: 1 addition & 1 deletion webapp/js/wardrobe/looks.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Presets, applyPreset, decodeOutfitCode, encodeOutfitCode, endPreview, schedulePreview } from '../outfit/presets.js?v=28';
import { clearWornHover, wdOverlay } from './panel.js?v=31';
import { clearWornHover, wdOverlay } from './panel.js?v=32';

export const looksOpen = () => document.body.classList.contains('looks-open');

Expand Down
8 changes: 4 additions & 4 deletions webapp/js/wardrobe/panel.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as Live2D from '../live2d/live2d.js?v=90';
import { BODY_VARIANTS, CLOTHING_VARIANTS, COLOR_GROUPS, ITEMS, ITEM_COLOR_GROUPS, ITEM_VARIANTS, VARIANTS } from '../outfit/catalog.js?v=4';
import { fillTile, makeOptOrb, makeSwatch, makeTile, openTilePopup, syncOptionsPopup, wdMoveGhost, wdShowGhost } from './tiles.js?v=31';
import { fillTile, makeOptOrb, makeSwatch, makeTile, openTilePopup, syncOptionsPopup, wdMoveGhost, wdShowGhost } from './tiles.js?v=32';
import { state, variantState } from '../outfit/current.js?v=4';
import { itemThumb, variantThumb } from './tile-bake.js?v=28';
import { looksOpen, toggleLooks } from './looks.js?v=31';
import { looksOpen, toggleLooks } from './looks.js?v=32';
import { reset, setItem } from '../outfit/apply.js?v=28';
import { wornDrawableMap, wornHitAt, wornLabel, wornRemove, wornWear } from './worn.js?v=29';
import { buildWardrobeSection, syncModTiles } from '../mods/section.js?v=31';
import { buildWardrobeSection, syncModTiles } from '../mods/section.js?v=32';
import { activate, playOutro } from './reactions.js?v=88';
import { refreshColorButtons } from './color-picker.js?v=31';
import { refreshColorButtons } from './color-picker.js?v=32';
import { hooks } from '../outfit/hooks.js?v=1';

export let clearWornHover = null;
Expand Down
4 changes: 2 additions & 2 deletions webapp/js/wardrobe/tiles.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as Live2D from '../live2d/live2d.js?v=90';
import { closeColorPicker, colorPickerEl, makeColorButton, phonePopupMode, pickerEmbedded, schedulePopupPosition, showColorPicker, visualViewportRect, watchPopupViewport } from './color-picker.js?v=31';
import { closeColorPicker, colorPickerEl, makeColorButton, phonePopupMode, pickerEmbedded, schedulePopupPosition, showColorPicker, visualViewportRect, watchPopupViewport } from './color-picker.js?v=32';
import { colorGroup } from '../outfit/catalog.js?v=4';
import { colors, state, variantState } from '../outfit/current.js?v=4';
import { setItem, setVariant } from '../outfit/apply.js?v=28';
import { variantThumb } from './tile-bake.js?v=28';
import { wdGhost } from './panel.js?v=31';
import { wdGhost } from './panel.js?v=32';

export function wdMoveGhost(x, y) {
wdGhost.style.left = (x + 10) + 'px';
Expand Down
2 changes: 1 addition & 1 deletion webapp/wardrobe.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<script defer src="vendor/pixi.min.js"></script>
<script defer src="vendor/pixi-unsafe-eval.min.js"></script>
<script defer src="vendor/cubism4.min.js"></script>
<script type="module" src="js/wardrobe.js?v=39"></script>
<script type="module" src="js/wardrobe.js?v=40"></script>
</body>
</html>
Loading