torsten/yourpart-daemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Behebe unnötige Zählvariablen und verbessere die Lesbarkeit in mehreren Modulen: Entferne die Zählvariable für Transporte in DirectorWorker, optimiere die Filterung in FalukantFamilyWorker und passe die Bedingungen in FalukantServants und Underground an, um die Lesbarkeit zu erhöhen.
All checks were successful
Deploy yourpart (blue-green) / deploy (push) Successful in 1m34s
Details

Browse Source
This commit is contained in:
Torsten Schulz (local)
2026-05-21 09:42:12 +02:00
parent 173776fb52
commit 773665635d
5 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/worker/falukant_family.rs
View File

@@ -181,56 +181,52 @@ impl FalukantFamilyWorker {
let mut marriages: Vec<MarriageData> = 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<LoverData> = 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();