From 297811e8825dbbe468d09fe83c281371e07754a7 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Wed, 24 Aug 2022 12:21:08 +0200
Subject: [PATCH 01/13] Platform material & filter bundle

---
 src/filters.rs       | 20 +++++++++++++++++
 src/game.rs          |  2 ++
 src/levels.rs        |  3 +++
 src/levels/level0.rs | 19 +++++++++++-----
 src/levels/level1.rs | 53 ++++++++++++++++++++++++++++++++++++++------
 src/main.rs          | 17 +++++++-------
 6 files changed, 93 insertions(+), 21 deletions(-)
 create mode 100644 src/filters.rs

diff --git a/src/filters.rs b/src/filters.rs
new file mode 100644
index 0000000..a4439c4
--- /dev/null
+++ b/src/filters.rs
@@ -0,0 +1,20 @@
+use bevy::prelude::*;
+use bevy_rapier2d::prelude::*;
+
+#[derive(Component, Default)]
+pub struct FilterColor(pub Color);
+
+#[derive(Component)]
+pub enum PassThroughFilter {
+	Absorbing,
+}
+
+#[derive(Bundle)]
+pub struct AbsorbingFilter {
+	pub color: FilterColor,
+	#[bundle]
+	pub mesh: ColorMesh2dBundle,
+	pub collider: Collider,
+	pub sensor: Sensor,
+	pub filter_type: PassThroughFilter,
+}
diff --git a/src/game.rs b/src/game.rs
index b9ca210..908752a 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -1,6 +1,8 @@
 #![allow(clippy::precedence)]
 #![allow(clippy::too_many_arguments)]
 
