Merge branch 'seachapel_rework' into 'master'

seachapel_rework

See merge request veloren/veloren!3856

assets/common/abilities/ability_set_manifest.ron

@@ -248,6 +248,13 @@
             Simple(None, "common.abilities.custom.woodgolem.shockwave")
         ],
     ),
+    Custom("Coral Golem"): (
+        primary: Simple(None, "common.abilities.custom.coralgolem.strike"),
+        secondary: Simple(None, "common.abilities.custom.coralgolem.spin"),
+        abilities: [
+            Simple(None, "common.abilities.custom.coralgolem.shockwave")
+        ],
+    ),
     Custom("Simple Flying Melee"): (
         primary: Simple(None, "common.abilities.custom.simpleflyingmelee.singlestrike"),
         secondary: Simple(None, "common.abilities.custom.simpleflyingmelee.singlestrike"),
@@ -471,6 +478,13 @@
             Simple(None, "common.abilities.custom.arthropods.weevil.threadshot"),
         ],
     ),
+    Custom("Dagonite"): (
+        primary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"),
+        secondary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"),
+        abilities: [
+            Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"),
+        ],
+    ),
     /// TODO: Organize the rest into further catagories and give purple tier droppers+ custom skillsets
     Custom("Turret"): (
         primary: Simple(None, "common.abilities.custom.turret.arrows"),
@@ -560,7 +574,7 @@
     secondary: Simple(None, "common.abilities.custom.dagon.seaurchins"),
         abilities: [
             Simple(None, "common.abilities.custom.dagon.steamwave"),
-            Simple(None, "common.abilities.custom.cardinal.steambeam"),
+            Simple(None, "common.abilities.custom.dagon.steambeam"),
             Simple(None, "common.abilities.custom.dagon.steamheal"),
         ],
     ),
@@ -569,9 +583,14 @@
         secondary: Simple(None, "common.abilities.sceptre.healingaura"),
         abilities: [
             Simple(None, "common.abilities.custom.cardinal.steambeam"),
-            Simple(None, "common.abilities.custom.cardinal.summonseacrocs"),
+            Simple(None, "common.abilities.custom.cardinal.summondagonites"),
         ],
     ),
+    Custom("Sea Bishop"): (
+        primary: Simple(None, "common.abilities.custom.sea_bishop.longbeam"),
+        secondary: Simple(None, "common.abilities.custom.sea_bishop.longbeam"),
+        abilities: [],
+    ),
     Custom("Oni"): (
         primary: Simple(None, "common.abilities.custom.oni.dash"),
         secondary: Simple(None, "common.abilities.custom.oni.doublestrike"),

assets/common/abilities/custom/arthropods/dagonite/leapshockwave.ron

@@ -0,0 +1,26 @@
+LeapShockwave(
+    energy_cost: 0,
+    buildup_duration: 1.4,
+    movement_duration: 0.8,
+    swing_duration: 0.15,
+    recover_duration: 0.9,
+    damage: 15.0,
+    poise_damage: 10,
+    knockback: (strength: 3.0, direction: Up),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 15.0,
+    shockwave_speed: 20.0,
+    shockwave_duration: 0.8,
+    requires_ground: true,
+    move_efficiency: 0.2,
+    damage_kind: Crushing,
+    specifier: Steam,
+    damage_effect: Some(Buff((
+        kind: Cursed,
+        dur_secs: 1.0,
+        strength: DamageFraction(0.1),
+        chance: 1.0,
+    ))),
+    forward_leap_strength: 40.0,
+    vertical_leap_strength: 7.5,
+)

assets/common/abilities/custom/cardinal/summondagonites.ron

@@ -2,17 +2,17 @@ BasicSummon(
     buildup_duration: 0.2,
     cast_duration: 0.3,
     recover_duration: 0.3,
-    summon_amount: 4,
+    summon_amount: 1,
     summon_distance: (4, 4),
     summon_info: (
-        body: QuadrupedLow((
-            species: SeaCrocodile,
+        body: Arthropod((
+            species: Dagonite,
             body_type: Male,
         )),
         scale: None,
         has_health: true,
         loadout_config: None,
-        skillset_config: Some(Rank5),
+        skillset_config: Some(Rank3),
     ),
     duration: None,
 )

assets/common/abilities/custom/coralgolem/shockwave.ron

@@ -0,0 +1,18 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 3.0,
+    swing_duration: 0.12,
+    recover_duration: 2.4,
+    damage: 60.0,
+    poise_damage: 30,
+    knockback: (strength: 20.0, direction: TowardsUp),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 90.0,
+    shockwave_speed: 25.0,
+    shockwave_duration: 2.0,
+    requires_ground: true,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Water,
+    ori_rate: 1.0,
+)

assets/common/abilities/custom/coralgolem/spin.ron

@@ -0,0 +1,21 @@
+SpinMelee(
+    buildup_duration: 0.9,
+    swing_duration: 0.3,
+    recover_duration: 0.6,
+    melee_constructor: (
+        kind: Bash(
+            damage: 45.0,
+            poise: 30.0,
+            knockback: 20.0,
+            energy_regen: 0.0,
+        ),
+        range: 7.5,
+        angle: 360.0,
+    ),
+    energy_cost: 0,
+    is_infinite: false,
+    movement_behavior: Stationary,
+    forward_speed: 0.0,
+    num_spins: 1,
+    specifier: None,
+)

assets/common/abilities/custom/coralgolem/strike.ron

@@ -0,0 +1,17 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 1.6,
+    swing_duration: 0.1,
+    recover_duration: 1.0,
+    melee_constructor: (
+        kind: Bash(
+            damage: 30.0,
+            poise: 25.0,
+            knockback: 15.0,
+            energy_regen: 0.0,
+        ),
+        range: 4.0,
+        angle: 45.0,
+    ),
+    ori_modifier: 0.4,
+)

assets/common/abilities/custom/dagon/steambeam.ron

@@ -0,0 +1,19 @@
+BasicBeam(
+    buildup_duration: 0.3,
+    recover_duration: 1.0,
+    beam_duration: 1.0,
+    damage: 22.5,
+    tick_rate: 5.0,
+    range: 12.0,
+    max_angle: 15.0,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 3.0,
+        strength: Value(0.5),
+        chance: 1.0,
+    ))),
+    energy_regen: 2,
+    energy_drain: 0,
+    ori_rate: 0.5,
+    specifier: Steam,
+)

