Merge branch 'sam/range-stat' into 'master'

Added range stat to weapons.

See merge request veloren/veloren!2563
This commit is contained in:
Samuel Keiffer 2021-07-06 21:18:47 +00:00
commit e5a5d28246
319 changed files with 750 additions and 117 deletions

View File

@ -10,7 +10,7 @@ ItemDef(
poise_strength: 0.75,
speed: 0.0,
crit_chance: 0.1,
crit_mult: 1.0
range: 1.0
),
)),
quality: Common,

View File

@ -11,7 +11,7 @@ ItemDef(
poise_strength: 1.00,
speed: 1.0,
crit_chance: 0.0,
crit_mult: 0.0,
range: 1.0,
)),
)
),

View File

@ -3,7 +3,7 @@ ItemDef(
description: "Shouldn't this be a hammer?",
kind: Tool(
(
kind: Sword,
kind: Sword,
hands: Two,
stats: Direct((
equip_time_secs: 0.0,
@ -11,8 +11,8 @@ ItemDef(
poise_strength: 999.9,
speed: 1.0,
crit_chance: 0.5,
crit_mult: 2.0,
)),
range: 1.0,
)),
)
),
quality: Debug,

View File

@ -10,8 +10,8 @@ ItemDef(
poise_strength: 999.9,
speed: 100.0,
crit_chance: 0.5,
crit_mult: 2.0,
)),
range: 1.0,
)),
)),
quality: Debug,
tags: [],

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
)),
)),
quality: Legendary,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.1,
crit_chance: 0.18,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 0.8,
speed: 0.3,
crit_chance: 0.08406594,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,9 +10,10 @@ ItemDef(
poise_strength: 0.8,
speed: 0.5,
crit_chance: 0.05059524,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_set: Some(Custom("Staff Simple")),
ability_spec: Some(Custom("Staff Simple")),
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.07589286,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 0.8,
speed: 0.7,
crit_chance: 0.26764706,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.8,
speed: 0.8,
crit_chance: 0.12037037,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.13541667,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 0.8,
speed: 0.3,
crit_chance: 0.05625,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
)
ability_spec: None,
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.8,
speed: 0.6,
crit_chance: 0.036458332,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.05357143,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 0.8,
speed: 0.5,
crit_chance: 0.095454544,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.8,
speed: 0.7,
crit_chance: 0.040873703,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.04963235,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 0.8,
speed: 0.3,
crit_chance: 0.066083916,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.8,
speed: 0.8,
crit_chance: 0.053030305,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.05965909,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.1,
speed: 0.8,
crit_chance: 0.140625,
range: 1.0,
)),
)),
quality: Epic,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 0.8,
crit_chance: 0.140625,
range: 1.0,
)),
)),
quality: Epic,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.05078125,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.046875,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 0.8,
crit_chance: 0.140625,
range: 1.0,
)),
)),
quality: Epic,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0,
range: 1.0,
)),
)),
quality: Legendary,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 0.8,
crit_chance: 0.140625,
range: 1.0,
)),
)),
quality: Epic,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,7 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
crit_mult: 1.9142857,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,9 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Husk Brute")),
)
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -8,11 +8,12 @@ ItemDef(
equip_time_secs: 0.01,
power: 0.5,
poise_strength: 1.0,
speed: 1.00,
speed: 1.0,
crit_chance: 0.09375,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Quad Med Basic")),
)
)

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,7 +10,7 @@ ItemDef(
poise_strength: 0.0,
speed: 1.0,
crit_chance: 0.0,
crit_mult: 0.0,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.25,
speed: 1.5,
crit_chance: 0.0,
range: 1.0,
)),
)),
quality: Common,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.25,
speed: 1.3,
crit_chance: 0.0,
range: 1.0,
)),
)),
quality: Moderate,

View File

@ -10,6 +10,7 @@ ItemDef(
poise_strength: 0.25,
speed: 0.5,
crit_chance: 0.0,
range: 1.0,
)),
)),
quality: Low,

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1421875,
range: 1.0,
)),
)),
quality: High,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1421875,
range: 1.0,
)),
)),
quality: High,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1421875,
range: 1.0,
)),
)),
quality: High,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.15,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.15,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.15,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.13611111,
range: 1.0,
)),
)),
quality: High,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.13611111,
range: 1.0,
)),
)),
quality: High,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.1375,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.140625,
range: 1.0,
)),
)),
quality: Epic,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.083333336,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 0.8,
crit_chance: 0.11666667,
range: 1.0,
)),
)),
quality: Legendary,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.09375,
range: 1.0,
)),
)),
quality: Low,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12857144,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12857144,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12857144,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12857144,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

View File

@ -10,8 +10,10 @@ ItemDef(
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.12857144,
range: 1.0,
)),
)),
quality: Moderate,
tags: [],
ability_spec: None,
)

Some files were not shown because too many files have changed in this diff Show More