diff --git a/assets/common/loadouts/unused/bandit.ron b/assets/common/loadouts/unused/bandit.ron deleted file mode 100644 index eb18a0332c..0000000000 --- a/assets/common/loadouts/unused/bandit.ron +++ /dev/null @@ -1,15 +0,0 @@ -({ - "shoulder": Item("common.items.armor.assassin.shoulder"), - "chest": Item("common.items.armor.assassin.chest"), - "belt": Item("common.items.armor.assassin.belt"), - "hands": Item("common.items.armor.assassin.hand"), - "pants": Item("common.items.armor.assassin.pants"), - "feet": Item("common.items.armor.assassin.foot"), - - "lantern": Choice([ - (1.0, Some(Item("common.items.lantern.black_0"))), - (2.0, None), - ]), - - "glider": Item("common.items.glider.glider_cloverleaf"), -}) diff --git a/assets/common/loadouts/unused/cultist_acolyte.ron b/assets/common/loadouts/unused/cultist_acolyte.ron deleted file mode 100644 index 865f43898a..0000000000 --- a/assets/common/loadouts/unused/cultist_acolyte.ron +++ /dev/null @@ -1,17 +0,0 @@ -({ - "shoulder": Item("common.items.armor.cultist.shoulder"), - "chest": Item("common.items.armor.cultist.chest"), - "belt": Item("common.items.armor.cultist.belt"), - "hands": Item("common.items.armor.cultist.hand"), - "pants": Item("common.items.armor.cultist.pants"), - "feet": Item("common.items.armor.cultist.foot"), - - "back": Item("common.items.armor.misc.back.dungeon_purple"), - - "lantern": Choice([ - (1.0, Some(Item("common.items.lantern.black_0"))), - (2.0, None), - ]), - - "glider": Item("common.items.glider.glider_blue"), -}) diff --git a/assets/common/loadouts/unused/cultist_novice.ron b/assets/common/loadouts/unused/cultist_novice.ron deleted file mode 100644 index c8324e703d..0000000000 --- a/assets/common/loadouts/unused/cultist_novice.ron +++ /dev/null @@ -1,17 +0,0 @@ -({ - "shoulder": Item("common.items.armor.steel.shoulder"), - "chest": Item("common.items.armor.steel.chest"), - "belt": Item("common.items.armor.steel.belt"), - "hands": Item("common.items.armor.steel.hand"), - "pants": Item("common.items.armor.steel.pants"), - "feet": Item("common.items.armor.steel.foot"), - - "back": Item("common.items.armor.misc.back.dungeon_purple"), - - "lantern": Choice([ - (1.0, Some(Item("common.items.lantern.black_0"))), - (2.0, None), - ]), - - "glider": Item("common.items.glider.glider_blue"), -}) diff --git a/assets/common/loadouts/unused/highwayman.ron b/assets/common/loadouts/unused/highwayman.ron deleted file mode 100644 index cb67904f20..0000000000 --- a/assets/common/loadouts/unused/highwayman.ron +++ /dev/null @@ -1,15 +0,0 @@ -({ - "shoulder": Item("common.items.armor.swift.shoulder"), - "chest": Item("common.items.armor.swift.chest"), - "belt": Item("common.items.armor.swift.belt"), - "hands": Item("common.items.armor.swift.hand"), - "pants": Item("common.items.armor.swift.pants"), - "feet": Item("common.items.armor.swift.foot"), - - "lantern": Choice([ - (1.0, Some(Item("common.items.lantern.black_0"))), - (2.0, None), - ]), - - "glider": Item("common.items.glider.glider_cloverleaf"), -}) diff --git a/assets/common/loadouts/unused/outcast.ron b/assets/common/loadouts/unused/outcast.ron deleted file mode 100644 index ad5fac7b14..0000000000 --- a/assets/common/loadouts/unused/outcast.ron +++ /dev/null @@ -1,13 +0,0 @@ -({ - "shoulder": Item("common.items.armor.cloth_purple.shoulder"), - "chest": Item("common.items.armor.cloth_purple.chest"), - "belt": Item("common.items.armor.cloth_purple.belt"), - "hands": Item("common.items.armor.cloth_purple.hand"), - "pants": Item("common.items.armor.cloth_purple.pants"), - "feet": Item("common.items.armor.cloth_purple.foot"), - - "lantern": Choice([ - (1.0, Some(Item("common.items.lantern.black_0"))), - (2.0, None), - ]), -}) diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 12e056b4cd..9417ff22eb 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -41,23 +41,18 @@ pub struct LoadoutBuilder(Loadout); #[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug, EnumIter)] pub enum LoadoutConfig { - Adlet, Gnarling, + Adlet, Sahagin, Haniwa, Myrmidon, Husk, - Guard, - Villager, - Merchant, - Outcast, - Highwayman, - Bandit, - CultistNovice, - CultistAcolyte, Beastmaster, Warlord, Warlock, + Villager, + Guard, + Merchant, } #[derive(Debug, Deserialize, Clone)] @@ -504,26 +499,6 @@ impl LoadoutBuilder { .complete_from_spec("common.loadouts.village.merchant") .build() }, - Outcast => LoadoutBuilder::new() - .active_mainhand(active_item) - .complete_from_spec("common.loadouts.unused.outcast") - .build(), - Highwayman => LoadoutBuilder::new() - .active_mainhand(active_item) - .complete_from_spec("common.loadouts.unused.highwayman") - .build(), - Bandit => LoadoutBuilder::new() - .active_mainhand(active_item) - .complete_from_spec("common.loadouts.unused.bandit") - .build(), - CultistNovice => LoadoutBuilder::new() - .active_mainhand(active_item) - .complete_from_spec("common.loadouts.unused.cultist_novice") - .build(), - CultistAcolyte => LoadoutBuilder::new() - .active_mainhand(active_item) - .complete_from_spec("common.loadouts.unused.cultist_acolyte") - .build(), } } else { match body {