Merge branch 'transp---opacity-in-UI' into 'master'

transparency -> opacity

See merge request veloren/veloren!2714

assets/voxygen/i18n/cz_CZ/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Relativní škálování",
         "hud.settings.custom_scaling": "Vlastní škálování",
         "hud.settings.crosshair": "Zaměřování",
-        "hud.settings.transparency": "Průhlednost",
+        "hud.settings.opacity": "Průhlednost",
         "hud.settings.hotbar": "Hotbar",
         "hud.settings.toggle_shortcuts": "Povolit Zkratky",
         "hud.settings.buffs_skillbar": "Buffy u Skillbaru",
@@ -33,7 +33,7 @@
         "hud.settings.values": "Hodnoty",
         "hud.settings.percentages": "Procenta",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Průhlednost Pozadí",
+        "hud.settings.background_opacity": "Průhlednost Pozadí",
         "hud.settings.chat_character_name": "Jména Postav v Chatu",
         "hud.settings.loading_tips": "Rady v Načítání",
         "hud.settings.reset_interface": "Výchozí Nastavení",

assets/voxygen/i18n/de_DE/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Relative Skalierung",
         "hud.settings.custom_scaling": "Benutzerdefinierte Skalierung",
         "hud.settings.crosshair": "Fadenkreuz",
-        "hud.settings.transparency": "Transparenz",
+        "hud.settings.opacity": "Sichtbarkeit",
         "hud.settings.hotbar": "Hotbar",
         "hud.settings.toggle_shortcuts": "Tastenkürzel umschalten",
         "hud.settings.buffs_skillbar": "Effekte an der Skillbar",
@@ -33,7 +33,7 @@
         "hud.settings.values": "Werte",
         "hud.settings.percentages": "Prozentangaben",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Hintergrundtransparenz",
+        "hud.settings.background_opacity": "Hintergrundsichtbarkeit",
         "hud.settings.chat_character_name": "Charakternamen im Chat",
         "hud.settings.loading_tips": "Tipps auf dem Ladebildschirm",
         "hud.settings.reset_interface": "Auf Standardwerte zurücksetzen",

assets/voxygen/i18n/en/hud/settings.ron

@@ -17,7 +17,7 @@
         "hud.settings.relative_scaling": "Relative Scaling",
         "hud.settings.custom_scaling": "Custom Scaling",
         "hud.settings.crosshair": "Crosshair",
-        "hud.settings.transparency": "Transparency",
+        "hud.settings.opacity": "Opacity",
         "hud.settings.hotbar": "Hotbar",
         "hud.settings.toggle_shortcuts": "Toggle Shortcuts",
         "hud.settings.buffs_skillbar": "Buffs at Skillbar",
@@ -35,7 +35,7 @@
         "hud.settings.values": "Values",
         "hud.settings.percentages": "Percentages",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Background Transparency",
+        "hud.settings.background_opacity": "Background Opacity",
         "hud.settings.chat_character_name": "Character Names in chat",
         "hud.settings.loading_tips": "Loading Screen Tips",
         "hud.settings.reset_interface": "Reset to Defaults",

assets/voxygen/i18n/es_ES/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Escala relativa",
         "hud.settings.custom_scaling": "Escala personalizada",
         "hud.settings.crosshair": "Punto de mira",
-        "hud.settings.transparency": "Transparencia",
+        "hud.settings.opacity": "Transparencia",
         "hud.settings.hotbar": "Barra rápida",
         "hud.settings.toggle_shortcuts": "Alternar atajos",
         "hud.settings.buffs_skillbar": "Buffs en la barra de habilidades.",
@@ -33,7 +33,7 @@
         "hud.settings.values": "Valores",
         "hud.settings.percentages": "Porcentaje",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Transparencia del fondo",
+        "hud.settings.background_opacity": "Transparencia del fondo",
         "hud.settings.chat_character_name": "Nombres de personajes en el chat",
         "hud.settings.loading_tips": "Consejos en pantalla de carga",
         "hud.settings.reset_interface": "Restablecer por defecto",

assets/voxygen/i18n/es_LA/hud/settings.ron

