Fixed bins (no assets)

This commit is contained in:
Sam 2022-05-18 16:44:09 -04:00
parent aeca67443b
commit bbe22d6807
2 changed files with 3 additions and 27 deletions

View File

@ -14,7 +14,7 @@ use veloren_common::{
item::{ item::{
armor::{ArmorKind, Protection}, armor::{ArmorKind, Protection},
tool::{Hands, Tool, ToolKind}, tool::{Hands, Tool, ToolKind},
Item, ItemKind, Item,
}, },
}, },
generation::{EntityConfig, EntityInfo}, generation::{EntityConfig, EntityInfo},
@ -201,42 +201,18 @@ fn get_armor_kind(kind: &ArmorKind) -> String {
} }
} }
fn get_armor_kind_kind(kind: &ArmorKind) -> String {
match kind {
ArmorKind::Shoulder(x) => x.clone(),
ArmorKind::Chest(x) => x.clone(),
ArmorKind::Belt(x) => x.clone(),
ArmorKind::Hand(x) => x.clone(),
ArmorKind::Pants(x) => x.clone(),
ArmorKind::Foot(x) => x.clone(),
ArmorKind::Back(x) => x.clone(),
ArmorKind::Ring(x) => x.clone(),
ArmorKind::Neck(x) => x.clone(),
ArmorKind::Head(x) => x.clone(),
ArmorKind::Tabard(x) => x.clone(),
ArmorKind::Bag(x) => x.clone(),
}
}
fn all_items() -> Result<(), Box<dyn Error>> { fn all_items() -> Result<(), Box<dyn Error>> {
let mut wtr = csv::Writer::from_path("items.csv")?; let mut wtr = csv::Writer::from_path("items.csv")?;
wtr.write_record(&["Path", "Name", "Kind"])?; wtr.write_record(&["Path", "Name"])?;
for item in comp::item::Item::new_from_asset_glob("common.items.*") for item in comp::item::Item::new_from_asset_glob("common.items.*")
.expect("Failed to iterate over item folders!") .expect("Failed to iterate over item folders!")
{ {
let kind = match &*item.kind() {
ItemKind::Armor(armor) => get_armor_kind_kind(&armor.kind),
ItemKind::Lantern(lantern) => lantern.kind.clone(),
_ => "".to_owned(),
};
wtr.write_record(&[ wtr.write_record(&[
item.item_definition_id() item.item_definition_id()
.itemdef_id() .itemdef_id()
.expect("All items in asset glob should be simple items"), .expect("All items in asset glob should be simple items"),
&item.name(), &item.name(),
&kind,
])?; ])?;
} }

View File

@ -173,7 +173,7 @@ fn armor_stats() -> Result<(), Box<dyn Error>> {
None None
}; };
let kind = armor.kind.clone(); let kind = armor.kind;
let armor_stats = comp::item::armor::Stats::new( let armor_stats = comp::item::armor::Stats::new(
protection, protection,
poise_resilience, poise_resilience,