From d9fc3acb249ceb54ae5275def9ebf85588731afd Mon Sep 17 00:00:00 2001
From: Ben Frankel <ben.frankel7@gmail.com>
Date: Sun, 10 Dec 2023 17:49:35 -0800
Subject: [PATCH] Add name progression to Touch Typing

---
 src/upgrade.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/upgrade.rs b/src/upgrade.rs
index d3210c4..9b3ea7b 100644
--- a/src/upgrade.rs
+++ b/src/upgrade.rs
@@ -909,16 +909,18 @@ generate_upgrade_list!(
     },
 
     TouchTyping: Upgrade {
-        name: "Touch Typing".to_string(),
+        name: "Touch Typing (40 WPM)".to_string(),
         desc: "\
             Improves your typing skills. \
-            Doubles the number of characters typed per key press.\
+            Multiplies the characters typed per key press by VALUE.\
         ".to_string(),
+        value: 2.0,
         sound: Some(SoundEffectKind::Keyboard),
-        installed_min: vec![(MechanicalKeyboard, 1)],
+        no_count: true,
         base_cost: 150.0,
         weight: 1.0,
-        remaining: 4,
+        remaining: 3,
+        installed_min: vec![(MechanicalKeyboard, 1)],
         install: Some(world.register_system(|
             mut typer_query: Query<&mut CodeTyper>,
             mut upgrade_list: ResMut<UpgradeList>,
@@ -926,6 +928,8 @@ generate_upgrade_list!(
             let this = &mut upgrade_list[TouchTyping];
             // Cost scaling of this is independent of tech debt.
             this.base_cost *= 2.0;
+            this.value *= 2.0;
+            this.name = format!("Touch Typing ({} WPM)", 40 * 2i32.pow(3 - this.remaining as u32));
             for mut typer in &mut typer_query {
                 typer.chars_per_key *= 2;
             }
@@ -1005,7 +1009,7 @@ generate_upgrade_list!(
         const COSTS: [f64; 4] = [1000.0, 5000.0, 25_000.0, 500_000.0];
 
         Upgrade {
-            name: format!("Coding LLM {}B", PARAMETERS[0]).to_string(),
+            name: format!("Coding LLM ({}B)", PARAMETERS[0]).to_string(),
             desc: format!(desc_template!(), PARAMETERS[0], CHARS[0]).to_string(),
             no_count: true,
             tech_debt: 1.0,
@@ -1025,7 +1029,7 @@ generate_upgrade_list!(
                 let next_idx = current_idx + 1;
                 if next_idx < 4 {
                     this.base_cost = COSTS[next_idx];
-                    this.name = format!("Coding LLM {}B", PARAMETERS[next_idx]).to_string();
+                    this.name = format!("Coding LLM ({}B)", PARAMETERS[next_idx]).to_string();
                     this.desc = format!(
                         desc_template!(), PARAMETERS[next_idx], CHARS[next_idx],
                     ).to_string();