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
5362000de4
veloren/common/src/skillset_builder.rs

611 lines
40 KiB
Rust
Raw Normal View History

Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
use crate::comp::{
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
item::{tool::ToolKind, Item, ItemKind},
skills::{
AxeSkill, BowSkill, HammerSkill, Skill, SkillGroupType, SkillSet, StaffSkill, SwordSkill,
},
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
};
use tracing::warn;
#[derive(Copy, Clone)]
pub enum SkillSetConfig {
Guard,
Villager,
Outcast,
Highwayman,
Bandit,
CultistNovice,
CultistAcolyte,
Warlord,
Warlock,
}
pub struct SkillSetBuilder(SkillSet);
impl Default for SkillSetBuilder {
fn default() -> Self { Self(SkillSet::default()) }
}
impl SkillSetBuilder {
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
pub fn build_skillset(main_tool: &Option<Item>, config: Option<SkillSetConfig>) -> Self {
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
let mut skillset = Self::default();
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
let active_item = main_tool.as_ref().and_then(|ic| {
if let ItemKind::Tool(tool) = &ic.kind() {
Some(tool.kind)
} else {
None
}
});
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
use SkillSetConfig::*;
match config {
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
Some(Guard) => {
if let Some(ToolKind::Sword) = active_item {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsRegen));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DCost));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDrain));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DScaling));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DInfinite));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
}
},
Some(Outcast) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CSpeed));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::ProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CKnockback));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CProjSpeed));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDrain));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FVelocity));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
},
Some(Highwayman) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SCost));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LUnlockLeap));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CKnockback));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CMove));
skillset = skillset.with_skill(Skill::Bow(BowSkill::UnlockRepeater));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RArrows));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BExplosion));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRegen));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRadius));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FRange));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FVelocity));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::UnlockShockwave));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
},
Some(Bandit) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DCost));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsRegen));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LKnockback));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LCost));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDistance));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsRegen));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LCost));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDistance));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::ProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BRegen));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDrain));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::UnlockRepeater));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RGlide));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BExplosion));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FRange));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDrain));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::UnlockShockwave));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
},
Some(CultistNovice) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsRegen));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DCost));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDrain));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DScaling));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SHelicopter));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LKnockback));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDistance));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsRegen));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDrain));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LKnockback));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::ProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CKnockback));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDrain));
skillset = skillset.with_skill(Skill::Bow(BowSkill::UnlockRepeater));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RGlide));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RArrows));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BExplosion));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRadius));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FRange));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDrain));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FVelocity));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::UnlockShockwave));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
},
Some(CultistAcolyte) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DScaling));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SCost));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LKnockback));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LCost));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDistance));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsRegen));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDrain));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CKnockback));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDrain));
skillset = skillset.with_skill(Skill::Bow(BowSkill::UnlockRepeater));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RGlide));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RArrows));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BExplosion));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRadius));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FRange));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FVelocity));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::UnlockShockwave));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SKnockback));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
},
Some(Warlord) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsRegen));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DCost));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDrain));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsRegen));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SHelicopter));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LKnockback));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDistance));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsRegen));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDrain));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDistance));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BRegen));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CKnockback));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CMove));
skillset = skillset.with_skill(Skill::Bow(BowSkill::UnlockRepeater));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RGlide));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RArrows));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BExplosion));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRegen));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRadius));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDrain));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FVelocity));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::UnlockShockwave));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SKnockback));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
},
Some(Warlock) => {
match active_item {
Some(ToolKind::Sword) => {
// Sword
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsCombo));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsRegen));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::TsSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DCost));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DDrain));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::DScaling));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SUnlockSpin));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SDamage));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpeed));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SSpins));
skillset = skillset.with_skill(Skill::Sword(SwordSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Axe) => {
// Axe
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsCombo));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::DsRegen));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SInfinite));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SHelicopter));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SSpeed));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::SCost));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDamage));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LKnockback));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LCost));
skillset = skillset.with_skill(Skill::Axe(AxeSkill::LDistance));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Hammer) => {
// Hammer
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::SsRegen));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CDrain));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::CSpeed));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LUnlockLeap));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDamage));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LCost));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LDistance));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LKnockback));
skillset = skillset.with_skill(Skill::Hammer(HammerSkill::LRange));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Bow) => {
// Bow
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset = skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::ProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::BRegen));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CKnockback));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CProjSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CDrain));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CSpeed));
skillset = skillset.with_skill(Skill::Bow(BowSkill::CMove));
skillset = skillset.with_skill(Skill::Bow(BowSkill::UnlockRepeater));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RDamage));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RGlide));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RArrows));
skillset = skillset.with_skill(Skill::Bow(BowSkill::RCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
Some(ToolKind::Staff) => {
// Staff
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
skillset =
skillset.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BExplosion));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRegen));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::BRadius));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FRange));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FDrain));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::FVelocity));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::UnlockShockwave));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SDamage));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SKnockback));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SRange));
skillset = skillset.with_skill(Skill::Staff(StaffSkill::SCost));
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
},
_ => {},
}
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
},
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
Some(Villager) | None => {},
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
}
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
skillset
}
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
pub fn with_skill(mut self, skill: Skill) -> Self {
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
if let Some(skill_group) = skill.get_skill_group_type() {
self.0
.add_skill_points(skill_group, self.0.skill_point_cost(skill));
self.0.unlock_skill(skill);
if !self.0.skills.contains_key(&skill) {
warn!(
Humanoid skill config and AI skill check updated axe skill with correct icons
2021-01-08 20:53:52 +00:00
"Failed to add skill: {:?}. Verify that it has the appropriate skill group \
available and meets all prerequisite skills.",
skill
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
);
}
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
} else {
warn!(
"Tried to add skill: {:?} which does not have an associated skill group.",
skill
);
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
}
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
self
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
}
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
pub fn with_skill_group(mut self, skill_group: SkillGroupType) -> Self {
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
self.0.unlock_skill_group(skill_group);
stats display Addressed comments. Addressed comments.
2021-01-10 01:05:13 +00:00
self
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
}
pub fn build(self) -> SkillSet { self.0 }
}
Reference in New Issue Copy Permalink