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

Made naming of fields more explicit.

Browse Source
This commit is contained in:
Sam 2021-05-01 09:25:38 -04:00
parent 85d1fad8b9
commit c5ce67f36c
46 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/npc_weapons/axe/minotaur_axe.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Axe Simple")), ability_spec: Some(Custom("Axe Simple")),
) )

2
assets/common/items/npc_weapons/axe/oni_blue_axe.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Axe Simple")), ability_spec: Some(Custom("Axe Simple")),
) )

2
assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Staff Simple")), ability_spec: Some(Custom("Staff Simple")),
) )

2
assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Staff Simple")), ability_spec: Some(Custom("Staff Simple")),
) )

2
assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Staff Simple")), ability_spec: Some(Custom("Staff Simple")),
) )

2
assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Staff Simple")), ability_spec: Some(Custom("Staff Simple")),
) )

2
assets/common/items/npc_weapons/bow/saurok_bow.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Bow Simple")), ability_spec: Some(Custom("Bow Simple")),
) )

2
assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Hammer Simple")), ability_spec: Some(Custom("Hammer Simple")),
) )

2
assets/common/items/npc_weapons/hammer/harvester_scythe.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Hammer Simple")), ability_spec: Some(Custom("Hammer Simple")),
) )

2
assets/common/items/npc_weapons/hammer/ogre_hammer.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Hammer Simple")), ability_spec: Some(Custom("Hammer Simple")),
) )

2
assets/common/items/npc_weapons/hammer/oni_red_hammer.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Hammer Simple")), ability_spec: Some(Custom("Hammer Simple")),
) )

2
assets/common/items/npc_weapons/hammer/troll_hammer.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Hammer Simple")), ability_spec: Some(Custom("Hammer Simple")),
) )

2
assets/common/items/npc_weapons/hammer/yeti_hammer.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Hammer Simple")), ability_spec: Some(Custom("Hammer Simple")),
) )

2
assets/common/items/npc_weapons/staff/mindflayer_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Legendary, quality: Legendary,
tags: [], tags: [],
ability_set: Some(Custom("Mindflayer")), ability_spec: Some(Custom("Mindflayer")),
) )

2
assets/common/items/npc_weapons/staff/ogre_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Staff Simple")), ability_spec: Some(Custom("Staff Simple")),
) )

2
assets/common/items/npc_weapons/staff/saurok_staff.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Staff Simple")), ability_spec: Some(Custom("Staff Simple")),
) )

2
assets/common/items/npc_weapons/sword/dullahan_sword.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Sword Simple")), ability_spec: Some(Custom("Sword Simple")),
) )

2
assets/common/items/npc_weapons/sword/saurok_sword.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Sword Simple")), ability_spec: Some(Custom("Sword Simple")),
) )

2
assets/common/items/npc_weapons/unique/beast_claws.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Beast Claws")), ability_spec: Some(Custom("Beast Claws")),
) )

2
assets/common/items/npc_weapons/unique/birdlargebreathe.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Bird Large Breathe")), ability_spec: Some(Custom("Bird Large Breathe")),
) )

2
assets/common/items/npc_weapons/unique/birdlargefire.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Bird Large Fire")), ability_spec: Some(Custom("Bird Large Fire")),
) )

2
assets/common/items/npc_weapons/unique/husk.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Husk")), ability_spec: Some(Custom("Husk")),
) )

2
assets/common/items/npc_weapons/unique/quadlowbasic.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Low Basic")), ability_spec: Some(Custom("Quad Low Basic")),
) )

2
assets/common/items/npc_weapons/unique/quadlowbeam.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Low Beam")), ability_spec: Some(Custom("Quad Low Beam")),
) )

2
assets/common/items/npc_weapons/unique/quadlowbreathe.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Low Breathe")), ability_spec: Some(Custom("Quad Low Breathe")),
) )

2
assets/common/items/npc_weapons/unique/quadlowquick.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Low Quick")), ability_spec: Some(Custom("Quad Low Quick")),
) )

