mine-implementation

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Dwarven-Mine update and activation.
 - Petting animals tamed by you or someone else!
 - Updated furniture sprites.
 - Added Abyssal rings

assets/common/abilities/ability_set_manifest.ron

@@ -363,6 +363,14 @@
             Simple(None, "common.abilities.custom.stonegolemfist.spin"),
         ],
     ),
+    Custom("Iron Golem"): (
+        primary: Simple(None, "common.abilities.custom.irongolemfist.singlestrike"),
+        secondary: Simple(None, "common.abilities.custom.irongolemfist.shockwave"),
+        abilities: [
+            Simple(None, "common.abilities.custom.irongolemfist.iron_pike_bomb"),
+            Simple(None, "common.abilities.custom.irongolemfist.spin"),
+        ],
+    ),
     Custom("Beast Claws"): (
         primary: Simple(None, "common.abilities.custom.beastclaws.basic"),
         secondary: Simple(None, "common.abilities.custom.beastclaws.basic"),
@@ -598,9 +606,7 @@
     Custom("Organ"): (
         primary: Simple(None, "common.abilities.custom.organ.organaura"),
         secondary: Simple(None, "common.abilities.custom.organ.organaura"),
-        abilities: [
+        abilities: [],
-            Simple(None, "common.abilities.custom.arthropods.weevil.threadshot"),
-        ],
     ),
     Custom("Haniwa Sentry"): (
         primary: Simple(None, "common.abilities.custom.turret.flamethrower"),
@@ -617,28 +623,39 @@
         ],
     ),
     Custom("Flamekeeper"): (
-        primary: Simple(None, "common.abilities.custom.dwarves.flamekeeper.lava_mortar"),
+        primary: Simple(None, "common.abilities.custom.dwarves.flamekeeper.mines"),
         secondary: Simple(None, "common.abilities.custom.dwarves.flamekeeper.flamecrush"),
         abilities: [
-            Simple(None, "common.abilities.custom.dwarves.flamekeeper.summon_flamethrower"),
+            Simple(None, "common.abilities.custom.dwarves.flamekeeper.summon_lavathrower"),
-            Simple(None, "common.abilities.custom.dwarves.flamekeeper.summon_clockwork"),
             Simple(None, "common.abilities.custom.dwarves.flamekeeper.flamethrower"),
             Simple(None, "common.abilities.custom.dwarves.flamekeeper.lavawave"),
             Simple(None, "common.abilities.custom.dwarves.flamekeeper.mines"),
         ],
     ),
