diff --git a/Content.Client/_Sunrise/Eye/NightVision/NVGSystem.cs b/Content.Client/_Sunrise/Eye/NightVision/NVGSystem.cs index 683a3ec2886..560a92545dd 100644 --- a/Content.Client/_Sunrise/Eye/NightVision/NVGSystem.cs +++ b/Content.Client/_Sunrise/Eye/NightVision/NVGSystem.cs @@ -11,6 +11,7 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent(OnAfterNVGUpdateVisualsEvent); + SubscribeLocalEvent(OnNVGClientUpdateVisualsEvent); } private void OnAfterNVGUpdateVisualsEvent(EntityUid uid, NVGComponent component, AfterNVGUpdateVisualsEvent args) @@ -18,6 +19,20 @@ private void OnAfterNVGUpdateVisualsEvent(EntityUid uid, NVGComponent component, var nvcomp = args.nvcomp; if (TryComp(component.Owner, out var sprite)) - sprite.LayerSetVisible(NVGVisuals.Light, nvcomp.IsNightVision); + { + if (sprite.LayerMapTryGet(NVGVisuals.Light, out var layer)) + sprite.LayerSetVisible(layer, !nvcomp.IsNightVision); + } + } + + private void OnNVGClientUpdateVisualsEvent(EntityUid uid, NVGComponent component, NVGClientUpdateVisualsEvent args) + { + var nvcomp = args.nvcomp; + + if (TryComp(component.Owner, out var sprite)) + { + if (sprite.LayerMapTryGet(NVGVisuals.Light, out var layer)) + sprite.LayerSetVisible(layer, args.enable); + } } } \ No newline at end of file diff --git a/Content.Client/_Sunrise/Eye/NightVision/NightVisionOverlay.cs b/Content.Client/_Sunrise/Eye/NightVision/NightVisionOverlay.cs index 70b7ef8f74f..90c62b3dd2e 100644 --- a/Content.Client/_Sunrise/Eye/NightVision/NightVisionOverlay.cs +++ b/Content.Client/_Sunrise/Eye/NightVision/NightVisionOverlay.cs @@ -50,6 +50,8 @@ protected override bool BeforeDraw(in OverlayDrawArgs args) _nightvisionComponent = nightvisionComp; + NightvisionColor = _nightvisionComponent.NightVisionColor; + var nightvision = _nightvisionComponent.IsNightVision; if (!nightvision && _nightvisionComponent.DrawShadows) // Disable our Night Vision diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Components/NVGComponent.cs b/Content.Shared/_Sunrise/Eye/NightVision/Components/NVGComponent.cs index ce0fb41c45a..c206efb6b55 100644 --- a/Content.Shared/_Sunrise/Eye/NightVision/Components/NVGComponent.cs +++ b/Content.Shared/_Sunrise/Eye/NightVision/Components/NVGComponent.cs @@ -14,6 +14,9 @@ public sealed partial class NVGComponent : Component [DataField] public EntProtoId ActionProto = "NVToggleAction"; [DataField] public EntityUid? ActionContainer; + [DataField("color")] + public Color NVGColor = Color.Green; + [DataField("playSounds")] public bool PlaySounds = true; public SoundSpecifier SoundOn = new SoundPathSpecifier("/Audio/_Sunrise/Items/night_vision_on.ogg"); diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NVGSystem.cs b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NVGSystem.cs index ab403c1cb9d..032a2d0c1c8 100644 --- a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NVGSystem.cs +++ b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NVGSystem.cs @@ -37,14 +37,14 @@ private void OnNVGUpdateVisuals(EntityUid uid, NVGComponent component, NVGUpdate { var nvcomp = args.nvcomp; - _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(15)); + _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(5)); - if (nvcomp.IsNightVision) + if (!nvcomp.IsNightVision) { if (_net.IsServer && component.PlaySounds) _audioSystem.PlayPvs(component.SoundOn, uid); } - else if (!nvcomp.IsNightVision) + else if (nvcomp.IsNightVision) { if (_net.IsServer && component.PlaySounds) _audioSystem.PlayPvs(component.SoundOff, uid); @@ -53,6 +53,23 @@ private void OnNVGUpdateVisuals(EntityUid uid, NVGComponent component, NVGUpdate var updVisEv = new AfterNVGUpdateVisualsEvent(nvcomp); RaiseLocalEvent(component.Owner, ref updVisEv); } + + public void UpdateVisuals(EntityUid uid, NVGComponent component, bool enable, NightVisionComponent nvcomp) + { + if (enable) + { + if (_net.IsServer && component.PlaySounds) + _audioSystem.PlayPvs(component.SoundOn, uid); + } + else if (!enable) + { + if (_net.IsServer && component.PlaySounds) + _audioSystem.PlayPvs(component.SoundOff, uid); + } + + var updVisEv = new NVGClientUpdateVisualsEvent(nvcomp, enable); + RaiseLocalEvent(component.Owner, ref updVisEv); + } private void OnEquipped(EntityUid uid, NVGComponent component, GotEquippedEvent args) { @@ -69,14 +86,7 @@ private void OnEquipped(EntityUid uid, NVGComponent component, GotEquippedEvent _nightvisionableSystem.UpdateIsNightVision(args.Equipee, nvcomp); if (component.ActionContainer == null) _actionsSystem.AddAction(args.Equipee, ref component.ActionContainer, component.ActionProto); - _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(1)); // GCD? - - if (component.PlaySounds && nvcomp.IsNightVision) - { - if (_net.IsServer) - _audioSystem.PlayPvs(component.SoundOn, uid); - } - + _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(5)); // GCD? } private void OnUnequipped(EntityUid uid, NVGComponent component, GotUnequippedEvent args) @@ -94,7 +104,10 @@ private void OnUnequipped(EntityUid uid, NVGComponent component, GotUnequippedEv component.ActionContainer = null; } - RemCompDeferred(args.Equipee); + UpdateVisuals(uid ,component, false, nvcomp); + + if (_net.IsServer) + RemCompDeferred(args.Equipee); } } @@ -106,4 +119,17 @@ public AfterNVGUpdateVisualsEvent(NightVisionComponent component) { nvcomp = component; } +} + +[PublicAPI, ByRefEvent] +public sealed class NVGClientUpdateVisualsEvent : EntityEventArgs { + public NightVisionComponent nvcomp; + public bool enable; + + public NVGClientUpdateVisualsEvent(NightVisionComponent component, bool isenable) + { + nvcomp = component; + enable = isenable; + + } } \ No newline at end of file diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionSystem.cs b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionSystem.cs index 3b81a042f16..4852d94f625 100644 --- a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionSystem.cs +++ b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionSystem.cs @@ -35,36 +35,38 @@ private void OnComponentStartup(EntityUid uid, NightVisionComponent component, C private void OnActionToggle(EntityUid uid, NightVisionComponent component, NVInstantActionEvent args) { - component.IsNightVision = !component.IsNightVision; - var changeEv = new NightVisionToggledEvent(component.IsNightVision); - RaiseLocalEvent(uid, ref changeEv); - Dirty(uid, component); - _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(15)); - - var updVisEv = new NVGUpdateVisualsEvent(component); if (_inventory.TryGetSlotEntity(uid, "eyes", out var eyesEntity)) { - if (HasComp(eyesEntity)) + if (TryComp(eyesEntity, out var nvcomp)) { + component.NightVisionColor = nvcomp.NVGColor; RaiseLocalEvent(eyesEntity.Value, ref updVisEv); } } else if (_inventory.TryGetSlotEntity(uid, "mask", out var maskEntity)) { - if (HasComp(maskEntity)) + if (TryComp(maskEntity, out var nvcomp)) { + component.NightVisionColor = nvcomp.NVGColor; RaiseLocalEvent(maskEntity.Value, ref updVisEv); } } else if (_inventory.TryGetSlotEntity(uid, "head", out var headEntity)) { - if (HasComp(headEntity)) + if (TryComp(headEntity, out var nvcomp)) { + component.NightVisionColor = nvcomp.NVGColor; RaiseLocalEvent(headEntity.Value, ref updVisEv); } } + + component.IsNightVision = !component.IsNightVision; + var changeEv = new NightVisionToggledEvent(component.IsNightVision); + RaiseLocalEvent(uid, ref changeEv); + Dirty(uid, component); + _actionsSystem.SetCooldown(component.ActionContainer, TimeSpan.FromSeconds(5)); } [PublicAPI] diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/eyes/nvg.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/eyes/nvg.ftl index 410d265893a..5ef4fe20cf2 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/eyes/nvg.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/eyes/nvg.ftl @@ -1,5 +1,8 @@ -ent-ClothingEyesVision = ПНВ - .desc = Прибор ночного видения. Обеспечивает изображение местности в условиях низкой освещенности. -ent-ClothingEyesVisionNuki = { ent-ClothingEyesVision } - .desc = { ent-ClothingEyesVision.desc } - .suffix = ЯО +ent-ClothingEyesNVD = ПНВ + .desc = Прибор ночного видения. Обеспечивает улучшение видимости в условиях низкой освещенности. +ent-ClothingEyesNVDSyndicate = ПНВ синдиката + .desc = Качественно исполненый прибор ночного видения, производства компании "Горлакс секьюрити", использует красные линзы для улучшения видимости в условиях низкой освещенности. + .suffix = Синдикат +ent-ClothingEyesNVDHandcrafted = кустарное ПНВ + .desc = Прибор ночного видения. Обеспечивает улучшение видимости в условиях низкой освещенности. На вид явно сделаное не качетсвенно. На боку визора видна надпись "Ручного производства". + .suffix = Кустарное diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl new file mode 100644 index 00000000000..d510bc8b444 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl @@ -0,0 +1,5 @@ +research-technology-energy-gun = Энергетическое вооружение +research-technology-energy-gun-advance = Продвинутое энергетическое вооружение +research-technology-advance-laser = Военное энергетическое вооружение +research-technology-handcraft-nvd = Кустарные ПНВ +research-technology-basic-nvd = Продвинутое ПНВ \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index 12a5d5ee7a1..ea4b063be70 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -12,3 +12,5 @@ uplink-hardsuit-syndie-commander-name = скафандр Командира Си uplink-hardsuit-syndie-commander-desc = Скафандр предназначеный для командиров отрядов Горлекса. uplink-hardsuit-syndie-medic-name = скафандр Медика Синдиката uplink-hardsuit-syndie-medic-desc = Скафандр предназначеный для боевых врачей отрядов Горлекса. +uplink-syndie-nvd-name = ПНВ Синдиката +uplink-syndie-nvd-desc = Качественно исполненый прибор ночного видения, производства компании "Горлакс секьюрити", использует красные линзы для улучшения видимости в условиях низкой освещенности. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/research/technologies.ftl index 234133d3667..cc4d4cfd0a9 100644 --- a/Resources/Locale/ru-RU/_strings/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/research/technologies.ftl @@ -74,6 +74,3 @@ research-technology-honk-weapons = Бананиумное вооружение research-technology-advanced-spray = Продвинутые спреи research-technology-quantum-fiber-weaving = Плетение квантового волокна research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов -research-technology-energy-gun = Энергетическое вооружение -research-technology-energy-gun-advance = Продвинутое энергетическое вооружение -research-technology-advance-laser = Военное энергетическое вооружение diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ecbf1532655..ca9e6434e12 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -83,8 +83,12 @@ - type: PressureProtection highPressureMultiplier: 0.1 lowPressureMultiplier: 1000 - - type: EyeProtection # Sunrise-Edit - - type: FlashImmunity # Sunrise-Edit + # Sunrise-Start + - type: EyeProtection + - type: FlashImmunity + - type: NVG + color: "#ebeb00" + # Sunrise-End #Spationaut Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6bc502789ad..9bb1ef59c79 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -360,6 +360,10 @@ - OreBagOfHolding - DeviceQuantumSpinInverter - EnergyDomeDirectionalTurtle + # Sunrise-start + - HandCraftedNVD + - BasicNVD + # Sunrise-end - type: EmagLatheRecipes emagDynamicRecipes: # Sunrise-Start diff --git a/Resources/Prototypes/_Sunrise/Actions/nvg.yml b/Resources/Prototypes/_Sunrise/Actions/nvg.yml index a44ebd5602e..8ae6f196147 100644 --- a/Resources/Prototypes/_Sunrise/Actions/nvg.yml +++ b/Resources/Prototypes/_Sunrise/Actions/nvg.yml @@ -6,9 +6,7 @@ components: - type: InstantAction useDelay: 2.5 - icon: - sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - state: icon + icon: { sprite: _Sunrise/Clothing/Eyes/Glasses/nvg.rsi, state: icon } event: !type:NVInstantActionEvent - type: entity @@ -19,7 +17,5 @@ components: - type: InstantAction useDelay: 2.5 - icon: - sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - state: icon + icon: { sprite: _Sunrise/Clothing/Eyes/Glasses/nvg.rsi, state: icon } event: !type:NVInstantActionEvent diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 3cd0f2d4029..172aefc26f3 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -1,3 +1,14 @@ +- type: listing + id: UplinkSyndieNVD + name: uplink-syndie-nvd-name + description: uplink-syndie-nvd-desc + icon: { sprite: /Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi, state: icon } + productEntity: ClothingEyesNVDSyndicate + cost: + Telecrystal: 4 + categories: + - UplinkWearables + # For the Buldog - type: listing id: UplinkMagazineShotgun diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/nvg.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/nvg.yml index dbae86e581d..8a978f78ed3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/nvg.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/nvg.yml @@ -6,7 +6,7 @@ components: - type: Item - type: Sprite - sprite: _Sunrise/Clothing/Eyes/Glasses/nvg.rsi + sprite: _Sunrise/Clothing/Eyes/Glasses/nvd.rsi layers: - state: icon - state: icon-unshaded @@ -40,4 +40,34 @@ id: ClothingEyesNVDSyndicate suffix: syndicate components: - - type: ShowSyndicateIcons \ No newline at end of file + - type: Sprite + sprite: _Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi + layers: + - state: icon + - state: icon-unshaded + shader: unshaded + - state: light-overlay + visible: false + shader: unshaded + map: [ "enum.NVGVisuals.Light" ] + - type: ShowSyndicateIcons + - type: NVG + color: "#800000" + +- type: entity + parent: ClothingEyesNVD + id: ClothingEyesNVDHandcrafted + suffix: handcrafted + components: + - type: Sprite + sprite: _Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi + layers: + - state: icon + - state: icon-unshaded + shader: unshaded + - state: light-overlay + visible: false + shader: unshaded + map: [ "enum.NVGVisuals.Light" ] + - type: NVG + color: "#ebeb00" \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml index ce14be36811..71defd82e66 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml @@ -98,6 +98,9 @@ flashDamage: types: Shock: 5.0 + - type: NightVision + isToggle: true + color: "#808080" - type: entity save: false diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/devices.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/devices.yml new file mode 100644 index 00000000000..08b9d188f6b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/devices.yml @@ -0,0 +1,18 @@ +- type: latheRecipe + id: HandCraftedNVD + result: ClothingEyesNVDHandcrafted + completetime: 10 + materials: + Steel: 500 + Plastic: 200 + Plasma: 300 + +- type: latheRecipe + id: BasicNVD + result: ClothingEyesNVD + completetime: 10 + materials: + Steel: 1000 + Plastic: 400 + Silver: 100 + Diamond: 100 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Research/industrial.yml b/Resources/Prototypes/_Sunrise/Research/industrial.yml new file mode 100644 index 00000000000..780feb7998b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Research/industrial.yml @@ -0,0 +1,27 @@ +# Tier 1 + +- type: technology + id: HandcraftNVD + name: research-technology-handcraft-nvd + icon: + sprite: _Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi + state: icon + discipline: Industrial + tier: 1 + cost: 2500 + recipeUnlocks: + - HandCraftedNVD + +# Tier 2 + +- type: technology + id: BasicNVD + name: research-technology-basic-nvd + icon: + sprite: _Sunrise/Clothing/Eyes/Glasses/nvd.rsi + state: icon + discipline: Industrial + tier: 2 + cost: 5000 + recipeUnlocks: + - BasicNVD \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/roadmap.yml b/Resources/Prototypes/_Sunrise/roadmap.yml index a2f3a97d00c..5f0255f37cc 100644 --- a/Resources/Prototypes/_Sunrise/roadmap.yml +++ b/Resources/Prototypes/_Sunrise/roadmap.yml @@ -39,10 +39,18 @@ new_maps: name: Гробальная переработка карт desc: Значительные доработки карт (дельта, бокс). - state: Partial + state: Complete fully_translating: name: Полный перевод всего desc: перевод всех вещей, меню. С целью упростить геймплей. + state: Complete + night_vision: + name: Ночное виденье + desc: ПНВ, ночное виденье у некоторых животных/расс. + state: Complete + ipc: + name: КПБ + desc: Расса разумных машин, в переработке. state: Partial blob: name: Блоб @@ -72,10 +80,6 @@ name: Культ крови (Нар`Си) desc: Культ который идёт за богом Нар`Си, цель культа призвать своего покровителя который позже уничтожит станцию. state: InProgress - ipc: - name: КПБ - desc: Расса разумных машин, в переработке. - state: InProgress economy: name: Экономика desc: Добавление денег, зарплаты, почта будет давать деньги а вендоматы будут брать деньги за еду. @@ -107,6 +111,14 @@ name: Почта desc: Отправка поссылок в разные части станции за которые станция будет получать деньги. state: InProgress + mech: + name: Мехи + desc: Ну типа да. + state: Partial + ai: + name: ИИ + desc: Новая профессия искуственного интелекта нацеленная на помощь станции в уничтожении самих себя? + state: Partial borer: name: Мозговой червь desc: Антагонист залазящий в мозги живых существ и захватывающий их разум. @@ -147,14 +159,6 @@ name: Болезни desc: Оживление вирусологии, вы сможете реально получить спид, как соник. state: Planned - ai: - name: ИИ - desc: Новая профессия искуственного интелекта нацеленная на помощь станции в уничтожении самих себя? - state: Planned - mech: - name: Мехи - desc: Ну типа да. - state: Planned plasmamens: name: Раса плазмаменов desc: Раса крутых плазменных чувачков. diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/equipped-EYES-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/equipped-EYES-unshaded.png new file mode 100644 index 00000000000..1e916d7961b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/equipped-EYES-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon-flash.png new file mode 100644 index 00000000000..d9032c0adb6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon-unshaded.png new file mode 100644 index 00000000000..6bc41ab0ee0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon.png new file mode 100644 index 00000000000..a302e1c11db Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-left-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-left-unshaded.png new file mode 100644 index 00000000000..e3345f73a43 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-left-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-left.png new file mode 100644 index 00000000000..2e3396fca9e Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-right-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-right-unshaded.png new file mode 100644 index 00000000000..85f957f74eb Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-right-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-right.png new file mode 100644 index 00000000000..3d83a9a3d30 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/light-overlay.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/light-overlay.png new file mode 100644 index 00000000000..21a1040b20a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/light-overlay.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/meta.json similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/meta.json rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/meta.json diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/off-equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/off-equipped-EYES.png new file mode 100644 index 00000000000..7614fc505b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/off-equipped-EYES.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/on-equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/on-equipped-EYES.png new file mode 100644 index 00000000000..70b475b3677 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/handcrafted_nvd.rsi/on-equipped-EYES.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/equipped-EYES-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/equipped-EYES-unshaded.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/equipped-EYES-unshaded.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/equipped-EYES-unshaded.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/icon-flash.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/icon-flash.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/icon-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/icon-unshaded.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/icon-unshaded.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/icon-unshaded.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/icon.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/icon.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/icon.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-left-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-left-unshaded.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-left-unshaded.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-left-unshaded.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-left.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-left.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-right-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-right-unshaded.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-right-unshaded.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-right-unshaded.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/inhand-right.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/inhand-right.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/light-overlay.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/light-overlay.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/light-overlay.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/light-overlay.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/meta.json new file mode 100644 index 00000000000..b0c563516a9 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by https://github.com/VigersRay", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-unshaded" + }, + { + "name": "icon-flash" + }, + { + "name": "light-overlay" + }, + { + "name": "on-equipped-EYES", + "directions": 4 + }, + { + "name": "off-equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-unshaded", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-unshaded", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-unshaded", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/off-equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/off-equipped-EYES.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/off-equipped-EYES.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/off-equipped-EYES.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/on-equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/on-equipped-EYES.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvg.rsi/on-equipped-EYES.png rename to Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/nvd.rsi/on-equipped-EYES.png diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/equipped-EYES-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/equipped-EYES-unshaded.png new file mode 100644 index 00000000000..557657610f9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/equipped-EYES-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon-flash.png new file mode 100644 index 00000000000..b955200bdcc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon-unshaded.png new file mode 100644 index 00000000000..f800e206e04 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon.png new file mode 100644 index 00000000000..c7418fe3c88 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-left-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-left-unshaded.png new file mode 100644 index 00000000000..9a9d9ac3320 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-left-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-left.png new file mode 100644 index 00000000000..1bab94ab2fc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-right-unshaded.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-right-unshaded.png new file mode 100644 index 00000000000..1200dd34cd0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-right-unshaded.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-right.png new file mode 100644 index 00000000000..85ea54637f2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/light-overlay.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/light-overlay.png new file mode 100644 index 00000000000..ae717e8ebfa Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/light-overlay.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/meta.json new file mode 100644 index 00000000000..b0c563516a9 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by https://github.com/VigersRay", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-unshaded" + }, + { + "name": "icon-flash" + }, + { + "name": "light-overlay" + }, + { + "name": "on-equipped-EYES", + "directions": 4 + }, + { + "name": "off-equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-unshaded", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-unshaded", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-unshaded", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/off-equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/off-equipped-EYES.png new file mode 100644 index 00000000000..9850364206c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/off-equipped-EYES.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/on-equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/on-equipped-EYES.png new file mode 100644 index 00000000000..fe551672e33 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi/on-equipped-EYES.png differ