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

Buff stonegolem, nerf giants, add missing sfxs

Browse Source
This commit is contained in:
Snowram 2020-11-05 10:18:06 +01:00
parent ca932f6c15
commit 0d92f02deb
5 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/items/food/mushroom.ron
View File

@ -7,9 +7,9 @@ ItemDef(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
strength: 2.5, strength: 5.0,
duration: Some(( duration: Some((
secs: 20, secs: 10,
nanos: 0, nanos: 0,
)), )),
), ),

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

@ -65,7 +65,7 @@
], ],
threshold: 0.5, threshold: 0.5,
), ),
Glide: ( Glide: (
files: [ files: [
// Event Missing or not implemented? // Event Missing or not implemented?
], ],
@ -383,6 +383,30 @@
], ],
threshold: 0.3, threshold: 0.3,
), ),
Inventory(Consumed("PotionMed")): (
files: [
"voxygen.audio.sfx.inventory.consumable.liquid",
],
threshold: 0.3,
),
Inventory(Consumed("PotionLarge")): (
files: [
"voxygen.audio.sfx.inventory.consumable.liquid",
],
threshold: 0.3,
),
Inventory(Consumed("PotionExp")): (
files: [
"voxygen.audio.sfx.inventory.consumable.liquid",
],
threshold: 0.3,
),
Inventory(Consumed("SunflowerTea")): (
files: [
"voxygen.audio.sfx.inventory.consumable.liquid",
],
threshold: 0.3,
),
Inventory(Consumed("Apple")): ( Inventory(Consumed("Apple")): (
files: [ files: [
"voxygen.audio.sfx.inventory.consumable.apple", "voxygen.audio.sfx.inventory.consumable.apple",
@ -401,6 +425,42 @@
], ],
threshold: 0.3, threshold: 0.3,
), ),
Inventory(Consumed("AppleShroomCurry")): (
files: [
"voxygen.audio.sfx.inventory.consumable.food",
],
threshold: 0.3,
),
Inventory(Consumed("AppleStick")): (
files: [
"voxygen.audio.sfx.inventory.consumable.food",
],
threshold: 0.3,
),
Inventory(Consumed("Coconut")): (
files: [
"voxygen.audio.sfx.inventory.consumable.food",
],
threshold: 0.3,
),
Inventory(Consumed("MushroomStick")): (
files: [
"voxygen.audio.sfx.inventory.consumable.food",
],
threshold: 0.3,
),
Inventory(Consumed("Velorite")): (
files: [
"voxygen.audio.sfx.inventory.consumable.food",
],
threshold: 0.3,
),
Inventory(Consumed("VeloriteFrag")): (
files: [
"voxygen.audio.sfx.inventory.consumable.food",
],
threshold: 0.3,
),
Explosion: ( Explosion: (
files: [ files: [
// in code // in code

2
common/src/comp/body.rs
View File

@ -276,7 +276,7 @@ impl Body {
_ => 1000, _ => 1000,
}, },
Body::Object(_) => 10000, Body::Object(_) => 10000,
Body::Golem(_) => 2560, Body::Golem(_) => 2740,
Body::Theropod(_) => 50, Body::Theropod(_) => 50,
Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { Body::QuadrupedLow(quadruped_low) => match quadruped_low.species {
quadruped_low::Species::Crocodile => 600, quadruped_low::Species::Crocodile => 600,

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

@ -260,8 +260,10 @@ impl Default for Inventory {
slots: vec![None; 36], slots: vec![None; 36],
amount: 0, amount: 0,
}; };
inventory.push(Item::new_from_asset_expect(
"common.items.consumable.potion_minor",
));
inventory.push(Item::new_from_asset_expect("common.items.food.cheese")); inventory.push(Item::new_from_asset_expect("common.items.food.cheese"));
inventory.push(Item::new_from_asset_expect("common.items.food.apple"));
inventory inventory
} }
} }

2
server/src/sys/terrain.rs
View File

@ -138,7 +138,7 @@ impl<'a> System<'a> for Sys {
body, body,
); );
} }
stats.level.set_level(rand::thread_rng().gen_range(30, 35)); stats.level.set_level(rand::thread_rng().gen_range(25, 30));
scale = 2.0 + rand::random::<f32>(); scale = 2.0 + rand::random::<f32>();
} }