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 are now factored into combat rating. New formula for exp scaling per SP.

Browse Source 
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.
This commit is contained in:
Sam
2021-01-16 12:01:57 -05:00
parent 0b156542e4
commit eaa41c7dea
31 changed files with 718 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/src/states/utils.rs
View File

@ -394,8 +394,7 @@ pub fn handle_ability1_input(data: &JoinData, update: &mut StateUpdate) {
ItemKind::Tool(tool) => Some(tool.kind),
_ => None,
};
a.clone()
.adjusted_by_skills(&data.stats.skill_set.skills, tool)
a.clone().adjusted_by_skills(&data.stats.skill_set, tool)
})
})
.filter(|ability| ability.requirements_paid(data, update))
@ -439,8 +438,7 @@ pub fn handle_ability2_input(data: &JoinData, update: &mut StateUpdate) {
ItemKind::Tool(tool) => Some(tool.kind),
_ => None,
};
a.clone()
.adjusted_by_skills(&data.stats.skill_set.skills, tool)
a.clone().adjusted_by_skills(&data.stats.skill_set, tool)
})
})
.filter(|ability| ability.requirements_paid(data, update))
@ -458,8 +456,7 @@ pub fn handle_ability2_input(data: &JoinData, update: &mut StateUpdate) {
ItemKind::Tool(tool) => Some(tool.kind),
_ => None,
};
a.clone()
.adjusted_by_skills(&data.stats.skill_set.skills, tool)
a.clone().adjusted_by_skills(&data.stats.skill_set, tool)
})
})
.filter(|ability| ability.requirements_paid(data, update))
@ -486,12 +483,12 @@ pub fn handle_ability3_input(data: &JoinData, update: &mut StateUpdate) {
.ability3
.as_ref()
.and_then(|s| match tool {
// TODO: Make this so abilities aren't hardcoded to ability3
Some(ToolKind::Sword)
if !&data
.stats
.skill_set
.skills
.contains_key(&Skill::Sword(SwordSkill::UnlockSpin)) =>
.has_skill(Skill::Sword(SwordSkill::UnlockSpin)) =>
{
None
},
@ -499,8 +496,7 @@ pub fn handle_ability3_input(data: &JoinData, update: &mut StateUpdate) {
if !&data
.stats
.skill_set
.skills
.contains_key(&Skill::Axe(AxeSkill::UnlockLeap)) =>
.has_skill(Skill::Axe(AxeSkill::UnlockLeap)) =>
{
None
},
@ -508,8 +504,7 @@ pub fn handle_ability3_input(data: &JoinData, update: &mut StateUpdate) {
if !&data
.stats
.skill_set
.skills
.contains_key(&Skill::Hammer(HammerSkill::UnlockLeap)) =>
.has_skill(Skill::Hammer(HammerSkill::UnlockLeap)) =>
{
None
},
@ -517,8 +512,7 @@ pub fn handle_ability3_input(data: &JoinData, update: &mut StateUpdate) {
if !&data
.stats
.skill_set
.skills
.contains_key(&Skill::Bow(BowSkill::UnlockRepeater)) =>
.has_skill(Skill::Bow(BowSkill::UnlockRepeater)) =>
{
None
},
@ -526,17 +520,13 @@ pub fn handle_ability3_input(data: &JoinData, update: &mut StateUpdate) {
if !&data
.stats
.skill_set
.skills
.contains_key(&Skill::Staff(StaffSkill::UnlockShockwave)) =>
.has_skill(Skill::Staff(StaffSkill::UnlockShockwave)) =>
{
None
},
_ => Some(s),
})
.map(|a| {
a.clone()
.adjusted_by_skills(&data.stats.skill_set.skills, tool)
})
.map(|a| a.clone().adjusted_by_skills(&data.stats.skill_set, tool))
})
.filter(|ability| ability.requirements_paid(data, update))
{
@ -553,10 +543,10 @@ pub fn handle_dodge_input(data: &JoinData, update: &mut StateUpdate) {
.inventory
.equipped(EquipSlot::Mainhand)
.and_then(|i| {
i.item_config_expect().dodge_ability.as_ref().map(|a| {
a.clone()
.adjusted_by_skills(&data.stats.skill_set.skills, None)
})
i.item_config_expect()
.dodge_ability
.as_ref()
.map(|a| a.clone().adjusted_by_skills(&data.stats.skill_set, None))
})
.filter(|ability| ability.requirements_paid(data, update))
{