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 'master' into 'flaffwaffle/action_state_concurrent_states'

Browse Source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Tim Finnegan 2022-10-24 01:35:25 +00:00
commit a21a674ed1
154 changed files with 2867 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -25,6 +25,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Pets can now be traded with.
- Crafting recipe for black lantern
- Added redwood and dead trees
- Water will now move according to its apparent flow direction
- Added screen-space reflection and refraction shaders
- Added reflection quality setting
### Changed
- Use fluent for translations
@ -59,6 +62,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Pets no longer aggro on pet owners after being healed
- Pets no longer lose their intrinsic weapons/armour when loaded on login.
- Fixed npcs using `/say` instead of `/tell`
- Camera jittering in third person has been significantly reduced
- Many water shader issues have been fixed
## [0.13.0] - 2022-07-23

4
assets/common/abilities/axe/doublestrike.ron
View File

@ -3,7 +3,7 @@ ComboMelee(
(
stage: 1,
base_damage: 12.0,
damage_increase: 1.0,
damage_increase: 0.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 5.0,
@ -25,7 +25,7 @@ ComboMelee(
(
stage: 2,
base_damage: 15.0,
damage_increase: 1.5,
damage_increase: 0.75,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 6.0,

2
assets/common/abilities/hammer/singlestrike.ron
View File

@ -2,7 +2,7 @@ ComboMelee(
stage_data: [(
stage: 1,
base_damage: 15.0,
damage_increase: 1.0,
damage_increase: 0.75,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 3.5,

14
assets/common/abilities/sword/triplestrike.ron
View File

@ -2,17 +2,17 @@ ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 10.0,
damage_increase: 1.0,
base_damage: 8.0,
damage_increase: 0.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 0.0,
range: 4.0,
angle: 30.0,
base_buildup_duration: 0.1,
base_swing_duration: 0.075,
base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.15,
base_recover_duration: 0.25,
forward_movement: 0.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
@ -24,8 +24,8 @@ ComboMelee(
),
(
stage: 2,
base_damage: 8.0,
damage_increase: 1.5,
base_damage: 9.0,
damage_increase: 0.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 2.0,
@ -47,7 +47,7 @@ ComboMelee(
(
stage: 3,
base_damage: 10.0,
damage_increase: 2,
damage_increase: 0.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 2.0,

4
assets/common/items/armor/cultist/bandana.ron
View File

@ -4,11 +4,11 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(8.0)),
protection: Some(Normal(6.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(2.0),
energy_reward: Some(0.025),
crit_power: Some(0.01),
crit_power: Some(0.008),
stealth: Some(0.04),
)),
)),

4
assets/common/items/armor/cultist/necklace.ron
View File

@ -6,8 +6,8 @@ ItemDef(
stats: Direct((
protection: Some(Normal(2.0)),
energy_max: Some(4.5),
energy_reward: Some(0.05),
crit_power: Some(0.03),
energy_reward: Some(0.0275),
crit_power: Some(0.015),
)),
)),
quality: Epic,

8
assets/common/items/armor/cultist/ring.ron
View File

@ -4,10 +4,10 @@ ItemDef(
kind: Armor((
kind: Ring,
stats: Direct((
protection: Some(Normal(1.0)),
energy_max: Some(5),
energy_reward: Some(0.025),
crit_power: Some(0.02),
protection: Some(Normal(0.5)),
energy_max: Some(2.5),
energy_reward: Some(0.0125),
crit_power: Some(0.01),
)),
)),
quality: Epic,

2
assets/common/items/armor/misc/head/bandana/red.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
crit_power: Some(0.008),
crit_power: Some(0.006),
stealth: Some(0.14),
)),
)),

2
assets/common/items/armor/misc/head/bandana/thief.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
crit_power: Some(0.006),
crit_power: Some(0.0045),
stealth: Some(0.18),
)),
)),

2
assets/common/items/armor/misc/head/boreal_warhelm.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(9.0)),
protection: Some(Normal(6.0)),
poise_resilience: Some(Normal(3.0)),
energy_max: Some(4.0),
energy_reward: Some(0.01),