@@ -14,7 +14,7 @@
         "hud.settings.relative_scaling": "Escalado Relativo",
         "hud.settings.custom_scaling": "Escalado Personalizado",
         "hud.settings.crosshair": "Mira",
-        "hud.settings.transparency": "Transparencia",
+        "hud.settings.opacity": "Transparencia",
         "hud.settings.hotbar": "Inventario Rápido",
         "hud.settings.toggle_shortcuts": "Alternar Atajos",
         "hud.settings.buffs_skillbar": "Buffs en la barra de habilidades.",
@@ -32,7 +32,7 @@
         "hud.settings.values": "Valores",
         "hud.settings.percentages": "Porcentajes",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Transparencia del Fondo",
+        "hud.settings.background_opacity": "Transparencia del Fondo",
         "hud.settings.chat_character_name": "Nombres de Personajes en el chat",
         "hud.settings.loading_tips": "Consejos en Pantalla de Carga",
 

assets/voxygen/i18n/fr_FR/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Echelle relative",
         "hud.settings.custom_scaling": "Echelle personalisée",
         "hud.settings.crosshair": "Réticule",
-        "hud.settings.transparency": "Transparence",
+        "hud.settings.opacity": "Transparence",
         "hud.settings.hotbar": "Barre d'action",
         "hud.settings.toggle_shortcuts": "Activer les raccourcis",
         "hud.settings.buffs_skillbar": "Effets sur la barre de compétences",
@@ -33,7 +33,7 @@
         "hud.settings.values": "Valeurs",
         "hud.settings.percentages": "Pourcentages",
         "hud.settings.chat": "Tchat",
-        "hud.settings.background_transparency": "Transparence de l'arrière-plan",
+        "hud.settings.background_opacity": "Transparence de l'arrière-plan",
         "hud.settings.chat_character_name": "Noms des personnages dans le tchat",
         "hud.settings.loading_tips": "Astuces sur l'écran de chargement",
         "hud.settings.reset_interface": "Restaurer par Défaut",

assets/voxygen/i18n/hu_HU/hud/settings.ron

@@ -17,7 +17,7 @@
         "hud.settings.relative_scaling": "Relatív méretezés",
         "hud.settings.custom_scaling": "Egyéni méretezés",
         "hud.settings.crosshair": "Célkereszt",
-        "hud.settings.transparency": "Átlátszóság",
+        "hud.settings.opacity": "Átlátszóság",
         "hud.settings.hotbar": "Gyorssáv",
         "hud.settings.toggle_shortcuts": "Gyorsbillentyűk megjelenítése/elrejtése",
         "hud.settings.buffs_skillbar": "Hatások a gyossávnál",
@@ -35,7 +35,7 @@
         "hud.settings.values": "Értékek",
         "hud.settings.percentages": "Százalékok",
         "hud.settings.chat": "Csevegés",
-        "hud.settings.background_transparency": "Háttér átlátszósága",
+        "hud.settings.background_opacity": "Háttér átlátszósága",
         "hud.settings.chat_character_name": "Karakternevek a csevegésben",
         "hud.settings.loading_tips": "Tippek a töltőképernyőn",
         "hud.settings.reset_interface": "Alapértékek visszaállítása",

assets/voxygen/i18n/it_IT/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Ridimensionamento Relativo",
         "hud.settings.custom_scaling": "Ridimensionamento Personalizzato",
         "hud.settings.crosshair": "Mirino",
-        "hud.settings.transparency": "Trasparenza",
+        "hud.settings.opacity": "Trasparenza",
         "hud.settings.hotbar": "Slot Rapido",
         "hud.settings.toggle_shortcuts": "Attiva/Disattiva Tasti rapidi",
         "hud.settings.buffs_skillbar": "Buff alla Barra delle Abilità",
@@ -33,7 +33,7 @@
         "hud.settings.values": "Valori",
         "hud.settings.percentages": "Percentuali",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Trasparenza Sfondo",
