diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
index ddc297a54c..4e172871a2 100644
--- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
+++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
kind: Staff,
stats: (
equip_time_millis: 300,
- power: 4.0,
- speed: 0.5,
+ power: 15.0,
+ speed: 0.2,
),
)
),
- quality: Epic,
+ quality: Legendary,
)
diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron
index 1c52804473..81b190becb 100644
--- a/assets/common/items/weapons/hammer/mjolnir.ron
+++ b/assets/common/items/weapons/hammer/mjolnir.ron
@@ -6,8 +6,8 @@ ItemDef(
kind: Hammer,
stats: (
equip_time_millis: 500,
- power: 2.00,
- speed: 1.0
+ power: 4.00,
+ speed: 0.5
),
)
),
diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron
new file mode 100644
index 0000000000..2720258e28
--- /dev/null
+++ b/assets/common/items/weapons/sceptre/fork0.ron
@@ -0,0 +1,15 @@
+ItemDef(
+ name: "Infused Fork",
+ description: "Shamanistic energies brought this piece of wood to life again.",
+ kind: Tool(
+ (
+ kind: Sceptre,
+ stats: (
+ equip_time_millis: 400,
+ power: 2.0,
+ speed: 0.8
+ ),
+ )
+ ),
+ quality: High,
+)
diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron
new file mode 100644
index 0000000000..4f67fefb71
--- /dev/null
+++ b/assets/common/items/weapons/sceptre/loops0.ron
@@ -0,0 +1,15 @@
+ItemDef(
+ name: "Soothing Loop",
+ description: "Do you really want to live forever?",
+ kind: Tool(
+ (
+ kind: Sceptre,
+ stats: (
+ equip_time_millis: 400,
+ power: 1.2,
+ speed: 1.5
+ ),
+ )
+ ),
+ quality: High,
+)
diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron
new file mode 100644
index 0000000000..b77a981837
--- /dev/null
+++ b/assets/common/items/weapons/sceptre/moon0.ron
@@ -0,0 +1,15 @@
+ItemDef(
+ name: "Crescent Saviour",
+ description: "Trusty companion by day and night.",
+ kind: Tool(
+ (
+ kind: Sceptre,
+ stats: (
+ equip_time_millis: 400,
+ power: 1.6,
+ speed: 0.5
+ ),
+ )
+ ),
+ quality: Common,
+)
diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron
new file mode 100644
index 0000000000..488423bbad
--- /dev/null
+++ b/assets/common/items/weapons/sceptre/root_evil.ron
@@ -0,0 +1,15 @@
+ItemDef(
+ name: "The Root of Evil",
+ description: "'Everything comes at a price...'",
+ kind: Tool(
+ (
+ kind: Sceptre,
+ stats: (
+ equip_time_millis: 400,
+ power: 4.0,
+ speed: 0.5
+ ),
+ )
+ ),
+ quality: Legendary,
+)
diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron
new file mode 100644
index 0000000000..a2dc37d073
--- /dev/null
+++ b/assets/common/items/weapons/sceptre/root_green0.ron
@@ -0,0 +1,15 @@
+ItemDef(
+ name: "Twitching Root",
+ description: "Sparkles from living energy.",
+ kind: Tool(
+ (
+ kind: Sceptre,
+ stats: (
+ equip_time_millis: 400,
+ power: 3.5,
+ speed: 0.4
+ ),
+ )
+ ),
+ quality: Moderate,
+)
diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
index e4e1844354..848210af87 100644
--- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
+++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
@@ -6,8 +6,8 @@ ItemDef(
kind: Sceptre,
stats: (
equip_time_millis: 400,
- power: 2.0,
- speed: 1.0
+ power: 1.2,
+ speed: 1.6
),
)
),
diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron
index 92c724d344..22d675987e 100644
--- a/assets/common/items/weapons/sceptre/staff_nature.ron
+++ b/assets/common/items/weapons/sceptre/staff_nature.ron
@@ -6,8 +6,8 @@ ItemDef(
kind: Sceptre,
stats: (
equip_time_millis: 400,
- power: 1.0,
- speed: 1.0
+ power: 0.91,
+ speed: 1.1
),
)
),
diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron
new file mode 100644
index 0000000000..54415c7f20
--- /dev/null
+++ b/assets/common/items/weapons/sceptre/totem_green.ron
@@ -0,0 +1,16 @@
+ItemDef(
+ name: "Gnarling Pride",
+ description: "Territory marker of a Gnarling tribe.
+ Infused with healing powers.",
+ kind: Tool(
+ (
+ kind: Sceptre,
+ stats: (
+ equip_time_millis: 400,
+ power: 1.0,
+ speed: 1.2
+ ),
+ )
+ ),
+ quality: Moderate,
+)
diff --git a/assets/common/loot_tables/loot_table_boss_cultist-leader.ron b/assets/common/loot_tables/loot_table_boss_cultist-leader.ron
index 12ca9ed3ae..ae58752df7 100644
--- a/assets/common/loot_tables/loot_table_boss_cultist-leader.ron
+++ b/assets/common/loot_tables/loot_table_boss_cultist-leader.ron
@@ -12,6 +12,7 @@
(1, "common.items.weapons.hammer.cultist_purp_2h-0"),
(1, "common.items.weapons.sword.cultist_purp_2h-0"),
(0.25, "common.items.crafting_ing.mindflayer_bag_damaged"),
+ (0.01, "common.items.weapons.sceptre.root_evil"),
// misc
(1, "common.items.boss_drops.lantern"),
(0.1, "common.items.glider.glider_purp"),
diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron
index 0ba5223e91..5d320157ac 100644
--- a/assets/common/loot_tables/loot_table_weapon_common.ron
+++ b/assets/common/loot_tables/loot_table_weapon_common.ron
@@ -21,7 +21,8 @@
(0.10, "common.items.weapons.axe.worn_iron_axe-3"),
(0.10, "common.items.weapons.axe.worn_iron_axe-4"),
// healing staff
- (0.25, "common.items.weapons.sceptre.staff_nature"),
+ (0.30, "common.items.weapons.sceptre.starter_sceptre"),
+ (0.20, "common.items.weapons.sceptre.moon0"),
// staves
(1.00, "common.items.weapons.staff.starter_staff"),
// hammers
diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron
index 5755a38271..8a8cb6715c 100644
--- a/assets/common/loot_tables/loot_table_weapon_rare.ron
+++ b/assets/common/loot_tables/loot_table_weapon_rare.ron
@@ -16,8 +16,9 @@
(0.20, "common.items.weapons.axe.bloodsteel_axe-2"),
(0.30, "common.items.weapons.axe.cobalt_axe-0"),
(0.10, "common.items.weapons.axe.malachite_axe-0"),
- // healing staff
- (0.25, "common.items.weapons.sceptre.staff_nature"),
+ // healing staff
+ (0.15, "common.items.weapons.sceptre.loops0"),
+ (0.10, "common.items.weapons.sceptre.fork0"),
// staves
(1.00, "common.items.weapons.staff.amethyst_staff"),
// hammers
diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron
index 51e4bb8375..33ce82c3e5 100644
--- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron
+++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron
@@ -40,6 +40,8 @@
(0.04, "common.items.weapons.axe.steel_axe-6"),
// healing staff
(0.5, "common.items.weapons.sceptre.staff_nature"),
+ (0.15, "common.items.weapons.sceptre.root_green0"),
+ (0.25, "common.items.weapons.sceptre.totem_green"),
// staves
(1.00, "common.items.weapons.staff.bone_staff"),
// hammers
diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron
index b88126f6f3..bdbf6cd59a 100644
--- a/assets/common/recipe_book.ron
+++ b/assets/common/recipe_book.ron
@@ -202,11 +202,11 @@
("common.items.crafting_tools.sewing_set", 0),
],
),
- "velorite_sceptre": (
- ("common.items.weapons.sceptre.sceptre_velorite_0", 1),
+ "Soothing Loop": (
+ ("common.items.weapons.sceptre.loops0", 1),
[
("common.items.crafting_ing.twigs", 20),
- ("common.items.ore.veloritefrag", 10),
+ ("common.items.ore.veloritefrag", 8),
("common.items.crafting_ing.shiny_gem", 4),
("common.items.crafting_tools.craftsman_hammer", 0),
],
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 12ede03821..5d91be5503 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -614,15 +614,39 @@
"voxel.weapon.staff.firestaff_cultist",
(1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
- // Healing staff
- Tool("common.items.weapons.sceptre.staff_nature"): VoxTrans(
- "voxel.weapon.sceptre.wood-nature",
- (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
- ),
+ // Healing Sceptres
Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans(
"voxel.weapon.sceptre.wood-simple",
(0.0, -0.0, 0.0), (-130., 90.0, 0.0), 1.25,
),
+ Tool("common.items.weapons.sceptre.moon0"): VoxTrans(
+ "voxel.weapon.sceptre.moon",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
+ Tool("common.items.weapons.sceptre.staff_nature"): VoxTrans(
+ "voxel.weapon.sceptre.wood-nature",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
+ Tool("common.items.weapons.sceptre.totem_green"): VoxTrans(
+ "voxel.weapon.sceptre.totem_green",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
+ Tool("common.items.weapons.sceptre.root_green0"): VoxTrans(
+ "voxel.weapon.sceptre.root_green",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
+ Tool("common.items.weapons.sceptre.fork0"): VoxTrans(
+ "voxel.weapon.sceptre.fork",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
+ Tool("common.items.weapons.sceptre.loops0"): VoxTrans(
+ "voxel.weapon.sceptre.loops",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
+ Tool("common.items.weapons.sceptre.root_evil"): VoxTrans(
+ "voxel.weapon.sceptre.root_evil",
+ (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+ ),
Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
"voxel.weapon.sceptre.ore-nature",
(1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
index 268213dbdf..a12e8e6bf2 100644
--- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron
@@ -651,10 +651,34 @@
vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),
color: None
),
+ "common.items.weapons.sceptre.moon0": (
+ vox_spec: ("weapon.sceptre.moon", (-1.5, -2.5, -6.0)),
+ color: None
+ ),
"common.items.weapons.sceptre.staff_nature": (
vox_spec: ("weapon.sceptre.wood-nature", (-1.0, -6.0, -5.0)),
color: None
),
+ "common.items.weapons.sceptre.totem_green": (
+ vox_spec: ("weapon.sceptre.totem_green", (-1.5, -2.5, -6.0)),
+ color: None
+ ),
+ "common.items.weapons.sceptre.root_green0": (
+ vox_spec: ("weapon.sceptre.root_green", (-1.5, -2.5, -6.0)),
+ color: None
+ ),
+ "common.items.weapons.sceptre.fork0": (
+ vox_spec: ("weapon.sceptre.fork", (-1.5, -2.5, -6.0)),
+ color: None
+ ),
+ "common.items.weapons.sceptre.loops0": (
+ vox_spec: ("weapon.sceptre.loops", (-1.5, -2.5, -6.0)),
+ color: None
+ ),
+ "common.items.weapons.sceptre.root_evil": (
+ vox_spec: ("weapon.sceptre.root_evil", (-1.5, -2.5, -6.0)),
+ color: None
+ ),
"common.items.weapons.sceptre.sceptre_velorite_0": (
vox_spec: ("weapon.sceptre.ore-nature", (-2.0, -6.0, -5.0)),
color: None
diff --git a/assets/voxygen/voxel/weapon/sceptre/fork.vox b/assets/voxygen/voxel/weapon/sceptre/fork.vox
new file mode 100644
index 0000000000..870c6d5dad
Binary files /dev/null and b/assets/voxygen/voxel/weapon/sceptre/fork.vox differ
diff --git a/assets/voxygen/voxel/weapon/sceptre/loops.vox b/assets/voxygen/voxel/weapon/sceptre/loops.vox
new file mode 100644
index 0000000000..ca1e760c54
Binary files /dev/null and b/assets/voxygen/voxel/weapon/sceptre/loops.vox differ
diff --git a/assets/voxygen/voxel/weapon/sceptre/moon.vox b/assets/voxygen/voxel/weapon/sceptre/moon.vox
new file mode 100644
index 0000000000..bd0c345d19
Binary files /dev/null and b/assets/voxygen/voxel/weapon/sceptre/moon.vox differ
diff --git a/assets/voxygen/voxel/weapon/sceptre/root_evil.vox b/assets/voxygen/voxel/weapon/sceptre/root_evil.vox
new file mode 100644
index 0000000000..08732dadb1
Binary files /dev/null and b/assets/voxygen/voxel/weapon/sceptre/root_evil.vox differ
diff --git a/assets/voxygen/voxel/weapon/sceptre/root_green.vox b/assets/voxygen/voxel/weapon/sceptre/root_green.vox
new file mode 100644
index 0000000000..becf0d2557
Binary files /dev/null and b/assets/voxygen/voxel/weapon/sceptre/root_green.vox differ
diff --git a/assets/voxygen/voxel/weapon/sceptre/totem_green.vox b/assets/voxygen/voxel/weapon/sceptre/totem_green.vox
new file mode 100644
index 0000000000..ebfa895b46
Binary files /dev/null and b/assets/voxygen/voxel/weapon/sceptre/totem_green.vox differ
diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs
index c427b70f69..292b4c86db 100644
--- a/voxygen/src/hud/util.rs
+++ b/voxygen/src/hud/util.rs
@@ -109,16 +109,18 @@ fn tool_desc(tool: &Tool, desc: &str) -> String {
if !desc.is_empty() {
format!(
- "{}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n<Right-Click to use>",
+ "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n<Right-Click to use>",
kind,
+ speed * power * 10.0, // Damage per second
power * 10.0,
speed,
desc
)
} else {
format!(
- "{}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n<Right-Click to use>",
+ "{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n<Right-Click to use>",
kind,
+ speed * power * 10.0, // Damage per second
power * 10.0,
speed
)
diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs
index f95f95f5fb..db6ab439fe 100644
--- a/world/src/layer/scatter.rs
+++ b/world/src/layer/scatter.rs
@@ -161,7 +161,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
(LongGrass, false, |c, _| {
(
close(c.temp, 0.3, 0.35).min(close(c.humidity, CONFIG.jungle_hum, 0.3)) * 0.15,
- Some((48.0, 0.2)),
+ Some((45.0, 0.5)),
)
}),
// Jungle Sprites