From 4b95401f7c501d83f6a6eaa223d0c4549d02b25b 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 | Bin 0 -> 2128 bytes .../voxygen/voxel/weapon/sceptre/caduceus.vox | Bin 0 -> 1640 bytes .../voxel/weapon/sceptre/coralline_cane.vox | Bin 0 -> 1544 bytes .../voxel/weapon/sceptre/divine_gohei.vox | Bin 0 -> 1336 bytes .../voxel/weapon/sceptre/druids_arbor.vox | Bin 0 -> 1440 bytes .../voxygen/voxel/weapon/sceptre/emerald.vox | Bin 0 -> 1660 bytes .../voxygen/voxel/weapon/staff/Bone_staff.vox | Bin 1368 -> 1368 bytes .../voxel/weapon/staff/amethyst_axis.vox | Bin 0 -> 1368 bytes .../voxel/weapon/staff/dragon_tongue.vox | Bin 0 -> 1828 bytes assets/voxygen/voxel/weapon/staff/emerald.vox | Bin 0 -> 1660 bytes .../voxel/weapon/staff/firestaff_amethyst.vox | Bin 1380 -> 1352 bytes .../voxel/weapon/staff/frostwood_torch.vox | Bin 0 -> 1624 bytes .../voxel/weapon/staff/golden_khakkara.vox | Bin 0 -> 1408 bytes .../voxygen/voxel/weapon/staff/laevateinn.vox | Bin 0 -> 1672 bytes .../voxygen/voxel/weapon/staff/ruby_rod.vox | Bin 0 -> 1364 bytes assets/voxygen/voxel/weapon/staff/solar.vox | Bin 0 -> 1404 bytes .../down.sql | 1 + .../up.sql | 2 + 39 files changed, 365 insertions(+), 23 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 0000000000000000000000000000000000000000..5d4f612eb3f31d9258484bf10c29eb2f49e346a6 GIT binary patch literal 2128 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/Bone_staff.vox b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox index 8109bdc8ea5eab205c1843587b2ce5b56dfc39c0..1d3c6e164b8481c1cfd57b93d09af176c97e5339 100644 GIT binary patch delta 233 zcmWlS%Mrpb3`DiEoI{4m*UqmIPTV;#l)=$S2ebe!Bqh*H%3*!byr-2VpXFJ8Zmr5L zPIj;~)4tE^TdNhWdciX5187!gli(U=q-QTJXYGN4)Q(3w9_bFvG?w;BT+f|8X{NCd zl4#)jkdzdo8$Hv91c@6E*E<}=#}!3nI4~Ue*-*oiMeaw=M>?q!eWH^#^U%D(E%ask HJ#eu*6-`~HuVP695C$$w`Ay?;pPNP^pM~=duACk%-F!wGB6WAL?Dnc!P1WCHHx`L z5G}SudlvRA?hh@tC3gqxnjZj5G(^>q)P^Lq&~QBJCLUfA%*w}F7PXvdNBb^8h^@I_ Jr{5D7`v)bOBYyw@ 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 0000000000000000000000000000000000000000..e82f72754f3dc8e0c67ed27f9b1de0157fcad6eb GIT binary patch literal 1368 zcmb7DYe<`C7(HLUeCir6F^P%yW?oj4R-Ko6soKSAT4Sr7y16#(L`I9+tgOf;RYFHi zTVjhzrefD0)w&_VWUdQNHvHkFE2SV~WM%BnD5Z?Ses5#{&YoBpjIJGf;d~G0oacSs z?|Co1M~~TO0dzEbIwhc01A07OcXFJ_Py~sBOu@0^UXLX%$Y_m!)PzZ>20^MIS)fIr zCWfGrJLg(roeON~O+3Ev@jL7+yVXyTIb`K zz_(Vw(eGq#S2pv93RvWKvS!uAoM8(KCbQ{W+{uc2yJ$NJ7G0FuvtZ)}h}UHOu_R(9 zm55q6u`8WRFK6&UQx4hwB4+@u34Rd#ESNbDu1tfQOW^&_g}cB7H~3{Y_|pLB6@I=K zjGPjE1Z;7DeRbeSEBK-4UDeqfau;x{tAw+sE9rl|ma~H`+zh_KUlxbByU@zU%AGv? zN(oQ**3#Dw2Hphc-vu|qU`>8DJ;Pxo+r-usXKAI}Z^ul_wY^LGEePAiA1bN=qXs;Y_~)XuZK zVu1}4luQC+9!y8}6xcA%y_m9u> z@Z1J_ZpY|yx%dbqk_7yNY7Bh%)sz2wDEI5Xe0hS~@9bGIZa&M4>(BGH3qOB8{sI!~ BM*aW* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7419c370e8e2ab46e9ba2a216eaeaf0f3649b315 GIT binary patch literal 1828 zcmcJOZ)jCz9LImp^PF?;ol|$W`}dqXw>dR;r>Ju_=b!4@Tsm#DxmtQNkx+6DDMpBn zA?Qj{v4)LlpxL?ijuoP*%vD6JVJ3ozEQuh*B%-&yi0Iw7@11X=(05(<@cll&KhN`f z?m4G()0V0s5oul1(ngU`K%}E3(>%Sf;Lj%0NCnxlHPiC5rs3~%q8-WV0I^k8J1VCG z)S&XUr5V#XU8LzvUfYJ=&|5ieTY2q}pyg}Z&S}Ty+WA^LfvegHQj4h5sKwOj%+KJy zGgvc|O6(HGO7c2DwL)AIhXg`-ZA$anD$OgKN=!kW(wsJBIc1eGSC%tG+eC-6%7oby z&Y6N*Va6hiMHq`PMztcGJ2F#C)YmGSRXWO=Xx+dZL5T60Kss z(lPeMa)u}qBgqFrBWH)m1Bxa@bc+PLg@vlbD{ z<+(2Rad|H5h_YSo#~Pv><{ajzD!_PvaiW6sL3*N#+`K5yw}@zuvwB&JC__&SQI^NM z(OVw(_xOA~?(gN5R)>O=c}3c9PGZYhu|+&X{CB zRhRpQh$-jU1RzR9NrQc<;(JeE7{Io_zBto<4jI8$TLH$E8W6(`gLLI3x%N{)Cwn-2d|7 keE0c&74i@G$vi60uW;%+dz2QEkIEI|kIPMM{P=$P8&;v8rvLx| literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/emerald.vox b/assets/voxygen/voxel/weapon/staff/emerald.vox new file mode 100644 index 0000000000000000000000000000000000000000..5a480e438496388235f94a358199ceffe7e61928 GIT binary patch literal 1660 zcmbW0Z%kEX9LIm>d7g725e4o&_Z}dTKqh}&gcw{z?HZ7xfgwqX#$3Y*V@}89=Dl8M z$P&#_MhxwR5|#5slZ*k&wMERCYjduV>z#AXwYFZiYQ6jRJ=f|*o3=XJXW!rN`+J_> zbDr}&r)|gX{BaR!+T7SokuIM|Yh!!EQZM0?@+aBU-Fw;_!^(3-Mu^rXs&$}GYfb#b zCJqV4wD!HJb;?PtQ>jl-mr&EFOR4D`vy5|>Q!_{=<1A_@thF0f+6`*ux<D%i1EV3dWQbj9FBXz;R2QxL8iyvYePjUop3o6BFgc6+OlMD#JY!<0mR z3mo@(@cp%N`jmGr#_2OuLseev`NmFUhb&uJB^hT#g2>*VkNkl$luXn>8f-|<63Ap0dhYch zqe&1tBzW?yV9ixQYL6g&NZ@B4{6w&>DGl2WWuSe~kGJMlpgtjJ856uVC5U~?xh*-! z>n^~mL@BCfBFOCxpkO2irI%Ks;^u0E_6b%EviG=P!@NLV=KAqe$k;N-bO5JUXX5fR z4(@Es1-3nfF%is>@5v8j?3iHcJ;B0d!8e~Vj|e6k1fTB|+&w60XMU_raJG|vR8UtU z=m-m<^@8*CTh`^EyP*K_mST(_Sc}B2YK(W)Vd2y(`0-LV$_j(nuy!T3KUa(cZPn=6 zCK!5EFmY5c|Bj$4F9(gKtFW)?Y4q0D;Ppr?&Ub9V$d)3^bd;n0rOoKs-;BhOy*M*) z5b@59INY%w&0E)F@%ja%rKQ33XCgm89~C79s4C1vU73T14Hek&LJj(NeSj~cU*o6g z2e^B?4CS3`;A~%kTVDtsd?$!^7vua;C2m})!_W5zk$$usnIna0o~pn#eEh%n|KQ@m z|Fr+Zt+mPhx0MFby)O6f{a032;@#>Alvhlm_Vfv44`t)#hk`qM1;5tRproV(U4>D+ zxOEyb6o=F6VD8+*GaSg_-O0KLMbM2<{6YsRX}4FADBmd-#6$ cc)$Lw&c87EpFK*w;-hMw|F~MR@#E*qA4V@|)&Kwi literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox b/assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox index 06c59501b0affbe4004a65ee234bd9afb6a1c335..e7544c0e8d2b62398de30c46287c3a94d0e0ccb7 100644 GIT binary patch delta 338 zcmWlTIZgvX5Jl@(^$aiuJo{pVAag(n2Y}E*m<$cvfKxapLzcKecSMA+oFF+PAm$7l zgx|r_t3|c^Wj|T*a6g{EiOAi}VoAx>Yf-II1}9{Ed|EifvdA@ot38sIG+wQFhc&+v zopc^byY>?$AY8d}%`(G?RTj*Xg5NV5QJzs8a-GG1h^**)$ delta 366 zcmWlSJ5B>J5Qb+wwl^$~UGFPdAW}{cgcMQHP@xn&DipW_EfrGEfFjXR*)*x5jc8V) zr{)awTp_=UZ@-z(w)Q9eOWniWV)9NzH&^ppi0(*|6)l-( zonb!$7l-&9fPIjDv)=n+J%AI~!UkOf0SYi4liyzQM#=N^WA!g%c{%@FWqK^Hv(5HQ Gx4Z*oW=7cn 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 0000000000000000000000000000000000000000..351483b8456aae648c3d1910443598cf4e070806 GIT binary patch literal 1624 zcma)5TTE0}6y5inJHx;LGt3Ncixjp4(TT1rX%qQn|wVw#4SrXM!Mn5IdS{xogVztwdyY0{=@Z?dxXS!eBi z_P+Pr_C5QvCq$&Vrm=-2b#{@q#*X@UYr)4x#1QGk{sSG2KE;5~2%!ueRyM*=5oJ>m ztyR>}dQ52}Y%o?@g_YvkR3W7ZEm36}QKgKi)<#5`dQ8)ASg~duWirnUD{Y3f#iq$T z8#NnqZPdu7jXrzG&~~0~|B^JD6%1)>R_K?875?DKdbqSS7EsBiY`Unq>2uTPX0LAMGFC~{lBgxoM>YxNVXlXohnj~z#>&fg%)Ydj z8rfuTI*s%ABHHSoGij9+HVAE!31O~j<=Y5@P)?rZWKT}kAe&BV@jNS@XT`Ipc%H>r z#nKl`Uo3rOGnT$M`r_z|qc4s=#s+7wxx;&RZm$t@^?FEUWhH{aARdJT4Oj0V*Y_uW z^ZBr})C}wSr16XY#Qo&tRoxv(LHdzwWDjnDf2s;nZ-ey2L8d*BJ1KBC3sO%A){F`^ z-V```1PQ|eFV`tI1ZB-mG@WpxW5|p57hXVJP|!Lqcym_J|1EP{GmzDtgS=oN%I5>f z?DZk%as~>ouSN0Q0;C=i=xGuR9~MlV5-eU3 zlxJn2u`myZ$~U36t_mZYixA#khRZwiG2dB)j@N3?bEE~qlLv8e@HhtE?!f4|9?Z|2 z$MWr~a5|kx^ClrXI~&FR9F%Wbhs`B^)K?c{&yFgLj;z7#wH$nZuMiKjnsL7{5f9%H z{POi-JYKnl8!dY=*{~a-+8sEzHGuw#D!f%(iX$6eLfg86=g!}G*quNd;Z2$@9O;Rg(>JR%lv!(($Z3lRZO9%cp6(SoJIO@I_`cXcyLhgdsP+u zem}Z$`>?xV4l+D|OcHjr;% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7dd44710a841c6cb451f578bac1dd23962c9aa0 GIT binary patch literal 1408 zcmbW0ZD>Nak8#dyBezdpruMF+t6uA%VZzAB1Hrd>0}H>5s|U4`>>6D`|r7t?ZZF^9{BM; z&;Pm4bI&>V+}_=Ly^}=L)fV2xLLaI`J>f`btr76xkP4X+X79d8xK-i_5948>NNHJ? z(n6-BWT-Ia(x8wSlqhg;T$~b$GcAZcVvpF9ohc#MlQ<`{FS{6fQV2&%sM@f^ z$f~9*s!b==Hmpdj602%qtn675q*@b-#IeM&#Ia;eNRl}rOJ=TTRn5b~z=$R8CuzE1 z6$-yYc5e`ho7c_A9$uF-DGC^Q?ckp6+uBIUA0xH2v_RK&JenZvxVVf8?JxYUX;@n7 zf-$a!=P~c}i0dp6j_z0n7obbwZ zLQ#ycE<>~${TNhz6 znc%cp;PrY@=PO6krkAm~-iJ_Y9d^GN!1$>W-2AE%Ki%hn@82eJgjr%UFqU^c%|M*h>bM3#^??ANC^Y8u}8XE9<^Au|9 zrmk literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/laevateinn.vox b/assets/voxygen/voxel/weapon/staff/laevateinn.vox new file mode 100644 index 0000000000000000000000000000000000000000..9351408448d20fcc1f1e3b9725c686bbc70f6aee GIT binary patch literal 1672 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 literal 0 HcmV?d00001 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