+        "hud.settings.background_opacity": "Trasparenza Sfondo",
         "hud.settings.chat_character_name": "Nome Personaggi in chat",
         "hud.settings.loading_tips": "Consigli Schermata di Caricamento",
         "hud.settings.reset_interface": "Ripristina Predefiniti",

assets/voxygen/i18n/ja_JP/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "相対的スケール",
         "hud.settings.custom_scaling": "カスタムスケール",
         "hud.settings.crosshair": "十字線",
-        "hud.settings.transparency": "透明度",
+        "hud.settings.opacity": "透明度",
         "hud.settings.hotbar": "ホットバー",
         "hud.settings.toggle_shortcuts": "ショートカット表示切り替え",
         "hud.settings.buffs_skillbar": "Buffs at Skillbar",
@@ -33,7 +33,7 @@
         "hud.settings.values": "数値",
         "hud.settings.percentages": "パーセント",
         "hud.settings.chat": "チャット",
-        "hud.settings.background_transparency": "背景透明度",
+        "hud.settings.background_opacity": "背景透明度",
         "hud.settings.chat_character_name": "チャット内にキャラクター名表示",
         "hud.settings.loading_tips": "ロード画面のヒント表示",
         "hud.settings.reset_interface": "デフォルトに戻す",

assets/voxygen/i18n/nl_NL/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Relatief Schalen",
         "hud.settings.custom_scaling": "Aangepast Schalen",
         "hud.settings.crosshair": "Richtkruis",
-        "hud.settings.transparency": "Doorschijnbaarheid",
+        "hud.settings.opacity": "Doorschijnbaarheid",
         "hud.settings.hotbar": "Hotbar",
         "hud.settings.toggle_shortcuts": "Toon Sneltoetsen",
         "hud.settings.toggle_bar_experience": "Toon Experience Balk",
@@ -31,7 +31,7 @@
         "hud.settings.values": "Waarden",
         "hud.settings.percentages": "Percentages",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Transparantie Achtergrond",
+        "hud.settings.background_opacity": "Transparantie Achtergrond",
         "hud.settings.chat_character_name": "Karakternamen in de Chat",
         "hud.settings.loading_tips": "Laadscherm Tips",
 

assets/voxygen/i18n/no_NB/hud/settings.ron

@@ -14,7 +14,7 @@
         "hud.settings.relative_scaling": "Relativ Skalering",
         "hud.settings.custom_scaling": "Tilpasset Skalering",
         "hud.settings.crosshair": "Retikkel",
-        "hud.settings.transparency": "Gjennomsiktighet",
+        "hud.settings.opacity": "Gjennomsiktighet",
         "hud.settings.hotbar": "Hurtigknappsbar",
         "hud.settings.toggle_shortcuts": "Veksle Snarveier",
         "hud.settings.buffs_skillbar": "Ikoner på Ferdighetsbar",
@@ -32,7 +32,7 @@
         "hud.settings.values": "Verdier",
         "hud.settings.percentages": "Prosentandeler",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Bakgrunnsgjennomsiktighet",
+        "hud.settings.background_opacity": "Bakgrunnsgjennomsiktighet",
         "hud.settings.chat_character_name": "Karakternavn i chat",
         "hud.settings.loading_tips": "Oppstartsskjerm Tips",
 

assets/voxygen/i18n/pl_PL/hud/settings.ron

@@ -13,7 +13,7 @@
         "hud.settings.relative_scaling": "Relatywne skalowanie",
         "hud.settings.custom_scaling": "Niestandardowe skalowanie",
         "hud.settings.crosshair": "Celownik",
-        "hud.settings.transparency": "Przezroczystość",
+        "hud.settings.opacity": "Przezroczystość",
         "hud.settings.hotbar": "Pasek skrótów",
         "hud.settings.toggle_shortcuts": "Przełącz skróty",
         "hud.settings.buffs_skillbar": "Wzmocnienia na pasku umiejętności",
@@ -31,7 +31,7 @@
         "hud.settings.values": "Wartości",
         "hud.settings.percentages": "Procenty",
         "hud.settings.chat": "Czat",