4
assets/common/items/armor/misc/head/crown.ron
View File

@ -4,10 +4,10 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(12.0)),
protection: Some(Normal(9.0)),
poise_resilience: Some(Normal(2.0)),
energy_max: Some(5.0),
crit_power: Some(0.008),
crit_power: Some(0.006),
)),
)),
quality: Epic,

7
assets/common/items/armor/misc/head/gnarling_mask.ron
View File

@ -4,10 +4,9 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(4.0)),
poise_resilience: Some(Normal(0.5)),
energy_max: Some(4.0),
energy_reward: Some(0.03),
protection: Some(Normal(3.0)),
poise_resilience: Some(Normal(1.0)),
energy_max: Some(14.0),
)),
)),
quality: High,

2
assets/common/items/armor/misc/head/helmet.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(16.0)),
protection: Some(Normal(12.0)),
poise_resilience: Some(Normal(3.0)),
)),
)),

4
assets/common/items/armor/misc/head/hog_hood.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(5.0)),
crit_power: Some(0.014),
protection: Some(Normal(3.0)),
crit_power: Some(0.0095),
stealth: Some(0.21),
)),
)),

4
assets/common/items/armor/misc/head/hood.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(3.0)),
crit_power: Some(0.021),
protection: Some(Normal(2.5)),
crit_power: Some(0.016),
stealth: Some(0.22),
)),
)),

2
assets/common/items/armor/misc/head/hood_dark.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(6.0)),
protection: Some(Normal(4.5)),
poise_resilience: Some(Normal(1.0)),
stealth: Some(0.2),
)),

2
assets/common/items/armor/misc/head/spikeguard.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(9.0)),
protection: Some(Normal(7.0)),
poise_resilience: Some(Normal(3.0)),
crit_power: Some(0.036),
)),

2
assets/common/items/armor/misc/head/wanderers_hat.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
crit_power: Some(0.021),
crit_power: Some(0.016),
stealth: Some(0.1),
)),
)),

2
assets/common/items/armor/misc/head/winged_coronet.ron
View File

@ -7,7 +7,7 @@ ItemDef(
protection: Some(Normal(2.0)),
energy_max: Some(4.5),
energy_reward: Some(0.04),
crit_power: Some(0.009),
crit_power: Some(0.006),
stealth: Some(0.17),
)),
)),

12
assets/common/items/armor/misc/neck/abyssal_gorget.ron
View File

@ -4,14 +4,10 @@ ItemDef(
kind: Armor((
kind: Neck,
stats: Direct((
protection: Some(Normal(2.0)),
energy_reward: Some(0.2),
crit_power: Some(0.1),
poise_resilience: Some(Normal(1.0)),
protection: Some(Normal(6.0)),
poise_resilience: Some(Normal(4.0)),
)),
)),
quality: Moderate,
tags: [
],
quality: Legendary,
tags: [],
)

3
assets/common/items/armor/misc/neck/amethyst.ron
View File

@ -5,7 +5,8 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(1.0)),
energy_reward: Some(0.1),
energy_reward: Some(0.075),
crit_power: Some(-0.03),
)),
)),
quality: Moderate,

2
assets/common/items/armor/misc/neck/ankh_of_life.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(2.0)),
energy_max: Some(20),
energy_max: Some(15.0),
energy_reward: Some(0.1),
)),
)),

2
assets/common/items/armor/misc/neck/carcanet_of_wrath.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(2.0)),
crit_power: Some(0.2),
crit_power: Some(0.15),
)),
)),
quality: Legendary,

4
assets/common/items/armor/misc/neck/diamond.ron
View File

@ -5,8 +5,8 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(1.0)),
energy_reward: Some(-0.1),
crit_power: Some(0.1),
energy_reward: Some(-0.0375),
crit_power: Some(0.075),
)),
)),
quality: Epic,

4
assets/common/items/armor/misc/neck/emerald.ron
View File

