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
All checks were successful
Deploy yourpart (blue-green) / deploy (push) Successful in 1m34s
This commit is contained in:
@@ -1407,13 +1407,11 @@ impl DirectorWorker {
|
|||||||
)?;
|
)?;
|
||||||
|
|
||||||
// Leere Transporte für alle verfügbaren Fahrzeuge anlegen
|
// Leere Transporte für alle verfügbaren Fahrzeuge anlegen
|
||||||
let mut _transport_count = 0;
|
|
||||||
for vehicle in &vehicles {
|
for vehicle in &vehicles {
|
||||||
conn.execute(
|
conn.execute(
|
||||||
"insert_empty_transport",
|
"insert_empty_transport",
|
||||||
&[&target_region_id, ¤t_region_id, &vehicle.id],
|
&[&target_region_id, ¤t_region_id, &vehicle.id],
|
||||||
)?;
|
)?;
|
||||||
_transport_count += 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1300,6 +1300,7 @@ impl EventsWorker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Behandelt Geldänderungen für persönliche Events (inkl. Spezialfälle „windfall“ und „theft“).
|
/// Behandelt Geldänderungen für persönliche Events (inkl. Spezialfälle „windfall“ und „theft“).
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
fn handle_money_change_effect(
|
fn handle_money_change_effect(
|
||||||
conn: &mut DbConnection,
|
conn: &mut DbConnection,
|
||||||
event: &RandomEvent,
|
event: &RandomEvent,
|
||||||
@@ -1436,6 +1437,7 @@ impl EventsWorker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Behandelt Gesundheitsänderungen bei persönlichen Events.
|
/// Behandelt Gesundheitsänderungen bei persönlichen Events.
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
fn handle_personal_character_health_effect(
|
fn handle_personal_character_health_effect(
|
||||||
conn: &mut DbConnection,
|
conn: &mut DbConnection,
|
||||||
user_id: i32,
|
user_id: i32,
|
||||||
@@ -1494,6 +1496,7 @@ impl EventsWorker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Behandelt persönliche Lager-Schäden.
|
/// Behandelt persönliche Lager-Schäden.
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
fn handle_personal_storage_damage_effect(
|
fn handle_personal_storage_damage_effect(
|
||||||
conn: &mut DbConnection,
|
conn: &mut DbConnection,
|
||||||
user_id: i32,
|
user_id: i32,
|
||||||
@@ -1536,6 +1539,7 @@ impl EventsWorker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Behandelt regionale Lager-Schäden.
|
/// Behandelt regionale Lager-Schäden.
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
fn handle_regional_storage_damage_effect(
|
fn handle_regional_storage_damage_effect(
|
||||||
conn: &mut DbConnection,
|
conn: &mut DbConnection,
|
||||||
region_id: i32,
|
region_id: i32,
|
||||||
|
|||||||
@@ -181,8 +181,7 @@ impl FalukantFamilyWorker {
|
|||||||
|
|
||||||
let mut marriages: Vec<MarriageData> = marriage_rows
|
let mut marriages: Vec<MarriageData> = marriage_rows
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter_map(|r| {
|
.map(|r| MarriageData {
|
||||||
Some(MarriageData {
|
|
||||||
id: parse_i32(&r, "marriage_id", -1),
|
id: parse_i32(&r, "marriage_id", -1),
|
||||||
m1: parse_i32(&r, "m1", -1),
|
m1: parse_i32(&r, "m1", -1),
|
||||||
m2: parse_i32(&r, "m2", -1),
|
m2: parse_i32(&r, "m2", -1),
|
||||||
@@ -203,14 +202,12 @@ impl FalukantFamilyWorker {
|
|||||||
servant_quality_1: parse_i32(&r, "servant_quality_1", 50),
|
servant_quality_1: parse_i32(&r, "servant_quality_1", 50),
|
||||||
servant_quality_2: parse_i32(&r, "servant_quality_2", 50),
|
servant_quality_2: parse_i32(&r, "servant_quality_2", 50),
|
||||||
})
|
})
|
||||||
})
|
|
||||||
.filter(|m| m.id > 0)
|
.filter(|m| m.id > 0)
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let mut lovers: Vec<LoverData> = lover_rows
|
let mut lovers: Vec<LoverData> = lover_rows
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter_map(|r| {
|
.map(|r| LoverData {
|
||||||
Some(LoverData {
|
|
||||||
rel_id: parse_i32(&r, "rel_id", -1),
|
rel_id: parse_i32(&r, "rel_id", -1),
|
||||||
c1: parse_i32(&r, "c1", -1),
|
c1: parse_i32(&r, "c1", -1),
|
||||||
c2: parse_i32(&r, "c2", -1),
|
c2: parse_i32(&r, "c2", -1),
|
||||||
@@ -231,7 +228,6 @@ impl FalukantFamilyWorker {
|
|||||||
servant_disc_u1: parse_i32(&r, "servant_disc_u1", 0),
|
servant_disc_u1: parse_i32(&r, "servant_disc_u1", 0),
|
||||||
servant_disc_u2: parse_i32(&r, "servant_disc_u2", 0),
|
servant_disc_u2: parse_i32(&r, "servant_disc_u2", 0),
|
||||||
})
|
})
|
||||||
})
|
|
||||||
.filter(|l| l.rel_id > 0)
|
.filter(|l| l.rel_id > 0)
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
|
|||||||
@@ -365,10 +365,7 @@ pub fn run_monthly(base: &BaseWorker, broker: &MessageBroker) -> Result<(), DbEr
|
|||||||
.and_then(|v| v.parse::<i32>().ok())
|
.and_then(|v| v.parse::<i32>().ok())
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
|
|
||||||
let notify = if servant_count <= 0 || abstract_monthly_cost <= 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 installment <= 0.0 {
|
|
||||||
conn.execute("upd_uh_mon", &[&false, &user_house_id])?;
|
conn.execute("upd_uh_mon", &[&false, &user_house_id])?;
|
||||||
false
|
false
|
||||||
} else if user_money >= installment {
|
} else if user_money >= installment {
|
||||||
|
|||||||
@@ -1465,6 +1465,7 @@ fn affair_household_leak_bonus(
|
|||||||
s.min(15.0)
|
s.min(15.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
fn affair_discovery_score(
|
fn affair_discovery_score(
|
||||||
visibility: i32,
|
visibility: i32,
|
||||||
discretion: i32,
|
discretion: i32,
|
||||||
|
|||||||
Reference in New Issue
Block a user