Update assets

2024-08-08 17:03:53 -04:00 · 2024-08-08 17:03:53 -04:00 · 545f8c6643
commit 545f8c6643
parent 99eec21aee
57 changed files with 361 additions and 200 deletions
--- a/assets/common/abilities/ability_set_manifest.ron
+++ b/assets/common/abilities/ability_set_manifest.ron
@ -771,8 +771,9 @@
        primary: Simple(None, "common.abilities.custom.harvester.scythe"),
        secondary: Simple(None, "common.abilities.custom.harvester.firebreath"),
        abilities: [
-            Simple(None, "common.abilities.custom.harvester.ensnaringvines"),
            Simple(None, "common.abilities.custom.harvester.explodingpumpkin"),
+            Simple(None, "common.abilities.custom.harvester.ensnaringvines_sparse"),
+            Simple(None, "common.abilities.custom.harvester.ensnaringvines_dense"),
        ],
    ),
    // TODO: Allow ability sets to expand other ability sets
--- a/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron
+++ b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron
@ -0,0 +1,10 @@
+SpriteSummon(
+    buildup_duration: 0.9,
+    cast_duration: 0.6,
+    recover_duration: 0.5,
+    sprite: EnsnaringVines,
+    del_timeout: None,
+    summon_distance: (0, 25),
+    sparseness: 0.6,
+    angle: 360,
+)
--- a/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron
+++ b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron
@ -0,0 +1,10 @@
+SpriteSummon(
+    buildup_duration: 0.6,
+    cast_duration: 0.4,
+    recover_duration: 0.3,
+    sprite: EnsnaringVines,
+    del_timeout: None,
+    summon_distance: (0, 30),
+    sparseness: 0.8,
+    angle: 360,
+)
--- a/assets/common/abilities/custom/harvester/explodingpumpkin.ron
+++ b/assets/common/abilities/custom/harvester/explodingpumpkin.ron
@ -1,21 +1,21 @@
 BasicRanged(
    energy_cost: 0,
-    buildup_duration: 0.75,
+    buildup_duration: 1.0,
    recover_duration: 1.6,
    projectile: (
        kind: Explosive(
-            radius: 5,
+            radius: 7.2,
            min_falloff: 0.6,
            reagent: Some(Red),
            terrain: Some((5, Black)),
        ),
        attack: Some((
-            damage: 37.5,
-            knockback: Some(25),
+            damage: 20,
+            knockback: Some(22),
            energy: 0,
            buff: Some((
                kind: Burning,
-                dur_secs: 5,
+                dur_secs: 4,
                strength: DamageFraction(0.2),
                chance: 1.0,
            )),
--- a/assets/common/abilities/custom/harvester/firebreath.ron
+++ b/assets/common/abilities/custom/harvester/firebreath.ron
@ -2,18 +2,18 @@ BasicBeam(
    buildup_duration: 1.4,
    recover_duration: 0.9,
    beam_duration: 1.0,
-    damage: 9.0,
+    damage: 5.0,
    tick_rate: 1.5,
    range: 20.0,
    max_angle: 15.0,
    damage_effect: Some(Buff((
        kind: Burning,
-        dur_secs: 10.0,
-        strength: DamageFraction(1.0),
+        dur_secs: 3.0,
+        strength: DamageFraction(0.8),
        chance: 1.0,
    ))),
    energy_regen: 0,
    energy_drain: 0,
-    ori_rate: 0.3,
+    ori_rate: 0.7,
    specifier: Flamethrower,
 )
--- a/assets/common/abilities/custom/harvester/scythe.ron
+++ b/assets/common/abilities/custom/harvester/scythe.ron
@ -1,19 +1,19 @@
 BasicMelee(
    energy_cost: 0,
-    buildup_duration: 0.9,
-    swing_duration: 0.1,
+    buildup_duration: 1.0,
+    swing_duration: 0.2,
    hit_timing: 0.5,
-    recover_duration: 1.2,
+    recover_duration: 1.0,
    melee_constructor: (
        kind: Slash(
-            damage: 21.0,
+            damage: 15.0,
            poise: 10.0,
            knockback: 10.0,
            energy_regen: 0.0,
        ),
-        range: 4.0,
-        angle: 60.0,
+        range: 4.5,
+        angle: 50.0,
        multi_target: Some(Normal),
    ),
-    ori_modifier: 1.0,
+    ori_modifier: 0.5,
 )
--- a/assets/common/abilities/custom/mandragora/basic.ron
+++ b/assets/common/abilities/custom/mandragora/basic.ron
@ -7,7 +7,7 @@ BasicMelee(
    melee_constructor: (
        kind: Bash(
            damage: 8,
-            poise: 5,
+            poise: 10,
            knockback: 0,
            energy_regen: 0,
        ),
--- a/assets/common/abilities/custom/mandragora/scream.ron
+++ b/assets/common/abilities/custom/mandragora/scream.ron
@ -7,7 +7,7 @@ BasicMelee(
    melee_constructor: (
        kind: SonicWave(
            damage: 10,
-            poise: 100,
+            poise: 75,
            knockback: 20,
            energy_regen: 0,
        ),
--- a/assets/common/abilities/custom/woodgolem/shockwave.ron
+++ b/assets/common/abilities/custom/woodgolem/shockwave.ron
@ -1,20 +1,20 @@
 Shockwave(
    energy_cost: 0,
-    buildup_duration: 3.0,
+    buildup_duration: 1.2,
    swing_duration: 0.12,
-    recover_duration: 2.4,
-    damage: 60.0,
+    recover_duration: 1.5,
+    damage: 22.0,
    poise_damage: 30,
-    knockback: (strength: 30.0, direction: TowardsUp),
+    knockback: (strength: 20.0, direction: TowardsUp),
    shockwave_angle: 90.0,
    shockwave_vertical_angle: 90.0,
    shockwave_speed: 15.0,
-    shockwave_duration: 2.0,
+    shockwave_duration: 1.9,
    dodgeable: Jump,
    move_efficiency: 0.0,
    damage_kind: Crushing,
    specifier: Ground,
-    ori_rate: 1.0,
+    ori_rate: 0.9,
    timing: PostBuildup,
    emit_outcome: true,
 )
--- a/assets/common/abilities/custom/woodgolem/spin.ron
+++ b/assets/common/abilities/custom/woodgolem/spin.ron
@ -1,18 +1,18 @@
 BasicMelee(
    energy_cost: 0,
-    buildup_duration: 0.9,
+    buildup_duration: 1.2,
    swing_duration: 0.3,
    hit_timing: 0.6,
-    recover_duration: 0.6,
+    recover_duration: 1.2,
    melee_constructor: (
        kind: Bash(
-            damage: 45,
+            damage: 18,
            poise: 30,
            knockback: 20,
            energy_regen: 0,
        ),
-        range: 7.5,
+        range: 5.0,
        angle: 360,
    ),
-    ori_modifier: 1.0,
+    ori_modifier: 0.75,
 )
--- a/assets/common/abilities/custom/woodgolem/strike.ron
+++ b/assets/common/abilities/custom/woodgolem/strike.ron
@ -1,18 +1,18 @@
 BasicMelee(
    energy_cost: 0,
-    buildup_duration: 1.6,
-    swing_duration: 0.1,
+    buildup_duration: 1.0,
+    swing_duration: 0.2,
    hit_timing: 0.6,
    recover_duration: 1.0,
    melee_constructor: (
        kind: Bash(
-            damage: 30.0,
+            damage: 12.0,
            poise: 25.0,
            knockback: 15.0,
            energy_regen: 0.0,
        ),
        range: 4.0,
-        angle: 45.0,
+        angle: 55.0,
    ),
-    ori_modifier: 0.4,
+    ori_modifier: 0.7,
 )
--- a/assets/common/abilities/gnarling/chieftain/firebarrage.ron
+++ b/assets/common/abilities/gnarling/chieftain/firebarrage.ron
@ -1,28 +1,28 @@
 BasicRanged(
    energy_cost: 0,
-    buildup_duration: 0.825,
+    buildup_duration: 1.0,
    recover_duration: 0.6,
    projectile: (
        kind: Explosive(
-            radius: 2,
-            min_falloff: 0.5,
+            radius: 3,
+            min_falloff: 0.7,
            reagent: Some(Red),
            terrain: Some((2, Black))
        ),
        attack: Some((
-            damage: 13.5,
+            damage: 5.5,
            energy: 10,
            buff: Some((
                kind: Burning,
-                dur_secs: 5,
-                strength: DamageFraction(0.1),
+                dur_secs: 3,
+                strength: DamageFraction(0.3),
                chance: 0.1,
            )),
        )),
    ),
    projectile_body: Object(BoltFire),
    projectile_speed: 25,
-    num_projectiles: 8,
+    num_projectiles: 5,
    projectile_spread: 0.125,
    move_efficiency: 0.3,
 )
--- a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron
+++ b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron
@ -1,16 +1,16 @@
 Shockwave(
    energy_cost: 0,
-    buildup_duration: 0.975,
+    buildup_duration: 1.2,
    swing_duration: 0.1,
-    recover_duration: 0.6,
-    damage: 30,
+    recover_duration: 0.8,
+    damage: 16,
    poise_damage: 0,
-    knockback: ( strength: 25, direction: Away),
+    knockback: ( strength: 15, direction: Away),
    shockwave_angle: 360,
    shockwave_vertical_angle: 90,
-    shockwave_speed: 10,
-    shockwave_duration: 1,
-    dodgeable: Roll,
+    shockwave_speed: 12,
+    shockwave_duration: 1.0,
+    dodgeable: Jump,
    move_efficiency: 0,
    damage_kind: Energy,
    specifier: Fire,
--- a/assets/common/abilities/gnarling/chieftain/flamestrike.ron
+++ b/assets/common/abilities/gnarling/chieftain/flamestrike.ron
@ -1,21 +1,21 @@
 BasicMelee(
    energy_cost: 0,
-    buildup_duration: 0.6,
-    swing_duration: 0.1,
+    buildup_duration: 0.75,
+    swing_duration: 0.4,
    hit_timing: 0.5,
-    recover_duration: 0.45,
+    recover_duration: 0.6,
    melee_constructor: (
        kind: Bash(
-            damage: 12,
+            damage: 9,
            poise: 10,
            knockback: 0,
            energy_regen: 0,
        ),
-        range: 7.5,
-        angle: 60.0,
+        range: 3.0,
+        angle: 40.0,
        damage_effect: Some(Buff((
            kind: Burning,
-            dur_secs: 10.0,
+            dur_secs: 4.0,
            strength: DamageFraction(0.5),
            chance: 0.5,
        ))),
--- a/assets/common/abilities/gnarling/totem/green.ron
+++ b/assets/common/abilities/gnarling/totem/green.ron
@ -1,24 +1,24 @@
 BasicAura(
-    buildup_duration: 0.375,
-    cast_duration: 0.5,
-    recover_duration: 0.375,
+    buildup_duration: 0.2,
+    cast_duration: 0.4,
+    recover_duration: 0.2,
    targets: InGroup,
    auras: [
        (
            kind: Regeneration,
-            strength: 7.5,
-            duration: Some(5),
+            strength: 1,
+            duration: Some(1),
            category: Magical,
        ),
        (
            kind: ProtectingWard,
-            strength: 0.75,
-            duration: Some(5),
+            strength: 0.5,
+            duration: Some(1),
            category: Magical,
        ),
    ],
-    aura_duration: Some(2),
-    range: 50,
+    aura_duration: Some(1),
+    range: 15,
    energy_cost: 0,
    scales_with_combo: false,
 )
--- a/assets/common/abilities/gnarling/totem/red.ron
+++ b/assets/common/abilities/gnarling/totem/red.ron
@ -1,18 +1,18 @@
 BasicAura(
-    buildup_duration: 0.375,
-    cast_duration: 0.5,
-    recover_duration: 0.375,
+    buildup_duration: 0.2,
+    cast_duration: 0.4,
+    recover_duration: 0.2,
    targets: OutOfGroup,
    auras: [
        (
            kind: Burning,
-            strength: 0.75,
-            duration: Some(5),
+            strength: 1.2,
+            duration: Some(1),
            category: Magical,
        ),
    ],
-    aura_duration: Some(2),
-    range: 50,
+    aura_duration: Some(1),
+    range: 15,
    energy_cost: 0,
    scales_with_combo: false,
 )
--- a/assets/common/abilities/gnarling/totem/white.ron
+++ b/assets/common/abilities/gnarling/totem/white.ron
@ -1,18 +1,18 @@
 BasicAura(
-    buildup_duration: 0.375,
-    cast_duration: 0.5,
-    recover_duration: 0.375,
+    buildup_duration: 0.2,
+    cast_duration: 0.4,
+    recover_duration: 0.2,
    targets: InGroup,
    auras: [
        (
            kind: Hastened,
-            strength: 0.75,
-            duration: Some(5),
+            strength: 0.4,
+            duration: Some(1),
            category: Magical,
        ),
    ],
-    aura_duration: Some(2),
-    range: 50,
+    aura_duration: Some(1),
+    range: 15,
    energy_cost: 0,
    scales_with_combo: false,
 )
--- a/assets/common/entity/dungeon/gnarling/chieftain.ron
+++ b/assets/common/entity/dungeon/gnarling/chieftain.ron
@ -2,7 +2,7 @@
 #![enable(implicit_some)]
 (
    name: Name("Gnarling Chieftain"),
-    body: RandomWith("gnarling"),
+    body: RandomWith("gnarling_chieftain"),
    alignment: Alignment(Enemy),
    loot: LootTable("common.loot_tables.dungeon.gnarling.chieftain"),
    inventory: (
--- a/assets/common/item_i18n_manifest.ron
+++ b/assets/common/item_i18n_manifest.ron
@ -3183,6 +3183,9 @@
        Simple(
            "common.items.consumable.potion_minor",
        ): "object-potion_minor",
+        Simple(
+            "common.items.consumable.potion_freezing",
+        ): "object-potion_freezing",
        Simple(
            "common.items.lantern.black_0",
        ): "lantern-black",
--- a/assets/common/items/armor/misc/head/gnarling_mask.ron
+++ b/assets/common/items/armor/misc/head/gnarling_mask.ron
@ -6,10 +6,10 @@ ItemDef(
        stats: Direct((
            protection: Some(Normal(3.0)),
            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(14.0),
+            energy_max: Some(6.0),
        )),
    )),
-    quality: High,
+    quality: Moderate,
    tags: [
        Gnarling,
        SalvageInto(Lifecloth, 1),
--- a/assets/common/items/charms/burning_charm.ron
+++ b/assets/common/items/charms/burning_charm.ron
@ -17,5 +17,5 @@ ItemDef(
        ])
    ),
    quality: Legendary,
-    tags: [],
+    tags: [Charm],
 )
--- a/assets/common/items/charms/frozen_charm.ron
+++ b/assets/common/items/charms/frozen_charm.ron
@ -17,5 +17,5 @@ ItemDef(
        ])
    ),
    quality: Legendary,
-    tags: [],
+    tags: [Charm],
 )
--- a/assets/common/items/charms/lifesteal_charm.ron
+++ b/assets/common/items/charms/lifesteal_charm.ron
@ -16,5 +16,5 @@ ItemDef(
        ])
    ),
    quality: Legendary,
-    tags: [],
+    tags: [Charm],
 )
--- a/assets/common/items/consumable/potion_combustion.ron
+++ b/assets/common/items/consumable/potion_combustion.ron
@ -11,7 +11,15 @@ ItemDef(
                    duration: Some(10)
                ),
                cat_ids: [Natural],
-            ))
+            )),
+            Buff((
+                kind: PotionSickness,
+                data: (
+                    strength: 0.15,
+                    duration: Some(30),
+                ),
+                cat_ids: [Natural],
+            )),
        ])
    ),
    quality: Moderate,
