Add click-spawn upgrades

src/state/editor_screen/scene_view.rs

@@ -23,9 +23,19 @@ impl Plugin for SceneViewPlugin {
     }
 }
 
-#[derive(Component, Reflect, Default)]
+#[derive(Component, Reflect)]
 pub struct SceneView {
     pub spawns_per_click: f64,
+    pub spawns_per_click_multiplier_per_click: f64,
+}
+
+impl Default for SceneView {
+    fn default() -> Self {
+        Self {
+            spawns_per_click: 0.0,
+            spawns_per_click_multiplier_per_click: 1.0,
+        }
+    }
 }
 
 pub fn spawn_scene_view(commands: &mut Commands) -> Entity {
@@ -52,24 +62,25 @@ fn click_spawn(
     mut events: EventWriter<SpawnEvent>,
     root: Res<AppRoot>,
     camera_query: Query<(&Camera, &GlobalTransform)>,
-    scene_view_query: Query<&SceneView>,
+    mut scene_view_query: Query<&mut SceneView>,
 ) {
     let Ok((camera, camera_gt)) = camera_query.get(root.camera) else {
         return;
     };
-    let world_pos = camera
-        .viewport_to_world(camera_gt, listener.pointer_location.position)
-        .unwrap()
-        .origin
-        .truncate();
+    let Some(position) = camera.viewport_to_world_2d(camera_gt, listener.pointer_location.position)
+    else {
+        return;
+    };
+
+    let Ok(mut scene_view) = scene_view_query.get_mut(listener.target) else {
+        return;
+    };
 
     events.send(SpawnEvent {
-        position: world_pos,
-        count: scene_view_query
-            .get(listener.target)
-            .unwrap()
-            .spawns_per_click,
+        position,
+        count: scene_view.spawns_per_click,
     });
+    scene_view.spawns_per_click *= scene_view.spawns_per_click_multiplier_per_click;
 }
 
 #[derive(Resource, Reflect, Default)]

src/upgrade.rs

@@ -731,12 +731,29 @@ generate_upgrade_list!(
         ..default()
     },
 
+    LaptopSticker: Upgrade {
+        name: "Laptop Sticker".to_string(),
+        desc: "Spawns 1 more entity per click.".to_string(),
+        base_cost: 15.0,
+        weight: 1.0,
+        remaining: 4,
+        install: Some(
+            world.register_system(|mut scene_view_query: Query<&mut SceneView>| {
+                for mut scene_view in &mut scene_view_query {
+                    scene_view.spawns_per_click += 1.0;
+                }
+            }),
+        ),
+        ..default()
+    },
+
     Coffee: Upgrade {
         name: "Coffee".to_string(),
         desc: "Quadruples the number of entities spawned per click.".to_string(),
-        base_cost: 25.0,
-        weight: 1.0,
+        base_cost: 200.0,
+        weight: 2.0,
         remaining: 3,
+        installed_min: vec![(LaptopSticker, 4)],
         install: Some(
             world.register_system(|mut scene_view_query: Query<&mut SceneView>| {
                 for mut scene_view in &mut scene_view_query {
@@ -747,6 +764,39 @@ generate_upgrade_list!(
         ..default()
     },
 
+    ProgrammingSock: Upgrade {
+        name: "Programming Sock".to_string(),
+        desc: "Squares the number of entities spawned per click.".to_string(),
+        base_cost: 5_000.0,
+        weight: 2.0,
+        remaining: 2,
+        installed_min: vec![(Coffee, 3)],
+        install: Some(
+            world.register_system(|mut scene_view_query: Query<&mut SceneView>| {
+                for mut scene_view in &mut scene_view_query {
+                    scene_view.spawns_per_click *= scene_view.spawns_per_click;
+                }
+            }),
+        ),
+        ..default()
+    },
+
+    StandingDesk: Upgrade {
+        name: "Standing Desk".to_string(),
+        desc: "Doubles the number of entities spawned per click, per click.".to_string(),
+        base_cost: 1e9,
+        weight: 1.0,
+        installed_min: vec![(ProgrammingSock, 2)],
+        install: Some(
+            world.register_system(|mut scene_view_query: Query<&mut SceneView>| {
+                for mut scene_view in &mut scene_view_query {
+                    scene_view.spawns_per_click_multiplier_per_click += 2.0;
+                }
+            }),
+        ),
+        ..default()
+    },
+
     // Entities (automatic)
 
     EntitySpawnerPlugin: Upgrade {