Changelog. Fixed a few qualities.

CHANGELOG.md

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

assets/common/items/weapons/sceptre/moon0.ron

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

assets/common/items/weapons/sceptre/root_green0.ron

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

assets/common/items/weapons/staff/bent_fuse.ron

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

assets/common/items/weapons/staff/bone_staff.ron

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

assets/common/items/weapons/staff/crimson_eye.ron

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

assets/common/items/weapons/staff/fiery_wishing_rod.ron

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

assets/common/items/weapons/staff/flamethrower_0.ron

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

assets/common/items/weapons/staff/infused_tower.ron

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

assets/common/items/weapons/staff/lava_rod.ron

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

assets/common/items/weapons/staff/orc_iron.ron

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

common/src/lottery.rs

@@ -114,8 +114,11 @@ 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() {
         #[derive(Clone)]
@@ -131,7 +134,7 @@ mod tests {
                     .iter()
                     .map(|spec| Lottery::<LootSpec>::load_cloned(spec))
                     .collect::<Result<_, Error>>()?;
-    
+
                 Ok(LootTableList(list))
             }
         }
@@ -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) => {

server/src/events/entity_manipulation.rs

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