@ -5,8 +5,8 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(1.0)),
energy_max: Some(20.0),
energy_reward: Some(-0.2),
energy_max: Some(15.0),
energy_reward: Some(-0.15),
)),
)),
quality: Epic,

1
assets/common/items/armor/misc/neck/fang.ron
View File

@ -6,6 +6,7 @@ ItemDef(
stats: Direct((
protection: Some(Normal(1.0)),
crit_power: Some(0.07),
energy_max: Some(-3.5),
)),
)),
quality: High,

5
assets/common/items/armor/misc/neck/gold.ron
View File

@ -1,12 +1,11 @@
// Note: Will be used to craft other necklaces, acting as the base.
ItemDef(
name: "Gold Necklace",
description: "An expensive gold necklace... looks stolen.",
kind: Armor((
kind: Neck,
stats: Direct((
protection: Some(Normal(1.0)),
energy_max: Some(10),
crit_power: Some(0.02),
protection: Some(Normal(1.5)),
)),
)),
quality: Moderate,

1
assets/common/items/armor/misc/neck/haniwa_talisman.ron
View File

@ -6,6 +6,7 @@ ItemDef(
stats: Direct((
protection: Some(Normal(3.0)),
poise_resilience: Some(Normal(2.0)),
energy_max: Some(-5.0),
)),
)),
quality: High,

1
assets/common/items/armor/misc/neck/honeycomb_pendant.ron
View File

@ -7,6 +7,7 @@ ItemDef(
protection: Some(Normal(1.0)),
energy_max: Some(8.0),
energy_reward: Some(0.04),
crit_power: Some(-0.06),
)),
)),
quality: Moderate,

4
assets/common/items/armor/misc/neck/ruby.ron
View File

@ -5,8 +5,8 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(1.0)),
energy_reward: Some(0.2),
crit_power: Some(-0.06),
energy_reward: Some(0.1125),
crit_power: Some(-0.045),
)),
)),
quality: Epic,

3
assets/common/items/armor/misc/neck/sapphire.ron
View File

@ -5,7 +5,8 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(1.0)),
crit_power: Some(0.05),
energy_reward: Some(-0.0225),
crit_power: Some(0.0225),
)),
)),
quality: Moderate,

3
assets/common/items/armor/misc/neck/topaz.ron
View File

@ -5,7 +5,8 @@ ItemDef(
kind: Neck,
stats: Direct((
protection: Some(Normal(0.5)),
energy_max: Some(6.0),
energy_max: Some(9.0),
energy_reward: Some(-0.09),
)),
)),
quality: Common,

1
assets/common/items/armor/misc/ring/amethyst.ron
View File

@ -6,6 +6,7 @@ ItemDef(
stats: Direct((
protection: Some(Normal(0.5)),
energy_reward: Some(0.05),
crit_power: Some(-0.02),
)),
)),
quality: Moderate,

2
assets/common/items/armor/misc/ring/diamond.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Ring,
stats: Direct((
protection: Some(Normal(0.5)),
energy_reward: Some(-0.05),
energy_reward: Some(-0.025),
crit_power: Some(0.05),
)),
)),

3
assets/common/items/armor/misc/ring/gold.ron
View File

@ -1,3 +1,4 @@
// Note: Will be used to craft other rings, acting as the base.
ItemDef(
name: "Gold Ring",
description: "A plain gold ring... almost as if it is missing a gem.",
@ -5,8 +6,6 @@ ItemDef(
kind: Ring,
stats: Direct((
protection: Some(Normal(0.5)),
energy_max: Some(5),
crit_power: Some(0.01),
)),
)),
quality: Moderate,

2
assets/common/items/armor/misc/ring/ruby.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Ring,
stats: Direct((
protection: Some(Normal(0.5)),
energy_reward: Some(0.1),
energy_reward: Some(0.075),
crit_power: Some(-0.03),
)),
)),

3
assets/common/items/armor/misc/ring/sapphire.ron
View File

