|
|
|
@ -10,7 +10,7 @@ use serde::Deserialize;
|
|
|
|
use std::str::Utf8Error;
|
|
|
|
use std::str::Utf8Error;
|
|
|
|
use thiserror::Error;
|
|
|
|
use thiserror::Error;
|
|
|
|
|
|
|
|
|
|
|
|
/// A Tweakfile is resource used to specify game customization like asset names,
|
|
|
|
/// A Tweaks is resource used to specify game customization like asset names,
|
|
|
|
/// and non-user customizations made to the game during development.
|
|
|
|
/// and non-user customizations made to the game during development.
|
|
|
|
pub(crate) struct TweakPlugin;
|
|
|
|
pub(crate) struct TweakPlugin;
|
|
|
|
|
|
|
|
|
|
|
|
@ -18,156 +18,101 @@ impl Plugin for TweakPlugin {
|
|
|
|
fn build(&self, app: &mut App) {
|
|
|
|
fn build(&self, app: &mut App) {
|
|
|
|
app.add_systems(OnEnter(GameState::Loading), load_tweakfile);
|
|
|
|
app.add_systems(OnEnter(GameState::Loading), load_tweakfile);
|
|
|
|
|
|
|
|
|
|
|
|
app.init_asset::<Tweakfile>()
|
|
|
|
app.init_asset::<Tweaks>()
|
|
|
|
.register_asset_loader(TweakfileLoader);
|
|
|
|
.register_asset_loader(TweaksLoader);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn load_tweakfile(server: Res<AssetServer>, mut commands: Commands) {
|
|
|
|
fn load_tweakfile(server: Res<AssetServer>, mut commands: Commands) {
|
|
|
|
let handle: Handle<Tweakfile> = server.load("martian.tweak.toml");
|
|
|
|
let handle: Handle<Tweaks> = server.load("martian.tweak.toml");
|
|
|
|
commands.insert_resource(GameTweakfile { handle });
|
|
|
|
commands.insert_resource(GameTweaks { handle });
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Resource)]
|
|
|
|
#[derive(Debug, Resource)]
|
|
|
|
pub(crate) struct GameTweakfile {
|
|
|
|
pub(crate) struct GameTweaks {
|
|
|
|
pub handle: Handle<Tweakfile>,
|
|
|
|
pub handle: Handle<Tweaks>,
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Tweakfile contains tweaks made to other parts of the game
|
|
|
|
|
|
|
|
#[derive(Debug, Deserialize, TypePath, Asset, Default)]
|
|
|
|
|
|
|
|
pub struct Tweakfile {
|
|
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
|
|
pub audio: audio::AudioTweaks,
|
|
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
|
|
pub display3d: display3d::tweaks::Display3dTweaks,
|
|
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
|
|
pub display2d: display2d::tweaks::Display2dTweaks,
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Asset, TypePath)]
|
|
|
|
#[derive(Debug, Asset, TypePath)]
|
|
|
|
pub struct Tweaks(HashMap<String, TweakValue>);
|
|
|
|
pub struct Tweaks {
|
|
|
|
|
|
|
|
table: toml::Table,
|
|
|
|
|
|
|
|
handles: HashMap<String, UntypedHandle>,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Tweaks {
|
|
|
|
impl Tweaks {
|
|
|
|
fn from_table(
|
|
|
|
fn from_table(table: &toml::Table, load_context: &mut LoadContext) -> Tweaks {
|
|
|
|
table: &toml::Table,
|
|
|
|
let handles = Tweaks::iter_all(table, "")
|
|
|
|
load_context: &mut LoadContext,
|
|
|
|
|
|
|
|
base: String,
|
|
|
|
|
|
|
|
) -> Vec<(String, TweakValue)> {
|
|
|
|
|
|
|
|
table
|
|
|
|
|
|
|
|
.iter()
|
|
|
|
.iter()
|
|
|
|
.flat_map(|(k, v)| {
|
|
|
|
.filter_map(|(k, v)| match v {
|
|
|
|
let key = if base.len() > 0 {
|
|
|
|
toml::Value::String(s) => std::path::Path::new(format!("assets/{}", s).as_str())
|
|
|
|
format!("{}_{}", base, k)
|
|
|
|
.exists()
|
|
|
|
} else {
|
|
|
|
.then(|| (k.clone(), load_context.load_untyped(s).untyped())),
|
|
|
|
k.clone()
|
|
|
|
_ => None,
|
|
|
|
};
|
|
|
|
|
|
|
|
match v {
|
|
|
|
|
|
|
|
toml::Value::Table(t) => Tweaks::from_table(t, load_context, key),
|
|
|
|
|
|
|
|
toml::Value::Datetime(_) => panic!("This type is not supported!"),
|
|
|
|
|
|
|
|
_ => vec![(key, TweakValue::from_toml(v, load_context))],
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.collect()
|
|
|
|
.collect();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn get_handle<T: Asset>(&self, key: &str) -> Option<Handle<T>> {
|
|
|
|
|
|
|
|
self.0.get(key).map(|val| Handle::<T>::from(val.clone()))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn get_int(&self, key: &str) -> Option<i64> {
|
|
|
|
Tweaks {
|
|
|
|
self.0.get(key).map(|val| i64::from(val.clone()))
|
|
|
|
table: table.clone(),
|
|
|
|
}
|
|
|
|
handles,
|
|
|
|
|
|
|
|
|
|
|
|
fn get_float(&self, key: &str) -> Option<f64> {
|
|
|
|
|
|
|
|
self.0.get(key).map(|val| f64::from(val.clone()))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
|
|
|
|
pub enum TweakValue {
|
|
|
|
|
|
|
|
Handle(UntypedHandle),
|
|
|
|
|
|
|
|
Int(i64),
|
|
|
|
|
|
|
|
Float(f64),
|
|
|
|
|
|
|
|
Bool(bool),
|
|
|
|
|
|
|
|
Str(String),
|
|
|
|
|
|
|
|
List(Vec<TweakValue>),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl TweakValue {
|
|
|
|
|
|
|
|
fn from_toml(val: &toml::Value, load_context: &mut LoadContext) -> TweakValue {
|
|
|
|
|
|
|
|
match val {
|
|
|
|
|
|
|
|
toml::Value::String(s) => {
|
|
|
|
|
|
|
|
if std::path::Path::new(&format!("assets/{}", s)).exists() {
|
|
|
|
|
|
|
|
TweakValue::Handle(load_context.load_untyped(s).untyped())
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
TweakValue::Str(s.clone())
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
toml::Value::Integer(i) => TweakValue::Int(*i),
|
|
|
|
|
|
|
|
toml::Value::Float(f) => TweakValue::Float(*f),
|
|
|
|
|
|
|
|
toml::Value::Boolean(b) => TweakValue::Bool(*b),
|
|
|
|
|
|
|
|
toml::Value::Array(a) => TweakValue::List(
|
|
|
|
|
|
|
|
a.iter()
|
|
|
|
|
|
|
|
.map(|v| TweakValue::from_toml(v, load_context))
|
|
|
|
|
|
|
|
.collect(),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
toml::Value::Table(_) | toml::Value::Datetime(_) => {
|
|
|
|
|
|
|
|
panic!("This type is not supported!")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl<T: Asset> From<TweakValue> for Handle<T> {
|
|
|
|
pub fn get_handle<T: Asset>(&self, key: &str) -> Option<Handle<T>> {
|
|
|
|
fn from(src: TweakValue) -> Handle<T> {
|
|
|
|
self.handles.get(key).map(|h| h.clone().typed::<T>())
|
|
|
|
match src {
|
|
|
|
|
|
|
|
TweakValue::Handle(h) => h.clone().typed::<T>(),
|
|
|
|
|
|
|
|
_ => panic!("{:?} is not a handle", src),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<TweakValue> for String {
|
|
|
|
pub fn get_handle_unchecked<T: Asset>(&self, key: &str) -> Option<Handle<T>> {
|
|
|
|
fn from(src: TweakValue) -> String {
|
|
|
|
self.handles
|
|
|
|
match src {
|
|
|
|
.get(key)
|
|
|
|
TweakValue::Str(s) => s,
|
|
|
|
.map(|h| h.clone().typed_unchecked::<T>())
|
|
|
|
_ => panic!("{:?} is not a bool", src),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<TweakValue> for i64 {
|
|
|
|
pub fn get<'de, T: Deserialize<'de>>(&self, key: &str) -> Option<T> {
|
|
|
|
fn from(src: TweakValue) -> i64 {
|
|
|
|
Tweaks::locate(&self.table, key)
|
|
|
|
match src {
|
|
|
|
.map(|val| val.try_into().ok())
|
|
|
|
TweakValue::Int(i) => i,
|
|
|
|
.flatten()
|
|
|
|
_ => panic!("{:?} is not an integer", src),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<TweakValue> for f64 {
|
|
|
|
fn iter_all(t: &toml::Table, key: &str) -> Vec<(String, toml::Value)> {
|
|
|
|
fn from(src: TweakValue) -> f64 {
|
|
|
|
t.iter()
|
|
|
|
match src {
|
|
|
|
.flat_map(|(k, v)| {
|
|
|
|
TweakValue::Float(f) => f,
|
|
|
|
let nk = if key == "" {
|
|
|
|
_ => panic!("{:?} is not a float", src),
|
|
|
|
k.to_string()
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
format!("{}_{}", key, k)
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
match v {
|
|
|
|
|
|
|
|
toml::Value::Table(nt) => Tweaks::iter_all(nt, nk.as_str()),
|
|
|
|
|
|
|
|
_ => vec![(nk, v.clone())],
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<TweakValue> for bool {
|
|
|
|
fn locate(t: &toml::Table, key: &str) -> Option<toml::Value> {
|
|
|
|
fn from(src: TweakValue) -> bool {
|
|
|
|
t.iter().find_map(|(k, v)| {
|
|
|
|
match src {
|
|
|
|
if key == k {
|
|
|
|
TweakValue::Bool(b) => b,
|
|
|
|
Some(v.clone())
|
|
|
|
_ => panic!("{:?} is not a bool", src),
|
|
|
|
} else if key.starts_with(k) {
|
|
|
|
}
|
|
|
|
let prefix = format!("{}_", k);
|
|
|
|
|
|
|
|
match v {
|
|
|
|
|
|
|
|
toml::Value::Table(nt) => {
|
|
|
|
|
|
|
|
Tweaks::locate(nt, key.strip_prefix(prefix.as_str()).unwrap())
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
_ => Some(v.clone()),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
None
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Default)]
|
|
|
|
#[derive(Default)]
|
|
|
|
pub struct TweakfileLoader;
|
|
|
|
pub struct TweaksLoader;
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Error)]
|
|
|
|
#[derive(Debug, Error)]
|
|
|
|
pub enum TweakfileError {
|
|
|
|
pub enum TweaksError {
|
|
|
|
#[error("Failed to read file")]
|
|
|
|
#[error("Failed to read file")]
|
|
|
|
IO(#[from] std::io::Error),
|
|
|
|
IO(#[from] std::io::Error),
|
|
|
|
#[error("Failed to decode file")]
|
|
|
|
#[error("Failed to decode file")]
|
|
|
|
@ -176,10 +121,10 @@ pub enum TweakfileError {
|
|
|
|
Parse(#[from] toml::de::Error),
|
|
|
|
Parse(#[from] toml::de::Error),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl AssetLoader for TweakfileLoader {
|
|
|
|
impl AssetLoader for TweaksLoader {
|
|
|
|
type Asset = Tweakfile;
|
|
|
|
type Asset = Tweaks;
|
|
|
|
type Settings = ();
|
|
|
|
type Settings = ();
|
|
|
|
type Error = TweakfileError;
|
|
|
|
type Error = TweaksError;
|
|
|
|
|
|
|
|
|
|
|
|
fn load<'a>(
|
|
|
|
fn load<'a>(
|
|
|
|
&'a self,
|
|
|
|
&'a self,
|
|
|
|
@ -191,11 +136,16 @@ impl AssetLoader for TweakfileLoader {
|
|
|
|
let mut bytes = Vec::new();
|
|
|
|
let mut bytes = Vec::new();
|
|
|
|
reader.read_to_end(&mut bytes).await?;
|
|
|
|
reader.read_to_end(&mut bytes).await?;
|
|
|
|
let s = std::str::from_utf8(bytes.as_slice())?;
|
|
|
|
let s = std::str::from_utf8(bytes.as_slice())?;
|
|
|
|
let parsed = toml::from_str::<toml::Table>(s)?;
|
|
|
|
match toml::from_str::<toml::Table>(s) {
|
|
|
|
let list = Tweaks::from_table(&parsed, load_context, String::new());
|
|
|
|
Ok(parsed) => {
|
|
|
|
let result: HashMap<String, TweakValue> = list.into_iter().collect();
|
|
|
|
let result = Tweaks::from_table(&parsed, load_context);
|
|
|
|
// Ok(Tweaks(result))
|
|
|
|
Ok(result)
|
|
|
|
Ok(Tweakfile::default())
|
|
|
|
}
|
|
|
|
|
|
|
|
Err(e) => {
|
|
|
|
|
|
|
|
println!("Error parsing tweaks: {:?}", e.message());
|
|
|
|
|
|
|
|
Err(TweaksError::Parse(e))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
Elijah Voigt
2 years ago