2
assets/common/items/npc_weapons/unique/quadlowranged.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Low Ranged")), ability_spec: Some(Custom("Quad Low Ranged")),
) )

2
assets/common/items/npc_weapons/unique/quadlowtail.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Low Tail")), ability_spec: Some(Custom("Quad Low Tail")),
) )

2
assets/common/items/npc_weapons/unique/quadmedbasic.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Med Basic")), ability_spec: Some(Custom("Quad Med Basic")),
) )

2
assets/common/items/npc_weapons/unique/quadmedbasicgentle.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Med Basic")), ability_spec: Some(Custom("Quad Med Basic")),
) )

2
assets/common/items/npc_weapons/unique/quadmedcharge.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Med Charge")), ability_spec: Some(Custom("Quad Med Charge")),
) )

2
assets/common/items/npc_weapons/unique/quadmedhoof.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Med Hoof")), ability_spec: Some(Custom("Quad Med Hoof")),
) )

2
assets/common/items/npc_weapons/unique/quadmedjump.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Med Jump")), ability_spec: Some(Custom("Quad Med Jump")),
) )

2
assets/common/items/npc_weapons/unique/quadmedquick.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Med Quick")), ability_spec: Some(Custom("Quad Med Quick")),
) )

2
assets/common/items/npc_weapons/unique/quadsmallbasic.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Quad Small Basic")), ability_spec: Some(Custom("Quad Small Basic")),
) )

2
assets/common/items/npc_weapons/unique/stone_golems_fist.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Stone Golem")), ability_spec: Some(Custom("Stone Golem")),
) )

2
assets/common/items/npc_weapons/unique/theropodbasic.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Theropod Basic")), ability_spec: Some(Custom("Theropod Basic")),
) )

2
assets/common/items/npc_weapons/unique/theropodbird.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Theropod Bird")), ability_spec: Some(Custom("Theropod Bird")),
) )

2
assets/common/items/npc_weapons/unique/theropodcharge.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Theropod Charge")), ability_spec: Some(Custom("Theropod Charge")),
) )

2
assets/common/items/npc_weapons/unique/tidal_claws.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Tidal Claws")), ability_spec: Some(Custom("Tidal Claws")),
) )

2
assets/common/items/npc_weapons/unique/turret.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Turret")), ability_spec: Some(Custom("Turret")),
) )

2
assets/common/items/npc_weapons/unique/wendigo_magic.ron
View File

@ -15,5 +15,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_set: Some(Custom("Wendigo Magic")), ability_spec: Some(Custom("Wendigo Magic")),
) )

14
common/src/comp/inventory/item/mod.rs
View File