@ -5,7 +5,8 @@ ItemDef(
kind: Ring,
stats: Direct((
protection: Some(Normal(0.5)),
crit_power: Some(0.025),
energy_reward: Some(-0.015),
crit_power: Some(0.015),
)),
)),
quality: Moderate,

2
assets/common/items/armor/misc/ring/scratched.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor((
kind: Ring,
stats: Direct((
protection: Some(Normal(0.5)),
protection: Some(Normal(0.25)),
)),
)),
quality: Low,

1
assets/common/items/armor/misc/ring/topaz.ron
View File

@ -6,6 +6,7 @@ ItemDef(
stats: Direct((
protection: Some(Normal(0.5)),
energy_max: Some(5.0),
energy_reward: Some(-0.05),
)),
)),
quality: Moderate,

4
assets/common/items/armor/pirate/hat.ron
View File

@ -4,9 +4,9 @@ ItemDef(
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(3.0)),
protection: Some(Normal(2.5)),
energy_reward: Some(0.025),
crit_power: Some(0.1),
crit_power: Some(0.08),
)),
)),
quality: Epic,

2
assets/common/items/modular/weapon/secondary/axe/short.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 1.0,
power: 0.8,
effect_power: 0.9,
speed: 1.5,
speed: 1.2,
crit_chance: 1.1,
range: 0.85,
energy_efficiency: 1.1,

2
assets/common/items/modular/weapon/secondary/bow/short.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 1.0,
power: 0.8,
effect_power: 0.9,
speed: 1.5,
speed: 1.2,
crit_chance: 1.1,
range: 0.85,
energy_efficiency: 1.1,

2
assets/common/items/modular/weapon/secondary/hammer/short.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 1.0,
power: 0.8,
effect_power: 0.9,
speed: 1.5,
speed: 1.2,
crit_chance: 1.1,
range: 0.85,
energy_efficiency: 1.1,

2
assets/common/items/modular/weapon/secondary/sceptre/light.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 1.0,
power: 0.8,
effect_power: 0.9,
speed: 1.5,
speed: 1.2,
crit_chance: 1.1,
range: 0.85,
energy_efficiency: 1.1,

2
assets/common/items/modular/weapon/secondary/staff/light.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 1.0,
power: 0.8,
effect_power: 0.9,
speed: 1.5,
speed: 1.2,
crit_chance: 1.1,
range: 0.85,
energy_efficiency: 1.1,

2
assets/common/items/modular/weapon/secondary/sword/short.ron
View File