--- a/assets/common/items/consumable/potion_freezing.ron
+++ b/assets/common/items/consumable/potion_freezing.ron
@ -0,0 +1,27 @@
+ItemDef(
+    legacy_name: "Freezing Potion",
+    legacy_description: "Freezes the user's brain",
+    kind: Consumable(
+        kind: Drink,
+        effects: All([
+            Buff((
+                kind: Frozen,
+                data: (
+                    strength: 0.1,
+                    duration: Some(30)
+                ),
+                cat_ids: [Natural],
+            )),
+            Buff((
+                kind: PotionSickness,
+                data: (
+                    strength: 0.15,
+                    duration: Some(30),
+                ),
+                cat_ids: [Natural],
+            )),
+        ])
+    ),
+    quality: Moderate,
+    tags: [Potion],
+)
--- a/assets/common/items/glider/moth.ron
+++ b/assets/common/items/glider/moth.ron
@ -2,6 +2,6 @@ ItemDef(
    legacy_name: "Green Luna",
    legacy_description: "The delicate wings flutter faintly.",
    kind: Glider,
-    quality: High,
+    quality: Moderate,
    tags: [],
 )
--- a/assets/common/items/lantern/pumpkin.ron
+++ b/assets/common/items/lantern/pumpkin.ron
@ -8,6 +8,6 @@ ItemDef(
            flicker_thousandths: 600,
        ),
    ),
