From 933c897450804a68d8f3dbe285810598e77a9a91 Mon Sep 17 00:00:00 2001 From: HEIEnthusiast Date: Tue, 5 Dec 2023 14:15:54 -0400 Subject: [PATCH] Renamed to potion of agility, burning potion to combustion --- CHANGELOG.md | 3 ++- .../consumable/{potion_retreat.ron => potion_agility.ron} | 6 +++--- .../{potion_burning.ron => potion_combustion.ron} | 2 +- assets/common/recipe_book.ron | 8 ++++---- assets/voxygen/i18n/en/buff.ftl | 8 ++++---- assets/voxygen/item_image_manifest.ron | 8 ++++---- assets/voxygen/voxel/item_drop_manifest.ron | 4 ++-- .../object/{potion_retreat.vox => potion_agility.vox} | 0 .../object/{potion_burning.vox => potion_combustion.vox} | 0 common/src/cmd.rs | 2 +- common/src/comp/buff.rs | 6 +++--- voxygen/i18n-helpers/src/lib.rs | 2 +- voxygen/src/hud/mod.rs | 8 ++++---- voxygen/src/hud/util.rs | 6 +++--- 14 files changed, 32 insertions(+), 31 deletions(-) rename assets/common/items/consumable/{potion_retreat.ron => potion_agility.ron} (81%) rename assets/common/items/consumable/{potion_burning.ron => potion_combustion.ron} (92%) rename assets/voxygen/voxel/object/{potion_retreat.vox => potion_agility.vox} (100%) rename assets/voxygen/voxel/object/{potion_burning.vox => potion_combustion.vox} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6ee5146d7..1ff35a4a69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - A way to target non-player entities with commands. With rtsim_id: `rtsim@`, with uid: `uid@`. - Shorthand in voxygen for specific entities in commands, some examples `@target`, `@mount`, `@viewpoint`. - Added hit_timing to BasicMelee abilities -- Retreating Potion +- Potion of Agility ### Changed @@ -72,6 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed offset of items carried on backs when wearing cloaks and backpacks - Linearize light colors on the CPU rather than in shaders on the GPU - You can no longer stack self buffs +- Renamed "Burning Potion" to "Potion of Combustion" ### Removed - Medium and large potions from all loot tables diff --git a/assets/common/items/consumable/potion_retreat.ron b/assets/common/items/consumable/potion_agility.ron similarity index 81% rename from assets/common/items/consumable/potion_retreat.ron rename to assets/common/items/consumable/potion_agility.ron index 738cfe884a..e7ebefd0e8 100644 --- a/assets/common/items/consumable/potion_retreat.ron +++ b/assets/common/items/consumable/potion_agility.ron @@ -1,11 +1,11 @@ ItemDef( - name: "Potion of Retreat", - description: "Don't get caught fighting too fierce a foe.", + name: "Potion of Agility", + description: "Fly, you fools!", kind: Consumable( kind: Drink, effects: All([ Buff(( - kind: Retreating, + kind: Agility, data: ( strength: 0.55, duration: Some(25), diff --git a/assets/common/items/consumable/potion_burning.ron b/assets/common/items/consumable/potion_combustion.ron similarity index 92% rename from assets/common/items/consumable/potion_burning.ron rename to assets/common/items/consumable/potion_combustion.ron index 2efca88089..6bf6f6736d 100644 --- a/assets/common/items/consumable/potion_burning.ron +++ b/assets/common/items/consumable/potion_combustion.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Burning Potion", + name: "Potion of Combustion", description: "Sets the user ablaze", kind: Consumable( kind: Drink, diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index c4029e5693..b5c7cf78d4 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -31,8 +31,8 @@ ], craft_sprite: Some(Anvil), ), - "potion_burning": ( - output: ("common.items.consumable.potion_burning", 1), + "potion_combustion": ( + output: ("common.items.consumable.potion_combustion", 1), inputs: [ (Item("common.items.crafting_ing.empty_vial"), 1, false), (Item("common.items.crafting_ing.living_embers"), 3, false), @@ -40,8 +40,8 @@ ], craft_sprite: Some(Cauldron), ), - "potion_retreat": ( - output: ("common.items.consumable.potion_retreat", 1), + "potion_agility": ( + output: ("common.items.consumable.potion_agility", 1), inputs: [ (Item("common.items.crafting_ing.empty_vial"), 1, false), (Item("common.items.mineral.ore.veloritefrag"), 2, false), diff --git a/assets/voxygen/i18n/en/buff.ftl b/assets/voxygen/i18n/en/buff.ftl index ccf789c2e1..3ba397931d 100644 --- a/assets/voxygen/i18n/en/buff.ftl +++ b/assets/voxygen/i18n/en/buff.ftl @@ -5,10 +5,10 @@ buff-stat-health = Restores { $str_total } Health ## Potion buff-title-potion = Potion buff-desc-potion = Drinking... -## Retreating -buff-title-retreat = Retreating -buff-desc-retreat = Your movement is faster, but you deal less damage, and take more damage. -buff-stat-retreat = +## Agility +buff-title-agility = Agility +buff-desc-agility = Your movement is faster, but you deal less damage, and take more damage. +buff-stat-agility = Increases movement speed by { $strength }%. but decreases your damage by 100%, and increases your damage vulnerability diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 46fb21c0ac..95acc5ac91 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3199,12 +3199,12 @@ "voxel.object.curious_potion", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), - Simple("common.items.consumable.potion_burning"): VoxTrans( - "voxel.object.potion_burning", + Simple("common.items.consumable.potion_combustion"): VoxTrans( + "voxel.object.potion_combustion", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), - Simple("common.items.consumable.potion_retreat"): VoxTrans( - "voxel.object.potion_retreat", + Simple("common.items.consumable.potion_agility"): VoxTrans( + "voxel.object.potion_agility", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Simple("common.items.charms.burning_charm"): VoxTrans( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 12388a562d..8cbf53f90d 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -809,8 +809,8 @@ Simple("common.items.consumable.potion_minor"): "voxel.object.potion_red", Simple("common.items.consumable.potion_big"): "voxel.object.potion_red", 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_retreat"): "voxel.object.potion_retreat", + Simple("common.items.consumable.potion_combustion"): "voxel.object.potion_combustion", + Simple("common.items.consumable.potion_agility"): "voxel.object.potion_agility", 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", diff --git a/assets/voxygen/voxel/object/potion_retreat.vox b/assets/voxygen/voxel/object/potion_agility.vox similarity index 100% rename from assets/voxygen/voxel/object/potion_retreat.vox rename to assets/voxygen/voxel/object/potion_agility.vox diff --git a/assets/voxygen/voxel/object/potion_burning.vox b/assets/voxygen/voxel/object/potion_combustion.vox similarity index 100% rename from assets/voxygen/voxel/object/potion_burning.vox rename to assets/voxygen/voxel/object/potion_combustion.vox diff --git a/common/src/cmd.rs b/common/src/cmd.rs index 3a8ac00d17..a41a9c93b7 100644 --- a/common/src/cmd.rs +++ b/common/src/cmd.rs @@ -155,7 +155,7 @@ lazy_static! { BuffKind::Bleeding => "bleeding", BuffKind::Cursed => "cursed", BuffKind::Potion => "potion", - BuffKind::Retreating => "retreating", + BuffKind::Agility => "agility", BuffKind::CampfireHeal => "campfire_heal", BuffKind::EnergyRegen => "energy_regen", BuffKind::IncreaseMaxEnergy => "increase_max_energy", diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs index 70c68cd666..e73b33f4df 100644 --- a/common/src/comp/buff.rs +++ b/common/src/comp/buff.rs @@ -41,7 +41,7 @@ pub enum BuffKind { /// decreases the amount of damage dealt. /// Movement speed increases linearly with strength 1.0 is an 100% increase /// Damage vulnerability and damage reduction are both hard set to 100% - Retreating, + Agility, /// Applied when sitting at a campfire. /// Strength is fraction of health restored per second. CampfireHeal, @@ -182,7 +182,7 @@ impl BuffKind { BuffKind::Regeneration | BuffKind::Saturation | BuffKind::Potion - | BuffKind::Retreating + | BuffKind::Agility | BuffKind::CampfireHeal | BuffKind::Frenzied | BuffKind::EnergyRegen @@ -270,7 +270,7 @@ impl BuffKind { tick_dur: Secs(0.1), }] }, - BuffKind::Retreating => vec![ + BuffKind::Agility => vec![ BuffEffect::MovementSpeed( 1.0 + data.strength * stats.map_or(1.0, |s| s.move_speed_multiplier), ), diff --git a/voxygen/i18n-helpers/src/lib.rs b/voxygen/i18n-helpers/src/lib.rs index 2720cf862f..5751cfab38 100644 --- a/voxygen/i18n-helpers/src/lib.rs +++ b/voxygen/i18n-helpers/src/lib.rs @@ -109,7 +109,7 @@ pub fn localize_chat_message( BuffKind::Regeneration | BuffKind::Saturation | BuffKind::Potion - | BuffKind::Retreating + | BuffKind::Agility | BuffKind::CampfireHeal | BuffKind::EnergyRegen | BuffKind::IncreaseMaxEnergy diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index cfeb5154ae..6297918fe3 100755 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -5160,8 +5160,8 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id { BuffKind::Regeneration => imgs.buff_plus_0, BuffKind::Saturation => imgs.buff_saturation_0, BuffKind::Potion => imgs.buff_potion_0, - // TODO: Need unique image for Retreating (uses same as regeneration atm) - BuffKind::Retreating => imgs.buff_plus_0, + // TODO: Need unique image for Agility (uses same as regeneration atm) + BuffKind::Agility => imgs.buff_plus_0, BuffKind::CampfireHeal => imgs.buff_campfire_heal_0, BuffKind::EnergyRegen => imgs.buff_energyplus_0, BuffKind::IncreaseMaxEnergy => imgs.buff_energyplus_0, @@ -5205,7 +5205,7 @@ pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> Cow localized_strings.get_msg("buff-title-heal"), BuffKind::Saturation => localized_strings.get_msg("buff-title-saturation"), BuffKind::Potion => localized_strings.get_msg("buff-title-potion"), - BuffKind::Retreating => localized_strings.get_msg("buff-title-retreat"), + BuffKind::Agility => localized_strings.get_msg("buff-title-agility"), 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"), @@ -5248,7 +5248,7 @@ pub fn get_buff_desc(buff: BuffKind, data: BuffData, localized_strings: &Localiz BuffKind::Regeneration => localized_strings.get_msg("buff-desc-heal"), BuffKind::Saturation => localized_strings.get_msg("buff-desc-saturation"), BuffKind::Potion => localized_strings.get_msg("buff-desc-potion"), - BuffKind::Retreating => localized_strings.get_msg("buff-desc-retreat"), + BuffKind::Agility => localized_strings.get_msg("buff-desc-agility"), BuffKind::CampfireHeal => { localized_strings.get_msg_ctx("buff-desc-campfire_heal", &i18n::fluent_args! { "rate" => data.strength * 100.0 diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 1f887c96ee..bd73551ff2 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -189,8 +189,8 @@ pub fn consumable_desc(effects: &Effects, i18n: &Localization) -> Vec { "strength" => format_float(strength * 100.0), }) }, - BuffKind::Retreating => { - i18n.get_msg_ctx("buff-stat-retreat", &i18n::fluent_args! { + BuffKind::Agility => { + i18n.get_msg_ctx("buff-stat-agility", &i18n::fluent_args! { "strength" => format_float(strength * 100.0), }) }, @@ -236,7 +236,7 @@ pub fn consumable_desc(effects: &Effects, i18n: &Localization) -> Vec { }) }, BuffKind::IncreaseMaxEnergy - | BuffKind::Retreating + | BuffKind::Agility | BuffKind::IncreaseMaxHealth | BuffKind::Invulnerability | BuffKind::PotionSickness