@ -8,7 +8,7 @@ ItemDef(
equip_time_secs: 1.0,
power: 0.8,
effect_power: 0.9,
speed: 1.5,
speed: 1.2,
crit_chance: 1.1,
range: 0.85,
energy_efficiency: 1.1,

98
assets/common/material_stats_manifest.ron
View File

@ -127,59 +127,59 @@
armor_stats: {
// Metals
"Bronze": (
protection: Some(Normal(40.0)),
protection: Some(Normal(60.0)),
poise_resilience: Some(Normal(10.0)),
),
"Iron": (
protection: Some(Normal(80.0)),
protection: Some(Normal(84.0)),
poise_resilience: Some(Normal(20.0)),
),
"Steel": (
protection: Some(Normal(120.0)),
protection: Some(Normal(108.0)),
poise_resilience: Some(Normal(30.0)),
),
"Cobalt": (
protection: Some(Normal(160.0)),
protection: Some(Normal(122.0)),
poise_resilience: Some(Normal(40.0)),
),
"Bloodsteel": (
protection: Some(Normal(200.0)),
protection: Some(Normal(146.0)),
poise_resilience: Some(Normal(50.0)),
),
"Orichalcum": (
protection: Some(Normal(240.0)),
protection: Some(Normal(180.0)),
poise_resilience: Some(Normal(60.0)),
),
// Hides
"Rawhide": (
protection: Some(Normal(20.0)),
crit_power: Some(0.333),
stealth: Some(0.333),
crit_power: Some(0.5),
stealth: Some(0.5),
),
"Leather": (
protection: Some(Normal(40.0)),
crit_power: Some(0.667),
stealth: Some(0.667),
protection: Some(Normal(28.0)),
crit_power: Some(0.6),
stealth: Some(0.7),
),
"Scale": (
protection: Some(Normal(60.0)),
crit_power: Some(1.0),
stealth: Some(1.0),
protection: Some(Normal(36.0)),
crit_power: Some(0.7),
stealth: Some(0.9),
),
"Carapace": (
protection: Some(Normal(80.0)),
crit_power: Some(1.33),
stealth: Some(1.33),
protection: Some(Normal(44.0)),
crit_power: Some(0.8),
stealth: Some(1.1),
),
"Plate": (
protection: Some(Normal(100.0)),
crit_power: Some(1.67),
stealth: Some(1.67),
protection: Some(Normal(52.0)),
crit_power: Some(0.9),
stealth: Some(1.3),
),
"Dragonscale": (
protection: Some(Normal(120.0)),
crit_power: Some(2.0),
stealth: Some(2.0),
protection: Some(Normal(60.0)),
crit_power: Some(1.0),
stealth: Some(1.5),
),
// Cloths
"Linen": (
@ -189,38 +189,38 @@
stealth: Some(0.167),
),
"Wool": (
protection: Some(Normal(30.0)),
protection: Some(Normal(20.0)),
energy_max: Some(33.3),
energy_reward: Some(0.333),
stealth: Some(0.333),
),
"Silk": (
protection: Some(Normal(45.0)),
protection: Some(Normal(25.0)),
energy_max: Some(50.0),
energy_reward: Some(0.5),
stealth: Some(0.5),
),
"Lifecloth": (
protection: Some(Normal(60.0)),
protection: Some(Normal(30.0)),
energy_max: Some(66.7),
energy_reward: Some(0.667),
stealth: Some(0.667),
),
"Moonweave": (
protection: Some(Normal(75.0)),
protection: Some(Normal(35.0)),
energy_max: Some(83.3),
energy_reward: Some(0.833),
stealth: Some(0.833),
),
"Sunsilk": (
protection: Some(Normal(90.0)),
protection: Some(Normal(40.0)),
energy_max: Some(100.0),
energy_reward: Some(1.0),
stealth: Some(1.0),
),
// Misc Sets
"Alchemist": (
protection: Some(Normal(160.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
@ -231,17 +231,17 @@
poise_resilience: Some(Normal(5.0)),
),
"Blacksmith": (
protection: Some(Normal(160.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
crit_power: Some(0.4),
),
"Bonerattler": (
protection: Some(Normal(100.0)),
protection: Some(Normal(80.0)),
),
"Chef": (
protection: Some(Normal(160.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
@ -257,61 +257,61 @@
protection: Some(Normal(5.0)),
),
"Cultist": (
protection: Some(Normal(150.0)),
protection: Some(Normal(100.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
crit_power: Some(0.4),
energy_max: Some(30.0),
energy_reward: Some(0.4),
crit_power: Some(0.25),
stealth: Some(0.4),
),
"Ferocious": (
protection: Some(Normal(240.0)),
protection: Some(Normal(180.0)),
),
"Leather Plate": (
protection: Some(Normal(160.0)),
poise_resilience: Some(Normal(40.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(30.0)),
),
"Merchant": (
protection: Some(Normal(160.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
crit_power: Some(0.4),
),
"Pirate": (
protection: Some(Normal(160.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
crit_power: Some(0.4),
),
"Savage": (
protection: Some(Normal(100.0)),
protection: Some(Normal(60.0)),
),
"Tarasque": (
protection: Some(Normal(100.0)),
protection: Some(Normal(60.0)),
),
"Twigs": (
protection: Some(Normal(60.0)),
protection: Some(Normal(20.0)),
),
"Twigs Flowers": (
protection: Some(Normal(60.0)),
protection: Some(Normal(20.0)),
),
"Twigs Leaves": (
protection: Some(Normal(60.0)),
protection: Some(Normal(20.0)),
),
"Velorite Battlemage": (
protection: Some(Normal(115.0)),
protection: Some(Normal(100.0)),
),
"Witch": (
protection: Some(Normal(160.0)),
protection: Some(Normal(120.0)),
poise_resilience: Some(Normal(20.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),
crit_power: Some(0.4),
),
"Cardinal": (
protection: Some(Normal(666.0)),
protection: Some(Normal(540.0)),
poise_resilience: Some(Normal(60.0)),
energy_max: Some(45.0),
energy_reward: Some(0.5),

49
assets/voxygen/audio/sfx.ron
View File

@ -549,6 +549,12 @@
"voxygen.audio.sfx.instrument.bass.bass_a",
"voxygen.audio.sfx.instrument.bass.bass_e",
"voxygen.audio.sfx.instrument.bass.bass_c1",
"voxygen.audio.sfx.instrument.bass.bass_ac1",
"voxygen.audio.sfx.instrument.bass.bass_ag",
"voxygen.audio.sfx.instrument.bass.bass_cec",
"voxygen.audio.sfx.instrument.bass.bass_de",
"voxygen.audio.sfx.instrument.bass.bass_e1c1",
"voxygen.audio.sfx.instrument.bass.bass_ge",
],
threshold: 0.5,
),
@ -560,6 +566,12 @@
"voxygen.audio.sfx.instrument.flute.flute_a",
"voxygen.audio.sfx.instrument.flute.flute_e",
"voxygen.audio.sfx.instrument.flute.flute_c1",
"voxygen.audio.sfx.instrument.flute.flute_c1a",
"voxygen.audio.sfx.instrument.flute.flute_c1ag",
"voxygen.audio.sfx.instrument.flute.flute_c1d1c1",
"voxygen.audio.sfx.instrument.flute.flute_ceg",
"voxygen.audio.sfx.instrument.flute.flute_dac1",
"voxygen.audio.sfx.instrument.flute.flute_eg",
],
threshold: 0.5,
),
@ -571,6 +583,12 @@
"voxygen.audio.sfx.instrument.harp.harp_a",
"voxygen.audio.sfx.instrument.harp.harp_e",
"voxygen.audio.sfx.instrument.harp.harp_c1",
"voxygen.audio.sfx.instrument.harp.harp_c1ag",
"voxygen.audio.sfx.instrument.harp.harp_cde",
"voxygen.audio.sfx.instrument.harp.harp_d1c1a",
"voxygen.audio.sfx.instrument.harp.harp_d1g",
"voxygen.audio.sfx.instrument.harp.harp_ec1",
"voxygen.audio.sfx.instrument.harp.harp_ega",
],
threshold: 0.5,
),
@ -582,6 +600,12 @@
"voxygen.audio.sfx.instrument.kalimba.kalimba_a",
"voxygen.audio.sfx.instrument.kalimba.kalimba_e",
"voxygen.audio.sfx.instrument.kalimba.kalimba_c1",
"voxygen.audio.sfx.instrument.kalimba.kalimba_c1a",
"voxygen.audio.sfx.instrument.kalimba.kalimba_c1d1c1",
"voxygen.audio.sfx.instrument.kalimba.kalimba_c1ge",
"voxygen.audio.sfx.instrument.kalimba.kalimba_cdc",
"voxygen.audio.sfx.instrument.kalimba.kalimba_ceg",
"voxygen.audio.sfx.instrument.kalimba.kalimba_da",
],
threshold: 0.5,
),
@ -593,6 +617,12 @@
"voxygen.audio.sfx.instrument.melodica.melodica_a",
"voxygen.audio.sfx.instrument.melodica.melodica_e",
"voxygen.audio.sfx.instrument.melodica.melodica_c1",
"voxygen.audio.sfx.instrument.melodica.melodica_ad1c1",
"voxygen.audio.sfx.instrument.melodica.melodica_c1a",
"voxygen.audio.sfx.instrument.melodica.melodica_d1a",
"voxygen.audio.sfx.instrument.melodica.melodica_ec",
"voxygen.audio.sfx.instrument.melodica.melodica_ec1g",
"voxygen.audio.sfx.instrument.melodica.melodica_ge",
],
threshold: 0.5,
),
@ -604,6 +634,12 @@
"voxygen.audio.sfx.instrument.lute.lute_a",
"voxygen.audio.sfx.instrument.lute.lute_e",
"voxygen.audio.sfx.instrument.lute.lute_c1",
"voxygen.audio.sfx.instrument.lute.lute_ac1",
"voxygen.audio.sfx.instrument.lute.lute_c1d1c1",
"voxygen.audio.sfx.instrument.lute.lute_cdc",
"voxygen.audio.sfx.instrument.lute.lute_ege",
"voxygen.audio.sfx.instrument.lute.lute_gag",
"voxygen.audio.sfx.instrument.lute.lute_ded",
],
threshold: 0.5,
),
@ -615,6 +651,12 @@
"voxygen.audio.sfx.instrument.sitar.sitar_a",
"voxygen.audio.sfx.instrument.sitar.sitar_e",
"voxygen.audio.sfx.instrument.sitar.sitar_c1",
"voxygen.audio.sfx.instrument.sitar.sitar_c1ae",
"voxygen.audio.sfx.instrument.sitar.sitar_ce",
"voxygen.audio.sfx.instrument.sitar.sitar_da",
"voxygen.audio.sfx.instrument.sitar.sitar_ec1",
"voxygen.audio.sfx.instrument.sitar.sitar_gd1",
"voxygen.audio.sfx.instrument.sitar.sitar_gec",
],
threshold: 0.5,
),
@ -643,9 +685,10 @@
"voxygen.audio.sfx.instrument.perc.perc_d",
"voxygen.audio.sfx.instrument.perc.perc_d",
"voxygen.audio.sfx.instrument.perc.perc_d",
"voxygen.audio.sfx.instrument.perc.perc_d",
"voxygen.audio.sfx.instrument.perc.perc_d",
"voxygen.audio.sfx.instrument.perc.perc_d",
"voxygen.audio.sfx.instrument.perc.perc_d_d",
"voxygen.audio.sfx.instrument.perc.perc_dd",
"voxygen.audio.sfx.instrument.perc.perc_d_dd",
"voxygen.audio.sfx.instrument.perc.perc_dd_d",
"voxygen.audio.sfx.instrument.perc.perc_a",
"voxygen.audio.sfx.instrument.perc.perc_e",
],

BIN
assets/voxygen/audio/sfx/instrument/bass/bass_ac1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/bass/bass_ag.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/bass/bass_cec.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/bass/bass_de.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/bass/bass_e1c1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/bass/bass_ge.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/flute/flute_c1a.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/flute/flute_c1ag.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/flute/flute_c1d1c1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/flute/flute_ceg.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/flute/flute_dac1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/flute/flute_eg.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_a.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_c.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_c1.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_c1ag.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_cde.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_d.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_d1c1a.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_d1g.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_e.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_ec1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_ega.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/harp/harp_g.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/kalimba/kalimba_c1a.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/kalimba/kalimba_c1d1c1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/kalimba/kalimba_c1ge.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/kalimba/kalimba_cdc.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/kalimba/kalimba_ceg.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/kalimba/kalimba_da.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/lute/lute_ac1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/lute/lute_c1d1c1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/lute/lute_cdc.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/lute/lute_ded.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/lute/lute_ege.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/lute/lute_gag.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/melodica/melodica_ad1c1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/melodica/melodica_c1a.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/melodica/melodica_d1a.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/melodica/melodica_ec.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/melodica/melodica_ec1g.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/melodica/melodica_ge.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/perc/perc_d_d.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/perc/perc_d_dd.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/perc/perc_dd.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/perc/perc_dd_d.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/sitar/sitar_c1ae.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/sitar/sitar_ce.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/sitar/sitar_da.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/sitar/sitar_ec1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/sitar/sitar_gd1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/instrument/sitar/sitar_gec.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

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