Merge branch 'snowram/new-scepters-starves' into 'master'

Add new batch of starves and scepter (by Gemu)

See merge request veloren/veloren!2022

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Amethyst Staff",
+    description: "Its stone is the closest thing from perfection",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.4,
+            power: 1.8,
+            poise_strength: 1.5,
+            speed: 1.2,
+            crit_chance: 0.088125,
+            crit_mult: 1.3857143,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Caduceus",
+    description: "The snakes seem to be alive",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.4,
+            power: 2.3,
+            poise_strength: 1.5,
+            speed: 1.0,
+            crit_chance: 0.078125,
+            crit_mult: 1.3657143,
+        )),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Coralline Cane",
+    description: "Traditional danari scepter from the depths of the ocean",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.4,
+            power: 1.6,
+            poise_strength: 1.5,
+            speed: 1.0,
+            crit_chance: 0.14666667,
+            crit_mult: 1.4285715,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Divine Gohei",
+    description: "The wind wont make it bend",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.4,
+            power: 1.0,
+            poise_strength: 1.5,
+            speed: 0.8,
+            crit_chance: 0.0809375,
+            crit_mult: 1.7326007,
+        )),
+    )),
+    quality: Common,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Druid's Arbor",
+    description: "Draws its power from the primordial nature",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.4,
+            power: 1.4,
+            poise_strength: 1.5,
+            speed: 1.1,
+            crit_chance: 0.055102043,
+            crit_mult: 1.4444444,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Emerald Staff",
+    description: "Its stone is the closest thing from perfection",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 2.0,
+            poise_strength: 1.0,
+            speed: 1.0,
+            crit_chance: 0.140625,
+            crit_mult: 1.4063492,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

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

