Modules update (#596)

* - add: Update module sprites.

* - add: Modules update.

Content.Server/_White/WeaponModules/WeaponModulesSystem.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared._White.Telescope;
 using Content.Shared._White.WeaponModules;
 using Content.Shared.Weapons.Ranged.Components;
@@ -128,7 +128,7 @@ public sealed class WeaponModulesSystem : EntitySystem
             return;
 
         weaponModulesComponent.WeaponFireEffect = true;
-        Dirty(module, weaponModulesComponent);
+        Dirty(weapon, weaponModulesComponent);
     }
 
     private void SilencerModuleOnInsert(EntityUid module, SilencerModuleComponent component, EntGotInsertedIntoContainerMessage args)
@@ -145,7 +145,7 @@ public sealed class WeaponModulesSystem : EntitySystem
         weaponModulesComponent.WeaponFireEffect = true;
         _gunSystem.SetSound(weapon, component.NewSoundGunshot);
 
-        Dirty(module, weaponModulesComponent);
+        Dirty(weapon, weaponModulesComponent);
     }
 
     private void AcceleratorModuleOnInsert(EntityUid module, AcceleratorModuleComponent component, EntGotInsertedIntoContainerMessage args)
@@ -224,7 +224,7 @@ public sealed class WeaponModulesSystem : EntitySystem
             return;
 
         weaponModulesComponent.WeaponFireEffect = false;
-        Dirty(module, weaponModulesComponent);
+        Dirty(weapon, weaponModulesComponent);
     }
 
     private void SilencerModuleOnEject(EntityUid module, SilencerModuleComponent component, EntGotRemovedFromContainerMessage args)
@@ -236,7 +236,7 @@ public sealed class WeaponModulesSystem : EntitySystem
 
         weaponModulesComponent.WeaponFireEffect = false;
         _gunSystem.SetSound(weapon, component.OldSoundGunshot!);
-        Dirty(module, weaponModulesComponent);
+        Dirty(weapon, weaponModulesComponent);
     }
 
     private void AcceleratorModuleOnEject(EntityUid module, AcceleratorModuleComponent component, EntGotRemovedFromContainerMessage args)

Resources/Locale/ru-RU/locales-new/autotranslate-57.ftl

@@ -8,4 +8,11 @@ ent-SilencerModule = глушитель
   .desc = Скрывает пламя огня и приглушает звук во время выстрела.
 ent-AcceleratorModule = продвинутый модуль
   .desc = Разработка NanoTrasen специально для отдела Службы Безопасности. Меняет затворную раму без видимых изменений, за счет этого увеличивает скорострельность оружия.
-gun-modules = Установленные модули: [color=cyan]{ $modules }[/color].
+ent-HolographicSightModule = голографической прицел
+  .desc = Позоляет целиться, небольшое приближение.
+ent-TelescopicSightModule = телескопический прицел
+  .desc = Позоляет целиться, большое приближение.
+gun-modules = Установленные модули: [color=cyan]{ $modules }[/color].
+research-technology-modules-basic = Базовые модули
+research-technology-modules-advanced = Продвинутые модули
+lathe-category-modules = Модули

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -287,7 +287,6 @@
       - id: MagazinePistol
       - id: BoxMindshield
       - id: TagillaHammer
-      - id: EightAimModule
 - type: entity
   id: LockerFreezerVaultFilled
   suffix: Vault, Locked

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -18,7 +18,6 @@
       - id: BoxMindshield
       - id: ClothingOuterHardsuitWarden
       - id: OxygenTankFilled
-      - id: LightModule
       - id: WeaponLauncherShinano
       - id: BoxShinanoGrenadeFlash
       - id: BoxShinanoGrenadeSmoke
@@ -43,7 +42,6 @@
       - id: WeaponPistolMk58Nonlethal
       - id: MagazinePistol
       - id: BoxMindshield
-      - id: LightModule
       - id: WeaponLauncherShinano
       - id: BoxShinanoGrenadeFlash
       - id: BoxShinanoGrenadeSmoke
@@ -77,7 +75,6 @@
       - id: WeaponPistolMk58Nonlethal
       - id: SurveillanceBodyCamera
       - id: MagazinePistol