assets/common/abilities/custom/sea_bishop/longbeam.ron

@@ -0,0 +1,19 @@
+BasicBeam(
+    buildup_duration: 0.3,
+    recover_duration: 1.0,
+    beam_duration: 1.0,
+    damage: 6.5,
+    tick_rate: 3.0,
+    range: 30.0,
+    max_angle: 15.0,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 3.0,
+        strength: Value(0.2),
+        chance: 0.1,
+    ))),
+    energy_regen: 2,
+    energy_drain: 0,
+    ori_rate: 0.5,
+    specifier: Bubbles,
+)

assets/common/entity/dungeon/sea_chapel/coralgolem.ron

@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Coral Golem"),
+    body: RandomWith("coralgolem"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.sea_chapel.coralgolem"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)

assets/common/entity/dungeon/sea_chapel/dagonite.ron

@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Dagonite"),
+    body: RandomWith("dagonite"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.sea_chapel.sea_cleric"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)

assets/common/entity/dungeon/sea_chapel/organ.ron

@@ -3,7 +3,7 @@
     name: Name("Organ"),
     body: Exact(Object(BarrelOrgan)),
     alignment: Alignment(Enemy),
-    loot: Item("common.items.crafting_ing.seashells"),
+    loot: Item("common.items.keys.glass_key"),
     inventory: (
         loadout: FromBody
     ),

assets/common/entity/dungeon/sea_chapel/sea_bishop.ron

@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Automatic,
+    body: RandomWith("sea_bishop"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.sea_chapel.sea_bishop"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)

assets/common/entity/dungeon/sea_chapel/sea_cleric_sceptre.ron

@@ -1,18 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Sea Cleric"),
-    body: RandomWith("danari"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.sea_chapel.sea_cleric"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.sea_chapel.sea_cleric"),
-            active_hands: InHands((Choice([
-                (1, ModularWeapon(tool: Sceptre, material: Ironwood, hands: None)),
-            ]), None)),
-        )),
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank4.fullskill"),
-    ],
-)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Cloak",
+    description: "It's not weak.",
+    kind: Armor((
+        kind: Back,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Belt",
+    description: "Ties it together.",
+    kind: Armor((
+        kind: Belt,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Chestplate",
+    description: "Hard to pierce.",
+    kind: Armor((
+        kind: Chest,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/armor/brinestone/crown.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Brinestone Crown",
+    description: "Makes you look taller.",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(8.0)),
+            poise_resilence: Some(Normal(4.0)),
+            energy_reward: Some(0.15),
+            crit_power: Some(0.05),
+        )),    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Boots",
+    description: "Not very comfortable.",
+    kind: Armor((
+        kind: Foot,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Guantlets",
+    description: "Hits like a rock.",
+    kind: Armor((
+        kind: Hand,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Pants",
+    description: "Do not tumble.",
+    kind: Armor((
+        kind: Pants,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

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

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Brinestone Pads",
+    description: "Almost too heavy.",
+    kind: Armor((
+        kind: Shoulder,
+        stats: FromSet("Brinestone"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/armor/cardinal/mitre.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    name: "Cardinal Mitre",
+    description: "Induces respect.",
+    kind: Armor((
+        kind: Head,
+        stats: FromSet("Cardinal"),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/crafting_ing/brinestone.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Brinestone",
+    description: "Used for armor crafting.",
+    kind: Ingredient(
+        // Descriptor not needed
+        descriptor: "",    ),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/keys/glass_key.ron

@@ -0,0 +1,11 @@
+ItemDef(
+    name: "Glass Key",
+    description: "Used to open Glass Barriers. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    amount: 1,
+    quality: Common,
+    tags: [Utility],
+)
+

assets/common/items/npc_armor/quadruped_low/dagon.ron

@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Chest,
         stats: Direct((
-            protection: Some(Normal(150.0)),
+            protection: Some(Normal(100.0)),
             poise_resilience: Some(Normal(5.0)),
         )),
     )),

assets/common/items/npc_weapons/unique/arthropods/dagonite.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Dagonite",
+    description: "testing123",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.01,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 0.1,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: High,
+    tags: [],
+    ability_spec: Some(Custom("Dagonite")),
+)

assets/common/items/npc_weapons/unique/coral_golem_fist.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Coral Golem Fists",
+    description: "Yeet",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.001,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 0.1,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Coral Golem")),
+)

assets/common/items/npc_weapons/unique/sea_bishop_sceptre.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Sea Bishop Sceptre",
+    description: "Hits like a wave.",
+    kind: Tool((
+        kind: Sceptre,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.4,
+            power: 1.2,
+            effect_power: 0.8,
+            speed: 1.2,
+            crit_chance: 0.4,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Sea Bishop")),
+)

assets/common/loadout/dungeon/sea_chapel/cardinal.ron

@@ -10,5 +10,6 @@
     feet: Item("common.items.armor.cardinal.foot"),
     lantern: Item("common.items.lantern.blue_0"),
     neck: Item("common.items.armor.misc.neck.abyssal_gorget"),
+    head: Item("common.items.armor.cardinal.mitre"),
 
 )

assets/common/loot_tables/dungeon/sea_chapel/cardinal.ron

@@ -1,6 +1,5 @@
 [    
     (0.5, Item("common.items.crafting_ing.abyssal_heart")),
     (2.0, Item("common.items.crafting_ing.coral_branch")),
-    (2.5, MultiDrop(Item("common.items.utility.coins"), 50, 100)),
     (0.2, Item("common.items.tool.instruments.glass_flute")),
 ]

assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron

@@ -1,6 +1,5 @@
 [
     // Ingredients
-    (0.5, Item("common.items.crafting_ing.coral_branch")),
-    (0.3, Item("common.items.crafting_ing.pearl")),
-    (5.0, Item("common.items.crafting_ing.seashells")),
+    (2.0, Item("common.items.crafting_ing.coral_branch")),
+    (0.5, Item("common.items.crafting_ing.pearl")),
 ]

assets/common/loot_tables/dungeon/sea_chapel/coralgolem.ron

@@ -0,0 +1,5 @@
+[
+    // Crafting ingredients
+    (1.0, Item("common.items.crafting_ing.coral_branch")),
+    (1.0, MultiDrop(Item("common.items.crafting_ing.brinestone"), 1, 3)),
+]

assets/common/loot_tables/dungeon/sea_chapel/dagon.ron

@@ -1,6 +1,4 @@
 [    
-    (0.5, Item("common.items.crafting_ing.abyssal_heart")),
-    (0.5, Item("common.items.crafting_ing.pearl")),
-    (5.0, LootTable("common.loot_tables.creature.quad_low.fanged")),
-    (5.0, Item("common.items.food.meat.tough_raw")),
+    (1.0, Item("common.items.crafting_ing.abyssal_heart")),
+    (1.0, MultiDrop(Item("common.items.crafting_ing.pearl"), 3, 5)),
 ]

assets/common/loot_tables/dungeon/sea_chapel/sea_bishop.ron

@@ -0,0 +1,4 @@
+[    
+    (1.0, MultiDrop(Item("common.items.crafting_ing.brinestone"), 3, 6)),
+    (1.0, MultiDrop(Item("common.items.crafting_ing.pearl"), 1, 2)),
+]

assets/common/material_stats_manifest.ron

@@ -323,6 +323,12 @@
             energy_reward: Some(-0.35),
             crit_power: Some(0.35),
             stealth: Some(0.5),
+        ),
+        "Brinestone": (
+            protection: Some(Normal(120.0)),
+            poise_resilence: Some(Normal(28.0)),
+            energy_reward: Some(0.35),
+            crit_power: Some(0.25),
         )
     },
 )

assets/common/npc_names.ron

@@ -969,6 +969,10 @@
             adlet_elder: (
                 keyword: "adlet_elder",
                 generic: "Adlet Elder"
+            ),
+            sea_bishop: (
+                keyword: "sea_bishop",
+                generic: "Sea Bishop"
             )
         )
     ),
@@ -995,6 +999,10 @@
             claygolem: (
                 keyword: "claygolem",
                 generic: "ClayGolem"
+            ),
+            coralgolem: (
+                keyword: "coralgolem",
+                generic: "CoralGolem"
             )
         )
     ),
@@ -1367,6 +1375,10 @@
                 keyword: "crawler_sand",
                 generic: "Sand Crawler"
             ),
+            dagonite: (
+                keyword: "dagonite",
+                generic: "Dagonite"
+            ),
         )
     ),
 )

