From 773665635dbab159f6d7c870c23513201724d229 Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (local)" Date: Thu, 21 May 2026 09:42:12 +0200 Subject: [PATCH] =?UTF-8?q?Behebe=20unn=C3=B6tige=20Z=C3=A4hlvariablen=20u?= =?UTF-8?q?nd=20verbessere=20die=20Lesbarkeit=20in=20mehreren=20Modulen:?= =?UTF-8?q?=20Entferne=20die=20Z=C3=A4hlvariable=20f=C3=BCr=20Transporte?= =?UTF-8?q?=20in=20DirectorWorker,=20optimiere=20die=20Filterung=20in=20Fa?= =?UTF-8?q?lukantFamilyWorker=20und=20passe=20die=20Bedingungen=20in=20Fal?= =?UTF-8?q?ukantServants=20und=20Underground=20an,=20um=20die=20Lesbarkeit?= =?UTF-8?q?=20zu=20erh=C3=B6hen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/worker/director.rs | 2 - src/worker/events.rs | 4 ++ src/worker/falukant_family.rs | 84 ++++++++++++++++----------------- src/worker/falukant_servants.rs | 5 +- src/worker/underground.rs | 1 + 5 files changed, 46 insertions(+), 50 deletions(-) diff --git a/src/worker/director.rs b/src/worker/director.rs index 549fda0..2ae5e5d 100644 --- a/src/worker/director.rs +++ b/src/worker/director.rs @@ -1407,13 +1407,11 @@ impl DirectorWorker { )?; // Leere Transporte für alle verfügbaren Fahrzeuge anlegen - let mut _transport_count = 0; for vehicle in &vehicles { conn.execute( "insert_empty_transport", &[&target_region_id, ¤t_region_id, &vehicle.id], )?; - _transport_count += 1; } diff --git a/src/worker/events.rs b/src/worker/events.rs index 55396ca..d09947c 100644 --- a/src/worker/events.rs +++ b/src/worker/events.rs @@ -1300,6 +1300,7 @@ impl EventsWorker { } /// Behandelt Geldänderungen für persönliche Events (inkl. Spezialfälle „windfall“ und „theft“). + #[allow(clippy::too_many_arguments)] fn handle_money_change_effect( conn: &mut DbConnection, event: &RandomEvent, @@ -1436,6 +1437,7 @@ impl EventsWorker { } /// Behandelt Gesundheitsänderungen bei persönlichen Events. + #[allow(clippy::too_many_arguments)] fn handle_personal_character_health_effect( conn: &mut DbConnection, user_id: i32, @@ -1494,6 +1496,7 @@ impl EventsWorker { } /// Behandelt persönliche Lager-Schäden. + #[allow(clippy::too_many_arguments)] fn handle_personal_storage_damage_effect( conn: &mut DbConnection, user_id: i32, @@ -1536,6 +1539,7 @@ impl EventsWorker { } /// Behandelt regionale Lager-Schäden. + #[allow(clippy::too_many_arguments)] fn handle_regional_storage_damage_effect( conn: &mut DbConnection, region_id: i32, diff --git a/src/worker/falukant_family.rs b/src/worker/falukant_family.rs index 64ba41a..c1bb446 100644 --- a/src/worker/falukant_family.rs +++ b/src/worker/falukant_family.rs @@ -181,56 +181,52 @@ impl FalukantFamilyWorker { let mut marriages: Vec = marriage_rows .into_iter() - .filter_map(|r| { - Some(MarriageData { - id: parse_i32(&r, "marriage_id", -1), - m1: parse_i32(&r, "m1", -1), - m2: parse_i32(&r, "m2", -1), - satisfaction: parse_i32(&r, "marriage_satisfaction", 55), - public_stability: parse_i32(&r, "marriage_public_stability", 55), - drift_high: parse_i32(&r, "marriage_drift_high", 0), - drift_low: parse_i32(&r, "marriage_drift_low", 0), - title1_tr: r.get("title1_tr").cloned().unwrap_or_default(), - title2_tr: r.get("title2_tr").cloned().unwrap_or_default(), - user1_id: parse_opt_i32(&r, "user1_id"), - user2_id: parse_opt_i32(&r, "user2_id"), - gift_days: parse_i32(&r, "marriage_gift_buff_days_remaining", 0), - feast_pending: parse_i32(&r, "marriage_pending_feast_bonus", 0), - house_supply: parse_i32(&r, "marriage_house_supply", 50), - no_lover_counter: parse_i32(&r, "marriage_no_lover_bonus_counter", 0), - household_order_1: parse_i32(&r, "household_order_1", 55), - household_order_2: parse_i32(&r, "household_order_2", 55), - servant_quality_1: parse_i32(&r, "servant_quality_1", 50), - servant_quality_2: parse_i32(&r, "servant_quality_2", 50), - }) + .map(|r| MarriageData { + id: parse_i32(&r, "marriage_id", -1), + m1: parse_i32(&r, "m1", -1), + m2: parse_i32(&r, "m2", -1), + satisfaction: parse_i32(&r, "marriage_satisfaction", 55), + public_stability: parse_i32(&r, "marriage_public_stability", 55), + drift_high: parse_i32(&r, "marriage_drift_high", 0), + drift_low: parse_i32(&r, "marriage_drift_low", 0), + title1_tr: r.get("title1_tr").cloned().unwrap_or_default(), + title2_tr: r.get("title2_tr").cloned().unwrap_or_default(), + user1_id: parse_opt_i32(&r, "user1_id"), + user2_id: parse_opt_i32(&r, "user2_id"), + gift_days: parse_i32(&r, "marriage_gift_buff_days_remaining", 0), + feast_pending: parse_i32(&r, "marriage_pending_feast_bonus", 0), + house_supply: parse_i32(&r, "marriage_house_supply", 50), + no_lover_counter: parse_i32(&r, "marriage_no_lover_bonus_counter", 0), + household_order_1: parse_i32(&r, "household_order_1", 55), + household_order_2: parse_i32(&r, "household_order_2", 55), + servant_quality_1: parse_i32(&r, "servant_quality_1", 50), + servant_quality_2: parse_i32(&r, "servant_quality_2", 50), }) .filter(|m| m.id > 0) .collect(); let mut lovers: Vec = lover_rows .into_iter() - .filter_map(|r| { - Some(LoverData { - rel_id: parse_i32(&r, "rel_id", -1), - c1: parse_i32(&r, "c1", -1), - c2: parse_i32(&r, "c2", -1), - lover_role: r.get("lover_role").cloned().unwrap_or_default(), - affection: parse_i32(&r, "affection", 50), - visibility: parse_i32(&r, "visibility", 0), - discretion: parse_i32(&r, "discretion", 50), - maintenance_level: parse_i32(&r, "maintenance_level", 50), - status_fit: parse_i32(&r, "status_fit", 0), - scandal_extra: parse_i32(&r, "scandal_extra_daily_pct", 0), - months_underfunded: parse_i32(&r, "months_underfunded", 0), - acknowledged: parse_bool_row(&r, "acknowledged"), - title1_tr: r.get("title1_tr").cloned().unwrap_or_default(), - title2_tr: r.get("title2_tr").cloned().unwrap_or_default(), - user1_id: parse_opt_i32(&r, "user1_id"), - user2_id: parse_opt_i32(&r, "user2_id"), - min_age_years: parse_i32(&r, "min_age_years", 99), - servant_disc_u1: parse_i32(&r, "servant_disc_u1", 0), - servant_disc_u2: parse_i32(&r, "servant_disc_u2", 0), - }) + .map(|r| LoverData { + rel_id: parse_i32(&r, "rel_id", -1), + c1: parse_i32(&r, "c1", -1), + c2: parse_i32(&r, "c2", -1), + lover_role: r.get("lover_role").cloned().unwrap_or_default(), + affection: parse_i32(&r, "affection", 50), + visibility: parse_i32(&r, "visibility", 0), + discretion: parse_i32(&r, "discretion", 50), + maintenance_level: parse_i32(&r, "maintenance_level", 50), + status_fit: parse_i32(&r, "status_fit", 0), + scandal_extra: parse_i32(&r, "scandal_extra_daily_pct", 0), + months_underfunded: parse_i32(&r, "months_underfunded", 0), + acknowledged: parse_bool_row(&r, "acknowledged"), + title1_tr: r.get("title1_tr").cloned().unwrap_or_default(), + title2_tr: r.get("title2_tr").cloned().unwrap_or_default(), + user1_id: parse_opt_i32(&r, "user1_id"), + user2_id: parse_opt_i32(&r, "user2_id"), + min_age_years: parse_i32(&r, "min_age_years", 99), + servant_disc_u1: parse_i32(&r, "servant_disc_u1", 0), + servant_disc_u2: parse_i32(&r, "servant_disc_u2", 0), }) .filter(|l| l.rel_id > 0) .collect(); diff --git a/src/worker/falukant_servants.rs b/src/worker/falukant_servants.rs index d9983cd..1e1fec6 100644 --- a/src/worker/falukant_servants.rs +++ b/src/worker/falukant_servants.rs @@ -365,10 +365,7 @@ pub fn run_monthly(base: &BaseWorker, broker: &MessageBroker) -> Result<(), DbEr .and_then(|v| v.parse::().ok()) .unwrap_or(0); - let notify = if servant_count <= 0 || abstract_monthly_cost <= 0.0 { - conn.execute("upd_uh_mon", &[&false, &user_house_id])?; - false - } else if installment <= 0.0 { + let notify = if servant_count <= 0 || abstract_monthly_cost <= 0.0 || installment <= 0.0 { conn.execute("upd_uh_mon", &[&false, &user_house_id])?; false } else if user_money >= installment { diff --git a/src/worker/underground.rs b/src/worker/underground.rs index 9d154b4..07c6e8b 100644 --- a/src/worker/underground.rs +++ b/src/worker/underground.rs @@ -1465,6 +1465,7 @@ fn affair_household_leak_bonus( s.min(15.0) } +#[allow(clippy::too_many_arguments)] fn affair_discovery_score( visibility: i32, discretion: i32,