-      - id: LightModule
 
 - type: entity
   id: LockerBrigmedicFilled
@@ -141,7 +138,6 @@
       - id: VoiceRecorder
       - id: ClothingEyesGlassesSecurity
       - id: BoxZipLocks
-      - id: LightModule
 
 - type: entity
   id: ClosetBombFilled

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -76,11 +76,9 @@
       map: [ "enum.GunVisualLayers.Mag" ]
     - state: barrel_module
       visible: false
-      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
       map: [ "enum.ModuleVisualState.BarrelModule" ]
     - state: handguard_module
       visible: false
-      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
       map: [ "enum.ModuleVisualState.HandGuardModule" ]
     - state: aim_module
       visible: false
@@ -214,11 +212,9 @@
       map: [ "enum.GunVisualLayers.Mag" ]
     - state: barrel_module
       visible: false
-      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
       map: [ "enum.ModuleVisualState.BarrelModule" ]
     - state: handguard_module
       visible: false
-      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
       map: [ "enum.ModuleVisualState.HandGuardModule" ]
     - state: aim_module
       visible: false

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -20,7 +20,7 @@
     maxAngle: 16
     fireRate: 8
     angleIncrease: 3
-    angleDecay: 16  
+    angleDecay: 16
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -106,11 +106,9 @@
       map: ["enum.GunVisualLayers.Mag"]
     - state: barrel_module
       visible: false
-      sprite: White/Objects/Weapons/modulesOnSMGs.rsi
       map: [ "enum.ModuleVisualState.BarrelModule" ]
     - state: handguard_module
       visible: false
-      sprite: White/Objects/Weapons/modulesOnSMGs.rsi
       map: [ "enum.ModuleVisualState.HandGuardModule" ]
     - state: aim_module
       visible: false
@@ -204,15 +202,13 @@
           map: ["enum.GunVisualLayers.Mag"]
         - state: barrel_module
           visible: false
-          sprite: White/Objects/Weapons/modulesOnWeapon.rsi
           map: [ "enum.ModuleVisualState.BarrelModule" ]
         - state: handguard_module
           visible: false
-          sprite: White/Objects/Weapons/modulesOnWeapon.rsi
           map: [ "enum.ModuleVisualState.HandGuardModule" ]
         - state: aim_module
           visible: false
-          sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+          sprite: White/Objects/Weapons/modulesOnSMGs.rsi
           map: [ "enum.ModuleVisualState.AimModule" ]
     - type: Clothing
       sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi
@@ -352,15 +348,13 @@
         shader: unshaded
       - state: barrel_module
         visible: false
-        sprite: White/Objects/Weapons/modulesOnWeapon.rsi
         map: [ "enum.ModuleVisualState.BarrelModule" ]
       - state: handguard_module
         visible: false
-        sprite: White/Objects/Weapons/modulesOnWeapon.rsi
         map: [ "enum.ModuleVisualState.HandGuardModule" ]
       - state: aim_module
         visible: false
-        sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+        sprite: White/Objects/Weapons/modulesOnSMGs.rsi
         map: [ "enum.ModuleVisualState.AimModule" ]
   - type: Clothing
     sprite: White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi
@@ -373,7 +367,7 @@
     minAngle: 1
     maxAngle: 6
     angleIncrease: 1.5
-    angleDecay: 6  
+    angleDecay: 6
     selectedMode: FullAuto
     shotsPerBurst: 5
     availableModes:

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -196,11 +196,8 @@
        - MagazineBoxRifle
        - MagazineBoxLightRifle
        - GrenadeBlast
-       - LightModuleRecipe
-       - LaserModuleRecipe
-       - FlameHiderModuleRecipe
-       - SilencerModuleRecipe
-       - AcceleratorModuleRecipe
+       - LightModule
+       - FlameHiderModule
        - ShinanoGrenadeBeanbagRecipe
     emagDynamicRecipes:
       - CartridgePistolRubber
@@ -235,6 +232,11 @@
       - MagazineGrenadeEmpty
       - GrenadeEMP
       - GrenadeFlash