-    quality: High,
+    quality: Moderate,
    tags: [Utility],
 )
--- a/assets/common/items/recipes/potions.ron
+++ b/assets/common/items/recipes/potions.ron
@ -4,6 +4,7 @@ ItemDef(
    kind: RecipeGroup(
        recipes: [
            "potion_combustion",
+            "potion_freezing",
            "potion_agility",
            "potion_minor",
            "potion_medium",
--- a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron
+++ b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron
@ -1,12 +1,14 @@
 [
-    // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-1")),
-    // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-1")),
-    // Misc
-    (3.0, Item("common.items.armor.misc.neck.scratched")),
-    (2.0, Item("common.items.armor.misc.head.wanderers_hat")),
-    (3.0, Item("common.items.armor.misc.head.bamboo_twig")),
-    // Chieftain Mask
-    (1.0, Item("common.items.armor.misc.head.gnarling_mask")),
+    (1, All([
+        All([
+            LootTable("common.loot_tables.armor.tier-1"),
+            LootTable("common.loot_tables.weapons.tier-1"),
+        ]),
+        Lottery([
+            (2.0, Nothing),
+            (1.0, Item("common.items.armor.misc.neck.scratched")),
+            (1.0, Item("common.items.armor.misc.head.gnarling_mask")),
+            (1.0, Item("common.items.glider.moth")),
+        ]),
+    ])),
 ]
--- a/assets/common/loot_tables/dungeon/gnarling/harvester.ron
+++ b/assets/common/loot_tables/dungeon/gnarling/harvester.ron
@ -1,10 +1,13 @@
 [
-    // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-3")),
-    // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-3")),
-    // Misc
-    (3.0, Item("common.items.armor.misc.neck.scratched")),
-    (2.0, Item("common.items.lantern.pumpkin")),
-    (1.0, Item("common.items.glider.moth")),
+    (1, All([
+        All([
+            LootTable("common.loot_tables.armor.tier-2"),
+            LootTable("common.loot_tables.weapons.tier-2"),
+        ]),
+        Lottery([
+            (3.0, Nothing),
+            (1.0, Item("common.items.lantern.pumpkin")),
+            (1.0, Item("common.items.armor.misc.head.wanderers_hat")),
+        ]),
+    ])),
 ]
--- a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron
+++ b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron
@ -1,6 +1,16 @@
 [
-    // Crafting ingredients
-    (2.4, MultiDrop(Item("common.items.log.wood"), 5, 10)),
-    (0.1, MultiDrop(Item("common.items.log.hardwood"), 1, 2)),
-    (0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")),
+    (1, Lottery([
+        (0.7, All([
+            MultiDrop(Item("common.items.log.wood"), 3, 4),
+            MultiDrop(Item("common.items.crafting_ing.twigs"), 1, 2),
+            Lottery([
+                (0.6, MultiDrop(Item("common.items.log.bamboo"), 1, 2)),
+                (0.4, LootTable("common.loot_tables.weapons.components.secondary.sceptre")),
+                ]),
+        ])),
+        (0.3, All([
+            MultiDrop(Item("common.items.log.wood"), 5, 7),
+            MultiDrop(Item("common.items.crafting_ing.twigs"), 3, 5),
+        ])),
+    ]))
 ]
--- a/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron
+++ b/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron
@ -4,7 +4,7 @@
            // Ingredients
            (2.0, Item("common.items.crafting_ing.coral_branch")),
            (0.5, Item("common.items.crafting_ing.pearl")),
-            (0.25, Item("common.items.recipes.unique.seashell_necklace")),
+            (0.5, Item("common.items.recipes.armor.brinestone")),
            (0.25, Item("common.items.recipes.unique.winged_coronet")),
            (0.25, Item("common.items.recipes.unique.abyssal_ring")),
        ]),
--- a/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron
+++ b/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron
@ -1,3 +1,5 @@
 [
-    (1.0, Item("common.items.recipes.armor.brinestone")),
+    (1.0, Nothing),
+    (1.0, LootTable("common.loot_tables.food.prepared")),
+    (0.5, Item("common.items.recipes.unique.seashell_necklace")),
 ]
--- a/assets/common/loot_tables/sprite/chest-buried.ron
+++ b/assets/common/loot_tables/sprite/chest-buried.ron
@ -1,5 +1,5 @@
 [
-    (1.0, LootTable("common.loot_tables.weapons.components.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.components.tier-0")),
    (1.0, LootTable("common.loot_tables.armor.cloth")),
    (0.5, Item("common.items.recipes.explosives")),
 ]
--- a/assets/common/loot_tables/sprite/chest.ron
+++ b/assets/common/loot_tables/sprite/chest.ron
@ -1,7 +1,16 @@
 [
-    (1.0, LootTable("common.loot_tables.weapons.components.tier-0")),
-    (1.0, LootTable("common.loot_tables.weapons.components.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.cloth")),
+    (0.5, LootTable("common.loot_tables.weapons.components.tier-0")),
+    (0.25, LootTable("common.loot_tables.weapons.tier-0")),
+    (0.25, LootTable("common.loot_tables.armor.tier-0")),
+    (0.25, Item("common.items.armor.misc.head.bamboo_twig")),
+    // Currency
+    (3.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)),
+    // Materials
+    (0.5, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 5, 10)),
+    // Consumables
+    (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)),
+    // Food
+    (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)),
    (0.2, Item("common.items.recipes.explosives")),
    (0.5, Item("common.items.recipes.instruments")),
    (0.2, Item("common.items.recipes.charms")),
