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 'crit-chance-removal' into 'master'

Browse Source 
Removed crit_chance stat from two item .ron files

See merge request veloren/veloren!4307
This commit is contained in:
Illia Denysenko 2024-02-07 19:13:27 +00:00
commit ac921c563d
24 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/armor/brinestone/crown.ron
View File

@ -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),
)),

1
assets/common/items/keys/bone_key.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: Common,
tags: [Utility],
)

1
assets/common/items/keys/glass_key.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: Common,
tags: [Utility],
)

1
assets/common/items/keys/haniwa_key.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: Common,
tags: [Utility],
)

1
assets/common/items/keys/quarry_keys/ancient.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/quarry_keys/backdoor.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/quarry_keys/cyclops_eye.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/quarry_keys/flamekeeper_left.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/quarry_keys/flamekeeper_right.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/quarry_keys/overseer.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/quarry_keys/smelting.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: High,
tags: [],
)

1
assets/common/items/keys/rusty_tower_key.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: Epic,
tags: [],
)

1
assets/common/items/tool/instruments/shamisen.ron
View File

@ -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,

1
assets/common/items/tool/instruments/steeldrum.ron
View File

@ -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,

1
assets/common/items/utility/coins.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Coins,
),
amount: 1,
quality: Common,
tags: [],
)

1
assets/common/items/utility/collar.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Collar,
),
amount: 1,
quality: Moderate,
tags: [Utility],
)

1
assets/common/items/utility/lockpick_0.ron
View File

@ -4,7 +4,6 @@ ItemDef(
kind: Utility(
kind: Key,
),
amount: 1,
quality: Common,
tags: [Utility],
)

1
common/src/combat.rs
View File

@ -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,

1
common/src/comp/aura.rs
View File

@ -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,

1
common/src/comp/health.rs
View File

@ -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,

2
common/src/comp/inventory/item/armor.rs
View File

@ -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,

4
common/src/comp/inventory/item/mod.rs
View File

@ -57,6 +57,7 @@ pub enum Utility {
}
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Lantern {
color: Rgb<u32>,
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,

1
common/src/comp/inventory/item/modular.rs
View File

@ -236,6 +236,7 @@ impl ModularBase {
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub enum ModularComponent {
ToolPrimaryComponent {
toolkind: ToolKind,

1
common/src/effect.rs
View File

@ -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,