From 5295894105276664b2289306cfc6ed28240f22cf Mon Sep 17 00:00:00 2001 From: Snowram Date: Sun, 28 Mar 2021 22:45:29 +0200 Subject: [PATCH] Add new batch of starves and scepter (by Gemu) --- .../common/items/weapons/sceptre/amethyst.ron | 18 ++++++ .../common/items/weapons/sceptre/caduceus.ron | 18 ++++++ .../items/weapons/sceptre/coralline_cane.ron | 18 ++++++ .../items/weapons/sceptre/divine_gohei.ron | 18 ++++++ .../items/weapons/sceptre/druids_arbor.ron | 18 ++++++ .../common/items/weapons/sceptre/emerald.ron | 18 ++++++ .../{amethyst_staff.ron => crimson_eye.ron} | 6 +- .../items/weapons/staff/dragon_tongue.ron | 18 ++++++ .../items/weapons/staff/frostwood_torch.ron | 18 ++++++ .../items/weapons/staff/golden_khakkara.ron | 18 ++++++ .../common/items/weapons/staff/laevateinn.ron | 18 ++++++ .../common/items/weapons/staff/ruby_rod.ron | 18 ++++++ assets/common/items/weapons/staff/solar.ron | 18 ++++++ .../loot_tables/loot_table_cave_large.ron | 16 +++-- .../loot_tables/loot_table_cultists.ron | 11 ++-- .../loot_tables/loot_table_weapon_common.ron | 3 +- .../loot_tables/loot_table_weapon_rare.ron | 8 ++- .../loot_table_weapon_uncommon.ron | 4 +- assets/common/loot_tables/mindflayer.ron | 7 ++- assets/voxygen/item_image_manifest.ron | 56 +++++++++++++++++- .../voxygen/voxel/biped_weapon_manifest.ron | 58 ++++++++++++++++++- .../voxygen/voxel/weapon/sceptre/amethyst.vox | 3 + .../voxygen/voxel/weapon/sceptre/caduceus.vox | 3 + .../voxel/weapon/sceptre/coralline_cane.vox | 3 + .../voxel/weapon/sceptre/divine_gohei.vox | 3 + .../voxel/weapon/sceptre/druids_arbor.vox | 3 + .../voxygen/voxel/weapon/sceptre/emerald.vox | 3 + .../voxygen/voxel/weapon/staff/Bone_staff.vox | 2 +- .../voxel/weapon/staff/amethyst_axis.vox | 3 + .../voxel/weapon/staff/dragon_tongue.vox | 3 + assets/voxygen/voxel/weapon/staff/emerald.vox | 3 + .../voxel/weapon/staff/firestaff_amethyst.vox | 4 +- .../voxel/weapon/staff/frostwood_torch.vox | 3 + .../voxel/weapon/staff/golden_khakkara.vox | 3 + .../voxygen/voxel/weapon/staff/laevateinn.vox | 3 + .../voxygen/voxel/weapon/staff/ruby_rod.vox | 3 + assets/voxygen/voxel/weapon/staff/solar.vox | 3 + .../down.sql | 1 + .../up.sql | 2 + 39 files changed, 410 insertions(+), 26 deletions(-) create mode 100644 assets/common/items/weapons/sceptre/amethyst.ron create mode 100644 assets/common/items/weapons/sceptre/caduceus.ron create mode 100644 assets/common/items/weapons/sceptre/coralline_cane.ron create mode 100644 assets/common/items/weapons/sceptre/divine_gohei.ron create mode 100644 assets/common/items/weapons/sceptre/druids_arbor.ron create mode 100644 assets/common/items/weapons/sceptre/emerald.ron rename assets/common/items/weapons/staff/{amethyst_staff.ron => crimson_eye.ron} (75%) create mode 100644 assets/common/items/weapons/staff/dragon_tongue.ron create mode 100644 assets/common/items/weapons/staff/frostwood_torch.ron create mode 100644 assets/common/items/weapons/staff/golden_khakkara.ron create mode 100644 assets/common/items/weapons/staff/laevateinn.ron create mode 100644 assets/common/items/weapons/staff/ruby_rod.ron create mode 100644 assets/common/items/weapons/staff/solar.ron create mode 100644 assets/voxygen/voxel/weapon/sceptre/amethyst.vox create mode 100644 assets/voxygen/voxel/weapon/sceptre/caduceus.vox create mode 100644 assets/voxygen/voxel/weapon/sceptre/coralline_cane.vox create mode 100644 assets/voxygen/voxel/weapon/sceptre/divine_gohei.vox create mode 100644 assets/voxygen/voxel/weapon/sceptre/druids_arbor.vox create mode 100644 assets/voxygen/voxel/weapon/sceptre/emerald.vox create mode 100644 assets/voxygen/voxel/weapon/staff/amethyst_axis.vox create mode 100644 assets/voxygen/voxel/weapon/staff/dragon_tongue.vox create mode 100644 assets/voxygen/voxel/weapon/staff/emerald.vox create mode 100644 assets/voxygen/voxel/weapon/staff/frostwood_torch.vox create mode 100644 assets/voxygen/voxel/weapon/staff/golden_khakkara.vox create mode 100644 assets/voxygen/voxel/weapon/staff/laevateinn.vox create mode 100644 assets/voxygen/voxel/weapon/staff/ruby_rod.vox create mode 100644 assets/voxygen/voxel/weapon/staff/solar.vox create mode 100644 server/src/migrations/2021-03-29-012510_fix_amethyst_staff/down.sql create mode 100644 server/src/migrations/2021-03-29-012510_fix_amethyst_staff/up.sql diff --git a/assets/common/items/weapons/sceptre/amethyst.ron b/assets/common/items/weapons/sceptre/amethyst.ron new file mode 100644 index 0000000000..c7777bc276 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/caduceus.ron b/assets/common/items/weapons/sceptre/caduceus.ron new file mode 100644 index 0000000000..09bf7152b7 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/coralline_cane.ron b/assets/common/items/weapons/sceptre/coralline_cane.ron new file mode 100644 index 0000000000..6dd881bd16 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/divine_gohei.ron b/assets/common/items/weapons/sceptre/divine_gohei.ron new file mode 100644 index 0000000000..27b61b67a0 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/druids_arbor.ron b/assets/common/items/weapons/sceptre/druids_arbor.ron new file mode 100644 index 0000000000..f3b5c62f07 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/emerald.ron b/assets/common/items/weapons/sceptre/emerald.ron new file mode 100644 index 0000000000..b7c572ba67 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/crimson_eye.ron similarity index 75% rename from assets/common/items/weapons/staff/amethyst_staff.ron rename to assets/common/items/weapons/staff/crimson_eye.ron index e42b6c997e..46a26b28dd 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/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, diff --git a/assets/common/items/weapons/staff/dragon_tongue.ron b/assets/common/items/weapons/staff/dragon_tongue.ron new file mode 100644 index 0000000000..bc5f5ea7d9 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/frostwood_torch.ron b/assets/common/items/weapons/staff/frostwood_torch.ron new file mode 100644 index 0000000000..dedd5926a7 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/golden_khakkara.ron b/assets/common/items/weapons/staff/golden_khakkara.ron new file mode 100644 index 0000000000..7b67add944 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/laevateinn.ron b/assets/common/items/weapons/staff/laevateinn.ron new file mode 100644 index 0000000000..29c302e35e --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/ruby_rod.ron b/assets/common/items/weapons/staff/ruby_rod.ron new file mode 100644 index 0000000000..9e0942dcbc --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/solar.ron b/assets/common/items/weapons/staff/solar.ron new file mode 100644 index 0000000000..9aea3b7f1f --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index 01abac9402..2a8142e807 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/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"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 9fed8ccc4c..7257b576e6 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/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"), diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron index 19fbcd8160..afa2715550 100644 --- a/assets/common/loot_tables/loot_table_weapon_common.ron +++ b/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 diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index 2d2413e15d..28484be0bc 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/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 diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index 3af9b46df3..ec870786e0 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/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"), diff --git a/assets/common/loot_tables/mindflayer.ron b/assets/common/loot_tables/mindflayer.ron index 8706a7efeb..d5fb91477d 100644 --- a/assets/common/loot_tables/mindflayer.ron +++ b/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"), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 82c111a8f8..4d7aad308b 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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", diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 8d02ae1358..44ee5b7a5e 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/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": ( diff --git a/assets/voxygen/voxel/weapon/sceptre/amethyst.vox b/assets/voxygen/voxel/weapon/sceptre/amethyst.vox new file mode 100644 index 0000000000..6465625ee1 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sceptre/amethyst.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d75810702ea65b1632410df202429aff7e4ff4873eadc9a67ae7f12041bc40d +size 2128 diff --git a/assets/voxygen/voxel/weapon/sceptre/caduceus.vox b/assets/voxygen/voxel/weapon/sceptre/caduceus.vox new file mode 100644 index 0000000000..43db682909 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sceptre/caduceus.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55ce0ad60e84414d896d0c2637fbbff41c598b8c1cf0067098a929471bb84699 +size 1640 diff --git a/assets/voxygen/voxel/weapon/sceptre/coralline_cane.vox b/assets/voxygen/voxel/weapon/sceptre/coralline_cane.vox new file mode 100644 index 0000000000..a50e6c8cb5 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sceptre/coralline_cane.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95189e884f78b9a9e63305095937113c6f19942a66a69dc246f8fc7232348f9c +size 1544 diff --git a/assets/voxygen/voxel/weapon/sceptre/divine_gohei.vox b/assets/voxygen/voxel/weapon/sceptre/divine_gohei.vox new file mode 100644 index 0000000000..e21be4ca48 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sceptre/divine_gohei.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39d48b6e8733ba452462188926e3d993bdc6cf7a953a0bc15f6e00e950241cef +size 1336 diff --git a/assets/voxygen/voxel/weapon/sceptre/druids_arbor.vox b/assets/voxygen/voxel/weapon/sceptre/druids_arbor.vox new file mode 100644 index 0000000000..79a1276e33 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sceptre/druids_arbor.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f5128a52abb906a22e6c65adf695f3a541f339a2cec576d84b48f37c5d53fad +size 1440 diff --git a/assets/voxygen/voxel/weapon/sceptre/emerald.vox b/assets/voxygen/voxel/weapon/sceptre/emerald.vox new file mode 100644 index 0000000000..4901862ae8 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sceptre/emerald.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b28bb7dbe3c6e574c665ec52c54d53853cac0180105bd320b2328feecb0416b +size 1660 diff --git a/assets/voxygen/voxel/weapon/staff/Bone_staff.vox b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox index 7a333c14a9..c13983360b 100644 --- a/assets/voxygen/voxel/weapon/staff/Bone_staff.vox +++ b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3c23d24347d41186fb7933e1004aec1e31f8222ba723a2ef1cf14e68f4740c6 +oid sha256:d3ef90371821c5270bef09ba1cff1e252bdbdffcff3b4a54f80b4d927b27b171 size 1368 diff --git a/assets/voxygen/voxel/weapon/staff/amethyst_axis.vox b/assets/voxygen/voxel/weapon/staff/amethyst_axis.vox new file mode 100644 index 0000000000..99bee701a9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/amethyst_axis.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bae38ee84c034a24abb9b2681644eef0fa5def0ef1d2d8ab6dbff0c231fded1 +size 1368 diff --git a/assets/voxygen/voxel/weapon/staff/dragon_tongue.vox b/assets/voxygen/voxel/weapon/staff/dragon_tongue.vox new file mode 100644 index 0000000000..d1154f2fd4 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/dragon_tongue.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69f79ac3f9fff9aa6212928a3d2013f9d3fa2baa2340e925b25031428667b7f4 +size 1828 diff --git a/assets/voxygen/voxel/weapon/staff/emerald.vox b/assets/voxygen/voxel/weapon/staff/emerald.vox new file mode 100644 index 0000000000..4901862ae8 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/emerald.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b28bb7dbe3c6e574c665ec52c54d53853cac0180105bd320b2328feecb0416b +size 1660 diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox b/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox index 79ebeed4ef..e082504e37 100644 --- a/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox +++ b/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b5a77d834b2f4817a2764198f4053af3c473f3b760b52eb7f842e58ab7e6651 -size 1380 +oid sha256:8540f86c8215d7ac27dd2ff5df1fe95d8c3276847a61ddf85b438f791db27716 +size 1352 diff --git a/assets/voxygen/voxel/weapon/staff/frostwood_torch.vox b/assets/voxygen/voxel/weapon/staff/frostwood_torch.vox new file mode 100644 index 0000000000..02443137b6 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/frostwood_torch.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39c5a99d51580fa4571f2e017cbdc5eaf3df859d0f703a374e14c8eb4486a51b +size 1624 diff --git a/assets/voxygen/voxel/weapon/staff/golden_khakkara.vox b/assets/voxygen/voxel/weapon/staff/golden_khakkara.vox new file mode 100644 index 0000000000..6de5f9d8c0 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/golden_khakkara.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecbef9c72759a3961411e1d298fd18fa2a14b8367a66061b6f484c41a328bbf7 +size 1408 diff --git a/assets/voxygen/voxel/weapon/staff/laevateinn.vox b/assets/voxygen/voxel/weapon/staff/laevateinn.vox new file mode 100644 index 0000000000..60aeddf63d --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/laevateinn.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b03c01d26ca3f84bf9f24b929539a5273278fc25a10a24d01638357a6ea9aefe +size 1672 diff --git a/assets/voxygen/voxel/weapon/staff/ruby_rod.vox b/assets/voxygen/voxel/weapon/staff/ruby_rod.vox new file mode 100644 index 0000000000..eb3162fa22 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/ruby_rod.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70f7a46c2d06f0478c5a1ce900f011d6f845cfa179cf81367377e26f922e1693 +size 1364 diff --git a/assets/voxygen/voxel/weapon/staff/solar.vox b/assets/voxygen/voxel/weapon/staff/solar.vox new file mode 100644 index 0000000000..48eb5d858c --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/solar.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90121ae29ba929ec8b3de09a5c15b251ce85c198a6476df59ad279c7fd84d76c +size 1404 diff --git a/server/src/migrations/2021-03-29-012510_fix_amethyst_staff/down.sql b/server/src/migrations/2021-03-29-012510_fix_amethyst_staff/down.sql new file mode 100644 index 0000000000..291a97c5ce --- /dev/null +++ b/server/src/migrations/2021-03-29-012510_fix_amethyst_staff/down.sql @@ -0,0 +1 @@ +-- This file should undo anything in `up.sql` \ No newline at end of file diff --git a/server/src/migrations/2021-03-29-012510_fix_amethyst_staff/up.sql b/server/src/migrations/2021-03-29-012510_fix_amethyst_staff/up.sql new file mode 100644 index 0000000000..67e1907a1b --- /dev/null +++ b/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'; \ No newline at end of file