bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Fix modules not showing up in generated weapon lists

Browse Source
This commit is contained in:
NG (Graham)
2025-07-31 20:47:13 -04:00
parent 1a17fa0f3a
commit 3c87289702
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rc_core/src/cubes/weapon_list.rs
View File

@@ -19,7 +19,7 @@ impl WeaponListParser {
pub fn with_cubes<'a, I: std::iter::Iterator<Item=&'a crate::persist::Cube>>(iter: I) -> Self { pub fn with_cubes<'a, I: std::iter::Iterator<Item=&'a crate::persist::Cube>>(iter: I) -> Self {
let mut weapons = std::collections::HashMap::new(); let mut weapons = std::collections::HashMap::new();
for item in iter { for item in iter {
if let crate::persist::ItemType::Weapon = item.info.type_ { if matches!(item.info.type_, crate::persist::ItemType::Weapon | crate::persist::ItemType::Module){
weapons.insert(item.id, WeaponInfo { weapons.insert(item.id, WeaponInfo {
category: item.info.category.into(), category: item.info.category.into(),
tier: item.info.size.into(), tier: item.info.size.into(),
@@ -41,7 +41,9 @@ impl WeaponListParser {
if keys.len() == MAX_WEAPON_SLOTS { break; } if keys.len() == MAX_WEAPON_SLOTS { break; }
} }
} }
keys.into_iter().collect::<Vec<i32>>() let mut result = keys.into_iter().collect::<Vec<i32>>();
result.sort();
result
} }
Err(e) => { Err(e) => {
log::error!("Failed to parse cube data to guess weapon order: {}", e); log::error!("Failed to parse cube data to guess weapon order: {}", e);