summaryrefslogtreecommitdiff
path: root/src/entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/bigblue.js2
-rw-r--r--src/entities/borderParticles.js7
-rw-r--r--src/entities/flag.js2
-rw-r--r--src/entities/floor.js2
-rw-r--r--src/entities/grass.js2
-rw-r--r--src/entities/hedge.js2
-rw-r--r--src/entities/lava.js3
-rw-r--r--src/entities/rock.js2
-rw-r--r--src/entities/wall.js4
-rw-r--r--src/entities/water.js8
-rw-r--r--src/entities/wordBigBlue.js2
-rw-r--r--src/entities/wordFlag.js2
-rw-r--r--src/entities/wordIs.js2
-rw-r--r--src/entities/wordKill.js2
-rw-r--r--src/entities/wordLava.js2
-rw-r--r--src/entities/wordPush.js2
-rw-r--r--src/entities/wordRock.js2
-rw-r--r--src/entities/wordSink.js2
-rw-r--r--src/entities/wordStop.js2
-rw-r--r--src/entities/wordWall.js2
-rw-r--r--src/entities/wordWater.js2
-rw-r--r--src/entities/wordWin.js2
-rw-r--r--src/entities/wordYou.js2
23 files changed, 27 insertions, 33 deletions
diff --git a/src/entities/bigblue.js b/src/entities/bigblue.js
index 02029a5..5b6af0f 100644
--- a/src/entities/bigblue.js
+++ b/src/entities/bigblue.js
@@ -3,7 +3,7 @@ game.createBigBlue = () => {
bigBlue.addComponent(game.components.LoadPriority({priority: 1}));
bigBlue.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
bigBlue.addComponent(game.components.Alive());
- bigBlue.sprite = game.sprites.bigBlue;
+ bigBlue.addComponent(game.components.Sprite({spriteName: "bigBlue"}))
// TODO: Remove this
bigBlue.addComponent(game.components.Controllable({controls: ['left', 'right', 'up', 'down']}));
diff --git a/src/entities/borderParticles.js b/src/entities/borderParticles.js
index a8d7036..34512bc 100644
--- a/src/entities/borderParticles.js
+++ b/src/entities/borderParticles.js
@@ -31,9 +31,7 @@ game.createBorderParticles = ({colors, maxAmount, minAmount, minLife, maxLife, m
}
return particle;
});
- particles.addComponent(game.components.LoadPriority({priority: 1}));
- particles.addComponent(game.components.Alive());
- particles.sprite = game.graphics.Sprite({
+ game.sprites.borderParticle = game.graphics.Sprite({
drawFunction: (elapsedTime, {x, y, width, height}, context) => {
particleSpecs.map((spec) => spec.elapsed += elapsedTime);
particleSpecs = particleSpecs.filter((spec) => spec.lifetime > spec.elapsed);
@@ -51,5 +49,8 @@ game.createBorderParticles = ({colors, maxAmount, minAmount, minLife, maxLife, m
});
}
})
+ particles.addComponent(game.components.LoadPriority({priority: 1}));
+ particles.addComponent(game.components.Alive());
+ particles.addComponent(game.components.Sprite({spriteName: "borderParticle"}))
return particles;
} \ No newline at end of file
diff --git a/src/entities/flag.js b/src/entities/flag.js
index 87daeb7..09cb7bd 100644
--- a/src/entities/flag.js
+++ b/src/entities/flag.js
@@ -3,6 +3,6 @@ game.createFlag = () => {
flag.addComponent(game.components.LoadPriority({priority: 2}));
flag.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
flag.addComponent(game.components.Alive());
- flag.sprite = game.sprites.flag;
+ flag.addComponent(game.components.Sprite({spriteName: "flag"}))
return flag;
}
diff --git a/src/entities/floor.js b/src/entities/floor.js
index d16392e..3f6b9f6 100644
--- a/src/entities/floor.js
+++ b/src/entities/floor.js
@@ -3,6 +3,6 @@ game.createFloor = () => {
floor.addComponent(game.components.LoadPriority({priority: 5}));
floor.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
floor.addComponent(game.components.Alive());
- floor.sprite = game.sprites.floor;
+ floor.addComponent(game.components.Sprite({spriteName: "floor"}))
return floor;
}
diff --git a/src/entities/grass.js b/src/entities/grass.js
index f731ef1..7f26712 100644
--- a/src/entities/grass.js
+++ b/src/entities/grass.js
@@ -3,6 +3,6 @@ game.createGrass = () => {
grass.addComponent(game.components.LoadPriority({priority: 6}));
grass.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
grass.addComponent(game.components.Alive());
- grass.sprite = game.sprites.grass;
+ grass.addComponent(game.components.Sprite({spriteName: "grass"}))
return grass;
}
diff --git a/src/entities/hedge.js b/src/entities/hedge.js
index 03ecb0f..90d069b 100644
--- a/src/entities/hedge.js
+++ b/src/entities/hedge.js
@@ -4,6 +4,6 @@ game.createHedge = () => {
hedge.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
hedge.addComponent(game.components.Stop({stop: true}));
hedge.addComponent(game.components.Alive());
- hedge.sprite = game.sprites.hedge;
+ hedge.addComponent(game.components.Sprite({spriteName: "hedge"}))
return hedge;
}
diff --git a/src/entities/lava.js b/src/entities/lava.js
index bd1ca04..e741f0d 100644
--- a/src/entities/lava.js
+++ b/src/entities/lava.js
@@ -1,10 +1,9 @@
game.createLava = () => {
- // TODO: Split this into two entities: water and lava
const lava = game.Entity();
lava.addComponent(game.components.LoadPriority({priority: 5}));
lava.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
lava.addComponent(game.components.Alive());
- lava.sprite = game.sprites.lava;
+ lava.addComponent(game.components.Sprite({spriteName: "lava"}))
return lava;
}
diff --git a/src/entities/rock.js b/src/entities/rock.js
index 7602ab6..4d73f8d 100644
--- a/src/entities/rock.js
+++ b/src/entities/rock.js
@@ -3,7 +3,7 @@ game.createRock = () => {
rock.addComponent(game.components.LoadPriority({priority: 2}));
rock.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
rock.addComponent(game.components.Alive());
- rock.sprite = game.sprites.rock;
+ rock.addComponent(game.components.Sprite({spriteName: "rock"}))
//TODO: Remove this
rock.addComponent(game.components.Pushable());
diff --git a/src/entities/wall.js b/src/entities/wall.js
index 84c9a91..af9aa1d 100644
--- a/src/entities/wall.js
+++ b/src/entities/wall.js
@@ -2,8 +2,8 @@ game.createWall = () => {
const wall = game.Entity();
wall.addComponent(game.components.LoadPriority({priority: 3}));
wall.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
- wall.addComponent(game.components.Stop({stop: true}));
+ wall.addComponent(game.components.Stop());
wall.addComponent(game.components.Alive());
- wall.sprite = game.sprites.wall;
+ wall.addComponent(game.components.Sprite({spriteName: "wall"}))
return wall;
}
diff --git a/src/entities/water.js b/src/entities/water.js
index abefd3f..7c160b0 100644
--- a/src/entities/water.js
+++ b/src/entities/water.js
@@ -3,12 +3,6 @@ game.createWater = () => {
water.addComponent(game.components.LoadPriority({priority: 5}));
water.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
water.addComponent(game.components.Alive());
- water.sprite = game.graphics.Sprite({
- image: game.assets.water,
- spriteHeight: 24,
- spriteWidth: 24,
- numFrames: 3,
- timePerFrame: 100,
- });
+ water.addComponent(game.components.Sprite({spriteName: "water"}))
return water;
}
diff --git a/src/entities/wordBigBlue.js b/src/entities/wordBigBlue.js
index 537c523..b6dd661 100644
--- a/src/entities/wordBigBlue.js
+++ b/src/entities/wordBigBlue.js
@@ -4,6 +4,6 @@ game.createWordBigBlue = () => {
wordBigBlue.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordBigBlue.addComponent(game.components.Pushable({pushable: true}));
wordBigBlue.addComponent(game.components.Alive());
- wordBigBlue.sprite = game.sprites.wordBigBlue;
+ wordBigBlue.addComponent(game.components.Sprite({spriteName: "wordBigBlue"}))
return wordBigBlue;
}
diff --git a/src/entities/wordFlag.js b/src/entities/wordFlag.js
index dd95845..bc2d782 100644
--- a/src/entities/wordFlag.js
+++ b/src/entities/wordFlag.js
@@ -4,6 +4,6 @@ game.createWordFlag = () => {
wordFlag.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordFlag.addComponent(game.components.Pushable({pushable: true}));
wordFlag.addComponent(game.components.Alive());
- wordFlag.sprite = game.sprites.wordFlag;
+ wordFlag.addComponent(game.components.Sprite({spriteName: "wordFlag"}))
return wordFlag;
}
diff --git a/src/entities/wordIs.js b/src/entities/wordIs.js
index ca00856..15bcbea 100644
--- a/src/entities/wordIs.js
+++ b/src/entities/wordIs.js
@@ -5,6 +5,6 @@ game.createWordIs = () => {
// wordIs.addComponent(game.components.Stop({stop: true}));
wordIs.addComponent(game.components.Pushable());
wordIs.addComponent(game.components.Alive());
- wordIs.sprite = game.sprites.wordIs;
+ wordIs.addComponent(game.components.Sprite({spriteName: "wordIs"}))
return wordIs;
}
diff --git a/src/entities/wordKill.js b/src/entities/wordKill.js
index 283ce90..8ea04d9 100644
--- a/src/entities/wordKill.js
+++ b/src/entities/wordKill.js
@@ -4,6 +4,6 @@ game.createWordKill = () => {
wordKill.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordKill.addComponent(game.components.Pushable({pushable: true}));
wordKill.addComponent(game.components.Alive());
- wordKill.sprite = game.sprites.wordKill;
+ wordKill.addComponent(game.components.Sprite({spriteName: "wordKill"}))
return wordKill;
}
diff --git a/src/entities/wordLava.js b/src/entities/wordLava.js
index dc50bf3..bb7a005 100644
--- a/src/entities/wordLava.js
+++ b/src/entities/wordLava.js
@@ -5,6 +5,6 @@ game.createWordLava = () => {
wordLava.addComponent(game.components.Pushable({pushable: true}));
wordLava.addComponent(game.components.Alive());
- wordLava.sprite = game.sprites.wordLava;
+ wordLava.addComponent(game.components.Sprite({spriteName: "wordLava"}))
return wordLava;
}
diff --git a/src/entities/wordPush.js b/src/entities/wordPush.js
index 20a4b8e..09478f6 100644
--- a/src/entities/wordPush.js
+++ b/src/entities/wordPush.js
@@ -4,6 +4,6 @@ game.createWordPush = () => {
wordPush.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordPush.addComponent(game.components.Pushable({pushable: true}));
wordPush.addComponent(game.components.Alive());
- wordPush.sprite = game.sprites.wordPush;
+ wordPush.addComponent(game.components.Sprite({spriteName: "wordPush"}))
return wordPush;
}
diff --git a/src/entities/wordRock.js b/src/entities/wordRock.js
index 96d8982..0897e35 100644
--- a/src/entities/wordRock.js
+++ b/src/entities/wordRock.js
@@ -4,6 +4,6 @@ game.createWordRock = () => {
wordRock.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordRock.addComponent(game.components.Pushable({pushable: true}));
wordRock.addComponent(game.components.Alive());
- wordRock.sprite = game.sprites.wordRock;
+ wordRock.addComponent(game.components.Sprite({spriteName: "wordRock"}))
return wordRock;
}
diff --git a/src/entities/wordSink.js b/src/entities/wordSink.js
index 2da3e07..decd480 100644
--- a/src/entities/wordSink.js
+++ b/src/entities/wordSink.js
@@ -4,6 +4,6 @@ game.createWordSink = () => {
wordSink.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordSink.addComponent(game.components.Pushable({pushable: true}));
wordSink.addComponent(game.components.Alive());
- wordSink.sprite = game.sprites.wordSink;
+ wordSink.addComponent(game.components.Sprite({spriteName: "wordSink"}))
return wordSink;
}
diff --git a/src/entities/wordStop.js b/src/entities/wordStop.js
index 0f6f97a..6eb79ea 100644
--- a/src/entities/wordStop.js
+++ b/src/entities/wordStop.js
@@ -4,6 +4,6 @@ game.createWordStop = () => {
wordStop.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordStop.addComponent(game.components.Pushable({pushable: true}));
wordStop.addComponent(game.components.Alive());
- wordStop.sprite = game.sprites.wordStop;
+ wordStop.addComponent(game.components.Sprite({spriteName: "wordStop"}))
return wordStop;
}
diff --git a/src/entities/wordWall.js b/src/entities/wordWall.js
index 4dac235..ea7068f 100644
--- a/src/entities/wordWall.js
+++ b/src/entities/wordWall.js
@@ -4,6 +4,6 @@ game.createWordWall = () => {
wordWall.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordWall.addComponent(game.components.Pushable({pushable: true}));
wordWall.addComponent(game.components.Alive());
- wordWall.sprite = game.sprites.wordWall;
+ wordWall.addComponent(game.components.Sprite({spriteName: "wordWall"}))
return wordWall;
}
diff --git a/src/entities/wordWater.js b/src/entities/wordWater.js
index e6272d1..c6404bf 100644
--- a/src/entities/wordWater.js
+++ b/src/entities/wordWater.js
@@ -4,6 +4,6 @@ game.createWordWater = () => {
wordWater.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordWater.addComponent(game.components.Pushable({pushable: true}));
wordWater.addComponent(game.components.Alive());
- wordWater.sprite = game.sprites.wordWater;
+ wordWater.addComponent(game.components.Sprite({spriteName: "wordWater"}))
return wordWater;
}
diff --git a/src/entities/wordWin.js b/src/entities/wordWin.js
index a3830b9..ed837d0 100644
--- a/src/entities/wordWin.js
+++ b/src/entities/wordWin.js
@@ -4,6 +4,6 @@ game.createWordWin = () => {
wordWin.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordWin.addComponent(game.components.Pushable({pushable: true}));
wordWin.addComponent(game.components.Alive());
- wordWin.sprite = game.sprites.wordWin;
+ wordWin.addComponent(game.components.Sprite({spriteName: "wordWin"}))
return wordWin;
}
diff --git a/src/entities/wordYou.js b/src/entities/wordYou.js
index 49a0044..89a3723 100644
--- a/src/entities/wordYou.js
+++ b/src/entities/wordYou.js
@@ -4,6 +4,6 @@ game.createWordYou = () => {
wordYou.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
wordYou.addComponent(game.components.Pushable({pushable: true}));
wordYou.addComponent(game.components.Alive());
- wordYou.sprite = game.sprites.wordYou;
+ wordYou.addComponent(game.components.Sprite({spriteName: "wordYou"}))
return wordYou;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-09-21 02:41:48 +0000