-    Custom("Clockwork"): (
+    Custom("Forgemaster"): (
-        primary: Simple(None, "common.abilities.custom.dwarves.clockwork.singlestrike"),
+        primary: Simple(None, "common.abilities.custom.dwarves.forgemaster.lava_mortar"),
-        secondary: Simple(None, "common.abilities.custom.dwarves.clockwork.triplestrike"),
+        secondary: Simple(None, "common.abilities.custom.dwarves.forgemaster.flamecrush"),
+        abilities: [
+            Simple(None, "common.abilities.custom.dwarves.forgemaster.summon_iron_dwarf"),
+            Simple(None, "common.abilities.custom.dwarves.forgemaster.groundislava1"),
+            Simple(None, "common.abilities.custom.dwarves.forgemaster.flamethrower"),
+            Simple(None, "common.abilities.custom.dwarves.forgemaster.lavawave"),
+            Simple(None, "common.abilities.custom.dwarves.forgemaster.groundislava2"),
+            Simple(None, "common.abilities.custom.dwarves.forgemaster.teleport"),
+        ],
+    ),
+    Custom("IronDwarf"): (
+        primary: Simple(None, "common.abilities.custom.dwarves.iron_dwarf.singlestrike"),
+        secondary: Simple(None, "common.abilities.custom.dwarves.iron_dwarf.triplestrike"),
         abilities: [],
     ),
-    Custom("HermitAlligator"): (
+    Custom("Snaretongue"): (
-        primary: Simple(None, "common.abilities.custom.dwarves.hermit_alligator.tail"),
+        primary: Simple(None, "common.abilities.custom.dwarves.snaretongue.tongue"),
-        secondary: Simple(None, "common.abilities.custom.dwarves.hermit_alligator.wave"),
+        secondary: Simple(None, "common.abilities.custom.dwarves.snaretongue.wave"),
         abilities: [
-            Simple(None, "common.abilities.custom.dwarves.hermit_alligator.bombs"),
+            Simple(None, "common.abilities.custom.dwarves.snaretongue.bombs"),
-            Simple(None, "common.abilities.custom.dwarves.hermit_alligator.beam"),
+            Simple(None, "common.abilities.custom.dwarves.snaretongue.beam"),
-            Simple(None, "common.abilities.custom.dwarves.hermit_alligator.heal"),
+            Simple(None, "common.abilities.custom.dwarves.snaretongue.heal"),
         ],
     ),
     Custom("Minotaur"): (

assets/common/abilities/custom/cursekeeper/teleport.ron

@@ -2,4 +2,5 @@ Blink(
     buildup_duration: 0.75,
     recover_duration: 0.25,
     max_range: 100.0,
+    frontend_specifier: Some(CultistFlame),
 )

assets/common/abilities/custom/dwarves/flamekeeper/flamecrush.ron

@@ -8,7 +8,7 @@ BasicMelee(
         kind: Bash(
             damage: 100.0,
             poise: 0.0,
-            knockback: 10.0,
+            knockback: 15.0,
             energy_regen: 10.0,
         ),
         range: 5.0,

assets/common/abilities/custom/dwarves/flamekeeper/summon_lavathrower.ron

@@ -5,7 +5,7 @@ BasicSummon(
     summon_amount: 2,
     summon_distance: (8, 8),
     summon_info: (
-        body: Object(Flamethrower),
+        body: Object(Lavathrower),
         scale: None,
         has_health: true,
         use_npc_name: true,

assets/common/abilities/custom/dwarves/forgemaster/flamecrush.ron

@@ -0,0 +1,25 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    swing_duration: 0.1,
+    recover_duration: 0.7,
+    melee_constructor: (
+        kind: Bash(
+            damage: 100.0,
+            poise: 0.0,
+            knockback: 30.0,
+            energy_regen: 10.0,
+        ),
+        range: 5.0,
+        angle: 60.0,
+        damage_effect: Some(Buff((
+            kind: Burning,
+            dur_secs: 1.0,
+            strength: DamageFraction(0.1),
+            chance: 0.3,
+        ))),
+        multi_target: Some(Normal),
+    ),
+    hit_timing: 0.5,
+    ori_modifier: 0.2,
+)

assets/common/abilities/custom/dwarves/forgemaster/flamethrower.ron

@@ -0,0 +1,19 @@
+BasicBeam(
+    buildup_duration: 0.1,
+    recover_duration: 1.5,
+    beam_duration: 1.0,
+    damage: 10.0,
+    tick_rate: 3.0,
+    range: 80.0,
+    max_angle: 20.0,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 60.0,
+        strength: DamageFraction(0.5),
+        chance: 1.0,
+    ))),
+    energy_regen: 0,
+    energy_drain: 0,
+    ori_rate: 5.0,
+    specifier: Flamethrower,
+)

assets/common/abilities/custom/dwarves/forgemaster/groundislava1.ron

@@ -0,0 +1,10 @@
+SpriteSummon(
+    buildup_duration: 2.5,
+    cast_duration: 0.5,
+    recover_duration: 0.9,
+    sprite: FireBlock,
+    del_timeout: Some((4, 4)),
+    summon_distance: (15, 30.0),
+    sparseness: 0.0,
+    angle: 360,
+)

assets/common/abilities/custom/dwarves/forgemaster/groundislava2.ron

@@ -0,0 +1,10 @@
+SpriteSummon(
+    buildup_duration: 2.5,
+    cast_duration: 0.5,
+    recover_duration: 0.9,
+    sprite: FireBlock,
+    del_timeout: Some((4, 4)),
+    summon_distance: (30, 70.0),
+    sparseness: 0.0,
+    angle: 360,
+)

assets/common/abilities/custom/dwarves/forgemaster/lava_mortar.ron

@@ -4,13 +4,13 @@ BasicRanged(
     recover_duration: 2.5,
     projectile: ClayRocket(
         damage: 25.0,
-        radius: 12.0,
+        radius: 15.0,
-        knockback: 10.0,
+        knockback: 20.0,
         min_falloff: 0.1,
     ),
     projectile_body: Object(Mine),
     projectile_speed: 50.0,
-    num_projectiles: 6,
+    num_projectiles: 2,
-    projectile_spread: 1.5,
+    projectile_spread: 0.1,
     move_efficiency: 0.3,
 )

assets/common/abilities/custom/dwarves/forgemaster/lavawave.ron

@@ -0,0 +1,18 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 1.2,
+    swing_duration: 0.4,
+    recover_duration: 1.2,
+    damage: 20.0,
+    poise_damage: 10,
+    knockback: (strength: 30.0, direction: Away),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 90.0,
+    shockwave_speed: 15.0,
+    shockwave_duration: 3.0,
+    dodgeable: Jump,
+    move_efficiency: 0.0,
+    damage_kind: Crushing,
+    specifier: Fire,
+    ori_rate: 1.0,
+)

assets/common/abilities/custom/dwarves/forgemaster/summon_iron_dwarf.ron

@@ -2,17 +2,16 @@ BasicSummon(
     buildup_duration: 0.5,
     cast_duration: 1.3,
     recover_duration: 2.5,
-    summon_amount: 3,
+    summon_amount: 5,
     summon_distance: (4, 4),
     summon_info: (
         body: BipedSmall((
-            species: Clockwork,
+            species: IronDwarf,
             body_type: Male,
         )),
         scale: None,
-        use_npc_name: true,
         has_health: true,
-        loadout_config: Some(ClockworkSummon),
+        loadout_config: Some(IronDwarfSummon),
         skillset_config: None,
     ),
     duration: None,

assets/common/abilities/custom/dwarves/forgemaster/teleport.ron

@@ -0,0 +1,6 @@
+Blink(
+    buildup_duration: 0.1,
+    recover_duration: 0.1,
+    max_range: 100.0,
+    frontend_specifier: Some(FlameThrower),
+)

assets/common/abilities/custom/dwarves/hermit_alligator/tail.ron

@@ -1,26 +0,0 @@
-ChargedMelee(
-    energy_cost: 0,
-    energy_drain: 0,
-    melee_constructor: (
-        kind: Bash(
-            damage: 25.0,
-            poise: 30.0,
-            knockback: 10.0,
-            energy_regen: 0.0,
-        ),
-        scaled: Some((
-            kind: Bash(
-                damage: 40.0,
-                poise: 80.0,
-                knockback: 20.0,
-                energy_regen: 0.0,
-            ))),
-        range: 6.0,
-        angle: 90.0,
-        multi_target: Some(Normal),
-    ),
-    charge_duration: 3.2,
-    swing_duration: 0.7,
-    hit_timing: 0.9,
-    recover_duration: 0.7,
-)

assets/common/abilities/custom/dwarves/snaretongue/beam.ron

@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.5,
     recover_duration: 0.5,
     beam_duration: 1.0,
-    damage: 20.0,
+    damage: 30.0,
     tick_rate: 3.0,
     range: 80.0,
     max_angle: 15.0,

assets/common/abilities/custom/dwarves/snaretongue/bombs.ron

@@ -8,7 +8,7 @@ BasicRanged(
         radius: 5.0,
         min_falloff: 0.1,
     ),
-    projectile_body: Object(FireworkPurple),
+    projectile_body: Object(BubbleBomb),
     projectile_light: None,
     projectile_speed: 40.0,
     num_projectiles: 1,

assets/common/abilities/custom/dwarves/snaretongue/heal.ron

@@ -6,8 +6,8 @@ BasicAura(
     auras: [
         (
             kind: Regeneration,
-            strength: 250.0,
+            strength: 200.0,
-            duration: Some(5),
+            duration: Some(4),
             category: Magical,
         ),
     ],

assets/common/abilities/custom/dwarves/snaretongue/tongue.ron

@@ -0,0 +1,26 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 45.0,
+                    poise: 30,
+                    knockback: 25.0,
+                    energy_regen: 0,
+                ),
+                range: 2.5,
+                angle: 40.0,
+            ),
+            buildup_duration: 0.3,
+            swing_duration: 0.2,
+            hit_timing: 0.4,
+            recover_duration: 0.3,
+            movement: (
+                swing: Some(Forward(0.0)),
+            ),
+            ori_modifier: 0.6,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+    auto_progress: true,
+)

assets/common/abilities/custom/dwarves/snaretongue/wave.ron

