diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index fd9d0d2..31d9b44 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -27,37 +27,22 @@ input[type=number] { .rounded { border-radius: 0.5rem; } -.btn-primary{ +.btn-primary { color: #fff; - background-color: #7fb1c5; + background-color: #3c6d82; border: 2px solid #1a617f; padding: 0.25rem 0.5rem; font-size: .7875rem; border-radius: 0.5rem; box-shadow: none!important; } -.btn-primary:hover{ - background-color: #185b77; - border-color: #175670; - box-shadow: none!important; -} -.btn-secondary{ - color: #fff; - background-color: #7fb1c5; +.btn-primary:hover { border: 2px solid #1a617f; - padding: 0.25rem 0.5rem; - font-size: .7875rem; - border-radius: 0.5rem; - box-shadow: none!important; -} -.btn-secondary:hover{ - background-color: #185b77; - border-color: #175670; box-shadow: none!important; } .btn-success{ color: #fff; - background-color: #00800b; + background-color: #3c8243; border: 2px solid #006d09; padding: 0.25rem 0.5rem; font-size: .7875rem; diff --git a/src/components/floorplan-editor/common/FloorplanEditor.ts b/src/components/floorplan-editor/common/FloorplanEditor.ts index 644492b..8003e10 100644 --- a/src/components/floorplan-editor/common/FloorplanEditor.ts +++ b/src/components/floorplan-editor/common/FloorplanEditor.ts @@ -198,6 +198,12 @@ export class FloorplanEditor const asset = spritesheet.frames[assetName]; + if (asset === undefined) + { + console.warn(`Asset "${ assetName }" not found in spritesheet.`); + continue; + } + this.renderer.drawImage(this._image, asset.frame.x, asset.frame.y, asset.frame.w, asset.frame.h, positionX, positionY, asset.frame.w, asset.frame.h); } } diff --git a/src/components/floorplan-editor/common/FloorplanResource.ts b/src/components/floorplan-editor/common/FloorplanResource.ts index eb8561d..f099228 100644 --- a/src/components/floorplan-editor/common/FloorplanResource.ts +++ b/src/components/floorplan-editor/common/FloorplanResource.ts @@ -192,7 +192,14 @@ export const spritesheet = { spriteSourceSize: { x: 0, y: 0, w: 34, h: 17 }, sourceSize: { w: 34, h: 17 }, }, - 'r_blocked': { + 'r': { + frame: { x: 73, y: 153, w: 34, h: 17 }, + rotated: false, + trimmed: false, + spriteSourceSize: { x: 0, y: 0, w: 34, h: 17 }, + sourceSize: { w: 34, h: 17 }, + }, + 'r_blocked': { frame: { x: 1, y: 172, w: 34, h: 17 }, rotated: false, trimmed: false, @@ -206,6 +213,20 @@ export const spritesheet = { spriteSourceSize: { x: 0, y: 0, w: 34, h: 17 }, sourceSize: { w: 34, h: 17 }, }, + 's': { + frame: { x: 73, y: 153, w: 34, h: 17 }, + rotated: false, + trimmed: false, + spriteSourceSize: { x: 0, y: 0, w: 34, h: 17 }, + sourceSize: { w: 34, h: 17 }, + }, + 't': { + frame: { x: 73, y: 153, w: 34, h: 17 }, + rotated: false, + trimmed: false, + spriteSourceSize: { x: 0, y: 0, w: 34, h: 17 }, + sourceSize: { w: 34, h: 17 }, + }, 'x': { frame: { x: 73, y: 172, w: 34, h: 17 }, rotated: false,