-        "hud.settings.background_transparency": "Przezroczystość tła",
+        "hud.settings.background_opacity": "Przezroczystość tła",
         "hud.settings.chat_character_name": "Imiona postaci na czacie",
         "hud.settings.loading_tips": "Porady na ekranie ładowania",
         "hud.settings.reset_interface": "Zresetuj ustawienia",

assets/voxygen/i18n/pt_BR/hud/settings.ron

@@ -17,7 +17,7 @@
         "hud.settings.relative_scaling": "Escala Relativa",
         "hud.settings.custom_scaling": "Escala Customizada",
         "hud.settings.crosshair": "Mira",
-        "hud.settings.transparency": "Transparência",
+        "hud.settings.opacity": "Transparência",
         "hud.settings.hotbar": "Hotbar",
         "hud.settings.toggle_shortcuts": "Mostar/Ocultar atalhos",
         "hud.settings.buffs_skillbar": "Buffs na Barra de Habilidades",
@@ -35,7 +35,7 @@
         "hud.settings.values": "Valores",
         "hud.settings.percentages": "Porcentagens",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Transparência de Fundo",
+        "hud.settings.background_opacity": "Transparência de Fundo",
         "hud.settings.chat_character_name": "Nomes de Personagem no chat",
         "hud.settings.loading_tips": "Dicas na Tela de Carregamento",
         "hud.settings.reset_interface": "Restaurar Padrões",

assets/voxygen/i18n/pt_PT/hud/settings.ron

@@ -14,7 +14,7 @@
         "hud.settings.relative_scaling": "Escala relativa",
         "hud.settings.custom_scaling": "Escala customizada",
         "hud.settings.crosshair": "Crosshair",
-        "hud.settings.transparency": "Transparência",
+        "hud.settings.opacity": "Transparência",
         "hud.settings.hotbar": "Hotbar",
         "hud.settings.toggle_shortcuts": "Mostar/Ocultar atalhos",
         "hud.settings.toggle_bar_experience": "Mostar/Ocultar barra de experiência",
@@ -27,7 +27,7 @@
         "hud.settings.values": "Valores",
         "hud.settings.percentages": "Percentagens",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Transparência do fundo",
+        "hud.settings.background_opacity": "Transparência do fundo",
 
         "hud.settings.pan_sensitivity": "Sensibilidade de rotação",
         "hud.settings.zoom_sensitivity": "Sensibilidade de zoom",

assets/voxygen/i18n/sv_SE/hud/settings.ron

@@ -17,7 +17,7 @@
         "hud.settings.relative_scaling": "Relativ skalning",
         "hud.settings.custom_scaling": "Anpassad skalning",
         "hud.settings.crosshair": "Hårkors",
-        "hud.settings.transparency": "Transparens",
+        "hud.settings.opacity": "Transparens",
         "hud.settings.hotbar": "Snabbåtkomst",
         "hud.settings.toggle_shortcuts": "Växla genvägar",
         "hud.settings.buffs_skillbar": "Buffs at Skillbar", // TODO
@@ -35,7 +35,7 @@
         "hud.settings.values": "Värden",
         "hud.settings.percentages": "Procent",
         "hud.settings.chat": "Konversation",
-        "hud.settings.background_transparency": "Bakgrundstransparens",
+        "hud.settings.background_opacity": "Bakgrundstransparens",
         "hud.settings.chat_character_name": "Karaktärers namn i konverationer",
         "hud.settings.loading_tips": "Tips på laddningsskärmen",
         "hud.settings.reset_interface": "Återställ till standard",

assets/voxygen/i18n/tr_TR/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "Otomatik Ölçek",
         "hud.settings.custom_scaling": "Sabit Ölçek",
         "hud.settings.crosshair": "İmleç tipi",
-        "hud.settings.transparency": "Şeffaflık",
+        "hud.settings.opacity": "Şeffaflık",
         "hud.settings.hotbar": "Aksiyon Çubuğu",
         "hud.settings.toggle_shortcuts": "Kısayolları aç/kapa",
         "hud.settings.buffs_skillbar": "Etkiler yetenek çubuğunun üstünde",