@@ -2,9 +2,9 @@ Shockwave(
     energy_cost: 0,
     buildup_duration: 1.0,
     swing_duration: 0.4,
-    recover_duration: 1.0,
+    recover_duration: 1.5,
-    damage: 20.0,
+    damage: 35.0,
-    poise_damage: 10,
+    poise_damage: 15,
     knockback: (strength: 30.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 90.0,

assets/common/abilities/custom/irongolemfist/iron_pike_bomb.ron

@@ -0,0 +1,16 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.3,
+    recover_duration: 0.5,
+    projectile: Mine(
+        damage: 25.0,
+        radius: 5.0,
+        min_falloff: 0.75,
+    ),
+    projectile_body: Object(IronPikeBomb),
+    projectile_light: None,
+    projectile_speed: 500.0,
+    num_projectiles: 3,
+    projectile_spread: 0.3,
+    move_efficiency: 0.3,
+)

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

@@ -0,0 +1,18 @@
+Shockwave(
+    energy_cost: 0,
+    buildup_duration: 0.5,
+    swing_duration: 0.12,
+    recover_duration: 2.4,
+    damage: 35.0,
+    poise_damage: 50,
+    knockback: (strength: 48.0, direction: TowardsUp),
+    shockwave_angle: 360.0,
+    shockwave_vertical_angle: 90.0,
+    shockwave_speed: 100.0,
+    shockwave_duration: 0.5,
+    dodgeable: Jump,
+    move_efficiency: 0.05,
+    damage_kind: Crushing,
+    specifier: Fire,
+    ori_rate: 1.0,
+)

assets/common/abilities/custom/irongolemfist/singlestrike.ron

@@ -0,0 +1,24 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 35,
+                    poise: 40,
+                    knockback: 35.0,
+                    energy_regen: 0,
+                ),
+                range: 5.5,
+                angle: 60.0,
+            ),
+            buildup_duration: 0.9,
+            swing_duration: 0.1,
+            hit_timing: 0.5,
+            recover_duration: 0.5,
+            ori_modifier: 0.7,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+    auto_progress: true,
+    specifier: Some(IronGolemFist),
+)

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

@@ -0,0 +1,26 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.2,
+    swing_duration: 0.3,
+    recover_duration: 0.1,
+    melee_constructor: (
+        kind: Bash(
+            damage: 25,
+            poise: 10,
+            knockback: 15,
+            energy_regen: 0,
+        ),
+        range: 55.5,
+        angle: 360,
+        multi_target: Some(Normal),
+        damage_effect: Some(Buff((
+            kind: Poisoned,
+            dur_secs: 3,
+            strength: DamageFraction(0.1),
+            chance: 1.0,
+        ))),
+    ),
+    hit_timing: 0.5,
+    ori_modifier: 1.0,
+    frontend_specifier: Some(FlameTornado),
+)

assets/common/abilities/custom/jiangshi/teleport.ron

@@ -2,4 +2,5 @@ Blink(
     buildup_duration: 0.75,
     recover_duration: 0.25,
     max_range: 100.0,
+    frontend_specifier: Some(CultistFlame),
 )

assets/common/abilities/custom/mindflayer/dimensionaldoor.ron

@@ -2,4 +2,5 @@ Blink(
     buildup_duration: 0.75,
     recover_duration: 0.25,
     max_range: 150.0,
+    frontend_specifier: Some(CultistFlame),
 )

assets/common/abilities/custom/shamanic_spirit/teleport.ron

@@ -2,4 +2,5 @@ Blink(
     buildup_duration: 0.75,
     recover_duration: 0.25,
     max_range: 100.0,
+    frontend_specifier: Some(CultistFlame),
 )

assets/common/abilities/custom/turret/flamethrower_strong.ron

@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 2.5,
     recover_duration: 0.01,
     beam_duration: 0.3,
-    damage: 10.0,
+    damage: 6.0,
     tick_rate: 3.0,
     range: 20.0,
     max_angle: 20.0,

assets/common/entity/dungeon/dwarven_quarry/alligator.ron

@@ -1,11 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Hermit Alligator"),
-    body: RandomWith("hermit_alligator"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.alligator"),
-        inventory: (
-        loadout: FromBody,
-    ),
-    meta: [],
-)

assets/common/entity/dungeon/dwarven_quarry/captain.ron

@@ -1,22 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Captain"),
-    body: RandomWith("dwarf"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.captain"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.dwarven_quarry.overseer"),
-            active_hands: InHands((
-                ModularWeapon(tool: Sword, material: Orichalcum, hands: Two),
-                None
-            )),
-        )),
-    ),
-    agent: (
-        idle_wander_factor: 0.1,
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank5.fullskill"),
-    ],
-)

assets/common/entity/dungeon/dwarven_quarry/forgemaster.ron

@@ -0,0 +1,14 @@
+#![enable(implicit_some)]
+(
+    name: Name("Forgemaster"),
+    body: RandomWith("forgemaster"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.forgemaster"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    agent: (
+        idle_wander_factor: 0.0,
+    ),
+    meta: [],
+)

assets/common/entity/dungeon/dwarven_quarry/hoplite.ron

@@ -1,19 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Myrmidon Hoplite"),
-    body: RandomWith("myrmidon"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.myrmidon.hoplite"),
-            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.hoplite"), None)),
-        )),
-    ),
-    agent: (
-        idle_wander_factor: 0.1,
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank4.fullskill"),
-    ],
-)

assets/common/entity/dungeon/dwarven_quarry/iron_dwarf.ron

