summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphat_sumo <ethanjpayne1@gmail.com>2022-04-13 18:21:11 -0600
committerphat_sumo <ethanjpayne1@gmail.com>2022-04-13 18:21:11 -0600
commitd12fa31cf86d54b5e88e9b6169e758a8875da869 (patch)
tree3e448328b0f43351ac0913b76a2d2e97656a4aea
parent8d0c43c1e7c47bb6767d361d8141c1467df9d50a (diff)
downloadbbiy-d12fa31cf86d54b5e88e9b6169e758a8875da869.tar.gz
bbiy-d12fa31cf86d54b5e88e9b6169e758a8875da869.zip
remove dynamic coloring, recolor sprites
-rw-r--r--assets/image/flag.pngbin895 -> 985 bytes
-rw-r--r--assets/image/floor.pngbin1389 -> 1296 bytes
-rw-r--r--assets/image/grass.pngbin1073 -> 1090 bytes
-rw-r--r--assets/image/hedge.pngbin17841 -> 14592 bytes
-rw-r--r--assets/image/lava.pngbin310 -> 409 bytes
-rw-r--r--assets/image/rock.pngbin1486 -> 1288 bytes
-rw-r--r--assets/image/wall.pngbin1315 -> 1283 bytes
-rw-r--r--assets/image/water.pngbin367 -> 436 bytes
-rw-r--r--assets/image/wordBigBlue.pngbin1264 -> 1083 bytes
-rw-r--r--assets/image/wordFlag.pngbin453 -> 509 bytes
-rw-r--r--assets/image/wordIs.pngbin353 -> 490 bytes
-rw-r--r--assets/image/wordKill.pngbin1063 -> 1042 bytes
-rw-r--r--assets/image/wordLava.pngbin430 -> 492 bytes
-rw-r--r--assets/image/wordPush.pngbin463 -> 483 bytes
-rw-r--r--assets/image/wordRock.pngbin480 -> 517 bytes
-rw-r--r--assets/image/wordSink.pngbin479 -> 499 bytes
-rw-r--r--assets/image/wordStop.pngbin464 -> 490 bytes
-rw-r--r--assets/image/wordWall.pngbin408 -> 556 bytes
-rw-r--r--assets/image/wordWater.pngbin457 -> 506 bytes
-rw-r--r--assets/image/wordWin.pngbin366 -> 455 bytes
-rw-r--r--assets/image/wordYou.pngbin389 -> 448 bytes
-rw-r--r--src/entities/flag.js2
-rw-r--r--src/entities/floor.js2
-rw-r--r--src/entities/lava.js2
-rw-r--r--src/render/graphics.js8
-rw-r--r--src/render/sprites.js21
26 files changed, 3 insertions, 32 deletions
diff --git a/assets/image/flag.png b/assets/image/flag.png
index 10d1995..0a53d60 100644
--- a/assets/image/flag.png
+++ b/assets/image/flag.png
Binary files differ
diff --git a/assets/image/floor.png b/assets/image/floor.png
index 40f3f74..92ec9f7 100644
--- a/assets/image/floor.png
+++ b/assets/image/floor.png
Binary files differ
diff --git a/assets/image/grass.png b/assets/image/grass.png
index a1cc58a..1991e8c 100644
--- a/assets/image/grass.png
+++ b/assets/image/grass.png
Binary files differ
diff --git a/assets/image/hedge.png b/assets/image/hedge.png
index 3fc280d..9295e61 100644
--- a/assets/image/hedge.png
+++ b/assets/image/hedge.png
Binary files differ
diff --git a/assets/image/lava.png b/assets/image/lava.png
index 0e6bdd2..bf95837 100644
--- a/assets/image/lava.png
+++ b/assets/image/lava.png
Binary files differ
diff --git a/assets/image/rock.png b/assets/image/rock.png
index 8c560a6..ce108b0 100644
--- a/assets/image/rock.png
+++ b/assets/image/rock.png
Binary files differ
diff --git a/assets/image/wall.png b/assets/image/wall.png
index 772b93d..6912323 100644
--- a/assets/image/wall.png
+++ b/assets/image/wall.png
Binary files differ
diff --git a/assets/image/water.png b/assets/image/water.png
index 6e89b04..47703e0 100644
--- a/assets/image/water.png
+++ b/assets/image/water.png
Binary files differ
diff --git a/assets/image/wordBigBlue.png b/assets/image/wordBigBlue.png
index b01f726..6fc767e 100644
--- a/assets/image/wordBigBlue.png
+++ b/assets/image/wordBigBlue.png
Binary files differ
diff --git a/assets/image/wordFlag.png b/assets/image/wordFlag.png
index ba99ca1..d848902 100644
--- a/assets/image/wordFlag.png
+++ b/assets/image/wordFlag.png
Binary files differ
diff --git a/assets/image/wordIs.png b/assets/image/wordIs.png
index 129ae75..878e40c 100644
--- a/assets/image/wordIs.png
+++ b/assets/image/wordIs.png
Binary files differ
diff --git a/assets/image/wordKill.png b/assets/image/wordKill.png
index 8bfc048..e781260 100644
--- a/assets/image/wordKill.png
+++ b/assets/image/wordKill.png
Binary files differ
diff --git a/assets/image/wordLava.png b/assets/image/wordLava.png
index a479943..be23819 100644
--- a/assets/image/wordLava.png
+++ b/assets/image/wordLava.png
Binary files differ
diff --git a/assets/image/wordPush.png b/assets/image/wordPush.png
index f285609..bdf847e 100644
--- a/assets/image/wordPush.png
+++ b/assets/image/wordPush.png
Binary files differ
diff --git a/assets/image/wordRock.png b/assets/image/wordRock.png
index 104554f..6809956 100644
--- a/assets/image/wordRock.png
+++ b/assets/image/wordRock.png
Binary files differ
diff --git a/assets/image/wordSink.png b/assets/image/wordSink.png
index a13a754..8b06deb 100644
--- a/assets/image/wordSink.png
+++ b/assets/image/wordSink.png
Binary files differ
diff --git a/assets/image/wordStop.png b/assets/image/wordStop.png
index bf8a674..e8dc434 100644
--- a/assets/image/wordStop.png
+++ b/assets/image/wordStop.png
Binary files differ
diff --git a/assets/image/wordWall.png b/assets/image/wordWall.png
index a5acb36..24564a1 100644
--- a/assets/image/wordWall.png
+++ b/assets/image/wordWall.png
Binary files differ
diff --git a/assets/image/wordWater.png b/assets/image/wordWater.png
index ff779e4..5141d08 100644
--- a/assets/image/wordWater.png
+++ b/assets/image/wordWater.png
Binary files differ
diff --git a/assets/image/wordWin.png b/assets/image/wordWin.png
index 49fa279..0c018ea 100644
--- a/assets/image/wordWin.png
+++ b/assets/image/wordWin.png
Binary files differ
diff --git a/assets/image/wordYou.png b/assets/image/wordYou.png
index 47026af..a0613c5 100644
--- a/assets/image/wordYou.png
+++ b/assets/image/wordYou.png
Binary files differ
diff --git a/src/entities/flag.js b/src/entities/flag.js
index 09cb7bd..e13d2a2 100644
--- a/src/entities/flag.js
+++ b/src/entities/flag.js
@@ -1,6 +1,6 @@
game.createFlag = () => {
const flag = game.Entity();
- flag.addComponent(game.components.LoadPriority({priority: 2}));
+ flag.addComponent(game.components.LoadPriority({priority: 5}));
flag.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
flag.addComponent(game.components.Alive());
flag.addComponent(game.components.Sprite({spriteName: "flag"}))
diff --git a/src/entities/floor.js b/src/entities/floor.js
index 3f6b9f6..95cbcf2 100644
--- a/src/entities/floor.js
+++ b/src/entities/floor.js
@@ -1,6 +1,6 @@
game.createFloor = () => {
const floor = game.Entity();
- floor.addComponent(game.components.LoadPriority({priority: 5}));
+ floor.addComponent(game.components.LoadPriority({priority: 6}));
floor.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
floor.addComponent(game.components.Alive());
floor.addComponent(game.components.Sprite({spriteName: "floor"}))
diff --git a/src/entities/lava.js b/src/entities/lava.js
index e741f0d..4a88f69 100644
--- a/src/entities/lava.js
+++ b/src/entities/lava.js
@@ -1,6 +1,6 @@
game.createLava = () => {
const lava = game.Entity();
- lava.addComponent(game.components.LoadPriority({priority: 5}));
+ lava.addComponent(game.components.LoadPriority({priority: 6}));
lava.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
lava.addComponent(game.components.Alive());
lava.addComponent(game.components.Sprite({spriteName: "lava"}))
diff --git a/src/render/graphics.js b/src/render/graphics.js
index 06d0b2c..aa4195e 100644
--- a/src/render/graphics.js
+++ b/src/render/graphics.js
@@ -34,14 +34,6 @@ game.graphics = (
const col = Math.floor(currentFrame / rows);
context.drawImage(image, spriteX+col*spriteWidth, spriteY+row*spriteHeight, spriteWidth, spriteHeight, x, y, width, height);
- // apply color to sprite
- if (color) {
- context.globalAlpha=0.7;
- context.globalCompositeOperation="source-atop";
- context.fillStyle=color;
- context.fillRect(x, y, width, height);
- }
-
context.restore();
};
} else {
diff --git a/src/render/sprites.js b/src/render/sprites.js
index 9626b00..d8ae126 100644
--- a/src/render/sprites.js
+++ b/src/render/sprites.js
@@ -12,7 +12,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#ede285",
}),
floor: game.graphics.Sprite({
image: game.assets.floor,
@@ -20,7 +19,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#404040",
}),
hedge: game.graphics.Sprite({
image: game.assets.hedge,
@@ -28,7 +26,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 250,
- color: "#5c8339",
}),
grass: game.graphics.Sprite({
image: game.assets.grass,
@@ -36,7 +33,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#5c8339",
}),
lava: game.graphics.Sprite({
image: game.assets.lava,
@@ -44,7 +40,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#e49950",
}),
rock: game.graphics.Sprite({
image: game.assets.rock,
@@ -52,7 +47,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#90673e",
}),
wall: game.graphics.Sprite({
image: game.assets.wall,
@@ -60,7 +54,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#707070",
}),
water: game.graphics.Sprite({
image: game.assets.water,
@@ -68,7 +61,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#5f9dd1",
}),
wordBigBlue: game.graphics.Sprite({
image: game.assets.wordBigBlue,
@@ -76,7 +68,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#0f2439",
}),
wordFlag: game.graphics.Sprite({
image: game.assets.wordFlag,
@@ -84,7 +75,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#ede285",
}),
wordIs: game.graphics.Sprite({
image: game.assets.wordIs,
@@ -92,7 +82,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#ffffff",
}),
wordKill: game.graphics.Sprite({
image: game.assets.wordKill,
@@ -100,7 +89,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#e49950",
}),
wordLava: game.graphics.Sprite({
image: game.assets.wordLava,
@@ -108,7 +96,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#e49950",
}),
wordPush: game.graphics.Sprite({
image: game.assets.wordPush,
@@ -116,7 +103,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#90673e",
}),
wordRock: game.graphics.Sprite({
image: game.assets.wordRock,
@@ -124,7 +110,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#90673e",
}),
wordSink: game.graphics.Sprite({
image: game.assets.wordSink,
@@ -132,7 +117,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#5f9dd1",
}),
wordStop: game.graphics.Sprite({
image: game.assets.wordStop,
@@ -140,7 +124,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#252e0e",
}),
wordWall: game.graphics.Sprite({
image: game.assets.wordWall,
@@ -148,7 +131,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#707070",
}),
wordWater: game.graphics.Sprite({
image: game.assets.wordWater,
@@ -156,7 +138,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#5f9dd1",
}),
wordWin: game.graphics.Sprite({
image: game.assets.wordWin,
@@ -164,7 +145,6 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#ede285",
}),
wordYou: game.graphics.Sprite({
image: game.assets.wordYou,
@@ -172,6 +152,5 @@ game.sprites = {
spriteWidth: 24,
numFrames: 3,
timePerFrame: 100,
- color: "#0f2439",
}),
};