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

Appease CI

Browse Source
This commit is contained in:
Sam 2023-01-28 12:21:43 -05:00
parent c9db227e43
commit 7386257854
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/bin/skill_graphviz.rs
View File

@ -7,7 +7,9 @@ use std::{fs::File, io::Write};
use structopt::StructOpt;
use veloren_common::comp::{
item::tool::ToolKind,
skillset::{skills::Skill, SkillGroupKind, SKILL_GROUP_DEFS, SKILL_PREREQUISITES},
skillset::{
skills::Skill, SkillGroupKind, SkillPrerequisite, SKILL_GROUP_DEFS, SKILL_PREREQUISITES,
},
};
#[derive(StructOpt)]
@ -35,9 +37,13 @@ fn main() {
*nodes.entry(node).or_insert_with(|| graph.add_node(node))
};
for skill in skills {
let prerequisites = SKILL_PREREQUISITES
.get(skill)
.map_or(Vec::new(), |p| p.iter().collect::<Vec<_>>());
let prerequisites = SKILL_PREREQUISITES.get(skill).map_or(Vec::new(), |p| {
let p = match p {
SkillPrerequisite::Any(skills) => skills,
SkillPrerequisite::All(skills) => skills,
};
p.iter().collect::<Vec<_>>()
});
let out_node = add_node(&mut graph, *skill);
for prerequisite in prerequisites.iter().map(|(s, _)| s) {

4
common/src/comp/skillset/test.rs
View File

@ -18,6 +18,10 @@ fn check_cyclic_skill_deps() {
for (skill, prereqs) in skill_prereqs.iter() {
let skill_node = add_node(&mut graph, *skill);
let prereqs = match prereqs {
SkillPrerequisite::Any(skills) => skills,
SkillPrerequisite::All(skills) => skills,
};
for (prereq, _) in prereqs.iter() {
let prereq_node = add_node(&mut graph, *prereq);
graph.add_edge(prereq_node, skill_node, ());

7
voxygen/src/audio/sfx/event_mapper/combat/tests.rs
View File

@ -3,8 +3,8 @@ use crate::audio::sfx::SfxEvent;
use common::{
combat::DamageKind,
comp::{
inventory::loadout_builder::LoadoutBuilder, item::tool::ToolKind, melee,
CharacterAbilityType, CharacterState, Item,
controller::InputKind, inventory::loadout_builder::LoadoutBuilder, item::tool::ToolKind,
melee, CharacterAbilityType, CharacterState, Item,
},
states,
};
@ -238,10 +238,9 @@ fn empty_ability_info() -> states::utils::AbilityInfo {
states::utils::AbilityInfo {
tool: None,
hand: None,
input: None,
input: InputKind::Primary,
input_attr: None,
ability_meta: Default::default(),
ability: None,
return_ability: None,
}
}

7
voxygen/src/audio/sfx/event_mapper/movement/tests.rs
View File

@ -2,8 +2,8 @@ use super::*;
use crate::audio::sfx::SfxEvent;
use common::{
comp::{
bird_large, character_state::AttackFilters, humanoid, quadruped_medium, quadruped_small,
Body, CharacterState, Ori, PhysicsState,
bird_large, character_state::AttackFilters, controller::InputKind, humanoid,
quadruped_medium, quadruped_small, Body, CharacterState, Ori, PhysicsState,
},
states,
terrain::{Block, BlockKind},
@ -298,10 +298,9 @@ fn empty_ability_info() -> states::utils::AbilityInfo {
states::utils::AbilityInfo {
tool: None,
hand: None,
input: None,
input: InputKind::Primary,
input_attr: None,
ability_meta: Default::default(),
ability: None,
return_ability: None,
}
}