--- a/assets/common/npc_names.ron
+++ b/assets/common/npc_names.ron
@ -1233,6 +1233,10 @@
                keyword: "treasure_egg",
                generic: "Treasure Egg",
            ),
+            gnarling_chieftain: (
+                keyword: "gnarling_chieftain",
+                generic: "Gnarling Chieftain"
+            ),
        )
    ),
    fish_small: (
--- a/assets/common/recipe_book_manifest.ron
+++ b/assets/common/recipe_book_manifest.ron
@ -31,6 +31,15 @@
        ],
        craft_sprite: Some(Anvil),
    ),
+    "potion_freezing": (
+        output: ("common.items.consumable.potion_freezing", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.empty_vial"), 1, false),
+            (Item("common.items.crafting_ing.animal_misc.icy_fang"), 3, false),
+            (Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, false),
+        ],
+        craft_sprite: Some(Cauldron),
+    ),
    "potion_combustion": (
        output: ("common.items.consumable.potion_combustion", 1),
        inputs: [
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@ -24,8 +24,8 @@ loot_tables: [
    (20.375, true, "common.trading.food"),

    // Recipes
-    (1.0, true, "common.trading.sellable_recipe"),
-    (1.0, false, "common.trading.unsellable_recipe"),
+    (1.8, true, "common.trading.sellable_recipe"),
+    (1.5, false, "common.trading.unsellable_recipe"),

    // Potions
    //
@ -50,5 +50,6 @@ good_scaling: [
    (Armor, 0.025), // common.items.armor.misc.pants.worker_blue
    (Tools, 0.015487), // common.items.weapons.staff.starter_staff
    (Ingredients, 0.034626), // common.items.crafting_ing.leather_scraps
+    (Wood, 0.034626), // common.items.log.wood
    (Recipe, 0.01), // common.items.recipes
 ])
--- a/assets/common/trading/item_price_equality.ron
+++ b/assets/common/trading/item_price_equality.ron
@ -1,7 +1,50 @@
 [
-    // Legendary sceptres
+    // Purple Linen set
    Set([
-        "common.items.weapons.sceptre.root_evil",
-        "common.items.weapons.sceptre.caduceus",
+        "common.items.armor.cloth_purple.belt",
+        "common.items.armor.cloth_purple.chest",
+        "common.items.armor.cloth_purple.foot",
+        "common.items.armor.cloth_purple.hand",
+        "common.items.armor.cloth_purple.pants",
+        "common.items.armor.cloth_purple.shoulder",
+    ]),
+
+    // Green Linen set
+    Set([
+        "common.items.armor.cloth_green.belt",
+        "common.items.armor.cloth_green.chest",
+        "common.items.armor.cloth_green.foot",
+        "common.items.armor.cloth_green.hand",
+        "common.items.armor.cloth_green.pants",
+        "common.items.armor.cloth_green.shoulder",
+    ]),
+
+    // Blue Linen set
+    Set([
+        "common.items.armor.cloth_blue.belt",
+        "common.items.armor.cloth_blue.chest",
+        "common.items.armor.cloth_blue.foot",
+        "common.items.armor.cloth_blue.hand",
+        "common.items.armor.cloth_blue.pants",
+        "common.items.armor.cloth_blue.shoulder_0",
+        "common.items.armor.cloth_blue.shoulder_1",
+    ]),
+
+    // Worker/starter clothing
+    Set([
+        "common.items.armor.misc.chest.worker_green_0",
+        "common.items.armor.misc.chest.worker_green_1",
+        "common.items.armor.misc.chest.worker_orange_0",
+        "common.items.armor.misc.chest.worker_orange_1",
+        "common.items.armor.misc.chest.worker_purple_0",
+        "common.items.armor.misc.chest.worker_purple_1",
+        "common.items.armor.misc.chest.worker_purple_brown",
+        "common.items.armor.misc.chest.worker_red_0",
+        "common.items.armor.misc.chest.worker_red_1",
+        "common.items.armor.misc.chest.worker_yellow_0",
+        "common.items.armor.misc.chest.worker_yellow_1",
+        "common.items.armor.misc.pants.worker_blue",
+        "common.items.armor.misc.pants.worker_brown",
+        "common.items.armor.misc.foot.sandals",
    ]),
 ]
--- a/assets/common/trading/unsellable_recipe.ron
+++ b/assets/common/trading/unsellable_recipe.ron
@ -6,40 +6,40 @@
 [
    // Recipes
    // Misc Groups
-    (1.0, Item("common.items.recipes.charms")),
-    (1.0, Item("common.items.recipes.explosives")),
-    (1.0, Item("common.items.recipes.gliders")),
-    (1.0, Item("common.items.recipes.instruments")),
+    (1.25, Item("common.items.recipes.charms")),
+    (1.25, Item("common.items.recipes.explosives")),
+    (1.25, Item("common.items.recipes.gliders")),
+    (1.25, Item("common.items.recipes.instruments")),
    // Equipment
    (1.0, Item("common.items.recipes.equipment.moderate")),
-    (0.2, Item("common.items.recipes.equipment.advanced")),
+    (0.3, Item("common.items.recipes.equipment.advanced")),
    // Armors
-    (0.7, Item("common.items.recipes.armor.steel")),
-    (0.7, Item("common.items.recipes.armor.silken")),
-    (0.7, Item("common.items.recipes.armor.scale")),
-    (0.7, Item("common.items.recipes.weapons.steel")),
-    (0.7, Item("common.items.recipes.weapons.hardwood")),
-    (0.4, Item("common.items.recipes.armor.cobalt")),
-    (0.4, Item("common.items.recipes.armor.druid")),
-    (0.4, Item("common.items.recipes.armor.carapace")),
-    (0.4, Item("common.items.recipes.weapons.cobalt")),
-    (0.4, Item("common.items.recipes.weapons.ironwood")),
-    (0.2, Item("common.items.recipes.armor.bloodsteel")),
-    (0.2, Item("common.items.recipes.armor.moonweave")),
-    (0.2, Item("common.items.recipes.armor.primal")),
-    (0.2, Item("common.items.recipes.weapons.bloodsteel")),
-    (0.2, Item("common.items.recipes.weapons.frostwood")),
-    (0.1, Item("common.items.recipes.armor.orichalcum")),
-    (0.1, Item("common.items.recipes.armor.sunsilk")),
-    (0.1, Item("common.items.recipes.armor.dragonscale")),
-    (0.1, Item("common.items.recipes.armor.brinestone")),
-    (0.1, Item("common.items.recipes.weapons.orichalcum")),
-    (0.1, Item("common.items.recipes.weapons.eldwood")),
+    (1.25, Item("common.items.recipes.armor.steel")),
+    (1.25, Item("common.items.recipes.armor.silken")),
+    (1.25, Item("common.items.recipes.armor.scale")),
+    (1.25, Item("common.items.recipes.weapons.steel")),
+    (1.25, Item("common.items.recipes.weapons.hardwood")),
+    (0.65, Item("common.items.recipes.armor.cobalt")),
+    (0.65, Item("common.items.recipes.armor.druid")),
+    (0.65, Item("common.items.recipes.armor.carapace")),
+    (0.65, Item("common.items.recipes.weapons.cobalt")),
+    (0.65, Item("common.items.recipes.weapons.ironwood")),
+    (0.38, Item("common.items.recipes.armor.bloodsteel")),
+    (0.38, Item("common.items.recipes.armor.moonweave")),
+    (0.38, Item("common.items.recipes.armor.primal")),
+    (0.38, Item("common.items.recipes.weapons.bloodsteel")),
+    (0.38, Item("common.items.recipes.weapons.frostwood")),
+    (0.25, Item("common.items.recipes.armor.sunsilk")),
+    (0.25, Item("common.items.recipes.armor.orichalcum")),
+    (0.25, Item("common.items.recipes.armor.dragonscale")),
+    (0.25, Item("common.items.recipes.weapons.orichalcum")),
+    (0.25, Item("common.items.recipes.weapons.eldwood")),
+    (0.25, Item("common.items.recipes.armor.brinestone")),
    // Unique items
-    (1.0, Item("common.items.recipes.unique.seashell_necklace")),
-    (0.8, Item("common.items.recipes.unique.winged_coronet")),
+    (1.25, Item("common.items.recipes.unique.seashell_necklace")),
+    (0.6, Item("common.items.recipes.unique.winged_coronet")),
    (0.5, Item("common.items.recipes.unique.troll_hide_pack")),
-    (0.3, Item("common.items.recipes.unique.abyssal_gorget")),
-    (0.1, Item("common.items.recipes.unique.mindflayer_spellbag")),
+    (0.2, Item("common.items.recipes.unique.abyssal_gorget")),
+    (0.15, Item("common.items.recipes.unique.mindflayer_spellbag")),
    (0.1, Item("common.items.recipes.unique.polaris")),
 ]
--- a/assets/voxygen/i18n/en/buff.ftl
+++ b/assets/voxygen/i18n/en/buff.ftl
@ -88,9 +88,6 @@ buff-reckless = Reckless
 ## Polymorped
 buff-polymorphed = Polymorphed
    .desc = Your body changes form.
-## Flame
-buff-flame = Flame
-    .desc = Flame is your ally.
 ## Frigid
 buff-frigid = Frigid
    .desc = Freeze your foes.
--- a/assets/voxygen/i18n/en/char_selection.ftl
+++ b/assets/voxygen/i18n/en/char_selection.ftl
@ -1,17 +1,12 @@
 char_selection-loading_characters = Loading characters...
 char_selection-delete_permanently = Permanently delete this character?
-char_selection-change_server = Change Server
 char_selection-enter_world = Enter World
 char_selection-spectate = Spectate World
 char_selection-joining_character = Joining world...
 char_selection-logout = Logout
 char_selection-create_new_character = Create new character
 char_selection-creating_character = Creating character...
-char_selection-character_creation = Character creation
-char_selection-human_default = Human default
-char_selection-level_fmt = Level { $level_nb }
 char_selection-uncanny_valley = Wilderness
-char_selection-plains_of_uncertainty = Plains of Uncertainty
 char_selection-beard = Beard
 char_selection-hair_style = Hair Style
 char_selection-hair_color = Hair Color
@ -22,7 +17,6 @@ char_selection-accessories = Accessories
 char_selection-starting_site = Select Starting Area
 char_selection-starting_site_next = Next
 char_selection-starting_site_prev = Previous
-char_selection-starting_site_name = { $name }
 char_selection-starting_site_kind = Kind: { $kind }
 char_selection-create_info_name = Your character needs a name!
 char_selection-version_mismatch = WARNING! This server is running a different, possibly incompatible game version. Please update your game.
--- a/assets/voxygen/i18n/en/command.ftl
+++ b/assets/voxygen/i18n/en/command.ftl
@ -14,6 +14,7 @@ command-give-inventory-full = Player inventory full. Gave { $given ->
  [1] only one
  *[other] { $given }
 } of { $total } items.
+command-give-inventory-success = Added { $total } x { $item } to the inventory.
 command-invalid-item = Invalid item: { $item }
 command-invalid-block-kind = Invalid block kind: { $kind }
 command-nof-entities-at-least = Number of entities should be at least 1
--- a/assets/voxygen/i18n/en/common.ftl
+++ b/assets/voxygen/i18n/en/common.ftl
@ -1,4 +1,3 @@
-common-username = username
 common-singleplayer = Singleplayer
 common-multiplayer = Multiplayer
 common-servers = Servers
@ -28,10 +27,7 @@ common-disclaimer = Disclaimer
 common-cancel = Cancel
 common-none = None
 common-error = Error
-common-fatal_error = Fatal Error
-common-you = You
 common-automatic = Auto
-common-random = Random
 common-empty = Empty
 common-confirm = Confirm
 common-delete_server = Delete Server
@ -66,12 +62,6 @@ common-weapons-general = General Combat
 common-weapons-sceptre = Healing Sceptre
 common-weapons-shield = Shield
 common-weapons-spear = Spear
-common-weapons-hammer_simple = Simple Hammer
-common-weapons-sword_simple = Simple Sword
-common-weapons-staff_simple = Simple Staff
-common-weapons-axe_simple = Simple Axe
-common-weapons-bow_simple = Simple Bow
-common-weapons-unique = Unique
 common-tool-debug = Debug
 common-tool-farming = Farming Tool
 common-tool-pick = Pickaxe
@ -91,14 +81,12 @@ common-hands-one = One-Handed
 common-hands-two = Two-Handed
 common-rand_appearance = Random appearance
 common-rand_name = Random name
-common-stats-combat_rating = CR
 common-stats-power = Power
 common-stats-speed = Speed
 common-stats-effect-power = Effect Power
 common-stats-range = Range
 common-stats-energy_efficiency = Energy Efficiency
 common-stats-buff_strength = Buff/Debuff Strength
-common-stats-precision_mult = Crit Mult
 common-stats-armor = Armor
 common-stats-poise_res = Stun Res
 common-stats-energy_max = Max Energy
--- a/assets/voxygen/i18n/en/gameinput.ftl
+++ b/assets/voxygen/i18n/en/gameinput.ftl
@ -30,7 +30,6 @@ gameinput-glide = Glider
 gameinput-roll = Roll
 gameinput-climb = Climb
 gameinput-climbdown = Climb Down
-gameinput-wallleap = Wall Leap
 gameinput-togglelantern = Toggle Lantern
 gameinput-mount = Mount
 gameinput-stayfollow = Stay/Follow
@ -45,7 +44,6 @@ gameinput-sit = Sit
 gameinput-spellbook = Spells
 gameinput-settings = Settings
 gameinput-respawn = Respawn
-gameinput-charge = Charge
 gameinput-togglewield = Toggle Wield
 gameinput-interact = Interact
 gameinput-freelook = Free Look
--- a/assets/voxygen/i18n/en/hud/crafting.ftl
+++ b/assets/voxygen/i18n/en/hud/crafting.ftl
@ -3,11 +3,11 @@ hud-crafting-recipes = Recipes
 hud-crafting-ingredients = Ingredients:
 hud-crafting-craft = Craft
 hud-crafting-craft_all = Craft All
-hud-crafting-repair = Repair
-hud-crafting-repair_equipped = Repair Equipped
-hud-crafting-repair_all = Repair All
-hud-crafting-tool_cata = Requires:
-hud-crafting-req_crafting_station = Requires:
+hud-crafting-repair-selection = Selection
+hud-crafting-repair_equipped = Equipped
+hud-crafting-repair_all = All
+hud-crafting-tool_cata = Tools:
+hud-crafting-req_crafting_station = Station:
 hud-crafting-anvil = Anvil
 hud-crafting-cauldron = Cauldron
 hud-crafting-cooking_pot = Cooking Pot
@ -37,6 +37,7 @@ hud-crafting-dismantle_explanation =

    Double-Click them to start dismantling.
 hud-crafting-modular_desc = Drag Item-Parts here to craft a weapon
+hud-crafting-repair_desc = Drag damaged items here to repair them
 hud-crafting-mod_weap_prim_slot_title = Primary Weapon Component
 hud-crafting-mod_weap_prim_slot_desc = Place a primary weapon component here (e.g. a sword blade, axe head, or bow limbs).
 hud-crafting-mod_weap_sec_slot_title = Secondary Weapon Component
--- a/assets/voxygen/i18n/en/hud/diary.ftl
+++ b/assets/voxygen/i18n/en/hud/diary.ftl
@ -0,0 +1,8 @@
+## General diary terms
+
+## Section titles
+
+hud-diary-sections-skill_trees-title = Skill-Trees
+hud-diary-sections-abilities-title = Abilities
+hud-diary-sections-stats-title = Stats
+hud-diary-sections-recipes-title = Recipes
--- a/assets/voxygen/i18n/en/hud/group.ftl
+++ b/assets/voxygen/i18n/en/hud/group.ftl
@ -1,6 +1,11 @@
 hud-group = Group
+
 hud-group-invite_to_join = [{ $name }] invited you to their group!
 hud-group-invite_to_trade = [{ $name }] would like to trade with you.
+hug-group-invite-accepted = { $target } accepted your group invite.
+hud-group-invite-declined = { $target } declined your group invite.
+hud-group-invite-timed_out= Group invite to { $target } timed out.
+
 hud-group-invite = Invite
 hud-group-kick = Kick
 hud-group-assign_leader = Assign Leader
--- a/assets/voxygen/i18n/en/hud/skills.ftl
+++ b/assets/voxygen/i18n/en/hud/skills.ftl
@ -7,6 +7,16 @@
 -hud-skill-st_shockwave_title = ""

 ## Skill tree UI
+
+hud-skill_tree-general = General Combat
+hud-skill_tree-sword = Sword
+hud-skill_tree-axe = Axe
+hud-skill_tree-hammer = Hammer
+hud-skill_tree-bow = Bow
+hud-skill_tree-staff = Fire Staff
+hud-skill_tree-sceptre = Sceptre
+hud-skill_tree-mining = Mining
+
 hud-rank_up = New skill point
 hud-skill-sp_available =
    { $number ->
--- a/assets/voxygen/i18n/en/hud/trade.ftl
+++ b/assets/voxygen/i18n/en/hud/trade.ftl
@ -12,7 +12,12 @@ hud-trade-has_accepted =
    has accepted
 hud-trade-accept = Accept
 hud-trade-decline = Decline
+
 hud-trade-invite_sent = Trade request sent to { $playername }.
+hud-trade-invite-accepted = { $target } accepted your trade request.
+hud-trade-invite-declined = { $target } declined your trade request.
+hud-trade-invite-timed_out = Trade request to { $target } timed out.
+
 hud-trade-result-completed = Trade completed successfully.
 hud-trade-result-declined = Trade declined.
 hud-trade-result-nospace = Not enough space to complete the trade.
--- a/assets/voxygen/i18n/en/item/common.ftl
+++ b/assets/voxygen/i18n/en/item/common.ftl
@ -0,0 +1 @@
+items-common-amount = Amount: { $amount }
--- a/assets/voxygen/i18n/en/item/items/potion.ftl
+++ b/assets/voxygen/i18n/en/item/items/potion.ftl
@ -19,6 +19,9 @@ object-potion_med = Medium Potion
 object-potion_minor = Minor Potion
    .desc = A small potion concocted from apples and honey.

+object-potion_freezing = Freezing Potion
+    .desc = Freezes the user's brain.
+
 object-burning_charm = Blazing Charm
    .desc = Flame is your ally, harness its power to burn your foes.

--- a/assets/voxygen/i18n/en/item/recipe.ftl
+++ b/assets/voxygen/i18n/en/item/recipe.ftl
@ -87,4 +87,30 @@ recipe-weapons-frostwood = Frostwood Weapon Recipes
 recipe-weapons-eldwood = Eldwood Weapon Recipes
    .desc = Eldwood Weapon Recipes
 recipe-default = Default Recipes
-    .desc = Default Recipes
+    .desc = Default Recipes
+
+## Pseudo
+
+pseudo-recipe-modular_weapon-modular_weapon = Modular Weapon
+    .desc = {""}
+
+pseudo-recipe-modular_weapon-sword = Sword Blade
+    .desc = {""}
+
+pseudo-recipe-modular_weapon-axe = Axe Head
+    .desc = {""}
+
+pseudo-recipe-modular_weapon-hammer = Hammer Head
+    .desc = {""}
+
+pseudo-recipe-modular_weapon-bow = Bow Limbs
+    .desc = {""}
+
+pseudo-recipe-modular_weapon-staff = Staff Shaft
+    .desc = {""}
+
+pseudo-recipe-modular_weapon-sceptre = Sceptre Shaft
+    .desc = {""}
+
+pseudo-recipe-repair = Repair Equipment
+    .desc = {""}
--- a/assets/voxygen/i18n/en/item/weapon/npc.ftl
+++ b/assets/voxygen/i18n/en/item/weapon/npc.ftl
@ -160,9 +160,6 @@ common-items-npc_weapons-unique-crab_pincer = Crab Pincer
 common-items-npc_weapons-unique-dagon = Dagon Kit
    .desc = Ocean Power!

-common-items-npc_weapons-unique-deadwood = Deadwood
-    .desc = testing123
-
 common-items-npc_weapons-unique-driggle = Starter Grace
    .desc = Fret not, newbies shant cry.

@ -229,15 +226,9 @@ common-items-npc_weapons-unique-husk = Husk
 common-items-npc_weapons-unique-husk_brute = Husk Brute
    .desc = testing123

-common-items-npc_weapons-unique-icedrake = Ice Drake
-    .desc = testing123
-
 common-items-npc_weapons-unique-irrwurz = Starter Grace
    .desc = Fret not, newbies shant cry.

-common-items-npc_weapons-unique-maneater = Maneater
-    .desc = testing123
-
 common-items-npc_weapons-unique-mossysnail = Starter Grace
    .desc = Fret not, newbies shant cry.

--- a/assets/voxygen/i18n/en/main.ftl
+++ b/assets/voxygen/i18n/en/main.ftl
@ -33,7 +33,6 @@ main-singleplayer-new = New
 main-singleplayer-delete = Delete
 main-singleplayer-regenerate = Regenerate
 main-singleplayer-create_custom = Create Custom
-main-singleplayer-invalid_name = Error: Invalid name
 main-singleplayer-seed = Seed
 main-singleplayer-day_length = Day duration
 main-singleplayer-random_seed = Random
@ -54,7 +53,6 @@ main-login-failed_auth_server_url_invalid = Failed to connect to authentication
 main-login-insecure_auth_scheme = The HTTP authentication scheme is not supported. It's insecure! For development purposes, HTTP is allowed for 'localhost' or debug builds.
 main-login-server_full = Server is full.
 main-login-untrusted_auth_server = Authentication server not trusted.
-main-login-outdated_client_or_server = ServerWentMad: Probably versions are incompatible, check for updates.
 main-login-timeout = Timeout: Server did not respond in time. Hint: the server might be currently overloaded or there are issues on the network.
 main-login-server_shut_down = Server shut down.
 main-login-network_error = Network error.
--- a/assets/voxygen/i18n/en/npc.ftl
+++ b/assets/voxygen/i18n/en/npc.ftl
@ -80,10 +80,6 @@ npc-speech-merchant_busy =
    .a0 = Please wait, I'm only one person.
    .a1 = Just a moment, let me finish.
    .a2 = I'm busy, come back later.
-npc-speech-merchant_busy_rude =
-    .a0 = Hey, wait your turn.
-    .a1 = Do you see the other person in front of you?
-    .a2 = No cutting in line.
 npc-speech-merchant_trade_successful =
    .a0 = Thank you for trading with me!
    .a1 = Thank you!
@ -218,11 +214,6 @@ npc-speech-cultist_low_health_fleeing =
    .a3 = I will curse you in the afterlife!
    .a4 = I must rest!
    .a5 = They're too strong!
-npc-speech-prisoner =
-    .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.
 npc-speech-moving_on =
    .a0 = I've spent enough time here, onward to { $site }!
 npc-speech-migrating =
--- a/config/config.toml
+++ b/config/config.toml
@ -2,6 +2,7 @@ position = [17720.0, 14951.0, 237.0]
 orientation = 0

 [buy_prices]
+"consumable.potion_freezing" = 1
 "food.cheese" = 50
 "iron|sword.greatsword|sword.long" = 1_000