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

Skills can now have prerequisite skills. Skills can now cost different amounts of skill points.

Browse Source
This commit is contained in:
Sam 2020-11-18 19:26:55 -06:00
parent cbfe064e4f
commit 5d474974b9
2 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/lib.rs
View File

@ -982,6 +982,16 @@ impl Client {
SkillGroupType::Weapon(Sceptre),
)));
},
"@unlock health1" => {
self.send_msg(ClientGeneral::UnlockSkill(Skill::General(
GeneralSkill::HealthIncrease1,
)));
},
"@unlock health2" => {
self.send_msg(ClientGeneral::UnlockSkill(Skill::General(
GeneralSkill::HealthIncrease2,
)));
},
_ => {},
}
} else {

53
common/src/comp/skills.rs
View File

@ -192,19 +192,24 @@ impl SkillSet {
pub fn unlock_skill(&mut self, skill: Skill) {
if !self.skills.contains(&skill) {
if let Some(skill_group_type) = SkillSet::get_skill_group_type_for_skill(&skill) {
let prerequisites_met = self.prerequisites_met(skill);
if let Some(mut skill_group) = self
.skill_groups
.iter_mut()
.find(|x| x.skill_group_type == skill_group_type)
{
if skill_group.available_sp > 0 {
skill_group.available_sp -= 1;
if let Skill::UnlockGroup(group) = skill {
self.unlock_skill_group(group);
if prerequisites_met {
if skill_group.available_sp >= skill.skill_cost() {
skill_group.available_sp -= skill.skill_cost();
if let Skill::UnlockGroup(group) = skill {
self.unlock_skill_group(group);
}
self.skills.insert(skill);
} else {
warn!("Tried to unlock skill for skill group with insufficient SP");
}
self.skills.insert(skill);
} else {
warn!("Tried to unlock skill for skill group with no available SP");
warn!("Tried to unlock skill without meeting prerequisite skills");
}
} else {
warn!("Tried to unlock skill for a skill group that player does not have");
@ -243,7 +248,7 @@ impl SkillSet {
.iter_mut()
.find(|x| x.skill_group_type == skill_group_type)
{
skill_group.available_sp += 1;
skill_group.available_sp += skill.skill_cost();
self.skills.remove(&skill);
} else {
warn!("Tried to refund skill for a skill group that player does not have");
@ -320,6 +325,40 @@ impl SkillSet {
warn!("Tried to add experience to a skill group that player does not have");
}
}
/// Checks that the skill set contains all prerequisite skills for a
/// particular skill
pub fn prerequisites_met(&self, skill: Skill) -> bool {
skill
.prerequisite_skills()
.iter()
.all(|s| self.skills.contains(s))
}
}
impl Skill {
/// Returns a vec of prerequisite skills (it should only be necessary to
/// note direct prerequisites)
pub fn prerequisite_skills(self) -> Vec<Skill> {
let mut prerequisites = Vec::new();
use Skill::*;
match self {
General(GeneralSkill::HealthIncrease2) => {
prerequisites.push(General(GeneralSkill::HealthIncrease1));
},
_ => {},
}
prerequisites
}
/// Returns the cost in skill points of unlocking a particular skill
pub fn skill_cost(self) -> u16 {
use Skill::*;
match self {
General(GeneralSkill::HealthIncrease2) => 2,
_ => 1,
}
}
}
#[cfg(test)]