+      - SilencerModule
+      - LaserModule
+      - AcceleratorModule
+      - HolographicSightModule
+      - TelescopicSightModule
   - type: BluespaceStorage
 
 - type: entity
@@ -734,11 +736,8 @@
       - ShellShotgunPractice
       - WeaponLaserCarbinePractice
       - WeaponDisablerPractice
-      - LightModuleRecipe
-      - LaserModuleRecipe
-      - FlameHiderModuleRecipe
-      - SilencerModuleRecipe
-      - AcceleratorModuleRecipe
+      - LightModule
+      - FlameHiderModule
       - ShinanoGrenadeBeanbagRecipe
     dynamicRecipes:
       - CartridgeLightRifleIncendiary
@@ -799,6 +798,11 @@
       - ShinanoGrenadeFlashRecipe
       - ShinanoGrenadeSmokeRecipe
       - ShinanoGrenadeStingerRecipe
+      - SilencerModule
+      - LaserModule
+      - AcceleratorModule
+      - HolographicSightModule
+      - TelescopicSightModule
   - type: EmagLatheRecipes
     emagStaticRecipes:
      - MagazineLightRifleBox

Resources/Prototypes/Procedural/salvage_loot.yml

@@ -200,12 +200,16 @@
           cost: 3
         - proto: LaserModule
           cost: 8
+        - proto: HolograpicSightModule
+          cost: 8
         - proto: FlameHiderModule
           cost: 3
         - proto: SilencerModule
           cost: 5
         - proto: AcceleratorModule
           cost: 12
+        - proto: TelescopicSightModule
+          cost: 12
         - proto: MedkitFilled
           cost: 3
         - proto: MedkitRadiationFilled

Resources/Prototypes/Recipes/Lathes/categories.yml

@@ -29,3 +29,8 @@
 - type: latheCategory
   id: Weapons
   name: lathe-category-weapons
+
+# WD
+- type: latheCategory
+  id: Modules
+  name: lathe-category-modules

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -659,43 +659,48 @@
     Silver: 50
 
 - type: latheRecipe
-  id: LightModuleRecipe
+  id: LightModule
   result: LightModule
-  completetime: 5
+  completetime: 3
+  category: Modules
   materials:
-     Steel: 700
-     Plastic: 700
-     Glass: 500
+     Steel: 200
+     Plastic: 100
+     Glass: 200
 
 - type: latheRecipe
-  id: LaserModuleRecipe
+  id: LaserModule
   result: LaserModule
-  completetime: 10
+  completetime: 6
+  category: Modules
   materials:
      Steel: 1500
      Plastic: 1000
      Glass: 300
 
 - type: latheRecipe
-  id: FlameHiderModuleRecipe
+  id: FlameHiderModule
   result: FlameHiderModule
-  completetime: 15
+  completetime: 3
+  category: Modules
   materials:
-     Steel: 1000
-     Plastic: 1000
+     Steel: 200
+     Plastic: 200
 
 - type: latheRecipe
-  id: SilencerModuleRecipe
+  id: SilencerModule
   result: SilencerModule
-  completetime: 15
+  completetime: 6
+  category: Modules
   materials:
-     Steel: 1000
-     Plastic: 1000
+     Steel: 400
+     Plastic: 300
 
 - type: latheRecipe
-  id: AcceleratorModuleRecipe
+  id: AcceleratorModule
   result: AcceleratorModule
-  completetime: 30
+  completetime: 12
+  category: Modules
   materials:
      Steel: 3500
      Plastic: 1000
@@ -703,10 +708,22 @@
      Gold: 1000
 
 - type: latheRecipe
-  id: EightAimRecipe
-  result: EightAimModule
-  completetime: 15
+  id: HolographicSightModule
+  result: HolographicSightModule
+  completetime: 6
+  category: Modules
   materials:
      Steel: 500
      Plastic: 700
-     Glass: 300
+     Glass: 300
+
+- type: latheRecipe
+  id: TelescopicSightModule
+  result: TelescopicSightModule
+  completetime: 12
+  category: Modules
+  materials:
+     Steel: 1000
+     Plastic: 1400
+     Glass: 600
+     Silver: 800

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml

