diff --git a/docs/Concepts.md b/docs/Concepts.md index e8f65ff..7badbc6 100644 --- a/docs/Concepts.md +++ b/docs/Concepts.md @@ -109,7 +109,6 @@ const presentationState = constructPresentationState(presentations); Presentation state includes: -- `base`: Base layout/screen configuration - `background`: Current background or CG - `dialogue`: Speaker, text content, mode (ADV/NVL) - `character`: Character sprites and positions diff --git a/docs/RouteEngine.md b/docs/RouteEngine.md index 7191518..4472b44 100644 --- a/docs/RouteEngine.md +++ b/docs/RouteEngine.md @@ -420,7 +420,6 @@ Actions that can be attached to lines to control presentation: | Action | Properties | Description | | ------------ | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | -| `base` | `{ resourceId }` | Set base layout | | `background` | `{ resourceId, animations? }` | Set background/CG | | `dialogue` | `{ characterId?, character?, content, mode?, ui?, clear? }` | Display dialogue | | `character` | `{ items }` | Display character sprites. Each item can have optional `x` and `y` to override transform position | diff --git a/package.json b/package.json index ba41ec8..2b560a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "route-engine-js", - "version": "0.3.0", + "version": "0.3.1", "description": "A lightweight Visual Novel engine built in JavaScript for creating interactive narrative games with branching storylines", "repository": { "type": "git", diff --git a/spec/system/constructPresentationState.spec.yaml b/spec/system/constructPresentationState.spec.yaml index fc5b329..e41faa1 100644 --- a/spec/system/constructPresentationState.spec.yaml +++ b/spec/system/constructPresentationState.spec.yaml @@ -5,13 +5,13 @@ suites: [constructPresentationState] suite: constructPresentationState exportName: constructPresentationState --- -case: construct presentation state with single base action +case: construct presentation state with single background action in: - - - base: - resourceId: "mainBase" + - - background: + resourceId: "mainBackground" out: - base: - resourceId: "mainBase" + background: + resourceId: "mainBackground" --- case: construct presentation state with control action in: @@ -39,16 +39,12 @@ out: --- case: construct presentation state with multiple actions in one presentation in: - - - base: - resourceId: "mainBase" - background: + - - background: resourceId: "bgImage" bgm: resourceId: "backgroundMusic" loop: true out: - base: - resourceId: "mainBase" background: resourceId: "bgImage" bgm: @@ -58,15 +54,11 @@ out: case: construct presentation state with clean all and multiple presentations in: - - cleanAll: true - base: - resourceId: "oldBase" - - base: - resourceId: "newBase" background: + resourceId: "oldBg" + - background: resourceId: "newBg" out: - base: - resourceId: "newBase" background: resourceId: "newBg" --- diff --git a/spec/system/constructRenderState.spec.yaml b/spec/system/constructRenderState.spec.yaml index a577fd4..2fd9bbe 100644 --- a/spec/system/constructRenderState.spec.yaml +++ b/spec/system/constructRenderState.spec.yaml @@ -5,17 +5,17 @@ suites: [constructRenderState] suite: constructRenderState exportName: constructRenderState --- -case: construct render state with single base action +case: construct render state with single background layout action in: - - presentationState: - base: - resourceId: "mainBase" + background: + resourceId: "mainBackground" resources: layouts: - mainBase: + mainBackground: elements: - type: "container" - id: "base-container" + id: "background-container" out: elements: - id: "story" @@ -23,33 +23,44 @@ out: x: 0 y: 0 children: - - id: "base" + - id: "bg-cg-mainBackground" type: "container" children: - type: "container" - id: "base-container" + id: "background-container" animations: [] audio: [] global: {} --- -case: construct render state with multiple actions in one presentation +case: construct render state keeps controls behind background and layout in: - - presentationState: - base: - resourceId: "mainBase" + control: + resourceId: "gameplay" background: resourceId: "bgImage" + layout: + resourceId: "foregroundLayout" resources: - layouts: - mainBase: - elements: - - type: "container" - id: "base-container" images: bgImage: fileId: "background.jpg" width: 1920 height: 1080 + controls: + gameplay: + elements: + - id: "control-hitbox" + type: "rect" + x: 0 + y: 0 + width: 100 + height: 100 + layouts: + foregroundLayout: + elements: + - type: "container" + id: "foreground-container" out: elements: - id: "story" @@ -57,11 +68,17 @@ out: x: 0 y: 0 children: - - id: "base" + - id: "control-gameplay" type: "container" + x: 0 + y: 0 children: - - type: "container" - id: "base-container" + - id: "control-hitbox" + type: "rect" + x: 0 + y: 0 + width: 100 + height: 100 - id: "bg-cg-bgImage" type: "sprite" x: 0 @@ -69,6 +86,13 @@ out: src: "background.jpg" width: 1920 height: 1080 + - id: "layout-foregroundLayout" + type: "container" + x: 0 + y: 0 + children: + - type: "container" + id: "foreground-container" animations: [] audio: [] global: {} @@ -77,25 +101,18 @@ case: construct render state with clean all and multiple presentations in: - - presentationState: cleanAll: true - base: - resourceId: "oldBase" + background: + resourceId: "oldBg" resources: layouts: - oldBase: + oldBg: elements: - type: "container" id: "old-container" - presentationState: - base: - resourceId: "newBase" background: resourceId: "newBg" resources: - layouts: - newBase: - elements: - - type: "container" - id: "new-container" images: newBg: fileId: "new-background.jpg" @@ -108,12 +125,7 @@ out: x: 0 y: 0 children: - - id: "base" - type: "container" - children: - - type: "container" - id: "new-container" - - id: "base" + - id: "bg-cg-oldBg" type: "container" children: - type: "container" @@ -127,4 +139,4 @@ out: height: 1080 animations: [] audio: [] - global: {} \ No newline at end of file + global: {} diff --git a/spec/system/renderState/addBase.spec.yaml b/spec/system/renderState/addBase.spec.yaml deleted file mode 100644 index e9e0bca..0000000 --- a/spec/system/renderState/addBase.spec.yaml +++ /dev/null @@ -1,558 +0,0 @@ -file: "../../../src/stores/constructRenderState.js" -group: constructRenderState.addBase -suites: [addBase] ---- -suite: addBase -exportName: addBase ---- -case: add base container as first child of story container -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "mainBase" - resources: - layouts: - mainBase: - elements: - - id: "baseElement1" - type: "text" - content: "Hello" -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "baseElement1" - type: "text" - content: "Hello" - animations: [] ---- -case: prepend base container before existing children -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "existingChild1" - type: "text" - - id: "existingChild2" - type: "container" - animations: [] - - presentationState: - base: - resourceId: "newBase" - resources: - layouts: - newBase: - elements: - - id: "baseElement" - type: "sprite" -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "baseElement" - type: "sprite" - - id: "existingChild1" - type: "text" - - id: "existingChild2" - type: "container" - animations: [] ---- -case: handle complex layout elements with nested children -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "complexBase" - resources: - layouts: - complexBase: - elements: - - id: "container1" - type: "container" - children: - - id: "nested1" - type: "text" - - id: "nested2" - type: "sprite" - - id: "standalone" - type: "image" -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "container1" - type: "container" - children: - - id: "nested1" - type: "text" - - id: "nested2" - type: "sprite" - - id: "standalone" - type: "image" - animations: [] ---- -case: no presentationState.base - return unchanged state -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: {} - resources: - layouts: - mainBase: - elements: [] -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] ---- -case: missing resourceId in presentationState.base - return unchanged state -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - someOtherProperty: "value" - resources: - layouts: - mainBase: - elements: [] -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] ---- -case: story container does not exist - return unchanged state -in: - - elements: - - id: "notStory" - type: "container" - children: [] - animations: [] - - presentationState: - base: - resourceId: "mainBase" - resources: - layouts: - mainBase: - elements: [] -out: - elements: - - id: "notStory" - type: "container" - children: [] - animations: [] ---- -case: layout not found in resources - return unchanged state -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "nonExistentBase" - resources: - layouts: - mainBase: - elements: [] -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] ---- -case: empty layout elements array -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "emptyBase" - resources: - layouts: - emptyBase: - elements: [] -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: [] - animations: [] ---- -case: null resources - return unchanged state -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "someBase" - resources: null -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] ---- -case: conditional elements with $if - renders matching branch (left rollback) -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "conditionalBase" - resources: - layouts: - conditionalBase: - elements: - - "$if variables.rollbackSide == 'left'": - id: "left_container" - type: "container" - children: - - id: "rollback_rect" - type: "rect" - width: 640 - height: 720 - x: 0 - - id: "forward_rect" - type: "rect" - width: 640 - height: 720 - x: 640 - - "$if variables.rollbackSide == 'disable' || !variables.rollbackSide": - id: "full_rect" - type: "rect" - width: 1280 - height: 720 - variables: - rollbackSide: "left" -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "left_container" - type: "container" - children: - - id: "rollback_rect" - type: "rect" - width: 640 - height: 720 - x: 0 - - id: "forward_rect" - type: "rect" - width: 640 - height: 720 - x: 640 - animations: [] ---- -case: conditional elements with $if - renders disable branch -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "conditionalBase" - resources: - layouts: - conditionalBase: - elements: - - "$if variables.rollbackSide == 'left'": - id: "left_container" - type: "container" - children: [] - - "$if variables.rollbackSide == 'disable' || !variables.rollbackSide": - id: "full_rect" - type: "rect" - width: 1280 - height: 720 - variables: - rollbackSide: "disable" -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "full_rect" - type: "rect" - width: 1280 - height: 720 - animations: [] ---- -case: conditional elements with $if - no variables defaults to fallback -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "conditionalBase" - resources: - layouts: - conditionalBase: - elements: - - "$if variables.rollbackSide == 'left'": - id: "left_container" - type: "container" - children: [] - - "$if variables.rollbackSide == 'disable' || !variables.rollbackSide": - id: "full_rect" - type: "rect" - width: 1280 - height: 720 - variables: {} -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "full_rect" - type: "rect" - width: 1280 - height: 720 - animations: [] ---- -case: resolves textStyleId in base layout elements -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "styledBase" - resources: - layouts: - styledBase: - elements: - - id: "base-text" - type: "text" - content: "Base" - textStyleId: "body" - textStyles: - body: - fontId: "fontMain" - colorId: "fg" - fontSize: 24 - fontWeight: "400" - fontStyle: "normal" - lineHeight: 1 - fonts: - fontMain: - fileId: "Arial" - colors: - fg: - hex: "#FFFFFF" - variables: {} -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "base-text" - type: "text" - content: "Base" - textStyle: - fontFamily: "Arial" - fontSize: 24 - fontWeight: "400" - fontStyle: "normal" - lineHeight: 1 - fill: "#FFFFFF" - animations: [] ---- -case: resolves colorId in base layout elements -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "coloredBase" - resources: - layouts: - coloredBase: - elements: - - id: "base-panel" - type: "rect" - width: 1280 - height: 720 - colorId: "panel" - colors: - panel: - hex: "#111111" - variables: {} -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "base-panel" - type: "rect" - width: 1280 - height: 720 - fill: "#111111" - animations: [] ---- -case: resolves imageId in base layout elements -in: - - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: [] - animations: [] - - presentationState: - base: - resourceId: "imageBase" - resources: - layouts: - imageBase: - elements: - - id: "base-image" - type: "sprite" - imageId: "backgroundImage" - images: - backgroundImage: - fileId: "background.png" - width: 1280 - height: 720 - variables: {} -out: - elements: - - id: "story" - type: "container" - x: 0 - y: 0 - children: - - id: "base" - type: "container" - children: - - id: "base-image" - type: "sprite" - src: "background.png" - width: 1280 - height: 720 - animations: [] diff --git a/src/schemas/presentationActions.yaml b/src/schemas/presentationActions.yaml index d9c51df..c7316a2 100644 --- a/src/schemas/presentationActions.yaml +++ b/src/schemas/presentationActions.yaml @@ -12,15 +12,6 @@ properties: description: Mode of cleaning/clearing all existing state additionalProperties: false - base: - type: object - description: Base layer behind the background - properties: - resourceId: - type: string - description: ID of the base resource to display - additionalProperties: false - background: type: object description: Background management and display diff --git a/src/stores/constructPresentationState.js b/src/stores/constructPresentationState.js index 7651a5c..e9a0cf9 100644 --- a/src/stores/constructPresentationState.js +++ b/src/stores/constructPresentationState.js @@ -50,17 +50,6 @@ export const createInitialState = () => { return {}; }; -/** - * Applies base from presentation to state - * @param {Object} state - The current state of the system - * @param {Object} presentation - The presentation to apply - */ -export const base = (state, presentation) => { - if (presentation.base) { - state.base = { ...presentation.base }; - } -}; - /** * * Applies background from presentation to state @@ -397,7 +386,6 @@ export const cleanAll = (state, presentation) => { export const constructPresentationState = (presentations) => { const actions = [ cleanAll, - base, background, sfx, bgm, diff --git a/src/stores/constructRenderState.js b/src/stores/constructRenderState.js index 9729f2f..d76a106 100644 --- a/src/stores/constructRenderState.js +++ b/src/stores/constructRenderState.js @@ -760,47 +760,6 @@ export const createInitialState = () => { }; }; -/** - * @param {Object} params - */ -export const addBase = (state, { presentationState, resources, variables }) => { - const { elements } = state; - if (presentationState.base) { - // Find the story container - const storyContainer = getStoryContainer(elements); - if (!storyContainer) { - return state; - } - - if (presentationState.base.resourceId) { - const layout = resources?.layouts[presentationState.base.resourceId]; - - if (layout) { - const baseContainer = { - id: "base", - type: "container", - children: layout.elements, - }; - - const processedContainer = parseAndRender( - baseContainer, - { variables }, - { functions: jemplFunctions }, - ); - - storyContainer.children.unshift( - resolveLayoutResourceIds(processedContainer, resources), - ); - } - } - } - return state; -}; - -/** - * - * @param {Object} params - */ export const addBackgroundOrCg = ( state, { @@ -1718,14 +1677,13 @@ export const addLayeredViews = ( export const constructRenderState = (params) => { const actions = [ - addBase, + addControl, addBackgroundOrCg, addCharacters, addVisuals, addDialogue, addChoices, addLayout, - addControl, addBgm, addSfx, addVoice, diff --git a/src/util.js b/src/util.js index c79265e..d5c01c4 100644 --- a/src/util.js +++ b/src/util.js @@ -612,7 +612,6 @@ export const diffPresentationState = (prev = {}, curr = {}) => { }; diffObject("background"); - diffObject("base"); diffObject("bgm"); diffObject("voice"); diff --git a/vt/specs/background/animation-1.yaml b/vt/specs/background/animation-1.yaml index 679912c..735285c 100644 --- a/vt/specs/background/animation-1.yaml +++ b/vt/specs/background/animation-1.yaml @@ -76,8 +76,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la animations: diff --git a/vt/specs/background/animation-2.yaml b/vt/specs/background/animation-2.yaml index 4571828..649ad68 100644 --- a/vt/specs/background/animation-2.yaml +++ b/vt/specs/background/animation-2.yaml @@ -67,8 +67,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la resourceType: image diff --git a/vt/specs/background/animation-once-per-line.yaml b/vt/specs/background/animation-once-per-line.yaml index 000a5ff..6ed8416 100644 --- a/vt/specs/background/animation-once-per-line.yaml +++ b/vt/specs/background/animation-once-per-line.yaml @@ -90,8 +90,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 dialogue: ui: resourceId: dialogueGui diff --git a/vt/specs/background/backgroundId.yaml b/vt/specs/background/backgroundId.yaml index 57aedf0..525db2a 100644 --- a/vt/specs/background/backgroundId.yaml +++ b/vt/specs/background/backgroundId.yaml @@ -76,8 +76,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la - id: line2 diff --git a/vt/specs/background/layout.yaml b/vt/specs/background/layout.yaml index 4f619e5..e760b67 100644 --- a/vt/specs/background/layout.yaml +++ b/vt/specs/background/layout.yaml @@ -92,8 +92,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: j3i8dk32 resourceType: layout diff --git a/vt/specs/bgm/basic.yaml b/vt/specs/bgm/basic.yaml index 1e738a0..525cb5e 100644 --- a/vt/specs/bgm/basic.yaml +++ b/vt/specs/bgm/basic.yaml @@ -79,7 +79,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 bgm: resourceId: dk392 diff --git a/vt/specs/character/animation-1.yaml b/vt/specs/character/animation-1.yaml index a20030c..1ea27ae 100644 --- a/vt/specs/character/animation-1.yaml +++ b/vt/specs/character/animation-1.yaml @@ -112,8 +112,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la resourceType: image diff --git a/vt/specs/character/animation-2.yaml b/vt/specs/character/animation-2.yaml index 2174951..8850c4b 100644 --- a/vt/specs/character/animation-2.yaml +++ b/vt/specs/character/animation-2.yaml @@ -153,8 +153,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la resourceType: image diff --git a/vt/specs/character/basic.yaml b/vt/specs/character/basic.yaml index 93d0304..b28ceee 100644 --- a/vt/specs/character/basic.yaml +++ b/vt/specs/character/basic.yaml @@ -60,8 +60,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la character: diff --git a/vt/specs/character/custom-position.yaml b/vt/specs/character/custom-position.yaml index ea9b83d..3b21848 100644 --- a/vt/specs/character/custom-position.yaml +++ b/vt/specs/character/custom-position.yaml @@ -60,8 +60,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la character: diff --git a/vt/specs/character/duplicate-character.yaml b/vt/specs/character/duplicate-character.yaml index 8608e3f..169b534 100644 --- a/vt/specs/character/duplicate-character.yaml +++ b/vt/specs/character/duplicate-character.yaml @@ -60,8 +60,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la character: diff --git a/vt/specs/choice/animation.yaml b/vt/specs/choice/animation.yaml index 27729e9..4e6f4ab 100644 --- a/vt/specs/choice/animation.yaml +++ b/vt/specs/choice/animation.yaml @@ -140,7 +140,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/choice/basic.yaml b/vt/specs/choice/basic.yaml index 9f28f04..2a491ee 100644 --- a/vt/specs/choice/basic.yaml +++ b/vt/specs/choice/basic.yaml @@ -134,7 +134,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: mode: adv @@ -160,7 +160,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: mode: adv diff --git a/vt/specs/complete/one.yaml b/vt/specs/complete/one.yaml index 86564c7..ad1c0a0 100644 --- a/vt/specs/complete/one.yaml +++ b/vt/specs/complete/one.yaml @@ -1419,7 +1419,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: @@ -1444,8 +1444,6 @@ story: lines: - id: line1 actions: - base: - resourceId: storyScreenLayout background: resourceId: f3wklajf32 dialogue: @@ -1548,7 +1546,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: storyScreenLayout resourceType: layout dialogue: @@ -1602,7 +1600,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: extraScreenLayout resourceType: layout dialogue: diff --git a/vt/specs/dialogue/animation.yaml b/vt/specs/dialogue/animation.yaml index d38c0d6..fa3e95d 100644 --- a/vt/specs/dialogue/animation.yaml +++ b/vt/specs/dialogue/animation.yaml @@ -111,7 +111,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/dialogue/autoplay.yaml b/vt/specs/dialogue/autoplay.yaml index b4261a4..2379047 100644 --- a/vt/specs/dialogue/autoplay.yaml +++ b/vt/specs/dialogue/autoplay.yaml @@ -140,7 +140,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout dialogue: mode: adv diff --git a/vt/specs/dialogue/basic.yaml b/vt/specs/dialogue/basic.yaml index 7950e02..ae59ba3 100644 --- a/vt/specs/dialogue/basic.yaml +++ b/vt/specs/dialogue/basic.yaml @@ -96,7 +96,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/dialogue/history.yaml b/vt/specs/dialogue/history.yaml index 41cde22..ca1af42 100644 --- a/vt/specs/dialogue/history.yaml +++ b/vt/specs/dialogue/history.yaml @@ -237,7 +237,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/dialogue/nvl-mode.yaml b/vt/specs/dialogue/nvl-mode.yaml index f616a8e..e87befd 100644 --- a/vt/specs/dialogue/nvl-mode.yaml +++ b/vt/specs/dialogue/nvl-mode.yaml @@ -132,7 +132,7 @@ story: lines: - id: "1" actions: - base: + background: resourceId: base1 dialogue: mode: adv diff --git a/vt/specs/dialogue/sceneMode.yaml b/vt/specs/dialogue/sceneMode.yaml index 828c5c9..6c40d6d 100644 --- a/vt/specs/dialogue/sceneMode.yaml +++ b/vt/specs/dialogue/sceneMode.yaml @@ -135,7 +135,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout dialogue: mode: adv diff --git a/vt/specs/dialogue/skip.yaml b/vt/specs/dialogue/skip.yaml index 74c0709..d5ece13 100644 --- a/vt/specs/dialogue/skip.yaml +++ b/vt/specs/dialogue/skip.yaml @@ -127,7 +127,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout dialogue: mode: adv diff --git a/vt/specs/dialogue/with-background.yaml b/vt/specs/dialogue/with-background.yaml index b81b0f7..d63b26c 100644 --- a/vt/specs/dialogue/with-background.yaml +++ b/vt/specs/dialogue/with-background.yaml @@ -118,7 +118,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/initialization/initial-line.yaml b/vt/specs/initialization/initial-line.yaml index 5e918d7..d529ea2 100644 --- a/vt/specs/initialization/initial-line.yaml +++ b/vt/specs/initialization/initial-line.yaml @@ -57,7 +57,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/keyboard/basic.yaml b/vt/specs/keyboard/basic.yaml index cb3c61c..0aed771 100644 --- a/vt/specs/keyboard/basic.yaml +++ b/vt/specs/keyboard/basic.yaml @@ -76,7 +76,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout control: resourceId: gameplay diff --git a/vt/specs/layout/animation.yaml b/vt/specs/layout/animation.yaml index 61e2207..db9d783 100644 --- a/vt/specs/layout/animation.yaml +++ b/vt/specs/layout/animation.yaml @@ -130,7 +130,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 - id: line2 actions: diff --git a/vt/specs/layout/basic.yaml b/vt/specs/layout/basic.yaml index 7eddb67..fbdebdc 100644 --- a/vt/specs/layout/basic.yaml +++ b/vt/specs/layout/basic.yaml @@ -83,7 +83,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: j3i8dk32 diff --git a/vt/specs/layout/layeredViews.yaml b/vt/specs/layout/layeredViews.yaml index 8781d84..ead03fe 100644 --- a/vt/specs/layout/layeredViews.yaml +++ b/vt/specs/layout/layeredViews.yaml @@ -216,5 +216,5 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout diff --git a/vt/specs/nextLineConfig/applyMode-persistent.yaml b/vt/specs/nextLineConfig/applyMode-persistent.yaml index 7feabd6..7249711 100644 --- a/vt/specs/nextLineConfig/applyMode-persistent.yaml +++ b/vt/specs/nextLineConfig/applyMode-persistent.yaml @@ -68,7 +68,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout bgm: resourceId: bgmMain diff --git a/vt/specs/nextLineConfig/applyMode-singleLine.yaml b/vt/specs/nextLineConfig/applyMode-singleLine.yaml index 3c8c371..b837225 100644 --- a/vt/specs/nextLineConfig/applyMode-singleLine.yaml +++ b/vt/specs/nextLineConfig/applyMode-singleLine.yaml @@ -68,7 +68,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout bgm: resourceId: bgmMain diff --git a/vt/specs/nextLineConfig/choice-stops-auto.yaml b/vt/specs/nextLineConfig/choice-stops-auto.yaml index 72a842c..0e9d226 100644 --- a/vt/specs/nextLineConfig/choice-stops-auto.yaml +++ b/vt/specs/nextLineConfig/choice-stops-auto.yaml @@ -107,7 +107,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout bgm: resourceId: bgmMain diff --git a/vt/specs/nextLineConfig/completion-text-animation-choice.yaml b/vt/specs/nextLineConfig/completion-text-animation-choice.yaml index 5aa14e8..7ba7bc4 100644 --- a/vt/specs/nextLineConfig/completion-text-animation-choice.yaml +++ b/vt/specs/nextLineConfig/completion-text-animation-choice.yaml @@ -119,7 +119,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout startAutoMode: {} setNextLineConfig: diff --git a/vt/specs/nextLineConfig/completion-video-animation.yaml b/vt/specs/nextLineConfig/completion-video-animation.yaml index d327dba..30a3617 100644 --- a/vt/specs/nextLineConfig/completion-video-animation.yaml +++ b/vt/specs/nextLineConfig/completion-video-animation.yaml @@ -91,7 +91,7 @@ story: lines: - id: line0 actions: - base: + background: resourceId: baseLayout dialogue: mode: adv diff --git a/vt/specs/save/basic.yaml b/vt/specs/save/basic.yaml index e1c5103..88de1ab 100644 --- a/vt/specs/save/basic.yaml +++ b/vt/specs/save/basic.yaml @@ -362,7 +362,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout dialogue: mode: adv diff --git a/vt/specs/save/dynamic-slot-selector-test.yaml b/vt/specs/save/dynamic-slot-selector-test.yaml index 60876fc..8295b8a 100644 --- a/vt/specs/save/dynamic-slot-selector-test.yaml +++ b/vt/specs/save/dynamic-slot-selector-test.yaml @@ -208,7 +208,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: dynamicSlotsTestUI diff --git a/vt/specs/save/multi-slot-test.yaml b/vt/specs/save/multi-slot-test.yaml index 9a62b6b..750bb00 100644 --- a/vt/specs/save/multi-slot-test.yaml +++ b/vt/specs/save/multi-slot-test.yaml @@ -547,7 +547,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: multiSlotTestUI diff --git a/vt/specs/sectionTransition/basic.yaml b/vt/specs/sectionTransition/basic.yaml index 2f5776e..c325cec 100644 --- a/vt/specs/sectionTransition/basic.yaml +++ b/vt/specs/sectionTransition/basic.yaml @@ -51,8 +51,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: alkejf3la - id: line2 @@ -64,8 +62,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: 8a3lkja - id: line2 @@ -81,8 +77,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: img3 - id: line2 diff --git a/vt/specs/sfx/basic.yaml b/vt/specs/sfx/basic.yaml index aad9046..3e55715 100644 --- a/vt/specs/sfx/basic.yaml +++ b/vt/specs/sfx/basic.yaml @@ -79,7 +79,7 @@ story: lines: - id: line0 actions: - base: + background: resourceId: base1 dialogue: ui: diff --git a/vt/specs/slider/slider-variable-binding.yaml b/vt/specs/slider/slider-variable-binding.yaml index 4259a2d..08ad49e 100644 --- a/vt/specs/slider/slider-variable-binding.yaml +++ b/vt/specs/slider/slider-variable-binding.yaml @@ -177,7 +177,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout layout: resourceId: sliderTestLayout diff --git a/vt/specs/variables/boolean-test.yaml b/vt/specs/variables/boolean-test.yaml index 0cd4186..c91a1c3 100644 --- a/vt/specs/variables/boolean-test.yaml +++ b/vt/specs/variables/boolean-test.yaml @@ -270,7 +270,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: booleanTestUI diff --git a/vt/specs/variables/counter.yaml b/vt/specs/variables/counter.yaml index 56f5d22..35697c4 100644 --- a/vt/specs/variables/counter.yaml +++ b/vt/specs/variables/counter.yaml @@ -118,7 +118,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: j3i8dk32 diff --git a/vt/specs/variables/object-test.yaml b/vt/specs/variables/object-test.yaml index e4c3d0c..8293d60 100644 --- a/vt/specs/variables/object-test.yaml +++ b/vt/specs/variables/object-test.yaml @@ -173,7 +173,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: objectTestUI diff --git a/vt/specs/variables/rollback-offset-test.yaml b/vt/specs/variables/rollback-offset-test.yaml index f861c87..af28dcb 100644 --- a/vt/specs/variables/rollback-offset-test.yaml +++ b/vt/specs/variables/rollback-offset-test.yaml @@ -182,7 +182,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout updateVariable: id: uvLine1 diff --git a/vt/specs/variables/rollback-test.yaml b/vt/specs/variables/rollback-test.yaml index 6258843..6815af0 100644 --- a/vt/specs/variables/rollback-test.yaml +++ b/vt/specs/variables/rollback-test.yaml @@ -139,7 +139,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: baseLayout dialogue: mode: adv diff --git a/vt/specs/variables/scope-comparison.yaml b/vt/specs/variables/scope-comparison.yaml index 0b7ce02..dec9619 100644 --- a/vt/specs/variables/scope-comparison.yaml +++ b/vt/specs/variables/scope-comparison.yaml @@ -663,7 +663,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: scopeComparisonUI diff --git a/vt/specs/variables/string-test.yaml b/vt/specs/variables/string-test.yaml index 78cd0d1..9e3914b 100644 --- a/vt/specs/variables/string-test.yaml +++ b/vt/specs/variables/string-test.yaml @@ -300,7 +300,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 layout: resourceId: stringTestUI diff --git a/vt/specs/video/background.yaml b/vt/specs/video/background.yaml index b4e3e3a..9be60d0 100644 --- a/vt/specs/video/background.yaml +++ b/vt/specs/video/background.yaml @@ -40,8 +40,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: video_sample_resource resourceType: video diff --git a/vt/specs/video/visual.yaml b/vt/specs/video/visual.yaml index c3341ab..5b909ff 100644 --- a/vt/specs/video/visual.yaml +++ b/vt/specs/video/visual.yaml @@ -46,7 +46,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/animated.yaml b/vt/specs/visual/animated.yaml index 580dd77..b0cdfcb 100644 --- a/vt/specs/visual/animated.yaml +++ b/vt/specs/visual/animated.yaml @@ -180,7 +180,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/transform.yaml b/vt/specs/visual/transform.yaml index 1a42257..1e393e6 100644 --- a/vt/specs/visual/transform.yaml +++ b/vt/specs/visual/transform.yaml @@ -49,7 +49,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/visual-1.yaml b/vt/specs/visual/visual-1.yaml index 14f2afb..fc3b23d 100644 --- a/vt/specs/visual/visual-1.yaml +++ b/vt/specs/visual/visual-1.yaml @@ -72,7 +72,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/visual-animation-1.yaml b/vt/specs/visual/visual-animation-1.yaml index 29a9015..93e42b1 100644 --- a/vt/specs/visual/visual-animation-1.yaml +++ b/vt/specs/visual/visual-animation-1.yaml @@ -76,7 +76,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/visual-animation-2.yaml b/vt/specs/visual/visual-animation-2.yaml index 16b4b2d..19007ba 100644 --- a/vt/specs/visual/visual-animation-2.yaml +++ b/vt/specs/visual/visual-animation-2.yaml @@ -84,7 +84,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/visual-layout.yaml b/vt/specs/visual/visual-layout.yaml index 9b18156..c666780 100644 --- a/vt/specs/visual/visual-layout.yaml +++ b/vt/specs/visual/visual-layout.yaml @@ -111,7 +111,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/visual-multiple.yaml b/vt/specs/visual/visual-multiple.yaml index 470c2aa..f120807 100644 --- a/vt/specs/visual/visual-multiple.yaml +++ b/vt/specs/visual/visual-multiple.yaml @@ -80,7 +80,7 @@ story: lines: - id: line1 actions: - base: + background: resourceId: base1 visual: items: diff --git a/vt/specs/visual/visual-snow-effect.yaml b/vt/specs/visual/visual-snow-effect.yaml index a1c0c43..9383c14 100644 --- a/vt/specs/visual/visual-snow-effect.yaml +++ b/vt/specs/visual/visual-snow-effect.yaml @@ -130,8 +130,6 @@ story: lines: - id: line1 actions: - base: - resourceId: base1 background: resourceId: winterBg resourceType: image