@@ -1,13 +1,13 @@
 #![enable(implicit_some)]
 (
-    name: Name("Clockwork"),
+    name: Name("Iron Dwarf"),
-    body: RandomWith("clockwork"),
+    body: RandomWith("iron_dwarf"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.nothing"),
+    loot: Nothing,
     inventory: (
         loadout: Inline((
-            active_hands: InHands((Item("common.items.npc_weapons.unique.husk"), None)),
+            active_hands: InHands((Item("common.items.npc_weapons.unique.iron_dwarf"), None)),
-            inherit: Asset("common.loadout.dungeon.dwarven_quarry.clockwork"),
+            inherit: Asset("common.loadout.dungeon.dwarven_quarry.iron_dwarf"),
         )),
     ),
     agent: (

assets/common/entity/dungeon/dwarven_quarry/irongolem.ron

@@ -1,9 +1,9 @@
 #![enable(implicit_some)]
 (
-    name: Automatic,
+    name: Name("Iron Golem"),
-    body: RandomWith("cyclops"),
+    body: RandomWith("irongolem"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.cyclops"),
+    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.irongolem"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/dwarven_quarry/irongolem_key.ron

@@ -1,9 +1,9 @@
 #![enable(implicit_some)]
 (
-    name: Name("Minotaur"),
+    name: Name("Iron Golem"),
-    body: RandomWith("minotaur"),
+    body: RandomWith("irongolem"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.minotaur"),
+    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.irongolem_key"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/dwarven_quarry/lavathrower.ron

@@ -1,9 +1,9 @@
 #![enable(implicit_some)]
 (
     name: Name("Lava Thrower"),
-    body: Exact(Object(Flamethrower)),
+    body: Exact(Object(Lavathrower)),
     alignment: Alignment(Enemy),
-    loot: Nothing,
+    loot: Item("common.items.crafting_ing.twigs"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/dwarven_quarry/marksman.ron

@@ -1,19 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Myrmidon Marksman"),
-    body: RandomWith("myrmidon"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.myrmidon.marksman"),
-            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.marksman"), None)),
-        )),
-    ),
-    agent: (
-        idle_wander_factor: 0.1,
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank4.fullskill"),
-    ],
-)

assets/common/entity/dungeon/dwarven_quarry/mine_guard.ron

@@ -3,8 +3,7 @@
     name: Name("Mine Guard"),
     body: RandomWith("dwarf"),
     alignment: Alignment(Enemy),
-    // TODO Add custom loot table
+    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.miner"),
-    loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.dungeon.dwarven_quarry.mine_guard"),

assets/common/entity/dungeon/dwarven_quarry/miner.ron

@@ -3,8 +3,7 @@
     name: Name("Greedy Miner"),
     body: RandomWith("dwarf"),
     alignment: Alignment(Enemy),
-    // TODO Add custom loot table
+    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.miner"),
-    loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"),
     inventory: (
         loadout: Inline((
             inherit: Asset("common.loadout.dungeon.dwarven_quarry.greedy_miner"),

assets/common/entity/dungeon/dwarven_quarry/miner_draugr.ron

@@ -1,17 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Greedy Miner"),
-    body: RandomWith("draugr"),
-    alignment: Alignment(Enemy),
-    // TODO Add custom loot table
-    loot: LootTable("common.loot_tables.humanoids.dwarf_graverobber"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.dwarven_quarry.greedy_miner"),
-            active_hands: InHands((Item("common.items.npc_weapons.sword.pickaxe_velorite_sword"), None)),
-        )),
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
-    ],
-)

assets/common/entity/dungeon/dwarven_quarry/overseer.ron

@@ -1,22 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Overseer"),
-    body: RandomWith("dwarf"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.dwarven_quarry.overseer"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.dwarven_quarry.overseer"),
-            active_hands: InHands((
-                ModularWeapon(tool: Hammer, material: Orichalcum, hands: Two),
-                None
-            )),
-        )),
-    ),
-    agent: (
-        idle_wander_factor: 0.0,
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank5.fullskill"),
-    ],
-)

assets/common/entity/dungeon/dwarven_quarry/snaretongue_forge_key.ron

@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Snaretongue"),
+    body: RandomWith("snaretongue"),
+    alignment: Alignment(Enemy),
+    loot: Item("common.items.keys.quarry_keys.forge_key"),
+        inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)

assets/common/entity/dungeon/dwarven_quarry/snaretongue_miner_key.ron

@@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Snaretongue"),
+    body: RandomWith("snaretongue"),
+    alignment: Alignment(Enemy),
+    loot: Item("common.items.keys.quarry_keys.miner_key"),
+        inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)

assets/common/entity/dungeon/dwarven_quarry/sniper.ron

@@ -1,20 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Myrmidon Sniper"),
-    body: RandomWith("myrmidon"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.myrmidon.marksman"),
-            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.marksman"), None)),
-        )),
-    ),
-    agent: (
-        idle_wander_factor: 0.1,
-        aggro_range_multiplier: 4.0,
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank1.fullskill"),
-    ],
-)

assets/common/entity/dungeon/dwarven_quarry/strategian.ron

@@ -1,19 +0,0 @@
-#![enable(implicit_some)]
-(
-    name: Name("Myrmidon Strategian"),
-    body: RandomWith("myrmidon"),
-    alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.dungeon.myrmidon.enemy"),
-    inventory: (
-        loadout: Inline((
-            inherit: Asset("common.loadout.dungeon.myrmidon.strategian"),
-            active_hands: InHands((Item("common.items.npc_weapons.biped_small.myrmidon.strategian"), None)),
-        )),
-    ),
-    agent: (
-        idle_wander_factor: 0.1,
-    ),
-    meta: [
-        SkillSetAsset("common.skillset.preset.rank4.fullskill"),
-    ],
-)

assets/common/item_i18n_manifest.ron

@@ -60,6 +60,9 @@
         Simple(
             "common.items.npc_armor.golem.mogwai",
         ): "common-items-npc_armor-golem-mogwai",
+        Simple(
+            "common.items.npc_armor.golem.irongolem",
+        ): "common-items-npc_armor-golem-irongolem",
         Simple(
             "common.items.npc_armor.biped_small.myrmidon.foot.hoplite",
         ): "common-items-npc_armor-biped_small-myrmidon-foot-hoplite",
@@ -346,20 +349,20 @@
             "common.items.npc_armor.biped_small.treasure_egg.foot.treasure_egg",
         ): "common-items-npc_armor-biped_small-treasure_egg-foot-treasure_egg",
         Simple(
-            "common.items.npc_armor.biped_small.clockwork.foot.clockwork",
+            "common.items.npc_armor.biped_small.iron_dwarf.foot.iron_dwarf",
-        ): "common-items-npc_armor-biped_small-clockwork-foot-clockwork",
+        ): "common-items-npc_armor-biped_small-iron_dwarf-foot-iron_dwarf",
         Simple(
-            "common.items.npc_armor.biped_small.clockwork.head.clockwork",
+            "common.items.npc_armor.biped_small.iron_dwarf.head.iron_dwarf",
-        ): "common-items-npc_armor-biped_small-clockwork-head-clockwork",
+        ): "common-items-npc_armor-biped_small-iron_dwarf-head-iron_dwarf",
         Simple(
-            "common.items.npc_armor.biped_small.clockwork.pants.clockwork",
+            "common.items.npc_armor.biped_small.iron_dwarf.pants.iron_dwarf",
-        ): "common-items-npc_armor-biped_small-clockwork-pants-clockwork",
+        ): "common-items-npc_armor-biped_small-iron_dwarf-pants-iron_dwarf",
         Simple(
-            "common.items.npc_armor.biped_small.clockwork.chest.clockwork",
+            "common.items.npc_armor.biped_small.iron_dwarf.chest.iron_dwarf",
-        ): "common-items-npc_armor-biped_small-clockwork-chest-clockwork",
+        ): "common-items-npc_armor-biped_small-iron_dwarf-chest-iron_dwarf",
         Simple(
-            "common.items.npc_armor.biped_small.clockwork.hand.clockwork",
+            "common.items.npc_armor.biped_small.iron_dwarf.hand.iron_dwarf",
-        ): "common-items-npc_armor-biped_small-clockwork-hand-clockwork",
+        ): "common-items-npc_armor-biped_small-iron_dwarf-hand-iron_dwarf",
         Simple(
             "common.items.npc_armor.biped_small.haniwa.foot.archer",
         ): "common-items-npc_armor-biped_small-haniwa-foot-archer",
