From ede5c1da5893b66773ae200ee638823793068656 Mon Sep 17 00:00:00 2001 From: JoramD Date: Sun, 9 May 2021 18:49:56 +0200 Subject: [PATCH] Night Vision - Add color variants to all generations (#8209) --- AUTHORS.txt | 1 + addons/nightvision/CfgWeapons.hpp | 48 +++++++++++++-- addons/nightvision/config.cpp | 16 ++++- addons/nightvision/stringtable.xml | 96 ++++++++++-------------------- 4 files changed, 92 insertions(+), 69 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 20d2654f28..c65fd69c12 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -106,6 +106,7 @@ Hawkins Head Hybrid V john681611 +JoramD Karneck Kavinsky Keithen diff --git a/addons/nightvision/CfgWeapons.hpp b/addons/nightvision/CfgWeapons.hpp index a81835996f..52c3d32d18 100644 --- a/addons/nightvision/CfgWeapons.hpp +++ b/addons/nightvision/CfgWeapons.hpp @@ -27,23 +27,63 @@ class CfgWeapons { }; class ACE_NVG_Gen1: NVGoggles_OPFOR { author = ECSTRING(common,ACETeam); - displayName = CSTRING(NVG_Gen1); + displayName = CSTRING(NVG_Gen1_black); GVAR(generation) = 1; }; + class ACE_NVG_Gen1_Brown: NVGoggles { + author = ECSTRING(common,ACETeam); + displayName = CSTRING(NVG_Gen1_brown); + GVAR(generation) = 1; + }; + class ACE_NVG_Gen1_Green: NVGoggles_INDEP { + author = ECSTRING(common,ACETeam); + displayName = CSTRING(NVG_Gen1_green); + GVAR(generation) = 1; + }; + class ACE_NVG_Gen2_Black: NVGoggles_OPFOR { + author = ECSTRING(common,ACETeam); + displayName = CSTRING(NVG_Gen2_black); + GVAR(generation) = 2; + }; + class ACE_NVG_Gen2_Brown: NVGoggles { + author = ECSTRING(common,ACETeam); + displayName = CSTRING(NVG_Gen2_brown); + GVAR(generation) = 2; + }; class ACE_NVG_Gen2: NVGoggles_INDEP { author = ECSTRING(common,ACETeam); - displayName = CSTRING(NVG_Gen2); + displayName = CSTRING(NVG_Gen2_green); GVAR(generation) = 2; }; + class ACE_NVG_Gen4_Black: NVGoggles_OPFOR { + author = ECSTRING(common,ACETeam); + displayName = CSTRING(NVG_Gen4_black); + GVAR(generation) = 4; + }; class ACE_NVG_Gen4: NVGoggles { author = ECSTRING(common,ACETeam); - displayName = CSTRING(NVG_Gen4); + displayName = CSTRING(NVG_Gen4_brown); GVAR(generation) = 4; }; + class ACE_NVG_Gen4_Green: NVGoggles_INDEP { + author = ECSTRING(common,ACETeam); + displayName = CSTRING(NVG_Gen4_green); + GVAR(generation) = 4; + }; + class ACE_NVG_Wide_Black: NVGoggles_OPFOR { + author = ECSTRING(common,ACETeam); + modelOptics = QPATHTOF(models\ACE_nvg_wide_optics); + displayName = CSTRING(NVG_Wide_black); + }; class ACE_NVG_Wide: NVGoggles { author = ECSTRING(common,ACETeam); modelOptics = QPATHTOF(models\ACE_nvg_wide_optics); - displayName = CSTRING(NVG_FullScreen); + displayName = CSTRING(NVG_Wide_brown); + }; + class ACE_NVG_Wide_Green: NVGoggles_INDEP { + author = ECSTRING(common,ACETeam); + modelOptics = QPATHTOF(models\ACE_nvg_wide_optics); + displayName = CSTRING(NVG_Wide_green); }; diff --git a/addons/nightvision/config.cpp b/addons/nightvision/config.cpp index ffdb3d16a0..f416af9d38 100644 --- a/addons/nightvision/config.cpp +++ b/addons/nightvision/config.cpp @@ -4,7 +4,21 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; - weapons[] = {"ACE_NVG_Gen1", "ACE_NVG_Gen2", /*"ACE_NVG_Gen3",*/ "ACE_NVG_Gen4", "ACE_NVG_Wide"}; + weapons[] = { + "ACE_NVG_Gen1", + "ACE_NVG_Gen1_Brown", + "ACE_NVG_Gen1_Green", + "ACE_NVG_Gen2_Black", + "ACE_NVG_Gen2_Brown", + "ACE_NVG_Gen2", + /*"ACE_NVG_Gen3",*/ + "ACE_NVG_Gen4_Black", + "ACE_NVG_Gen4", + "ACE_NVG_Gen4_Green", + "ACE_NVG_Wide_Black", + "ACE_NVG_Wide", + "ACE_NVG_Wide_Green" + }; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; author = ECSTRING(common,ACETeam); diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index af3d048f1e..1df394f83a 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -16,39 +16,23 @@ ACE Gece Görüşü ACE visión nocturna - - NV Goggles (Gen1) - Noktovizor (Gen1) - JVN (Gen1) - NS-Brille (1. Gen.) - Occhiali notturni (Gen1) - Gogle noktowizyjne (Gen1) - Óculos de visão noturna (Gen1) - ПНВ (Gen1) - Gafas de visión nocturna (Gen1) - Éjjellátó szemüveg (1. Gen.) - 暗視装置 (第1世代) - 야투경 (1세대) - 夜视镜 (初代) - 夜視鏡 (初代) - GG Gözlüğü (1. Jen) + + NV Goggles (Gen1, Brown) - - NV Goggles (Gen2) - Noktovizor (Gen2) - JVN (Gen2) - NS-Brille (2. Gen.) - Occhiali notturni (Gen2) - Gogle noktowizyjne (Gen2) - Óculos de visão noturna (Gen2) - ПНВ (Gen2) - Gafas de visión nocturna (Gen2) - Éjjellátó szemüveg (2. Gen.) - 暗視装置 (第2世代) - 야투경 (2세대) - 夜视镜 (二代) - 夜視鏡 (二代) - GG Gözlüğü (2. Jen) + + NV Goggles (Gen1, Black) + + + NV Goggles (Gen1, Green) + + + NV Goggles (Gen2, Brown) + + + NV Goggles (Gen2, Black) + + + NV Goggles (Gen2, Green) NV Goggles (Gen3) @@ -118,39 +102,23 @@ 夜視鏡 (三代, 黑色) GG Gözlüğü (3. Jen Siyah) - - NV Goggles (Gen4) - Noktovizor (Gen4) - JVN (Gen4) - NS-Brille (4. Gen.) - Occhiali notturni (Gen4) - Gogle noktowizyjne (Gen4) - Óculos de visão noturna (Gen4) - ПНВ (Gen4) - Gafas de visión nocturna (Gen4) - Éjjellátó szemüveg (4. Gen.) - 暗視装置 (第4世代) - 야투경 (4세대) - 夜视镜 (四代) - 夜視鏡 (四代) - GG Gözlüğü (4. Jen) + + NV Goggles (Gen4, Brown) - - NV Goggles (Wide) - NS-Brille (Weitwinkel) - Gafas de visión nocturna (Panorámicas) - Gogle noktowizyjne (panoramiczne) - Noktovizor (Širokoúhlý) - ПНВ (Широкоугольный) - JVN (Large) - Éjjellátó szemüveg (széles látószögű) - Óculos de visão noturna (Panorâmico) - Occhiali notturni (Larghi) - 暗視装置 (ワイド) - 야투경 (넓음) - 夜视镜 (宽版) - 夜視鏡 (寬版) - GG Gözlüğü (Geniş) + + NV Goggles (Gen4, Black) + + + NV Goggles (Gen4, Green) + + + NV Goggles (Wide, Brown) + + + NV Goggles (Wide, Black) + + + NV Goggles (Wide, Green) Brightness: %1