Renamed swiftness to retreating, changed model

This commit is contained in:
HEIEnthusiast 2023-12-05 13:09:14 -04:00
parent 73d7ff224d
commit 99b5571fd8
13 changed files with 29 additions and 29 deletions

View File

@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Swiftness potion
- Esperanto translation
- Item quantity sort in player inventory.
- Using Block('Alt' by default) in Defensive Stance now feels stronger
@ -39,6 +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@<id>`, with uid: `uid@<id>`.
- Shorthand in voxygen for specific entities in commands, some examples `@target`, `@mount`, `@viewpoint`.
- Added hit_timing to BasicMelee abilities
- Retreating Potion
### Changed

View File

@ -1,11 +1,11 @@
ItemDef(
name: "Swiftness Potion",
description: "Makes you faster.",
name: "Potion of Retreat",
description: "Don't get caught fighting too fierce a foe.",
kind: Consumable(
kind: Drink,
effects: All([
Buff((
kind: Swiftness,
kind: Retreating,
data: (
strength: 0.55,
duration: Some(25),

View File

@ -40,8 +40,8 @@
],
craft_sprite: Some(Cauldron),
),
"potion_swiftness": (
output: ("common.items.consumable.potion_swiftness", 1),
"potion_retreat": (
output: ("common.items.consumable.potion_retreat", 1),
inputs: [
(Item("common.items.crafting_ing.empty_vial"), 1, false),
(Item("common.items.mineral.ore.veloritefrag"), 2, false),

View File

@ -5,10 +5,10 @@ buff-stat-health = Restores { $str_total } Health
## Potion
buff-title-potion = Potion
buff-desc-potion = Drinking...
## Swiftness
buff-title-swift = Swiftness
buff-desc-swift = Your movement is faster, but you deal less damage, and take more damage.
buff-stat-swift =
## Retreating
buff-title-retreat = Retreating
buff-desc-retreat = Your movement is faster, but you deal less damage, and take more damage.
buff-stat-retreat =
Increases movement speed by { $strength }%.
but decreases your damage by 100%,
and increases your damage vulnerability

View File

@ -3203,9 +3203,9 @@
"voxel.object.potion_burning",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
),
Simple("common.items.consumable.potion_swiftness"): VoxTrans(
"voxel.object.potion_swiftness",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
Simple("common.items.consumable.potion_retreat"): VoxTrans(
"voxel.object.potion_retreat",
(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",

View File

@ -810,7 +810,7 @@
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_swiftness"): "voxel.object.potion_swiftness",
Simple("common.items.consumable.potion_retreat"): "voxel.object.potion_retreat",
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",

BIN
assets/voxygen/voxel/object/potion_retreat.vox (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

View File

@ -155,7 +155,7 @@ lazy_static! {
BuffKind::Bleeding => "bleeding",
BuffKind::Cursed => "cursed",
BuffKind::Potion => "potion",
BuffKind::Swiftness => "swiftness",
BuffKind::Retreating => "retreating",
BuffKind::CampfireHeal => "campfire_heal",
BuffKind::EnergyRegen => "energy_regen",
BuffKind::IncreaseMaxEnergy => "increase_max_energy",

View File

@ -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%
Swiftness,
Retreating,
/// 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::Swiftness
| BuffKind::Retreating
| BuffKind::CampfireHeal
| BuffKind::Frenzied
| BuffKind::EnergyRegen
@ -270,7 +270,7 @@ impl BuffKind {
tick_dur: Secs(0.1),
}]
},
BuffKind::Swiftness => vec![
BuffKind::Retreating => vec![
BuffEffect::MovementSpeed(
1.0 + data.strength * stats.map_or(1.0, |s| s.move_speed_multiplier),
),

View File

@ -109,7 +109,7 @@ pub fn localize_chat_message(
BuffKind::Regeneration
| BuffKind::Saturation
| BuffKind::Potion
| BuffKind::Swiftness
| BuffKind::Retreating
| BuffKind::CampfireHeal
| BuffKind::EnergyRegen
| BuffKind::IncreaseMaxEnergy

View File

@ -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 Swiftness (uses same as regeneration atm)
BuffKind::Swiftness => imgs.buff_plus_0,
// TODO: Need unique image for Retreating (uses same as regeneration atm)
BuffKind::Retreating => 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<s
BuffKind::Regeneration => 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::Swiftness => localized_strings.get_msg("buff-title-swift"),
BuffKind::Retreating => localized_strings.get_msg("buff-title-retreat"),
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::Swiftness => localized_strings.get_msg("buff-desc-swift"),
BuffKind::Retreating => localized_strings.get_msg("buff-desc-retreat"),
BuffKind::CampfireHeal => {
localized_strings.get_msg_ctx("buff-desc-campfire_heal", &i18n::fluent_args! {
"rate" => data.strength * 100.0

View File

@ -189,8 +189,8 @@ pub fn consumable_desc(effects: &Effects, i18n: &Localization) -> Vec<String> {
"strength" => format_float(strength * 100.0),
})
},
BuffKind::Swiftness => {
i18n.get_msg_ctx("buff-stat-swift", &i18n::fluent_args! {
BuffKind::Retreating => {
i18n.get_msg_ctx("buff-stat-retreat", &i18n::fluent_args! {
"strength" => format_float(strength * 100.0),
})
},
@ -236,7 +236,7 @@ pub fn consumable_desc(effects: &Effects, i18n: &Localization) -> Vec<String> {
})
},
BuffKind::IncreaseMaxEnergy
| BuffKind::Swiftness
| BuffKind::Retreating
| BuffKind::IncreaseMaxHealth
| BuffKind::Invulnerability
| BuffKind::PotionSickness