@@ -672,6 +675,9 @@
         Simple(
             "common.items.npc_armor.biped_large.terracotta",
         ): "common-items-npc_armor-biped_large-terracotta",
+        Simple(
+            "common.items.npc_armor.biped_large.forgemaster",
+        ): "common-items-npc_armor-biped_large-forgemaster",
         Simple(
             "common.items.keys.bone_key",
         ): "object-key-bone",
@@ -691,26 +697,11 @@
             "common.items.keys.rusty_tower_key",
         ): "object-key-rusty",
         Simple(
-            "common.items.keys.quarry_keys.ancient",
+            "common.items.keys.quarry_keys.miner_key",
-        ): "object-key-quarry-ancient",
+        ): "object-key-miner",
         Simple(
-            "common.items.keys.quarry_keys.backdoor",
+            "common.items.keys.quarry_keys.forge_key",
-        ): "object-key-quarry-backdoor",
+        ): "object-key-forge",
-        Simple(
-            "common.items.keys.quarry_keys.cyclops_eye",
-        ): "object-key-cyclops_eyeball",
-        Simple(
-            "common.items.keys.quarry_keys.flamekeeper_left",
-        ): "object-key-quarry-keeper_goggle_left",
-        Simple(
-            "common.items.keys.quarry_keys.flamekeeper_right",
-        ): "object-key-quarry-keeper_goggle_right",
-        Simple(
-            "common.items.keys.quarry_keys.overseer",
-        ): "object-key-quarry-overseer",
-        Simple(
-            "common.items.keys.quarry_keys.smelting",
-        ): "object-key-quarry-smelting",
         Simple(
             "common.items.weapons.shield.shield_1",
         ): "weapon-shield-wood-0",
@@ -1668,6 +1659,9 @@
         Simple(
             "common.items.armor.mail.orichalcum.shoulder",
         ): "armor-mail-orichalcum-5",
+        Simple(
+            "common.items.armor.mail.orichalcum.head",
+        ): "armor-mail-orichalcum-7",
         Simple(
             "common.items.armor.mail.steel.back",
         ): "armor-mail-steel-back",
@@ -2231,6 +2225,9 @@
         Simple(
             "common.items.mineral.ore.tin",
         ): "sprite-mineral-ore-tin",
+        Simple(
+            "common.items.mineral.ore.ancient_gold",
+        ): "sprite-mineral-ore-ancient_gold",
         Simple(
             "common.items.mineral.ore.velorite",
         ): "sprite-velorite-velorite_ore",
@@ -2557,8 +2554,17 @@
             "common.items.npc_weapons.unique.clay_golem_fist",
         ): "common-items-npc_weapons-unique-clay_golem_fist",
         Simple(
-            "common.items.npc_weapons.unique.clockwork",
+            "common.items.npc_weapons.unique.iron_golem_fist",
-        ): "common-items-npc_weapons-unique-clockwork",
+        ): "common-items-npc_weapons-unique-iron_golem_fist",
+        Simple(
+            "common.items.npc_weapons.hammer.forgemaster_hammer",
+        ): "common-items-npc_weapons-hammer-forgemaster_hammer",
+        Simple(
+            "common.items.npc_weapons.unique.snaretongue",
+        ): "common-items-npc_weapons-unique-snaretongue",
+        Simple(
+            "common.items.npc_weapons.unique.iron_dwarf",
+        ): "common-items-npc_weapons-unique-iron_dwarf",
         Simple(
             "common.items.npc_weapons.unique.cloudwyvern",
         ): "common-items-npc_weapons-unique-cloudwyvern",
@@ -2619,9 +2625,6 @@
         Simple(
             "common.items.npc_weapons.unique.haniwa_sentry",
         ): "common-items-npc_weapons-unique-haniwa_sentry",
-        Simple(
-            "common.items.npc_weapons.unique.hermit_alligator",
-        ): "common-items-npc_weapons-unique-hermit_alligator",
         Simple(
             "common.items.npc_weapons.unique.husk",
         ): "common-items-npc_weapons-unique-husk",
@@ -3093,6 +3096,15 @@
         Simple(
             "common.items.crafting_ing.sticky_thread",
         ): "sprite-crafting_ing-sticky_thread",
+        Simple(
+            "common.items.crafting_ing.alkahest",
+        ): "sprite-crafting_ing-alkahest",
+        Simple(
+            "common.items.crafting_ing.dwarven_battery",
+        ): "sprite-crafting_ing-dwarven_battery",
+        Simple(
+            "common.items.crafting_ing.dwarven_battery",
+        ): "sprite-crafting_ing-dwarven_battery",
         Simple(
             "common.items.crafting_ing.stones",
         ): "sprite-rocks-rock-0",
@@ -3246,6 +3258,9 @@
         Simple(
             "common.items.lantern.polaris",
         ): "lantern-polaris",
+        Simple(
+            "common.items.lantern.delvers_lamp",
+        ): "lantern-delvers_lamp",
         Simple(
             "common.items.lantern.pumpkin",
         ): "lantern-pumpkin",

assets/common/items/armor/mail/orichalcum/head.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    legacy_name: "Orichalcum Helmet",
+    legacy_description: "An ancient alloy. Myths remain of heroes who once wore this metal.",
+    kind: Armor((
+        kind: Head,
+        stats: FromSet("Orichalcum"),
+    )),
+    quality: Legendary,
+    tags: [
+        Material(Orichalcum),
+        SalvageInto(Orichalcum, 3),
+    ],
+)

assets/common/items/crafting_ing/alkahest.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    legacy_name: "Alkahest",
+    legacy_description: "Alchemical solvent.",
+    kind: Ingredient(
+        // Descriptor not needed
+        descriptor: "",    ),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/crafting_ing/dwarven_battery.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    legacy_name: "Dwarven Battery",
+    legacy_description: "Container of magical energy.",
+    kind: Ingredient(
+        // Descriptor not needed
+        descriptor: "",    ),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/keys/quarry_keys/ancient.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Ancient Key",
-    legacy_description: "If you are lucky it works one more time before breaking.",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/keys/quarry_keys/backdoor.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Backdoor Key",
-    legacy_description: "If you are lucky it works one more time before breaking.",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/keys/quarry_keys/cyclops_eye.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Cyclops Eye",
-    legacy_description: "Looks like it could open an ancient mechanism.",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/keys/quarry_keys/flamekeeper_left.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Left Goggle-Glass",
-    legacy_description: "Looks like it could open a door...",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/keys/quarry_keys/flamekeeper_right.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Right Goggle-Glass",
-    legacy_description: "Looks like it could open a door...",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/keys/quarry_keys/forge_key.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    legacy_name: "Forge Key",
+    legacy_description: "Used to open doors. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    quality: High,
+    tags: [],
+)

