Removed strength and regeneration potions

assets/common/items/consumable/potion_regeneration.ron

@@ -1,19 +0,0 @@
-ItemDef(
-    name: "Regeneration Potion",
-    description: "You must have lost an arm and a leg to need this.",
-    kind: Consumable(
-        kind: Drink,
-        effects: All([
-            Buff((
-                kind: Regeneration,
-                data: (
-                    strength: 1.0,
-                    duration: Some(60),
-                ),
-                cat_ids: [Natural],
-            )),
-        ])
-    ),
-    quality: Common,
-    tags: [Potion],
-)

assets/common/items/consumable/potion_strength.ron

@@ -1,19 +0,0 @@
-ItemDef(
-    name: "Strength Potion",
-    description: "Makes you stronger.",
-    kind: Consumable(
-        kind: Drink,
-        effects: All([
-            Buff((
-                kind: Strength,
-                data: (
-                    strength: 0.15,
-                    duration: Some(45),
-                ),
-                cat_ids: [Natural],
-            )),
-        ])
-    ),
-    quality: Moderate,
-    tags: [Potion],
-)

assets/common/recipe_book.ron

@@ -49,24 +49,6 @@
         ],
         craft_sprite: Some(Cauldron),
     ),
-    "potion_regeneration": (
-        output: ("common.items.consumable.potion_regeneration", 1),
-        inputs: [
-            (Item("common.items.consumable.potion_minor"), 1, false),
-            (Item("common.items.crafting_ing.sentient_seed"), 1, false),
-        ],
-        craft_sprite: Some(Cauldron),
-    ),
-    "potion_strength": (
-        output: ("common.items.consumable.potion_strength", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.empty_vial"), 1, false),
-            (Item("common.items.mineral.ore.velorite"), 1, false),
-            (Item("common.items.crafting_ing.animal_misc.grim_eyeball"), 1, false),
-            (Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, false),
-        ],
-        craft_sprite: Some(Cauldron),
-    ),
     "potion_s": (
         output: ("common.items.consumable.potion_minor", 1),
         inputs: [

assets/voxygen/item_image_manifest.ron

@@ -3207,14 +3207,6 @@
         "voxel.object.potion_swiftness",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
     ),
-    Simple("common.items.consumable.potion_regeneration"): VoxTrans(
-        "voxel.object.potion_regeneration",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
-    ),
-    Simple("common.items.consumable.potion_strength"): VoxTrans(
-        "voxel.object.potion_strength",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
-    ),
     Simple("common.items.charms.burning_charm"): VoxTrans(
         "voxel.object.burning_charm",
         (0.0, 0.0, 0.0), (-80.0, 15.0, 15.0), 1.0,

assets/voxygen/voxel/item_drop_manifest.ron

@@ -811,8 +811,6 @@
     Simple("common.items.consumable.curious_potion"): "voxel.object.curious_potion",
     Simple("common.items.consumable.potion_burning"): "voxel.object.potion_burning",
     Simple("common.items.consumable.potion_swiftness"): "voxel.object.potion_swiftness",
-    Simple("common.items.consumable.potion_regeneration"): "voxel.object.potion_regeneration",
-    Simple("common.items.consumable.potion_strength"): "voxel.object.potion_strength", 
     Simple("common.items.charms.burning_charm"): "voxel.object.burning_charm",
     Simple("common.items.charms.frozen_charm"): "voxel.object.frozen_charm",
     Simple("common.items.charms.lifesteal_charm"): "voxel.object.lifesteal_charm",

common/src/cmd.rs

@@ -157,7 +157,6 @@ lazy_static! {
             BuffKind::Potion => "potion",
             BuffKind::Swiftness => "swiftness",
             BuffKind::CampfireHeal => "campfire_heal",
-            BuffKind::Strength => "strength",
             BuffKind::EnergyRegen => "energy_regen",
             BuffKind::IncreaseMaxEnergy => "increase_max_energy",
             BuffKind::IncreaseMaxHealth => "increase_max_health",

common/src/comp/buff.rs

@@ -41,10 +41,6 @@ pub enum BuffKind {
     /// to get critical hits. Movement speed and vulnerability to damage
     /// increase linearly with strength, 1.0 is an 100% increase for both.
     Swiftness,
-    /// Increases attack damage.
-    /// Attack damage scales linearly with strength
-    /// 1.0 is an 100% increase of attack damage
-    Strength,
     /// Applied when sitting at a campfire.
     /// Strength is fraction of health restored per second.
     CampfireHeal,
@@ -180,7 +176,6 @@ impl BuffKind {
             | BuffKind::Saturation
             | BuffKind::Potion
             | BuffKind::Swiftness
-            | BuffKind::Strength
             | BuffKind::CampfireHeal
             | BuffKind::Frenzied
             | BuffKind::EnergyRegen
@@ -272,7 +267,6 @@ impl BuffKind {
                 BuffEffect::DamageReduction(-data.strength),
                 BuffEffect::PrecisionOverride(0.0),
             ],
-            BuffKind::Strength => vec![BuffEffect::AttackDamage(1.0 + data.strength)],
             BuffKind::CampfireHeal => vec![BuffEffect::HealthChangeOverTime {
                 rate: data.strength,
                 kind: ModifierKind::Multiplicative,

voxygen/i18n-helpers/src/lib.rs

@@ -110,7 +110,6 @@ pub fn localize_chat_message(
                 | BuffKind::Saturation
                 | BuffKind::Potion
                 | BuffKind::Swiftness
-                | BuffKind::Strength
                 | BuffKind::CampfireHeal
                 | BuffKind::EnergyRegen
                 | BuffKind::IncreaseMaxEnergy

voxygen/src/hud/mod.rs

@@ -5162,7 +5162,6 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
         BuffKind::Potion => imgs.buff_potion_0,
         // TODO: Need unique image for Swiftness and Strength
         BuffKind::Swiftness => imgs.buff_plus_0,
-        BuffKind::Strength => imgs.buff_plus_0,
         BuffKind::CampfireHeal => imgs.buff_campfire_heal_0,
         BuffKind::EnergyRegen => imgs.buff_energyplus_0,
         BuffKind::IncreaseMaxEnergy => imgs.buff_energyplus_0,
@@ -5206,7 +5205,6 @@ pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> Cow<s
         BuffKind::Saturation => localized_strings.get_msg("buff-title-saturation"),
         BuffKind::Potion => localized_strings.get_msg("buff-title-potion"),
         BuffKind::Swiftness => localized_strings.get_msg("buff-title-swift"),
-        BuffKind::Strength => localized_strings.get_msg("buff-title-strength"),
         BuffKind::CampfireHeal => localized_strings.get_msg("buff-title-campfire_heal"),
         BuffKind::EnergyRegen => localized_strings.get_msg("buff-title-energy_regen"),
         BuffKind::IncreaseMaxHealth => localized_strings.get_msg("buff-title-increase_max_health"),
@@ -5249,7 +5247,6 @@ pub fn get_buff_desc(buff: BuffKind, data: BuffData, localized_strings: &Localiz
         BuffKind::Saturation => localized_strings.get_msg("buff-desc-saturation"),
         BuffKind::Potion => localized_strings.get_msg("buff-desc-potion"),
         BuffKind::Swiftness => localized_strings.get_msg("buff-desc-swift"),
-        BuffKind::Strength => localized_strings.get_msg("buff-desc-strength"),
         BuffKind::CampfireHeal => {
             localized_strings.get_msg_ctx("buff-desc-campfire_heal", &i18n::fluent_args! {
                 "rate" => data.strength * 100.0

voxygen/src/hud/util.rs

@@ -194,11 +194,6 @@ pub fn consumable_desc(effects: &Effects, i18n: &Localization) -> Vec<String> {
                                 "strength" => format_float(strength * 100.0),
                             })
                         },
-                        BuffKind::Strength => {
-                            i18n.get_msg_ctx("buff-stat-strength", &i18n::fluent_args! {
-                                "strength" => format_float(strength * 100.0),
-                            })
-                        },
                         BuffKind::Invulnerability => i18n.get_msg("buff-stat-invulnerability"),
                         BuffKind::Bleeding
                         | BuffKind::Burning
@@ -240,7 +235,6 @@ pub fn consumable_desc(effects: &Effects, i18n: &Localization) -> Vec<String> {
                                 })
                             },
                             BuffKind::IncreaseMaxEnergy
-                            | BuffKind::Strength
                             | BuffKind::Swiftness
                             | BuffKind::IncreaseMaxHealth
                             | BuffKind::Invulnerability