jan/rrt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rehost world locomotive policy owner state

Browse source
This commit is contained in:
Jan Petykiewicz 2026-04-18 06:51:22 -07:00
commit 95215d836e
11 changed files with 536 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

187
crates/rrt-runtime/src/import.rs
View file

@ -836,6 +836,42 @@ fn project_save_slice_components(
limited_track_building_amount: None,
economic_status_code: None,
territory_access_cost: None,
linked_site_removal_follow_on_gate_raw_u8: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.linked_site_removal_follow_on_gate_raw_u8),
linked_site_removal_follow_on_gate_enabled: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.linked_site_removal_follow_on_gate_raw_u8)
.map(|raw| raw != 0),
all_steam_locomotives_available_raw_u8: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.all_steam_locomotives_available_raw_u8),
all_steam_locomotives_available_enabled: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.all_steam_locomotives_available_raw_u8)
.map(|raw| raw != 0),
all_diesel_locomotives_available_raw_u8: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.all_diesel_locomotives_available_raw_u8),
all_diesel_locomotives_available_enabled: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.all_diesel_locomotives_available_raw_u8)
.map(|raw| raw != 0),
all_electric_locomotives_available_raw_u8: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.all_electric_locomotives_available_raw_u8),
all_electric_locomotives_available_enabled: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.all_electric_locomotives_available_raw_u8)
.map(|raw| raw != 0),
issue_37_value: save_slice
.world_issue_37_state
.as_ref()
@ -934,6 +970,18 @@ fn project_save_slice_components(
.as_ref()
.map(|state| state.lane_value_f32_text.clone())
.unwrap_or_default(),
cached_available_locomotive_rating_raw_u32: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| state.cached_available_locomotive_rating_raw_u32),
cached_available_locomotive_rating_value_f32_text: save_slice
.world_locomotive_policy_state
.as_ref()
.and_then(|state| {
state
.cached_available_locomotive_rating_value_f32_text
.clone()
}),
selected_year_gap_scalar_raw_u32: None,
selected_year_gap_scalar_value_f32_text: None,
absolute_counter_restore_kind: Some(
@ -5839,6 +5887,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -5885,6 +5934,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -6085,6 +6135,24 @@ mod tests {
"0.000000".to_string(),
],
}),
world_locomotive_policy_state: Some(crate::smp::SmpLoadedWorldLocomotivePolicyState {
source_kind: "save-fixed-world-block".to_string(),
semantic_family: "world-locomotive-policy".to_string(),
selected_year_gap_scalar_raw_u32: Some(0x3eaaaaab),
selected_year_gap_scalar_raw_hex: Some("0x3eaaaaab".to_string()),
selected_year_gap_scalar_value_f32_text: Some("0.333333".to_string()),
linked_site_removal_follow_on_gate_raw_u8: Some(1),
linked_site_removal_follow_on_gate_raw_hex: Some("0x01".to_string()),
all_steam_locomotives_available_raw_u8: Some(1),
all_steam_locomotives_available_raw_hex: Some("0x01".to_string()),
all_diesel_locomotives_available_raw_u8: Some(0),
all_diesel_locomotives_available_raw_hex: Some("0x00".to_string()),
all_electric_locomotives_available_raw_u8: Some(1),
all_electric_locomotives_available_raw_hex: Some("0x01".to_string()),
cached_available_locomotive_rating_raw_u32: Some(0x41a00000),
cached_available_locomotive_rating_raw_hex: Some("0x41a00000".to_string()),
cached_available_locomotive_rating_value_f32_text: Some("20.000000".to_string()),
}),
company_roster: None,
chairman_profile_table: None,
special_conditions_table: Some(crate::SmpLoadedSpecialConditionsTable {
@ -6401,6 +6469,41 @@ mod tests {
.economic_tuning_lane_value_f32_text,
vec!["0.750000".to_string(), "0.007000".to_string()]
);
assert_eq!(
import
.state
.world_restore
.linked_site_removal_follow_on_gate_raw_u8,
Some(1)
);
assert_eq!(
import
.state
.world_restore
.all_steam_locomotives_available_enabled,
Some(true)
);
assert_eq!(
import
.state
.world_restore
.all_diesel_locomotives_available_enabled,
Some(false)
);
assert_eq!(
import
.state
.world_restore
.all_electric_locomotives_available_enabled,
Some(true)
);
assert_eq!(
import
.state
.world_restore
.cached_available_locomotive_rating_raw_u32,
Some(0x41a00000)
);
assert_eq!(
import
.state
@ -6547,6 +6650,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(save_company_roster()),
chairman_profile_table: Some(save_chairman_profile_table()),
special_conditions_table: None,
@ -6634,6 +6738,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(save_company_roster()),
chairman_profile_table: Some(save_chairman_profile_table()),
special_conditions_table: None,
@ -6790,6 +6895,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(crate::SmpLoadedCompanyRoster {
source_kind: "save-direct-world-block-company-selection-only".to_string(),
semantic_family: "scenario-selected-company-context".to_string(),
@ -6850,6 +6956,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -6975,6 +7082,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7078,6 +7186,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7207,6 +7316,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7297,6 +7407,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7455,6 +7566,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7703,6 +7815,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7786,6 +7899,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7893,6 +8007,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -7973,6 +8088,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(save_company_roster()),
chairman_profile_table: Some(save_chairman_profile_table()),
special_conditions_table: None,
@ -8056,6 +8172,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(save_company_roster()),
chairman_profile_table: Some(save_chairman_profile_table()),
special_conditions_table: None,
@ -8152,6 +8269,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8264,6 +8382,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8347,6 +8466,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8507,6 +8627,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8612,6 +8733,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8694,6 +8816,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8776,6 +8899,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -8932,6 +9056,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9033,6 +9158,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9113,6 +9239,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9203,6 +9330,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9302,6 +9430,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9409,6 +9538,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9505,6 +9635,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9587,6 +9718,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9739,6 +9871,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -9901,6 +10034,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10011,6 +10145,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10102,6 +10237,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10220,6 +10356,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10332,6 +10469,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10434,6 +10572,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10532,6 +10671,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10644,6 +10784,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10741,6 +10882,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10820,6 +10962,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10904,6 +11047,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -10993,6 +11137,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -11082,6 +11227,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -11187,6 +11333,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -11283,6 +11430,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -11382,6 +11530,27 @@ mod tests {
.get("world.all_electric_locos_available"),
Some(&true)
);
assert_eq!(
import
.state
.world_restore
.all_steam_locomotives_available_raw_u8,
Some(1)
);
assert_eq!(
import
.state
.world_restore
.all_diesel_locomotives_available_raw_u8,
Some(0)
);
assert_eq!(
import
.state
.world_restore
.all_electric_locomotives_available_raw_u8,
Some(1)
);
}
#[test]
@ -11405,6 +11574,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -11547,6 +11717,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -12080,6 +12251,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -12267,6 +12439,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -12399,6 +12572,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(save_company_roster()),
chairman_profile_table: Some(save_chairman_profile_table()),
special_conditions_table: None,
@ -12530,6 +12704,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: Some(save_company_roster()),
chairman_profile_table: Some(save_chairman_profile_table()),
special_conditions_table: None,
@ -12662,6 +12837,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -12778,6 +12954,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -12969,6 +13146,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13068,6 +13246,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13169,6 +13348,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13341,6 +13521,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13496,6 +13677,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13592,6 +13774,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13721,6 +13904,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -13838,6 +14022,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -14024,6 +14209,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,
@ -14225,6 +14411,7 @@ mod tests {
world_issue_37_state: None,
world_economic_tuning_state: None,
world_finance_neighborhood_state: None,
world_locomotive_policy_state: None,
company_roster: None,
chairman_profile_table: None,
special_conditions_table: None,