+pub use crate::filters::*;
+
 use crate::AppState;
 
 use bevy::{
diff --git a/src/levels.rs b/src/levels.rs
index fbe3ff8..0d2ce89 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -36,6 +36,7 @@ pub fn despawn_level(mut commands: Commands, level_query: Query<Entity, With<Lev
 pub fn post_setup_level(
 	mut commands: Commands,
 	character_meshes: Res<CharacterMeshes>,
+	mut meshes: ResMut<Assets<Mesh>>,
 	mut materials: ResMut<Assets<ColorMaterial>>,
 	current_level: Res<CurrentLevel>,
 	mut level_startup_event: EventReader<LevelStartupEvent>,
@@ -47,12 +48,14 @@ pub fn post_setup_level(
 			match level_id.0 {
 				0 => level0::setup(
 					&mut commands,
+					&mut meshes,
 					&character_meshes,
 					&mut materials,
 					&audio,
 				),
 				1 => level1::setup(
 					&mut commands,
+					&mut meshes,
 					&character_meshes,
 					&mut materials,
 					&audio,
diff --git a/src/levels/level0.rs b/src/levels/level0.rs
index 01b13a4..6cec4c4 100644
--- a/src/levels/level0.rs
+++ b/src/levels/level0.rs
@@ -1,19 +1,28 @@
 use crate::game::*;
 
-use bevy::prelude::*;
+use bevy::prelude::{shape::Quad, *};
 use bevy_rapier2d::prelude::*;
 
 pub fn setup(
 	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
 	character_meshes: &Res<CharacterMeshes>,
 	materials: &mut ResMut<Assets<ColorMaterial>>,
-	// selected_character_id: &mut Mut<SelectedCharacterId>,
-	// character_id_list: &mut Mut<CharacterIdList>,
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
 	commands
-		.spawn_bundle(TransformBundle::from(Transform::from_xyz(0.0, -256.0, 0.0)))
-		.insert(Collider::cuboid(400., 10.))
+		.spawn_bundle(ColorMesh2dBundle {
+			mesh: meshes
+				.add(Mesh::from(Quad {
+					size: Vec2 { x: 800.0, y: 16.0 },
+					flip: false,
+				}))
+				.into(),
+			material: materials.add(ColorMaterial::from(Color::GRAY)),
+			transform: Transform::from_xyz(0.0, -256.0, 0.0),
+			..default()
+		})
+		.insert(Collider::cuboid(400., 8.))
 		.insert(Level);
 
 	spawn_character(
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
index 3efdebf..4699cb1 100644
--- a/src/levels/level1.rs
+++ b/src/levels/level1.rs
@@ -1,23 +1,42 @@
 use crate::game::*;
 
-use bevy::prelude::*;
+use bevy::prelude::{shape::Quad, *};
 use bevy_rapier2d::prelude::*;
 
 pub fn setup(
 	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
 	character_meshes: &Res<CharacterMeshes>,
 	materials: &mut ResMut<Assets<ColorMaterial>>,
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
 	commands
-		.spawn_bundle(TransformBundle::from(Transform::from_xyz(0.0, -256.0, 0.0)))
-		.insert(Collider::cuboid(400., 10.))
+		.spawn_bundle(ColorMesh2dBundle {
+			mesh: meshes
+				.add(Mesh::from(Quad {
+					size: Vec2 { x: 800.0, y: 16.0 },
+					flip: false,
+				}))
+				.into(),
+			material: materials.add(ColorMaterial::from(Color::GRAY)),
+			transform: Transform::from_xyz(0.0, -256.0, 0.0),
+			..default()
+		})
+		.insert(Collider::cuboid(400., 8.))
 		.insert(Level);
 	commands
-		.spawn_bundle(TransformBundle::from(Transform::from_xyz(
-			256.0, -128.0, 0.0,
-		)))
-		.insert(Collider::cuboid(200., 10.))
+		.spawn_bundle(ColorMesh2dBundle {
+			mesh: meshes
+				.add(Mesh::from(Quad {
+					size: Vec2 { x: 400.0, y: 16.0 },
+					flip: false,
+				}))
+				.into(),
+			material: materials.add(ColorMaterial::from(Color::GRAY)),
+			transform: Transform::from_xyz(256.0, -128.0, 0.0),
+			..default()
+		})
+		.insert(Collider::cuboid(200., 8.))
 		.insert(Level);
 
 	spawn_character(
@@ -47,4 +66,24 @@ pub fn setup(
 		Color::GREEN,
 		false,
 	);
+
+	commands
+		.spawn_bundle(AbsorbingFilter {
+			color: FilterColor(Color::RED),
+			mesh: ColorMesh2dBundle {
+				mesh: meshes
+					.add(Mesh::from(Quad {
+						size: Vec2 { x: 128.0, y: 16.0 },
+						flip: false,
+					}))
+					.into(),
+				material: materials.add(Color::rgba(1., 0., 0., 0.5).into()),
+				transform: Transform::from_xyz(0., 0., 2.),
+				..Default::default()
+			},
+			collider: Collider::cuboid(64., 8.),
+			sensor: Sensor,
+			filter_type: PassThroughFilter::Absorbing,
+		})
+		.insert(Level);
 }
diff --git a/src/main.rs b/src/main.rs
index 7a19dab..b7fbbc2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,12 @@
 #[cfg(not(target_arch = "wasm32"))]
 mod audio;
+mod filters;
 mod game;
 mod levels;
 mod menu;
 mod particle_effect;
 
-use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*};
+use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
@@ -23,15 +24,18 @@ fn main() {
 	std::thread::spawn(move || audio::setup(audio_event_receiver));
 
 	App::new()
+		.insert_resource(Msaa { samples: 4 })
 		.insert_resource(audio_event_sender)
 		.add_state(AppState::Menu)
+		.insert_resource(ClearColor(Color::BLACK))
 		.add_plugins(DefaultPlugins)
 		.add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(64.0))
-		.add_plugin(RapierDebugRenderPlugin::default())
+		//.add_plugin(RapierDebugRenderPlugin::default())
 		.add_plugin(menu::MenuPlugin)
 		.add_plugin(game::GamePlugin)
 		.add_plugin(particle_effect::ParticleEffectPlugin)
-		.add_plugin(bevy_inspector_egui::WorldInspectorPlugin::new())
+		//.add_plugin(bevy_inspector_egui::WorldInspectorPlugin::new())
+		.add_system(bevy::window::close_on_esc)
 		.add_startup_system(setup)
 		.run();
 }
@@ -43,12 +47,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 	let font: Handle<Font> = asset_server.load("UacariLegacy-Thin.ttf");
 	commands.insert_resource(font);
 
-	commands.spawn_bundle(Camera2dBundle {
-		camera_2d: Camera2d {
-			clear_color: ClearColorConfig::Custom(Color::BLACK),
-		},
-		..Default::default()
-	});
+	commands.spawn_bundle(Camera2dBundle::default());
 	commands.insert_resource(AmbientLight {
 		color: Color::WHITE,
 		brightness: 0.6,

From ec7d04c8c82a0b415ed3c1e24f33d5019de8de45 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Wed, 24 Aug 2022 14:51:49 +0200
Subject: [PATCH 02/13] Audio: switch, fusion

---
 assets/init.hxy |  2 +-
 src/audio.rs    | 16 +++++++++++++++-
 src/game.rs     |  7 +++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/assets/init.hxy b/assets/init.hxy
index 8ba0f92..3700a2f 100644
--- a/assets/init.hxy
+++ b/assets/init.hxy
@@ -1 +1 @@
-{"VERSION":2,"atoms":[["tseq",0,"cmode",["i",0]],["sfilter",0,"ftype",["i",8]],["delay",0,"mode",["i",0]],["delay",1,"mode",["i",0]],["out",0,"mono",["i",0]],["ad",0,"mult",["i",0]],["amp",0,"neg_att",["i",1]],["amp",1,"neg_att",["i",1]],["bosc",0,"wtype",["i",3]]],"cells":[["sin",1,1,2,[-1,-1,-1],[-1,"sig",-1]],["sin",0,1,3,[-1,-1,-1],["sig",-1,-1]],["sin",2,2,2,[-1,-1,-1],[-1,-1,"sig"]],["mix3",0,2,3,["ch3","ch2","ch1"],[-1,"sig",-1]],["ad",0,3,3,[-1,"inp",-1],[-1,"sig","sig"]],["amp",0,3,4,["inp",-1,-1],[-1,"sig",-1]],["amp",1,4,4,[-1,"inp",-1],[-1,-1,"sig"]],["out",0,4,5,["ch2","ch1",-1],[-1,-1,-1]]],"params":[["ad",0,"ashp",0.8149999976158142],["ad",0,"atk",15.0],["amp",0,"att",1.0],["amp",1,"att",1.0],["mix3",0,"ch1",0.0],["out",0,"ch1",0.0],["mix3",0,"ch2",0.0],["out",0,"ch2",0.0],["mix3",0,"ch3",0.0],["tseq",0,"clock",0.0],["ad",0,"dcy",1000.0],["sin",0,"det",0.0],["sin",1,"det",4.0],["sin",2,"det",7.0],["bosc",0,"det",0.0],["ad",0,"dshp",0.19500002264976501],["delay",0,"fb",0.6499999761581421],["delay",1,"fb",0.5999999642372131],["sin",0,"freq",440.0,0.0],["sin",1,"freq",440.0],["sin",2,"freq",440.0],["bosc",0,"freq",440.0],["sfilter",0,"freq",1900.0001220703125],["amp",0,"gain",0.9999999403953552],["amp",1,"gain",0.9999999403953552],["out",0,"gain",0.08999998867511749],["mix3",0,"gain1",0.9999999403953552],["mix3",0,"gain2",0.9999999403953552],["mix3",0,"gain3",0.9999999403953552],["amp",0,"inp",0.0],["amp",1,"inp",0.0],["ad",0,"inp",1.0],["delay",0,"inp",0.0],["delay",1,"inp",0.0],["sfilter",0,"inp",0.0],["delay",0,"mix",0.5],["delay",1,"mix",0.5],["mix3",0,"ogain",0.9999999403953552],["bosc",0,"pw",0.5,-0.25999999046325684],["sfilter",0,"res",0.5],["tslfo",0,"rev",0.5],["tslfo",1,"rev",0.5],["tslfo",2,"rev",0.5],["tslfo",3,"rev",0.5],["tslfo",0,"time",1699.99951171875],["tslfo",1,"time",22999.99609375],["tslfo",2,"time",19999.994140625],["tslfo",3,"time",499.99993896484375],["delay",0,"time",256.70001220703125,0.009999999776482582],["delay",1,"time",249.99998474121094,-0.007999999448657036],["tseq",0,"trig",0.0],["ad",0,"trig",0.0],["tslfo",0,"trig",0.0],["tslfo",1,"trig",0.0],["tslfo",2,"trig",0.0],["tslfo",3,"trig",0.0],["delay",0,"trig",0.0],["delay",1,"trig",0.0]],"patterns":[{"col_types":[1,3,0,0,0,0],"cursor_col":2,"cursor_row":2,"data":[[60,4071,-1,-1,-1,-1],[64,4071,-1,-1,-1,-1],[69,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[72,4071,-1,-1,-1,-1],[76,4071,-1,-1,-1,-1],[84,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[60,4071,-1,-1,-1,-1],[64,4071,-1,-1,-1,-1],[79,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[72,4071,-1,-1,-1,-1],[76,4071,-1,-1,-1,-1],[65,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1]],"edit_step":4,"rows":16},null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],"props":[]}
+{"VERSION":2,"atoms":[["tseq",0,"cmode",["i",0]],["sfilter",0,"ftype",["i",13]],["sfilter",1,"ftype",["i",6]],["sfilter",2,"ftype",["i",7]],["quant",0,"keys",["i",0]],["delay",0,"mode",["i",0]],["delay",1,"mode",["i",0]],["comb",0,"mode",["i",0]],["noise",0,"mode",["i",0]],["out",0,"mono",["i",0]],["ad",0,"mult",["i",0]],["ad",1,"mult",["i",1]],["ad",2,"mult",["i",0]],["ad",3,"mult",["i",0]],["amp",0,"neg_att",["i",1]],["amp",1,"neg_att",["i",1]],["amp",2,"neg_att",["i",1]],["amp",3,"neg_att",["i",1]],["bosc",0,"wtype",["i",3]]],"cells":[["ad",2,3,5,["trig",-1,-1],[-1,"sig","sig"]],["sin",1,4,3,[-1,-1,-1],[-1,"sig",-1]],["sin",0,4,4,[-1,-1,-1],["sig",-1,-1]],["ad",3,4,5,[-1,"trig",-1],["sig",-1,-1]],["amp",3,4,6,[-1,"inp","gain"],["sig",-1,-1]],["sin",2,5,2,[-1,-1,-1],[-1,-1,"sig"]],["mix3",0,5,3,["ch3","ch2","ch1"],["sig","sig","sig"]],["mix3",1,5,4,["ch1",-1,"gain1"],[-1,"sig",-1]],["mix3",5,5,5,[-1,-1,"ch1"],["sig",-1,-1]],["noise",0,6,2,[-1,-1,-1],[-1,-1,"sig"]],["sfilter",0,6,3,["freq",-1,"inp"],[-1,"sig",-1]],["ad",0,6,4,[-1,"inp",-1],[-1,"sig",-1]],["sfilter",1,6,5,[-1,"inp","freq"],[-1,"sig",-1]],["ad",1,7,3,[-1,"inp",-1],[-1,-1,"sig"]],["mix3",2,7,4,["ch2","ch1",-1],[-1,-1,"sig"]],["mix3",4,7,5,["ch1","ch2",-1],[-1,"sig","sig"]],["amp",0,7,6,["inp",-1,-1],[-1,"sig",-1]],["amp",1,8,6,[-1,"inp",-1],[-1,-1,"sig"]],["out",0,8,7,["ch2","ch1",-1],[-1,-1,-1]]],"params":[["ad",0,"ashp",0.8149999976158142],["ad",1,"ashp",0.41499999165534973],["ad",2,"ashp",0.36000004410743713],["ad",3,"ashp",1.0],["ad",0,"atk",15.0],["ad",1,"atk",8.0],["ad",2,"atk",1000.0],["ad",3,"atk",775.0],["amp",0,"att",1.0],["amp",1,"att",1.0],["amp",2,"att",0.390625],["amp",3,"att",1.0],["noise",0,"atv",0.1300000101327896],["mix3",0,"ch1",0.0],["mix3",1,"ch1",0.0],["mix3",2,"ch1",0.0],["mix3",3,"ch1",0.0],["mix3",4,"ch1",0.0],["mix3",5,"ch1",0.0],["out",0,"ch1",0.0],["mix3",0,"ch2",0.0],["mix3",1,"ch2",0.0],["mix3",2,"ch2",0.0],["mix3",3,"ch2",0.0],["mix3",4,"ch2",0.0],["mix3",5,"ch2",0.0],["out",0,"ch2",0.0],["mix3",0,"ch3",0.0],["mix3",1,"ch3",0.0],["mix3",2,"ch3",0.0],["mix3",3,"ch3",0.0],["mix3",4,"ch3",0.0],["mix3",5,"ch3",0.0],["tseq",0,"clock",0.0],["ad",0,"dcy",1000.0],["ad",1,"dcy",347.9999694824219],["ad",2,"dcy",488.9999694824219],["ad",3,"dcy",18.999998092651367],["sin",0,"det",0.0],["sin",1,"det",4.0],["sin",2,"det",7.0],["sin",3,"det",-0.0],["bosc",0,"det",0.0],["ad",0,"dshp",0.19500002264976501],["ad",1,"dshp",0.14000003039836884],["ad",2,"dshp",0.875],["ad",3,"dshp",0.2849999964237213],["delay",0,"fb",0.6499999761581421],["delay",1,"fb",0.5999999642372131],["quant",0,"freq",577.044189453125],["sin",0,"freq",440.0,0.0],["sin",1,"freq",440.0],["sin",2,"freq",440.0],["sin",3,"freq",0.4296875],["bosc",0,"freq",440.0],["sfilter",0,"freq",1900.0001220703125],["sfilter",1,"freq",440.0],["sfilter",2,"freq",880.0],["comb",0,"g",0.699999988079071],["amp",0,"gain",0.9999999403953552],["amp",1,"gain",0.9999999403953552],["amp",2,"gain",0.9999999403953552],["amp",3,"gain",0.42320001125335693],["out",0,"gain",0.08999998867511749],["mix3",0,"gain1",0.9999999403953552],["mix3",1,"gain1",0.9999999403953552],["mix3",2,"gain1",0.9999999403953552],["mix3",3,"gain1",0.7616416215896606],["mix3",4,"gain1",0.9999999403953552],["mix3",5,"gain1",0.9999999403953552],["mix3",0,"gain2",0.9999999403953552],["mix3",1,"gain2",0.9999999403953552],["mix3",2,"gain2",0.9999999403953552],["mix3",3,"gain2",0.9999999403953552],["mix3",4,"gain2",2.0],["mix3",5,"gain2",0.9999999403953552],["mix3",0,"gain3",0.9999999403953552],["mix3",1,"gain3",0.9999999403953552],["mix3",2,"gain3",0.9999999403953552],["mix3",3,"gain3",0.9999999403953552],["mix3",4,"gain3",0.9999999403953552],["mix3",5,"gain3",0.9999999403953552],["amp",0,"inp",0.0],["amp",1,"inp",0.0],["amp",2,"inp",0.0],["amp",3,"inp",0.0],["ad",0,"inp",1.0],["ad",1,"inp",1.0],["ad",2,"inp",1.0],["ad",3,"inp",1.0],["delay",0,"inp",0.0],["delay",1,"inp",0.0],["comb",0,"inp",0.0],["sfilter",0,"inp",0.0],["sfilter",1,"inp",0.0],["sfilter",2,"inp",0.0],["delay",0,"mix",0.5],["delay",1,"mix",0.5],["quant",0,"oct",0.0],["noise",0,"offs",0.0],["mix3",0,"ogain",0.9999999403953552],["mix3",1,"ogain",0.10315494984388351],["mix3",2,"ogain",0.9999999403953552],["mix3",3,"ogain",0.9999999403953552],["mix3",4,"ogain",0.9999999403953552],["mix3",5,"ogain",0.9999999403953552],["bosc",0,"pw",0.5,-0.25999999046325684],["sfilter",0,"res",0.5],["sfilter",1,"res",0.9099999666213989],["sfilter",2,"res",0.0],["tslfo",0,"rev",0.5],["tslfo",1,"rev",0.5],["tslfo",2,"rev",0.5],["tslfo",3,"rev",0.5],["tslfo",0,"time",1699.99951171875],["tslfo",1,"time",22999.99609375],["tslfo",2,"time",19999.994140625],["tslfo",3,"time",499.99993896484375],["delay",0,"time",256.70001220703125,0.009999999776482582],["delay",1,"time",249.99998474121094,-0.007999999448657036],["comb",0,"time",24.999996185302734],["tseq",0,"trig",0.0],["ad",0,"trig",0.0],["ad",1,"trig",0.0],["ad",2,"trig",0.0],["ad",3,"trig",0.0],["tslfo",0,"trig",0.0],["tslfo",1,"trig",0.0],["tslfo",2,"trig",0.0],["tslfo",3,"trig",0.0],["delay",0,"trig",0.0],["delay",1,"trig",0.0]],"patterns":[{"col_types":[1,3,0,0,0,0],"cursor_col":2,"cursor_row":2,"data":[[60,4071,-1,-1,-1,-1],[64,4071,-1,-1,-1,-1],[69,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[72,4071,-1,-1,-1,-1],[76,4071,-1,-1,-1,-1],[84,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[60,4071,-1,-1,-1,-1],[64,4071,-1,-1,-1,-1],[79,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[72,4071,-1,-1,-1,-1],[76,4071,-1,-1,-1,-1],[65,4071,-1,-1,-1,-1],[-1,4071,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1]],"edit_step":4,"rows":16},null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],"props":[]}
diff --git a/src/audio.rs b/src/audio.rs
index f8400f6..767b309 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -33,9 +33,18 @@ pub fn setup(event_channel: Receiver<AudioMsg>) {
 		let color_mix_b_gain = color_mix.inp_param("gain3").unwrap();
 		let jump_ad = NodeId::Ad(0);
 		let jump_ad_trig = jump_ad.inp_param("trig").unwrap();
+		let switch_ad = NodeId::Ad(1);
+		let switch_ad_trig = switch_ad.inp_param("trig").unwrap();
+		let fusion_ad = NodeId::Ad(2);
+		let fusion_ad_trig = fusion_ad.inp_param("trig").unwrap();
+		let fusion_ad2 = NodeId::Ad(3);
+		let fusion_ad2_trig = fusion_ad2.inp_param("trig").unwrap();
 
-		for (_tick, _now) in Clock::framerate(10.0).iter() {
+		for (_tick, _now) in Clock::framerate(20.0).iter() {
 			matrix.set_param(jump_ad_trig, (0.0).into());
+			matrix.set_param(switch_ad_trig, (0.0).into());
+			matrix.set_param(fusion_ad_trig, (0.0).into());
+			matrix.set_param(fusion_ad2_trig, (0.0).into());
 
 			if let Ok(msg) = event_channel.try_recv() {
 				match msg {
@@ -44,7 +53,12 @@ pub fn setup(event_channel: Receiver<AudioMsg>) {
 						matrix.set_param(color_mix_g_gain, g.into());
 						matrix.set_param(color_mix_b_gain, b.into());
 					}
+					AudioMsg::Fusion => {
+						matrix.set_param(fusion_ad_trig, (1.0).into());
+						matrix.set_param(fusion_ad2_trig, (1.0).into());
+					}
 					AudioMsg::Jump => matrix.set_param(jump_ad_trig, (1.0).into()),
+					AudioMsg::Switch => matrix.set_param(switch_ad_trig, (1.0).into()),
 				}
 			}
 		}
diff --git a/src/game.rs b/src/game.rs
index 908752a..820b3ad 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -14,7 +14,9 @@ use bevy_rapier2d::prelude::*;
 
 pub enum AudioMsg {
 	Color([f32; 3]),
+	Fusion,
 	Jump,
+	Switch,
 }
 
 #[derive(Clone, Copy, Eq, Hash, PartialEq)]
@@ -199,7 +201,6 @@ fn collision_event_system(
 					Ok((c2_color, c2_transform, c2_player))) =
 					(character_query.get(*e1), character_query.get(*e2))
 				{
-					// TODO completely remove particles
 					commands.entity(*e1).despawn_recursive();
 					commands.entity(*e2).despawn_recursive();
 
@@ -235,6 +236,8 @@ fn collision_event_system(
 							true,
 						);
 					}
+					
+					audio.send(AudioMsg::Fusion).ok();
 				}
 			}
 		}
@@ -276,7 +279,7 @@ fn change_character_system(
 			audio
 				.send(AudioMsg::Color([color.0.r(), color.0.g(), color.0.b()]))
 				.ok();
-            audio.send(AudioMsg::Jump).ok();
+            audio.send(AudioMsg::Switch).ok();
 		}
 
 		player_count += 1;

From b42a032cfdc809732f849d9cf175a102a9034bee Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Wed, 24 Aug 2022 18:51:18 +0200
Subject: [PATCH 03/13] fix: character fusion without player

---
 src/game.rs          | 119 +++++++++++++++++++------------------------
 src/levels.rs        |   7 +--
 src/levels/level0.rs |  28 +++-------
 src/levels/level1.rs |  28 +++-------
 4 files changed, 67 insertions(+), 115 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 820b3ad..a265f88 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -6,9 +6,10 @@ pub use crate::filters::*;
 use crate::AppState;
 
 use bevy::{
+	ecs::system::EntityCommands,
 	input::{keyboard::KeyCode, Input},
 	prelude::{shape::Quad, *},
-	sprite::Mesh2dHandle, ecs::system::EntityCommands,
+	sprite::Mesh2dHandle,
 };
 use bevy_rapier2d::prelude::*;
 
@@ -41,9 +42,9 @@ impl Plugin for GamePlugin {
 					.with_system(player_movement_system)
 					.with_system(move_camera)
 					.with_system(character_particle_effect_system),
-				)
-				.add_system_set(
-					SystemSet::on_update(AppState::Win)
+			)
+			.add_system_set(
+				SystemSet::on_update(AppState::Win)
 					.with_system(player_movement_system)
 					.with_system(move_camera)
 					.with_system(character_particle_effect_system),
@@ -107,34 +108,23 @@ fn setup(
 	);
 }
 
-pub fn spawn_characters(
+pub fn spawn_characters<I: IntoIterator<Item = (Transform, Color)>>(
 	commands: &mut Commands,
 	character_meshes: &Res<CharacterMeshes>,
 	materials: &mut ResMut<Assets<ColorMaterial>>,
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
 
-	transforms: &mut Vec<Transform>,
-	colors: &Vec<Color>,
+	characters: I,
 ) {
-	spawn_character(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		transforms[0],
-		colors[0],
-		true,
-	);
-
-	for c in 1 .. transforms.len() {
+	for (i, (transform, color)) in characters.into_iter().enumerate() {
 		spawn_character(
 			commands,
 			character_meshes,
 			materials,
 			audio,
-			transforms[c],
-			colors[c],
-			false,
+			transform,
+			color,
+			i == 0,
 		);
 	}
 }
@@ -198,8 +188,8 @@ fn collision_event_system(
 			if flags.is_empty() {
 				if let (
 					Ok((c1_color, c1_transform, c1_player)),
-					Ok((c2_color, c2_transform, c2_player))) =
-					(character_query.get(*e1), character_query.get(*e2))
+					Ok((c2_color, c2_transform, c2_player)),
+				) = (character_query.get(*e1), character_query.get(*e2))
 				{
 					commands.entity(*e1).despawn_recursive();
 					commands.entity(*e2).despawn_recursive();
@@ -215,28 +205,24 @@ fn collision_event_system(
 					}
 
 					// position character based on current player location
-					if let Some(_player) = c1_player {
-						spawn_character(
-							&mut commands,
-							&character_meshes,
-							&mut materials,
-							&audio,
-							*c1_transform,
-							new_color.into(),
-							true,
-						);
-					} else if let Some(_player) = c2_player {
-						spawn_character(
-							&mut commands,
-							&character_meshes,
-							&mut materials,
-							&audio,
-							*c2_transform,
-							new_color.into(),
-							true,
-						);
-					}
-					
+					spawn_character(
+						&mut commands,
+						&character_meshes,
+						&mut materials,
+						&audio,
+						if c1_player.is_some() {
+							*c1_transform
+						} else if c2_player.is_some() {
+							*c2_transform
+						} else {
+							Transform::identity().with_translation(
+								(c1_transform.translation + c2_transform.translation) / 2.,
+							)
+						},
+						new_color.into(),
+						c1_player.is_some() || c2_player.is_some(),
+					);
+
 					audio.send(AudioMsg::Fusion).ok();
 				}
 			}
@@ -251,14 +237,16 @@ fn change_character_system(
 	characters: Query<(Entity, &CharacterColor, Option<&Player>)>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
-	if !keyboard_input.just_pressed(KeyCode::Tab) { return; }
+	if !keyboard_input.just_pressed(KeyCode::Tab) {
+		return;
+	}
 
-    let mut player_idx: usize = 0;
-    let mut player_count: usize = 0;
+	let mut player_idx: usize = 0;
+	let mut player_count: usize = 0;
 
 	// find player idx
 	for (_entity, _color, player) in characters.iter() {
-		if let Some(_player) = player {
+		if player.is_some() {
 			player_idx = player_count;
 		}
 		player_count += 1;
@@ -279,7 +267,7 @@ fn change_character_system(
 			audio
 				.send(AudioMsg::Color([color.0.r(), color.0.g(), color.0.b()]))
 				.ok();
-            audio.send(AudioMsg::Switch).ok();
+			audio.send(AudioMsg::Switch).ok();
 		}
 
 		player_count += 1;
@@ -292,20 +280,19 @@ fn player_movement_system(
 	mut app_state: ResMut<State<AppState>>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
+	let right_pressed: bool =
+		keyboard_input.pressed(KeyCode::Right) || keyboard_input.pressed(KeyCode::D);
+	let left_pressed: bool =
+		keyboard_input.pressed(KeyCode::Left) || keyboard_input.pressed(KeyCode::A);
 
-    let right_pressed: bool =
-        keyboard_input.pressed(KeyCode::Right) || keyboard_input.pressed(KeyCode::D);
-    let left_pressed: bool =
-        keyboard_input.pressed(KeyCode::Left) || keyboard_input.pressed(KeyCode::A);
+	for mut velocity in characters.iter_mut() {
+		velocity.linvel.x = 200. * (right_pressed as i8 - left_pressed as i8) as f32;
 
-    for mut velocity  in characters.iter_mut() {
-        velocity.linvel.x = 200. * (right_pressed as i8 - left_pressed as i8) as f32;
-
-        if keyboard_input.just_pressed(KeyCode::Space) {
-            audio.send(AudioMsg::Jump).ok();
-            velocity.linvel.y = 500.;
-        }
-    }
+		if keyboard_input.just_pressed(KeyCode::Space) {
+			audio.send(AudioMsg::Jump).ok();
+			velocity.linvel.y = 500.;
+		}
+	}
 
 	if app_state.current() == &AppState::Win && keyboard_input.just_pressed(KeyCode::Return) {
 		app_state.replace(AppState::Game).unwrap();
@@ -349,17 +336,17 @@ fn move_camera(
 	const FOLLOW_SPEED: f32 = std::f32::consts::PI;
 
 	for character_transform in characters.iter() {
-		let (camera, mut camera_transform) =
-			camera_query.single_mut();
+		let (camera, mut camera_transform) = camera_query.single_mut();
 
 		let size: Vec2 = camera.logical_viewport_size().unwrap();
 		let half_height: f32 = size.y * 0.5;
 		camera_transform.translation = camera_transform.translation.lerp(
-			character_transform.translation, time.delta_seconds() * FOLLOW_SPEED
+			character_transform.translation,
+			time.delta_seconds() * FOLLOW_SPEED,
 		);
 
 		// prevent camera from going too low
-		camera_transform.translation.y = camera_transform.translation.y.max(half_height-MARGIN);
+		camera_transform.translation.y = camera_transform.translation.y.max(half_height - MARGIN);
 		// always make sure that camera is away from the object in order to render them
 		camera_transform.translation.z = 999.0;
 	}
diff --git a/src/levels.rs b/src/levels.rs
index 0d2ce89..a669d0f 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -15,10 +15,7 @@ pub fn setup_level(
 	camera_query: &mut Query<&mut Transform, With<Camera>>,
 	level_id: LevelId,
 ) {
-	let level_entity = commands
-		.spawn()
-		.insert(Level)
-		.id();
+	let level_entity = commands.spawn().insert(Level).id();
 	current_level.0 = Some(level_id);
 
 	camera_query.single_mut().translation = Default::default();
@@ -43,7 +40,7 @@ pub fn post_setup_level(
 	asset_server: Res<AssetServer>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
-	for LevelStartupEvent(level_entity) in level_startup_event.iter() {
+	for LevelStartupEvent(_level_entity) in level_startup_event.iter() {
 		if let Some(level_id) = current_level.0 {
 			match level_id.0 {
 				0 => level0::setup(
diff --git a/src/levels/level0.rs b/src/levels/level0.rs
index 6cec4c4..5b72da6 100644
--- a/src/levels/level0.rs
+++ b/src/levels/level0.rs
@@ -25,31 +25,15 @@ pub fn setup(
 		.insert(Collider::cuboid(400., 8.))
 		.insert(Level);
 
-	spawn_character(
+	spawn_characters(
 		commands,
 		character_meshes,
 		materials,
 		audio,
-		Transform::from_xyz(-128., -64., 0.),
-		Color::RED,
-        true,
-	);
-	spawn_character(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		Transform::from_xyz(0., -64., 0.),
-		Color::GREEN,
-		false,
-	);
-	spawn_character(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		Transform::from_xyz(128., -64., 0.),
-		Color::BLUE,
-		false,
+		[
+			(Transform::from_xyz(-128., -64., 0.), Color::RED),
+			(Transform::from_xyz(0., -64., 0.), Color::GREEN),
+			(Transform::from_xyz(128., -64., 0.), Color::BLUE),
+		],
 	);
 }
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
index 4699cb1..f26df88 100644
--- a/src/levels/level1.rs
+++ b/src/levels/level1.rs
@@ -39,32 +39,16 @@ pub fn setup(
 		.insert(Collider::cuboid(200., 8.))
 		.insert(Level);
 
-	spawn_character(
+	spawn_characters(
 		commands,
 		character_meshes,
 		materials,
 		audio,
-		Transform::from_xyz(128., 64., 0.),
-		Color::BLUE,
-        true,
-	);
-	spawn_character(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		Transform::from_xyz(-128., -128., 0.),
-		Color::RED,
-		false,
-	);
-	spawn_character(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		Transform::from_xyz(0., -128., 0.),
-		Color::GREEN,
-		false,
+		[
+			(Transform::from_xyz(128., 64., 0.), Color::BLUE),
+			(Transform::from_xyz(-128., -128., 0.), Color::RED),
+			(Transform::from_xyz(0., -128., 0.), Color::GREEN),
+		],
 	);
 
 	commands

From 2a4625269f827394400753a93bdac3d6b418f04d Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Wed, 24 Aug 2022 23:11:59 +0200
Subject: [PATCH 04/13] Color filter

---
 Cargo.lock  | 133 ++++++++++++++++++++++++++--------------------------
 Cargo.toml  |   3 +-
 README.md   |   4 +-
 src/game.rs |  47 ++++++++++++++++---
 4 files changed, 112 insertions(+), 75 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a790240..3ddac41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,9 +208,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bevy"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55f08528a4e59d607460513a823b40f602d013c1a00f57b824f1075d5d48c3cd"
+checksum = "fea147ef1ebb92d41294cfad804c40de151b174c711ce6e0a4a40eba23eae1a4"
 dependencies = [
  "bevy_internal",
 ]
@@ -241,9 +241,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e243169af495ad616ff701247c0d3e40078a26ed8de231cf9e54bde6b3c4bb45"
+checksum = "a4365465fca7bd78295eb81d0a04afc049399852793d562eb017849bb5d6c55e"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -259,9 +259,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d26d6ffdf493609d2fedc1018a2ef0cb4d8e48f6d3bcea56fa2df81867e464"
+checksum = "9e4ae0a6ed2adf3b153511b4645241660a93f747c05ecd1e5a909dafc803cad4"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -274,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8fb95306d5f18fa70df40632cd984993aeb71e91ce059ae99699098a4f9ce9"
+checksum = "2ec773c861a7e9d9978771f59f385500ec6da3a1ab5487705cddb054393d3d19"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -302,9 +302,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee08ac575397ce17477dd291862bafa15226334bdfb82c02bbc3d10bad7bdb8"
+checksum = "1e5cf4713a24f318841f73a9e030854cfd5bad46bc81fa1acc9590cdab053c6f"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -318,9 +318,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6712146d54fff9e1865362e9f39a7b63c7b037ddb72a3d7bb05b959213fb61e"
+checksum = "c53172003d5cde7780870b5403c66c8ede3581faf3e510e916d8b4baa5b538d2"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -333,9 +333,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080bb00399b6d7697e505f871d67c6de8b52eb06b47b0cda2be80c2396805983"
+checksum = "5e60efd10d593f6d122f2687f74c09ad55835a8f999c35bed6380ddd8e6ff7f2"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -351,9 +351,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b8f0786d1fc7e0d35297917be463db3d0886f7bd8d4221ca3d565502579ffb"
+checksum = "0e6345431bbe6d7b6c165cd860ecd0b35da929779571259c5df970ac256d45f9"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -362,9 +362,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adab74ee5375fbf5d2b1d3da41de8d1491a8a706d17441b5e31214b65349d692"
+checksum = "58ac9f4c2815f412be4b6e21e4b299cdafa710f651d064f6d40b2a8377a0d17c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -375,9 +375,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5643dc27b7d6778e3a66c8e0f6ad1fd33309aa2fa61d935f360ccc85b7be6a2"
+checksum = "c174066a24ed8a14d15ea58b0aea1c1f5c763f4bb36ebdc2b1dc78026007d0f5"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -394,9 +394,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5f2f12677f8725d40930d0a19652f007fe0ef5ac38e23817cfc4930c61f5680"
+checksum = "cc50c39e49e8febccc74e8e731680adb0cb4aef1f53275740cbaa95c6da71f4f"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -419,9 +419,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a767adc36ce1fc917a736843b026d4de7069d90ed5e669c852481ef69fd5aa"
+checksum = "68bc194009c5e9b97da64a08142dd183c264885d99c985cf849868103018adf1"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -429,9 +429,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963940426127533164af2a556971a03c493143c0afb95afadb4a070b6ab8c3df"
+checksum = "cb15a3427d9707be92b457e5d66900b02d853b475c21dd8662bdda387ba9f24e"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -442,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gltf"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150cc6782c4472600c2ade5d78c6ce481c992690f0499e63765aba752d7e0f04"
+checksum = "79db7d7e71b47a69953fbe8407ded5c6308eaeecf9a05efd5dfb42992f400a16"
 dependencies = [
  "anyhow",
  "base64",
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2e4c20d7c843cd26ef3c5d7b4c20e3e32c275943e2437ecaca1cfd6cfe3b30"
+checksum = "5eb1ec76099ea5a716de08ea42ff41f036ebe2502df1d569168b58f16458a85e"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -484,9 +484,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a11c70573fb4d4c056ba32cfa553daa7e6e1245cb876ccfbe322640928b7ee1c"
+checksum = "1821c4b760ba6ddb4fe61806e9cc33f40b09a884557aca4553a29b8c7d73c6b4"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -496,9 +496,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d603b597772130782eab6e604706cbb764fb037f9cf0a1904b6f342845b6f44"
+checksum = "ee63ad1e3f95a26ff2c227fadb1534a7bfe3a098e0e45c347f2f2575a573d9bc"
 dependencies = [
  "bevy_animation",
  "bevy_app",
@@ -534,9 +534,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cafb12fc84734236e36f407ab62c72d5d4279fa4777e40a95d7cc973cbabcd1"
+checksum = "092daf498887814a064331dfcd1cf487a5ddab01fd38629b84a35b8b664462a1"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -549,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d081af83b701e16cad209255ba6b383744dfa49efa99eb6505989f293305ab3"
+checksum = "43fb5137e5198302d7c6c33d1e454cf48a586e7c6fd12f4860f12863951e16b9"
 dependencies = [
  "quote",
  "syn",
@@ -560,18 +560,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_math"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db5394e86c5708d3aa506c6e98ec4ed2a4083a7a018c6693d9ac0e77ebfabfc2"
+checksum = "531f2b90c7e861a96f418b3d560131b3354c5e67a67eba3953a45a56ea0114d2"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b299a61175a6f7e7398f83cd5b50920fd8bad4df674e614ad94f25f8426509"
+checksum = "941e7d3d4e1dbb735f040e4cdc1558be1d3c38d43f1d9fdbb039c39a7849a00b"
 dependencies = [
  "glam",
 ]
@@ -599,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92d5679e89602a18682a37846573dcd1979410179e14204280460ba9fb8713a"
+checksum = "9960c19e582b43cebe1894b6679520a4f50802d1cc5b6fa432f8d685ed232f09"
 
 [[package]]
 name = "bevy_rapier2d"
@@ -618,9 +618,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08798e67f2d4e6898ef117d8c99cf3b50a8eebc8da4159e6dad2657a0fbe9a4e"
+checksum = "3fc689dd7a7df3b3768884a4754711d406aa302ea48da483c03b52715fa95045"
 dependencies = [
  "bevy_ptr",
  "bevy_reflect_derive",
@@ -637,9 +637,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19209a7f0238053802b7de04e6724bd90d4ed7d90e87101dbd1b64cca64ff694"
+checksum = "8c36fa5100832c787c10558d31632ddc454c221e8dfacbbef836938f59614754"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -650,9 +650,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb49530388ef17cff3fb8bd5e47372fb3cfeb4befc73e3036f6462ac20f049ef"
+checksum = "600bcef85c7efac6e38ed725707f0e5b7c59b510430034ba2f743f472493f845"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -693,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d0b7a51fa819c20c64f43856c5aaea40f853050bbb09b9ba3672e5ff2688a5"
+checksum = "1be90adc9e5d5808833e363670818da5fe68ccafd7ca983a457f90957d2a430b"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -705,9 +705,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0064d73ebb0de39901478b493604a1a6d448fd337b66803004c60f41f1fa6c37"
+checksum = "a045d575d2c8f776d8ea965363c81660243fefbfc3712ead938b00dfd6797216"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -753,9 +753,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff874c91a36eaac3ef957c6f3b590fb71332d9d136671cc858847d56fe9f80a3"
+checksum = "719b753acb3d5b9dbfd77038560fe1893c17d4ee0a4242c2ee70da9d59430537"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -768,9 +768,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_text"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef05a788c2c04aaa5db95b22a8f0fff0d3a0b08a7bcd1a71f050a628b38eec6e"
+checksum = "c265b7515faf55a3b92fd6ce0ab65dd246f247e11d737d6f5cdaf49c2be42c63"
 dependencies = [
  "ab_glyph",
  "anyhow",
@@ -791,9 +791,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ec681d641371df81d7bfbcb0eea725ed873f38a094f34b5f7b436f0889e77c"
+checksum = "22830665b8476292b861216383fd79922aef2b540f9fd09d49144e3e5e94550e"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -804,9 +804,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e1528e35f30bede46a50ee4134f150efc01f5c1002c340b3b2e6a0bfcb8aa5"
+checksum = "a4bb8760f03e9667e7499a5ceec1f7630fc3e45702781ac0df56cb969e8ae668"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -845,9 +845,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda6dada53e546845887ae7357eec57b8d547ef71627b716b33839b4a98b687"
+checksum = "f6e9aa1866c1cf7ee000f281ce9e90d02d701f5c7380a107252017e58e2f5246"
 dependencies = [
  "ahash",
  "getrandom",
@@ -874,9 +874,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57537a56ac4f4e1ffcad95227bcab37cd17b51770dacff82374a2d88be376322"
+checksum = "98b15fee4b75472e3441b0c7221467303e4ce59b342a94a328e447e7cdb5a43c"
 dependencies = [
  "approx",
  "bevy_app",
@@ -904,6 +904,7 @@ dependencies = [
  "hexodsp",
  "rand",
  "rand_distr",
+ "rapier2d",
  "ticktock",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index f79d249..f50dc6f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,12 +6,13 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-bevy = "0.8.0"
+bevy = "0.8.1"
 bevy-inspector-egui = "0.12.1"
 bevy_rapier2d = "0.16.2"
 crossbeam-channel = "0.5.6"
 rand = "0.8.5"
 rand_distr = "0.4.3"
+rapier2d = "0.14.0"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies]
 cpal = "0.14.0"
diff --git a/README.md b/README.md
index bb59e47..db5e8dc 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,9 @@
 ## TODO
 
 * name
-* color filters
+* more filters
+* despawn black characters
+* despawn character when too far
 * level design
 * (?) can jump only from a surface (no mid-air jump)
 * (?) multiplayer
diff --git a/src/game.rs b/src/game.rs
index a265f88..f908016 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -12,6 +12,7 @@ use bevy::{
 	sprite::Mesh2dHandle,
 };
 use bevy_rapier2d::prelude::*;
+use rapier2d::geometry::CollisionEventFlags;
 
 pub enum AudioMsg {
 	Color([f32; 3]),
@@ -154,7 +155,6 @@ pub fn spawn_character(
 		.insert(CharacterColor(color))
 		.insert(RigidBody::Dynamic)
 		.insert(Collider::cuboid(32., 32.))
-		.insert(ExternalForce::default())
 		.insert(Velocity::default())
 		.insert(GravityScale(10.0))
 		.insert(LockedAxes::ROTATION_LOCKED)
@@ -163,7 +163,6 @@ pub fn spawn_character(
 			linear_damping: 0.5,
 			angular_damping: 0.5,
 		})
-		.insert(ExternalImpulse::default())
 		.insert(ActiveEvents::COLLISION_EVENTS);
 
 	if is_player {
@@ -179,7 +178,13 @@ fn collision_event_system(
 	character_meshes: Res<CharacterMeshes>,
 	mut materials: ResMut<Assets<ColorMaterial>>,
 	mut collision_events: EventReader<CollisionEvent>,
-	character_query: Query<(&CharacterColor, &Transform, Option<&Player>)>,
+	mut character_query: Query<(
+		&mut CharacterColor,
+		&Transform,
+		&mut Handle<ColorMaterial>,
+		Option<&Player>,
+	)>,
+	pass_through_filter_query: Query<(&PassThroughFilter, &FilterColor)>,
 	mut app_state: ResMut<State<AppState>>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
@@ -187,8 +192,8 @@ fn collision_event_system(
 		if let CollisionEvent::Started(e1, e2, flags) = collision_event {
 			if flags.is_empty() {
 				if let (
-					Ok((c1_color, c1_transform, c1_player)),
-					Ok((c2_color, c2_transform, c2_player)),
+					Ok((c1_color, c1_transform, _c1_material, c1_player)),
+					Ok((c2_color, c2_transform, _c2_material, c2_player)),
 				) = (character_query.get(*e1), character_query.get(*e2))
 				{
 					commands.entity(*e1).despawn_recursive();
@@ -225,6 +230,34 @@ fn collision_event_system(
 
 					audio.send(AudioMsg::Fusion).ok();
 				}
+			} else if *flags == CollisionEventFlags::SENSOR {
+				if let (
+					Ok((mut c_color, _c_transform, mut c_material, c_player)),
+					Ok((filter, filter_color)),
+				) = (
+					character_query.get_mut(*e1),
+					pass_through_filter_query.get(*e2),
+				) {
+					c_color.0 = match filter {
+						PassThroughFilter::Absorbing => Vec4::from(c_color.0)
+							.mul_add(
+								-Vec4::from(filter_color.0) * Vec4::from([1., 1., 1., 0.]),
+								Vec4::from(c_color.0),
+							)
+							.into(),
+					};
+					*c_material = materials.add(ColorMaterial::from(c_color.0));
+
+					if c_player.is_some() {
+						audio
+							.send(AudioMsg::Color([
+								c_color.0.r(),
+								c_color.0.g(),
+								c_color.0.b(),
+							]))
+							.ok();
+					}
+				}
 			}
 		}
 	}
@@ -300,10 +333,10 @@ fn player_movement_system(
 }
 
 fn character_particle_effect_system(
-	characters: Query<(&Transform, &CharacterColor), With<Player>>,
+	player_character: Query<(&Transform, &CharacterColor), With<Player>>,
 	mut particle_effect: ResMut<crate::particle_effect::ParticleEffectResource>,
 ) {
-	for (transform, color) in characters.iter() {
+	if let Ok((transform, color)) = player_character.get_single() {
 		particle_effect.translation = transform.translation;
 		particle_effect.color = color.0;
 	}

From 05ecbbbbec72a03644da6c71b5b4f93ccb9311af Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 08:20:13 +0200
Subject: [PATCH 05/13] Fullscreen & exit controls

---
 index.html  |  1 +
 src/main.rs | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 30034f5..3b956aa 100644
--- a/index.html
+++ b/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="UTF-8"/>
+		<title>Bevyjam</title>
 	</head>
 	<body>
 		<script type="module">
diff --git a/src/main.rs b/src/main.rs
index b7fbbc2..8f78e79 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,10 @@ mod levels;
 mod menu;
 mod particle_effect;
 
-use bevy::prelude::*;
+use bevy::{
+	prelude::*,
+	window::{WindowId, WindowMode},
+};
 use bevy_rapier2d::prelude::*;
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
@@ -35,12 +38,17 @@ fn main() {
 		.add_plugin(game::GamePlugin)
 		.add_plugin(particle_effect::ParticleEffectPlugin)
 		//.add_plugin(bevy_inspector_egui::WorldInspectorPlugin::new())
-		.add_system(bevy::window::close_on_esc)
+		.add_system(keyboard_util_system)
 		.add_startup_system(setup)
 		.run();
 }
 
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup(mut commands: Commands, mut windows: ResMut<Windows>, asset_server: Res<AssetServer>) {
+	windows
+		.get_mut(WindowId::primary())
+		.unwrap()
+		.set_title(String::from("Bevyjam"));
+
 	#[cfg(not(target_arch = "wasm32"))]
 	let font: Handle<Font> = asset_server.load("UacariLegacy-Thin.ttf");
 	#[cfg(target_arch = "wasm32")]
@@ -53,3 +61,20 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 		brightness: 0.6,
 	});
 }
+
+fn keyboard_util_system(keyboard_input: Res<Input<KeyCode>>, mut windows: ResMut<Windows>) {
+	#[cfg(not(target_arch = "wasm32"))]
+	{
+		if keyboard_input.just_released(KeyCode::Escape) {
+			std::process::exit(0);
+		}
+		if keyboard_input.just_pressed(KeyCode::F11) {
+			if let Some(window) = windows.get_primary_mut() {
+				window.set_mode(match window.mode() {
+					WindowMode::Windowed => WindowMode::Fullscreen,
+					_ => WindowMode::Windowed,
+				});
+			}
+		}
+	}
+}

From 5ac4b4711cd7b872dfad3bb419da5ceea586f74e Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 09:30:47 +0200
Subject: [PATCH 06/13] Rotating filter

---
 assets/bevy.png      | Bin 0 -> 8873 bytes
 src/filters.rs       |  40 ++++++++++++++++++++++++++++++++++------
 src/game.rs          |  16 +++-------------
 src/levels.rs        |   1 +
 src/levels/level1.rs |  19 +++++++++++++++++--
 src/main.rs          |   6 +++---
 6 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 assets/bevy.png

diff --git a/assets/bevy.png b/assets/bevy.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cd3f1e81e61254a236de80ea42f40f25a7ed2dc
GIT binary patch
literal 8873
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

literal 0
HcmV?d00001

diff --git a/src/filters.rs b/src/filters.rs
index a4439c4..e34b458 100644
--- a/src/filters.rs
+++ b/src/filters.rs
@@ -1,20 +1,48 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
 
-#[derive(Component, Default)]
-pub struct FilterColor(pub Color);
-
 #[derive(Component)]
 pub enum PassThroughFilter {
-	Absorbing,
+	/// Absorbs this color (ignoring alpha)
+	Absorbing(Color),
+	/// Rotates hue by this angle (in degrees)
+	Rotating(f32),
+}
+
+impl PassThroughFilter {
+	pub fn apply(&self, color: Color) -> Color {
+		match self {
+			PassThroughFilter::Absorbing(filter_color) => Vec4::from(color)
+				.mul_add(
+					-Vec4::from(*filter_color) * Vec4::from([1., 1., 1., 0.]),
+					Vec4::from(color),
+				)
+				.into(),
+			PassThroughFilter::Rotating(filter_angle) => {
+				let mut hsla = color.as_hsla_f32();
+				hsla[0] = (hsla[0] + filter_angle) % 360.;
+				Color::hsla(hsla[0], hsla[1], hsla[2], hsla[3])
+			}
+		}
+	}
 }
 
 #[derive(Bundle)]
 pub struct AbsorbingFilter {
-	pub color: FilterColor,
 	#[bundle]
 	pub mesh: ColorMesh2dBundle,
 	pub collider: Collider,
 	pub sensor: Sensor,
-	pub filter_type: PassThroughFilter,
+	pub filter: PassThroughFilter,
+}
+
+#[derive(Bundle)]
+pub struct RotatingFilter {
+	#[bundle]
+	pub sprite: SpriteBundle,
+	pub collider: Collider,
+	pub sensor: Sensor,
+	pub filter: PassThroughFilter,
+	pub velocity: Velocity,
+	pub rigid_body: RigidBody,
 }
diff --git a/src/game.rs b/src/game.rs
index f908016..484dd21 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -184,7 +184,7 @@ fn collision_event_system(
 		&mut Handle<ColorMaterial>,
 		Option<&Player>,
 	)>,
-	pass_through_filter_query: Query<(&PassThroughFilter, &FilterColor)>,
+	pass_through_filter_query: Query<&PassThroughFilter>,
 	mut app_state: ResMut<State<AppState>>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
@@ -231,21 +231,11 @@ fn collision_event_system(
 					audio.send(AudioMsg::Fusion).ok();
 				}
 			} else if *flags == CollisionEventFlags::SENSOR {
-				if let (
-					Ok((mut c_color, _c_transform, mut c_material, c_player)),
-					Ok((filter, filter_color)),
-				) = (
+				if let (Ok((mut c_color, _c_transform, mut c_material, c_player)), Ok(filter)) = (
 					character_query.get_mut(*e1),
 					pass_through_filter_query.get(*e2),
 				) {
-					c_color.0 = match filter {
-						PassThroughFilter::Absorbing => Vec4::from(c_color.0)
-							.mul_add(
-								-Vec4::from(filter_color.0) * Vec4::from([1., 1., 1., 0.]),
-								Vec4::from(c_color.0),
-							)
-							.into(),
-					};
+					c_color.0 = filter.apply(c_color.0);
 					*c_material = materials.add(ColorMaterial::from(c_color.0));
 
 					if c_player.is_some() {
diff --git a/src/levels.rs b/src/levels.rs
index a669d0f..ac00218 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -56,6 +56,7 @@ pub fn post_setup_level(
 					&character_meshes,
 					&mut materials,
 					&audio,
+					&asset_server,
 				),
 				_ => game_over::setup(&mut commands, &asset_server),
 			}
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
index f26df88..f2d7a73 100644
--- a/src/levels/level1.rs
+++ b/src/levels/level1.rs
@@ -9,6 +9,7 @@ pub fn setup(
 	character_meshes: &Res<CharacterMeshes>,
 	materials: &mut ResMut<Assets<ColorMaterial>>,
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
+	asset_server: &Res<AssetServer>,
 ) {
 	commands
 		.spawn_bundle(ColorMesh2dBundle {
@@ -53,7 +54,6 @@ pub fn setup(
 
 	commands
 		.spawn_bundle(AbsorbingFilter {
-			color: FilterColor(Color::RED),
 			mesh: ColorMesh2dBundle {
 				mesh: meshes
 					.add(Mesh::from(Quad {
@@ -67,7 +67,22 @@ pub fn setup(
 			},
 			collider: Collider::cuboid(64., 8.),
 			sensor: Sensor,
-			filter_type: PassThroughFilter::Absorbing,
+			filter: PassThroughFilter::Absorbing(Color::RED),
+		})
+		.insert(Level);
+
+	commands
+		.spawn_bundle(RotatingFilter {
+			sprite: SpriteBundle {
+				texture: asset_server.get_handle("bevy.png"),
+				transform: Transform::from_xyz(256., -224., 2.),
+				..Default::default()
+			},
+			collider: Collider::ball(32.),
+			sensor: Sensor,
+			filter: PassThroughFilter::Rotating(45.),
+			velocity: Velocity::angular(1.),
+			rigid_body: RigidBody::KinematicVelocityBased,
 		})
 		.insert(Level);
 }
diff --git a/src/main.rs b/src/main.rs
index 8f78e79..08b60fa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,12 +49,12 @@ fn setup(mut commands: Commands, mut windows: ResMut<Windows>, asset_server: Res
 		.unwrap()
 		.set_title(String::from("Bevyjam"));
 
-	#[cfg(not(target_arch = "wasm32"))]
-	let font: Handle<Font> = asset_server.load("UacariLegacy-Thin.ttf");
-	#[cfg(target_arch = "wasm32")]
 	let font: Handle<Font> = asset_server.load("UacariLegacy-Thin.ttf");
 	commands.insert_resource(font);
 
+	let bevy_icon: Handle<Image> = asset_server.load("bevy.png");
+	commands.insert_resource(bevy_icon);
+
 	commands.spawn_bundle(Camera2dBundle::default());
 	commands.insert_resource(AmbientLight {
 		color: Color::WHITE,

From 56fea25a879411ee7b056e2017368e45649ce736 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 09:55:39 +0200
Subject: [PATCH 07/13] Filter spawn functions

---
 src/filters.rs       | 53 +++++++++++++++++++++++++++++++++++++++++++-
 src/levels/level1.rs | 46 ++++++++++++--------------------------
 2 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/src/filters.rs b/src/filters.rs
index e34b458..9a18af2 100644
--- a/src/filters.rs
+++ b/src/filters.rs
@@ -1,4 +1,6 @@
-use bevy::prelude::*;
+use crate::game::Level;
+
+use bevy::prelude::{shape::Quad, *};
 use bevy_rapier2d::prelude::*;
 
 #[derive(Component)]
@@ -36,6 +38,32 @@ pub struct AbsorbingFilter {
 	pub filter: PassThroughFilter,
 }
 
+pub fn spawn_absorbing_filter(
+	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+
+	transform: Transform,
+	size: Vec2,
+	color: Color,
+) {
+	let mut material_color = color;
+	material_color.set_a(0.5);
+	commands
+		.spawn_bundle(AbsorbingFilter {
+			mesh: ColorMesh2dBundle {
+				mesh: meshes.add(Mesh::from(Quad { size, flip: false })).into(),
+				material: materials.add(material_color.into()),
+				transform,
+				..Default::default()
+			},
+			collider: Collider::cuboid(size.x / 2., size.y / 2.),
+			sensor: Sensor,
+			filter: PassThroughFilter::Absorbing(color),
+		})
+		.insert(Level);
+}
+
 #[derive(Bundle)]
 pub struct RotatingFilter {
 	#[bundle]
@@ -46,3 +74,26 @@ pub struct RotatingFilter {
 	pub velocity: Velocity,
 	pub rigid_body: RigidBody,
 }
+
+pub fn spawn_rotating_filter(
+	commands: &mut Commands,
+	asset_server: &Res<AssetServer>,
+
+	transform: Transform,
+	angle: f32,
+) {
+	commands
+		.spawn_bundle(RotatingFilter {
+			sprite: SpriteBundle {
+				texture: asset_server.get_handle("bevy.png"),
+				transform,
+				..Default::default()
+			},
+			collider: Collider::ball(32.),
+			sensor: Sensor,
+			filter: PassThroughFilter::Rotating(angle),
+			velocity: Velocity::angular(1.),
+			rigid_body: RigidBody::KinematicVelocityBased,
+		})
+		.insert(Level);
+}
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
index f2d7a73..8bcf4bb 100644
--- a/src/levels/level1.rs
+++ b/src/levels/level1.rs
@@ -52,37 +52,19 @@ pub fn setup(
 		],
 	);
 
-	commands
-		.spawn_bundle(AbsorbingFilter {
-			mesh: ColorMesh2dBundle {
-				mesh: meshes
-					.add(Mesh::from(Quad {
-						size: Vec2 { x: 128.0, y: 16.0 },
-						flip: false,
-					}))
-					.into(),
-				material: materials.add(Color::rgba(1., 0., 0., 0.5).into()),
-				transform: Transform::from_xyz(0., 0., 2.),
-				..Default::default()
-			},
-			collider: Collider::cuboid(64., 8.),
-			sensor: Sensor,
-			filter: PassThroughFilter::Absorbing(Color::RED),
-		})
-		.insert(Level);
+	spawn_absorbing_filter(
+		commands,
+		meshes,
+		materials,
+		Transform::from_xyz(0., 0., 2.),
+		Vec2 { x: 128.0, y: 16.0 },
+		Color::RED,
+	);
 
-	commands
-		.spawn_bundle(RotatingFilter {
-			sprite: SpriteBundle {
-				texture: asset_server.get_handle("bevy.png"),
-				transform: Transform::from_xyz(256., -224., 2.),
-				..Default::default()
-			},
-			collider: Collider::ball(32.),
-			sensor: Sensor,
-			filter: PassThroughFilter::Rotating(45.),
-			velocity: Velocity::angular(1.),
-			rigid_body: RigidBody::KinematicVelocityBased,
-		})
-		.insert(Level);
+	spawn_rotating_filter(
+		commands,
+		asset_server,
+		Transform::from_xyz(256., -224., 2.),
+		45.,
+	);
 }

From 10abb0a67609476d4d759c47ac0e2b7d4a619a83 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 11:31:12 +0200
Subject: [PATCH 08/13] Reset level

---
 README.md     |  2 +-
 src/game.rs   | 49 ++++++++++++++++++++++++++++++++++---------------
 src/levels.rs | 10 ++--------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index db5e8dc..abc7271 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 * **Move**: arrows
 * **Switch character**: Tab
 * **Level up**: Enter (when character is white)
+* **Reset**: R
 
 ## TODO
 
@@ -15,7 +16,6 @@
 * level design
 * (?) can jump only from a surface (no mid-air jump)
 * (?) multiplayer
-* level reset
 * more audio
 
 ## Build
diff --git a/src/game.rs b/src/game.rs
index 484dd21..8e47fb1 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -41,12 +41,14 @@ impl Plugin for GamePlugin {
 					.with_system(crate::levels::post_setup_level)
 					.with_system(change_character_system)
 					.with_system(player_movement_system)
+					.with_system(level_keyboard_system)
 					.with_system(move_camera)
 					.with_system(character_particle_effect_system),
 			)
 			.add_system_set(
 				SystemSet::on_update(AppState::Win)
 					.with_system(player_movement_system)
+					.with_system(level_keyboard_system)
 					.with_system(move_camera)
 					.with_system(character_particle_effect_system),
 			)
@@ -56,7 +58,7 @@ impl Plugin for GamePlugin {
 
 // Events
 
-pub struct LevelStartupEvent(pub Entity);
+pub struct LevelStartupEvent;
 
 // Resources
 
@@ -94,19 +96,15 @@ pub struct Player;
 // Systems
 
 fn setup(
-	mut commands: Commands,
 	mut current_level: ResMut<CurrentLevel>,
 	mut level_startup_event: EventWriter<LevelStartupEvent>,
 	mut camera_query: Query<&mut Transform, With<Camera>>,
 ) {
-	let level_id = LevelId(current_level.0.map_or(0, |level_id| level_id.0 + 1));
-	crate::levels::setup_level(
-		&mut commands,
-		&mut current_level,
-		&mut level_startup_event,
-		&mut camera_query,
-		level_id,
-	);
+	if current_level.0.is_none() {
+		current_level.0 = Some(LevelId(0));
+	}
+
+	crate::levels::setup_level(&mut level_startup_event, &mut camera_query);
 }
 
 pub fn spawn_characters<I: IntoIterator<Item = (Transform, Color)>>(
@@ -300,7 +298,6 @@ fn change_character_system(
 fn player_movement_system(
 	keyboard_input: Res<Input<KeyCode>>,
 	mut characters: Query<&mut Velocity, With<Player>>,
-	mut app_state: ResMut<State<AppState>>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
 	let right_pressed: bool =
@@ -316,10 +313,6 @@ fn player_movement_system(
 			velocity.linvel.y = 500.;
 		}
 	}
-
-	if app_state.current() == &AppState::Win && keyboard_input.just_pressed(KeyCode::Return) {
-		app_state.replace(AppState::Game).unwrap();
-	}
 }
 
 fn character_particle_effect_system(
@@ -374,3 +367,29 @@ fn move_camera(
 		camera_transform.translation.z = 999.0;
 	}
 }
+
+fn level_keyboard_system(
+	mut commands: Commands,
+	mut current_level: ResMut<CurrentLevel>,
+	mut level_startup_event: EventWriter<LevelStartupEvent>,
+	mut camera_query: Query<&mut Transform, With<Camera>>,
+	keyboard_input: Res<Input<KeyCode>>,
+	level_query: Query<Entity, With<Level>>,
+	mut app_state: ResMut<State<AppState>>,
+) {
+	if app_state.current() == &AppState::Win && keyboard_input.just_pressed(KeyCode::Return) {
+		current_level.0 = Some(LevelId(
+			current_level.0.map_or(0, |level_id| level_id.0 + 1),
+		));
+		app_state.replace(AppState::Game).unwrap();
+	}
+
+	if keyboard_input.just_pressed(KeyCode::R) {
+		for entity in level_query.iter() {
+			commands.entity(entity).despawn_recursive();
+		}
+		if app_state.replace(AppState::Game).is_err() {
+			crate::levels::setup_level(&mut level_startup_event, &mut camera_query);
+		}
+	}
+}
diff --git a/src/levels.rs b/src/levels.rs
index ac00218..c6f446e 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -9,18 +9,12 @@ use crate::game::*;
 use bevy::prelude::*;
 
 pub fn setup_level(
-	commands: &mut Commands,
-	current_level: &mut ResMut<CurrentLevel>,
 	level_startup_event: &mut EventWriter<LevelStartupEvent>,
 	camera_query: &mut Query<&mut Transform, With<Camera>>,
-	level_id: LevelId,
 ) {
-	let level_entity = commands.spawn().insert(Level).id();
-	current_level.0 = Some(level_id);
-
 	camera_query.single_mut().translation = Default::default();
 
-	level_startup_event.send(LevelStartupEvent(level_entity));
+	level_startup_event.send(LevelStartupEvent);
 }
 
 pub fn despawn_level(mut commands: Commands, level_query: Query<Entity, With<Level>>) {
@@ -40,7 +34,7 @@ pub fn post_setup_level(
 	asset_server: Res<AssetServer>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
-	for LevelStartupEvent(_level_entity) in level_startup_event.iter() {
+	for _ in level_startup_event.iter() {
 		if let Some(level_id) = current_level.0 {
 			match level_id.0 {
 				0 => level0::setup(

From e7f2188091fe9093837d4d5f29aa6d608606bb41 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 12:32:06 +0200
Subject: [PATCH 09/13] Spawn platforms function

---
 src/game.rs             | 52 ++++++++++++++++++++++++++++++++++++++++-
 src/levels.rs           | 10 +++++++-
 src/levels/game_over.rs | 29 +++++++++++++++++++++--
 src/levels/level0.rs    | 35 ++++++++++++++++-----------
 src/levels/level1.rs    | 46 +++++++++++++-----------------------
 5 files changed, 125 insertions(+), 47 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 8e47fb1..e1499b3 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -171,6 +171,37 @@ pub fn spawn_character(
 	}
 }
 
+pub fn spawn_platforms<I: IntoIterator<Item = (Transform, Vec2)>>(
+	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+
+	platforms: I,
+) {
+	for (transform, size) in platforms.into_iter() {
+		spawn_platform(commands, meshes, materials, transform, size);
+	}
+}
+
+pub fn spawn_platform(
+	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+
+	transform: Transform,
+	size: Vec2,
+) {
+	commands
+		.spawn_bundle(ColorMesh2dBundle {
+			mesh: meshes.add(Mesh::from(Quad { size, flip: false })).into(),
+			material: materials.add(ColorMaterial::from(Color::GRAY)),
+			transform,
+			..default()
+		})
+		.insert(Collider::cuboid(size.x / 2., size.y / 2.))
+		.insert(Level);
+}
+
 fn collision_event_system(
 	mut commands: Commands,
 	character_meshes: Res<CharacterMeshes>,
@@ -325,8 +356,26 @@ fn character_particle_effect_system(
 	}
 }
 
-fn win_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn win_setup(
+	mut commands: Commands,
+	mut meshes: ResMut<Assets<Mesh>>,
+	mut materials: ResMut<Assets<ColorMaterial>>,
+	asset_server: Res<AssetServer>,
+) {
 	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
+	commands
+		.spawn_bundle(ColorMesh2dBundle {
+			mesh: meshes
+				.add(Mesh::from(Quad {
+					size: Vec2 { x: 512., y: 64. },
+					flip: false,
+				}))
+				.into(),
+			material: materials.add(ColorMaterial::from(Color::rgba(0., 0., 0., 0.9))),
+			transform: Transform::from_xyz(0., 0., 3.),
+			..default()
+		})
+		.insert(Level);
 	commands
 		.spawn_bundle(Text2dBundle {
 			text: Text::from_section(
@@ -338,6 +387,7 @@ fn win_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 				},
 			)
 			.with_alignment(TextAlignment::CENTER),
+			transform: Transform::from_xyz(0., 0., 4.),
 			..Default::default()
 		})
 		.insert(Level);
diff --git a/src/levels.rs b/src/levels.rs
index c6f446e..ef9557f 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -43,6 +43,7 @@ pub fn post_setup_level(
 					&character_meshes,
 					&mut materials,
 					&audio,
+					&asset_server,
 				),
 				1 => level1::setup(
 					&mut commands,
@@ -52,7 +53,14 @@ pub fn post_setup_level(
 					&audio,
 					&asset_server,
 				),
-				_ => game_over::setup(&mut commands, &asset_server),
+				_ => game_over::setup(
+					&mut commands,
+					&mut meshes,
+					&character_meshes,
+					&mut materials,
+					&audio,
+					&asset_server,
+				),
 			}
 		}
 	}
diff --git a/src/levels/game_over.rs b/src/levels/game_over.rs
index f03026d..5fa3372 100644
--- a/src/levels/game_over.rs
+++ b/src/levels/game_over.rs
@@ -2,12 +2,19 @@ use crate::game::*;
 
 use bevy::prelude::*;
 
-pub fn setup(commands: &mut Commands, asset_server: &Res<AssetServer>) {
+pub fn setup(
+	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	character_meshes: &Res<CharacterMeshes>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
+	asset_server: &Res<AssetServer>,
+) {
 	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
 	commands
 		.spawn_bundle(Text2dBundle {
 			text: Text::from_section(
-				"GAME OVER",
+				"Thank you for playing!",
 				TextStyle {
 					font: font.clone(),
 					font_size: 48.0,
@@ -33,4 +40,22 @@ pub fn setup(commands: &mut Commands, asset_server: &Res<AssetServer>) {
 			..Default::default()
 		})
 		.insert(Level);
+
+	spawn_platform(
+		commands,
+		meshes,
+		materials,
+		Transform::from_xyz(0.0, -256.0, 0.0),
+		Vec2 { x: 800.0, y: 16.0 },
+	);
+
+	spawn_character(
+		commands,
+		character_meshes,
+		materials,
+		audio,
+		Transform::from_xyz(-128., -64., 0.),
+		Color::RED,
+		true,
+	);
 }
diff --git a/src/levels/level0.rs b/src/levels/level0.rs
index 5b72da6..3679121 100644
--- a/src/levels/level0.rs
+++ b/src/levels/level0.rs
@@ -1,7 +1,6 @@
 use crate::game::*;
 
-use bevy::prelude::{shape::Quad, *};
-use bevy_rapier2d::prelude::*;
+use bevy::prelude::*;
 
 pub fn setup(
 	commands: &mut Commands,
@@ -9,22 +8,32 @@ pub fn setup(
 	character_meshes: &Res<CharacterMeshes>,
 	materials: &mut ResMut<Assets<ColorMaterial>>,
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
+	asset_server: &Res<AssetServer>,
 ) {
+	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
 	commands
-		.spawn_bundle(ColorMesh2dBundle {
-			mesh: meshes
-				.add(Mesh::from(Quad {
-					size: Vec2 { x: 800.0, y: 16.0 },
-					flip: false,
-				}))
-				.into(),
-			material: materials.add(ColorMaterial::from(Color::GRAY)),
-			transform: Transform::from_xyz(0.0, -256.0, 0.0),
-			..default()
+		.spawn_bundle(Text2dBundle {
+			text: Text::from_section(
+				"Combine the colors to synthetize a white light.\nTab to switch; Arrows to move.",
+				TextStyle {
+					font,
+					font_size: 32.0,
+					color: Color::WHITE,
+				},
+			)
+			.with_alignment(TextAlignment::CENTER),
+			..Default::default()
 		})
-		.insert(Collider::cuboid(400., 8.))
 		.insert(Level);
 
+	spawn_platform(
+		commands,
+		meshes,
+		materials,
+		Transform::from_xyz(0.0, -256.0, 0.0),
+		Vec2 { x: 800.0, y: 16.0 },
+	);
+
 	spawn_characters(
 		commands,
 		character_meshes,
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
index 8bcf4bb..ce3906b 100644
--- a/src/levels/level1.rs
+++ b/src/levels/level1.rs
@@ -1,7 +1,6 @@
 use crate::game::*;
 
-use bevy::prelude::{shape::Quad, *};
-use bevy_rapier2d::prelude::*;
+use bevy::prelude::*;
 
 pub fn setup(
 	commands: &mut Commands,
@@ -11,34 +10,21 @@ pub fn setup(
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
 	asset_server: &Res<AssetServer>,
 ) {
-	commands
-		.spawn_bundle(ColorMesh2dBundle {
-			mesh: meshes
-				.add(Mesh::from(Quad {
-					size: Vec2 { x: 800.0, y: 16.0 },
-					flip: false,
-				}))
-				.into(),
-			material: materials.add(ColorMaterial::from(Color::GRAY)),
-			transform: Transform::from_xyz(0.0, -256.0, 0.0),
-			..default()
-		})
-		.insert(Collider::cuboid(400., 8.))
-		.insert(Level);
-	commands
-		.spawn_bundle(ColorMesh2dBundle {
-			mesh: meshes
-				.add(Mesh::from(Quad {
-					size: Vec2 { x: 400.0, y: 16.0 },
-					flip: false,
-				}))
-				.into(),
-			material: materials.add(ColorMaterial::from(Color::GRAY)),
-			transform: Transform::from_xyz(256.0, -128.0, 0.0),
-			..default()
-		})
-		.insert(Collider::cuboid(200., 8.))
-		.insert(Level);
+	spawn_platforms(
+		commands,
+		meshes,
+		materials,
+		[
+			(
+				Transform::from_xyz(0.0, -256.0, 0.0),
+				Vec2 { x: 800.0, y: 16.0 },
+			),
+			(
+				Transform::from_xyz(256.0, -128.0, 0.0),
+				Vec2 { x: 400.0, y: 16.0 },
+			),
+		],
+	);
 
 	spawn_characters(
 		commands,

From f117b2750adefe2a1f6a118e50e0f0c0d8257124 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 14:47:20 +0200
Subject: [PATCH 10/13] Prevent mid-air jump

---
 README.md   |   2 +-
 src/game.rs | 159 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 102 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index abc7271..65737f5 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,9 @@
 * despawn black characters
 * despawn character when too far
 * level design
-* (?) can jump only from a surface (no mid-air jump)
 * (?) multiplayer
 * more audio
+* "jumpable" component to avoid jumping on sensors
 
 ## Build
 
diff --git a/src/game.rs b/src/game.rs
index e1499b3..6cdd7cd 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -93,6 +93,9 @@ pub struct CharacterColor(pub Color);
 #[derive(Component)]
 pub struct Player;
 
+#[derive(Component)]
+pub struct CollisionCount(usize);
+
 // Systems
 
 fn setup(
@@ -161,7 +164,16 @@ pub fn spawn_character(
 			linear_damping: 0.5,
 			angular_damping: 0.5,
 		})
-		.insert(ActiveEvents::COLLISION_EVENTS);
+		.insert(ActiveEvents::COLLISION_EVENTS)
+		.with_children(|c| {
+			c.spawn_bundle(TransformBundle::from_transform(Transform::from_xyz(
+				0., -33., 0.,
+			)))
+			.insert(Sensor)
+			.insert(Collider::cuboid(30., 0.5))
+			.insert(ActiveEvents::COLLISION_EVENTS)
+			.insert(CollisionCount(0));
+		});
 
 	if is_player {
 		entity_commands.insert(Player);
@@ -214,67 +226,95 @@ fn collision_event_system(
 		Option<&Player>,
 	)>,
 	pass_through_filter_query: Query<&PassThroughFilter>,
+	mut collision_counter_query: Query<&mut CollisionCount>,
 	mut app_state: ResMut<State<AppState>>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
 	for collision_event in collision_events.iter() {
-		if let CollisionEvent::Started(e1, e2, flags) = collision_event {
-			if flags.is_empty() {
-				if let (
-					Ok((c1_color, c1_transform, _c1_material, c1_player)),
-					Ok((c2_color, c2_transform, _c2_material, c2_player)),
-				) = (character_query.get(*e1), character_query.get(*e2))
-				{
-					commands.entity(*e1).despawn_recursive();
-					commands.entity(*e2).despawn_recursive();
-
-					let new_color = (Vec4::from(c1_color.0) + Vec4::from(c2_color.0))
-						.clamp(Vec4::ZERO, Vec4::ONE);
-
-					// If color approximately white
-					if app_state.current() == &AppState::Game
-						&& 4. - new_color.length_squared() < 0.1
+		match collision_event {
+			CollisionEvent::Started(e1, e2, flags) => {
+				if flags.is_empty() {
+					if let (
+						Ok((c1_color, c1_transform, _c1_material, c1_player)),
+						Ok((c2_color, c2_transform, _c2_material, c2_player)),
+					) = (character_query.get(*e1), character_query.get(*e2))
 					{
-						app_state.replace(AppState::Win).ok();
+						commands.entity(*e1).despawn_recursive();
+						commands.entity(*e2).despawn_recursive();
+
+						let new_color = (Vec4::from(c1_color.0) + Vec4::from(c2_color.0))
+							.clamp(Vec4::ZERO, Vec4::ONE);
+
+						// If color approximately white
+						if app_state.current() == &AppState::Game
+							&& 4. - new_color.length_squared() < 0.1
+						{
+							app_state.replace(AppState::Win).ok();
+						}
+
+						// position character based on current player location
+						spawn_character(
+							&mut commands,
+							&character_meshes,
+							&mut materials,
+							&audio,
+							if c1_player.is_some() {
+								*c1_transform
+							} else if c2_player.is_some() {
+								*c2_transform
+							} else {
+								Transform::identity().with_translation(
+									(c1_transform.translation + c2_transform.translation) / 2.,
+								)
+							},
+							new_color.into(),
+							c1_player.is_some() || c2_player.is_some(),
+						);
+
+						audio.send(AudioMsg::Fusion).ok();
 					}
+				} else if *flags == CollisionEventFlags::SENSOR {
+					if let (Ok((mut c_color, _c_transform, mut c_material, c_player)), Ok(filter)) = (
+						character_query.get_mut(*e1),
+						pass_through_filter_query.get(*e2),
+					) {
+						c_color.0 = filter.apply(c_color.0);
+						*c_material = materials.add(ColorMaterial::from(c_color.0));
 
-					// position character based on current player location
-					spawn_character(
-						&mut commands,
-						&character_meshes,
-						&mut materials,
-						&audio,
-						if c1_player.is_some() {
-							*c1_transform
-						} else if c2_player.is_some() {
-							*c2_transform
-						} else {
-							Transform::identity().with_translation(
-								(c1_transform.translation + c2_transform.translation) / 2.,
-							)
-						},
-						new_color.into(),
-						c1_player.is_some() || c2_player.is_some(),
-					);
-
-					audio.send(AudioMsg::Fusion).ok();
+						if c_player.is_some() {
+							audio
+								.send(AudioMsg::Color([
+									c_color.0.r(),
+									c_color.0.g(),
+									c_color.0.b(),
+								]))
+								.ok();
+						}
+					} else if let (Ok(mut collision_count), Err(_)) = (
+						collision_counter_query.get_mut(*e1),
+						character_query.get_mut(*e2),
+					) {
+						collision_count.0 += 1;
+					} else if let (Ok(mut collision_count), Err(_)) = (
+						collision_counter_query.get_mut(*e2),
+						character_query.get_mut(*e1),
+					) {
+						collision_count.0 += 1;
+					}
 				}
-			} else if *flags == CollisionEventFlags::SENSOR {
-				if let (Ok((mut c_color, _c_transform, mut c_material, c_player)), Ok(filter)) = (
-					character_query.get_mut(*e1),
-					pass_through_filter_query.get(*e2),
-				) {
-					c_color.0 = filter.apply(c_color.0);
-					*c_material = materials.add(ColorMaterial::from(c_color.0));
-
-					if c_player.is_some() {
-						audio
-							.send(AudioMsg::Color([
-								c_color.0.r(),
-								c_color.0.g(),
-								c_color.0.b(),
-							]))
-							.ok();
+			}
+			CollisionEvent::Stopped(e1, e2, flags) => {
+				if *flags == CollisionEventFlags::SENSOR {
+					if let (Ok(mut collision_count), Err(_)) = (
+						collision_counter_query.get_mut(*e1),
+						character_query.get_mut(*e2),
+					) {
+						collision_count.0 = collision_count.0.saturating_sub(1);
+					} else if let (Ok(mut collision_count), Err(_)) = (
+						collision_counter_query.get_mut(*e2),
+						character_query.get_mut(*e1),
+					) {
+						collision_count.0 = collision_count.0.saturating_sub(1);
 					}
 				}
 			}
@@ -328,7 +368,8 @@ fn change_character_system(
 
 fn player_movement_system(
 	keyboard_input: Res<Input<KeyCode>>,
-	mut characters: Query<&mut Velocity, With<Player>>,
+	mut characters: Query<(&mut Velocity, &Children), With<Player>>,
+	collision_counter_query: Query<&CollisionCount>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
 ) {
 	let right_pressed: bool =
@@ -336,12 +377,14 @@ fn player_movement_system(
 	let left_pressed: bool =
 		keyboard_input.pressed(KeyCode::Left) || keyboard_input.pressed(KeyCode::A);
 
-	for mut velocity in characters.iter_mut() {
+	for (mut velocity, children) in characters.iter_mut() {
 		velocity.linvel.x = 200. * (right_pressed as i8 - left_pressed as i8) as f32;
 
-		if keyboard_input.just_pressed(KeyCode::Space) {
+		if keyboard_input.just_pressed(KeyCode::Space)
+			&& collision_counter_query.get(children[0]).unwrap().0 != 0
+		{
 			audio.send(AudioMsg::Jump).ok();
-			velocity.linvel.y = 500.;
+			velocity.linvel.y = 700.;
 		}
 	}
 }

From 445f3850cad3e881d417533977ad21bf5c3d1828 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 15:39:16 +0200
Subject: [PATCH 11/13] Tutorial levels

---
 README.md               |  1 +
 src/game.rs             | 21 +++++++++++-
 src/levels.rs           | 18 +++++++++++
 src/levels/game_over.rs |  2 +-
 src/levels/level0.rs    | 10 +++---
 src/levels/level1.rs    | 44 +++++++++++++------------
 src/levels/level2.rs    | 72 +++++++++++++++++++++++++++++++++++++++++
 src/levels/level3.rs    | 59 +++++++++++++++++++++++++++++++++
 src/menu.rs             |  2 +-
 9 files changed, 201 insertions(+), 28 deletions(-)
 create mode 100644 src/levels/level2.rs
 create mode 100644 src/levels/level3.rs

diff --git a/README.md b/README.md
index 65737f5..17112e6 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@
 * (?) multiplayer
 * more audio
 * "jumpable" component to avoid jumping on sensors
+* bug: in level2, move the blue character to win, then reset. The characters are lighter than expected.
 
 ## Build
 
diff --git a/src/game.rs b/src/game.rs
index 6cdd7cd..c335c75 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -281,6 +281,25 @@ fn collision_event_system(
 						c_color.0 = filter.apply(c_color.0);
 						*c_material = materials.add(ColorMaterial::from(c_color.0));
 
+						if c_player.is_some() {
+							audio
+								.send(AudioMsg::Color([
+									c_color.0.r(),
+									c_color.0.g(),
+									c_color.0.b(),
+								]))
+								.ok();
+						}
+					} else if let (
+						Ok((mut c_color, _c_transform, mut c_material, c_player)),
+						Ok(filter),
+					) = (
+						character_query.get_mut(*e2),
+						pass_through_filter_query.get(*e1),
+					) {
+						c_color.0 = filter.apply(c_color.0);
+						*c_material = materials.add(ColorMaterial::from(c_color.0));
+
 						if c_player.is_some() {
 							audio
 								.send(AudioMsg::Color([
@@ -425,7 +444,7 @@ fn win_setup(
 				"Press ENTER to level up",
 				TextStyle {
 					font,
-					font_size: 32.0,
+					font_size: 36.0,
 					color: Color::WHITE,
 				},
 			)
diff --git a/src/levels.rs b/src/levels.rs
index ef9557f..ad217e1 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -3,6 +3,8 @@
 mod game_over;
 mod level0;
 mod level1;
+mod level2;
+mod level3;
 
 use crate::game::*;
 
@@ -53,6 +55,22 @@ pub fn post_setup_level(
 					&audio,
 					&asset_server,
 				),
+				2 => level2::setup(
+					&mut commands,
+					&mut meshes,
+					&character_meshes,
+					&mut materials,
+					&audio,
+					&asset_server,
+				),
+				3 => level3::setup(
+					&mut commands,
+					&mut meshes,
+					&character_meshes,
+					&mut materials,
+					&audio,
+					&asset_server,
+				),
 				_ => game_over::setup(
 					&mut commands,
 					&mut meshes,
diff --git a/src/levels/game_over.rs b/src/levels/game_over.rs
index 5fa3372..d513383 100644
--- a/src/levels/game_over.rs
+++ b/src/levels/game_over.rs
@@ -54,7 +54,7 @@ pub fn setup(
 		character_meshes,
 		materials,
 		audio,
-		Transform::from_xyz(-128., -64., 0.),
+		Transform::from_xyz(0., -64., 0.),
 		Color::RED,
 		true,
 	);
diff --git a/src/levels/level0.rs b/src/levels/level0.rs
index 3679121..d6789d8 100644
--- a/src/levels/level0.rs
+++ b/src/levels/level0.rs
@@ -1,3 +1,5 @@
+// Movement tutorial
+
 use crate::game::*;
 
 use bevy::prelude::*;
@@ -14,7 +16,7 @@ pub fn setup(
 	commands
 		.spawn_bundle(Text2dBundle {
 			text: Text::from_section(
-				"Combine the colors to synthetize a white light.\nTab to switch; Arrows to move.",
+				"Combine the colors to synthetize a white light.\nUse arrows to move.",
 				TextStyle {
 					font,
 					font_size: 32.0,
@@ -40,9 +42,9 @@ pub fn setup(
 		materials,
 		audio,
 		[
-			(Transform::from_xyz(-128., -64., 0.), Color::RED),
-			(Transform::from_xyz(0., -64., 0.), Color::GREEN),
-			(Transform::from_xyz(128., -64., 0.), Color::BLUE),
+			(Transform::from_xyz(0., -192., 0.), Color::RED),
+			(Transform::from_xyz(-128., -192., 0.), Color::GREEN),
+			(Transform::from_xyz(128., -192., 0.), Color::BLUE),
 		],
 	);
 }
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
index ce3906b..1d92187 100644
--- a/src/levels/level1.rs
+++ b/src/levels/level1.rs
@@ -1,3 +1,5 @@
+// Switch tutorial
+
 use crate::game::*;
 
 use bevy::prelude::*;
@@ -10,6 +12,22 @@ pub fn setup(
 	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
 	asset_server: &Res<AssetServer>,
 ) {
+	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
+	commands
+		.spawn_bundle(Text2dBundle {
+			text: Text::from_section(
+				"Press Tab to switch.",
+				TextStyle {
+					font,
+					font_size: 32.0,
+					color: Color::WHITE,
+				},
+			)
+			.with_alignment(TextAlignment::CENTER),
+			..Default::default()
+		})
+		.insert(Level);
+
 	spawn_platforms(
 		commands,
 		meshes,
@@ -20,8 +38,8 @@ pub fn setup(
 				Vec2 { x: 800.0, y: 16.0 },
 			),
 			(
-				Transform::from_xyz(256.0, -128.0, 0.0),
-				Vec2 { x: 400.0, y: 16.0 },
+				Transform::from_xyz(128.0, 256.0, 0.0),
+				Vec2 { x: 96.0, y: 16.0 },
 			),
 		],
 	);
@@ -32,25 +50,9 @@ pub fn setup(
 		materials,
 		audio,
 		[
-			(Transform::from_xyz(128., 64., 0.), Color::BLUE),
-			(Transform::from_xyz(-128., -128., 0.), Color::RED),
-			(Transform::from_xyz(0., -128., 0.), Color::GREEN),
+			(Transform::from_xyz(0., -192., 0.), Color::GREEN),
+			(Transform::from_xyz(-128., -192., 0.), Color::RED),
+			(Transform::from_xyz(128., 320., 0.), Color::BLUE),
 		],
 	);
-
-	spawn_absorbing_filter(
-		commands,
-		meshes,
-		materials,
-		Transform::from_xyz(0., 0., 2.),
-		Vec2 { x: 128.0, y: 16.0 },
-		Color::RED,
-	);
-
-	spawn_rotating_filter(
-		commands,
-		asset_server,
-		Transform::from_xyz(256., -224., 2.),
-		45.,
-	);
 }
diff --git a/src/levels/level2.rs b/src/levels/level2.rs
new file mode 100644
index 0000000..91606d5
--- /dev/null
+++ b/src/levels/level2.rs
@@ -0,0 +1,72 @@
+// Absorbing filter tutorial
+
+use crate::game::*;
+
+use bevy::prelude::*;
+
+pub fn setup(
+	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	character_meshes: &Res<CharacterMeshes>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
+	asset_server: &Res<AssetServer>,
+) {
+	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
+	commands
+		.spawn_bundle(Text2dBundle {
+			text: Text::from_section(
+				"Press R to reset.",
+				TextStyle {
+					font,
+					font_size: 32.0,
+					color: Color::WHITE,
+				},
+			)
+			.with_alignment(TextAlignment::CENTER),
+			..Default::default()
+		})
+		.insert(Level);
+
+	spawn_platforms(
+		commands,
+		meshes,
+		materials,
+		[
+			(
+				Transform::from_xyz(0.0, -256.0, 0.0),
+				Vec2 { x: 800.0, y: 16.0 },
+			),
+			(
+				Transform::from_xyz(0.0, -128.0, 0.0),
+				Vec2 { x: 800.0, y: 16.0 },
+			),
+		],
+	);
+
+	spawn_characters(
+		commands,
+		character_meshes,
+		materials,
+		audio,
+		[
+			(
+				Transform::from_xyz(-128., -192., 0.),
+				Color::rgba(1., 0.64, 0., 1.),
+			),
+			(
+				Transform::from_xyz(128., -192., 0.),
+				Color::rgba(0., 0.37, 1., 1.),
+			),
+		],
+	);
+
+	spawn_absorbing_filter(
+		commands,
+		meshes,
+		materials,
+		Transform::from_xyz(0., -192., 2.),
+		Vec2 { x: 16.0, y: 112.0 },
+		Color::RED,
+	);
+}
diff --git a/src/levels/level3.rs b/src/levels/level3.rs
new file mode 100644
index 0000000..5fa2607
--- /dev/null
+++ b/src/levels/level3.rs
@@ -0,0 +1,59 @@
+// Rotating filter tutorial
+
+use crate::game::*;
+
+use bevy::prelude::*;
+
+pub fn setup(
+	commands: &mut Commands,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	character_meshes: &Res<CharacterMeshes>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
+	asset_server: &Res<AssetServer>,
+) {
+	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
+	commands
+		.spawn_bundle(Text2dBundle {
+			text: Text::from_section(
+				"Let's rotate the hue!",
+				TextStyle {
+					font,
+					font_size: 32.0,
+					color: Color::WHITE,
+				},
+			)
+			.with_alignment(TextAlignment::CENTER),
+			..Default::default()
+		})
+		.insert(Level);
+
+	spawn_platforms(
+		commands,
+		meshes,
+		materials,
+		[(
+			Transform::from_xyz(0.0, -256.0, 0.0),
+			Vec2 { x: 800.0, y: 16.0 },
+		)],
+	);
+
+	spawn_characters(
+		commands,
+		character_meshes,
+		materials,
+		audio,
+		[
+			(Transform::from_xyz(0., -192., 0.), Color::RED),
+			(Transform::from_xyz(-128., -192., 0.), Color::RED),
+			(Transform::from_xyz(128., -192., 0.), Color::RED),
+		],
+	);
+
+	spawn_rotating_filter(
+		commands,
+		asset_server,
+		Transform::from_xyz(0., -64., 2.),
+		45.,
+	);
+}
diff --git a/src/menu.rs b/src/menu.rs
index 52bcdb9..fff9778 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -26,7 +26,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 				"BEVYJAM",
 				TextStyle {
 					font: font.clone(),
-					font_size: 48.0,
+					font_size: 96.0,
 					color: Color::WHITE,
 				},
 			)

From 21d98a4a1d5705146cec97098ed3fea164f7add0 Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 15:52:28 +0200
Subject: [PATCH 12/13] cli: skip to level

---
 src/game.rs |  5 ++++-
 src/main.rs | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/game.rs b/src/game.rs
index c335c75..eba3d44 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -21,6 +21,8 @@ pub enum AudioMsg {
 	Switch,
 }
 
+pub struct FirstLevel(pub LevelId);
+
 #[derive(Clone, Copy, Eq, Hash, PartialEq)]
 pub struct LevelId(pub u32);
 
@@ -99,12 +101,13 @@ pub struct CollisionCount(usize);
 // Systems
 
 fn setup(
+	first_level: Res<FirstLevel>,
 	mut current_level: ResMut<CurrentLevel>,
 	mut level_startup_event: EventWriter<LevelStartupEvent>,
 	mut camera_query: Query<&mut Transform, With<Camera>>,
 ) {
 	if current_level.0.is_none() {
-		current_level.0 = Some(LevelId(0));
+		current_level.0 = Some(first_level.0);
 	}
 
 	crate::levels::setup_level(&mut level_startup_event, &mut camera_query);
diff --git a/src/main.rs b/src/main.rs
index 08b60fa..6cb80d7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,10 +26,20 @@ fn main() {
 	#[cfg(not(target_arch = "wasm32"))]
 	std::thread::spawn(move || audio::setup(audio_event_receiver));
 
+	#[cfg(not(target_arch = "wasm32"))]
+	let first_level = game::LevelId(
+		std::env::args()
+			.nth(1)
+			.map_or(0, |s| s.parse().unwrap_or(0)),
+	);
+	#[cfg(target_arch = "wasm32")]
+	let first_level = game::LevelId(0);
+
 	App::new()
 		.insert_resource(Msaa { samples: 4 })
 		.insert_resource(audio_event_sender)
 		.add_state(AppState::Menu)
+		.insert_resource(game::FirstLevel(first_level))
 		.insert_resource(ClearColor(Color::BLACK))
 		.add_plugins(DefaultPlugins)
 		.add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(64.0))

From 1d22c11cde12798dbbda9ec80e9999831786bffd Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Thu, 25 Aug 2022 19:55:34 +0200
Subject: [PATCH 13/13] Levels stored outside program

---
 Cargo.lock              |  14 ++++
 Cargo.toml              |   2 +
 assets/game.levels.json | 119 ++++++++++++++++++++++++++
 src/levels.rs           | 180 ++++++++++++++++++++++++++++++----------
 src/levels/game_over.rs |  61 --------------
 src/levels/level0.rs    |  50 -----------
 src/levels/level1.rs    |  58 -------------
 src/levels/level2.rs    |  72 ----------------
 src/levels/level3.rs    |  59 -------------
 src/main.rs             |  12 +--
 10 files changed, 280 insertions(+), 347 deletions(-)
 create mode 100644 assets/game.levels.json
 delete mode 100644 src/levels/game_over.rs
 delete mode 100644 src/levels/level0.rs
 delete mode 100644 src/levels/level1.rs
 delete mode 100644 src/levels/level2.rs
 delete mode 100644 src/levels/level3.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3ddac41..f26df36 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -316,6 +316,18 @@ dependencies = [
  "rodio",
 ]
 
+[[package]]
+name = "bevy_common_assets"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f7be9ee39085d8319d5cd853447b0b5c4f8b4bfd647aec91e2bd996e9db67ef"
+dependencies = [
+ "anyhow",
+ "bevy",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "bevy_core"
 version = "0.8.1"
@@ -898,6 +910,7 @@ version = "0.1.0"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
+ "bevy_common_assets",
  "bevy_rapier2d",
  "cpal 0.14.0",
  "crossbeam-channel",
@@ -905,6 +918,7 @@ dependencies = [
  "rand",
  "rand_distr",
  "rapier2d",
+ "serde",
  "ticktock",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index f50dc6f..df12e56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,12 +7,14 @@ edition = "2021"
 
 [dependencies]
 bevy = "0.8.1"
+bevy_common_assets = { version = "0.3.0", features = ["json"] }
 bevy-inspector-egui = "0.12.1"
 bevy_rapier2d = "0.16.2"
 crossbeam-channel = "0.5.6"
 rand = "0.8.5"
 rand_distr = "0.4.3"
 rapier2d = "0.14.0"
+serde = { version = "1.0.144", features = ["derive"] }
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies]
 cpal = "0.14.0"
diff --git a/assets/game.levels.json b/assets/game.levels.json
new file mode 100644
index 0000000..549c17b
--- /dev/null
+++ b/assets/game.levels.json
@@ -0,0 +1,119 @@
+{
+	"levels": [
+		{
+			"comment": "Movement tutorial",
+			"platforms": [
+				{"pos": [0, -256], "size": [800, 16]}
+			],
+			"characters": [
+				{"pos": [0, -192], "color": [1,0,0,1]},
+				{"pos": [-128, -192], "color": [0,1,0,1]},
+				{"pos": [128, -192], "color": [0,0,1,1]}
+			],
+			"absorbing_filters": [],
+			"rotating_filters": [],
+			"texts": [
+				{
+					"pos": [0, 0],
+					"font_size": 32,
+					"text": "Combine the colors to synthetize a white light.\nUse arrows to move."
+				}
+			]
+		},
+		{
+			"comment": "Switch tutorial",
+			"platforms": [
+				{"pos": [0, -256], "size": [800, 16]},
+				{"pos": [128, 256], "size": [96, 16]}
+			],
+			"characters": [
+				{"pos": [0, -192], "color": [0,1,0,1]},
+				{"pos": [-128, -192], "color": [1,0,0,1]},
+				{"pos": [128, 320], "color": [0,0,1,1]}
+			],
+			"absorbing_filters": [],
+			"rotating_filters": [],
+			"texts": [
+				{
+					"pos": [0, 0],
+					"font_size": 32,
+					"text": "Press Tab to switch."
+				}
+			]
+		},
+		{
+			"comment": "Absorbing filter tutorial",
+			"platforms": [
+				{"pos": [0, -256], "size": [800, 16]},
+				{"pos": [0, -128], "size": [800, 16]}
+			],
+			"characters": [
+				{"pos": [-128, -192], "color": [1,0.64,0,1]},
+				{"pos": [128, -192], "color": [0,0.37,1,1]}
+			],
+			"absorbing_filters": [
+				{
+					"pos": [0, -192],
+					"size": [16, 112],
+					"color": [1,0,0,1]
+				}
+			],
+			"rotating_filters": [],
+			"texts": [
+				{
+					"pos": [0, 0],
+					"font_size": 32,
+					"text": "Press R to reset."
+				}
+			]
+		},
+		{
+			"comment": "Rotating filter tutorial",
+			"platforms": [
+				{"pos": [0, -256], "size": [800, 16]}
+			],
+			"characters": [
+				{"pos": [0, -192], "color": [1,0,0,1]},
+				{"pos": [-128, -192], "color": [1,0,0,1]},
+				{"pos": [128, -192], "color": [1,0,0,1]}
+			],
+			"absorbing_filters": [],
+			"rotating_filters": [
+				{
+					"pos": [0, -64],
+					"angle": 45
+				}
+			],
+			"texts": [
+				{
+					"pos": [0, 0],
+					"font_size": 32,
+					"text": "Let's rotate the hue!"
+				}
+			]
+		},
+		{
+			"comment": "Game over",
+			"platforms": [
+				{"pos": [0, -256], "size": [800, 16]}
+			],
+			"characters": [
+				{"pos": [0, -64], "color": [1,0,0,1]}
+			],
+			"absorbing_filters": [],
+			"rotating_filters": [],
+			"texts": [
+				{
+					"pos": [0, 128],
+					"font_size": 48,
+					"text": "Thank you for playing!"
+				},
+				{
+					"pos": [0, 0],
+					"font_size": 32,
+					"text": "There is no more light to combine."
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/levels.rs b/src/levels.rs
index ad217e1..c131e63 100644
--- a/src/levels.rs
+++ b/src/levels.rs
@@ -1,14 +1,9 @@
 #![allow(clippy::too_many_arguments)]
 
-mod game_over;
-mod level0;
-mod level1;
-mod level2;
-mod level3;
-
 use crate::game::*;
 
-use bevy::prelude::*;
+use bevy::{prelude::*, reflect::TypeUuid};
+use serde::{Deserialize, Serialize};
 
 pub fn setup_level(
 	level_startup_event: &mut EventWriter<LevelStartupEvent>,
@@ -35,51 +30,152 @@ pub fn post_setup_level(
 	mut level_startup_event: EventReader<LevelStartupEvent>,
 	asset_server: Res<AssetServer>,
 	audio: Res<crossbeam_channel::Sender<AudioMsg>>,
+	stored_levels_assets: Res<Assets<StoredLevels>>,
+	stored_levels_handle: Res<Handle<StoredLevels>>,
 ) {
 	for _ in level_startup_event.iter() {
 		if let Some(level_id) = current_level.0 {
-			match level_id.0 {
-				0 => level0::setup(
+			if let Some(stored_level) = stored_levels_assets
+				.get(&stored_levels_handle)
+				.unwrap()
+				.levels
+				.get(level_id.0 as usize)
+			{
+				spawn_stored_level(
 					&mut commands,
-					&mut meshes,
 					&character_meshes,
-					&mut materials,
-					&audio,
-					&asset_server,
-				),
-				1 => level1::setup(
-					&mut commands,
 					&mut meshes,
-					&character_meshes,
 					&mut materials,
-					&audio,
 					&asset_server,
-				),
-				2 => level2::setup(
-					&mut commands,
-					&mut meshes,
-					&character_meshes,
-					&mut materials,
 					&audio,
-					&asset_server,
-				),
-				3 => level3::setup(
-					&mut commands,
-					&mut meshes,
-					&character_meshes,
-					&mut materials,
-					&audio,
-					&asset_server,
-				),
-				_ => game_over::setup(
-					&mut commands,
-					&mut meshes,
-					&character_meshes,
-					&mut materials,
-					&audio,
-					&asset_server,
-				),
+					stored_level,
+				);
 			}
 		}
 	}
 }
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "1fbba930-644b-0d62-2514-4b302b945327"]
+pub struct StoredLevels {
+	levels: Vec<StoredLevel>,
+}
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "a1464a30-1f57-a654-d56c-ded41032af0b"]
+pub struct StoredLevel {
+	pub comment: String,
+	pub characters: Vec<StoredCharacter>,
+	pub platforms: Vec<StoredPlatform>,
+	pub absorbing_filters: Vec<StoredAbsorbingFilter>,
+	pub rotating_filters: Vec<StoredRotatingFilter>,
+	pub texts: Vec<StoredText>,
+}
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "1c798f8c-ef15-c528-693e-76becdef6b10"]
+pub struct StoredCharacter {
+	pub pos: Vec2,
+	pub color: Vec4,
+}
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "31696095-59de-93be-b5e9-333c2afbc900"]
+pub struct StoredPlatform {
+	pub pos: Vec2,
+	pub size: Vec2,
+}
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "bcad7fff-0605-c4e3-3cd4-42d5bbaad926"]
+pub struct StoredAbsorbingFilter {
+	pub pos: Vec2,
+	pub size: Vec2,
+	pub color: Vec4,
+}
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "fa2843f2-6e34-601b-6c46-4827b0370b3f"]
+pub struct StoredRotatingFilter {
+	pub pos: Vec2,
+	pub angle: f32,
+}
+
+#[derive(Deserialize, Serialize, TypeUuid)]
+#[uuid = "72f6321a-f01f-6eea-9b17-3159837a2fd3"]
+pub struct StoredText {
+	pub pos: Vec2,
+	pub font_size: f32,
+	pub text: String,
+}
+
+pub fn spawn_stored_level(
+	commands: &mut Commands,
+	character_meshes: &Res<CharacterMeshes>,
+	meshes: &mut ResMut<Assets<Mesh>>,
+	materials: &mut ResMut<Assets<ColorMaterial>>,
+	asset_server: &Res<AssetServer>,
+	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
+
+	stored_level: &StoredLevel,
+) {
+	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
+	spawn_platforms(
+		commands,
+		meshes,
+		materials,
+		stored_level.platforms.iter().map(|platform| {
+			(
+				Transform::from_xyz(platform.pos.x, platform.pos.y, 0.),
+				platform.size,
+			)
+		}),
+	);
+	spawn_characters(
+		commands,
+		character_meshes,
+		materials,
+		audio,
+		stored_level.characters.iter().map(|character| {
+			(
+				Transform::from_xyz(character.pos.x, character.pos.y, 0.),
+				character.color.into(),
+			)
+		}),
+	);
+	for absorbing_filter in stored_level.absorbing_filters.iter() {
+		spawn_absorbing_filter(
+			commands,
+			meshes,
+			materials,
+			Transform::from_xyz(absorbing_filter.pos.x, absorbing_filter.pos.y, 2.),
+			absorbing_filter.size,
+			absorbing_filter.color.into(),
+		);
+	}
+	for rotating_filter in stored_level.rotating_filters.iter() {
+		spawn_rotating_filter(
+			commands,
+			asset_server,
+			Transform::from_xyz(rotating_filter.pos.x, rotating_filter.pos.y, 2.),
+			rotating_filter.angle,
+		);
+	}
+	for text in stored_level.texts.iter() {
+		commands
+			.spawn_bundle(Text2dBundle {
+				text: Text::from_section(
+					&text.text,
+					TextStyle {
+						font: font.clone(),
+						font_size: text.font_size,
+						color: Color::WHITE,
+					},
+				)
+				.with_alignment(TextAlignment::CENTER),
+				transform: Transform::from_xyz(text.pos.x, text.pos.y, 0.),
+				..Default::default()
+			})
+			.insert(Level);
+	}
+}
diff --git a/src/levels/game_over.rs b/src/levels/game_over.rs
deleted file mode 100644
index d513383..0000000
--- a/src/levels/game_over.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use crate::game::*;
-
-use bevy::prelude::*;
-
-pub fn setup(
-	commands: &mut Commands,
-	meshes: &mut ResMut<Assets<Mesh>>,
-	character_meshes: &Res<CharacterMeshes>,
-	materials: &mut ResMut<Assets<ColorMaterial>>,
-	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
-	asset_server: &Res<AssetServer>,
-) {
-	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
-	commands
-		.spawn_bundle(Text2dBundle {
-			text: Text::from_section(
-				"Thank you for playing!",
-				TextStyle {
-					font: font.clone(),
-					font_size: 48.0,
-					color: Color::WHITE,
-				},
-			)
-			.with_alignment(TextAlignment::CENTER),
-			transform: Transform::from_xyz(0., 128.0, 0.),
-			..Default::default()
-		})
-		.insert(Level);
-	commands
-		.spawn_bundle(Text2dBundle {
-			text: Text::from_section(
-				"There is no more light to combine.",
-				TextStyle {
-					font,
-					font_size: 32.0,
-					color: Color::WHITE,
-				},
-			)
-			.with_alignment(TextAlignment::CENTER),
-			..Default::default()
-		})
-		.insert(Level);
-
-	spawn_platform(
-		commands,
-		meshes,
-		materials,
-		Transform::from_xyz(0.0, -256.0, 0.0),
-		Vec2 { x: 800.0, y: 16.0 },
-	);
-
-	spawn_character(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		Transform::from_xyz(0., -64., 0.),
-		Color::RED,
-		true,
-	);
-}
diff --git a/src/levels/level0.rs b/src/levels/level0.rs
deleted file mode 100644
index d6789d8..0000000
--- a/src/levels/level0.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Movement tutorial
-
-use crate::game::*;
-
-use bevy::prelude::*;
-
-pub fn setup(
-	commands: &mut Commands,
-	meshes: &mut ResMut<Assets<Mesh>>,
-	character_meshes: &Res<CharacterMeshes>,
-	materials: &mut ResMut<Assets<ColorMaterial>>,
-	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
-	asset_server: &Res<AssetServer>,
-) {
-	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
-	commands
-		.spawn_bundle(Text2dBundle {
-			text: Text::from_section(
-				"Combine the colors to synthetize a white light.\nUse arrows to move.",
-				TextStyle {
-					font,
-					font_size: 32.0,
-					color: Color::WHITE,
-				},
-			)
-			.with_alignment(TextAlignment::CENTER),
-			..Default::default()
-		})
-		.insert(Level);
-
-	spawn_platform(
-		commands,
-		meshes,
-		materials,
-		Transform::from_xyz(0.0, -256.0, 0.0),
-		Vec2 { x: 800.0, y: 16.0 },
-	);
-
-	spawn_characters(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		[
-			(Transform::from_xyz(0., -192., 0.), Color::RED),
-			(Transform::from_xyz(-128., -192., 0.), Color::GREEN),
-			(Transform::from_xyz(128., -192., 0.), Color::BLUE),
-		],
-	);
-}
diff --git a/src/levels/level1.rs b/src/levels/level1.rs
deleted file mode 100644
index 1d92187..0000000
--- a/src/levels/level1.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Switch tutorial
-
-use crate::game::*;
-
-use bevy::prelude::*;
-
-pub fn setup(
-	commands: &mut Commands,
-	meshes: &mut ResMut<Assets<Mesh>>,
-	character_meshes: &Res<CharacterMeshes>,
-	materials: &mut ResMut<Assets<ColorMaterial>>,
-	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
-	asset_server: &Res<AssetServer>,
-) {
-	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
-	commands
-		.spawn_bundle(Text2dBundle {
-			text: Text::from_section(
-				"Press Tab to switch.",
-				TextStyle {
-					font,
-					font_size: 32.0,
-					color: Color::WHITE,
-				},
-			)
-			.with_alignment(TextAlignment::CENTER),
-			..Default::default()
-		})
-		.insert(Level);
-
-	spawn_platforms(
-		commands,
-		meshes,
-		materials,
-		[
-			(
-				Transform::from_xyz(0.0, -256.0, 0.0),
-				Vec2 { x: 800.0, y: 16.0 },
-			),
-			(
-				Transform::from_xyz(128.0, 256.0, 0.0),
-				Vec2 { x: 96.0, y: 16.0 },
-			),
-		],
-	);
-
-	spawn_characters(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		[
-			(Transform::from_xyz(0., -192., 0.), Color::GREEN),
-			(Transform::from_xyz(-128., -192., 0.), Color::RED),
-			(Transform::from_xyz(128., 320., 0.), Color::BLUE),
-		],
-	);
-}
diff --git a/src/levels/level2.rs b/src/levels/level2.rs
deleted file mode 100644
index 91606d5..0000000
--- a/src/levels/level2.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Absorbing filter tutorial
-
-use crate::game::*;
-
-use bevy::prelude::*;
-
-pub fn setup(
-	commands: &mut Commands,
-	meshes: &mut ResMut<Assets<Mesh>>,
-	character_meshes: &Res<CharacterMeshes>,
-	materials: &mut ResMut<Assets<ColorMaterial>>,
-	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
-	asset_server: &Res<AssetServer>,
-) {
-	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
-	commands
-		.spawn_bundle(Text2dBundle {
-			text: Text::from_section(
-				"Press R to reset.",
-				TextStyle {
-					font,
-					font_size: 32.0,
-					color: Color::WHITE,
-				},
-			)
-			.with_alignment(TextAlignment::CENTER),
-			..Default::default()
-		})
-		.insert(Level);
-
-	spawn_platforms(
-		commands,
-		meshes,
-		materials,
-		[
-			(
-				Transform::from_xyz(0.0, -256.0, 0.0),
-				Vec2 { x: 800.0, y: 16.0 },
-			),
-			(
-				Transform::from_xyz(0.0, -128.0, 0.0),
-				Vec2 { x: 800.0, y: 16.0 },
-			),
-		],
-	);
-
-	spawn_characters(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		[
-			(
-				Transform::from_xyz(-128., -192., 0.),
-				Color::rgba(1., 0.64, 0., 1.),
-			),
-			(
-				Transform::from_xyz(128., -192., 0.),
-				Color::rgba(0., 0.37, 1., 1.),
-			),
-		],
-	);
-
-	spawn_absorbing_filter(
-		commands,
-		meshes,
-		materials,
-		Transform::from_xyz(0., -192., 2.),
-		Vec2 { x: 16.0, y: 112.0 },
-		Color::RED,
-	);
-}
diff --git a/src/levels/level3.rs b/src/levels/level3.rs
deleted file mode 100644
index 5fa2607..0000000
--- a/src/levels/level3.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Rotating filter tutorial
-
-use crate::game::*;
-
-use bevy::prelude::*;
-
-pub fn setup(
-	commands: &mut Commands,
-	meshes: &mut ResMut<Assets<Mesh>>,
-	character_meshes: &Res<CharacterMeshes>,
-	materials: &mut ResMut<Assets<ColorMaterial>>,
-	audio: &Res<crossbeam_channel::Sender<AudioMsg>>,
-	asset_server: &Res<AssetServer>,
-) {
-	let font = asset_server.get_handle("UacariLegacy-Thin.ttf");
-	commands
-		.spawn_bundle(Text2dBundle {
-			text: Text::from_section(
-				"Let's rotate the hue!",
-				TextStyle {
-					font,
-					font_size: 32.0,
-					color: Color::WHITE,
-				},
-			)
-			.with_alignment(TextAlignment::CENTER),
-			..Default::default()
-		})
-		.insert(Level);
-
-	spawn_platforms(
-		commands,
-		meshes,
-		materials,
-		[(
-			Transform::from_xyz(0.0, -256.0, 0.0),
-			Vec2 { x: 800.0, y: 16.0 },
-		)],
-	);
-
-	spawn_characters(
-		commands,
-		character_meshes,
-		materials,
-		audio,
-		[
-			(Transform::from_xyz(0., -192., 0.), Color::RED),
-			(Transform::from_xyz(-128., -192., 0.), Color::RED),
-			(Transform::from_xyz(128., -192., 0.), Color::RED),
-		],
-	);
-
-	spawn_rotating_filter(
-		commands,
-		asset_server,
-		Transform::from_xyz(0., -64., 2.),
-		45.,
-	);
-}
diff --git a/src/main.rs b/src/main.rs
index 6cb80d7..410492a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@ use bevy::{
 	prelude::*,
 	window::{WindowId, WindowMode},
 };
+use bevy_common_assets::json::JsonAssetPlugin;
 use bevy_rapier2d::prelude::*;
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
@@ -42,6 +43,9 @@ fn main() {
 		.insert_resource(game::FirstLevel(first_level))
 		.insert_resource(ClearColor(Color::BLACK))
 		.add_plugins(DefaultPlugins)
+		.add_plugin(JsonAssetPlugin::<levels::StoredLevels>::new(&[
+			"levels.json",
+		]))
 		.add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(64.0))
 		//.add_plugin(RapierDebugRenderPlugin::default())
 		.add_plugin(menu::MenuPlugin)
@@ -59,11 +63,9 @@ fn setup(mut commands: Commands, mut windows: ResMut<Windows>, asset_server: Res
 		.unwrap()
 		.set_title(String::from("Bevyjam"));
 
-	let font: Handle<Font> = asset_server.load("UacariLegacy-Thin.ttf");
-	commands.insert_resource(font);
-
-	let bevy_icon: Handle<Image> = asset_server.load("bevy.png");
-	commands.insert_resource(bevy_icon);
+	commands.insert_resource(asset_server.load::<levels::StoredLevels, _>("game.levels.json"));
+	commands.insert_resource(asset_server.load::<Font, _>("UacariLegacy-Thin.ttf"));
+	commands.insert_resource(asset_server.load::<Image, _>("bevy.png"));
 
 	commands.spawn_bundle(Camera2dBundle::default());
 	commands.insert_resource(AmbientLight {