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

Merge branch 'christof/kits_in_plugins' into 'master'

Browse Source 
support adding kits, presets and resource experience by plugins

See merge request veloren/veloren!4173
This commit is contained in:
Christof Petig 2023-11-07 23:06:17 +00:00
commit d193e03a03
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/cmd.rs
View File

@ -1,10 +1,9 @@
use crate::{
assets,
assets::{self, AssetCombined, Concatenate},
comp::{self, buff::BuffKind, inventory::item::try_all_item_defs, AdminRole as Role, Skill},
generation::try_all_entity_configs,
npc, terrain,
};
use assets::AssetExt;
use hashbrown::HashMap;
use lazy_static::lazy_static;
use serde::{Deserialize, Serialize};
@ -54,6 +53,9 @@ impl assets::Asset for KitManifest {
const EXTENSION: &'static str = "ron";
}
impl Concatenate for KitManifest {
fn concatenate(self, b: Self) -> Self { KitManifest(self.0.concatenate(b.0)) }
}
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
pub struct SkillPresetManifest(pub HashMap<String, Vec<(Skill, u8)>>);
@ -62,6 +64,9 @@ impl assets::Asset for SkillPresetManifest {
const EXTENSION: &'static str = "ron";
}
impl Concatenate for SkillPresetManifest {
fn concatenate(self, b: Self) -> Self { SkillPresetManifest(self.0.concatenate(b.0)) }
}
pub const KIT_MANIFEST_PATH: &str = "server.manifests.kits";
pub const PRESET_MANIFEST_PATH: &str = "server.manifests.presets";
@ -232,7 +237,7 @@ lazy_static! {
};
pub static ref KITS: Vec<String> = {
if let Ok(kits) = KitManifest::load(KIT_MANIFEST_PATH) {
if let Ok(kits) = KitManifest::load_and_combine(KIT_MANIFEST_PATH) {
let mut kits = kits.read().0.keys().cloned().collect::<Vec<String>>();
kits.sort();
kits
@ -242,7 +247,7 @@ lazy_static! {
};
static ref PRESETS: HashMap<String, Vec<(Skill, u8)>> = {
if let Ok(presets) = SkillPresetManifest::load(PRESET_MANIFEST_PATH) {
if let Ok(presets) = SkillPresetManifest::load_and_combine(PRESET_MANIFEST_PATH) {
presets.read().0.clone()
} else {
warn!("Error while loading presets");
@ -1196,11 +1201,13 @@ mod tests {
}
#[test]
fn test_loading_skill_presets() { SkillPresetManifest::load_expect(PRESET_MANIFEST_PATH); }
fn test_loading_skill_presets() {
SkillPresetManifest::load_expect_combined(PRESET_MANIFEST_PATH);
}
#[test]
fn test_load_kits() {
let kits = KitManifest::load_expect(KIT_MANIFEST_PATH).read();
let kits = KitManifest::load_expect_combined(KIT_MANIFEST_PATH).read();
let mut rng = rand::thread_rng();
for kit in kits.0.values() {
for (item_id, _) in kit.iter() {

9
server/src/events/interaction.rs
View File

@ -2,7 +2,7 @@ use specs::{world::WorldExt, Entity as EcsEntity, Join};
use vek::*;
use common::{
assets,
assets::{self, Concatenate},
comp::{
self,
agent::{AgentEvent, Sound, SoundKind},
@ -276,10 +276,15 @@ impl assets::Asset for ResourceExperienceManifest {
const EXTENSION: &'static str = "ron";
}
impl Concatenate for ResourceExperienceManifest {
fn concatenate(self, b: Self) -> Self { Self(self.0.concatenate(b.0)) }
}
lazy_static! {
static ref RESOURCE_EXPERIENCE_MANIFEST: assets::AssetHandle<ResourceExperienceManifest> =
assets::AssetExt::load_expect("server.manifests.resource_experience_manifest");
assets::AssetCombined::load_expect_combined(
"server.manifests.resource_experience_manifest"
);
}
pub fn handle_mine_block(