assets/common/items/keys/quarry_keys/miner_key.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    legacy_name: "Miner Key",
+    legacy_description: "Used to open doors. Will break after use.",
+    kind: Utility(
+        kind: Key,
+    ),
+    quality: High,
+    tags: [],
+)

assets/common/items/keys/quarry_keys/overseer.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Overseer Key",
-    legacy_description: "If you are lucky it works one more time before breaking.",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/keys/quarry_keys/smelting.ron

@@ -1,10 +0,0 @@
-ItemDef(
-    legacy_name: "Smelting Room Key",
-    legacy_description: "If you are lucky it works one more time before breaking.",
-    kind: Utility(
-        kind: Key,
-    ),
-    quality: High,
-    tags: [],
-)
-

assets/common/items/lantern/delvers_lamp.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    legacy_name: "Delver's Lamp",
+    legacy_description: "Perfect for mining.",
+    kind: Lantern(
+        (
+            color: (r: 0, g: 216, b: 255),
+            strength_thousandths: 8000,
+            flicker_thousandths: 600,
+        ),
+    ),
+    quality: Legendary,
+    tags: [Utility],
+)

assets/common/items/mineral/ore/ancient_gold.ron

@@ -0,0 +1,10 @@
+ItemDef(
+    legacy_name: "Ancient Gold",
+    legacy_description: "Ancient ingot of gold, soaked in magical energies.",
+    kind: Ingredient(
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/npc_armor/biped_large/forgemaster.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    legacy_name: "Forgemaster Armor",
+    legacy_description: "Forgemaster Armor",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(100.0)),
+            poise_resilience: Some(Normal(10.0)),
+            energy_max: Some(100.0),
+        )),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/iron_dwarf/chest/iron_dwarf.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Clockwork Chest",
+    legacy_name: "Iron Dwarf Chest",
-    legacy_description: "Clockwork Chest",
+    legacy_description: "Iron Dwarf Chest",
     kind: Armor((
         kind: Chest,
         stats: Direct((

assets/common/items/npc_armor/biped_small/iron_dwarf/foot/iron_dwarf.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Clockwork Foot",
+    legacy_name: "Iron Dwarf Foot",
-    legacy_description: "Clockwork Foot.",
+    legacy_description: "Iron Dwarf Foot.",
     kind: Armor((
         kind: Foot,
         stats: Direct((

assets/common/items/npc_armor/biped_small/iron_dwarf/hand/iron_dwarf.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Clockwork Hand",
+    legacy_name: "Iron Dwarf Hand",
-    legacy_description: "Clockwork Hand",
+    legacy_description: "Iron Dwarf Hand",
     kind: Armor((
         kind: Hand,
         stats: Direct((

assets/common/items/npc_armor/biped_small/iron_dwarf/head/iron_dwarf.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Clockwork Head",
+    legacy_name: "Iron Dwarf Head",
-    legacy_description: "Clockwork Head",
+    legacy_description: "Iron Dwarf Head",
     kind: Armor((
         kind: Head,
         stats: Direct((

assets/common/items/npc_armor/biped_small/iron_dwarf/pants/iron_dwarf.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Clockwork Pants",
+    legacy_name: "Iron Dwarf Pants",
-    legacy_description: "Clockwork Pants",
+    legacy_description: "Iron Dwarf Pants",
     kind: Armor((
         kind: Pants,
         stats: Direct((

assets/common/items/npc_armor/golem/irongolem.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    legacy_name: "Iron Golem Armor",
+    legacy_description: "Worn by iron golem.",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(300.0)),
+            poise_resilience: Some(Normal(10.0)),
+        )),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/npc_weapons/hammer/forgemaster_hammer.ron

@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Forgemaster Hammer",
+    legacy_description: "Forgemaster Hammer",
+    kind: Tool((
+        kind: Hammer,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.01,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Forgemaster")),
+)

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

@@ -1,5 +1,5 @@
 ItemDef(
-    legacy_name: "Clockwork",
+    legacy_name: "IronDwarf",
     legacy_description: "testing123",
     kind: Tool((
         kind: Natural,
@@ -16,5 +16,5 @@ ItemDef(
     )),
     quality: Low,
     tags: [],
-    ability_spec: Some(Custom("Clockwork")),
+    ability_spec: Some(Custom("IronDwarf")),
 )

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

@@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Iron Golem's Fist",
+    legacy_description: "Was attached to a mighty iron golem.",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.001,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Iron Golem")),
+)

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

@@ -1,5 +1,5 @@
 ItemDef(
-    legacy_name: "Hermit Alligator Teeth",
+    legacy_name: "Snare Tongue",
     legacy_description: "Grrr!",
     kind: Tool((
         kind: Natural,
@@ -16,5 +16,5 @@ ItemDef(
     )),
     quality: High,
     tags: [],
-    ability_spec: Some(Custom("HermitAlligator")),
+    ability_spec: Some(Custom("Snaretongue")),
 )

assets/common/items/tool/instruments/steeltonguedrum.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Steeldrum",
+    legacy_name: "Steeltonguedrum",
-    legacy_description: "Steeldrum.",
+    legacy_description: "Steeltonguedrum.",
     kind: Tool((
         kind: Instrument,
         hands: Two,

assets/common/loadout/dungeon/dwarven_quarry/captain.ron

@@ -1,11 +0,0 @@
-#![enable(implicit_some)]
-(
-    shoulders: Item("common.items.armor.miner.shoulder"),
-    back: Item("common.items.armor.miner.back"),
-    chest: Item("common.items.armor.miner.chest"),
-    gloves: Item("common.items.armor.miner.hand"),
-    belt: Item("common.items.armor.miner.belt"),
-    legs: Item("common.items.armor.miner.pants"),
-    feet: Item("common.items.armor.miner.foot"),
-    lantern: Item("common.items.lantern.black_0"),
-)

assets/common/loadout/dungeon/dwarven_quarry/clockwork.ron

@@ -1,8 +0,0 @@
-#![enable(implicit_some)]
-(
-    head: Item("common.items.npc_armor.biped_small.clockwork.head.clockwork"),
-    chest: Item("common.items.npc_armor.biped_small.clockwork.chest.clockwork"),
-    gloves: Item("common.items.npc_armor.biped_small.clockwork.hand.clockwork"),
-    legs: Item("common.items.npc_armor.biped_small.clockwork.pants.clockwork"),
-    feet: Item("common.items.npc_armor.biped_small.clockwork.foot.clockwork"),
-)

assets/common/loadout/dungeon/dwarven_quarry/iron_dwarf.ron

@@ -0,0 +1,8 @@
+#![enable(implicit_some)]
+(
+    head: Item("common.items.npc_armor.biped_small.iron_dwarf.head.iron_dwarf"),
+    chest: Item("common.items.npc_armor.biped_small.iron_dwarf.chest.iron_dwarf"),
+    gloves: Item("common.items.npc_armor.biped_small.iron_dwarf.hand.iron_dwarf"),
+    legs: Item("common.items.npc_armor.biped_small.iron_dwarf.pants.iron_dwarf"),
+    feet: Item("common.items.npc_armor.biped_small.iron_dwarf.foot.iron_dwarf"),
+)

assets/common/loadout/dungeon/dwarven_quarry/overseer.ron

@@ -1,12 +0,0 @@
-#![enable(implicit_some)]
-(
-    head: Item("common.items.armor.misc.head.winged_coronet"),
-    shoulders: Item("common.items.armor.miner.shoulder"),
-    back: Item("common.items.armor.miner.back"),
-    chest: Item("common.items.armor.miner.chest"),
-    gloves: Item("common.items.armor.miner.hand"),
-    belt: Item("common.items.armor.miner.belt"),
-    legs: Item("common.items.armor.miner.pants"),
-    feet: Item("common.items.armor.miner.foot"),
-    lantern: Item("common.items.lantern.black_0"),
-)

assets/common/loot_tables/dungeon/cultist/chest.ron

@@ -11,6 +11,8 @@
             (0.1, MultiDrop(Item("common.items.food.spore_corruption"), 1, 3)),
             // Food
             (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 3, 6)),
+            // Ingredients        
+            (0.75, MultiDrop(Item("common.items.crafting_ing.alkahest"), 1, 3)),                            
         ]),
         Lottery([
             (0.6, Nothing),

assets/common/loot_tables/dungeon/dwarven_quarry/alligator.ron

@@ -1,7 +0,0 @@
-[
-  (1, All([
-        Item("common.items.keys.quarry_keys.smelting"),
-        MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2),
-        ],
-   )),
-]

assets/common/loot_tables/dungeon/dwarven_quarry/captain.ron

@@ -1,8 +0,0 @@
-[
-  (1, All([
-        Item("common.items.keys.quarry_keys.backdoor"),
-        MultiDrop(Item("common.items.utility.coins"), 50, 150),
-        LootTable("common.loot_tables.weapons.components.tier-4"),
-        ],
-   )),
-]

assets/common/loot_tables/dungeon/dwarven_quarry/cyclops.ron

@@ -1,8 +0,0 @@
-[
-  (1.0, All([
-        Item("common.items.keys.quarry_keys.cyclops_eye"),
-        MultiDrop(Item("common.items.utility.coins"), 200, 500),
-        MultiDrop(Item("common.items.mineral.ingot.iron"), 5, 10),
-        ],
-   )),
-]

assets/common/loot_tables/dungeon/dwarven_quarry/flamekeeper.ron

@@ -1,8 +1,7 @@
 [
   (1, All([
-        Item("common.items.keys.quarry_keys.flamekeeper_left"),
+        MultiDrop(Item("common.items.keys.quarry_keys.miner_key"), 2, 2),        
-        Item("common.items.keys.quarry_keys.flamekeeper_right"),
+        MultiDrop(Item("common.items.crafting_ing.alkahest"), 1, 1),        
-        MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2),
         ],
    )),
 ]

assets/common/loot_tables/dungeon/dwarven_quarry/forgemaster.ron

@@ -0,0 +1,10 @@
+[
+  (1, All([
+        Item("common.items.keys.quarry_keys.miner_key"),
+        MultiDrop(Item("common.items.mineral.ore.ancient_gold"), 1, 3),
+        MultiDrop(Item("common.items.crafting_ing.alkahest"), 1, 2),        
+        MultiDrop(Item("common.items.crafting_ing.dwarven_battery"), 1, 1),                
+//        Item("common.items.keys.quarry_keys.rusty_tower_key"),
+        ],
+   )),
+]

assets/common/loot_tables/dungeon/dwarven_quarry/irongolem.ron

@@ -0,0 +1,7 @@
+[
+  (1, All([
+        MultiDrop(Item("common.items.crafting_ing.alkahest"), 1, 1),
+        MultiDrop(Item("common.items.crafting_ing.dwarven_battery"), 1, 2),
+        ],
+   )),
+]

assets/common/loot_tables/dungeon/dwarven_quarry/irongolem_key.ron

@@ -0,0 +1,7 @@
+[
+  (1, All([
+        Item("common.items.keys.quarry_keys.miner_key"),
+        MultiDrop(Item("common.items.crafting_ing.dwarven_battery"), 1, 2),
+        ],
+   )),
+]

assets/common/loot_tables/dungeon/dwarven_quarry/miner.ron

@@ -0,0 +1,8 @@
+[
+    // Crafting Ingredients
+    (4.0, LootTable("common.loot_tables.materials.common")),
+    // Consumables
+    (2.0, Item("common.items.consumable.potion_minor")),
+    // Gold
+    (2.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)),
+]

assets/common/loot_tables/dungeon/dwarven_quarry/minotaur.ron

@@ -1,20 +0,0 @@
-[
-  (1.7, All([
-            Item("common.items.keys.quarry_keys.ancient"),
-            // coins are temporary placeholder for unique drops
-            MultiDrop(Item("common.items.utility.coins"), 200, 500),
-            MultiDrop(Item("common.items.log.eldwood"), 2, 6),
-      ],
-   )),
-  (0.1, All([
-            Item("common.items.keys.quarry_keys.ancient"),
-            Item("common.items.weapons.axe.parashu"),
-      ],
-   )),
-  (0.2, All([
-            Item("common.items.keys.quarry_keys.ancient"),
-            Item("common.items.armor.misc.neck.carcanet_of_wrath"),
-      ],
-   )),
-
-]

assets/common/loot_tables/dungeon/dwarven_quarry/overseer.ron

@@ -1,7 +0,0 @@
-[
-  (1, All([
-        Item("common.items.keys.quarry_keys.overseer"),
-        MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2),
-        ],
-   )),
-]

assets/common/loot_tables/dungeon/dwarven_quarry/t4-mats.ron

@@ -1,5 +0,0 @@
-[
-  (1.0, MultiDrop(Item("common.items.crafting_ing.cloth.sunsilk"), 1, 3)),
-  (1.0, MultiDrop(Item("common.items.mineral.ingot.orichalcum"), 1, 3)),
-  (1.0, MultiDrop(Item("common.items.log.eldwood"), 2, 6)),
-]

assets/common/loot_tables/dungeon/dwarven_quarry/t4.ron

@@ -1,9 +0,0 @@
-[
-  // Armor
-    (10.0, LootTable("common.loot_tables.weapons.tier-5")),
-    (10.0, LootTable("common.loot_tables.armor.tier-5")),
-    // Misc
-    (1.0, Item("common.items.armor.misc.neck.carcanet_of_wrath")),
-    // Legendary weapons
-    (1.0, LootTable("common.loot_tables.weapons.legendary_melee")),
-]

assets/common/loot_tables/dungeon/terracotta/chest_terracotta.ron

@@ -3,8 +3,8 @@
         // Key
         Item("common.items.keys.terracotta_key_door"),
         Lottery([
-            (0.4, Nothing),
+            (1.0, Nothing),
-            (0.6, LootTable("common.loot_tables.consumables.pyrotechnics")),
+            (0.5, Item("common.items.mineral.ore.ancient_gold")),
         ]),
     ])),
 ]

assets/common/npc_names.ron

@@ -1009,6 +1009,10 @@
             cursekeeper: (
                 keyword: "cursekeeper",
                 generic: "Cursekeeper"
+            ),
+            forgemaster: (
+                keyword: "forgemaster",
+                generic: "Forgemaster"
             )
         )
     ),
@@ -1051,6 +1055,10 @@
             coralgolem: (
                 keyword: "coralgolem",
                 generic: "Coral Golem"
+            ),
+            irongolem: (
+                keyword: "irongolem",
+                generic: "IronGolem"
             )
         )
     ),
@@ -1153,9 +1161,9 @@
                 keyword: "gnome",
                 generic: "Gnome"
             ),
-            clockwork: (
+            iron_dwarf: (
-                keyword: "clockwork",
+                keyword: "iron_dwarf",
-                generic: "Clockwork"
+                generic: "Iron Dwarf"
             ),
             flamekeeper: (
                 keyword: "flamekeeper",
@@ -1325,9 +1333,9 @@
                 keyword: "alligator",
                 generic: "Alligator"
             ),
-            hermit_alligator: (
+            snaretongue: (
-                keyword: "hermit_alligator",
+                keyword: "snaretongue",
-                generic: "Hermit Alligator"
+                generic: "Snaretongue"
             ),
             salamander: (
                 keyword: "salamander",

assets/common/recipe_book.ron

@@ -291,8 +291,9 @@
     "orichalcum_ingot": (
         output: ("common.items.mineral.ingot.orichalcum", 2),
         inputs: [
-            (Item("common.items.mineral.ingot.gold"), 1, false),
+            (Item("common.items.mineral.ingot.copper"), 2, false),
-            (Item("common.items.mineral.ingot.silver"), 1, false),
+            (Item("common.items.crafting_ing.alkahest"), 1, false),
+            (Item("common.items.mineral.ore.ancient_gold"), 1, false),
         ],
         craft_sprite: Some(Forge),
     ),
@@ -1677,6 +1678,17 @@
         ],
         craft_sprite: Some(Anvil),
     ),
+    "orichalcum_head": (
+        output: ("common.items.armor.mail.orichalcum.head", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 10, false),
+            (Item("common.items.mineral.ingot.cobalt"), 2, false),
+            (Item("common.items.crafting_ing.hide.plate"), 4, false),
+            (Item("common.items.mineral.gem.diamond"), 3, false),
+            (Item("common.items.mineral.gem.sapphire"), 2, false),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
     //ARMOR/BRINESTONE
     "brinestone_back": (
         output: ("common.items.armor.brinestone.back", 1),
@@ -2057,6 +2069,17 @@
             craft_sprite: Some(CraftingBench),
             is_recycling: false,
         ),
+    "delvers_lamp": (
+            output: ("common.items.lantern.delvers_lamp", 1),
+            inputs: [
+                (Item("common.items.crafting_ing.dwarven_battery"), 1, false),
+                (Item("common.items.crafting_ing.twigs"), 16, false),
+                (Item("common.items.crafting_ing.pearl"), 1, false),
+                (Item("common.items.tool.craftsman_hammer"), 0, false),
+            ],
+            craft_sprite: Some(CraftingBench),
+            is_recycling: false,
+        ),
 /// MODULAR WEAPONS/SWORDS/SECONDARY COMPONENTS
     "short_hilt": (
         output: ("common.items.modular.weapon.secondary.sword.short", 1),

assets/common/repair_recipe_book.ron

@@ -1061,6 +1061,13 @@ recipes: {
             (Item("common.items.mineral.ore.velorite"), 2),
         ],
     ),
+    ItemDefId("common.items.armor.mail.orichalcum.head"): (
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 12),
+            (Item("common.items.mineral.ore.velorite"), 3),
+        ],
+    ),
     ItemDefId("common.items.armor.brinestone.back"): (
         inputs: [
             (Item("common.items.crafting_ing.brinestone"), 1),

assets/server/manifests/kits.ron

@@ -104,6 +104,7 @@
         (Item("common.items.armor.mail.orichalcum.hand"), 1),
         (Item("common.items.armor.mail.orichalcum.pants"), 1),
         (Item("common.items.armor.mail.orichalcum.shoulder"), 1),
+        (Item("common.items.armor.mail.orichalcum.head"), 1),
 
         // Weapons
         (ModularWeapon(tool: Sword, material: Orichalcum),1),

assets/voxygen/audio/sfx.ron

@@ -1486,6 +1486,13 @@
             threshold: 1.2,
             subtitle: "subtitle-deep_laugh",
         ),
+        Bleep: (
+            files: [
+                    "voxygen.audio.sfx.abilities.bleep",
+                ],
+            threshold: 1.8,
+            subtitle: "subtitle-bleep",
+        ),        
         FlashFreeze: (
             files: [
                     "voxygen.audio.sfx.abilities.minotaur_smash_2",

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

@@ -111,6 +111,7 @@ subtitle-attack-cyclops_charge = Cyclops charge
 subtitle-attack-fuse_charge = Fuse sizzling
 subtitle-giga_roar = Frost gigas roar
 subtitle-deep_laugh = Deep Laugh
+subtitle-bleep = Beep Bleep
 subtitle-attack-flash_freeze = Flash freeze
 subtitle-attack-icy_spikes = Icy spikes
 subtitle-attack-ice_crack = Ice crack

assets/voxygen/i18n/en/item/armor/armor.ftl

@@ -571,6 +571,9 @@ armor-mail-orichalcum-1 = Orichalcum Legplates
 armor-mail-orichalcum-5 = Orichalcum Mantle
     .desc = An ancient alloy. Myths remain of heroes who once wore this armor.
 
+armor-mail-orichalcum-7 = Orichalcum Helmet
+    .desc = An ancient alloy. Myths remain of heroes who once wore this armor.
+
 armor-mail-steel-back = Steel Cape
     .desc = Metal alloy interlocking plates to improve protection.