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

Comment-out health/energy skills

Browse Source
This commit is contained in:
juliancoffee 2024-03-18 23:29:35 +02:00
parent 32989ffe99
commit 1e6e595a87
19 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/skill_trees/skill_max_levels.ron
View File

@ -1,6 +1,8 @@
({
/*
General(HealthIncrease): 10,
General(EnergyIncrease): 5,
*/
Hammer(SsKnockback): 2,
Hammer(SsDamage): 3,
Hammer(SsRegen): 2,

2
assets/common/skill_trees/skills_skill-groups_manifest.ron
View File

@ -1,7 +1,9 @@
({
General: [
/*
General(HealthIncrease),
General(EnergyIncrease),
*/
UnlockGroup(Weapon(Sword)),
UnlockGroup(Weapon(Axe)),
UnlockGroup(Weapon(Hammer)),

2
assets/common/skillset/preset/rank1/general.ron
View File

@ -1,4 +1,6 @@
([
/*
Skill((General(HealthIncrease), 2)),
Skill((General(EnergyIncrease), 1)),
*/
])

2
assets/common/skillset/preset/rank2/general.ron
View File

@ -1,4 +1,6 @@
([
/*
Skill((General(HealthIncrease), 4)),
Skill((General(EnergyIncrease), 2)),
*/
])

2
assets/common/skillset/preset/rank3/general.ron
View File

@ -1,4 +1,6 @@
([
/*
Skill((General(HealthIncrease), 6)),
Skill((General(EnergyIncrease), 3)),
*/
])

2
assets/common/skillset/preset/rank4/general.ron
View File

@ -1,4 +1,6 @@
([
/*
Skill((General(HealthIncrease), 8)),
Skill((General(EnergyIncrease), 4)),
*/
])

2
assets/common/skillset/preset/rank5/general.ron
View File

@ -1,4 +1,6 @@
([
/*
Skill((General(HealthIncrease), 10)),
Skill((General(EnergyIncrease), 5)),
*/
])

4
assets/server/manifests/presets.ron
View File

@ -3,8 +3,10 @@
({
"max": [
// General skills
/*
(General(HealthIncrease), 10),
(General(EnergyIncrease), 5),
*/
(Roll(Cost), 2),
(Roll(Strength), 2),
(Roll(Duration), 2),
@ -146,8 +148,10 @@
// Just copypasta from max with random reductions
"middle": [
// General skills
/*
(General(HealthIncrease), 6),
(General(EnergyIncrease), 4),
*/
(Roll(Cost), 2),
(Roll(Strength), 1),
(Roll(Duration), 1),

8
assets/voxygen/i18n/en/hud/skills.ftl
View File

@ -17,10 +17,10 @@ hud-skill-sp_available =
hud-skill-not_unlocked = Not yet unlocked
hud-skill-req_sp = {"\u000A"}Requires { $number } SP
hud-skill-set_as_exp_bar = Track progress on experience bar
hud-skill-inc_health_title = Increase health
hud-skill-inc_health = Increases your maximum health by { $boost } points.{ $SP }
hud-skill-inc_energy_title = Increase energy
hud-skill-inc_energy = Increases your maximum energy by { $boost } points.{ $SP }
hud-skill-health_title = Health
hud-skill-health = Gives you the ability to withstand attacks.
hud-skill-energy_title = Energy
hud-skill-energy = Your main resource for actions.
hud-skill-unlck_sword_title = Sword proficiency
hud-skill-unlck_sword = Unlocks the sword skill tree.{ $SP }

6
common/src/comp/body.rs
View File

@ -809,15 +809,14 @@ impl Body {
bird_large::Species::SeaWyvern => 600,
bird_large::Species::WealdWyvern => 600,
},
Body::Humanoid(_) => 75,
Body::Humanoid(_) => 100,
_ => 100,
}
}
#[allow(unreachable_patterns)]
pub fn base_health(&self) -> u16 {
match self {
Body::Humanoid(_) => 50,
Body::Humanoid(_) => 100,
Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
// T1
quadruped_small::Species::Boar => 60,
@ -1042,7 +1041,6 @@ impl Body {
arthropod::Species::Mosscrawler => 600,
arthropod::Species::Sandcrawler => 500,
arthropod::Species::Stagbeetle => 440,
_ => 150,
},
Body::Ship(_) => 1000,
Body::Crustacean(_) => 40,

17
common/src/comp/skillset/mod.rs
View File

@ -256,8 +256,9 @@ impl SkillGroup {
pub struct SkillSet {
skill_groups: HashMap<SkillGroupKind, SkillGroup>,
skills: HashMap<Skill, u16>,
pub modify_health: bool,
pub modify_energy: bool,
//#[deprecated]
//pub modify_health: bool,
//pub modify_energy: bool,
}
impl Component for SkillSet {
@ -273,8 +274,8 @@ impl Default for SkillSet {
let mut skill_group = Self {
skill_groups: HashMap::new(),
skills: SkillSet::initial_skills(),
modify_health: false,
modify_energy: false,
//modify_health: false,
//modify_energy: false,
};
// Insert default skill groups
@ -306,8 +307,8 @@ impl SkillSet {
let mut skillset = SkillSet {
skill_groups,
skills: SkillSet::initial_skills(),
modify_health: true,
modify_energy: true,
//modify_health: true,
//modify_energy: true,
};
let mut persistence_load_error = None;
@ -530,12 +531,16 @@ impl SkillSet {
Skill::UnlockGroup(group) => {
this.unlock_skill_group(group);
},
/*
Skill::General(GeneralSkill::HealthIncrease) => {
this.modify_health = true;
},
*/
/*
Skill::General(GeneralSkill::EnergyIncrease) => {
this.modify_energy = true;
},
*/
_ => {},
}
this.skills.insert(skill, next_level);

2
common/src/comp/skillset/skills.rs
View File

@ -164,8 +164,10 @@ pub enum SceptreSkill {
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)]
pub enum GeneralSkill {
/*
HealthIncrease,
EnergyIncrease,
*/
}
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)]

4
common/src/states/basic_summon.rs
View File

@ -132,12 +132,14 @@ impl CharacterBehavior for Data {
);
let health = self.static_data.summon_info.has_health.then(|| {
/*
let health_level = skill_set
.skill_level(skills::Skill::General(
skills::GeneralSkill::HealthIncrease,
))
.unwrap_or(0);
comp::Health::new(body, health_level)
*/
comp::Health::new(body, 0)
});
// Ray cast to check where summon should happen

8
common/systems/src/stats.rs
View File

@ -33,7 +33,7 @@ pub struct ReadData<'a> {
time: Read<'a, Time>,
events: Events<'a>,
positions: ReadStorage<'a, Pos>,
bodies: ReadStorage<'a, Body>,
//bodies: ReadStorage<'a, Body>,
char_states: ReadStorage<'a, CharacterState>,
inventories: ReadStorage<'a, Inventory>,
msm: ReadExpect<'a, MaterialStatManifest>,
@ -46,7 +46,7 @@ impl<'a> System<'a> for Sys {
type SystemData = (
ReadData<'a>,
WriteStorage<'a, Stats>,
WriteStorage<'a, SkillSet>,
//WriteStorage<'a, SkillSet>,
WriteStorage<'a, Health>,
WriteStorage<'a, Poise>,
WriteStorage<'a, Energy>,
@ -63,7 +63,7 @@ impl<'a> System<'a> for Sys {
(
read_data,
stats,
mut skill_sets,
//mut skill_sets,
mut healths,
mut poises,
mut energies,
@ -120,6 +120,7 @@ impl<'a> System<'a> for Sys {
}
});
/*
// Apply effects from leveling skills
let join = (
&mut skill_sets,
@ -144,6 +145,7 @@ impl<'a> System<'a> for Sys {
skill_set.modify_energy = false;
}
});
*/
// Update energies and poises
let join = (&read_data.char_states, &mut energies, &mut poises).lend_join();

3
common/systems/tests/character_state.rs
View File

@ -66,9 +66,12 @@ mod tests {
.with(body)
.with(Energy::new(
body,
0,
/*
skill_set
.skill_level(Skill::General(GeneralSkill::EnergyIncrease))
.unwrap_or(0),
*/
))
.with(Controller::default())
.with(Poise::new(body))

3
common/systems/tests/phys/utils.rs
View File

@ -133,9 +133,12 @@ pub fn create_player(state: &mut State) -> Entity {
.with(Auras::default())
.with(Energy::new(
body,
0,
/*
skill_set
.skill_level(Skill::General(GeneralSkill::EnergyIncrease))
.unwrap_or(0),
*/
))
.with(Health::new(body, body.base_health()))
.with(skill_set)

14
server/src/state_ext.rs
View File

@ -301,9 +301,12 @@ impl StateExt for State {
.with(body)
.with(comp::Energy::new(
body,
0,
/*
skill_set
.skill_level(Skill::General(GeneralSkill::EnergyIncrease))
.unwrap_or(0),
*/
))
.with(stats)
.with(if body.is_humanoid() {
@ -734,6 +737,7 @@ impl StateExt for State {
self.write_component_ignore_entity_dead(entity, body);
self.write_component_ignore_entity_dead(entity, body.mass());
self.write_component_ignore_entity_dead(entity, body.density());
/*
let (health_level, energy_level) = (
skill_set
.skill_level(Skill::General(GeneralSkill::HealthIncrease))
@ -742,8 +746,9 @@ impl StateExt for State {
.skill_level(Skill::General(GeneralSkill::EnergyIncrease))
.unwrap_or(0),
);
self.write_component_ignore_entity_dead(entity, comp::Health::new(body, health_level));
self.write_component_ignore_entity_dead(entity, comp::Energy::new(body, energy_level));
*/
self.write_component_ignore_entity_dead(entity, comp::Health::new(body, 0));
self.write_component_ignore_entity_dead(entity, comp::Energy::new(body, 0));
self.write_component_ignore_entity_dead(entity, Poise::new(body));
self.write_component_ignore_entity_dead(entity, stats);
self.write_component_ignore_entity_dead(entity, active_abilities);
@ -778,9 +783,6 @@ impl StateExt for State {
pets.len(),
player_pos
);
// This is the same as wild creatures naturally spawned in the world
const DEFAULT_PET_HEALTH_LEVEL: u16 = 0;
let mut rng = rand::thread_rng();
for (pet, body, stats) in pets {
@ -791,7 +793,7 @@ impl StateExt for State {
ori,
stats,
comp::SkillSet::default(),
Some(comp::Health::new(body, DEFAULT_PET_HEALTH_LEVEL)),
Some(comp::Health::new(body, 0)),
Poise::new(body),
Inventory::with_loadout(
LoadoutBuilder::from_default(&body).build(),

4
server/src/sys/terrain.rs
View File

@ -498,10 +498,12 @@ impl SpawnEntityData {
inventory
};
/*
let health_level = skill_set
.skill_level(skills::Skill::General(skills::GeneralSkill::HealthIncrease))
.unwrap_or(0);
let health = Some(comp::Health::new(body, health_level));
*/
let health = Some(comp::Health::new(body, 0));
let poise = comp::Poise::new(body);
// Allow Humanoid, BirdMedium, and Parrot to speak

16
voxygen/src/hud/diary.rs
View File

@ -1,3 +1,4 @@
#![allow(deprecated)]
use super::{
img_ids::{Imgs, ImgsRot},
item_imgs::{animate_by_pulse, ItemImgs},
@ -1419,14 +1420,17 @@ impl<'a> Diary<'a> {
// 5 1 6
// 3 0 4
// 8 2 7
SkillIcon::Unlockable {
skill: Skill::General(HealthIncrease),
// Bottom left skills
SkillIcon::Descriptive {
title: "hud-skill-health_title",
desc: "hud-skill-health",
image: self.imgs.health_plus_skill,
position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
id: state.ids.skill_general_stat_0,
},
SkillIcon::Unlockable {
skill: Skill::General(EnergyIncrease),
SkillIcon::Descriptive {
title: "hud-skill-energy_title",
desc: "hud-skill-energy",
image: self.imgs.energy_plus_skill,
position: MidTopWithMarginOn(state.ids.skills_top_l[1], 3.0),
id: state.ids.skill_general_stat_1,
@ -2849,7 +2853,9 @@ impl<'a> Diary<'a> {
fn skill_strings(skill: Skill) -> SkillStrings<'static> {
match skill {
// general tree
/*
Skill::General(s) => general_skill_strings(s),
*/
Skill::UnlockGroup(s) => unlock_skill_strings(s),
// weapon trees
Skill::Hammer(s) => hammer_skill_strings(s),
@ -2866,6 +2872,7 @@ fn skill_strings(skill: Skill) -> SkillStrings<'static> {
}
}
/*
fn general_skill_strings(skill: GeneralSkill) -> SkillStrings<'static> {
match skill {
GeneralSkill::HealthIncrease => SkillStrings::with_const(
@ -2880,6 +2887,7 @@ fn general_skill_strings(skill: GeneralSkill) -> SkillStrings<'static> {
),
}
}
*/
fn unlock_skill_strings(group: SkillGroupKind) -> SkillStrings<'static> {
match group {