@@ -1,12 +1,12 @@
 ItemDef(
-    name: "Amethyst Staff",
-    description: "The amethyst faintly glows.",
+    name: "Crimson Eye",
+    description: "The eye faintly glows.",
     kind: Tool((
         kind: Staff,
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.3,
-            power: 1.5,
+            power: 1.3,
             poise_strength: 1.0,
             speed: 1.0,
             crit_chance: 0.125,

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Dragon Tongue",
+    description: "The one they fear",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 2.0,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.2625,
+            crit_mult: 1.4761904,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Frostwood Torch",
+    description: "Staff made from the coolest wood",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 1.2,
+            crit_chance: 0.134379086,
+            crit_mult: 1.4114286,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Golden Khakkara",
+    description: "Originally used to frighten away animals",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.2,
+            poise_strength: 1.0,
+            speed: 1.2,
+            crit_chance: 0.115,
+            crit_mult: 1.4571428,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Laevateinn",
+    description: "Can shatter the gate of death",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.6,
+            power: 1.8,
+            poise_strength: 1.0,
+            speed: 1.6,
+            crit_chance: 0.2002994,
+            crit_mult: 1.3798152,
+        )),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Ruby Rod",
+    description: "Some legends tell that the ruby is is tied to the fire element",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 1.0,
+            crit_chance: 0.2625,
+            crit_mult: 1.4761904,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Solar Staff",
+    description: "Sun energy rumble deep within this staff",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.2,
+            poise_strength: 1.0,
+            speed: 0.9,
+            crit_chance: 0.125,
+            crit_mult: 1.4571428,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/loot_tables/loot_table_cave_large.ron

@@ -44,15 +44,21 @@
     (0.04, "common.items.weapons.axe.steel_axe-5"),
     (0.04, "common.items.weapons.axe.steel_axe-6"),
     // healing staff
-    (0.5, "common.items.weapons.sceptre.staff_nature"),
+    (0.2, "common.items.weapons.sceptre.staff_nature"),
+    (0.1, "common.items.weapons.sceptre.fork0"),
+    (0.1, "common.items.weapons.sceptre.emerald"),
+    (0.1, "common.items.weapons.sceptre.coralline_cane"),
     (0.001, "common.items.weapons.sceptre.sceptre_velorite_0"),
     // staves
     (0.20, "common.items.weapons.staff.bone_staff"),
     (0.20, "common.items.weapons.staff.ley_seeker"),
-    (0.15, "common.items.weapons.staff.fiery_wishing_rod"),
-    (0.15, "common.items.weapons.staff.heated_arm"),
-    (0.10, "common.items.weapons.staff.amethyst_staff"),
-    (0.10, "common.items.weapons.staff.lava_rod"),
+    (0.10, "common.items.weapons.staff.fiery_wishing_rod"),
+    (0.10, "common.items.weapons.staff.heated_arm"),
+    (0.10, "common.items.weapons.staff.golden_khakkara"),
+    (0.10, "common.items.weapons.staff.crimson_eye"),
+    (0.10, "common.items.weapons.staff.solar"),
+    (0.05, "common.items.weapons.staff.lava_rod"),
+    (0.05, "common.items.weapons.staff.dragon_tongue"),
     (0.01, "common.items.weapons.staff.orc_iron"),
     // hammers
     (0.30, "common.items.weapons.hammer.cobalt_hammer-0"),

assets/common/loot_tables/loot_table_cultists.ron

@@ -156,8 +156,9 @@
     (0.5, "common.items.weapons.sceptre.staff_nature"),
     // staves
     (0.40, "common.items.weapons.staff.bone_staff"),
-    (0.40, "common.items.weapons.staff.amethyst_staff"),
+    (0.40, "common.items.weapons.staff.crimson_eye"),
     (0.20, "common.items.weapons.staff.aurora"),
+    (0.20, "common.items.weapons.staff.frostwood_torch"),
     // hammers
     (0.15, "common.items.weapons.hammer.bronze_hammer-0"),
     (0.15, "common.items.weapons.hammer.bronze_hammer-1"),
@@ -205,10 +206,12 @@
     (0.25, "common.items.weapons.sceptre.staff_nature"),
     // staves
     (0.2, "common.items.weapons.staff.infused_tower"),
-    (0.15, "common.items.weapons.staff.lava_rod"),
+    (0.10, "common.items.weapons.staff.lava_rod"),
+    (0.10, "common.items.weapons.staff.dragon_tongue"),
     (0.10, "common.items.weapons.staff.flamethrower_0"),
-    (0.05, "common.items.weapons.staff.bent_fuse"),
-    (0.05, "common.items.weapons.staff.orc_iron"),
+    (0.04, "common.items.weapons.staff.bent_fuse"),
+    (0.04, "common.items.weapons.staff.emerald"),
+    (0.04, "common.items.weapons.staff.orc_iron"),
     // hammers
     (0.01, "common.items.weapons.hammer.cobalt_hammer-0"),
     (0.01, "common.items.weapons.hammer.cobalt_hammer-1"),

assets/common/loot_tables/loot_table_weapon_common.ron

@@ -17,7 +17,8 @@
     (0.10, "common.items.weapons.axe.worn_iron_axe-4"),
     // healing staff
     (0.30, "common.items.weapons.sceptre.starter_sceptre"),
-    (0.20, "common.items.weapons.sceptre.moon0"),
+    (0.10, "common.items.weapons.sceptre.moon0"),
+    (0.10, "common.items.weapons.sceptre.druids_arbor"),
     // staves
     (1.00, "common.items.weapons.staff.starter_staff"),
     // hammers

assets/common/loot_tables/loot_table_weapon_rare.ron

@@ -17,10 +17,14 @@
     // healing staff    
     (0.15, "common.items.weapons.sceptre.loops0"),
     (0.10, "common.items.weapons.sceptre.fork0"),
+    (0.10, "common.items.weapons.sceptre.emerald"),
+    (0.10, "common.items.weapons.sceptre.coralline_cane"),
     // staves
-    (1.00, "common.items.weapons.staff.amethyst_staff"),
+    (1.00, "common.items.weapons.staff.crimson_eye"),
     (0.7, "common.items.weapons.staff.aurora"),
-    (0.65, "common.items.weapons.staff.lava_rod"),
+    (0.7, "common.items.weapons.staff.frostwood_torch"),
+    (0.5, "common.items.weapons.staff.lava_rod"),
+    (0.5, "common.items.weapons.staff.dragon_tongue"),
     (0.75, "common.items.weapons.staff.infused_tower"),
     (0.5, "common.items.weapons.staff.flamethrower_0"),
     // hammers

assets/common/loot_tables/loot_table_weapon_uncommon.ron

@@ -51,7 +51,9 @@
     // staves
     (1.00, "common.items.weapons.staff.bone_staff"),
     (0.7, "common.items.weapons.staff.heated_arm"),
-    (0.8, "common.items.weapons.staff.fiery_wishing_rod"),
+    (0.7, "common.items.weapons.staff.golden_khakkara"),
+    (0.7, "common.items.weapons.staff.fiery_wishing_rod"),
+    (0.7, "common.items.weapons.staff.solar"),
     // hammers
     (0.15, "common.items.weapons.hammer.bronze_hammer-0"),
     (0.15, "common.items.weapons.hammer.bronze_hammer-1"),

assets/common/loot_tables/mindflayer.ron

@@ -6,8 +6,11 @@
     (1.0, "common.items.weapons.axe.parashu"),
     (1.0, "common.items.weapons.hammer.mjolnir"),
     (1.0, "common.items.weapons.bow.sagitta"),
-    (1.0, "common.items.weapons.staff.phoenix"),
-    (1.0, "common.items.weapons.sceptre.root_evil"),
+    (0.5, "common.items.weapons.staff.phoenix"),
+    (0.5, "common.items.weapons.staff.laevateinn"),
+    (0.5, "common.items.weapons.sceptre.root_evil"),
+    (0.5, "common.items.weapons.sceptre.caduceus"),
+
     // Rare misc items
     (0.5, "common.items.boss_drops.lantern"),
     (0.5, "common.items.glider.glider_purp"),

assets/voxygen/item_image_manifest.ron

@@ -873,8 +873,8 @@
         "voxel.weapon.staff.firestaff_bone",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
-    Tool("common.items.weapons.staff.amethyst_staff"): VoxTrans(
-        "voxel.weapon.staff.firestaff_amethyst",
+    Tool("common.items.weapons.staff.crimson_eye"): VoxTrans(
+        "voxel.weapon.staff.crimson_eye",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
     Tool("common.items.weapons.staff.cultist_staff"): VoxTrans(
@@ -921,6 +921,34 @@
         "voxel.weapon.staff.heated_arm",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
     ),
+    Tool("common.items.weapons.staff.eldwood"): VoxTrans(
+        "voxel.weapon.staff.eldwood",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.frostwood_torch"): VoxTrans(
+        "voxel.weapon.staff.frostwood_torch",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.golden_khakkara"): VoxTrans(
+        "voxel.weapon.staff.golden_khakkara",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.laevateinn"): VoxTrans(
+        "voxel.weapon.staff.laevateinn",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.ruby_rod"): VoxTrans(
+        "voxel.weapon.staff.ruby_rod",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.dragon_tongue"): VoxTrans(
+        "voxel.weapon.staff.dragon_tongue",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.solar"): VoxTrans(
+        "voxel.weapon.staff.solar",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
     // Healing Sceptres
     Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans(
         "voxel.weapon.sceptre.wood-simple",
@@ -958,6 +986,30 @@
         "voxel.weapon.sceptre.ore-nature",
         (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
     ),
+    Tool("common.items.weapons.sceptre.caduceus"): VoxTrans(
+        "voxel.weapon.sceptre.caduceus",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sceptre.coralline_cane"): VoxTrans(
+        "voxel.weapon.sceptre.coralline_cane",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.divine_gohei"): VoxTrans(
+        "voxel.weapon.sceptre.divine_gohei",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.15,
+    ),
+    Tool("common.items.weapons.sceptre.emerald"): VoxTrans(
+        "voxel.weapon.sceptre.emerald",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
+    ),
+    Tool("common.items.weapons.sceptre.druids_arbor"): VoxTrans(
+        "voxel.weapon.sceptre.druids_arbor",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
+    ),
+    Tool("common.items.weapons.sceptre.amethyst"): VoxTrans(
+        "voxel.weapon.sceptre.amethyst",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
+    ),
     // Shields
     Tool("common.items.weapons.shield.shield_1"): VoxTrans(
         "voxel.weapon.shield.wood-0",

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -865,8 +865,8 @@
         vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
         color: None
     ),
-    "common.items.weapons.staff.amethyst_staff": (
-        vox_spec: ("weapon.staff.firestaff_amethyst", (-1.5, -4.0, -4.0)),
+    "common.items.weapons.staff.crimson_eye": (
+        vox_spec: ("weapon.staff.crimson_eye", (-1.5, -3.5, -4.0)),
         color: None
     ),
     "common.items.weapons.staff.cultist_staff": (
@@ -913,7 +913,35 @@
         vox_spec: ("weapon.staff.bent_fuse", (-2.0, -2.5, -5.0)),
         color: None
     ),
-    // Healing sceptre
+    "common.items.weapons.staff.eldwood": (
+        vox_spec: ("weapon.staff.eldwood", (-1.5, -4.5, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.frostwood_torch": (
+        vox_spec: ("weapon.staff.frostwood_torch", (-2.5, -3.5, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.golden_khakkara": (
+        vox_spec: ("weapon.staff.golden_khakkara", (-2.5, -3.5, -4.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.laevateinn": (
+        vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -4.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.ruby_rod": (
+        vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.dragon_tongue": (
+        vox_spec: ("weapon.staff.dragon_tongue", (-2.5, -6.0, -5.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.solar": (
+        vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -3.0)),
+        color: None
+    ),
+    // Sceptres
     "common.items.weapons.sceptre.starter_sceptre": (
         vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),
         color: None
@@ -949,6 +977,30 @@
     "common.items.weapons.sceptre.sceptre_velorite_0": (
         vox_spec: ("weapon.sceptre.ore-nature", (-2.0, -6.0, -5.0)),
         color: None
+    ),
+    "common.items.weapons.sceptre.caduceus": (
+        vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -4.0)),
+        color: None
+    ),
+    "common.items.weapons.sceptre.coralline_cane": (
+        vox_spec: ("weapon.sceptre.coralline_cane", (-3.5, -4.0, -5.0)),
+        color: None
+    ),
+    "common.items.weapons.sceptre.divine_gohei": (
+        vox_spec: ("weapon.sceptre.divine_gohei", (-0.5, -3.5, -2.0)),
+        color: None
+    ),
+    "common.items.weapons.sceptre.emerald": (
+        vox_spec: ("weapon.sceptre.emerald", (-3.5, -3.5, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.sceptre.druids_arbor": (
+        vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.sceptre.amethyst": (
+        vox_spec: ("weapon.sceptre.amethyst", (-1.5, -4.5, -9.5)),
+        color: None
     ),
 	// Picks
 	"common.items.tool.pick": (

server/src/migrations/2021-03-29-012510_fix_amethyst_staff/down.sql

@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`

server/src/migrations/2021-03-29-012510_fix_amethyst_staff/up.sql

@@ -0,0 +1,2 @@
+UPDATE item
+SET item_definition_id = 'common.items.weapons.staff.crimson_eye' WHERE item_definition_id = 'common.items.weapons.staff.amethyst_staff';