From 7386257854b7f0ffb7d8338424ed624c5b0eeb16 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 28 Jan 2023 12:21:43 -0500
Subject: [PATCH] Appease CI

---
 common/src/bin/skill_graphviz.rs                   | 14 ++++++++++----
 common/src/comp/skillset/test.rs                   |  4 ++++
 voxygen/src/audio/sfx/event_mapper/combat/tests.rs |  7 +++----
 .../src/audio/sfx/event_mapper/movement/tests.rs   |  7 +++----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/common/src/bin/skill_graphviz.rs b/common/src/bin/skill_graphviz.rs
index 0753e24903..493d2597af 100644
--- a/common/src/bin/skill_graphviz.rs
+++ b/common/src/bin/skill_graphviz.rs
@@ -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) {
diff --git a/common/src/comp/skillset/test.rs b/common/src/comp/skillset/test.rs
index bda4849ad6..617e54a328 100644
--- a/common/src/comp/skillset/test.rs
+++ b/common/src/comp/skillset/test.rs
@@ -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, ());
diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
index 00d7646ea4..3865d0ee14 100644
--- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
@@ -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,
     }
 }
diff --git a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
index 88629a6e2c..2fa848222e 100644
--- a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
@@ -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,
     }
 }