From 89eee332c9eedad9938c3ec744442637b8f9a508 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sat, 31 Jul 2021 01:03:12 -0400 Subject: [PATCH] Replace `stamina -> energy` in code, i18n keys, and asset names --- .../{stamina_plus.png => energy_plus.png} | 0 .../ui/bag/icons/{stamina.png => energy.png} | 0 .../{stamina_bg.png => energy_bg.png} | 0 .../{stamina_frame.png => energy_frame.png} | 0 assets/voxygen/i18n/PL/buff.ron | 2 +- assets/voxygen/i18n/PL/hud/bag.ron | 2 +- assets/voxygen/i18n/PL/skills.ron | 12 ++--- assets/voxygen/i18n/cz_CZ/_manifest.ron | 16 +++---- assets/voxygen/i18n/de_DE/buff.ron | 2 +- assets/voxygen/i18n/de_DE/hud/bag.ron | 2 +- assets/voxygen/i18n/de_DE/skills.ron | 12 ++--- assets/voxygen/i18n/en/buff.ron | 2 +- assets/voxygen/i18n/en/hud/bag.ron | 2 +- assets/voxygen/i18n/en/skills.ron | 12 ++--- assets/voxygen/i18n/es_ES/buff.ron | 2 +- assets/voxygen/i18n/es_ES/hud/bag.ron | 2 +- assets/voxygen/i18n/es_ES/skills.ron | 12 ++--- assets/voxygen/i18n/fr_FR/buff.ron | 2 +- assets/voxygen/i18n/fr_FR/hud/bag.ron | 2 +- assets/voxygen/i18n/fr_FR/skills.ron | 12 ++--- assets/voxygen/i18n/hu_HU/buff.ron | 2 +- assets/voxygen/i18n/hu_HU/hud/bag.ron | 2 +- assets/voxygen/i18n/hu_HU/skills.ron | 12 ++--- assets/voxygen/i18n/it_IT/buff.ron | 2 +- assets/voxygen/i18n/it_IT/hud/bag.ron | 2 +- assets/voxygen/i18n/it_IT/skills.ron | 12 ++--- assets/voxygen/i18n/ja_JP/buff.ron | 2 +- assets/voxygen/i18n/ja_JP/hud/bag.ron | 2 +- assets/voxygen/i18n/ja_JP/skills.ron | 12 ++--- assets/voxygen/i18n/pt_BR/buff.ron | 2 +- assets/voxygen/i18n/pt_BR/hud/bag.ron | 2 +- assets/voxygen/i18n/pt_BR/skills.ron | 12 ++--- assets/voxygen/i18n/ru_RU/skills.ron | 12 ++--- assets/voxygen/i18n/sv/buff.ron | 2 +- assets/voxygen/i18n/sv/hud/bag.ron | 2 +- assets/voxygen/i18n/sv/skills.ron | 12 ++--- assets/voxygen/i18n/uk_UA/buff.ron | 2 +- assets/voxygen/i18n/uk_UA/hud/bag.ron | 2 +- assets/voxygen/i18n/uk_UA/skills.ron | 12 ++--- assets/voxygen/i18n/zh_CN/buff.ron | 2 +- assets/voxygen/i18n/zh_CN/hud/bag.ron | 2 +- assets/voxygen/i18n/zh_CN/skills.ron | 12 ++--- common/src/comp/buff.rs | 4 +- voxygen/src/hud/bag.rs | 10 ++-- voxygen/src/hud/buffs.rs | 6 +-- voxygen/src/hud/diary.rs | 8 ++-- voxygen/src/hud/group.rs | 10 ++-- voxygen/src/hud/img_ids.rs | 8 ++-- voxygen/src/hud/mod.rs | 2 +- voxygen/src/hud/skillbar.rs | 48 +++++++++---------- voxygen/src/hud/util.rs | 2 +- 51 files changed, 159 insertions(+), 159 deletions(-) rename assets/voxygen/element/skills/skilltree/{stamina_plus.png => energy_plus.png} (100%) rename assets/voxygen/element/ui/bag/icons/{stamina.png => energy.png} (100%) rename assets/voxygen/element/ui/skillbar/{stamina_bg.png => energy_bg.png} (100%) rename assets/voxygen/element/ui/skillbar/{stamina_frame.png => energy_frame.png} (100%) diff --git a/assets/voxygen/element/skills/skilltree/stamina_plus.png b/assets/voxygen/element/skills/skilltree/energy_plus.png similarity index 100% rename from assets/voxygen/element/skills/skilltree/stamina_plus.png rename to assets/voxygen/element/skills/skilltree/energy_plus.png diff --git a/assets/voxygen/element/ui/bag/icons/stamina.png b/assets/voxygen/element/ui/bag/icons/energy.png similarity index 100% rename from assets/voxygen/element/ui/bag/icons/stamina.png rename to assets/voxygen/element/ui/bag/icons/energy.png diff --git a/assets/voxygen/element/ui/skillbar/stamina_bg.png b/assets/voxygen/element/ui/skillbar/energy_bg.png similarity index 100% rename from assets/voxygen/element/ui/skillbar/stamina_bg.png rename to assets/voxygen/element/ui/skillbar/energy_bg.png diff --git a/assets/voxygen/element/ui/skillbar/stamina_frame.png b/assets/voxygen/element/ui/skillbar/energy_frame.png similarity index 100% rename from assets/voxygen/element/ui/skillbar/stamina_frame.png rename to assets/voxygen/element/ui/skillbar/energy_frame.png diff --git a/assets/voxygen/i18n/PL/buff.ron b/assets/voxygen/i18n/PL/buff.ron index f0c8fd9ba8..283575691e 100644 --- a/assets/voxygen/i18n/PL/buff.ron +++ b/assets/voxygen/i18n/PL/buff.ron @@ -26,7 +26,7 @@ "buff.desc.burn": "Palisz się żywcem", // Buffs stats "buff.stat.health": "Odnawia {str_total} Zdrowia", - "buff.stat.increase_max_stamina": "Podnosi Maksymalną Wytrzymałość o {strength}", + "buff.stat.increase_max_energy": "Podnosi Maksymalną Wytrzymałość o {strength}", "buff.stat.increase_max_health": "Podnosi Maksymalne Zdrowie o {strength}", "buff.stat.invulnerability": "Daje nietykalność", // Text diff --git a/assets/voxygen/i18n/PL/hud/bag.ron b/assets/voxygen/i18n/PL/hud/bag.ron index 819ff405d4..1ef6272b84 100644 --- a/assets/voxygen/i18n/PL/hud/bag.ron +++ b/assets/voxygen/i18n/PL/hud/bag.ron @@ -24,7 +24,7 @@ "hud.bag.offhand": "Ręka poboczna", "hud.bag.bag": "Torba", "hud.bag.health": "Zdrowie", - "hud.bag.stamina": "Energia", + "hud.bag.energy": "Energia", "hud.bag.combat_rating": "Combat Rating", "hud.bag.protection": "Ochrona", "hud.bag.combat_rating_desc": "Liczone na postawie Twojego\nekwipunku i zdrowia.", diff --git a/assets/voxygen/i18n/PL/skills.ron b/assets/voxygen/i18n/PL/skills.ron index cf9473ea72..0186674aab 100644 --- a/assets/voxygen/i18n/PL/skills.ron +++ b/assets/voxygen/i18n/PL/skills.ron @@ -9,8 +9,8 @@ // General "hud.skill.inc_health_title": "Zwiększ Zdrowie", "hud.skill.inc_health": "Zwiększa Maksymalne Zdrowie o {boost}{SP}", - "hud.skill.inc_stam_title": "Zwiększ Wytrzymałość", - "hud.skill.inc_stam": "Zwiększ Maksymalną Wytrzymałość o {boost}{SP}", + "hud.skill.inc_energy_title": "Zwiększ Wytrzymałość", + "hud.skill.inc_energy": "Zwiększ Maksymalną Wytrzymałość o {boost}{SP}", "hud.skill.unlck_sword_title": "Odblokuj miecz", "hud.skill.unlck_sword": "Odblokowuje umiejętności powiązane z mieczem{SP}", "hud.skill.unlck_axe_title": "Odblokuj topór", @@ -25,8 +25,8 @@ "hud.skill.unlck_sceptre": "Odblokowuje umiejętności powiązane z kosturem druida{SP}", "hud.skill.dodge_title": "Unik (przewrót)", "hud.skill.dodge": "Umożliwia unikanie ataków przeciwników (dodaje klatki nieśmiertelności){SP}", - "hud.skill.roll_stamina_title": "Przewrót - koszt", - "hud.skill.roll_stamina": "Przewrót kosztuje {boost}% mniej wytrzymałości{SP}", + "hud.skill.roll_energy_title": "Przewrót - koszt", + "hud.skill.roll_energy": "Przewrót kosztuje {boost}% mniej wytrzymałości{SP}", "hud.skill.roll_speed_title": "Przewrót - prędkość", "hud.skill.roll_speed": "Przewrót jest {boost}% szybszy{SP}", "hud.skill.roll_dur_title": "Przewrót - długość (czas)", @@ -93,8 +93,8 @@ "hud.skill.st_flamethrower_damage" : "Zwiększa obrażenia o {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Eksplozja - rozmiar", "hud.skill.st_explosion_radius" : "Rozmiar ma znaczenie, szczególnie gdy walczysz z wieloma przeciwnikami,\nzwiększa wielkość eksplozji o {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Regeneracja Wytrzymałości", - "hud.skill.st_stamina_regen" : "Zwiększa regenerację Wytrzymałości o {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Regeneracja Wytrzymałości", + "hud.skill.st_energy_regen" : "Zwiększa regenerację Wytrzymałości o {boost}%{SP}", "hud.skill.st_fireball_title" : "Kula ognia", "hud.skill.st_fireball" : "Walisz z różdżki wybuchającymi fajerbolami", "hud.skill.st_damage_title" : "Obrażenia", diff --git a/assets/voxygen/i18n/cz_CZ/_manifest.ron b/assets/voxygen/i18n/cz_CZ/_manifest.ron index d5a6c1bef5..62e7bce880 100644 --- a/assets/voxygen/i18n/cz_CZ/_manifest.ron +++ b/assets/voxygen/i18n/cz_CZ/_manifest.ron @@ -262,7 +262,7 @@ Užijte si svůj pobyt ve světě Veloren!"#, "hud.bag.glider": "Glider", "hud.bag.bag": "Batoh", "hud.bag.health": "Život", - "hud.bag.stamina": "Výdrž", + "hud.bag.energy": "Výdrž", "hud.bag.combat_rating": "Bojové hodnocení", "hud.bag.protection": "Ochrana", "hud.bag.combat_rating_desc": "Vypočítáno z života/zbroje.", @@ -315,8 +315,8 @@ Užijte si svůj pobyt ve světě Veloren!"#, // General "hud.skill.inc_health_title": "Zvýší Zdraví", "hud.skill.inc_health": "Zvýší maximální zdraví o 5{SP}", - "hud.skill.inc_stam_title": "Zvýší Výdrž", - "hud.skill.inc_stam": "Zvýší Výdrž o 5{SP}", + "hud.skill.inc_energy_title": "Zvýší Výdrž", + "hud.skill.inc_energy": "Zvýší Výdrž o 5{SP}", "hud.skill.unlck_sword_title": "Odemknutí Meče", "hud.skill.unlck_sword": "Odemkne strom dovedností pro meče{SP}", "hud.skill.unlck_axe_title": "Odemknutí Sekery", @@ -331,8 +331,8 @@ Užijte si svůj pobyt ve světě Veloren!"#, "hud.skill.unlck_sceptre": "Odemkne strom dovedností pro žezlo{SP}", "hud.skill.dodge_title": "Vyhnutí", "hud.skill.dodge": "Vyhnese útokům zblízka{SP}", - "hud.skill.roll_stamina_title": "Menší spotřeba Výdrže pro Kotrmelec", - "hud.skill.roll_stamina": "Kotrmelec použije o 20% méně Výdrže{SP}", + "hud.skill.roll_energy_title": "Menší spotřeba Výdrže pro Kotrmelec", + "hud.skill.roll_energy": "Kotrmelec použije o 20% méně Výdrže{SP}", "hud.skill.roll_speed_title": "Rychlost Kotrmelce", "hud.skill.roll_speed": "Kotrmelec je o 20% rychlejší{SP}", "hud.skill.roll_dur_title": "Délka Kotrmelce", @@ -399,8 +399,8 @@ Užijte si svůj pobyt ve světě Veloren!"#, "hud.skill.st_flamethrower_damage" : "Zvýší poškození o 30%{SP}", "hud.skill.st_explosion_radius_title" : "Rozsah Exploze", "hud.skill.st_explosion_radius" : "Cím větší, tím lepší. Zvětší Rádius Exploze o 10%{SP}", - "hud.skill.st_stamina_regen_title" : "Obnova Výdrže", - "hud.skill.st_stamina_regen" : "Zvýší generaci výdrže o 20%{SP}", + "hud.skill.st_energy_regen_title" : "Obnova Výdrže", + "hud.skill.st_energy_regen" : "Zvýší generaci výdrže o 20%{SP}", "hud.skill.st_fireball_title" : "Ohnivá Koule", "hud.skill.st_fireball" : "Hrajte aport s nepřáteli", "hud.skill.st_damage_title" : "Poškození", @@ -778,7 +778,7 @@ Kdykoli se budeš cítit připraven, pokus se získat ještě lepší vybavení "buff.desc.cursed": "Jsi prokletý.", // Buffs stats "buff.stat.health": "Obnoví {str_total} Životů", - "buff.stat.increase_max_stamina": "Zvedne Maximalní Výdrž o {strength}", + "buff.stat.increase_max_energy": "Zvedne Maximalní Výdrž o {strength}", "buff.stat.increase_max_health": "Zvedne Maximální počet životů o {strength}", "buff.stat.invulnerability": "Zaručuje Nezranitelnost", // Text diff --git a/assets/voxygen/i18n/de_DE/buff.ron b/assets/voxygen/i18n/de_DE/buff.ron index f42d807832..f2e149b547 100644 --- a/assets/voxygen/i18n/de_DE/buff.ron +++ b/assets/voxygen/i18n/de_DE/buff.ron @@ -26,7 +26,7 @@ "buff.desc.cursed": "Du bist verflucht.", // Buffs stats "buff.stat.health": "Stellt {str_total} Leben wiederher", - "buff.stat.increase_max_stamina": "Erhöt die maximale Ausdauer um {strength}", + "buff.stat.increase_max_energy": "Erhöt die maximale Ausdauer um {strength}", "buff.stat.increase_max_health": "Erhöht die maximale Lebensenergie um {strength}", "buff.stat.invulnerability": "Gewährt Unverwundbarkeit", // Text diff --git a/assets/voxygen/i18n/de_DE/hud/bag.ron b/assets/voxygen/i18n/de_DE/hud/bag.ron index fafb68eb3e..24c2252fea 100644 --- a/assets/voxygen/i18n/de_DE/hud/bag.ron +++ b/assets/voxygen/i18n/de_DE/hud/bag.ron @@ -26,7 +26,7 @@ "hud.bag.offhand": "Nebenhand", "hud.bag.bag": "Beutel", "hud.bag.health": "Leben", - "hud.bag.stamina": "Ausdauer", + "hud.bag.energy": "Ausdauer", "hud.bag.combat_rating": "Kampfwertung", "hud.bag.protection": "Schutz", "hud.bag.stun_res": "Betäubungsresistenz", diff --git a/assets/voxygen/i18n/de_DE/skills.ron b/assets/voxygen/i18n/de_DE/skills.ron index d8915a90a4..edf044c638 100644 --- a/assets/voxygen/i18n/de_DE/skills.ron +++ b/assets/voxygen/i18n/de_DE/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Leben erhöhen", "hud.skill.inc_health": "Erhöht max. Leben um {boost}{SP}", - "hud.skill.inc_stam_title": "Ausdauer", - "hud.skill.inc_stam": "Erhöht die max. Ausdauer um {boost}{SP}", + "hud.skill.inc_energy_title": "Ausdauer", + "hud.skill.inc_energy": "Erhöht die max. Ausdauer um {boost}{SP}", "hud.skill.unlck_sword_title": "Schwert freischalten", "hud.skill.unlck_sword": "Schaltet den Schwert-Fähigkeitenbaum frei{SP}", "hud.skill.unlck_axe_title": "Axt freischalten", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Schaltet den Zepter-Fähigkeitenbaum frei{SP}", "hud.skill.dodge_title": "Ausweichen", "hud.skill.dodge": "Weicht Nahkampfattacken aus{SP}", - "hud.skill.roll_stamina_title": "Ausdauerkosten beim Rollen", - "hud.skill.roll_stamina": "Rollen nutzt {boost}% weniger Ausdauer{SP}", + "hud.skill.roll_energy_title": "Ausdauerkosten beim Rollen", + "hud.skill.roll_energy": "Rollen nutzt {boost}% weniger Ausdauer{SP}", "hud.skill.roll_speed_title": "Rollgeschwindigkeit", "hud.skill.roll_speed": "Rolle um {boost}% schneller{SP}", "hud.skill.roll_dur_title": "Rolldauer", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Erhöht den Schaden um {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Explosionsradius", "hud.skill.st_explosion_radius" : "Größer ist besser, erhöht den Radius der Explosion um {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Ausdauerregeneration", - "hud.skill.st_stamina_regen" : "Erhöht den Ausdauergewinn um {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Ausdauerregeneration", + "hud.skill.st_energy_regen" : "Erhöht den Ausdauergewinn um {boost}%{SP}", "hud.skill.st_fireball_title" : "Feuerball", "hud.skill.st_fireball" : "Sende brennende Kugeln in Richtung deiner Feinde", "hud.skill.st_damage_title" : "Schaden", diff --git a/assets/voxygen/i18n/en/buff.ron b/assets/voxygen/i18n/en/buff.ron index e2c4ed10c6..1e41ca4b08 100644 --- a/assets/voxygen/i18n/en/buff.ron +++ b/assets/voxygen/i18n/en/buff.ron @@ -38,7 +38,7 @@ "buff.desc.ensnared": "Vines grasp at your legs, impeding your movement.", // Buffs stats "buff.stat.health": "Restores {str_total} Health", - "buff.stat.increase_max_stamina": "Raises Maximum Stamina by {strength}", + "buff.stat.increase_max_energy": "Raises Maximum Stamina by {strength}", "buff.stat.increase_max_health": "Raises Maximum Health by {strength}", "buff.stat.invulnerability": "Grants invulnerability", // Text diff --git a/assets/voxygen/i18n/en/hud/bag.ron b/assets/voxygen/i18n/en/hud/bag.ron index b8a0271369..ef65866ccd 100644 --- a/assets/voxygen/i18n/en/hud/bag.ron +++ b/assets/voxygen/i18n/en/hud/bag.ron @@ -30,7 +30,7 @@ "hud.bag.swap_equipped_weapons_desc": "Press {key}", "hud.bag.bag": "Bag", "hud.bag.health": "Health", - "hud.bag.stamina": "Stamina", + "hud.bag.energy": "Stamina", "hud.bag.combat_rating": "Combat Rating", "hud.bag.protection": "Protection", "hud.bag.stun_res": "Stun Resilience", diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron index 472af3e40e..1c8b9eaa4d 100644 --- a/assets/voxygen/i18n/en/skills.ron +++ b/assets/voxygen/i18n/en/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Increase Health", "hud.skill.inc_health": "Increases max health by {boost}{SP}", - "hud.skill.inc_stam_title": "Increase Stamina", - "hud.skill.inc_stam": "Increases max stamina by {boost}{SP}", + "hud.skill.inc_energy_title": "Increase Stamina", + "hud.skill.inc_energy": "Increases max stamina by {boost}{SP}", "hud.skill.unlck_sword_title": "Unlock Sword", "hud.skill.unlck_sword": "Unlocks sword skill tree{SP}", "hud.skill.unlck_axe_title": "Unlock Axe", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Unlocks sceptre skill tree{SP}", "hud.skill.dodge_title": "Dodge", "hud.skill.dodge": "Dodge rolls are triggered with middle-click, and grant temporary immunity to melee attacks (iframes) while you're rolling.", - "hud.skill.roll_stamina_title": "Roll Stamina Cost", - "hud.skill.roll_stamina": "Rolling uses {boost}% less stamina{SP}", + "hud.skill.roll_energy_title": "Roll Stamina Cost", + "hud.skill.roll_energy": "Rolling uses {boost}% less stamina{SP}", "hud.skill.roll_speed_title": "Rolling Speed", "hud.skill.roll_speed": "Roll {boost}% faster{SP}", "hud.skill.roll_dur_title": "Rolling Duration", @@ -97,8 +97,8 @@ "hud.skill.st_flamethrower_damage" : "Increases damage by {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Explosion Radius", "hud.skill.st_explosion_radius" : "Bigger is better, increases explosion radius by {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Stamina Regen", - "hud.skill.st_stamina_regen" : "Increases stamina gain by {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Stamina Regen", + "hud.skill.st_energy_regen" : "Increases stamina gain by {boost}%{SP}", "hud.skill.st_fireball_title" : "Fireball", "hud.skill.st_fireball" : "Shoots a fireball that explodes on impact", "hud.skill.st_damage_title" : "Damage", diff --git a/assets/voxygen/i18n/es_ES/buff.ron b/assets/voxygen/i18n/es_ES/buff.ron index 6cf979b30c..014a67c146 100644 --- a/assets/voxygen/i18n/es_ES/buff.ron +++ b/assets/voxygen/i18n/es_ES/buff.ron @@ -26,7 +26,7 @@ "buff.desc.cursed": "Estás maldito.", // Buffs stats "buff.stat.health": "Restaura {str_total} salud", - "buff.stat.increase_max_stamina": "Aumenta la resistencia máxima en {strength}", + "buff.stat.increase_max_energy": "Aumenta la resistencia máxima en {strength}", "buff.stat.increase_max_health": "Aumenta la salud máxima en {strength}", "buff.stat.invulnerability": "Ofrece invulnerabilidad", // Text diff --git a/assets/voxygen/i18n/es_ES/hud/bag.ron b/assets/voxygen/i18n/es_ES/hud/bag.ron index db22d86dfb..c0b84fe65d 100644 --- a/assets/voxygen/i18n/es_ES/hud/bag.ron +++ b/assets/voxygen/i18n/es_ES/hud/bag.ron @@ -26,7 +26,7 @@ "hud.bag.offhand": "Mano secundaria", "hud.bag.bag": "Mochila", "hud.bag.health": "Vida", - "hud.bag.stamina": "Resistencia", + "hud.bag.energy": "Resistencia", "hud.bag.combat_rating": "Puntuación de combate", "hud.bag.protection": "Protección", "hud.bag.combat_rating_desc": "Calculado por tu\nequipamiento y vida", diff --git a/assets/voxygen/i18n/es_ES/skills.ron b/assets/voxygen/i18n/es_ES/skills.ron index 05bf911f4f..6fdf55cab1 100644 --- a/assets/voxygen/i18n/es_ES/skills.ron +++ b/assets/voxygen/i18n/es_ES/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Aumentar la salud", "hud.skill.inc_health": "Aumenta la salud máxima en {boost}{SP}", - "hud.skill.inc_stam_title": "Aumenta la resistencia", - "hud.skill.inc_stam": "Aumenta la resistencia máxima en {boost}{SP}", + "hud.skill.inc_energy_title": "Aumenta la resistencia", + "hud.skill.inc_energy": "Aumenta la resistencia máxima en {boost}{SP}", "hud.skill.unlck_sword_title": "Desbloquear la espada", "hud.skill.unlck_sword": "Desbloquea el árbol de habilidades de la espada{SP}", "hud.skill.unlck_axe_title": "Desbloquear el hacha", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Desbloquea el árbol de habilidades del cetro{SP}", "hud.skill.dodge_title": "Esquivar", "hud.skill.dodge": "Esquivar evita los ataques cuerpo a cuerpo{SP}", - "hud.skill.roll_stamina_title": "Coste de resistencia Rodar", - "hud.skill.roll_stamina": "Rodar usa un {boost}% menos de resistencia{SP}", + "hud.skill.roll_energy_title": "Coste de resistencia Rodar", + "hud.skill.roll_energy": "Rodar usa un {boost}% menos de resistencia{SP}", "hud.skill.roll_speed_title": "Velocidad al rodar", "hud.skill.roll_speed": "Rodar es un {boost}% más rápido{SP}", "hud.skill.roll_dur_title": "Duración de rodar", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Aumenta el daño en un {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Radio de explosión", "hud.skill.st_explosion_radius" : "Más grande es mejor, aumenta el radio de explosión en un {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Regeneración de resistencia", - "hud.skill.st_stamina_regen" : "Aumenta la regeneración de resistencia en un {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Regeneración de resistencia", + "hud.skill.st_energy_regen" : "Aumenta la regeneración de resistencia en un {boost}%{SP}", "hud.skill.st_fireball_title" : "Bola de fuego", "hud.skill.st_fireball" : "Juega a perseguir a los enemigos", "hud.skill.st_damage_title" : "Daño", diff --git a/assets/voxygen/i18n/fr_FR/buff.ron b/assets/voxygen/i18n/fr_FR/buff.ron index d764b7968a..86d5d45b15 100644 --- a/assets/voxygen/i18n/fr_FR/buff.ron +++ b/assets/voxygen/i18n/fr_FR/buff.ron @@ -26,7 +26,7 @@ "buff.desc.cursed": "Vous êtes maudit.", // Buffs stats "buff.stat.health": "Restaure {str_total} points de vie", - "buff.stat.increase_max_stamina": "Augmente la vigueur maximale de {strength}", + "buff.stat.increase_max_energy": "Augmente la vigueur maximale de {strength}", "buff.stat.increase_max_health": "Augmente la santé maximale de {strength}", "buff.stat.invulnerability": "Rend invincible", // Text diff --git a/assets/voxygen/i18n/fr_FR/hud/bag.ron b/assets/voxygen/i18n/fr_FR/hud/bag.ron index 7865db0406..020f1ef603 100644 --- a/assets/voxygen/i18n/fr_FR/hud/bag.ron +++ b/assets/voxygen/i18n/fr_FR/hud/bag.ron @@ -26,7 +26,7 @@ "hud.bag.offhand": "Main Secondaire", "hud.bag.bag": "Sac", "hud.bag.health": "Santé", - "hud.bag.stamina": "Vigueur", + "hud.bag.energy": "Vigueur", "hud.bag.combat_rating": "Niveau de Combat", "hud.bag.protection": "Protection", "hud.bag.combat_rating_desc": "Calculé depuis votre\néquipement et votre santé", diff --git a/assets/voxygen/i18n/fr_FR/skills.ron b/assets/voxygen/i18n/fr_FR/skills.ron index 3fa6636704..5008c09588 100644 --- a/assets/voxygen/i18n/fr_FR/skills.ron +++ b/assets/voxygen/i18n/fr_FR/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Augmentation de Santé", "hud.skill.inc_health": "Augmente les points de vie max de {boost}{SP}", - "hud.skill.inc_stam_title": "Augmentation d'Endurance", - "hud.skill.inc_stam": "Augmente les points d'endurance max de {boost}{SP}", + "hud.skill.inc_energy_title": "Augmentation d'Endurance", + "hud.skill.inc_energy": "Augmente les points d'endurance max de {boost}{SP}", "hud.skill.unlck_sword_title": "Maniement de l'Épée", "hud.skill.unlck_sword": "Débloque l'arbre de compétence pour l'épée{SP}", "hud.skill.unlck_axe_title": "Maniement de la Hache", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Débloque l'arbre de compétence pour le sceptre{SP}", "hud.skill.dodge_title": "Roulade", "hud.skill.dodge": "Esquivez les attaques de mélée en faisant des roulades{SP}", - "hud.skill.roll_stamina_title": "Coût d'Endurance de la Roulade", - "hud.skill.roll_stamina": "Rouler coûte {boost}% moins d'endurance{SP}", + "hud.skill.roll_energy_title": "Coût d'Endurance de la Roulade", + "hud.skill.roll_energy": "Rouler coûte {boost}% moins d'endurance{SP}", "hud.skill.roll_speed_title": "Vitesse de la Roulade", "hud.skill.roll_speed": "Rouler {boost}% plus vite{SP}", "hud.skill.roll_dur_title": "Durée de la Roulade", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Augmente de {boost}% les dégâts{SP}", "hud.skill.st_explosion_radius_title" : "Portée de l'Explosion", "hud.skill.st_explosion_radius" : "Augmente la portée d'explosion de {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Régénération d'Endurance des Boules de feu", - "hud.skill.st_stamina_regen" : "Augmente de {boost}% la régénération d'endurance{SP}", + "hud.skill.st_energy_regen_title" : "Régénération d'Endurance des Boules de feu", + "hud.skill.st_energy_regen" : "Augmente de {boost}% la régénération d'endurance{SP}", "hud.skill.st_fireball_title" : "Boule de Feu", "hud.skill.st_fireball" : "Joue à la balle avec les ennemis", "hud.skill.st_damage_title" : "Dégâts des boules de feu", diff --git a/assets/voxygen/i18n/hu_HU/buff.ron b/assets/voxygen/i18n/hu_HU/buff.ron index 7b1633b8d2..5a0f8eee85 100644 --- a/assets/voxygen/i18n/hu_HU/buff.ron +++ b/assets/voxygen/i18n/hu_HU/buff.ron @@ -38,7 +38,7 @@ "buff.desc.ensnared": "Indák kapaszkodnak a lábadba, így szinte lehetetlenné vált számodra a mozgás.", // Buffs stats "buff.stat.health": "{str_total} életerőt tölt vissza", - "buff.stat.increase_max_stamina": "Megnöveli a maximális energiát ennyivel: {strength}", + "buff.stat.increase_max_energy": "Megnöveli a maximális energiát ennyivel: {strength}", "buff.stat.increase_max_health": "Megnöveli a maximális életerőt ennyivel: {strength}", "buff.stat.invulnerability": "Sebezhetetlenné tesz", // Text diff --git a/assets/voxygen/i18n/hu_HU/hud/bag.ron b/assets/voxygen/i18n/hu_HU/hud/bag.ron index fec5dfa1f6..ca11e5a763 100644 --- a/assets/voxygen/i18n/hu_HU/hud/bag.ron +++ b/assets/voxygen/i18n/hu_HU/hud/bag.ron @@ -30,7 +30,7 @@ "hud.bag.swap_equipped_weapons_desc": "Nyomd meg a(z) '{key}' gombot", "hud.bag.bag": "Holmitartó", "hud.bag.health": "Életerő", - "hud.bag.stamina": "Energia", + "hud.bag.energy": "Energia", "hud.bag.combat_rating": "Küzdelmi érték", "hud.bag.protection": "Védelem", "hud.bag.stun_res": "Megszédíthetőség", diff --git a/assets/voxygen/i18n/hu_HU/skills.ron b/assets/voxygen/i18n/hu_HU/skills.ron index e3926b27c8..4cee0264a8 100644 --- a/assets/voxygen/i18n/hu_HU/skills.ron +++ b/assets/voxygen/i18n/hu_HU/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Életerő növelése", "hud.skill.inc_health": "Maximális életerő növelése {boost} ponttal{SP}", - "hud.skill.inc_stam_title": "Energia növelése", - "hud.skill.inc_stam": "Maximális energia növelése {boost} ponttal{SP}", + "hud.skill.inc_energy_title": "Energia növelése", + "hud.skill.inc_energy": "Maximális energia növelése {boost} ponttal{SP}", "hud.skill.unlck_sword_title": "Kard feloldása", "hud.skill.unlck_sword": "Kard képességfájának feloldása{SP}", "hud.skill.unlck_axe_title": "Fejsze feloldása", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Varázsjogar képességfájának feloldása{SP}", "hud.skill.dodge_title": "Kitérés", "hud.skill.dodge": "A kitérőbukfencet görgőkattintással lehet aktiválni. A gurulás ideje alatt nem lehet megsebezni téged közelharci támadással.", - "hud.skill.roll_stamina_title": "Bukfencezés energiaigénye", - "hud.skill.roll_stamina": "A bukfencezés {boost}%-kal kevesebb energiát használ{SP}", + "hud.skill.roll_energy_title": "Bukfencezés energiaigénye", + "hud.skill.roll_energy": "A bukfencezés {boost}%-kal kevesebb energiát használ{SP}", "hud.skill.roll_speed_title": "Bukfencezés sebessége", "hud.skill.roll_speed": "{boost}%-kal gyorsabb bukfencezés{SP}", "hud.skill.roll_dur_title": "Bukfencezés időtartama", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Megnöveli a sebzést {boost}%-kal{SP}", "hud.skill.st_explosion_radius_title" : "Robbanás sugara", "hud.skill.st_explosion_radius" : "Nagyobb a jobb, megnöveli a robbanás sugarát {boost}%-kal{SP}", - "hud.skill.st_stamina_regen_title" : "Energia visszatöltődés", - "hud.skill.st_stamina_regen" : "Megnöveli az energia visszatöltődést {boost}%-kal{SP}", + "hud.skill.st_energy_regen_title" : "Energia visszatöltődés", + "hud.skill.st_energy_regen" : "Megnöveli az energia visszatöltődést {boost}%-kal{SP}", "hud.skill.st_fireball_title" : "Tűzgolyó", "hud.skill.st_fireball" : "Egy tűzgolyót lő ki, amely becsapódáskor felrobban", "hud.skill.st_damage_title" : "Sebzés", diff --git a/assets/voxygen/i18n/it_IT/buff.ron b/assets/voxygen/i18n/it_IT/buff.ron index 3bed46b05c..254bb051d5 100644 --- a/assets/voxygen/i18n/it_IT/buff.ron +++ b/assets/voxygen/i18n/it_IT/buff.ron @@ -32,7 +32,7 @@ "buff.desc.crippled": "Il tuo movimento è storpio dal momento che le tue gambe sono gravemente ferite.", // Buffs stats "buff.stat.health": "Rigenera {str_total} di Salute", - "buff.stat.increase_max_stamina": "Aumenta la Stamina Massima di {strength}", + "buff.stat.increase_max_energy": "Aumenta la Stamina Massima di {strength}", "buff.stat.increase_max_health": "Aumenta la Salute Massima di {strength}", "buff.stat.invulnerability": "Dona invulnerabilità", // Text diff --git a/assets/voxygen/i18n/it_IT/hud/bag.ron b/assets/voxygen/i18n/it_IT/hud/bag.ron index c763a7bb66..517ee552f6 100644 --- a/assets/voxygen/i18n/it_IT/hud/bag.ron +++ b/assets/voxygen/i18n/it_IT/hud/bag.ron @@ -26,7 +26,7 @@ "hud.bag.offhand": "Mano Secondaria", "hud.bag.bag": "Borsa", "hud.bag.health": "Salute", - "hud.bag.stamina": "Stamina", + "hud.bag.energy": "Stamina", "hud.bag.combat_rating": "Grado di Combattimento", "hud.bag.protection": "Protezione", "hud.bag.stun_res": "Resilienza allo Stordimento", diff --git a/assets/voxygen/i18n/it_IT/skills.ron b/assets/voxygen/i18n/it_IT/skills.ron index 98f6c0a93f..8e0f41e237 100644 --- a/assets/voxygen/i18n/it_IT/skills.ron +++ b/assets/voxygen/i18n/it_IT/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Aumenta Salute", "hud.skill.inc_health": "Incrementa la salute massima di {boost}{SP}", - "hud.skill.inc_stam_title": "Aumenta Stamina", - "hud.skill.inc_stam": "Incrementa la stamina massima di {boost}{SP}", + "hud.skill.inc_energy_title": "Aumenta Stamina", + "hud.skill.inc_energy": "Incrementa la stamina massima di {boost}{SP}", "hud.skill.unlck_sword_title": "Sblocca Spada", "hud.skill.unlck_sword": "Sblocca l'albero di abilità per la spada{SP}", "hud.skill.unlck_axe_title": "Sblocca Ascia", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Sblocca l'albero di abilità per lo scettro{SP}", "hud.skill.dodge_title": "Schivata", "hud.skill.dodge": "Le rotolate per schivare vengono attivate col click del tasto centrale del mouse, e concede immunità temporanea ad attacchi ravvicinati (iframes) mentre stai rotolando.", - "hud.skill.roll_stamina_title": "Costo di Stamina Rotolata", - "hud.skill.roll_stamina": "Rotolare usa il {boost}% in meno di stamina{SP}", + "hud.skill.roll_energy_title": "Costo di Stamina Rotolata", + "hud.skill.roll_energy": "Rotolare usa il {boost}% in meno di stamina{SP}", "hud.skill.roll_speed_title": "Velocità Rotolata", "hud.skill.roll_speed": "Rotola il {boost}% più velocemente{SP}", "hud.skill.roll_dur_title": "Durata Rotolata", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Incrementa il danno del {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Portata Esplosione", "hud.skill.st_explosion_radius" : "Più grande è meglio, aumenta la portata dell'esplosione del {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Rigenerazione Stamina", - "hud.skill.st_stamina_regen" : "Incrementa la stamina ottenuta del {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Rigenerazione Stamina", + "hud.skill.st_energy_regen" : "Incrementa la stamina ottenuta del {boost}%{SP}", "hud.skill.st_fireball_title" : "Palla di Fuoco", "hud.skill.st_fireball" : "Spara una palla di fuoco che esplode all'impatto", "hud.skill.st_damage_title" : "Danno", diff --git a/assets/voxygen/i18n/ja_JP/buff.ron b/assets/voxygen/i18n/ja_JP/buff.ron index da5885664c..1cb53bbdd0 100644 --- a/assets/voxygen/i18n/ja_JP/buff.ron +++ b/assets/voxygen/i18n/ja_JP/buff.ron @@ -26,7 +26,7 @@ "buff.desc.cursed": "あなたは呪われた。", // Buffs stats "buff.stat.health": "体力を{str_total}回復", - "buff.stat.increase_max_stamina": "スタミナ最大値を{strength}上げる", + "buff.stat.increase_max_energy": "スタミナ最大値を{strength}上げる", "buff.stat.increase_max_health": "体力最大値を{strength}上げる", "buff.stat.invulnerability": "不死身になる", // Text diff --git a/assets/voxygen/i18n/ja_JP/hud/bag.ron b/assets/voxygen/i18n/ja_JP/hud/bag.ron index 5492894b4d..e25c97ff1c 100644 --- a/assets/voxygen/i18n/ja_JP/hud/bag.ron +++ b/assets/voxygen/i18n/ja_JP/hud/bag.ron @@ -26,7 +26,7 @@ "hud.bag.offhand": "非利き手", "hud.bag.bag": "バッグ", "hud.bag.health": "体力", - "hud.bag.stamina": "スタミナ", + "hud.bag.energy": "スタミナ", "hud.bag.combat_rating": "戦闘レート", "hud.bag.protection": "防御力", "hud.bag.combat_rating_desc": "装備と体力から\n計算されます", diff --git a/assets/voxygen/i18n/ja_JP/skills.ron b/assets/voxygen/i18n/ja_JP/skills.ron index 6f94dc94f4..1ce14d2843 100644 --- a/assets/voxygen/i18n/ja_JP/skills.ron +++ b/assets/voxygen/i18n/ja_JP/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "体力追加", "hud.skill.inc_health": "体力の最大値を{boost}増加 {SP}", - "hud.skill.inc_stam_title": "スタミナ追加", - "hud.skill.inc_stam": "スタミナ最大値を{boost}増加 {SP}", + "hud.skill.inc_energy_title": "スタミナ追加", + "hud.skill.inc_energy": "スタミナ最大値を{boost}増加 {SP}", "hud.skill.unlck_sword_title": "剣解除", "hud.skill.unlck_sword": "剣のスキルツリーを解除 {SP}", "hud.skill.unlck_axe_title": "斧解除", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "セプターのスキルツリーを解除 {SP}", "hud.skill.dodge_title": "回避", "hud.skill.dodge": "近接攻撃を素早く避ける {SP}", - "hud.skill.roll_stamina_title": "ローリング スタミナコスト", - "hud.skill.roll_stamina": "ローリングのスタミナ消費を{boost}%減少 {SP}", + "hud.skill.roll_energy_title": "ローリング スタミナコスト", + "hud.skill.roll_energy": "ローリングのスタミナ消費を{boost}%減少 {SP}", "hud.skill.roll_speed_title": "ローリング 速度", "hud.skill.roll_speed": "ローリングの速度を{boost}%加速 {SP}", "hud.skill.roll_dur_title": "ローリング 時間", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "ダメージを{boost}%増加 {SP}", "hud.skill.st_explosion_radius_title" : "エクスプロージョン 範囲", "hud.skill.st_explosion_radius" : "大きいのはいいですよね。爆発半径を{boost}%増加 {SP}", - "hud.skill.st_stamina_regen_title" : "スタミナ 再生", - "hud.skill.st_stamina_regen" : "スタミナ獲得量を{boost}%増加 {SP}", + "hud.skill.st_energy_regen_title" : "スタミナ 再生", + "hud.skill.st_energy_regen" : "スタミナ獲得量を{boost}%増加 {SP}", "hud.skill.st_fireball_title" : "ファイアーボール", "hud.skill.st_fireball" : "敵と一緒に遊びましょう", "hud.skill.st_damage_title" : "ダメージ", diff --git a/assets/voxygen/i18n/pt_BR/buff.ron b/assets/voxygen/i18n/pt_BR/buff.ron index 41010940af..19ae344942 100644 --- a/assets/voxygen/i18n/pt_BR/buff.ron +++ b/assets/voxygen/i18n/pt_BR/buff.ron @@ -38,7 +38,7 @@ "buff.desc.ensnared": "Trepadeiras agarram suas pernas, impedindo seus movimentos.", // Buffs stats "buff.stat.health": "Restaura {str_total} de Vida", - "buff.stat.increase_max_stamina": "Aumenta a Stamina Máxima em {strength}", + "buff.stat.increase_max_energy": "Aumenta a Stamina Máxima em {strength}", "buff.stat.increase_max_health": "Aumenta a Vida Máxima em {strength}", "buff.stat.invulnerability": "Concede invulnerabilidade", // Text diff --git a/assets/voxygen/i18n/pt_BR/hud/bag.ron b/assets/voxygen/i18n/pt_BR/hud/bag.ron index 175bc7e44e..11cbfcb6b4 100644 --- a/assets/voxygen/i18n/pt_BR/hud/bag.ron +++ b/assets/voxygen/i18n/pt_BR/hud/bag.ron @@ -30,7 +30,7 @@ "hud.bag.swap_equipped_weapons_desc": "Pressione {key}", "hud.bag.bag": "Mochila", "hud.bag.health": "Vida", - "hud.bag.stamina": "Stamina", + "hud.bag.energy": "Stamina", "hud.bag.combat_rating": "Pontuação de Combate", "hud.bag.protection": "Proteção", "hud.bag.stun_res": "Resistência à paralisia", diff --git a/assets/voxygen/i18n/pt_BR/skills.ron b/assets/voxygen/i18n/pt_BR/skills.ron index 493f6f139d..a2ea312e52 100644 --- a/assets/voxygen/i18n/pt_BR/skills.ron +++ b/assets/voxygen/i18n/pt_BR/skills.ron @@ -11,8 +11,8 @@ // Geral "hud.skill.inc_health_title": "Aumentar Saúde", "hud.skill.inc_health": "Aumentar saúde máxima por {boost}{SP}", - "hud.skill.inc_stam_title": "Aumentar Stamina", - "hud.skill.inc_stam": "Aumentar stamina máxima por {boost}{SP}", + "hud.skill.inc_energy_title": "Aumentar Stamina", + "hud.skill.inc_energy": "Aumentar stamina máxima por {boost}{SP}", "hud.skill.unlck_sword_title": "Desbloquear Espada", "hud.skill.unlck_sword": "Desbloquear habilidades de espada{SP}", "hud.skill.unlck_axe_title": "Desbloquear Machado", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Desbloquear Habilidades de Cetro{SP}", "hud.skill.dodge_title": "Esquiva", "hud.skill.dodge": "Esquivar evita ataques corpo a corpo{SP}", - "hud.skill.roll_stamina_title": "Custo de Stamina da Rolagem", - "hud.skill.roll_stamina": "Rolar usa {boost}% menos de stamina{SP}", + "hud.skill.roll_energy_title": "Custo de Stamina da Rolagem", + "hud.skill.roll_energy": "Rolar usa {boost}% menos de stamina{SP}", "hud.skill.roll_speed_title": "Velocidade da Rolagem", "hud.skill.roll_speed": "Rola {boost}% mais rápido{SP}", "hud.skill.roll_dur_title": "Duração da Rolagem", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Aumenta o dano em {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Raio da Explosão", "hud.skill.st_explosion_radius" : "Quanto maior melhor, e o raio da explosão é aumentado em {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Regeneração de stamina", - "hud.skill.st_stamina_regen" : "Aumenta o ganho de stamina em {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Regeneração de stamina", + "hud.skill.st_energy_regen" : "Aumenta o ganho de stamina em {boost}%{SP}", "hud.skill.st_fireball_title" : "Bola de fogo", "hud.skill.st_fireball" : "Brinque de perseguir seus inimigos", "hud.skill.st_damage_title" : "Dano", diff --git a/assets/voxygen/i18n/ru_RU/skills.ron b/assets/voxygen/i18n/ru_RU/skills.ron index e8de3706c2..1da764c4ff 100644 --- a/assets/voxygen/i18n/ru_RU/skills.ron +++ b/assets/voxygen/i18n/ru_RU/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Повышение здоровья", "hud.skill.inc_health": "Увеличивает максимальное здоровье на {boost}{SP}", - "hud.skill.inc_stam_title": "Повышение Выносливости", - "hud.skill.inc_stam": "Увеличивает максимальную выносливость на {boost}{SP}", + "hud.skill.inc_energy_title": "Повышение Выносливости", + "hud.skill.inc_energy": "Увеличивает максимальную выносливость на {boost}{SP}", "hud.skill.unlck_sword_title": "Разблокировать меч", "hud.skill.unlck_sword": "Разблокировать древо навыков владения мечом{SP}", "hud.skill.unlck_axe_title": "Разблокировать топор", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Разблокировать древо навыков владения скипетром{SP}", "hud.skill.dodge_title": "Перекат", "hud.skill.dodge": "Перекат активируется средним щелчком мыши. Во время переката вы игнорируете урон ближнего боя.", - "hud.skill.roll_stamina_title": "Стоимость активации переката", - "hud.skill.roll_stamina": "Перекат использует на {boost}% меньше выносливости{SP}", + "hud.skill.roll_energy_title": "Стоимость активации переката", + "hud.skill.roll_energy": "Перекат использует на {boost}% меньше выносливости{SP}", "hud.skill.roll_speed_title": "Скорость переката", "hud.skill.roll_speed": "Перекат на {boost}% быстрее{SP}", "hud.skill.roll_dur_title": "Продолжительность переката", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "Урон больше на {boost}%{SP}", "hud.skill.st_explosion_radius_title" : "Радиус взрыва", "hud.skill.st_explosion_radius" : "Радиус взрыва больше на {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Востановление выносливости", - "hud.skill.st_stamina_regen" : "Увеличивает прирост выносливости на {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Востановление выносливости", + "hud.skill.st_energy_regen" : "Увеличивает прирост выносливости на {boost}%{SP}", "hud.skill.st_fireball_title" : "Огненый шар", "hud.skill.st_fireball" : "Стреляет огненным шаром, который взрывается при ударе", "hud.skill.st_damage_title" : "Урон", diff --git a/assets/voxygen/i18n/sv/buff.ron b/assets/voxygen/i18n/sv/buff.ron index ea29b691d8..efc98bfbb6 100644 --- a/assets/voxygen/i18n/sv/buff.ron +++ b/assets/voxygen/i18n/sv/buff.ron @@ -38,7 +38,7 @@ "buff.desc.ensnared": "Rankor greppar tag i dina ben vilket begränsar dina rörelser.", // Buffs stats "buff.stat.health": "Återger {str_total} hälsa", - "buff.stat.increase_max_stamina": "Ökar max-uthålligheten med {strength}", + "buff.stat.increase_max_energy": "Ökar max-uthålligheten med {strength}", "buff.stat.increase_max_health": "Ökar maxhälsan med {strength}", "buff.stat.invulnerability": "Ger osårbarhet", // Text diff --git a/assets/voxygen/i18n/sv/hud/bag.ron b/assets/voxygen/i18n/sv/hud/bag.ron index 26be317f5e..42f8d8f7ba 100644 --- a/assets/voxygen/i18n/sv/hud/bag.ron +++ b/assets/voxygen/i18n/sv/hud/bag.ron @@ -30,7 +30,7 @@ "hud.bag.swap_equipped_weapons_desc": "Tryck {key}", "hud.bag.bag": "Säck", "hud.bag.health": "Hälsa", - "hud.bag.stamina": "Uthållighet", + "hud.bag.energy": "Uthållighet", "hud.bag.combat_rating": "Stridsduglighet", "hud.bag.protection": "Skydd", "hud.bag.stun_res": "Motståndskraft mot medvetslöshet", diff --git a/assets/voxygen/i18n/sv/skills.ron b/assets/voxygen/i18n/sv/skills.ron index 2605641c13..067a7b3965 100644 --- a/assets/voxygen/i18n/sv/skills.ron +++ b/assets/voxygen/i18n/sv/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Mer hälsa", "hud.skill.inc_health": "Ökar maxhälsan med {boost}{SP}", - "hud.skill.inc_stam_title": "Ökad uthållighet", - "hud.skill.inc_stam": "Ökar max-uthålligheten med {boost}{SP}", + "hud.skill.inc_energy_title": "Ökad uthållighet", + "hud.skill.inc_energy": "Ökar max-uthålligheten med {boost}{SP}", "hud.skill.unlck_sword_title": "Lås upp svärd", "hud.skill.unlck_sword": "Låser upp färdighetsträdet för svärd{SP}", "hud.skill.unlck_axe_title": "Lås upp yxa", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Låser upp färdighetsträdet för spira{SP}", "hud.skill.dodge_title": "Ducka", "hud.skill.dodge": "Rulla åt sidan genom att mittenklicka och bli immun mot närstridsattacker under tiden du rullar.", - "hud.skill.roll_stamina_title": "Uthållighetskostnad för rullning", - "hud.skill.roll_stamina": "Rullning kostar {boost}% mindre uthållighet{SP}", + "hud.skill.roll_energy_title": "Uthållighetskostnad för rullning", + "hud.skill.roll_energy": "Rullning kostar {boost}% mindre uthållighet{SP}", "hud.skill.roll_speed_title": "Rullningshastighet", "hud.skill.roll_speed": "Ralla {boost}% fortare{SP}", "hud.skill.roll_dur_title": "Rullningstid", @@ -97,8 +97,8 @@ "hud.skill.st_flamethrower_damage" : "Orsakar {boost}% mer skada{SP}", "hud.skill.st_explosion_radius_title" : "Explosionsradie", "hud.skill.st_explosion_radius" : "Större är bättre, explosionsradien ökar med {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Engergiåterhämtning", - "hud.skill.st_stamina_regen" : "Återhämta ytterligare {boost}% energi{SP}", + "hud.skill.st_energy_regen_title" : "Engergiåterhämtning", + "hud.skill.st_energy_regen" : "Återhämta ytterligare {boost}% energi{SP}", "hud.skill.st_fireball_title" : "Eldklot", "hud.skill.st_fireball" : "Skjuter ett eldklot som exploderar vid träff", "hud.skill.st_damage_title" : "Skada", diff --git a/assets/voxygen/i18n/uk_UA/buff.ron b/assets/voxygen/i18n/uk_UA/buff.ron index ce75cce748..ceb08de5bc 100644 --- a/assets/voxygen/i18n/uk_UA/buff.ron +++ b/assets/voxygen/i18n/uk_UA/buff.ron @@ -52,7 +52,7 @@ // Stats "buff.stat.health": "Відновлює {str_total} ОЗ", "buff.stat.increase_max_health": "Підвищує Максимальне Здоров'я на {strength}", - "buff.stat.increase_max_stamina": "Підвищує Максимальну Енергію на {strength}", + "buff.stat.increase_max_energy": "Підвищує Максимальну Енергію на {strength}", "buff.stat.invulnerability": "Дає невразливість", // Text "buff.text.for_seconds": "протягом {dur_secs} сек.", diff --git a/assets/voxygen/i18n/uk_UA/hud/bag.ron b/assets/voxygen/i18n/uk_UA/hud/bag.ron index f8c3ca571a..1a286d1a60 100644 --- a/assets/voxygen/i18n/uk_UA/hud/bag.ron +++ b/assets/voxygen/i18n/uk_UA/hud/bag.ron @@ -39,7 +39,7 @@ // Stats "hud.bag.health": "Здоров'я", - "hud.bag.stamina": "Енергія", + "hud.bag.energy": "Енергія", "hud.bag.combat_rating": "Бойовий рейтинг", "hud.bag.combat_rating_desc": "Розрахований з огляду на ваше\nспорядження і здоров'я", "hud.bag.protection": "Захист", diff --git a/assets/voxygen/i18n/uk_UA/skills.ron b/assets/voxygen/i18n/uk_UA/skills.ron index ab26355d0c..3c64c7c95a 100644 --- a/assets/voxygen/i18n/uk_UA/skills.ron +++ b/assets/voxygen/i18n/uk_UA/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "Збільшення здоров'я", "hud.skill.inc_health": "Збільшує максимальне здоров'я на {boost}{SP}", - "hud.skill.inc_stam_title": "Збільшення енергії", - "hud.skill.inc_stam": "Збільшує максимальну енергію на {boost}{SP}", + "hud.skill.inc_energy_title": "Збільшення енергії", + "hud.skill.inc_energy": "Збільшує максимальну енергію на {boost}{SP}", "hud.skill.unlck_sword_title": "Меч", "hud.skill.unlck_sword": "Відкриває дерево навичок володіння мечем{SP}", "hud.skill.unlck_axe_title": "Сокира", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "Відкриває дерево навичок володіння цілющим скіпетром{SP}", "hud.skill.dodge_title": "Ухил", "hud.skill.dodge": "Станьте невразливим до ближніх атак під час перекиду{SP}", - "hud.skill.roll_stamina_title": "Енергоспоживання перекиду", - "hud.skill.roll_stamina": "Перекид споживає на {boost}% менше енергії{SP}", + "hud.skill.roll_energy_title": "Енергоспоживання перекиду", + "hud.skill.roll_energy": "Перекид споживає на {boost}% менше енергії{SP}", "hud.skill.roll_speed_title": "Швидкість перекиду", "hud.skill.roll_speed": "Перекид виконується на {boost}% швидше{SP}", "hud.skill.roll_dur_title": "Тривалість перекиду", @@ -116,8 +116,8 @@ "hud.skill.st_fireball_title": "Вогнений м'яч", "hud.skill.st_explosion_radius_title" : "Радіус вибуху", "hud.skill.st_explosion_radius" : "Більше - краще, збільшує радіус вибуху снарядів на {boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "Відновлення енергії", - "hud.skill.st_stamina_regen" : "Збільшує відновлення енергії від заподіяних ушкоджень на {boost}%{SP}", + "hud.skill.st_energy_regen_title" : "Відновлення енергії", + "hud.skill.st_energy_regen" : "Збільшує відновлення енергії від заподіяних ушкоджень на {boost}%{SP}", "hud.skill.st_damage_title" : "Ушкодження снарядами", "hud.skill.st_damage" : "Збільшує ушкодження вогняними снарядами на {boost}%{SP}", // Bow diff --git a/assets/voxygen/i18n/zh_CN/buff.ron b/assets/voxygen/i18n/zh_CN/buff.ron index 64b0b7df0f..7efc477e8f 100644 --- a/assets/voxygen/i18n/zh_CN/buff.ron +++ b/assets/voxygen/i18n/zh_CN/buff.ron @@ -26,7 +26,7 @@ "buff.desc.cursed": "你被诅咒了.", // Buffs stats "buff.stat.health": "总共恢复 {str_total} 点生命值", - "buff.stat.increase_max_stamina": "提高{strength}点耐力值上限 ", + "buff.stat.increase_max_energy": "提高{strength}点耐力值上限 ", "buff.stat.increase_max_health": "提高{strength}点生命值上限", "buff.stat.invulnerability": "获得无敌状态", // Text diff --git a/assets/voxygen/i18n/zh_CN/hud/bag.ron b/assets/voxygen/i18n/zh_CN/hud/bag.ron index 32a3169e2a..45e6602221 100644 --- a/assets/voxygen/i18n/zh_CN/hud/bag.ron +++ b/assets/voxygen/i18n/zh_CN/hud/bag.ron @@ -26,7 +26,7 @@ "hud.bag.offhand": "副手", "hud.bag.bag": "背包", "hud.bag.health": "血量", - "hud.bag.stamina": "耐力", + "hud.bag.energy": "耐力", "hud.bag.combat_rating": "战力", "hud.bag.protection": "防御", "hud.bag.stun_res": "韧性恢复", diff --git a/assets/voxygen/i18n/zh_CN/skills.ron b/assets/voxygen/i18n/zh_CN/skills.ron index fd35f09502..7a3e1840bd 100644 --- a/assets/voxygen/i18n/zh_CN/skills.ron +++ b/assets/voxygen/i18n/zh_CN/skills.ron @@ -11,8 +11,8 @@ // General "hud.skill.inc_health_title": "增强生命", "hud.skill.inc_health": "最大生命值提高{boost}{SP}", - "hud.skill.inc_stam_title": "增强耐力/法力", - "hud.skill.inc_stam": "最大耐力提升{boost}{SP}", + "hud.skill.inc_energy_title": "增强耐力/法力", + "hud.skill.inc_energy": "最大耐力提升{boost}{SP}", "hud.skill.unlck_sword_title": "解锁双手剑专精", "hud.skill.unlck_sword": "解锁双手剑技能树{SP}", "hud.skill.unlck_axe_title": "解锁双手斧专精", @@ -27,8 +27,8 @@ "hud.skill.unlck_sceptre": "解锁生命权杖技能树{SP}", "hud.skill.dodge_title": "闪避", "hud.skill.dodge": "翻滚可以躲避敌人的攻击{SP}", - "hud.skill.roll_stamina_title": "体术(翻滚)", - "hud.skill.roll_stamina": "减少每次翻滚需要消耗的耐力{boost}%{SP}", + "hud.skill.roll_energy_title": "体术(翻滚)", + "hud.skill.roll_energy": "减少每次翻滚需要消耗的耐力{boost}%{SP}", "hud.skill.roll_speed_title": "迅捷", "hud.skill.roll_speed": "加快{boost}%的翻滚速度{SP}", "hud.skill.roll_dur_title": "飞身跃入", @@ -95,8 +95,8 @@ "hud.skill.st_flamethrower_damage" : "吐息造成的伤害提高{boost}%{SP}", "hud.skill.st_explosion_radius_title" : "爆破专家", "hud.skill.st_explosion_radius" : "火球爆炸的半径扩大{boost}%{SP}", - "hud.skill.st_stamina_regen_title" : "法力回复", - "hud.skill.st_stamina_regen" : "每次击中敌人回复的法力增加{boost}%{SP}", + "hud.skill.st_energy_regen_title" : "法力回复", + "hud.skill.st_energy_regen" : "每次击中敌人回复的法力增加{boost}%{SP}", "hud.skill.st_fireball_title" : "火球术", "hud.skill.st_fireball" : "发射火球攻击敌人", "hud.skill.st_damage_title" : "伤害提升", diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs index 7e889c70ef..a8640f6a10 100644 --- a/common/src/comp/buff.rs +++ b/common/src/comp/buff.rs @@ -29,7 +29,7 @@ pub enum BuffKind { /// Applied when sitting at a campfire /// Strength is fraction of health resotred per second CampfireHeal, - /// Raises maximum stamina + /// Raises maximum energy /// Strength should be 10x the effect to max energy IncreaseMaxEnergy, /// Raises maximum health @@ -146,7 +146,7 @@ pub enum BuffEffect { }, /// Changes maximum health by a certain amount MaxHealthModifier { value: f32, kind: ModifierKind }, - /// Changes maximum stamina by a certain amount + /// Changes maximum energy by a certain amount MaxEnergyModifier { value: f32, kind: ModifierKind }, /// Reduces damage after armor is accounted for by this fraction DamageReduction(f32), diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs index 4a21b416db..a3c676dc33 100644 --- a/voxygen/src/hud/bag.rs +++ b/voxygen/src/hud/bag.rs @@ -533,7 +533,7 @@ impl<'a> Bag<'a> { } const STATS: [&str; 5] = [ "Health", - "Stamina", + "Energy", "Protection", "Combat Rating", "Stun Resilience", @@ -809,7 +809,7 @@ impl<'a> Widget for Bag<'a> { for i in STATS.iter().copied().enumerate() { let btn = Button::image(match i.1 { "Health" => self.imgs.health_ico, - "Stamina" => self.imgs.stamina_ico, + "Energy" => self.imgs.energy_ico, "Combat Rating" => self.imgs.combat_rating_ico, "Protection" => self.imgs.protection_ico, "Stun Resilience" => self.imgs.stun_res_ico, @@ -828,7 +828,7 @@ impl<'a> Widget for Bag<'a> { as i32 ); let health_txt = format!("{}", (self.health.maximum() as f32 / 10.0) as usize); - let stamina_txt = format!("{}", (self.energy.maximum() as f32 / 10.0) as usize); + let energy_txt = format!("{}", (self.energy.maximum() as f32 / 10.0) as usize); let combat_rating_txt = format!("{}", (combat_rating * 10.0) as usize); let stun_res_txt = format!( "{}", @@ -841,7 +841,7 @@ impl<'a> Widget for Bag<'a> { }; let tooltip_head = match i.1 { "Health" => i18n.get("hud.bag.health"), - "Stamina" => i18n.get("hud.bag.stamina"), + "Energy" => i18n.get("hud.bag.energy"), "Combat Rating" => i18n.get("hud.bag.combat_rating"), "Protection" => i18n.get("hud.bag.protection"), "Stun Resilience" => i18n.get("hud.bag.stun_res"), @@ -863,7 +863,7 @@ impl<'a> Widget for Bag<'a> { .set(state.ids.stat_icons[i.0], ui); Text::new(match i.1 { "Health" => &health_txt, - "Stamina" => &stamina_txt, + "Energy" => &energy_txt, "Combat Rating" => &combat_rating_txt, "Protection" => &protection_txt, "Stun Resilience" => &stun_res_txt, diff --git a/voxygen/src/hud/buffs.rs b/voxygen/src/hud/buffs.rs index 393dd06fc0..da63a601c3 100644 --- a/voxygen/src/hud/buffs.rs +++ b/voxygen/src/hud/buffs.rs @@ -129,10 +129,10 @@ impl<'a> Widget for BuffsBar<'a> { let decayed_health = 1.0 - self.health.maximum() as f64 / self.health.base_max() as f64; let show_health = self.health.current() != self.health.maximum() || decayed_health > 0.0; - let show_stamina = self.energy.current() != self.energy.maximum(); - let offset = if show_stamina && show_health { + let show_energy = self.energy.current() != self.energy.maximum(); + let offset = if show_energy && show_health { 140.0 - } else if show_health || show_stamina { + } else if show_health || show_energy { 95.0 } else { 55.0 diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index da5af98b50..a53f4728c5 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -739,9 +739,9 @@ impl<'a> Widget for Diary<'a> { ); self.create_unlock_skill_button( Skill::General(EnergyIncrease), - self.imgs.stamina_plus_skill, + self.imgs.energy_plus_skill, state.skills_top_l[1], - "inc_stam", + "inc_energy", state.skill_general_stat_1, ui, &mut events, @@ -824,7 +824,7 @@ impl<'a> Widget for Diary<'a> { Skill::Roll(RollSkill::Cost), self.imgs.utility_cost_skill, state.skills_bot_l[1], - "roll_stamina", + "roll_energy", state.skill_general_roll_1, ui, &mut events, @@ -1699,7 +1699,7 @@ impl<'a> Widget for Diary<'a> { Skill::Staff(BRegen), self.imgs.magic_energy_regen_skill, state.skills_top_l[2], - "st_stamina_regen", + "st_energy_regen", state.skill_staff_basic_2, ui, &mut events, diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs index 71fb4a5f56..506501fe2b 100644 --- a/voxygen/src/hud/group.rs +++ b/voxygen/src/hud/group.rs @@ -53,7 +53,7 @@ widget_ids! { member_panels_txt[], member_health[], member_health_decay[], - member_stam[], + member_energy[], buffs[], buff_timers[], dead_txt[], @@ -297,10 +297,10 @@ impl<'a> Widget for Group<'a> { .resize(group_size, &mut ui.widget_id_generator()); }) }; - if state.ids.member_stam.len() < group_size { + if state.ids.member_energy.len() < group_size { state.update(|s| { s.ids - .member_stam + .member_energy .resize(group_size, &mut ui.widget_id_generator()) }) }; @@ -485,12 +485,12 @@ impl<'a> Widget for Group<'a> { .set(state.ids.member_panels_txt[i], ui); if let Some(energy) = energy { let stam_perc = energy.current() as f64 / energy.maximum() as f64; - // Stamina + // Energy Image::new(self.imgs.bar_content) .w_h(100.0 * stam_perc, 8.0) .color(Some(STAMINA_COLOR)) .top_left_with_margins_on(state.ids.member_panels_bg[i], 26.0, 2.0) - .set(state.ids.member_stam[i], ui); + .set(state.ids.member_energy[i], ui); } if let Some(buffs) = buffs { // Limit displayed buffs to 11 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 55eaa73b5a..ba0badbcbe 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -187,7 +187,7 @@ image_ids! { // Skilltree Icons health_plus_skill: "voxygen.element.skills.skilltree.health_plus", - stamina_plus_skill: "voxygen.element.skills.skilltree.stamina_plus", + energy_plus_skill: "voxygen.element.skills.skilltree.energy_plus", unlock_axe_skill: "voxygen.element.skills.skilltree.unlock_axe", unlock_bow_skill: "voxygen.element.skills.skilltree.unlock_bow", unlock_hammer_skill: "voxygen.element.skills.skilltree.unlock_hammer", @@ -318,8 +318,8 @@ image_ids! { health_bg: "voxygen.element.ui.skillbar.health_bg", health_frame: "voxygen.element.ui.skillbar.health_frame", decayed_bg: "voxygen.element.ui.skillbar.decayed_bg", - stamina_bg: "voxygen.element.ui.skillbar.stamina_bg", - stamina_frame: "voxygen.element.ui.skillbar.stamina_frame", + energy_bg: "voxygen.element.ui.skillbar.energy_bg", + energy_frame: "voxygen.element.ui.skillbar.energy_frame", m1_ico: "voxygen.element.ui.generic.icons.m1", m2_ico: "voxygen.element.ui.generic.icons.m2", m_scroll_ico: "voxygen.element.ui.generic.icons.m_scroll", @@ -476,7 +476,7 @@ image_ids! { mainhand_bg: "voxygen.element.ui.bag.backgrounds.mainhand", bag_bg: "voxygen.element.ui.bag.backgrounds.bag", offhand_bg: "voxygen.element.ui.bag.backgrounds.offhand", - stamina_ico: "voxygen.element.ui.bag.icons.stamina", + energy_ico: "voxygen.element.ui.bag.icons.energy", health_ico: "voxygen.element.ui.bag.icons.health", protection_ico: "voxygen.element.ui.bag.icons.protection", stun_res_ico: "voxygen.element.ui.bag.icons.stun_res", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 4a3b4693ba..5250e94d69 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -3943,7 +3943,7 @@ pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> &str BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"), BuffKind::CampfireHeal { .. } => localized_strings.get("buff.title.campfire_heal"), BuffKind::IncreaseMaxHealth { .. } => localized_strings.get("buff.title.IncreaseMaxHealth"), - BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get("buff.title.staminaup"), + BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get("buff.title.energyup"), BuffKind::Invulnerability => localized_strings.get("buff.title.invulnerability"), BuffKind::ProtectingWard => localized_strings.get("buff.title.protectingward"), BuffKind::Frenzied => localized_strings.get("buff.title.frenzied"), diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 07eae60057..d1777b47af 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -58,8 +58,8 @@ widget_ids! { frame, bg_health, frame_health, - bg_stamina, - frame_stamina, + bg_energy, + frame_energy, m1_ico, m2_ico, // Level @@ -76,12 +76,12 @@ widget_ids! { hp_txt_bg, hp_txt, decay_overlay, - // Stamina-Bar - stamina_alignment, - stamina_filling, - stamina_txt_alignment, - stamina_txt_bg, - stamina_txt, + // Energy-Bar + energy_alignment, + energy_filling, + energy_txt_alignment, + energy_txt_bg, + energy_txt, // Combo Counter combo_align, combo_bg, @@ -379,7 +379,7 @@ impl<'a> Skillbar<'a> { let crit_hp_color: Color = Color::Rgba(0.79, 0.19, 0.17, hp_ani); let bar_values = self.global_state.settings.interface.bar_numbers; let show_health = self.health.current() != self.health.maximum(); - let show_stamina = self.energy.current() != self.energy.maximum(); + let show_energy = self.energy.current() != self.energy.maximum(); let decayed_health = 1.0 - self.health.maximum() as f64 / self.health.base_max() as f64; if show_health && !self.health.is_dead || decayed_health > 0.0 { @@ -424,29 +424,29 @@ impl<'a> Skillbar<'a> { .middle_of(state.ids.bg_health) .set(state.ids.frame_health, ui); } - if show_stamina && !self.health.is_dead { + if show_energy && !self.health.is_dead { let offset = if show_health || decayed_health > 0.0 { 34.0 } else { 1.0 }; - Image::new(self.imgs.stamina_bg) + Image::new(self.imgs.energy_bg) .w_h(323.0, 16.0) .mid_top_with_margin_on(state.ids.frame, -offset) - .set(state.ids.bg_stamina, ui); + .set(state.ids.bg_energy, ui); Rectangle::fill_with([319.0, 10.0], color::TRANSPARENT) - .top_left_with_margins_on(state.ids.bg_stamina, 2.0, 2.0) - .set(state.ids.stamina_alignment, ui); + .top_left_with_margins_on(state.ids.bg_energy, 2.0, 2.0) + .set(state.ids.energy_alignment, ui); Image::new(self.imgs.bar_content) .w_h(319.0 * energy_percentage / 100.0, 10.0) .color(Some(STAMINA_COLOR)) - .top_left_with_margins_on(state.ids.stamina_alignment, 0.0, 0.0) - .set(state.ids.stamina_filling, ui); - Image::new(self.imgs.stamina_frame) + .top_left_with_margins_on(state.ids.energy_alignment, 0.0, 0.0) + .set(state.ids.energy_filling, ui); + Image::new(self.imgs.energy_frame) .w_h(323.0, 16.0) .color(Some(UI_HIGHLIGHT_0)) - .middle_of(state.ids.bg_stamina) - .set(state.ids.frame_stamina, ui); + .middle_of(state.ids.bg_energy) + .set(state.ids.frame_energy, ui); } // Bar Text let bar_text = if self.health.is_dead { @@ -491,17 +491,17 @@ impl<'a> Skillbar<'a> { .set(state.ids.hp_txt, ui); Text::new(&energy_txt) - .middle_of(state.ids.frame_stamina) + .middle_of(state.ids.frame_energy) .font_size(self.fonts.cyri.scale(12)) .font_id(self.fonts.cyri.conrod_id) .color(Color::Rgba(0.0, 0.0, 0.0, 1.0)) - .set(state.ids.stamina_txt_bg, ui); + .set(state.ids.energy_txt_bg, ui); Text::new(&energy_txt) - .bottom_left_with_margins_on(state.ids.stamina_txt_bg, 2.0, 2.0) + .bottom_left_with_margins_on(state.ids.energy_txt_bg, 2.0, 2.0) .font_size(self.fonts.cyri.scale(12)) .font_id(self.fonts.cyri.conrod_id) .color(TEXT_COLOR) - .set(state.ids.stamina_txt, ui); + .set(state.ids.energy_txt, ui); } } @@ -873,7 +873,7 @@ impl<'a> Widget for Skillbar<'a> { .mid_bottom_with_margin_on(ui.window, 10.0) .set(state.ids.frame, ui); - // Health and Stamina bar + // Health and Energy bar self.show_stat_bars(state, ui); // Slots diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 0b7342abf1..3e368eacab 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -148,7 +148,7 @@ pub fn consumable_desc(effects: &[Effect], i18n: &Localization) -> Vec { .get("buff.stat.health") .replace("{str_total}", &str_total.to_string()), BuffKind::IncreaseMaxEnergy => i18n - .get("buff.stat.increase_max_stamina") + .get("buff.stat.increase_max_energy") .replace("{strength}", &strength.to_string()), BuffKind::IncreaseMaxHealth => i18n .get("buff.stat.increase_max_health")