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

625 lines
35 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 {
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsDamage))
.with_skill(Skill::Sword(SwordSkill::TsRegen))
.with_skill(Skill::Sword(SwordSkill::TsSpeed))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DCost))
.with_skill(Skill::Sword(SwordSkill::DDrain))
.with_skill(Skill::Sword(SwordSkill::DScaling))
.with_skill(Skill::Sword(SwordSkill::DSpeed))
.with_skill(Skill::Sword(SwordSkill::DInfinite))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SDamage))
.with_skill(Skill::Sword(SwordSkill::SSpeed))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.with_skill(Skill::Sword(SwordSkill::SCost))
} else {
Self::default()
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SSpeed))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsSpeed))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::ProjSpeed))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FDrain))
.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
},
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
_ => Self::default(),
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsDamage))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::DsDamage))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SDamage))
.with_skill(Skill::Axe(AxeSkill::SSpeed))
.with_skill(Skill::Axe(AxeSkill::SCost))
.with_skill(Skill::Axe(AxeSkill::UnlockLeap))
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsDamage))
.with_skill(Skill::Hammer(HammerSkill::SsSpeed))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.with_skill(Skill::Hammer(HammerSkill::UnlockLeap))
.with_skill(Skill::Hammer(HammerSkill::LKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CKnockback))
.with_skill(Skill::Bow(BowSkill::CSpeed))
.with_skill(Skill::Bow(BowSkill::CMove))
.with_skill(Skill::Bow(BowSkill::UnlockRepeater))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::BExplosion))
.with_skill(Skill::Staff(StaffSkill::BRegen))
.with_skill(Skill::Staff(StaffSkill::BRadius))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FRange))
.with_skill(Skill::Staff(StaffSkill::FVelocity))
.with_skill(Skill::Staff(StaffSkill::UnlockShockwave))
},
_ => Self::default(),
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsDamage))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DCost))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SDamage))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::DsSpeed))
.with_skill(Skill::Axe(AxeSkill::DsRegen))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SDamage))
.with_skill(Skill::Axe(AxeSkill::UnlockLeap))
.with_skill(Skill::Axe(AxeSkill::LKnockback))
.with_skill(Skill::Axe(AxeSkill::LCost))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsDamage))
.with_skill(Skill::Hammer(HammerSkill::SsRegen))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.with_skill(Skill::Hammer(HammerSkill::CDamage))
.with_skill(Skill::Hammer(HammerSkill::UnlockLeap))
.with_skill(Skill::Hammer(HammerSkill::LDamage))
.with_skill(Skill::Hammer(HammerSkill::LCost))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::ProjSpeed))
.with_skill(Skill::Bow(BowSkill::BRegen))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CDrain))
.with_skill(Skill::Bow(BowSkill::CSpeed))
.with_skill(Skill::Bow(BowSkill::UnlockRepeater))
.with_skill(Skill::Bow(BowSkill::RGlide))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::BExplosion))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FRange))
.with_skill(Skill::Staff(StaffSkill::FDrain))
.with_skill(Skill::Staff(StaffSkill::UnlockShockwave))
.with_skill(Skill::Staff(StaffSkill::SDamage))
.with_skill(Skill::Staff(StaffSkill::SRange))
},
_ => Self::default(),
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsRegen))
.with_skill(Skill::Sword(SwordSkill::TsSpeed))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DCost))
.with_skill(Skill::Sword(SwordSkill::DDrain))
.with_skill(Skill::Sword(SwordSkill::DScaling))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SSpeed))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SHelicopter))
.with_skill(Skill::Axe(AxeSkill::SDamage))
.with_skill(Skill::Axe(AxeSkill::UnlockLeap))
.with_skill(Skill::Axe(AxeSkill::LKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsSpeed))
.with_skill(Skill::Hammer(HammerSkill::SsRegen))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.with_skill(Skill::Hammer(HammerSkill::CDamage))
.with_skill(Skill::Hammer(HammerSkill::CDrain))
.with_skill(Skill::Hammer(HammerSkill::CSpeed))
.with_skill(Skill::Hammer(HammerSkill::UnlockLeap))
.with_skill(Skill::Hammer(HammerSkill::LDamage))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::ProjSpeed))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CKnockback))
.with_skill(Skill::Bow(BowSkill::CProjSpeed))
.with_skill(Skill::Bow(BowSkill::CDrain))
.with_skill(Skill::Bow(BowSkill::UnlockRepeater))
.with_skill(Skill::Bow(BowSkill::RDamage))
.with_skill(Skill::Bow(BowSkill::RGlide))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::BExplosion))
.with_skill(Skill::Staff(StaffSkill::BDamage))
.with_skill(Skill::Staff(StaffSkill::BRadius))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FRange))
.with_skill(Skill::Staff(StaffSkill::FDrain))
.with_skill(Skill::Staff(StaffSkill::FVelocity))
.with_skill(Skill::Staff(StaffSkill::UnlockShockwave))
.with_skill(Skill::Staff(StaffSkill::SDamage))
.with_skill(Skill::Staff(StaffSkill::SRange))
},
_ => Self::default(),
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsDamage))
.with_skill(Skill::Sword(SwordSkill::TsSpeed))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DScaling))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SDamage))
.with_skill(Skill::Sword(SwordSkill::SSpeed))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::DsDamage))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SDamage))
.with_skill(Skill::Axe(AxeSkill::SCost))
.with_skill(Skill::Axe(AxeSkill::UnlockLeap))
.with_skill(Skill::Axe(AxeSkill::LDamage))
.with_skill(Skill::Axe(AxeSkill::LKnockback))
.with_skill(Skill::Axe(AxeSkill::LCost))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsDamage))
.with_skill(Skill::Hammer(HammerSkill::SsRegen))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.with_skill(Skill::Hammer(HammerSkill::CDamage))
.with_skill(Skill::Hammer(HammerSkill::CDrain))
.with_skill(Skill::Hammer(HammerSkill::UnlockLeap))
.with_skill(Skill::Hammer(HammerSkill::LDamage))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CKnockback))
.with_skill(Skill::Bow(BowSkill::CProjSpeed))
.with_skill(Skill::Bow(BowSkill::CDrain))
.with_skill(Skill::Bow(BowSkill::UnlockRepeater))
.with_skill(Skill::Bow(BowSkill::RDamage))
.with_skill(Skill::Bow(BowSkill::RGlide))
.with_skill(Skill::Bow(BowSkill::RArrows))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::BExplosion))
.with_skill(Skill::Staff(StaffSkill::BDamage))
.with_skill(Skill::Staff(StaffSkill::BRadius))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FRange))
.with_skill(Skill::Staff(StaffSkill::FVelocity))
.with_skill(Skill::Staff(StaffSkill::UnlockShockwave))
.with_skill(Skill::Staff(StaffSkill::SDamage))
.with_skill(Skill::Staff(StaffSkill::SKnockback))
.with_skill(Skill::Staff(StaffSkill::SRange))
},
_ => Self::default(),
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsDamage))
.with_skill(Skill::Sword(SwordSkill::TsRegen))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DCost))
.with_skill(Skill::Sword(SwordSkill::DDrain))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SDamage))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::DsDamage))
.with_skill(Skill::Axe(AxeSkill::DsSpeed))
.with_skill(Skill::Axe(AxeSkill::DsRegen))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SHelicopter))
.with_skill(Skill::Axe(AxeSkill::SDamage))
.with_skill(Skill::Axe(AxeSkill::SSpeed))
.with_skill(Skill::Axe(AxeSkill::UnlockLeap))
.with_skill(Skill::Axe(AxeSkill::LDamage))
.with_skill(Skill::Axe(AxeSkill::LKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsDamage))
.with_skill(Skill::Hammer(HammerSkill::SsSpeed))
.with_skill(Skill::Hammer(HammerSkill::SsRegen))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.with_skill(Skill::Hammer(HammerSkill::CDamage))
.with_skill(Skill::Hammer(HammerSkill::CDrain))
.with_skill(Skill::Hammer(HammerSkill::UnlockLeap))
.with_skill(Skill::Hammer(HammerSkill::LDamage))
.with_skill(Skill::Hammer(HammerSkill::LDistance))
.with_skill(Skill::Hammer(HammerSkill::LKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::BRegen))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CKnockback))
.with_skill(Skill::Bow(BowSkill::CProjSpeed))
.with_skill(Skill::Bow(BowSkill::CSpeed))
.with_skill(Skill::Bow(BowSkill::CMove))
.with_skill(Skill::Bow(BowSkill::UnlockRepeater))
.with_skill(Skill::Bow(BowSkill::RDamage))
.with_skill(Skill::Bow(BowSkill::RGlide))
.with_skill(Skill::Bow(BowSkill::RArrows))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::BExplosion))
.with_skill(Skill::Staff(StaffSkill::BDamage))
.with_skill(Skill::Staff(StaffSkill::BRegen))
.with_skill(Skill::Staff(StaffSkill::BRadius))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FDrain))
.with_skill(Skill::Staff(StaffSkill::FVelocity))
.with_skill(Skill::Staff(StaffSkill::UnlockShockwave))
.with_skill(Skill::Staff(StaffSkill::SDamage))
.with_skill(Skill::Staff(StaffSkill::SKnockback))
.with_skill(Skill::Staff(StaffSkill::SCost))
},
_ => Self::default(),
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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Sword))
.with_skill(Skill::Sword(SwordSkill::TsCombo))
.with_skill(Skill::Sword(SwordSkill::TsDamage))
.with_skill(Skill::Sword(SwordSkill::TsRegen))
.with_skill(Skill::Sword(SwordSkill::TsSpeed))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DDamage))
.with_skill(Skill::Sword(SwordSkill::DCost))
.with_skill(Skill::Sword(SwordSkill::DDrain))
.with_skill(Skill::Sword(SwordSkill::DScaling))
.with_skill(Skill::Sword(SwordSkill::UnlockSpin))
.with_skill(Skill::Sword(SwordSkill::SDamage))
.with_skill(Skill::Sword(SwordSkill::SSpeed))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.with_skill(Skill::Sword(SwordSkill::SSpins))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Axe))
.with_skill(Skill::Axe(AxeSkill::DsCombo))
.with_skill(Skill::Axe(AxeSkill::DsDamage))
.with_skill(Skill::Axe(AxeSkill::DsSpeed))
.with_skill(Skill::Axe(AxeSkill::DsRegen))
.with_skill(Skill::Axe(AxeSkill::SInfinite))
.with_skill(Skill::Axe(AxeSkill::SHelicopter))
.with_skill(Skill::Axe(AxeSkill::SDamage))
.with_skill(Skill::Axe(AxeSkill::SSpeed))
.with_skill(Skill::Axe(AxeSkill::SCost))
.with_skill(Skill::Axe(AxeSkill::UnlockLeap))
.with_skill(Skill::Axe(AxeSkill::LDamage))
.with_skill(Skill::Axe(AxeSkill::LKnockback))
.with_skill(Skill::Axe(AxeSkill::LCost))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Hammer))
.with_skill(Skill::Hammer(HammerSkill::SsKnockback))
.with_skill(Skill::Hammer(HammerSkill::SsDamage))
.with_skill(Skill::Hammer(HammerSkill::SsSpeed))
.with_skill(Skill::Hammer(HammerSkill::SsRegen))
.with_skill(Skill::Hammer(HammerSkill::CKnockback))
.with_skill(Skill::Hammer(HammerSkill::CDamage))
.with_skill(Skill::Hammer(HammerSkill::CDrain))
.with_skill(Skill::Hammer(HammerSkill::CSpeed))
.with_skill(Skill::Hammer(HammerSkill::UnlockLeap))
.with_skill(Skill::Hammer(HammerSkill::LDamage))
.with_skill(Skill::Hammer(HammerSkill::LCost))
.with_skill(Skill::Hammer(HammerSkill::LDistance))
.with_skill(Skill::Hammer(HammerSkill::LKnockback))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Bow))
.with_skill(Skill::Bow(BowSkill::BDamage))
.with_skill(Skill::Bow(BowSkill::ProjSpeed))
.with_skill(Skill::Bow(BowSkill::BRegen))
.with_skill(Skill::Bow(BowSkill::CDamage))
.with_skill(Skill::Bow(BowSkill::CKnockback))
.with_skill(Skill::Bow(BowSkill::CProjSpeed))
.with_skill(Skill::Bow(BowSkill::CDrain))
.with_skill(Skill::Bow(BowSkill::CSpeed))
.with_skill(Skill::Bow(BowSkill::CMove))
.with_skill(Skill::Bow(BowSkill::UnlockRepeater))
.with_skill(Skill::Bow(BowSkill::RDamage))
.with_skill(Skill::Bow(BowSkill::RGlide))
.with_skill(Skill::Bow(BowSkill::RArrows))
.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
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Self::default()
.with_skill_group(SkillGroupType::Weapon(ToolKind::Staff))
.with_skill(Skill::Staff(StaffSkill::BExplosion))
.with_skill(Skill::Staff(StaffSkill::BDamage))
.with_skill(Skill::Staff(StaffSkill::BRegen))
.with_skill(Skill::Staff(StaffSkill::BRadius))
.with_skill(Skill::Staff(StaffSkill::FDamage))
.with_skill(Skill::Staff(StaffSkill::FRange))
.with_skill(Skill::Staff(StaffSkill::FDrain))
.with_skill(Skill::Staff(StaffSkill::FVelocity))
.with_skill(Skill::Staff(StaffSkill::UnlockShockwave))
.with_skill(Skill::Staff(StaffSkill::SDamage))
.with_skill(Skill::Staff(StaffSkill::SKnockback))
.with_skill(Skill::Staff(StaffSkill::SRange))
.with_skill(Skill::Staff(StaffSkill::SCost))
},
_ => Self::default(),
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
},
keyframed axe spin Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-13 08:11:31 +00:00
Some(Villager) | None => Self::default(),
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(mut self, skill: Skill) -> Self {
Skills are now factored into combat rating. New formula for exp scaling per SP. Adjust lvl up msg fade Add female humanoid names WIP Changed text formatting when skill is max level. Added message to show you have 0 skill points available. Addressed a lot of comments. various changes to UI - fix skillbar offset - remove CR indicators for group members - add CR indicators to group member frames - use unified CR indicator icon Exp reward tweaks. Fixed flamethrower range skill description.
2021-01-16 17:01:57 +00:00
if let Some(skill_group) = skill.skill_group_type() {
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
self.0
Skills are now factored into combat rating. New formula for exp scaling per SP. Adjust lvl up msg fade Add female humanoid names WIP Changed text formatting when skill is max level. Added message to show you have 0 skill points available. Addressed a lot of comments. various changes to UI - fix skillbar offset - remove CR indicators for group members - add CR indicators to group member frames - use unified CR indicator icon Exp reward tweaks. Fixed flamethrower range skill description.
2021-01-16 17:01:57 +00:00
.add_skill_points(skill_group, self.0.skill_cost(skill));
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
self.0.unlock_skill(skill);
Skills are now factored into combat rating. New formula for exp scaling per SP. Adjust lvl up msg fade Add female humanoid names WIP Changed text formatting when skill is max level. Added message to show you have 0 skill points available. Addressed a lot of comments. various changes to UI - fix skillbar offset - remove CR indicators for group members - add CR indicators to group member frames - use unified CR indicator icon Exp reward tweaks. Fixed flamethrower range skill description.
2021-01-16 17:01:57 +00:00
if !self.0.has_skill(skill) {
Added SkillSetConfig to specify skill sets for npcs.
2021-01-07 19:47:29 +00:00
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