assets/common/recipe_book.ron

@@ -1638,7 +1638,76 @@
         ],
         craft_sprite: Some(Anvil),
     ),
-
+    //ARMOR/BRINESTONE
+    "brinestone_back": (
+        output: ("common.items.armor.brinestone.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 1, false),
+            (Item("common.items.crafting_ing.brinestone"), 2, false),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 3, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_belt": (
+        output: ("common.items.armor.brinestone.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 1, false),
+            (Item("common.items.crafting_ing.brinestone"), 2, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_chest": (
+        output: ("common.items.armor.brinestone.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 2, false),
+            (Item("common.items.crafting_ing.brinestone"), 4, false),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_feet": (
+        output: ("common.items.armor.brinestone.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 1, false),
+            (Item("common.items.crafting_ing.brinestone"), 2, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_hands": (
+        output: ("common.items.armor.brinestone.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.pearl"), 1, false),
+            (Item("common.items.crafting_ing.brinestone"), 2, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_pants": (
+        output: ("common.items.armor.brinestone.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 2, false),
+            (Item("common.items.crafting_ing.brinestone"), 4, false),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 3, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_shoulder": (
+        output: ("common.items.armor.brinestone.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 2, false),
+            (Item("common.items.crafting_ing.brinestone"), 4, false),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 4, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "brinestone_crown": (
+        output: ("common.items.armor.brinestone.crown", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 1, false),
+            (Item("common.items.crafting_ing.pearl"), 2, false),
+            (Item("common.items.crafting_ing.brinestone"), 4, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
     "seashell_necklace": (
         output: ("common.items.armor.misc.neck.shell", 1),
         inputs: [

assets/server/manifests/kits.ron

@@ -388,6 +388,16 @@
         (Item("common.items.armor.boreal.back"),1),
         (Item("common.items.armor.misc.head.boreal_warhelm"),1),
     ],
+    "brinestone": [
+        (Item("common.items.armor.brinestone.chest"),1),
+        (Item("common.items.armor.brinestone.pants"),1),
+        (Item("common.items.armor.brinestone.hand"),1),
+        (Item("common.items.armor.brinestone.foot"),1),
+        (Item("common.items.armor.brinestone.shoulder"),1),
+        (Item("common.items.armor.brinestone.belt"),1),
+        (Item("common.items.armor.brinestone.back"),1),
+        (Item("common.items.armor.brinestone.crown"),1),
+    ],
     "instruments": [
         (Item("common.items.tool.instruments.double_bass"),1),
         (Item("common.items.tool.instruments.flute"),1),

assets/voxygen/audio/sfx.ron

@@ -1471,6 +1471,13 @@
             threshold: 0.9,
             subtitle: "subtitle-attack-ice_crack",
         ),
+        Steam: (
+            files: [
+                    "voxygen.audio.sfx.abilities.steam",
+                ],
+            threshold: 0.9,
+            subtitle: "subtitle-attack-steam",
+        ),
 
         // Utterances (NPCs)
 

assets/voxygen/i18n/en/hud/subtitles.ftl

@@ -106,6 +106,7 @@ subtitle-giga_roar = Frost gigas roar
 subtitle-attack-flash_freeze = Flash freeze
 subtitle-attack-icy_spikes = Icy spikes
 subtitle-attack-ice_crack = Ice crack
+subtitle-attack-steam = Steam
 
 subtitle-consume_potion = Drinking potion
 subtitle-consume_apple = Eating apple

assets/voxygen/i18n/en/npc.ftl

@@ -218,11 +218,10 @@ npc-speech-cultist_low_health_fleeing =
     .a4 = I must rest!
     .a5 = They're too strong!
 npc-speech-prisoner =
-    .a0 = Them scoundrels took away my pickaxe!
+    .a0 = Please find the key!
     .a1 = Being trapped is no fun.
     .a2 = That Cardinal can't be trusted.
     .a3 = These Clerics are up to no good.
-    .a4 = I wish i still had my pick!
 npc-speech-moving_on =
     .a0 = I've spent enough time here, onward to { $site }!
 npc-speech-migrating =

assets/voxygen/i18n/sv_SE/hud/subtitles.ftl

@@ -105,6 +105,7 @@ subtitle-giga_roar = Frost gigas vrål
 subtitle-attack-flash_freeze = Blixtfrysning
 subtitle-attack-icy_spikes = Istappar
 subtitle-attack-ice_crack = Isspricka
+subtitle-attack-steam = Ånga
 
 subtitle-consume_potion = Dricker förtrollningsdryck
 subtitle-consume_apple = Äter äpple

assets/voxygen/item_image_manifest.ron

@@ -1987,6 +1987,39 @@
         "voxel.armor.boreal.back",
         (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
     ),
+    //Brinestone Armor
+    Simple("common.items.armor.brinestone.chest"): VoxTrans(
+        "voxel.armor.brinestone.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Simple("common.items.armor.brinestone.pants"): VoxTrans(
+        "voxel.armor.brinestone.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Simple("common.items.armor.brinestone.belt"): VoxTrans(
+        "voxel.armor.brinestone.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Simple("common.items.armor.brinestone.foot"): VoxTrans(
+        "voxel.armor.brinestone.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Simple("common.items.armor.brinestone.hand"): VoxTrans(
+        "voxel.armor.brinestone.hand",
+        (0.0, 0.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Simple("common.items.armor.brinestone.shoulder"): VoxTrans(
+        "voxel.armor.brinestone.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Simple("common.items.armor.brinestone.back"): VoxTrans(
+        "voxel.armor.brinestone.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Simple("common.items.armor.brinestone.crown"): VoxTrans(
+        "voxel.armor.brinestone.crown",
+        (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3,
+    ),
     //Blue Leather Armor
     Simple("common.items.npc_armor.chest.leather_blue"): VoxTrans(
         "voxel.armor.leather_blue.chest",
@@ -2128,6 +2161,10 @@
         "voxel.armor.cardinal.shoulder",
         (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
     ),
+    Simple("common.items.armor.cardinal.mitre"): VoxTrans(
+        "voxel.armor.cardinal.mitre",
+        (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3,
+    ),
     //Twig Set
     Simple("common.items.armor.twigs.chest"): VoxTrans(
         "voxel.armor.twigs.chest",
@@ -3653,6 +3690,10 @@
         "voxel.sprite.crafting_ing.abyssal_heart",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
     ),
+    Simple("common.items.crafting_ing.brinestone"): VoxTrans(
+        "voxel.sprite.crafting_ing.brinestone",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
     Simple("common.items.crafting_ing.pearl"): VoxTrans(
         "voxel.sprite.crafting_ing.pearl",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
@@ -4861,6 +4902,10 @@
         "voxel.object.key_bone",
         (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
     ),
+    Simple("common.items.keys.glass_key"): VoxTrans(
+        "voxel.object.key_glass",
+        (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
+    ),
     // Lockpicks
     Simple("common.items.utility.lockpick_0"): VoxTrans(
         "voxel.object.lockpick",

assets/voxygen/voxel/arthropod_central_manifest.ron

@@ -219,4 +219,24 @@
             central: ("npc.crawler_sand.male.chest"),
         ),
     ),
+    (Dagonite, Male): (
+        head: (
+            offset: (-5.5, 0.0, -5.0),
+            central: ("npc.dagonite.male.head"),
+        ),
+        chest: (
+            offset: (-4.5, -4.0, -5.5),
+            central: ("npc.dagonite.male.chest"),
+        ),
+    ),
+    (Dagonite, Female): (
+        head: (
+            offset: (-5.5, 0.0, -5.0),
+            central: ("npc.dagonite.male.head"),
+        ),
+        chest: (
+            offset: (-4.5, -4.0, -5.5),
+            central: ("npc.dagonite.male.chest"),
+        ),
+    ),
 })

assets/voxygen/voxel/arthropod_lateral_manifest.ron

@@ -1275,4 +1275,120 @@
             lateral: ("armor.empty"),
         ),
     ),
+    (Dagonite, Male): (
+        mandible_l: (
+            offset: (0.0, 0.0, -3.0),
+            lateral: ("armor.empty"),
+        ),
+        mandible_r: (
+            offset: (-2.0, 0.0, -3.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_fl: (
+            offset: (-6.0, -4.5, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_fr: (
+            offset: (0.0, -4.5, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_bl: (
+            offset: (-11.0, -1.0, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_br: (
+            offset: (-11.0, -1.0, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        leg_fl: (
+            offset: (-6.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fr"),
+        ),
+        leg_fr: (
+            offset: (-0.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fr"),
+        ),
+        leg_fcl: (
+            offset: (-6.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fcr"),
+        ),
+        leg_fcr: (
+            offset: (-0.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fcr"),
+        ),
+        leg_bcl: (
+            offset: (-6.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_bcr"),
+        ),
+        leg_bcr: (
+            offset: (-0.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_bcr"),
+        ),
+        leg_bl: (
+            offset: (-11.0, -0.5, -4.5),
+            lateral: ("armor.empty"),
+        ),
+        leg_br: (
+            offset: (0.0, -0.5, -4.5),
+            lateral: ("armor.empty"),
+        ),
+    ),
+    (Dagonite, Female): (
+        mandible_l: (
+            offset: (0.0, 0.0, -3.0),
+            lateral: ("armor.empty"),
+        ),
+        mandible_r: (
+            offset: (-2.0, 0.0, -3.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_fl: (
+            offset: (-6.0, -4.5, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_fr: (
+            offset: (0.0, -4.5, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_bl: (
+            offset: (-11.0, -1.0, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        wing_br: (
+            offset: (-11.0, -1.0, -8.0),
+            lateral: ("armor.empty"),
+        ),
+        leg_fl: (
+            offset: (-6.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fr"),
+        ),
+        leg_fr: (
+            offset: (-0.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fr"),
+        ),
+        leg_fcl: (
+            offset: (-6.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fcr"),
+        ),
+        leg_fcr: (
+            offset: (-0.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_fcr"),
+        ),
+        leg_bcl: (
+            offset: (-6.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_bcr"),
+        ),
+        leg_bcr: (
+            offset: (-0.0, -0.5, -5.0),
+            lateral: ("npc.dagonite.male.leg_bcr"),
+        ),
+        leg_bl: (
+            offset: (-11.0, -0.5, -4.5),
+            lateral: ("armor.empty"),
+        ),
+        leg_br: (
+            offset: (0.0, -0.5, -4.5),
+            lateral: ("armor.empty"),
+        ),
+    ),
 })

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -1248,4 +1248,56 @@
             central: ("armor.empty"),
         )
     ),
+    (SeaBishop, Male): (
+        head: (
+            offset: (-7.0, -4.5, -8.5),
+            central: ("npc.sea_bishop.male.head"),
+        ),
+        torso_upper: (
+            offset: (-4.0, -5.0, -5.0),
+            central: ("npc.sea_bishop.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -4.5, -11.0),
+            central: ("npc.sea_bishop.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-4.0, -27.0, -6.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (SeaBishop, Female): (
+        head: (
+            offset: (-7.0, -4.5, -8.5),
+            central: ("npc.sea_bishop.male.head"),
+        ),
+        torso_upper: (
+            offset: (-4.0, -5.0, -5.0),
+            central: ("npc.sea_bishop.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -4.5, -11.0),
+            central: ("npc.sea_bishop.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-4.0, -27.0, -6.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -1631,4 +1631,72 @@
             lateral: ("npc.adlet.elder.male.foot_r"),
         ),
     ),
+    (SeaBishop, Male): (
+        shoulder_l: (
+            offset: (-3.5, -2.0, -4.0),
+            lateral: ("npc.sea_bishop.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -2.0, -4.0),
+            lateral: ("npc.sea_bishop.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.0, -2.0, -9.0),
+            lateral: ("npc.sea_bishop.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -2.0, -9.0),
+            lateral: ("npc.sea_bishop.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.5, 0.0),
+            lateral: ("npc.sea_bishop.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.5, 0.0),
+            lateral: ("npc.sea_bishop.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("armor.empty"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("armor.empty"),
+        ),
+    ),
+    (SeaBishop, Female): (
+        shoulder_l: (
+            offset: (-3.5, -2.0, -4.0),
+            lateral: ("npc.sea_bishop.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -2.0, -4.0),
+            lateral: ("npc.sea_bishop.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.0, -2.0, -9.0),
+            lateral: ("npc.sea_bishop.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -2.0, -9.0),
+            lateral: ("npc.sea_bishop.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.5, 0.0),
+            lateral: ("npc.sea_bishop.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.5, 0.0),
+            lateral: ("npc.sea_bishop.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("armor.empty"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("armor.empty"),
+        ),
+    ),
 })

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1775,4 +1775,8 @@
         vox_spec: ("weapon.biped_small.hammer.boreal_hammer", (-2.5, -6.0, -4.0)),
         color: None
     ),
+    Tool("common.items.npc_weapons.unique.sea_bishop_sceptre"): (
+        vox_spec: ("weapon.sceptre.scepter_sea_bishop", (-3.5, -4.0, 3.0)),
+        color: None
+    ),
 })

assets/voxygen/voxel/golem_central_manifest.ron

@@ -143,4 +143,40 @@
             central: ("npc.woodgolem.male.chest_lower"),
         ),
     ),
+    (CoralGolem, Male): (
+        head: (
+            offset: (-8.5, -2.5, -7.0),
+            central: ("npc.coralgolem.male.head"),
+        ),
+        jaw: (
+            offset: (-9.5, 0.0, -3.0),
+            central: ("armor.empty"),
+        ),
+        torso_upper: (
+            offset: (-11.5, -16.0, -11.5),
+            central: ("npc.coralgolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.5, -4.0, -8.0),
+            central: ("npc.coralgolem.male.chest_lower"),
+        ),
+    ),
+    (CoralGolem, Female): (
+        head: (
+            offset: (-8.5, -2.5, -7.0),
+            central: ("npc.coralgolem.male.head"),
+        ),
+        jaw: (
+            offset: (-9.5, 0.0, -3.0),
+            central: ("armor.empty"),
+        ),
+        torso_upper: (
+            offset: (-11.5, -16.0, -11.5),
+            central: ("npc.coralgolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.5, -4.0, -8.0),
+            central: ("npc.coralgolem.male.chest_lower"),
+        ),
+    ),
 })

assets/voxygen/voxel/golem_lateral_manifest.ron

@@ -271,4 +271,72 @@
             lateral: ("npc.woodgolem.male.foot_r"),
         )
     ),
+    (CoralGolem, Male): (
+        shoulder_l: (
+            offset: (-7.5, -6.5, -6.5),
+            lateral: ("npc.coralgolem.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-7.5, -6.5, -6.5),
+            lateral: ("npc.coralgolem.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-7.0, -6.0, -15.0),
+            lateral: ("npc.coralgolem.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-7.0, -6.0, -15.0),
+            lateral: ("npc.coralgolem.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-5.0, -3.5, -4.0),
+            lateral: ("npc.coralgolem.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -3.5, -4.0),
+            lateral: ("npc.coralgolem.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -4.5, -9.0),
+            lateral: ("npc.coralgolem.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -4.5, -9.0),
+            lateral: ("npc.coralgolem.male.foot_r"),
+        )
+    ),
+    (CoralGolem, Female): (
+        shoulder_l: (
+            offset: (-7.5, -6.5, -6.5),
+            lateral: ("npc.coralgolem.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-7.5, -6.5, -6.5),
+            lateral: ("npc.coralgolem.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-7.0, -6.0, -15.0),
+            lateral: ("npc.coralgolem.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-7.0, -6.0, -15.0),
+            lateral: ("npc.coralgolem.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-5.0, -3.5, -4.0),
+            lateral: ("npc.coralgolem.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -3.5, -4.0),
+            lateral: ("npc.coralgolem.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -4.5, -9.0),
+            lateral: ("npc.coralgolem.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -4.5, -9.0),
+            lateral: ("npc.coralgolem.male.foot_r"),
+        )
+    ),
 })

assets/voxygen/voxel/humanoid_armor_back_manifest.ron

@@ -32,6 +32,10 @@
             vox_spec: ("armor.boreal.back", (-5.0, -2.0, -14.0)),
             color: None
         ),
+        "common.items.armor.brinestone.back": (
+            vox_spec: ("armor.brinestone.back", (-5.0, -2.0, -14.0)),
+            color: None
+        ),
         "common.items.armor.misc.back.backpack": (
             vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_belt_manifest.ron

@@ -32,6 +32,10 @@
             vox_spec: ("armor.boreal.belt", (-4.0, -3.0, 2.0)),
             color: None
         ),
+        "common.items.armor.brinestone.belt": (
+            vox_spec: ("armor.brinestone.belt", (-4.0, -3.0, 2.0)),
+            color: None
+        ),
         "common.items.armor.cloth_purple.belt": (
             vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_chest_manifest.ron

@@ -36,6 +36,10 @@
             vox_spec: ("armor.boreal.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
+        "common.items.armor.brinestone.chest": (
+            vox_spec: ("armor.brinestone.chest", (-7.0, -3.5, 0.0)),
+            color: None
+        ),
         "common.items.armor.assassin.chest": (
             vox_spec: ("armor.assassin.chest", (-7.0, -3.5, 2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_foot_manifest.ron

@@ -28,6 +28,10 @@
             vox_spec: ("armor.boreal.foot", (-2.5, -3.5, -2.0)),
             color: None
         ),
+        "common.items.armor.brinestone.foot": (
+            vox_spec: ("armor.brinestone.foot", (-2.5, -3.5, -2.0)),
+            color: None
+        ),
         "common.items.armor.cloth_blue.foot": (
             vox_spec: ("armor.cloth_blue.foot", (-2.5, -3.5, -2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_hand_manifest.ron

@@ -50,6 +50,16 @@
                 color: None
             )
         ),
+        "common.items.armor.brinestone.hand": (
+            left: (
+                vox_spec: ("armor.brinestone.hand", (-3.5, -1.5, -4.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.brinestone.hand", (-1.5, -1.5, -4.0)),
+                color: None
+            )
+        ),
         "common.items.armor.cloth_purple.hand": (
             left: (
                 vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)),

assets/voxygen/voxel/humanoid_armor_head_manifest.ron

@@ -1107,6 +1107,55 @@
             vox_spec: ("armor.misc.head.facegourd", (-2.0, -6.0, 1.0)),
             color: None
         ),
+        // Cardinal Mitre
+        (Human, Male, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-4.0, -5.0, 5.0)),
+            color: None
+        ),
+        (Human, Female, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-4.0, -5.0, 5.0)),
+            color: None
+        ),
+        (Elf, Male, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-3.0, -5.0, 7.0)),
+            color: None
+        ),
+        (Elf, Female, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-3.0, -6.0, 5.0)),
+            color: None
+        ),
+        (Dwarf, Male, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-5.0, -4.0, 5.0)),
+            color: None
+        ),
+        (Dwarf, Female, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-5.0, -4.0, 5.0)),
+            color: None
+        ),
+        (Danari, Male, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-2.0, -5.0, 7.0)),
+            color: None
+        ),
+        (Danari, Female, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-2.0, -5.0, 7.0)),
+            color: None
+        ),
+        (Draugr, Male, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-6.0, -5.0, 7.0)),
+            color: None
+        ),
+        (Draugr, Female, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-6.0, -5.0, 6.0)),
+            color: None
+        ),
+        (Orc, Male, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-3.0, -3.0, 8.0)),
+            color: None
+        ),
+        (Orc, Female, "common.items.armor.cardinal.mitre"): (
+            vox_spec: ("armor.cardinal.mitre", (-3.0, -6.0, 5.0)),
+            color: None
+        ),
         // Merchant Turban
         (Human, Male, "common.items.armor.merchant.turban"): (
             vox_spec: ("armor.merchant.turban", (-4.0, -7.0, -6.0)),
@@ -1254,6 +1303,55 @@
             vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -7.0, -4.0)),
             color: None
         ),
+        // Brinestone Crown
+        (Human, Male, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-4.0, -4.0, -1.0)),
+            color: None
+        ),
+        (Human, Female, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-4.0, -4.0, -1.0)),
+            color: None
+        ),
+        (Elf, Male, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-3.0, -4.0, -0.0)),
+            color: None
+        ),
+        (Elf, Female, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-3.0, -4.0, -0.0)),
+            color: None
+        ),
+        (Dwarf, Male, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-5.0, -3.0, -1.0)),
+            color: None
+        ),
+        (Dwarf, Female, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-5.0, -3.0, -1.0)),
+            color: None
+        ),
+        (Danari, Male, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-2.0, -4.0, 1.0)),
+            color: None
+        ),
+        (Danari, Female, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-2.0, -4.0, 2.0)),
+            color: None
+        ),
+        (Draugr, Male, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-6.0, -4.0, 2.0)),
+            color: None
+        ),
+        (Draugr, Female, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-6.0, -4.0, -1.0)),
+            color: None
+        ),
+        (Orc, Male, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-3.0, -2.0, 2.0)),
+            color: None
+        ),
+        (Orc, Female, "common.items.armor.brinestone.crown"): (
+            vox_spec: ("armor.brinestone.crown", (-3.0, -5.0, -1.0)),
+            color: None
+        ),
         // Woolly Wintercap (Christmas hat+event)
         (Human, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): (
             vox_spec: ("armor.misc.head.woolly_wintercap", (-4.0, -7.0, -3.0)),

assets/voxygen/voxel/humanoid_armor_pants_manifest.ron

@@ -39,6 +39,10 @@
          "common.items.armor.boreal.pants": (
             vox_spec: ("armor.boreal.pants", (-5.0, -3.5, 0.0)),
             color: None
+        ),
+         "common.items.armor.brinestone.pants": (
+            vox_spec: ("armor.brinestone.pants", (-7.0, -3.5, 0.0)),
+            color: None
         ),
         "common.items.npc_armor.pants.plate_red": (
             vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)),

assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron

@@ -61,6 +61,16 @@
                 color: None
             )
         ),
+        "common.items.armor.brinestone.shoulder": (
+            left: (
+                vox_spec: ("armor.brinestone.shoulder", (-5.0, -3.5, -2.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.brinestone.shoulder", (-3.0, -3.5, -2.0)),
+                color: None
+            )
+        ),
         "common.items.armor.cloth_purple.shoulder": (
             left: (
                 vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)),

assets/voxygen/voxel/item_drop_manifest.ron

@@ -488,6 +488,15 @@
     Simple("common.items.armor.boreal.hand"): "voxel.armor.boreal.hand",
     Simple("common.items.armor.boreal.shoulder"): "voxel.armor.boreal.shoulder",
     Simple("common.items.armor.boreal.back"): "voxel.armor.boreal.back",
+    //Brinestone Armor
+    Simple("common.items.armor.brinestone.chest"): "voxel.armor.brinestone.chest",
+    Simple("common.items.armor.brinestone.pants"): "voxel.armor.brinestone.pants",
+    Simple("common.items.armor.brinestone.belt"): "voxel.armor.brinestone.belt",
+    Simple("common.items.armor.brinestone.foot"): "voxel.armor.brinestone.foot",
+    Simple("common.items.armor.brinestone.hand"): "voxel.armor.brinestone.hand",
+    Simple("common.items.armor.brinestone.shoulder"): "voxel.armor.brinestone.shoulder",
+    Simple("common.items.armor.brinestone.back"): "voxel.armor.brinestone.back",
+    Simple("common.items.armor.brinestone.crown"): "voxel.armor.brinestone.crown",
     //Blue Leather Armor
     Simple("common.items.npc_armor.chest.leather_blue"): "voxel.armor.leather_blue.chest",
     Simple("common.items.npc_armor.pants.leather_blue"): "voxel.armor.leather_blue.pants",
@@ -878,6 +887,7 @@
     Simple("common.items.flowers.plant_fiber"): "voxel.sprite.crafting_ing.plant_fiber",
     Simple("common.items.flowers.moonbell"): "voxel.sprite.flowers.moonbell",
     Simple("common.items.crafting_ing.abyssal_heart"): "voxel.sprite.crafting_ing.abyssal_heart",
+    Simple("common.items.crafting_ing.brinestone"): "voxel.sprite.crafting_ing.brinestone",
     Simple("common.items.crafting_ing.pearl"): "voxel.sprite.crafting_ing.pearl",
     Simple("common.items.crafting_ing.coral_branch"): "voxel.sprite.crafting_ing.coral_branch",
     Simple("common.items.flowers.pyrebloom"): "voxel.sprite.flowers.pyrebloom",
@@ -929,6 +939,7 @@
     // Keys and Lockpicks
     Simple("common.items.keys.rusty_tower_key"): "voxel.object.key_rusty-0",
     Simple("common.items.keys.bone_key"): "voxel.object.key_bone",
+    Simple("common.items.keys.glass_key"): "voxel.object.key_glass",
     Simple("common.items.utility.lockpick_0"): "voxel.object.lockpick",
     // Gliders
     Simple("common.items.glider.cloverleaf"): "voxel.glider.starter",