frost cleaver

velorite mage set

offsets
armor stats

assets/common/items/armor/back/velorite_mage_0.ron

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Velorite Battlemage Cloak",
+    description: "Keeps your shoulders warm.",
+    kind: Armor(
+        (
+            kind: Back("VeloriteMage0"),
+            stats: (
+                protection: Normal(2.8)),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/belt/velorite_mage_0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Velorite Battlemage Belt",
+    description: "",
+    kind: Armor(
+        (
+            kind: Belt("VeloriteMage0"),
+            stats: (
+                protection: Normal(5.8)
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/chest/cultist_chest_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Chest",
+    name: "Velorite Chest",
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Chest("CultistBlue"),
+            kind: Chest("VeloriteMage0"),
             stats: (
                 protection: Normal(30.0)),            
         )

assets/common/items/armor/chest/velorite_mage_0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Velorite Battlemage Vest",
+    description: "",
+    kind: Armor(
+        (
+            kind: Chest("VeloriteMage0"),
+            stats: (
+                protection: Normal(28.0)
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/foot/velorite_mage_0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Velorite Battlemage Boots",
+    description: "",
+    kind: Armor(
+        (
+            kind: Foot("VeloriteMage0"),
+            stats: (
+                protection: Normal(5.9)
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/hand/cultist_hands_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Gloves",
+    name: "Velorite Gloves",
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Hand("CultistBlue"),
+            kind: Hand("VeloriteMage0"),
             stats: (
                 protection: Normal(12.0)),            
         )

assets/common/items/armor/hand/velorite_mage_0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Velorite Battlemage Gauntlets",
+    description: "",
+    kind: Armor(
+        (
+            kind: Hand("VeloriteMage0"),
+            stats: (
+                protection: Normal(11.5)
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/pants/cultist_legs_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Skirt",
+    name: "Velorite Skirt",
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Pants("CultistBlue"),
+            kind: Pants("VeloriteMage0"),
             stats: (
                 protection: Normal(24.0)),            
         )

assets/common/items/armor/pants/velorite_mage_0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Velorite Battlemage Kilt",
+    description: "",
+    kind: Armor(
+        (
+            kind: Pants("VeloriteMage0"),
+            stats: (
+                protection: Normal(23.0)
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/ring/ring_0.ron

@@ -5,7 +5,7 @@ ItemDef(
         (
             kind: Ring("Ring0"),
             stats: (
-                protection: Normal(0.0)),            
+                protection: Normal(0.1)),            
         )
     ),
     quality: Low,

assets/common/items/armor/ring/ring_gold_0.ron

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Gold Ring",
+    description: "Someone is surely missing it...",
+    kind: Armor(
+        (
+            kind: Ring("RingGold0"),
+            stats: (
+                protection: Normal(0.5)),            
+        )
+    ),
+    quality: Moderate,
+)

assets/common/items/armor/ring/ring_purp_high_0.ron

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Cultist Signet Ring ",
+    description: "Once belonged to a cultist.",
+    kind: Armor(
+        (
+            kind: Ring("RingSkull0"),
+            stats: (
+                protection: Normal(3.0)),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/armor/shoulder/cultist_shoulder_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Mantle",
+    name: "Velorite Mantle",
     description: "Ceremonial attire used by members.",
     kind: Armor(
         (
-            kind: Shoulder("CultistBlue"),
+            kind: Shoulder("VeloriteMage0"),
             stats: (
                 protection: Normal(18.0)),            
         )

assets/common/items/armor/shoulder/velorite_mage_0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Velorite Battlemage Guards",
+    description: "",
+    kind: Armor(
+        (
+            kind: Shoulder("VeloriteMage0"),
+            stats: (
+                protection: Normal(17.0)
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/debug/cultist_belt.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Cultist Belt",
+    name: "Velorite Belt",
-    description: "Ceremonial attire used by members.",
+    description: "",
     kind: Armor(
         (
-            kind: Belt("Cultist"),
+            kind: Belt("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/debug/cultist_boots.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Cultist Boots",
+    name: "Velorite Boots",
-    description: "Ceremonial attire used by members.",
+    description: "",
     kind: Armor(
         (
-            kind: Foot("Cultist"),
+            kind: Foot("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/debug/cultist_chest_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Chest",
+    name: "Velorite Chest",
-    description: "Ceremonial attire used by members.",
+    description: "",
     kind: Armor(
         (
-            kind: Chest("CultistBlue"),
+            kind: Chest("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/debug/cultist_hands_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Gloves",
+    name: "Velorite Gloves",
-    description: "Ceremonial attire used by members.",
+    description: "",
     kind: Armor(
         (
-            kind: Hand("CultistBlue"),
+            kind: Hand("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/debug/cultist_legs_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Skirt",
+    name: "Velorite Skirt",
-    description: "Ceremonial attire used by members.",
+    description: "",
     kind: Armor(
         (
-            kind: Pants("CultistBlue"),
+            kind: Pants("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/debug/cultist_shoulder_blue.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Blue Cultist Mantle",
+    name: "Velorite Mantle",
-    description: "Ceremonial attire used by members.",
+    description: "",
     kind: Armor(
         (
-            kind: Shoulder("CultistBlue"),
+            kind: Shoulder("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/debug/dungeon_purple-0.ron

@@ -1,9 +1,9 @@
 ItemDef(
-    name: "Purple Admin Cape",
+    name: "Velorite Admin Cape",
     description: "Where did I put my banhammer again?",
     kind: Armor(
         (
-            kind: Back("DungPurp0"),
+            kind: Back("VeloriteMage0"),
             stats: (
                 protection: Invincible),            
         )

assets/common/items/weapons/dagger/basic_0.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Suspicious Paper Knife",
+    description: "Opens letters quickly.",
+    kind: Tool(
+        (
+            kind: Dagger("BasicDagger0"),    
+            stats: (
+                equip_time_millis: 0,
+                power: 1.80
+                ),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/weapons/dagger/cultist_0.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Magical Cultist Dagger",
+    description: "This belonged to an evil Cult Leader.",
+    kind: Tool(
+        (
+            kind: Dagger("CultDagger0"),    
+            stats: (
+                equip_time_millis: 0,
+                power: 2.00
+                ),            
+        )
+    ),
+    quality: Epic,
+)

assets/common/items/weapons/sword/frost_cleaver_2h-0.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Frost Cleaver",
+    description: "Radiates a freezing aura.",
+    kind: Tool(
+       (
+            kind: Sword("FrostCleaver0"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.70),            
+        )
+    ),
+    quality: High,
+)

assets/common/items/weapons/sword/frost_cleaver_2h-1.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Frost Saw",
+    description: "Forged from a single piece\nof eternal ice.",
+    kind: Tool(
+       (
+            kind: Sword("FrostCleaver1"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.95),            
+        )
+    ),
+    quality: Epic,
+)

assets/common/loot_tables/loot_table_armor_misc.ron

@@ -1,6 +1,7 @@
 [
     // rings
     (0.15, "common.items.armor.ring.ring_0"),
+    (0.05, "common.items.armor.ring.ring_gold_0"),
     // capes
     (0.25, "common.items.armor.back.short_0"),
     (0.25, "common.items.armor.back.short_1"),

assets/common/loot_tables/loot_table_cave_large.ron

@@ -4,6 +4,7 @@
     (0.2, "common.items.crafting_ing.cloth_scraps"), 
     (1.0, "common.items.crafting_ing.empty_vial"),  
     (0.1, "common.items.glider.glider_blue"),  
+    (0.05, "common.items.armor.ring.ring_gold_0"),   
     // swords 
     (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),
     (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"),

assets/common/loot_tables/loot_table_cultists.ron

@@ -17,6 +17,8 @@
     (0.1, "common.items.glider.glider_blue"),
     (0.5, "common.items.utility.firework_purple"),
     (0.5, "common.items.utility.bomb"),
+    (0.5, "common.items.armor.ring.ring_gold_0"),
+    (0.25, "common.items.armor.ring.ring_purp_high_0"),
     // Heavy Armour
     // belts
     (0.5, "common.items.armor.belt.plate_0"),

assets/common/loot_tables/loot_table_humanoids.ron

@@ -5,6 +5,8 @@
     (2, "common.items.crafting_ing.cloth_scraps"),   
     // Consumables
     (0.2, "common.items.consumable.potion_minor"),
+    // Ring
+    (0.02, "common.items.armor.ring.ring_gold_0"),
     // Utility
     (0.05, "common.items.utility.collar"),
     // Food

assets/common/loot_tables/loot_table_rocks.ron

@@ -1,6 +1,6 @@
 [  
     (1, "common.items.crafting_ing.stones"),
-    (0.10, "common.items.crafting_ing.shiny_gem"),
+    (0.05, "common.items.crafting_ing.shiny_gem"),
     (0.10, "common.items.ore.velorite"),
     (0.20, "common.items.ore.veloritefrag"),
 ]

assets/voxygen/item_image_manifest.ron

@@ -61,7 +61,23 @@
         "voxel.weapon.dagger.dagger_rusty",
         (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
     ),
+    Tool("common.items.weapons.dagger.basic-0"): VoxTrans(
+        "voxel.weapon.dagger.dagger_basic-0",
+        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.dagger.cultist_0"): VoxTrans(
+        "voxel.weapon.dagger.dagger_cult-0",
+        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
+    ),
     // Swords
+    Tool("common.items.weapons.sword.frost_cleaver_2h-0"): VoxTrans(
+        "voxel.weapon.sword.frost_cleaver-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40,
+    ),
+    Tool("common.items.weapons.sword.frost_cleaver_2h-1"): VoxTrans(
+        "voxel.weapon.sword.frost_cleaver-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40,
+    ),
     Tool("common.items.weapons.sword.short_sword_0"): VoxTrans(
         "voxel.weapon.sword.short_2h-0",
         (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60,
@@ -239,7 +255,7 @@
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
     Tool("common.items.debug.cultist_purp_2h_boss-0"): VoxTrans(
-        "voxel.weapon.sword.cultist_purp_2h-0",
+        "voxel.weapon.sword.frost_cleaver-1",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
     Tool("common.items.npc_weapons.sword.cultist_purp_2h_boss-0"): VoxTrans(
@@ -787,6 +803,35 @@
         "voxel.armor.chest.shirt_white-0",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
+    // Velorite Battlemage Set
+    Armor(Chest("VeloriteMage0")): VoxTrans(
+        "voxel.armor.chest.velorite_battlemage",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("VeloriteMage0")): VoxTrans(
+        "voxel.armor.pants.velorite_battlemage",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("VeloriteMage0")): VoxTrans(
+        "voxel.armor.belt.velorite_battlemage",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+    ),
+    Armor(Foot("VeloriteMage0")): VoxTrans(
+        "voxel.armor.foot.velorite_battlemage",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("VeloriteMage0")): VoxTrans(
+        "voxel.armor.hand.velorite_battlemage_left",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("VeloriteMage0")): VoxTrans(
+        "voxel.armor.shoulder.velorite_battlemage_left",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Back("VeloriteMage0")): VoxTrans(
+        "voxel.armor.back.velorite_battlemage",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
     // Assassin Set
     Armor(Chest("Assassin")): VoxTrans(
         "voxel.armor.chest.assa",
@@ -1188,9 +1233,19 @@
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
     // Rings
-    Armor(Ring("Ring0")): Png(
+    Armor(Ring("Ring0")): VoxTrans(
-        "element.icons.ring-0",
+        "voxel.armor.ring.simple_purp-0",
+        (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9,
     ),
+    Armor(Ring("RingGold0")): VoxTrans(
+        "voxel.armor.ring.simple_gold-0",
+        (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9,
+    ),
+    Armor(Ring("RingSkull0")): VoxTrans(
+        "voxel.armor.ring.high_purp-0",
+        (0.0, 0.0, 0.0), (30.0, 0.0, 0.0), 0.9,
+    ),
+
     // Necks
     Armor(Neck("Neck0")): Png(
         "element.icons.neck-0",

assets/voxygen/voxel/humanoid_armor_back_manifest.ron

@@ -32,5 +32,9 @@
           vox_spec: ("armor.back.backpack-grey", (-7.0, -5.0, -10.0)),
           color: Some((76, 72, 178))
       ),   
+      "VeloriteMage0": (
+          vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)),
+          color: None
+      ),   
     },
 ))

assets/voxygen/voxel/humanoid_armor_belt_manifest.ron

@@ -84,5 +84,9 @@
             vox_spec: ("armor.belt.bonerattler", (-5.0, -4.5, 2.0)),
             color: None
         ),
+        "VeloriteMage0": (
+          vox_spec: ("armor.belt.velorite_battlemage", (-5.0, -3.5, 2.0)),
+          color: None
+      ),
     },
 ))

assets/voxygen/voxel/humanoid_armor_chest_manifest.ron

@@ -126,7 +126,7 @@
             vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
             color: Some((30, 0, 64))
         ),
-        "CultistBlue": (
+        "VeloriteMage0": (
             vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
             color: Some((57, 81, 132))
         ),
@@ -146,6 +146,10 @@
             vox_spec: ("armor.chest.bonerattler", (-7.0, -4.5, 2.0)),
             color: None
         ),
+        "VeloriteMage0": (
+          vox_spec: ("armor.chest.velorite_battlemage", (-7.0, -3.5, 0.5)),
+          color: None
+      ),
     },
 )
 )

assets/voxygen/voxel/humanoid_armor_foot_manifest.ron

@@ -80,5 +80,9 @@
             vox_spec: ("armor.foot.bonerattler", (-2.5, -3.5, -2.0)),
             color: None
         ),
+        "VeloriteMage0": (
+          vox_spec: ("armor.foot.velorite_battlemage", (-2.5, -3.5, -2.0)),
+          color: None
+      ),
     },
 ))

assets/voxygen/voxel/humanoid_armor_hand_manifest.ron

@@ -90,7 +90,7 @@
                 color: Some((30, 0, 64))
             )
         ),
-        "CultistBlue": (
+        "VeloriteMage0": (
             left: (
                 vox_spec: ("armor.hand.cultist_right", (-3.0, -1.5, -2.5)),
                 color: Some((57, 81, 132))
@@ -180,5 +180,15 @@
                 color: None
             )
         ),
+        "VeloriteMage0": (
+            left: (
+                vox_spec: ("armor.hand.velorite_battlemage_left", (-2.5, -1.5, -2.5)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.velorite_battlemage_left", (-2.5, -1.5, -2.5)),
+                color: None
+            )
+        ),
     },
 ))

assets/voxygen/voxel/humanoid_armor_pants_manifest.ron

@@ -68,10 +68,6 @@
             vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
             color: Some((30, 0, 64))
         ),        
-        "CultistBlue" : (
-            vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
-            color: Some((57, 81, 132))
-        ),
         "Steel0": (
             vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
             color: None
@@ -104,5 +100,9 @@
             vox_spec: ("armor.pants.bonerattler", (-5.0, -3.5, 1.0)),
             color: None
         ),
+        "VeloriteMage0": (
+          vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)),
+          color: None
+      ),
     },
 ))

assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron

@@ -111,7 +111,7 @@
                 color: Some((30, 0, 64))
             )
         ),
-        "CultistBlue": (
+        "VeloriteMage0": (
             left: (
                 vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)),
                 color: Some((57, 81, 132))
@@ -271,5 +271,15 @@
                 color: None
             )
         ),
+        "VeloriteMage0": (
+            left: (
+                vox_spec: ("armor.shoulder.velorite_battlemage_left", (-6.0, -4.0 , 0.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.velorite_battlemage_left", (-1.0, -4.0, 0.0)),
+                color: None
+            )
+        ),
     },
 ))

assets/voxygen/voxel/humanoid_head_manifest.ron

@@ -10,6 +10,7 @@
             Some(("figure.eyes.general.male_heterochromia-0", (3, 9, 2))), 
             Some(("figure.eyes.general.male_scar-0", (3, 9, 2))), 
             Some(("figure.eyes.general.male_blind-0", (3, 9, 2))),    
+            Some(("figure.eyes.general.male_old", (3, 9, 2))),                              
             ],
         hair: [
             Some(("figure.hair.human.male-0", (1, 1, 1))),
@@ -213,6 +214,7 @@
             Some(("figure.eyes.general.male_heterochromia-0", (2, 10, 2))), 
             Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), 
             Some(("figure.eyes.general.male_blind-0", (2, 10, 2))),  
+            Some(("figure.eyes.general.male_old", (1, 10, 1))),            
             ],
         hair: [
             Some(("figure.hair.dwarf.bald", (0, 3, 1))), 
@@ -273,6 +275,7 @@
             Some(("figure.hair.dwarf.female-4", (-3, -2, -5))),
             Some(("figure.hair.dwarf.female-5", (-3, -2, -5))),
             Some(("figure.hair.dwarf.female-6", (-3, -2, -5))),
+            Some(("figure.hair.dwarf.female-7", (-9, -9, -7))),        
         ],
         beard: [None],
         accessory: [
@@ -338,6 +341,7 @@
             Some(("figure.eyes.general.male_heterochromia-0", (5, 9, 4))), 
             Some(("figure.eyes.general.male_scar-0", (5, 9, 4))),
             Some(("figure.eyes.general.male_blind-0", (5, 9, 4))),  
+            Some(("figure.eyes.general.male_old", (4, 9, 3))),                                      
             ],
         hair: [
             Some(("figure.hair.danari.male-0", (3, 1, 2))),

assets/voxygen/voxel/humanoid_main_weapon_manifest.ron

@@ -167,20 +167,16 @@
         vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)),
         color: None
     ),
-    "common.items.weapons.sword.cultist_purp_2h-0": (
+    "common.items.weapons.sword.cultist_purp_2h": (
         vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.npc_weapons.sword.cultist_purp_2h-0": (
+    "common.items.weapons.sword.frost_cleaver_2h-0": (
-        vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.debug.cultist_purp_2h_boss-0": (
+    "common.items.weapons.sword.frost_cleaver_2h-1": (
-        vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)),
-        color: None
-    ),
-    "common.items.npc_weapons.sword.cultist_purp_2h_boss-0": (
-        vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
     // Axes
@@ -478,6 +474,14 @@
         vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)),
         color: None
     ),
+    "common.items.weapons.dagger.basic-0": (
+        vox_spec: ("weapon.dagger.dagger_basic-0", (-1.5, -3.0, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.dagger.cultist_0": (
+        vox_spec: ("weapon.dagger.dagger_cult-0", (-1.5, -3.0, -3.0)),
+        color: None
+    ),
     // Shields
     "common.items.weapons.shield.shield_1": (
         vox_spec: ("weapon.shield.wood-0", (-2.5, -5.5, -5.5)),
@@ -652,6 +656,10 @@
         vox_spec: ("weapon.tool.broom_belzeshrub_purple", (-3.0, -4.0, -4.0)),
         color: None
     ),
+    "common.items.debug.cultist_purp_2h_boss-0": (
+        vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)),
+        color: None
+    ),
     // Misc
     "common.items.weapons.empty.empty": (
             vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),

assets/voxygen/voxel/sprite_manifest.ron

@@ -2002,6 +2002,54 @@ PotionMinor: Some((
             offset: (-5.0, -5.0, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
+],
+    wind_sway: 0.0,
+)),
+// Underwater Grass
+GrassBlue: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.underwater_grass.blue-0",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.5),
+        ),
+        (
+            model: "voxygen.voxel.sprite.underwater_grass.blue-1",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.5),
+        ),        
+    ],
+    wind_sway: 1.0,
+)),
+// Underwater Chests
+ChestBurried: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.underwater_chests.chest_skull",
+            offset: (-10.0, -8.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.5),
+        ),
+        (
+             model: "voxygen.voxel.sprite.underwater_chests.chest_vines",
+            offset: (-10.0, -8.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.5),
+        ),        
+    ],
+    wind_sway: 0.0,
+)),
+// Underwater Mud Piles
+Mud: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.underwater_mud.mud-0",
+            offset: (-9.5, -7.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.5),
+        ),
+        (
+            model: "voxygen.voxel.sprite.underwater_mud.mud-1",
+            offset: (-8.5, -7.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.5),
+        ),        
     ],
     wind_sway: 0.0,
 )),

