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

Changelog. Fixed a few qualities.

Browse Source
This commit is contained in:
Sam 2021-04-01 21:26:35 -04:00
parent 7c8242b5b1
commit 9ad5b0f6b7
13 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Overhauled clouds for more verticality and performance
- New tooltip for items with stats comparison
- Improved bow feedback, added arrow particles
- Retiered most sceptres and staves
- Loot tables can now recursively reference loot tables
### Removed

2
assets/common/items/weapons/sceptre/moon0.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.7326007,
)),
)),
quality: Common,
quality: Moderate,
tags: [],
)

2
assets/common/items/weapons/sceptre/root_green0.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.4444444,
)),
)),
quality: Moderate,
quality: Low,
tags: [],
)

2
assets/common/items/weapons/staff/bent_fuse.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.4469842,
)),
)),
quality: Epic,
quality: Low,
tags: [],
)

2
assets/common/items/weapons/staff/bone_staff.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.6349206,
)),
)),
quality: Common,
quality: Low,
tags: [],
)

2
assets/common/items/weapons/staff/crimson_eye.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.4571428,
)),
)),
quality: Moderate,
quality: Low,
tags: [],
)

2
assets/common/items/weapons/staff/fiery_wishing_rod.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.5142857,
)),
)),
quality: Moderate,
quality: Common,
tags: [],
)

2
assets/common/items/weapons/staff/flamethrower_0.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.4017857,
)),
)),
quality: High,
quality: Moderate,
tags: [],
)

2
assets/common/items/weapons/staff/infused_tower.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.445269,
)),
)),
quality: High,
quality: Moderate,
tags: [],
)

2
assets/common/items/weapons/staff/lava_rod.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.4114286,
)),
)),
quality: High,
quality: Moderate,
tags: [],
)

2
assets/common/items/weapons/staff/orc_iron.ron
View File

@ -13,6 +13,6 @@ ItemDef(
crit_mult: 1.481203,
)),
)),
quality: Epic,
quality: Moderate,
tags: [],
)

19
common/src/lottery.rs
View File

@ -114,7 +114,10 @@ impl LootSpec {
#[cfg(test)]
mod tests {
use super::*;
use crate::{assets::{AssetExt, Error}, comp::Item};
use crate::{
assets::{AssetExt, Error},
comp::Item,
};
#[test]
fn test_loot_tables() {
@ -143,8 +146,18 @@ mod tests {
Item::new_from_asset_expect(&item);
},
LootSpec::ItemQuantity(item, lower, upper) => {
assert!(*lower > 0, "Lower quantity must be more than 0. It is {}.", lower);
assert!(upper >= lower, "Upper quantity must be at least the value of lower quantity. Upper value: {}, low value: {}.", upper, lower);
assert!(
*lower > 0,
"Lower quantity must be more than 0. It is {}.",
lower
);
assert!(
upper >= lower,
"Upper quantity must be at least the value of lower quantity. Upper \
value: {}, low value: {}.",
upper,
lower
);
Item::new_from_asset_expect(&item);
},
LootSpec::LootTable(loot_table) => {

3
server/src/events/entity_manipulation.rs
View File

@ -347,7 +347,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
2 => "common.loot_tables.armor.cloth",
3 => "common.loot_tables.weapons.starter",
4 => "common.loot_tables.humanoids",
_ => "common.loots_tables.fallback",
_ => "common.loot_tables.fallback",
},
Some(common::comp::Body::QuadrupedSmall(quadruped_small)) => {
match quadruped_small.species {
@ -356,7 +356,6 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
},
_ => match rng.gen_range(0..4) {
0 => "common.loot_tables.food.wild_ingredients",
2 => "common.loot_tables.wild_animal",
_ => "common.loot_tables.wild_animal",
},
}