diff --git a/dist/extension.zip b/dist/extension.zip index 165ceeb..8e97313 100644 Binary files a/dist/extension.zip and b/dist/extension.zip differ diff --git a/dist/extension/birb.js b/dist/extension/birb.js index bafedbb..bf95dbd 100644 --- a/dist/extension/birb.js +++ b/dist/extension/birb.js @@ -196,7 +196,7 @@ * @param {number} width The width of each sprite * @returns {string[][]} */ - function getLayer(spriteSheet, spriteIndex, width) { + function getLayerPixels(spriteSheet, spriteIndex, width) { // From an array of a horizontal sprite sheet, get the layer for a specific sprite const layer = []; for (let y = 0; y < width; y++) { @@ -631,16 +631,16 @@ // Build layers from sprite sheet this.layers = { - base: new Layer(getLayer(spriteSheet, 0, this.spriteWidth)), - down: new Layer(getLayer(spriteSheet, 1, this.spriteWidth)), - heartOne: new Layer(getLayer(spriteSheet, 2, this.spriteWidth)), - heartTwo: new Layer(getLayer(spriteSheet, 3, this.spriteWidth)), - heartThree: new Layer(getLayer(spriteSheet, 4, this.spriteWidth)), - tuftBase: new Layer(getLayer(spriteSheet, 5, this.spriteWidth), "tuft"), - tuftDown: new Layer(getLayer(spriteSheet, 6, this.spriteWidth), "tuft"), - wingsUp: new Layer(getLayer(spriteSheet, 7, this.spriteWidth)), - wingsDown: new Layer(getLayer(spriteSheet, 8, this.spriteWidth)), - happyEye: new Layer(getLayer(spriteSheet, 9, this.spriteWidth)), + base: new Layer(getLayerPixels(spriteSheet, 0, this.spriteWidth)), + down: new Layer(getLayerPixels(spriteSheet, 1, this.spriteWidth)), + heartOne: new Layer(getLayerPixels(spriteSheet, 2, this.spriteWidth)), + heartTwo: new Layer(getLayerPixels(spriteSheet, 3, this.spriteWidth)), + heartThree: new Layer(getLayerPixels(spriteSheet, 4, this.spriteWidth)), + tuftBase: new Layer(getLayerPixels(spriteSheet, 5, this.spriteWidth), "tuft"), + tuftDown: new Layer(getLayerPixels(spriteSheet, 6, this.spriteWidth), "tuft"), + wingsUp: new Layer(getLayerPixels(spriteSheet, 7, this.spriteWidth)), + wingsDown: new Layer(getLayerPixels(spriteSheet, 8, this.spriteWidth)), + happyEye: new Layer(getLayerPixels(spriteSheet, 9, this.spriteWidth)), }; // Build frames from layers @@ -1810,7 +1810,7 @@ const FEATHER_SPRITE_SHEET = featherPixels; const featherLayers = { - feather: new Layer(getLayer(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), + feather: new Layer(getLayerPixels(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), }; const featherFrames = { diff --git a/dist/obsidian/main.js b/dist/obsidian/main.js index 1721c9f..e3154b5 100644 --- a/dist/obsidian/main.js +++ b/dist/obsidian/main.js @@ -201,7 +201,7 @@ module.exports = class PocketBird extends Plugin { * @param {number} width The width of each sprite * @returns {string[][]} */ - function getLayer(spriteSheet, spriteIndex, width) { + function getLayerPixels(spriteSheet, spriteIndex, width) { // From an array of a horizontal sprite sheet, get the layer for a specific sprite const layer = []; for (let y = 0; y < width; y++) { @@ -636,16 +636,16 @@ module.exports = class PocketBird extends Plugin { // Build layers from sprite sheet this.layers = { - base: new Layer(getLayer(spriteSheet, 0, this.spriteWidth)), - down: new Layer(getLayer(spriteSheet, 1, this.spriteWidth)), - heartOne: new Layer(getLayer(spriteSheet, 2, this.spriteWidth)), - heartTwo: new Layer(getLayer(spriteSheet, 3, this.spriteWidth)), - heartThree: new Layer(getLayer(spriteSheet, 4, this.spriteWidth)), - tuftBase: new Layer(getLayer(spriteSheet, 5, this.spriteWidth), "tuft"), - tuftDown: new Layer(getLayer(spriteSheet, 6, this.spriteWidth), "tuft"), - wingsUp: new Layer(getLayer(spriteSheet, 7, this.spriteWidth)), - wingsDown: new Layer(getLayer(spriteSheet, 8, this.spriteWidth)), - happyEye: new Layer(getLayer(spriteSheet, 9, this.spriteWidth)), + base: new Layer(getLayerPixels(spriteSheet, 0, this.spriteWidth)), + down: new Layer(getLayerPixels(spriteSheet, 1, this.spriteWidth)), + heartOne: new Layer(getLayerPixels(spriteSheet, 2, this.spriteWidth)), + heartTwo: new Layer(getLayerPixels(spriteSheet, 3, this.spriteWidth)), + heartThree: new Layer(getLayerPixels(spriteSheet, 4, this.spriteWidth)), + tuftBase: new Layer(getLayerPixels(spriteSheet, 5, this.spriteWidth), "tuft"), + tuftDown: new Layer(getLayerPixels(spriteSheet, 6, this.spriteWidth), "tuft"), + wingsUp: new Layer(getLayerPixels(spriteSheet, 7, this.spriteWidth)), + wingsDown: new Layer(getLayerPixels(spriteSheet, 8, this.spriteWidth)), + happyEye: new Layer(getLayerPixels(spriteSheet, 9, this.spriteWidth)), }; // Build frames from layers @@ -1853,7 +1853,7 @@ module.exports = class PocketBird extends Plugin { const FEATHER_SPRITE_SHEET = featherPixels; const featherLayers = { - feather: new Layer(getLayer(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), + feather: new Layer(getLayerPixels(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), }; const featherFrames = { diff --git a/dist/userscript/birb.user.js b/dist/userscript/birb.user.js index c3743f3..df89919 100644 --- a/dist/userscript/birb.user.js +++ b/dist/userscript/birb.user.js @@ -210,7 +210,7 @@ * @param {number} width The width of each sprite * @returns {string[][]} */ - function getLayer(spriteSheet, spriteIndex, width) { + function getLayerPixels(spriteSheet, spriteIndex, width) { // From an array of a horizontal sprite sheet, get the layer for a specific sprite const layer = []; for (let y = 0; y < width; y++) { @@ -645,16 +645,16 @@ // Build layers from sprite sheet this.layers = { - base: new Layer(getLayer(spriteSheet, 0, this.spriteWidth)), - down: new Layer(getLayer(spriteSheet, 1, this.spriteWidth)), - heartOne: new Layer(getLayer(spriteSheet, 2, this.spriteWidth)), - heartTwo: new Layer(getLayer(spriteSheet, 3, this.spriteWidth)), - heartThree: new Layer(getLayer(spriteSheet, 4, this.spriteWidth)), - tuftBase: new Layer(getLayer(spriteSheet, 5, this.spriteWidth), "tuft"), - tuftDown: new Layer(getLayer(spriteSheet, 6, this.spriteWidth), "tuft"), - wingsUp: new Layer(getLayer(spriteSheet, 7, this.spriteWidth)), - wingsDown: new Layer(getLayer(spriteSheet, 8, this.spriteWidth)), - happyEye: new Layer(getLayer(spriteSheet, 9, this.spriteWidth)), + base: new Layer(getLayerPixels(spriteSheet, 0, this.spriteWidth)), + down: new Layer(getLayerPixels(spriteSheet, 1, this.spriteWidth)), + heartOne: new Layer(getLayerPixels(spriteSheet, 2, this.spriteWidth)), + heartTwo: new Layer(getLayerPixels(spriteSheet, 3, this.spriteWidth)), + heartThree: new Layer(getLayerPixels(spriteSheet, 4, this.spriteWidth)), + tuftBase: new Layer(getLayerPixels(spriteSheet, 5, this.spriteWidth), "tuft"), + tuftDown: new Layer(getLayerPixels(spriteSheet, 6, this.spriteWidth), "tuft"), + wingsUp: new Layer(getLayerPixels(spriteSheet, 7, this.spriteWidth)), + wingsDown: new Layer(getLayerPixels(spriteSheet, 8, this.spriteWidth)), + happyEye: new Layer(getLayerPixels(spriteSheet, 9, this.spriteWidth)), }; // Build frames from layers @@ -1815,7 +1815,7 @@ const FEATHER_SPRITE_SHEET = featherPixels; const featherLayers = { - feather: new Layer(getLayer(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), + feather: new Layer(getLayerPixels(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), }; const featherFrames = { diff --git a/dist/web/birb.embed.js b/dist/web/birb.embed.js index 0fcb55b..077d90d 100644 --- a/dist/web/birb.embed.js +++ b/dist/web/birb.embed.js @@ -196,7 +196,7 @@ * @param {number} width The width of each sprite * @returns {string[][]} */ - function getLayer(spriteSheet, spriteIndex, width) { + function getLayerPixels(spriteSheet, spriteIndex, width) { // From an array of a horizontal sprite sheet, get the layer for a specific sprite const layer = []; for (let y = 0; y < width; y++) { @@ -631,16 +631,16 @@ // Build layers from sprite sheet this.layers = { - base: new Layer(getLayer(spriteSheet, 0, this.spriteWidth)), - down: new Layer(getLayer(spriteSheet, 1, this.spriteWidth)), - heartOne: new Layer(getLayer(spriteSheet, 2, this.spriteWidth)), - heartTwo: new Layer(getLayer(spriteSheet, 3, this.spriteWidth)), - heartThree: new Layer(getLayer(spriteSheet, 4, this.spriteWidth)), - tuftBase: new Layer(getLayer(spriteSheet, 5, this.spriteWidth), "tuft"), - tuftDown: new Layer(getLayer(spriteSheet, 6, this.spriteWidth), "tuft"), - wingsUp: new Layer(getLayer(spriteSheet, 7, this.spriteWidth)), - wingsDown: new Layer(getLayer(spriteSheet, 8, this.spriteWidth)), - happyEye: new Layer(getLayer(spriteSheet, 9, this.spriteWidth)), + base: new Layer(getLayerPixels(spriteSheet, 0, this.spriteWidth)), + down: new Layer(getLayerPixels(spriteSheet, 1, this.spriteWidth)), + heartOne: new Layer(getLayerPixels(spriteSheet, 2, this.spriteWidth)), + heartTwo: new Layer(getLayerPixels(spriteSheet, 3, this.spriteWidth)), + heartThree: new Layer(getLayerPixels(spriteSheet, 4, this.spriteWidth)), + tuftBase: new Layer(getLayerPixels(spriteSheet, 5, this.spriteWidth), "tuft"), + tuftDown: new Layer(getLayerPixels(spriteSheet, 6, this.spriteWidth), "tuft"), + wingsUp: new Layer(getLayerPixels(spriteSheet, 7, this.spriteWidth)), + wingsDown: new Layer(getLayerPixels(spriteSheet, 8, this.spriteWidth)), + happyEye: new Layer(getLayerPixels(spriteSheet, 9, this.spriteWidth)), }; // Build frames from layers @@ -1795,7 +1795,7 @@ const FEATHER_SPRITE_SHEET = featherPixels; const featherLayers = { - feather: new Layer(getLayer(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), + feather: new Layer(getLayerPixels(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), }; const featherFrames = { diff --git a/dist/web/birb.js b/dist/web/birb.js index 0fcb55b..077d90d 100644 --- a/dist/web/birb.js +++ b/dist/web/birb.js @@ -196,7 +196,7 @@ * @param {number} width The width of each sprite * @returns {string[][]} */ - function getLayer(spriteSheet, spriteIndex, width) { + function getLayerPixels(spriteSheet, spriteIndex, width) { // From an array of a horizontal sprite sheet, get the layer for a specific sprite const layer = []; for (let y = 0; y < width; y++) { @@ -631,16 +631,16 @@ // Build layers from sprite sheet this.layers = { - base: new Layer(getLayer(spriteSheet, 0, this.spriteWidth)), - down: new Layer(getLayer(spriteSheet, 1, this.spriteWidth)), - heartOne: new Layer(getLayer(spriteSheet, 2, this.spriteWidth)), - heartTwo: new Layer(getLayer(spriteSheet, 3, this.spriteWidth)), - heartThree: new Layer(getLayer(spriteSheet, 4, this.spriteWidth)), - tuftBase: new Layer(getLayer(spriteSheet, 5, this.spriteWidth), "tuft"), - tuftDown: new Layer(getLayer(spriteSheet, 6, this.spriteWidth), "tuft"), - wingsUp: new Layer(getLayer(spriteSheet, 7, this.spriteWidth)), - wingsDown: new Layer(getLayer(spriteSheet, 8, this.spriteWidth)), - happyEye: new Layer(getLayer(spriteSheet, 9, this.spriteWidth)), + base: new Layer(getLayerPixels(spriteSheet, 0, this.spriteWidth)), + down: new Layer(getLayerPixels(spriteSheet, 1, this.spriteWidth)), + heartOne: new Layer(getLayerPixels(spriteSheet, 2, this.spriteWidth)), + heartTwo: new Layer(getLayerPixels(spriteSheet, 3, this.spriteWidth)), + heartThree: new Layer(getLayerPixels(spriteSheet, 4, this.spriteWidth)), + tuftBase: new Layer(getLayerPixels(spriteSheet, 5, this.spriteWidth), "tuft"), + tuftDown: new Layer(getLayerPixels(spriteSheet, 6, this.spriteWidth), "tuft"), + wingsUp: new Layer(getLayerPixels(spriteSheet, 7, this.spriteWidth)), + wingsDown: new Layer(getLayerPixels(spriteSheet, 8, this.spriteWidth)), + happyEye: new Layer(getLayerPixels(spriteSheet, 9, this.spriteWidth)), }; // Build frames from layers @@ -1795,7 +1795,7 @@ const FEATHER_SPRITE_SHEET = featherPixels; const featherLayers = { - feather: new Layer(getLayer(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), + feather: new Layer(getLayerPixels(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), }; const featherFrames = { diff --git a/src/application.js b/src/application.js index 6c710d7..da7dfe6 100644 --- a/src/application.js +++ b/src/application.js @@ -19,7 +19,7 @@ import { log, debug, error, - getLayer, + getLayerPixels, getWindowHeight } from './shared.js'; import { @@ -136,7 +136,7 @@ function startApplication(birbPixels, featherPixels) { const FEATHER_SPRITE_SHEET = featherPixels; const featherLayers = { - feather: new Layer(getLayer(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), + feather: new Layer(getLayerPixels(FEATHER_SPRITE_SHEET, 0, FEATHER_SPRITE_WIDTH)), }; const featherFrames = { diff --git a/src/birb.js b/src/birb.js index a7f6843..bf12dff 100644 --- a/src/birb.js +++ b/src/birb.js @@ -1,4 +1,4 @@ -import { Directions, getLayer, getWindowHeight, getFixedWindowHeight } from './shared.js'; +import { Directions, getLayerPixels, getWindowHeight, getFixedWindowHeight } from './shared.js'; import Layer from './animation/layer.js'; import Frame from './animation/frame.js'; import Anim from './animation/anim.js'; @@ -41,16 +41,16 @@ export class Birb { // Build layers from sprite sheet this.layers = { - base: new Layer(getLayer(spriteSheet, 0, this.spriteWidth)), - down: new Layer(getLayer(spriteSheet, 1, this.spriteWidth)), - heartOne: new Layer(getLayer(spriteSheet, 2, this.spriteWidth)), - heartTwo: new Layer(getLayer(spriteSheet, 3, this.spriteWidth)), - heartThree: new Layer(getLayer(spriteSheet, 4, this.spriteWidth)), - tuftBase: new Layer(getLayer(spriteSheet, 5, this.spriteWidth), "tuft"), - tuftDown: new Layer(getLayer(spriteSheet, 6, this.spriteWidth), "tuft"), - wingsUp: new Layer(getLayer(spriteSheet, 7, this.spriteWidth)), - wingsDown: new Layer(getLayer(spriteSheet, 8, this.spriteWidth)), - happyEye: new Layer(getLayer(spriteSheet, 9, this.spriteWidth)), + base: new Layer(getLayerPixels(spriteSheet, 0, this.spriteWidth)), + down: new Layer(getLayerPixels(spriteSheet, 1, this.spriteWidth)), + heartOne: new Layer(getLayerPixels(spriteSheet, 2, this.spriteWidth)), + heartTwo: new Layer(getLayerPixels(spriteSheet, 3, this.spriteWidth)), + heartThree: new Layer(getLayerPixels(spriteSheet, 4, this.spriteWidth)), + tuftBase: new Layer(getLayerPixels(spriteSheet, 5, this.spriteWidth), "tuft"), + tuftDown: new Layer(getLayerPixels(spriteSheet, 6, this.spriteWidth), "tuft"), + wingsUp: new Layer(getLayerPixels(spriteSheet, 7, this.spriteWidth)), + wingsDown: new Layer(getLayerPixels(spriteSheet, 8, this.spriteWidth)), + happyEye: new Layer(getLayerPixels(spriteSheet, 9, this.spriteWidth)), }; // Build frames from layers diff --git a/src/shared.js b/src/shared.js index 01a5a5a..990f2c8 100644 --- a/src/shared.js +++ b/src/shared.js @@ -193,7 +193,7 @@ export function error() { * @param {number} width The width of each sprite * @returns {string[][]} */ -export function getLayer(spriteSheet, spriteIndex, width) { +export function getLayerPixels(spriteSheet, spriteIndex, width) { // From an array of a horizontal sprite sheet, get the layer for a specific sprite const layer = []; for (let y = 0; y < width; y++) {