add: new modules, sprite visuals, client and shared logic

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

@@ -72,7 +72,8 @@
     - state: mag-0
       map: [ "enum.GunVisualLayers.Mag" ]
     - state: laser
-      map: [ "enum.ModuleVisualState.Laser" ]
+      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+      map: [ "enum.ModuleVisualState.Module" ]
   - type: Gun
     fireRate: 5
     soundGunshot:
@@ -114,6 +115,9 @@
     steps: 1
     zeroVisible: true
   - type: WeaponModulesVisuals
+  - type: PointLight
+    enabled: false
+    autoRot: true
   - type: Appearance
 
 - type: entity
@@ -172,6 +176,9 @@
       map: [ "enum.GunVisualLayers.Base" ]
     - state: mag-0
       map: [ "enum.GunVisualLayers.Mag" ]
+    - state: laser
+      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+      map: [ "enum.ModuleVisualState.Module" ]
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
   - type: Gun
@@ -195,14 +202,25 @@
         whitelist:
           tags:
           - CartridgeRifle
+      gun_modules:
+        name: Modules
+        priority: 2
+        whitelist:
+          tags:
+          - BaseModule
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+      gun_modules: !type:ContainerSlot
   - type: MagazineVisuals
     magState: mag
     steps: 1
     zeroVisible: true
+  - type: WeaponModulesVisuals
+  - type: PointLight
+    enabled: false
+    autoRot: true
   - type: Appearance
 
 - type: entity
@@ -229,3 +247,9 @@
         whitelist:
           tags:
             - CartridgeRifle
+      gun_modules:
+        name: Modules
+        priority: 2
+        whitelist:
+          tags:
+          - BaseModule

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

@@ -117,6 +117,9 @@
           map: ["enum.GunVisualLayers.Base"]
         - state: mag-0
           map: ["enum.GunVisualLayers.Mag"]
+        - state: laser
+          sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+          map: [ "enum.ModuleVisualState.Module" ]
     - type: Clothing
       sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
     - type: Gun
@@ -126,6 +129,7 @@
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
+    - type: WeaponModules
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -144,10 +148,25 @@
           whitelist:
             tags:
               - CartridgePistol
+        gun_modules:
+          name: Modules
+          priority: 2
+          whitelist:
+            tags:
+            - BaseModule
+    - type: ContainerContainer
+      containers:
+        gun_magazine: !type:ContainerSlot
+        gun_chamber: !type:ContainerSlot
+        gun_modules: !type:ContainerSlot
     - type: MagazineVisuals
       magState: mag
       steps: 1
       zeroVisible: true
+    - type: WeaponModulesVisuals
+    - type: PointLight
+      enabled: false
+      autoRot: true
     - type: Appearance
 
 - type: entity
@@ -216,6 +235,9 @@
       - state: mag-unshaded-0
         map: ["enum.GunVisualLayers.MagUnshaded"]
         shader: unshaded
+      - state: laser
+        sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+        map: [ "enum.ModuleVisualState.Module" ]
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
   - type: ChamberMagazineAmmoProvider
@@ -225,6 +247,7 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
+  - type: WeaponModules
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -243,10 +266,24 @@
         whitelist:
           tags:
             - CartridgePistol
+      gun_modules:
+        name: Modules
+        priority: 2
+        whitelist:
+          tags:
+          - BaseModule
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: MagazineVisuals
     magState: mag
     steps: 6
     zeroVisible: true
+  - type: WeaponModulesVisuals
+  - type: PointLight
+    enabled: false
+    autoRot: true
   - type: Appearance
 
 # Rubber
@@ -274,6 +311,12 @@
           whitelist:
             tags:
               - CartridgePistol
+        gun_modules:
+          name: Modules
+          priority: 2
+          whitelist:
+            tags:
+            - BaseModule
 
 - type: entity
   name: Vector

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

@@ -59,4 +59,14 @@
   - type: Item
   - type: Sprite
     state: silencer
+  - type: Appearance
+
+- type: entity
+  id: AcceleratorModule
+  name: "accelerator module"
+  parent: BaseModule
+  components:
+  - type: Item
+  - type: Sprite
+    state: accelerator
   - type: Appearance

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

@@ -19,9 +19,6 @@
         {
             "name": "mag-0"
         },
-        {
-            "name": "laser"
-        },
         {
             "name": "inhand-left",
             "directions": 4

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

@@ -18,6 +18,9 @@
     },
     {
       "name": "silencer"
+    },
+    {
+      "name": "accelerator"
     }
   ]
 }

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

@@ -0,0 +1,26 @@
+{
+    "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"
+        }
+    ]
+}