Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused LoadoutConfig-s

Browse Source
This commit is contained in:
juliancoffee 2021-05-23 19:16:13 +03:00
parent 6656cfe010
commit 00b182c183
6 changed files with 4 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/common/loadouts/unused/bandit.ron
View File

@ -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"),
})

17
assets/common/loadouts/unused/cultist_acolyte.ron
View File

@ -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"),
})

17
assets/common/loadouts/unused/cultist_novice.ron
View File

@ -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"),
})

15
assets/common/loadouts/unused/highwayman.ron
View File

@ -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"),
})

13
assets/common/loadouts/unused/outcast.ron
View File

@ -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),
]),
})

33
common/src/comp/inventory/loadout_builder.rs
View File

@ -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 {