@@ -1,70 +1,50 @@
 - type: entity
   parent: BaseItem
+  id: BaseModule
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/modules.rsi
+  - type: Item
+    sprite: White/Objects/Weapons/modules.rsi
+    size: Tiny
+  - type: Appearance
+
+- type: entity
+  parent: BaseModule
   id: BaseHandGuardModule
   abstract: true
   components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/modules.rsi
   - type: Tag
     tags:
       - BaseHandGuardModule
-  - type: Item
-    sprite: White/Objects/Weapons/modules.rsi
-    size: Small
-    shape:
-    - 0,0,0,0
-  - type: Appearance
 
 - type: entity
-  parent: BaseItem
+  parent: BaseModule
   id: BaseBarrelModule
   abstract: true
   components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/modules.rsi
   - type: Tag
     tags:
       - BaseBarrelModule
-  - type: Item
-    sprite: White/Objects/Weapons/modules.rsi
-    size: Small
-    shape:
-    - 0,0,0,0
-  - type: Appearance
 
 - type: entity
-  parent: BaseItem
+  parent: BaseModule
   id: BaseAimModule
   abstract: true
   components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/modules.rsi
   - type: Tag
     tags:
       - BaseAimModule
-  - type: Item
-    sprite: White/Objects/Weapons/modules.rsi
-    size: Small
-    shape:
-    - 0,0,0,0
-  - type: Appearance
 
 - type: entity
-  parent: BaseItem
+  parent: BaseModule
   id: BaseShutterModule
   abstract: true
   components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/modules.rsi
   - type: Tag
     tags:
       - BaseShutterModule
-  - type: Item
-    sprite: White/Objects/Weapons/modules.rsi
-    size: Small
-    shape:
-    - 0,0,0,0
-  - type: Appearance
 
 # modules
 - type: entity
@@ -78,7 +58,6 @@
     module_type: "handguard_module"
   - type: Sprite
     state: light
-  - type: Appearance
 
 - type: entity
   parent: BaseHandGuardModule
@@ -91,7 +70,6 @@
     module_type: "handguard_module"
   - type: Sprite
     state: laser
-  - type: Appearance
 
 - type: entity
   parent: BaseBarrelModule
@@ -104,7 +82,6 @@
     module_type: "barrel_module"
   - type: Sprite
     state: flamehider
-  - type: Appearance
 
 - type: entity
   parent: BaseBarrelModule
@@ -117,7 +94,6 @@
     module_type: "barrel_module"
   - type: Sprite
     state: silencer
-  - type: Appearance
 
 - type: entity
   parent: BaseHandGuardModule
@@ -130,20 +106,31 @@
     module_type: "handguard_module"
   - type: Sprite
     state: accelerator
-  - type: Appearance
 
 - type: entity
   parent: BaseAimModule
-  id: EightAimModule
-  name: "aim module"
-  description: 8X Aim Module for rifles.
+  id: HolographicSightModule
+  name: "holographic sight"
+  description: Holographic sight for rifles  (lecter, CV, drozd, WT).
   components:
   - type: AimModule
-    value: "eightaim"
+    value: "holographic"
     module_type: "aim_module"
   - type: Sprite
-    state: eightaim
-  - type: Appearance
+    state: holographic
+
+- type: entity
+  parent: BaseAimModule
+  id: TelescopicSightModule
+  name: "telescopic sight"
+  description: Telescopic sight for rifles  (lecter, CV, drozd, WT).
+  components:
+  - type: AimModule
+    divisor: 0.15
+    value: "telescopic"
+    module_type: "aim_module"
+  - type: Sprite
+    state: telescopic
 
 - type: entity
   parent: BaseShutterModule

Resources/Prototypes/_White/Research/arsenal.yml

@@ -9,3 +9,30 @@
   cost: 7500
   recipeUnlocks:
   - WeaponTempGun
