From 30767e8e0e6f6b20c92efed29828589b41a64c8f Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Sat, 15 Nov 2025 16:28:38 -0700 Subject: [PATCH] Fix tower and price listing --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/discord/improvements.rs | 8 ++++++-- src/models/improvements.rs | 10 +++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2893db5..4b83825 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1093,7 +1093,7 @@ dependencies = [ [[package]] name = "fren" -version = "2.5.0" +version = "2.5.1" dependencies = [ "axum 0.8.1", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index e8595ea..51d8a41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fren" -version = "2.5.0" +version = "2.5.1" edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/discord/improvements.rs b/src/discord/improvements.rs index 55f19a4..771ff35 100644 --- a/src/discord/improvements.rs +++ b/src/discord/improvements.rs @@ -20,7 +20,11 @@ pub async fn improvements(ctx: Context<'_>) -> Result<(), Error> { if let Some(improvement) = Improvements::get_improvement(&ctx.data().db, improvement_type)? { if improvement_type.has_levels() { - msg_builder.push(format!(" (✅ Level={}) ", improvement.level)); + msg_builder.push(format!( + "({} FC Level={}) ", + improvement_type.price().separate_with_commas(), + improvement.level + )); } else { msg_builder.push(" (✅) "); } @@ -129,7 +133,7 @@ pub async fn jotchua_college_fund(ctx: Context<'_>) -> Result<(), Error> { }; ctx.reply(format!( - "{jotch} has {} FC in the bank for his college fund!", + "{jotch} has {} FC in the bank for his college fund!", college_savings )) .await?; diff --git a/src/models/improvements.rs b/src/models/improvements.rs index aa63429..998781e 100644 --- a/src/models/improvements.rs +++ b/src/models/improvements.rs @@ -62,6 +62,7 @@ impl ImprovementType { #[allow(clippy::match_like_matches_macro)] match self { ImprovementType::FriendshipTower => true, + ImprovementType::JotchuaCollegeFund => true, _ => false, } } @@ -138,12 +139,15 @@ impl Improvements { let entry = improvements .improvements .entry(improvement_type) - .or_insert(Improvement { level: 1 }) - .clone(); + .or_insert(Improvement { level: 0 }); + + entry.level += 1; + + let level = entry.level; db.insert(improvements)?; - Ok(entry.level) + Ok(level) } pub fn has_improvement(