From f048600335d25354380820690dc7367d4a0cbf0a Mon Sep 17 00:00:00 2001 From: Socksonme Date: Thu, 16 Jun 2022 19:31:57 +0300 Subject: [PATCH] Add back old i18n + some small fixes - Fix .filter() for combo_floater - Rename sct_inc_dmg_accum_duration to sct_inc_dmg, as it was in the wrong place to rebase --- assets/voxygen/i18n/be_BY/hud/settings.ron | 1 + assets/voxygen/i18n/ca_CA/hud/settings.ron | 1 + assets/voxygen/i18n/cz_CZ/hud/settings.ron | 1 + assets/voxygen/i18n/de_DE/hud/settings.ron | 1 + assets/voxygen/i18n/es_ES/hud/settings.ron | 1 + assets/voxygen/i18n/es_LA/hud/settings.ron | 1 + assets/voxygen/i18n/eu/hud/settings.ron | 1 + assets/voxygen/i18n/fr_FR/hud/settings.ron | 1 + assets/voxygen/i18n/hu_HU/hud/settings.ron | 1 + assets/voxygen/i18n/it_IT/hud/settings.ron | 1 + assets/voxygen/i18n/ja_JP/hud/settings.ron | 1 + assets/voxygen/i18n/nl_NL/hud/settings.ron | 1 + assets/voxygen/i18n/no_NB/hud/settings.ron | 1 + assets/voxygen/i18n/pl_PL/hud/settings.ron | 1 + assets/voxygen/i18n/pt_BR/hud/settings.ron | 1 + assets/voxygen/i18n/pt_PT/hud/settings.ron | 1 + assets/voxygen/i18n/ru_RU/hud/settings.ron | 1 + assets/voxygen/i18n/sr_SR/hud/settings.ron | 1 + assets/voxygen/i18n/sv_SE/hud/settings.ron | 1 + assets/voxygen/i18n/th_TH/hud/settings.ron | 3 --- assets/voxygen/i18n/tr_TR/hud/settings.ron | 1 + assets/voxygen/i18n/uk_UA/hud/settings.ron | 1 + assets/voxygen/i18n/vi_VI/hud/settings.ron | 1 + assets/voxygen/i18n/zh_CN/hud/settings.ron | 1 + assets/voxygen/i18n/zh_TW/hud/settings.ron | 1 + server/src/events/entity_manipulation.rs | 16 ++++++++++------ voxygen/src/hud/mod.rs | 6 ++---- voxygen/src/session/settings_change.rs | 4 ++-- 28 files changed, 38 insertions(+), 15 deletions(-) diff --git a/assets/voxygen/i18n/be_BY/hud/settings.ron b/assets/voxygen/i18n/be_BY/hud/settings.ron index e6a6fab78c..857131b930 100644 --- a/assets/voxygen/i18n/be_BY/hud/settings.ron +++ b/assets/voxygen/i18n/be_BY/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Статусныя эфекты каля мінімапы", "hud.settings.toggle_bar_experience": "Адлюстроўваць панэль досведу", "hud.settings.scrolling_combat_text": "Адлюстроўваць шкоду/злечванне", + "hud.settings.incoming_damage": "Шкода ад кожнага ўдара па гульцу", "hud.settings.speech_bubble": "Індыкатар гаворкі", "hud.settings.speech_bubble_self": "Паказваць свае індыкатары гаворкі", "hud.settings.speech_bubble_dark_mode": "Цёмны рэжым індыкатара гаворкі", diff --git a/assets/voxygen/i18n/ca_CA/hud/settings.ron b/assets/voxygen/i18n/ca_CA/hud/settings.ron index f1910aeb39..ceb0cb20c4 100644 --- a/assets/voxygen/i18n/ca_CA/hud/settings.ron +++ b/assets/voxygen/i18n/ca_CA/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Buffs al Minimapa", "hud.settings.toggle_bar_experience": "Mostra Barra d'Experiència", "hud.settings.scrolling_combat_text": "Text de Combat Desplaçat", + "hud.settings.incoming_damage": "Dany Imminent", "hud.settings.speech_bubble": "Bafarades", "hud.settings.speech_bubble_self": "Mostrar les Bafarades pròpies", "hud.settings.speech_bubble_dark_mode": "Bafarades Mode Fosc", diff --git a/assets/voxygen/i18n/cz_CZ/hud/settings.ron b/assets/voxygen/i18n/cz_CZ/hud/settings.ron index 0d078b6f20..a76646c6ae 100644 --- a/assets/voxygen/i18n/cz_CZ/hud/settings.ron +++ b/assets/voxygen/i18n/cz_CZ/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Buffy u Minimapy", "hud.settings.toggle_bar_experience": "Povolit Zkušenostní Bar", "hud.settings.scrolling_combat_text": "Létajíci Text v boji", + "hud.settings.incoming_damage": "Příchozí Poškození", "hud.settings.speech_bubble": "Povídací Bublina", "hud.settings.speech_bubble_dark_mode": "Tmavá Povídací Bublina", "hud.settings.speech_bubble_icon": "Ikona Povídací Bubliny", diff --git a/assets/voxygen/i18n/de_DE/hud/settings.ron b/assets/voxygen/i18n/de_DE/hud/settings.ron index f3e4a86dcc..f1e6103f48 100644 --- a/assets/voxygen/i18n/de_DE/hud/settings.ron +++ b/assets/voxygen/i18n/de_DE/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Effekte an der Minimap", "hud.settings.toggle_bar_experience": "Erfahrungsleiste umschalten", "hud.settings.scrolling_combat_text": "Fließtext für Kampfhandlungen", + "hud.settings.incoming_damage": "Erlittener Schaden", "hud.settings.speech_bubble": "Sprechblase", "hud.settings.speech_bubble_dark_mode": "Sprechblase: Nachtmodus", "hud.settings.speech_bubble_icon": "Sprechblasen-Icon", diff --git a/assets/voxygen/i18n/es_ES/hud/settings.ron b/assets/voxygen/i18n/es_ES/hud/settings.ron index df80d88f77..b765788888 100644 --- a/assets/voxygen/i18n/es_ES/hud/settings.ron +++ b/assets/voxygen/i18n/es_ES/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Estados en el Minimapa", "hud.settings.toggle_bar_experience": "Alternar Barra de Experiencia", "hud.settings.scrolling_combat_text": "Texto de Combate Deslizante", + "hud.settings.incoming_damage": "Daño Entrante", "hud.settings.speech_bubble": "Burbuja de Diálogo", "hud.settings.speech_bubble_self": "Mostrar Diálogos propios en Burbuja", "hud.settings.speech_bubble_dark_mode": "Modo Oscuro de Burbuja de Diálogo", diff --git a/assets/voxygen/i18n/es_LA/hud/settings.ron b/assets/voxygen/i18n/es_LA/hud/settings.ron index 745c935f29..53d59ee9cc 100644 --- a/assets/voxygen/i18n/es_LA/hud/settings.ron +++ b/assets/voxygen/i18n/es_LA/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Buffs en el Minimapa", "hud.settings.toggle_bar_experience": "Alternar Barra de Experiencia", "hud.settings.scrolling_combat_text": "Texto de Combate con Desplazamiento", + "hud.settings.incoming_damage": "Daño Recibido", "hud.settings.speech_bubble": "Burbuja de Diálogo", "hud.settings.speech_bubble_self": "Mostrar Diálogos propios en Burbuja", "hud.settings.speech_bubble_dark_mode": "Burbuja de Diálogo en Modo Oscuro", diff --git a/assets/voxygen/i18n/eu/hud/settings.ron b/assets/voxygen/i18n/eu/hud/settings.ron index c8edd1c0ff..f879930a3c 100644 --- a/assets/voxygen/i18n/eu/hud/settings.ron +++ b/assets/voxygen/i18n/eu/hud/settings.ron @@ -18,6 +18,7 @@ "hud.settings.opacity": "Opakotasuna", "hud.settings.toggle_shortcuts": "Aldatu laster teklak", "hud.settings.toggle_bar_experience": "Erakutsi/ezkutatu esperientzia barra", + "hud.settings.incoming_damage": "Jasotako kaltea banaka erakutsi", "hud.settings.energybar_numbers": "Zenbakiak energia barran", "hud.settings.always_show_bars": "Erakutsi beti energia barra", "hud.settings.values": "Balioak", diff --git a/assets/voxygen/i18n/fr_FR/hud/settings.ron b/assets/voxygen/i18n/fr_FR/hud/settings.ron index dd628e584b..7e5088dc0d 100644 --- a/assets/voxygen/i18n/fr_FR/hud/settings.ron +++ b/assets/voxygen/i18n/fr_FR/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Effets sur la minimap", "hud.settings.toggle_bar_experience": "Activer la barre d'expérience", "hud.settings.scrolling_combat_text": "Dégats de combat", + "hud.settings.incoming_damage": "Dégats reçus", "hud.settings.speech_bubble": "Bulle de dialogue", "hud.settings.speech_bubble_self": "Montrer ses propres bulles de dialogue", "hud.settings.speech_bubble_dark_mode": "Bulle de dialogue Mode Sombre", diff --git a/assets/voxygen/i18n/hu_HU/hud/settings.ron b/assets/voxygen/i18n/hu_HU/hud/settings.ron index 6253709776..493ec718fa 100644 --- a/assets/voxygen/i18n/hu_HU/hud/settings.ron +++ b/assets/voxygen/i18n/hu_HU/hud/settings.ron @@ -24,6 +24,7 @@ "hud.settings.buffs_mmap": "Hatások a minitérképnél", "hud.settings.toggle_bar_experience": "Tapasztalatsáv megjelenítése/elrejtése", "hud.settings.scrolling_combat_text": "Harci szöveg görgetése", + "hud.settings.incoming_damage": "Bejövő sebzés", "hud.settings.speech_bubble": "Szövegbuborék", "hud.settings.speech_bubble_dark_mode": "Szövegbuborék sötét mód", "hud.settings.speech_bubble_icon": "Szövegbuborék ikon", diff --git a/assets/voxygen/i18n/it_IT/hud/settings.ron b/assets/voxygen/i18n/it_IT/hud/settings.ron index 8f012fa580..5df8c96a78 100644 --- a/assets/voxygen/i18n/it_IT/hud/settings.ron +++ b/assets/voxygen/i18n/it_IT/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Buff alla Minimappa", "hud.settings.toggle_bar_experience": "Attiva/Disattiva Barra dell'Esperienza", "hud.settings.scrolling_combat_text": "Testo del Combattimento a Scorrimento", + "hud.settings.incoming_damage": "Danno in Entrata", "hud.settings.speech_bubble": "Fumetto", "hud.settings.speech_bubble_self": "Mostra i Propri Fumetti", "hud.settings.speech_bubble_dark_mode": "Fumetto Modalità Scura", diff --git a/assets/voxygen/i18n/ja_JP/hud/settings.ron b/assets/voxygen/i18n/ja_JP/hud/settings.ron index 2b39aab9c1..fbd36a695f 100644 --- a/assets/voxygen/i18n/ja_JP/hud/settings.ron +++ b/assets/voxygen/i18n/ja_JP/hud/settings.ron @@ -22,6 +22,7 @@ "hud.settings.buffs_mmap": "Buffs at Minimap", "hud.settings.toggle_bar_experience": "経験値バーの切り替え", "hud.settings.scrolling_combat_text": "戦闘メッセージのスクロール", + "hud.settings.incoming_damage": "Incoming Damage", "hud.settings.speech_bubble": "吹き出し", "hud.settings.speech_bubble_dark_mode": "ダークモード吹き出し", "hud.settings.speech_bubble_icon": "アイコン吹き出し", diff --git a/assets/voxygen/i18n/nl_NL/hud/settings.ron b/assets/voxygen/i18n/nl_NL/hud/settings.ron index bb235de2db..52c6e16761 100644 --- a/assets/voxygen/i18n/nl_NL/hud/settings.ron +++ b/assets/voxygen/i18n/nl_NL/hud/settings.ron @@ -20,6 +20,7 @@ "hud.settings.toggle_shortcuts": "Toon Sneltoetsen", "hud.settings.toggle_bar_experience": "Toon Experience Balk", "hud.settings.scrolling_combat_text": "Pop-up Gevechtstext", + "hud.settings.incoming_damage": "Inkomende Schade Getallen", "hud.settings.speech_bubble": "Spraakbubbel", "hud.settings.speech_bubble_dark_mode": "Donkere Modus", "hud.settings.speech_bubble_icon": "Spraakbubbel Icoon", diff --git a/assets/voxygen/i18n/no_NB/hud/settings.ron b/assets/voxygen/i18n/no_NB/hud/settings.ron index 505dba6d5a..3de4642315 100644 --- a/assets/voxygen/i18n/no_NB/hud/settings.ron +++ b/assets/voxygen/i18n/no_NB/hud/settings.ron @@ -21,6 +21,7 @@ "hud.settings.buffs_mmap": "Ikoner på Minimap", "hud.settings.toggle_bar_experience": "Veksle erfaringsbar", "hud.settings.scrolling_combat_text": "Rullende kamptekst", + "hud.settings.incoming_damage": "Innkommende skade", "hud.settings.speech_bubble": "Snakkeboble", "hud.settings.speech_bubble_dark_mode": "Mørk modus for snakkeboble", "hud.settings.speech_bubble_icon": "Snakkeboble ikon", diff --git a/assets/voxygen/i18n/pl_PL/hud/settings.ron b/assets/voxygen/i18n/pl_PL/hud/settings.ron index 48ab9b1991..41f219b3e5 100644 --- a/assets/voxygen/i18n/pl_PL/hud/settings.ron +++ b/assets/voxygen/i18n/pl_PL/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Wzmocnienia na minimapie", "hud.settings.toggle_bar_experience": "Przełącz pasek doświadczenia", "hud.settings.scrolling_combat_text": "Przewijanie tekstu podczas walki", + "hud.settings.incoming_damage": "Otrzymywane obrażenia", "hud.settings.speech_bubble": "Dymek rozmowy", "hud.settings.speech_bubble_self": "Pokazuj swój dymek rozmowy", "hud.settings.speech_bubble_dark_mode": "Dymek rozmowy w trybie ciemnym", diff --git a/assets/voxygen/i18n/pt_BR/hud/settings.ron b/assets/voxygen/i18n/pt_BR/hud/settings.ron index 541e5312bd..b4bdd5424d 100644 --- a/assets/voxygen/i18n/pt_BR/hud/settings.ron +++ b/assets/voxygen/i18n/pt_BR/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Buffs no Minimapa", "hud.settings.toggle_bar_experience": "Mostar/Ocultar Barra de Experiência", "hud.settings.scrolling_combat_text": "Texto de Combate Deslizante", + "hud.settings.incoming_damage": "Dano Recebido", "hud.settings.speech_bubble": "Balão de Fala", "hud.settings.speech_bubble_dark_mode": "Balão de Fala Modo Escuro", "hud.settings.speech_bubble_icon": "Ícone do Balão de Fala", diff --git a/assets/voxygen/i18n/pt_PT/hud/settings.ron b/assets/voxygen/i18n/pt_PT/hud/settings.ron index cddea64f75..cffb2f665d 100644 --- a/assets/voxygen/i18n/pt_PT/hud/settings.ron +++ b/assets/voxygen/i18n/pt_PT/hud/settings.ron @@ -19,6 +19,7 @@ "hud.settings.toggle_shortcuts": "Mostar/Ocultar atalhos", "hud.settings.toggle_bar_experience": "Mostar/Ocultar barra de experiência", "hud.settings.scrolling_combat_text": "Texto de combate deslizante", + "hud.settings.incoming_damage": "Dano recebido", "hud.settings.energybar_numbers": "Números da barra de energia", "hud.settings.values": "Valores", "hud.settings.percentages": "Percentagens", diff --git a/assets/voxygen/i18n/ru_RU/hud/settings.ron b/assets/voxygen/i18n/ru_RU/hud/settings.ron index e0eb946b72..64c6ffc193 100644 --- a/assets/voxygen/i18n/ru_RU/hud/settings.ron +++ b/assets/voxygen/i18n/ru_RU/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Баффы возле миникарте", "hud.settings.toggle_bar_experience": "Переключить панель опыта", "hud.settings.scrolling_combat_text": "Отображение урона/исцеления", + "hud.settings.incoming_damage": "Отдельно полученный", "hud.settings.speech_bubble": "Диалоговое окно", "hud.settings.speech_bubble_self": "Показывать каждое отдельное окно", "hud.settings.speech_bubble_dark_mode": "Диалоговое окно (тёмная тема)", diff --git a/assets/voxygen/i18n/sr_SR/hud/settings.ron b/assets/voxygen/i18n/sr_SR/hud/settings.ron index fcfefe7580..5ecf1da4dd 100644 --- a/assets/voxygen/i18n/sr_SR/hud/settings.ron +++ b/assets/voxygen/i18n/sr_SR/hud/settings.ron @@ -24,6 +24,7 @@ "hud.settings.buffs_mmap": "Бафови на Мапици", "hud.settings.toggle_bar_experience": "Ис/Укључи Траку са Искуством", "hud.settings.scrolling_combat_text": "Померајући Борбени Текст ", + "hud.settings.incoming_damage": "Долазне Ране", "hud.settings.speech_bubble": "Говорни Облачић", "hud.settings.speech_bubble_dark_mode": "Тамни Говорни Облачић", "hud.settings.speech_bubble_icon": "Иконица Говорног Облачића", diff --git a/assets/voxygen/i18n/sv_SE/hud/settings.ron b/assets/voxygen/i18n/sv_SE/hud/settings.ron index 10797f3711..b81dcfa598 100644 --- a/assets/voxygen/i18n/sv_SE/hud/settings.ron +++ b/assets/voxygen/i18n/sv_SE/hud/settings.ron @@ -25,6 +25,7 @@ "hud.settings.buffs_mmap": "Effekter vid Minikartan", "hud.settings.toggle_bar_experience": "Visa/dölj erfarenhetsmätare", "hud.settings.scrolling_combat_text": "Rullande stridstext", + "hud.settings.incoming_damage": "Inkommande skada", "hud.settings.speech_bubble": "Pratbubbla", "hud.settings.speech_bubble_self": "Visa egna pratbubblor", "hud.settings.speech_bubble_dark_mode": "Pratbubbla mörkt läge", diff --git a/assets/voxygen/i18n/th_TH/hud/settings.ron b/assets/voxygen/i18n/th_TH/hud/settings.ron index bc56a89191..97559f562d 100644 --- a/assets/voxygen/i18n/th_TH/hud/settings.ron +++ b/assets/voxygen/i18n/th_TH/hud/settings.ron @@ -25,10 +25,7 @@ "hud.settings.buffs_mmap": "แสดงสถานะที่แผนที่", "hud.settings.toggle_bar_experience": "เปิด/ปิดแถบค่าประสบการณ์", "hud.settings.scrolling_combat_text": "ความเสียหายที่ทำได้", - "hud.settings.single_damage_number": "แสดงแต่ละเลขแยกกัน", - "hud.settings.cumulated_damage": "แสดงเลขรวมกันเป็นเลขเดียว", "hud.settings.incoming_damage": "ความเสียหายที่ได้รับ", - "hud.settings.cumulated_incoming_damage": "ความเสียหายที่ได้รับแบบรวม", "hud.settings.speech_bubble": "ลูกโป่งคำพูด", "hud.settings.speech_bubble_self": "แสดงลูกโป่งคำพูด", "hud.settings.speech_bubble_dark_mode": "แสดงลูกดป่งคำพูดแบบมืด", diff --git a/assets/voxygen/i18n/tr_TR/hud/settings.ron b/assets/voxygen/i18n/tr_TR/hud/settings.ron index a897965416..e2a5038977 100644 --- a/assets/voxygen/i18n/tr_TR/hud/settings.ron +++ b/assets/voxygen/i18n/tr_TR/hud/settings.ron @@ -22,6 +22,7 @@ "hud.settings.buffs_mmap": "Etkiler haritanın yanında", "hud.settings.toggle_bar_experience": "Tecrübe çubuğunu aç/kapa", "hud.settings.scrolling_combat_text": "Verilen/Alınan Hasar Yazısı", + "hud.settings.incoming_damage": "Alınan Hasarı Tek Tek Göster", "hud.settings.speech_bubble": "Konuşma balonu", "hud.settings.speech_bubble_dark_mode": "Konuşma balonunda karanlık tema kullan", "hud.settings.speech_bubble_icon": "Konuşma balonunda ikon göster", diff --git a/assets/voxygen/i18n/uk_UA/hud/settings.ron b/assets/voxygen/i18n/uk_UA/hud/settings.ron index f5e75faf11..7eba6b69fe 100644 --- a/assets/voxygen/i18n/uk_UA/hud/settings.ron +++ b/assets/voxygen/i18n/uk_UA/hud/settings.ron @@ -24,6 +24,7 @@ "hud.settings.buffs_mmap": "Бафи біля Мінімапи", "hud.settings.toggle_bar_experience": "Панель досвіду", "hud.settings.scrolling_combat_text": "Відображення Пошкоджень/Зцілень", + "hud.settings.incoming_damage": "Роздільно отримані Гравцем", "hud.settings.speech_bubble": "Діалоги", "hud.settings.speech_bubble_dark_mode": "Темний режим", "hud.settings.speech_bubble_icon": "Піктограма", diff --git a/assets/voxygen/i18n/vi_VI/hud/settings.ron b/assets/voxygen/i18n/vi_VI/hud/settings.ron index e281a937c5..db00a4317d 100644 --- a/assets/voxygen/i18n/vi_VI/hud/settings.ron +++ b/assets/voxygen/i18n/vi_VI/hud/settings.ron @@ -24,6 +24,7 @@ "hud.settings.buffs_mmap": "Buffs tại Minimap", "hud.settings.toggle_bar_experience": "Bật tắt thanh kinh nghiệm", "hud.settings.scrolling_combat_text": "Thông Tin Chiến Đấu", + "hud.settings.incoming_damage": "Sát thương nhận phải", "hud.settings.speech_bubble": "Bong Bóng Thoại", "hud.settings.speech_bubble_dark_mode": "Chế độ tối màu", "hud.settings.speech_bubble_icon": "Biểu tượng bong bóng thoại", diff --git a/assets/voxygen/i18n/zh_CN/hud/settings.ron b/assets/voxygen/i18n/zh_CN/hud/settings.ron index 8899f8fefe..4ff00b42e4 100644 --- a/assets/voxygen/i18n/zh_CN/hud/settings.ron +++ b/assets/voxygen/i18n/zh_CN/hud/settings.ron @@ -22,6 +22,7 @@ "hud.settings.buffs_mmap": "增益效果显示在小地图旁", "hud.settings.toggle_bar_experience": "显示经验条", "hud.settings.scrolling_combat_text": "战斗信息", + "hud.settings.incoming_damage": "所受伤害", "hud.settings.speech_bubble": "对话框", "hud.settings.speech_bubble_dark_mode": "对话框启用暗色模式", "hud.settings.speech_bubble_icon": "对话框显示图标", diff --git a/assets/voxygen/i18n/zh_TW/hud/settings.ron b/assets/voxygen/i18n/zh_TW/hud/settings.ron index 4d73f39ab0..c0f1d39a3c 100644 --- a/assets/voxygen/i18n/zh_TW/hud/settings.ron +++ b/assets/voxygen/i18n/zh_TW/hud/settings.ron @@ -20,6 +20,7 @@ "hud.settings.toggle_shortcuts": "顯示快捷鍵", "hud.settings.toggle_bar_experience": "顯示經驗條", "hud.settings.scrolling_combat_text": "戰鬥訊息", + "hud.settings.incoming_damage": "所受傷害", "hud.settings.energybar_numbers": "能量條", "hud.settings.values": "數字", "hud.settings.percentages": "百分比", diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 5519977a19..f50109d7eb 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -592,14 +592,18 @@ pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3) stats.get(entity), &msm, ); - let change = - damage.calculate_health_change(damage_reduction, None, false, 0.0, 1.0, *time, rand::random()); + let change = damage.calculate_health_change( + damage_reduction, + None, + false, + 0.0, + 1.0, + *time, + rand::random(), + ); health.change_by(change); let server_eventbus = ecs.read_resource::>(); - server_eventbus.emit_now(ServerEvent::HealthChange { - entity, - change, - }); + server_eventbus.emit_now(ServerEvent::HealthChange { entity, change }); } // Handle poise change diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index c5f11e226f..0d50f072dd 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -54,7 +54,6 @@ use trade::Trade; use crate::{ cmd::get_player_uuid, - ecs::{comp as vcomp, comp::{HpFloater, HpFloaterList}, sys::floater}, ecs::{ comp as vcomp, comp::{HpFloater, HpFloaterList}, @@ -2687,8 +2686,7 @@ impl Hud { f.timer -= dt.as_secs_f64(); f }); - self.floaters.combo_floater.filter(|f| f.timer > 0_f64); - let combo = self.floaters.combo_floater; + self.floaters.combo_floater = self.floaters.combo_floater.filter(|f| f.timer > 0_f64); if let ( Some(health), @@ -2729,7 +2727,7 @@ impl Hud { &mut self.slot_manager, i18n, &msm, - combo, + self.floaters.combo_floater, ) .set(self.ids.skillbar, ui_widgets); } diff --git a/voxygen/src/session/settings_change.rs b/voxygen/src/session/settings_change.rs index fd389422da..b56e3f81c6 100644 --- a/voxygen/src/session/settings_change.rs +++ b/voxygen/src/session/settings_change.rs @@ -466,8 +466,8 @@ impl SettingsChange { Interface::SctDamageAccumDuration(sct_dmg_accum_duration) => { settings.interface.sct_dmg_accum_duration = sct_dmg_accum_duration; }, - Interface::SctIncomingDamage(sct_inc_dmg_accum_duration) => { - settings.interface.sct_inc_dmg = sct_inc_dmg_accum_duration; + Interface::SctIncomingDamage(sct_inc_dmg) => { + settings.interface.sct_inc_dmg = sct_inc_dmg; }, Interface::SctIncomingDamageAccumDuration(sct_inc_dmg_accum_duration) => { settings.interface.sct_inc_dmg_accum_duration = sct_inc_dmg_accum_duration;