diff --git a/assets/common/items/armor/brinestone/crown.ron b/assets/common/items/armor/brinestone/crown.ron index dfa2b57d61..8e79f6ad4a 100644 --- a/assets/common/items/armor/brinestone/crown.ron +++ b/assets/common/items/armor/brinestone/crown.ron @@ -5,7 +5,7 @@ ItemDef( kind: Head, stats: Direct(( protection: Some(Normal(8.0)), - poise_resilence: Some(Normal(4.0)), + poise_resilience: Some(Normal(4.0)), energy_reward: Some(0.15), precision_power: Some(-0.05), )), diff --git a/assets/common/items/keys/bone_key.ron b/assets/common/items/keys/bone_key.ron index 7b291c103d..80b43b8760 100644 --- a/assets/common/items/keys/bone_key.ron +++ b/assets/common/items/keys/bone_key.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: Common, tags: [Utility], ) diff --git a/assets/common/items/keys/glass_key.ron b/assets/common/items/keys/glass_key.ron index 697ace156d..7a67dd26c0 100644 --- a/assets/common/items/keys/glass_key.ron +++ b/assets/common/items/keys/glass_key.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: Common, tags: [Utility], ) diff --git a/assets/common/items/keys/haniwa_key.ron b/assets/common/items/keys/haniwa_key.ron index 720b811338..43bdebf47d 100644 --- a/assets/common/items/keys/haniwa_key.ron +++ b/assets/common/items/keys/haniwa_key.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: Common, tags: [Utility], ) diff --git a/assets/common/items/keys/quarry_keys/ancient.ron b/assets/common/items/keys/quarry_keys/ancient.ron index 7fdc11e473..00f3aa453c 100644 --- a/assets/common/items/keys/quarry_keys/ancient.ron +++ b/assets/common/items/keys/quarry_keys/ancient.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/quarry_keys/backdoor.ron b/assets/common/items/keys/quarry_keys/backdoor.ron index 4d6e38bfb8..91b34924a1 100644 --- a/assets/common/items/keys/quarry_keys/backdoor.ron +++ b/assets/common/items/keys/quarry_keys/backdoor.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/quarry_keys/cyclops_eye.ron b/assets/common/items/keys/quarry_keys/cyclops_eye.ron index 4a4bfe80eb..fe2ee4e7b0 100644 --- a/assets/common/items/keys/quarry_keys/cyclops_eye.ron +++ b/assets/common/items/keys/quarry_keys/cyclops_eye.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/quarry_keys/flamekeeper_left.ron b/assets/common/items/keys/quarry_keys/flamekeeper_left.ron index e1942bb862..579662e728 100644 --- a/assets/common/items/keys/quarry_keys/flamekeeper_left.ron +++ b/assets/common/items/keys/quarry_keys/flamekeeper_left.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/quarry_keys/flamekeeper_right.ron b/assets/common/items/keys/quarry_keys/flamekeeper_right.ron index 50c0cd51ae..1cd24b7f6c 100644 --- a/assets/common/items/keys/quarry_keys/flamekeeper_right.ron +++ b/assets/common/items/keys/quarry_keys/flamekeeper_right.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/quarry_keys/overseer.ron b/assets/common/items/keys/quarry_keys/overseer.ron index 38f6bfea19..d901fa5af6 100644 --- a/assets/common/items/keys/quarry_keys/overseer.ron +++ b/assets/common/items/keys/quarry_keys/overseer.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/quarry_keys/smelting.ron b/assets/common/items/keys/quarry_keys/smelting.ron index 7f4d4d0b4c..6389e24ba5 100644 --- a/assets/common/items/keys/quarry_keys/smelting.ron +++ b/assets/common/items/keys/quarry_keys/smelting.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: High, tags: [], ) diff --git a/assets/common/items/keys/rusty_tower_key.ron b/assets/common/items/keys/rusty_tower_key.ron index bb6ad976c6..7c2d1b3f7b 100644 --- a/assets/common/items/keys/rusty_tower_key.ron +++ b/assets/common/items/keys/rusty_tower_key.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: Epic, tags: [], ) diff --git a/assets/common/items/tool/instruments/shamisen.ron b/assets/common/items/tool/instruments/shamisen.ron index c47c36c6ec..05f2c42366 100644 --- a/assets/common/items/tool/instruments/shamisen.ron +++ b/assets/common/items/tool/instruments/shamisen.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/tool/instruments/steeldrum.ron b/assets/common/items/tool/instruments/steeldrum.ron index e89409ae17..1ac5589729 100644 --- a/assets/common/items/tool/instruments/steeldrum.ron +++ b/assets/common/items/tool/instruments/steeldrum.ron @@ -9,7 +9,6 @@ ItemDef( power: 0.0, effect_power: 1.0, speed: 1.0, - crit_chance: 0.0, range: 0.0, energy_efficiency: 1.0, buff_strength: 1.0, diff --git a/assets/common/items/utility/coins.ron b/assets/common/items/utility/coins.ron index 61cb50ab87..a3a253b367 100644 --- a/assets/common/items/utility/coins.ron +++ b/assets/common/items/utility/coins.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Coins, ), - amount: 1, quality: Common, tags: [], ) diff --git a/assets/common/items/utility/collar.ron b/assets/common/items/utility/collar.ron index 365b2c10ec..a97a019942 100644 --- a/assets/common/items/utility/collar.ron +++ b/assets/common/items/utility/collar.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Collar, ), - amount: 1, quality: Moderate, tags: [Utility], ) diff --git a/assets/common/items/utility/lockpick_0.ron b/assets/common/items/utility/lockpick_0.ron index 51bd2e3da6..1df602e701 100644 --- a/assets/common/items/utility/lockpick_0.ron +++ b/assets/common/items/utility/lockpick_0.ron @@ -4,7 +4,6 @@ ItemDef( kind: Utility( kind: Key, ), - amount: 1, quality: Common, tags: [Utility], ) diff --git a/common/src/combat.rs b/common/src/combat.rs index 371ec66297..2b77be0e8c 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -982,6 +982,7 @@ const SLASHING_ENERGY_FRACTION: f32 = 0.5; const CRUSHING_POISE_FRACTION: f32 = 1.0; #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct Damage { pub source: DamageSource, pub kind: DamageKind, diff --git a/common/src/comp/aura.rs b/common/src/comp/aura.rs index 212c73365d..5f462a97c3 100644 --- a/common/src/comp/aura.rs +++ b/common/src/comp/aura.rs @@ -141,6 +141,7 @@ impl Auras { } #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq)] +#[serde(deny_unknown_fields)] pub struct AuraBuffConstructor { pub kind: BuffKind, pub strength: f32, diff --git a/common/src/comp/health.rs b/common/src/comp/health.rs index 2476169571..3837166bb2 100644 --- a/common/src/comp/health.rs +++ b/common/src/comp/health.rs @@ -8,6 +8,7 @@ use std::{convert::TryFrom, ops::Mul}; /// Specifies what and how much changed current health #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)] +#[serde(deny_unknown_fields)] pub struct HealthChange { /// The amount of the health change, negative is damage, positive is healing pub amount: f32, diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index f85213d88f..7778c26afa 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -99,6 +99,7 @@ impl Friction { } #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Default)] +#[serde(deny_unknown_fields)] pub struct Stats { /// Protection is non-linearly transformed (following summation) to a damage /// reduction using (prot / (60 + prot)) @@ -232,6 +233,7 @@ impl PartialOrd for Protection { } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct Armor { pub kind: ArmorKind, pub stats: StatsSource, diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index c59db7dc19..f6e84da511 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -57,6 +57,7 @@ pub enum Utility { } #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct Lantern { color: Rgb, strength_thousandths: u32, @@ -335,6 +336,7 @@ impl Effects { } #[derive(Clone, Debug, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub enum ItemKind { /// Something wieldable Tool(Tool), @@ -875,7 +877,7 @@ impl assets::Compound for ItemDef { } #[derive(Clone, Debug, Serialize, Deserialize)] -#[serde(rename = "ItemDef")] +#[serde(rename = "ItemDef", deny_unknown_fields)] struct RawItemDef { legacy_name: String, legacy_description: String, diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 29be4079f3..f7ab0fad51 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -236,6 +236,7 @@ impl ModularBase { } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub enum ModularComponent { ToolPrimaryComponent { toolkind: ToolKind, diff --git a/common/src/effect.rs b/common/src/effect.rs index c55b338b71..cc61ec6e85 100644 --- a/common/src/effect.rs +++ b/common/src/effect.rs @@ -12,6 +12,7 @@ pub enum Effect { /// A buff that may be applied to an entity #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct BuffEffect { pub kind: comp::BuffKind, pub data: comp::BuffData,