@ -278,7 +278,7 @@ pub struct ItemDef {
pub slots: u16, pub slots: u16,
/// Used to specify a custom ability set for a weapon. Leave None (or don't /// Used to specify a custom ability set for a weapon. Leave None (or don't
/// include field in ItemDef) to use default ability set for weapon kind. /// include field in ItemDef) to use default ability set for weapon kind.
pub ability_set: Option<AbilitySpec>, pub ability_spec: Option<AbilitySpec>,
} }
impl PartialEq for ItemDef { impl PartialEq for ItemDef {
@ -307,7 +307,7 @@ impl TryFrom<(&Item, &AbilityMap, &MaterialStatManifest)> for ItemConfig {
let tool_default = ability_map let tool_default = ability_map
.get_ability_set(&AbilitySpec::Tool(tool.kind)) .get_ability_set(&AbilitySpec::Tool(tool.kind))
.cloned(); .cloned();
let abilities = if let Some(set_key) = item.ability_set() { let abilities = if let Some(set_key) = item.ability_spec() {
if let Some(set) = ability_map.get_ability_set(set_key) { if let Some(set) = ability_map.get_ability_set(set_key) {
set.clone().modified_by_tool(&tool, msm, &item.components) set.clone().modified_by_tool(&tool, msm, &item.components)
} else { } else {
@ -383,7 +383,7 @@ impl ItemDef {
quality, quality,
tags, tags,
slots, slots,
ability_set: None, ability_spec: None,
} }
} }
} }
@ -424,7 +424,7 @@ impl assets::Compound for ItemDef {
quality, quality,
tags, tags,
slots, slots,
ability_set, ability_spec,
} = raw; } = raw;
// Some commands like /give_item provide the asset specifier separated with \ // Some commands like /give_item provide the asset specifier separated with \
@ -441,7 +441,7 @@ impl assets::Compound for ItemDef {
quality, quality,
tags, tags,
slots, slots,
ability_set, ability_spec,
}) })
} }
} }
@ -456,7 +456,7 @@ struct RawItemDef {
tags: Vec<ItemTag>, tags: Vec<ItemTag>,
#[serde(default)] #[serde(default)]
slots: u16, slots: u16,
ability_set: Option<AbilitySpec>, ability_spec: Option<AbilitySpec>,
} }
impl assets::Asset for RawItemDef { impl assets::Asset for RawItemDef {
@ -765,7 +765,7 @@ impl Item {
})) }))
} }
pub fn ability_set(&self) -> Option<&AbilitySpec> { self.item_def.ability_set.as_ref() } pub fn ability_spec(&self) -> Option<&AbilitySpec> { self.item_def.ability_spec.as_ref() }
} }
/// Provides common methods providing details about an item definition /// Provides common methods providing details about an item definition

6
common/src/comp/inventory/item/modular.rs
View File

@ -192,7 +192,7 @@ fn make_component_def(
quality, quality,
tags: vec![ItemTag::ModularComponent(tag)], tags: vec![ItemTag::ModularComponent(tag)],
slots: 0, slots: 0,
ability_set: None, ability_spec: None,
}; };
(identifier, item) (identifier, item)
} }
@ -215,7 +215,7 @@ fn make_weapon_def(toolkind: ToolKind) -> (String, RawItemDef) {
quality, quality,
tags: Vec::new(), tags: Vec::new(),
slots: 0, slots: 0,
ability_set: None, ability_spec: None,
}; };
(identifier, item) (identifier, item)
} }
@ -268,7 +268,7 @@ fn make_tagexample_def(
quality, quality,
tags: vec![ItemTag::ModularComponent(tag)], tags: vec![ItemTag::ModularComponent(tag)],
slots: 0, slots: 0,
ability_set: None, ability_spec: None,
}; };
(identifier, item) (identifier, item)
} }

4
server/src/sys/agent.rs
View File

@ -1507,8 +1507,8 @@ impl<'a> AgentData<'a> {
.equipped(EquipSlot::Mainhand) .equipped(EquipSlot::Mainhand)
.as_ref() .as_ref()
.map(|item| { .map(|item| {
if let Some(ability_set) = item.ability_set() { if let Some(ability_spec) = item.ability_spec() {
match ability_set { match ability_spec {
AbilitySpec::Custom(spec) => match spec.as_str() { AbilitySpec::Custom(spec) => match spec.as_str() {
"Axe Simple" | "Sword Simple" => Tactic::Sword, "Axe Simple" | "Sword Simple" => Tactic::Sword,
"Staff Simple" => Tactic::Staff, "Staff Simple" => Tactic::Staff,

2
voxygen/src/scene/figure/mod.rs
View File

@ -731,7 +731,7 @@ impl FigureMgr {
.and_then(|i| i.equipped(equip_slot)) .and_then(|i| i.equipped(equip_slot))
.map(|i| { .map(|i| {
if let ItemKind::Tool(tool) = i.kind() { if let ItemKind::Tool(tool) = i.kind() {
(Some(tool.kind), Some(tool.hands), i.ability_set()) (Some(tool.kind), Some(tool.hands), i.ability_spec())
} else { } else {
(None, None, None) (None, None, None)
} }