@@ -33,7 +33,7 @@
         "hud.settings.values": "Sayılar",
         "hud.settings.percentages": "Yüzdeler",
         "hud.settings.chat": "Sohbet",
-        "hud.settings.background_transparency": "Arkaplan Şeffaflığı",
+        "hud.settings.background_opacity": "Arkaplan Şeffaflığı",
         "hud.settings.chat_character_name": "Sohbette karakter isimlerini göster",
         "hud.settings.loading_tips": "Yükleme ekranı ipuçları",
 

assets/voxygen/i18n/uk_UA/hud/settings.ron

@@ -17,7 +17,7 @@
         "hud.settings.relative_scaling": "Відносне",
         "hud.settings.custom_scaling": "Ручне",
         "hud.settings.crosshair": "Приціл",
-        "hud.settings.transparency": "Прозорість",
+        "hud.settings.opacity": "Прозорість",
         "hud.settings.hotbar": "Панель швидкого доступу",
         "hud.settings.toggle_shortcuts": "Гарячі клавіші",
         "hud.settings.buffs_skillbar": "Бафи біля Панелі Швидкого Доступу",
@@ -35,7 +35,7 @@
         "hud.settings.values": "Значення",
         "hud.settings.percentages": "Відсотки",
         "hud.settings.chat": "Чат",
-        "hud.settings.background_transparency": "Прозорість фону",
+        "hud.settings.background_opacity": "Прозорість фону",
         "hud.settings.chat_character_name": "Імена персонажів в чаті",
         "hud.settings.loading_tips": "Підказки на екрані завантаження",
         "hud.settings.reset_interface": "Значення за\n замовчуванням",

assets/voxygen/i18n/zh_CN/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "相对缩放",
         "hud.settings.custom_scaling": "自定义缩放",
         "hud.settings.crosshair": "准星",
-        "hud.settings.transparency": "透明度",
+        "hud.settings.opacity": "透明度",
         "hud.settings.hotbar": "快捷键",
         "hud.settings.toggle_shortcuts": "显示快捷键",
         "hud.settings.buffs_skillbar": "增益效果显示在技能栏",
@@ -33,7 +33,7 @@
         "hud.settings.values": "数字",
         "hud.settings.percentages": "百分比",
         "hud.settings.chat": "聊天",
-        "hud.settings.background_transparency": "背景透明度",
+        "hud.settings.background_opacity": "背景透明度",
         "hud.settings.chat_character_name": "聊天显示人物名称",
         "hud.settings.loading_tips": "加载游戏时显示小提示",
         "hud.settings.reset_interface": "重置为默认",

assets/voxygen/i18n/zh_TW/hud/settings.ron

@@ -15,7 +15,7 @@
         "hud.settings.relative_scaling": "相對大小",
         "hud.settings.custom_scaling": "自訂大小",
         "hud.settings.crosshair": "準星",
-        "hud.settings.transparency": "透明度",
+        "hud.settings.opacity": "透明度",
         "hud.settings.hotbar": "角色資訊",
         "hud.settings.toggle_shortcuts": "顯示快捷鍵",
         "hud.settings.toggle_bar_experience": "顯示經驗條",
@@ -28,7 +28,7 @@
         "hud.settings.values": "數字",
         "hud.settings.percentages": "百分比",
         "hud.settings.chat": "聊天欄",
-        "hud.settings.background_transparency": "背景透明度",
+        "hud.settings.background_opacity": "背景透明度",
         "hud.settings.none": "無",
 
         "hud.settings.pan_sensitivity": "滑鼠靈敏度",

voxygen/src/hud/chat.rs

@@ -375,7 +375,7 @@ impl<'a> Widget for Chat<'a> {
                 _ => 0.0,
             };
             Rectangle::fill([CHAT_BOX_WIDTH, y])
-                .rgba(0.0, 0.0, 0.0, chat_settings.chat_transp + 0.1)
+                .rgba(0.0, 0.0, 0.0, chat_settings.chat_opacity + 0.1)
                 .bottom_left_with_margins_on(ui.window, 10.0, 10.0)
                 .w(CHAT_BOX_WIDTH)
                 .set(state.ids.chat_input_bg, ui);