common/src/comp/body/humanoid.rs

@@ -315,7 +315,7 @@ impl Species {
         match (self, body_type) {
             (Species::Danari, BodyType::Female) => 4,
             (Species::Danari, BodyType::Male) => 4,
-            (Species::Dwarf, BodyType::Female) => 7,
+            (Species::Dwarf, BodyType::Female) => 8,
             (Species::Dwarf, BodyType::Male) => 4,
             (Species::Elf, BodyType::Female) => 21,
             (Species::Elf, BodyType::Male) => 4,
@@ -350,13 +350,13 @@ impl Species {
     pub fn num_eyes(self, body_type: BodyType) -> u8 {
         match (self, body_type) {
             (Species::Danari, BodyType::Female) => 6,
-            (Species::Danari, BodyType::Male) => 7,
+            (Species::Danari, BodyType::Male) => 8,
             (Species::Dwarf, BodyType::Female) => 6,
-            (Species::Dwarf, BodyType::Male) => 7,
+            (Species::Dwarf, BodyType::Male) => 8,
             (Species::Elf, BodyType::Female) => 6,
             (Species::Elf, BodyType::Male) => 7,
             (Species::Human, BodyType::Female) => 6,
-            (Species::Human, BodyType::Male) => 5,
+            (Species::Human, BodyType::Male) => 7,
             (Species::Orc, BodyType::Female) => 6,
             (Species::Orc, BodyType::Male) => 2,
             (Species::Undead, BodyType::Female) => 3,

common/src/comp/inventory/item/mod.rs

@@ -326,6 +326,24 @@ impl Item {
                 });
                 chosen.choose()
             },
+            SpriteKind::ChestBurried => {
+                chosen = Lottery::<String>::load_expect(match rng.gen_range(0, 7) {
+                    1 => "common.loot_tables.loot_table_weapon_common",
+                    2 => "common.loot_tables.loot_table_armor_light",
+                    3 => "common.loot_tables.loot_table_armor_cloth",
+                    _ => "common.loot_tables.loot_table_armor_misc",
+                });
+                chosen.choose()
+            },
+            SpriteKind::Mud => {
+                chosen = Lottery::<String>::load_expect(match rng.gen_range(0, 5) {
+                    0 => "common.loot_tables.loot_table_crafting",
+                    1 => "common.loot_tables.loot_table_weapon_common",
+                    2 => "common.loot_tables.loot_table_armor_misc",
+                    _ => "common.loot_tables.loot_table_rocks",
+                });
+                chosen.choose()
+            },
             SpriteKind::Crate => {
                 chosen = Lottery::<String>::load_expect(match rng.gen_range(0, 4) {
                     0 => "common.loot_tables.loot_table_crafting",

common/src/terrain/sprite.rs

@@ -104,6 +104,9 @@ make_case_elim!(
         LargeCactus = 0x4E,
         VialEmpty = 0x4F,
         PotionMinor = 0x50,
+        GrassBlue = 0x51,
+        ChestBurried = 0x52,
+        Mud = 0x53,
     }
 );
 
@@ -141,6 +144,8 @@ impl SpriteKind {
             SpriteKind::WardrobeSingle => 3.0,
             SpriteKind::WardrobeDouble => 3.0,
             SpriteKind::Pot => 0.90,
+            SpriteKind::Mud => 0.36,
+            SpriteKind::ChestBurried => 0.91,
             // TODO: Find suitable heights.
             SpriteKind::BarrelCactus
             | SpriteKind::RoundCactus
@@ -188,6 +193,8 @@ impl SpriteKind {
             SpriteKind::Beehive => true,
             SpriteKind::VialEmpty => true,
             SpriteKind::PotionMinor => true,
+            SpriteKind::ChestBurried => true,
+            SpriteKind::Mud => true,
             _ => false,
         }
     }

voxygen/src/scene/simple.rs

@@ -233,7 +233,8 @@ impl Scene {
             ..
         } = self.camera.dependents();
         const VD: f32 = 115.0; // View Distance
-        const TIME: f64 = 10.0 * 60.0 * 60.0;
+
+        const TIME: f64 = 9.0 * 60.0 * 60.0;
         const SHADOW_NEAR: f32 = 1.0;
         const SHADOW_FAR: f32 = 25.0;
 

voxygen/src/settings.rs

@@ -529,7 +529,7 @@ impl Default for GameplaySettings {
             smooth_pan_enable: true,
             toggle_debug: false,
             sct: true,
-            sct_player_batch: true,
+            sct_player_batch: false,
             sct_damage_batch: false,
             speech_bubble_dark_mode: false,
             speech_bubble_icon: true,

world/src/layer/scatter.rs

@@ -7,7 +7,9 @@ use vek::*;
 fn close(x: f32, tgt: f32, falloff: f32) -> f32 {
     (1.0 - (x - tgt).abs() / falloff).max(0.0).powf(0.125)
 }
+
 const MUSH_FACT: f32 = 1.0e-4; // To balance everything around the mushroom spawning rate
+const DEPTH_WATER_NORM: f32 = 15.0; // Water depth at which regular underwater sprites start spawning
 pub fn apply_scatter_to(canvas: &mut Canvas) {
     use SpriteKind::*;
     #[allow(clippy::type_complexity)]
@@ -274,7 +276,56 @@ pub fn apply_scatter_to(canvas: &mut Canvas) {
             )
         }),
         // Underwater chests
-        (Chest, true, |_, _| (MUSH_FACT * 0.1, None)),
+        (ChestBurried, true, |_, col| {
+            (
+                MUSH_FACT
+                    * 1.0e-6
+                    * if col.alt < col.water_level - DEPTH_WATER_NORM + 30.0 {
+                        1.0
+                    } else {
+                        0.0
+                    },
+                None,
+            )
+        }),
+        // Underwater mud piles
+        (Mud, true, |_, col| {
+            (
+                MUSH_FACT
+                    * 1.0e-3
+                    * if col.alt < col.water_level - DEPTH_WATER_NORM {
+                        1.0
+                    } else {
+                        0.0
+                    },
+                None,
+            )
+        }),
+        // Underwater grass
+        (GrassBlue, true, |_, col| {
+            (
+                MUSH_FACT
+                    * 250.0
+                    * if col.alt < col.water_level - DEPTH_WATER_NORM {
+                        1.0
+                    } else {
+                        0.0
+                    },
+                Some((100.0, 0.15)),
+            )
+        }),
+        (Stones, true, |c, col| {
+            (
+                (c.rockiness - 0.5).max(0.0)
+                    * 1.0e-3
+                    * if col.alt < col.water_level - DEPTH_WATER_NORM {
+                        1.0
+                    } else {
+                        0.0
+                    },
+                None,
+            )
+        }),
     ];
 
     canvas.foreach_col(|canvas, wpos2d, col| {