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

handle terrain more correctly

Browse Source
This commit is contained in:
Christof Petig 2022-08-22 23:27:57 +02:00
parent fbe0aee40d
commit 04b7090197
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
world/src/site/economy/cache.rs
View File

@ -8,7 +8,7 @@ use crate::{
}; };
use common::{ use common::{
terrain::BiomeKind, terrain::BiomeKind,
trade::Good::{self, Territory}, trade::Good::{self, Territory, Terrain},
}; };
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -20,10 +20,6 @@ const fn default_true() -> bool { true }
struct RawGoodProperties { struct RawGoodProperties {
#[serde(default)] #[serde(default)]
pub decay_rate: f32, pub decay_rate: f32,
// #[serde(default)]
// pub decay_regain: Option<(Good, f32)>,
// #[serde(default)]
// pub equivalent_to: Option<(Good, f32, EquivalenceType)>,
#[serde(default = "default_one")] #[serde(default = "default_one")]
pub transport_effort: f32, pub transport_effort: f32,
#[serde(default = "default_true")] #[serde(default = "default_true")]
@ -40,10 +36,8 @@ impl assets::Asset for RawGoodPropertiesList {
const EXTENSION: &'static str = "ron"; const EXTENSION: &'static str = "ron";
} }
/// Contains all caches used for economical simulation /// Contains caches used for economic simulation
pub struct EconomyCache { pub struct EconomyCache {
// professions: Vec<Profession>,
// everybody: Profession,
pub(crate) transport_effort: GoodMap<f32>, pub(crate) transport_effort: GoodMap<f32>,
pub(crate) decay_rate: GoodMap<f32>, pub(crate) decay_rate: GoodMap<f32>,
pub(crate) direct_use_goods: Vec<GoodIndex>, pub(crate) direct_use_goods: Vec<GoodIndex>,
@ -84,6 +78,17 @@ fn load_cache() -> EconomyCache {
} }
} }
}, },
Terrain(BiomeKind::Void) => {
for j in good_list() {
if let Terrain(_) = Good::from(j) {
decay_rate[j] = i.1.decay_rate;
transport_effort[j] = i.1.transport_effort;
if !i.1.storable {
direct_use_goods.push(j);
}
}
}
},
_ => tracing::warn!("Raw good not in index: {:?}", i.0), _ => tracing::warn!("Raw good not in index: {:?}", i.0),
} }
} }