Add effect images and target height indicator asset

src/block.rs

@@ -360,7 +360,7 @@ impl Block {
             .id();
 
         if let Some(effect) = effect_type {
-            effect.enable(&mut commands, assets, entity);
+            effect.enable(&mut commands, assets, entity, block_type);
         }
         entity
     }

src/effect/glue.rs

@@ -3,7 +3,8 @@ use std::mem;
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
 
-use crate::block::{CaughtBlock, FallingBlockCollision};
+use crate::block::{Block, CaughtBlock, FallingBlockCollision};
+use crate::effect::glue_texture;
 
 pub struct GluePlugin;
 
@@ -35,8 +36,11 @@ impl Default for GlueEffectPhase {
 pub struct GlueJoint;
 
 pub fn collect_glue_list_system(
+    mut commands: Commands,
     mut event_reader: EventReader<FallingBlockCollision>,
     mut query: Query<(Entity, &mut GlueEffect)>,
+    hit_query: Query<(Entity, &Block)>,
+    assets: Res<AssetServer>,
 ) {
     for event in event_reader.read() {
         let FallingBlockCollision { falling, hit } = event;
@@ -45,6 +49,26 @@ pub fn collect_glue_list_system(
             if let GlueEffectPhase::Gluing { targets } = &mut glue_effect.0 {
                 if !targets.contains(hit) {
                     targets.push(*hit);
+
+                    if let Ok((hit, block)) = hit_query.get(*hit) {
+                        commands.entity(hit).with_children(|parent| {
+                            parent.spawn(
+                                (SpriteBundle {
+                                    transform: Transform::from_xyz(0.0, 0.0, 1.0),
+                                    texture: assets.load(glue_texture(block.block_type)),
+                                    sprite: Sprite {
+                                        custom_size: Some(Vec2::new(
+                                            block.block_type.width(),
+                                            block.block_type.height(),
+                                        )),
+                                        color: Color::rgba(1.0, 1.0, 1.0, 0.5),
+                                        ..Default::default()
+                                    },
+                                    ..Default::default()
+                                }),
+                            );
+                        });
+                    }
                 }
             }
         }

src/effect/mod.rs

@@ -1,6 +1,8 @@
+use bevy::prelude::*;
+
+use crate::block::BlockType;
 use crate::effect::glue::GlueEffect;
 use crate::effect::platform::PlatformEffect;
-use bevy::prelude::*;
 
 pub mod glue;
 pub mod magnetic;
@@ -30,12 +32,18 @@ pub const ALL_EFFECTS: [EffectType; 3] =
 
 pub const DEFAULT_EFFECTS: [EffectType; 2] = [EffectType::Glue, EffectType::Magnetic];
 
+pub fn glue_texture(block_type: BlockType) -> String {
+    format!("effects/glue/{}.png", block_type.letter().to_lowercase())
+}
+
 impl EffectType {
-    pub fn texture(&self) -> &'static str {
+    pub fn texture(&self, block_type: BlockType) -> String {
         match self {
-            EffectType::Glue => "glue.png",
-            EffectType::Platform => "fixed.png",
-            EffectType::Magnetic => "magnet.png",
+            EffectType::Glue => glue_texture(block_type),
+            EffectType::Platform => "fixed.png".to_string(),
+            EffectType::Magnetic => {
+                format!("effects/magnet/{}.png", block_type.letter().to_lowercase())
+            }
         }
     }
 
@@ -55,14 +63,22 @@ impl EffectType {
         }
     }
 
-    pub fn enable(&self, commands: &mut Commands, assets: &AssetServer, entity: Entity) {
+    pub fn enable(
+        &self,
+        commands: &mut Commands,
+        assets: &AssetServer,
+        entity: Entity,
+        block_type: BlockType,
+    ) {
         self.insert_effect(commands, entity);
-        let texture = self.texture();
+        let texture = self.texture(block_type);
         commands.entity(entity).with_children(|parent| {
             parent.spawn(SpriteBundle {
+                transform: Transform::from_xyz(0.0, 0.0, 1.0),
                 texture: assets.load(texture),
                 sprite: Sprite {
-                    custom_size: Some(Vec2::new(1.0, 1.0)),
+                    custom_size: Some(Vec2::new(block_type.width(), block_type.height())),
+                    color: Color::rgba(1.0, 1.0, 1.0, 0.75),
                     ..Default::default()
                 },
                 ..Default::default()

src/level.rs

@@ -118,7 +118,7 @@ pub const DEFAULT_LEVEL: Level = Level {
         ..default_level_base()
     }],
     enabled_effects: &DEFAULT_EFFECTS,
-    effect_likelihood: 0.05,
+    effect_likelihood: 0.5,
     intro_text: "Welcome to the game!",
     rain: None,
     friction: 0.5,

src/target_height_indicator.rs

@@ -1,3 +1,4 @@
+use crate::ASSET_SCALE;
 use bevy::prelude::*;
 
 use crate::level::{Level, LevelGoal, LevelLifecycle};
@@ -21,6 +22,7 @@ pub fn setup_target_height_indicator(
     mut commands: Commands,
     mut level: Res<Level>,
     old_indicator: Query<Entity, With<TargetHeightIndicator>>,
+    assets: Res<AssetServer>,
 ) {
     println!("Setting up target height indicator");
     for entity in old_indicator.iter() {
@@ -32,12 +34,12 @@ pub fn setup_target_height_indicator(
             TargetHeightIndicator,
             LevelLifecycle,
             SpriteBundle {
-                sprite: Sprite {
-                    custom_size: Some(Vec2::new(1000.0, 0.1)),
-                    color: Color::rgb(1.0, 0.0, 0.0),
-                    ..Default::default()
-                },
-                transform: Transform::from_xyz(0.0, height, 0.0),
+                transform: Transform::from_xyz(0.0, height, 5.0).with_scale(Vec3::new(
+                    ASSET_SCALE,
+                    ASSET_SCALE * 0.5,
+                    1.0,
+                )),
+                texture: assets.load("target_height_indicator.png"),
                 ..Default::default()
             },
         ));