From f25c066795306f7d960320bed4870070dd03936f Mon Sep 17 00:00:00 2001 From: timokoesters Date: Thu, 19 Mar 2020 17:47:37 +0100 Subject: [PATCH] Regular naming scheme for armor assets --- .../{belt_assassin.ron => belt/assassin.ron} | 0 .../leather_0.ron} | 0 .../{belt_plate-0.ron => belt/plate_0.ron} | 0 .../{chest_assassin.ron => assassin.ron} | 0 .../{chest_leather-0.ron => leather_0.ron} | 0 ...st_plate_green-0.ron => plate_green_0.ron} | 0 .../{foot_assassin.ron => foot/assassin.ron} | 0 .../leather_0.ron} | 0 .../{foot_plate-0.ron => foot/plate_0.ron} | 0 .../{hand_assassin.ron => hand/assassin.ron} | 0 .../leather_0.ron} | 0 .../{hand_plate-0.ron => hand/plate_0.ron} | 0 .../assassin.ron} | 0 .../{pants_green-0.ron => pants/green_0.ron} | 0 .../leather_0.ron} | 0 .../plate_green_0.ron} | 0 .../assassin.ron} | 0 .../leather_0.ron} | 0 .../leather_1.ron} | 0 .../plate_0.ron} | 0 server/src/sys/terrain.rs | 36 +++++++++---------- 21 files changed, 18 insertions(+), 18 deletions(-) rename assets/common/items/armor/{belt_assassin.ron => belt/assassin.ron} (100%) rename assets/common/items/armor/{belt_leather-0.ron => belt/leather_0.ron} (100%) rename assets/common/items/armor/{belt_plate-0.ron => belt/plate_0.ron} (100%) rename assets/common/items/armor/chest/{chest_assassin.ron => assassin.ron} (100%) rename assets/common/items/armor/chest/{chest_leather-0.ron => leather_0.ron} (100%) rename assets/common/items/armor/chest/{chest_plate_green-0.ron => plate_green_0.ron} (100%) rename assets/common/items/armor/{foot_assassin.ron => foot/assassin.ron} (100%) rename assets/common/items/armor/{foot_leather-0.ron => foot/leather_0.ron} (100%) rename assets/common/items/armor/{foot_plate-0.ron => foot/plate_0.ron} (100%) rename assets/common/items/armor/{hand_assassin.ron => hand/assassin.ron} (100%) rename assets/common/items/armor/{hand_leather-0.ron => hand/leather_0.ron} (100%) rename assets/common/items/armor/{hand_plate-0.ron => hand/plate_0.ron} (100%) rename assets/common/items/armor/{pants_assassin.ron => pants/assassin.ron} (100%) rename assets/common/items/armor/{pants_green-0.ron => pants/green_0.ron} (100%) rename assets/common/items/armor/{pants_leather-0.ron => pants/leather_0.ron} (100%) rename assets/common/items/armor/{pants_plate_green-0.ron => pants/plate_green_0.ron} (100%) rename assets/common/items/armor/{shoulder_assassin.ron => shoulder/assassin.ron} (100%) rename assets/common/items/armor/{shoulder_leather-0.ron => shoulder/leather_0.ron} (100%) rename assets/common/items/armor/{shoulder_leather-1.ron => shoulder/leather_1.ron} (100%) rename assets/common/items/armor/{shoulder_plate-0.ron => shoulder/plate_0.ron} (100%) diff --git a/assets/common/items/armor/belt_assassin.ron b/assets/common/items/armor/belt/assassin.ron similarity index 100% rename from assets/common/items/armor/belt_assassin.ron rename to assets/common/items/armor/belt/assassin.ron diff --git a/assets/common/items/armor/belt_leather-0.ron b/assets/common/items/armor/belt/leather_0.ron similarity index 100% rename from assets/common/items/armor/belt_leather-0.ron rename to assets/common/items/armor/belt/leather_0.ron diff --git a/assets/common/items/armor/belt_plate-0.ron b/assets/common/items/armor/belt/plate_0.ron similarity index 100% rename from assets/common/items/armor/belt_plate-0.ron rename to assets/common/items/armor/belt/plate_0.ron diff --git a/assets/common/items/armor/chest/chest_assassin.ron b/assets/common/items/armor/chest/assassin.ron similarity index 100% rename from assets/common/items/armor/chest/chest_assassin.ron rename to assets/common/items/armor/chest/assassin.ron diff --git a/assets/common/items/armor/chest/chest_leather-0.ron b/assets/common/items/armor/chest/leather_0.ron similarity index 100% rename from assets/common/items/armor/chest/chest_leather-0.ron rename to assets/common/items/armor/chest/leather_0.ron diff --git a/assets/common/items/armor/chest/chest_plate_green-0.ron b/assets/common/items/armor/chest/plate_green_0.ron similarity index 100% rename from assets/common/items/armor/chest/chest_plate_green-0.ron rename to assets/common/items/armor/chest/plate_green_0.ron diff --git a/assets/common/items/armor/foot_assassin.ron b/assets/common/items/armor/foot/assassin.ron similarity index 100% rename from assets/common/items/armor/foot_assassin.ron rename to assets/common/items/armor/foot/assassin.ron diff --git a/assets/common/items/armor/foot_leather-0.ron b/assets/common/items/armor/foot/leather_0.ron similarity index 100% rename from assets/common/items/armor/foot_leather-0.ron rename to assets/common/items/armor/foot/leather_0.ron diff --git a/assets/common/items/armor/foot_plate-0.ron b/assets/common/items/armor/foot/plate_0.ron similarity index 100% rename from assets/common/items/armor/foot_plate-0.ron rename to assets/common/items/armor/foot/plate_0.ron diff --git a/assets/common/items/armor/hand_assassin.ron b/assets/common/items/armor/hand/assassin.ron similarity index 100% rename from assets/common/items/armor/hand_assassin.ron rename to assets/common/items/armor/hand/assassin.ron diff --git a/assets/common/items/armor/hand_leather-0.ron b/assets/common/items/armor/hand/leather_0.ron similarity index 100% rename from assets/common/items/armor/hand_leather-0.ron rename to assets/common/items/armor/hand/leather_0.ron diff --git a/assets/common/items/armor/hand_plate-0.ron b/assets/common/items/armor/hand/plate_0.ron similarity index 100% rename from assets/common/items/armor/hand_plate-0.ron rename to assets/common/items/armor/hand/plate_0.ron diff --git a/assets/common/items/armor/pants_assassin.ron b/assets/common/items/armor/pants/assassin.ron similarity index 100% rename from assets/common/items/armor/pants_assassin.ron rename to assets/common/items/armor/pants/assassin.ron diff --git a/assets/common/items/armor/pants_green-0.ron b/assets/common/items/armor/pants/green_0.ron similarity index 100% rename from assets/common/items/armor/pants_green-0.ron rename to assets/common/items/armor/pants/green_0.ron diff --git a/assets/common/items/armor/pants_leather-0.ron b/assets/common/items/armor/pants/leather_0.ron similarity index 100% rename from assets/common/items/armor/pants_leather-0.ron rename to assets/common/items/armor/pants/leather_0.ron diff --git a/assets/common/items/armor/pants_plate_green-0.ron b/assets/common/items/armor/pants/plate_green_0.ron similarity index 100% rename from assets/common/items/armor/pants_plate_green-0.ron rename to assets/common/items/armor/pants/plate_green_0.ron diff --git a/assets/common/items/armor/shoulder_assassin.ron b/assets/common/items/armor/shoulder/assassin.ron similarity index 100% rename from assets/common/items/armor/shoulder_assassin.ron rename to assets/common/items/armor/shoulder/assassin.ron diff --git a/assets/common/items/armor/shoulder_leather-0.ron b/assets/common/items/armor/shoulder/leather_0.ron similarity index 100% rename from assets/common/items/armor/shoulder_leather-0.ron rename to assets/common/items/armor/shoulder/leather_0.ron diff --git a/assets/common/items/armor/shoulder_leather-1.ron b/assets/common/items/armor/shoulder/leather_1.ron similarity index 100% rename from assets/common/items/armor/shoulder_leather-1.ron rename to assets/common/items/armor/shoulder/leather_1.ron diff --git a/assets/common/items/armor/shoulder_plate-0.ron b/assets/common/items/armor/shoulder/plate_0.ron similarity index 100% rename from assets/common/items/armor/shoulder_plate-0.ron rename to assets/common/items/armor/shoulder/plate_0.ron diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs index d7681616b8..0265f63311 100644 --- a/server/src/sys/terrain.rs +++ b/server/src/sys/terrain.rs @@ -218,44 +218,44 @@ impl<'a> System<'a> for Sys { active_item, second_item: None, shoulder: Some(assets::load_expect_cloned( - "common.items.armor.shoulder_leather-0", + "common.items.armor.shoulder.leather_0", )), chest: Some(assets::load_expect_cloned( - "common.items.armor.chest.chest_leather-0", + "common.items.armor.chest.leather_0", )), belt: Some(assets::load_expect_cloned( - "common.items.armor.belt_plate-0", + "common.items.armor.belt.plate_0", )), hand: Some(assets::load_expect_cloned( - "common.items.armor.hand_plate-0", + "common.items.armor.hand.plate_0", )), pants: Some(assets::load_expect_cloned( - "common.items.armor.pants_plate_green-0", + "common.items.armor.pants.plate_green_0", )), foot: Some(assets::load_expect_cloned( - "common.items.armor.foot_leather-0", + "common.items.armor.foot.leather_0", )), }, comp::Alignment::Enemy => comp::Loadout { active_item, second_item: None, shoulder: Some(assets::load_expect_cloned( - "common.items.armor.shoulder_leather-0", + "common.items.armor.shoulder.leather_0", )), chest: Some(assets::load_expect_cloned( - "common.items.armor.chest.chest_plate_green-0", + "common.items.armor.chest.plate_green_0", )), belt: Some(assets::load_expect_cloned( - "common.items.armor.belt_plate-0", + "common.items.armor.belt.plate_0", )), hand: Some(assets::load_expect_cloned( - "common.items.armor.hand_plate-0", + "common.items.armor.hand.plate_0", )), pants: Some(assets::load_expect_cloned( - "common.items.armor.pants_plate_green-0", + "common.items.armor.pants.plate_green_0", )), foot: Some(assets::load_expect_cloned( - "common.items.armor.foot_plate-0", + "common.items.armor.foot.plate_0", )), }, _ => comp::Loadout { @@ -306,22 +306,22 @@ impl<'a> System<'a> for Sys { }), second_item: None, shoulder: Some(assets::load_expect_cloned( - "common.items.armor.shoulder_plate-0", + "common.items.armor.shoulder.plate_0", )), chest: Some(assets::load_expect_cloned( - "common.items.armor.chest.chest_plate_green-0", + "common.items.armor.chest.plate_green_0", )), belt: Some(assets::load_expect_cloned( - "common.items.armor.belt_plate-0", + "common.items.armor.belt.plate_0", )), hand: Some(assets::load_expect_cloned( - "common.items.armor.hand_plate-0", + "common.items.armor.hand.plate_0", )), pants: Some(assets::load_expect_cloned( - "common.items.armor.pants_plate_green-0", + "common.items.armor.pants.plate_green_0", )), foot: Some(assets::load_expect_cloned( - "common.items.armor.foot_plate-0", + "common.items.armor.foot.plate_0", )), };