+
+- type: technology
+  id: BasicModules
+  name: research-technology-modules-basic
+  icon:
+    sprite: White/Objects/Weapons/modules.rsi
+    state: laser
+  discipline: Arsenal
+  tier: 1
+  cost: 5000
+  recipeUnlocks:
+  - LaserModule
+  - SilencerModule
+  - HolographicSightModule
+
+- type: technology
+  id: AdvancedModules
+  name: research-technology-modules-advanced
+  icon:
+    sprite: White/Objects/Weapons/modules.rsi
+    state: accelerator
+  discipline: Arsenal
+  tier: 2
+  cost: 15000
+  recipeUnlocks:
+  - AcceleratorModule
+  - TelescopicSightModule

Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json

@@ -18,6 +18,27 @@
         },
         {
             "name": "mag-0"
+        },
+        {
+            "name": "silencer"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "laser"
+        },
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "handguard_module"
         }
     ]
 }

Resources/Textures/White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi/meta.json

@@ -18,6 +18,27 @@
         },
         {
             "name": "mag-0"
+        },
+        {
+            "name": "silencer"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "laser"
+        },
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "handguard_module"
         }
     ]
 }

Resources/Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi/meta.json

@@ -30,6 +30,24 @@
         },
         {
             "name": "silencer"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "laser"
+        },
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "handguard_module"
         }
     ]
 }

Resources/Textures/White/Objects/Weapons/Guns/SMG/drozd-icons.rsi/meta.json

@@ -19,8 +19,26 @@
 		{
 			"name": "mag-0"
 		},
-		{
-			"name": "silencer"
-		}
+        {
+            "name": "silencer"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "laser"
+        },
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "handguard_module"
+        }
     ]
 }

Resources/Textures/White/Objects/Weapons/Guns/SMG/wt550-icons.rsi/meta.json

@@ -45,6 +45,27 @@
         },
         {
             "name": "mag-unshaded-4"
+        },
+        {
+            "name": "silencer"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "laser"
+        },
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "handguard_module"
         }
     ]
 }

Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "laser"
-    },    
+    },
     {
       "name": "flamehider"
     },
@@ -23,7 +23,10 @@
       "name": "accelerator"
     },
     {
-      "name": "eightaim"
+      "name": "holographic"
+    },
+    {
+      "name": "telescopic"
     },
     {
       "name": "barrel_module"

Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json

@@ -1,35 +1,17 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "made by CaypenNow",
+    "copyright": "made by Aviu",
     "size": {
-        "x": 32,
+        "x": 48,
         "y": 32
     },
     "states": [
         {
-            "name": "flamehider"
+            "name": "holographic"
         },
         {
-            "name": "silencer"
-        },
-        {
-            "name": "light"
-        },
-        {
-            "name": "laser"
-        },
-        {
-            "name": "accelerator"
-        },
-        {
-            "name": "eightaim"
-        },
-        {
-            "name": "handguard_module"
-        },
-        {
-            "name": "barrel_module"
+            "name": "telescopic"
         },
         {
             "name": "aim_module"

Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json

@@ -1,35 +1,17 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "made by CaypenNow",
+    "copyright": "made by Aviu",
     "size": {
-        "x": 32,
+        "x": 48,
         "y": 32
     },
     "states": [
         {
-            "name": "laser"
+            "name": "holographic"
         },
         {
-            "name": "light"
-        },
-        {
-            "name": "flamehider"
-        },
-        {
-            "name": "silencer"
-        },
-        {
-            "name": "accelerator"
-        },
-        {
-            "name": "eightaim"
-        },
-        {
-            "name": "handguard_module"
-        },
-        {
-            "name": "barrel_module"
+            "name": "telescopic"
         },
         {
             "name": "aim_module"

Resources/Textures/White/Objects/Weapons/modulesOnWeaponOld.rsi/meta.json

@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by CaypenNow",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "laser"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "silencer"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "eightaim"
+        },
+        {
+            "name": "handguard_module"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "aim_module"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/moulesOnSMGsOld.rsi/meta.json

@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by CaypenNow",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flamehider"
+        },
+        {
+            "name": "silencer"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "laser"
+        },
+        {
+            "name": "accelerator"
+        },
+        {
+            "name": "eightaim"
+        },
+        {
+            "name": "handguard_module"
+        },
+        {
+            "name": "barrel_module"
+        },
+        {
+            "name": "aim_module"
+        }
+    ]
+}