@@ -393,7 +393,7 @@ impl<'a> Widget for Chat<'a> {
 
         // Message box
         Rectangle::fill([CHAT_BOX_WIDTH, CHAT_BOX_HEIGHT])
-            .rgba(0.0, 0.0, 0.0, chat_settings.chat_transp)
+            .rgba(0.0, 0.0, 0.0, chat_settings.chat_opacity)
             .and(|r| {
                 if input_focused {
                     r.up_from(state.ids.chat_input_bg, 0.0)
@@ -518,10 +518,10 @@ impl<'a> Widget for Chat<'a> {
             .filter(|t| t <= &1.5)
         {
             let alpha = 1.0 - (time_since_hover / 1.5).powi(4);
-            let shading = color::rgba(1.0, 0.82, 0.27, (chat_settings.chat_transp + 0.1) * alpha);
+            let shading = color::rgba(1.0, 0.82, 0.27, (chat_settings.chat_opacity + 0.1) * alpha);
 
             Rectangle::fill([CHAT_BOX_WIDTH, CHAT_TAB_HEIGHT])
-                .rgba(0.0, 0.0, 0.0, (chat_settings.chat_transp + 0.1) * alpha)
+                .rgba(0.0, 0.0, 0.0, (chat_settings.chat_opacity + 0.1) * alpha)
                 .up_from(state.ids.message_box_bg, 0.0)
                 .set(state.ids.chat_tab_align, ui);
             if ui

voxygen/src/hud/mod.rs

@@ -1144,7 +1144,7 @@ impl Hud {
                         1.0,
                         1.0,
                         1.0,
-                        self.crosshair_opacity * global_state.settings.interface.crosshair_transp,
+                        self.crosshair_opacity * global_state.settings.interface.crosshair_opacity,
                     )))
                     .set(self.ids.crosshair_outer, ui_widgets);
                     Image::new(self.imgs.crosshair_inner)

voxygen/src/hud/settings_window/chat.rs

@@ -150,7 +150,7 @@ impl<'a> Widget for Chat<'a> {
         // Chat Transp
         Text::new(
             self.localized_strings
-                .get("hud.settings.background_transparency"),
+                .get("hud.settings.background_opacity"),
         )
         .down_from(state.ids.general_txt, 20.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -158,7 +158,7 @@ impl<'a> Widget for Chat<'a> {
         .color(TEXT_COLOR)
         .set(state.ids.transp_text, ui);
         if let Some(new_val) = ImageSlider::continuous(
-            chat_settings.chat_transp,
+            chat_settings.chat_opacity,
             0.0,
             0.9,
             self.imgs.slider_indicator,

voxygen/src/hud/settings_window/interface.rs

@@ -159,7 +159,7 @@ impl<'a> Widget for Interface<'a> {
             .set(state.ids.window_scrollbar, ui);
 
         let bar_values = self.global_state.settings.interface.bar_numbers;
-        let crosshair_transp = self.global_state.settings.interface.crosshair_transp;
+        let crosshair_opacity = self.global_state.settings.interface.crosshair_opacity;
         let crosshair_type = self.global_state.settings.interface.crosshair_type;
         let ui_scale = self.global_state.settings.interface.ui_scale;
 
@@ -441,7 +441,7 @@ impl<'a> Widget for Interface<'a> {
                 1.0,
                 1.0,
                 1.0,
-                self.global_state.settings.interface.crosshair_transp,
+                self.global_state.settings.interface.crosshair_opacity,
             )))
             .graphics_for(state.ids.ch_1_bg)
             .set(state.ids.crosshair_outer_1, ui);
@@ -484,7 +484,7 @@ impl<'a> Widget for Interface<'a> {
                 1.0,
                 1.0,
                 1.0,
-                self.global_state.settings.interface.crosshair_transp,
+                self.global_state.settings.interface.crosshair_opacity,
             )))
             .graphics_for(state.ids.ch_2_bg)
             .set(state.ids.crosshair_outer_2, ui);
@@ -527,7 +527,7 @@ impl<'a> Widget for Interface<'a> {
                 1.0,
                 1.0,
                 1.0,
-                self.global_state.settings.interface.crosshair_transp,
+                self.global_state.settings.interface.crosshair_opacity,
             )))
             .graphics_for(state.ids.ch_3_bg)
             .set(state.ids.crosshair_outer_3, ui);
@@ -544,7 +544,7 @@ impl<'a> Widget for Interface<'a> {
             .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.ch_title, ui);
-        Text::new(self.localized_strings.get("hud.settings.transparency"))
+        Text::new(self.localized_strings.get("hud.settings.opacity"))
             .right_from(state.ids.ch_3_bg, 20.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -552,7 +552,7 @@ impl<'a> Widget for Interface<'a> {
             .set(state.ids.ch_transp_text, ui);
 
         if let Some(new_val) = ImageSlider::continuous(
-            crosshair_transp,
+            crosshair_opacity,
             0.0,
             1.0,
             self.imgs.slider_indicator,
@@ -568,7 +568,7 @@ impl<'a> Widget for Interface<'a> {
             events.push(CrosshairTransp(new_val));
         }
 
-        Text::new(&format!("{:.2}", crosshair_transp,))
+        Text::new(&format!("{:.2}", crosshair_opacity,))
             .right_from(state.ids.ch_transp_slider, 8.0)
             .font_size(self.fonts.cyri.scale(14))
             .graphics_for(state.ids.ch_transp_slider)

voxygen/src/session/settings_change.rs

@@ -207,8 +207,8 @@ impl SettingsChange {
             SettingsChange::Chat(chat_change) => {
                 let chat_tabs = &mut settings.chat.chat_tabs;
                 match chat_change {
-                    Chat::Transp(chat_transp) => {
-                        settings.chat.chat_transp = chat_transp;
+                    Chat::Transp(chat_opacity) => {
+                        settings.chat.chat_opacity = chat_opacity;
                     },
                     Chat::CharName(chat_char_name) => {
                         settings.chat.chat_character_name = chat_char_name;
@@ -453,8 +453,8 @@ impl SettingsChange {
                     Interface::ToggleTips(loading_tips) => {
                         settings.interface.loading_tips = loading_tips;
                     },
-                    Interface::CrosshairTransp(crosshair_transp) => {
-                        settings.interface.crosshair_transp = crosshair_transp;
+                    Interface::CrosshairTransp(crosshair_opacity) => {
+                        settings.interface.crosshair_opacity = crosshair_opacity;
                     },
                     Interface::CrosshairType(crosshair_type) => {
                         settings.interface.crosshair_type = crosshair_type;

voxygen/src/settings/chat.rs

@@ -69,7 +69,7 @@ impl Default for ChatFilter {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
 pub struct ChatSettings {
-    pub chat_transp: f32,
+    pub chat_opacity: f32,
     pub chat_character_name: bool,
     pub chat_tabs: Vec<ChatTab>,
     pub chat_tab_index: Option<usize>,
@@ -78,7 +78,7 @@ pub struct ChatSettings {
 impl Default for ChatSettings {
     fn default() -> Self {
         Self {
-            chat_transp: 0.4,
+            chat_opacity: 0.4,
             chat_character_name: true,
             chat_tabs: vec![ChatTab::default()],
             chat_tab_index: Some(0),

voxygen/src/settings/interface.rs

@@ -17,7 +17,7 @@ pub struct InterfaceSettings {
     pub sct_damage_batch: bool,
     pub speech_bubble_dark_mode: bool,
     pub speech_bubble_icon: bool,
-    pub crosshair_transp: f32,
+    pub crosshair_opacity: f32,
     pub crosshair_type: CrosshairType,
     pub intro_show: Intro,
     pub xp_bar: XpBar,
@@ -53,7 +53,7 @@ impl Default for InterfaceSettings {
             sct_damage_batch: false,
             speech_bubble_dark_mode: false,
             speech_bubble_icon: true,
-            crosshair_transp: 0.6,
+            crosshair_opacity: 0.6,
             crosshair_type: CrosshairType::Round,
             intro_show: Intro::Show,
             xp_bar: XpBar::Always,