mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Responding to review
- make `skillset_builder::Preset` void enum and left comment about how to extend it - add `.with_default_equipment()` in case if preset is missing to `basic_summon` loadout creation to match old `build_loadout()` behaviour
This commit is contained in:
parent
057aa7fecf
commit
d5cbe27612
@ -6,10 +6,11 @@ use crate::assets::{self, AssetExt};
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use tracing::warn;
|
use tracing::warn;
|
||||||
|
|
||||||
|
/// `SkillSetBuilder` preset. Consider using loading from assets, when possible.
|
||||||
|
/// When you're adding new enum variant,
|
||||||
|
/// handle it in [`with_preset`](SkillSetBuilder::with_preset) method
|
||||||
#[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug)]
|
#[derive(Copy, Clone, PartialEq, Serialize, Deserialize, Debug)]
|
||||||
pub enum Preset {
|
pub enum Preset {}
|
||||||
Empty,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Clone)]
|
#[derive(Debug, Deserialize, Clone)]
|
||||||
struct SkillSetTree(Vec<SkillNode>);
|
struct SkillSetTree(Vec<SkillNode>);
|
||||||
@ -89,12 +90,7 @@ impl SkillSetBuilder {
|
|||||||
|
|
||||||
/// Applies preset
|
/// Applies preset
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub const fn with_preset(self, preset: Preset) -> Self {
|
pub const fn with_preset(self, _preset: Preset) -> Self { self }
|
||||||
match preset {
|
|
||||||
Preset::Empty => {},
|
|
||||||
}
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
/// # Panics
|
/// # Panics
|
||||||
|
@ -84,10 +84,11 @@ impl CharacterBehavior for Data {
|
|||||||
let loadout = {
|
let loadout = {
|
||||||
let loadout_builder =
|
let loadout_builder =
|
||||||
LoadoutBuilder::new().with_default_maintool(&body);
|
LoadoutBuilder::new().with_default_maintool(&body);
|
||||||
|
// If preset is none, use default equipment
|
||||||
if let Some(preset) = loadout_config {
|
if let Some(preset) = loadout_config {
|
||||||
loadout_builder.with_preset(preset).build()
|
loadout_builder.with_preset(preset).build()
|
||||||
} else {
|
} else {
|
||||||
loadout_builder.build()
|
loadout_builder.with_default_equipment(&body).build()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user