Novalite (Rework)

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

@@ -935,6 +935,9 @@
         - SpeedLoaderMagnumEmpty
         - SpeedLoaderRifleHeavy # Frontier
         - SpeedLoaderRifleHeavyEmpty # Frontier
+        - MagazineNovaliteC1Empty # Frontier
+        - MagazineNovaliteC1 # Frontier
+        - MagazineNovaliteC1Rubber # Frontier
     - type: MaterialStorage
       whitelist:
         tags:

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml

@@ -1,3 +1,4 @@
+# Upstream
 - type: entity
   id: MagazineLightRifleRubber
   name: "magazine (.30 rifle rubber)"
@@ -11,3 +12,92 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+# Rifle low
+- type: entity
+  id: MagazineLightRifleLowCapacityEmpty
+  name: "low cap magazine (.30 rifle any)"
+  suffix: empty
+  parent: MagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineLightRifleLowCapacity
+  name: "low cap magazine (.30 rifle)"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifle
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineLightRifleLowCapacityPractice
+  name: "low cap magazine (.30 rifle practice)"
+  parent: MagazineLightRifleLowCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRiflePractice
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    layers:
+    - state: practice
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineLightRifleLowCapacityRubber
+  name: "low cap magazine (.30 rifle rubber)"
+  parent: MagazineLightRifleLowCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineLightRifleLowCapacityUranium
+  name: "low cap magazine (.30 rifle uranium)"
+  parent: MagazineLightRifleLowCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleUranium
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml

@@ -1,3 +1,4 @@
+# Upstream
 - type: entity
   id: MagazineRifleRubber
   name: "magazine (.20 rifle rubber)"
@@ -11,3 +12,67 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+# Novalite
+- type: entity
+  parent: BaseMagazineRifle
+  id: MagazineNovaliteC1Empty
+  name: "clip (.20 rifle any)"
+  suffix: empty
+  components:
+  - type: Tag
+    tags:
+      - MagazineNovaliteC1
+  - type: Item
+    size: Small
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeRifle
+    capacity: 25
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-15
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 16
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: MagazineNovaliteC1Empty
+  id: MagazineNovaliteC1
+  name: "clip (.20 rifle)"
+  suffix: full
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-15
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  parent: MagazineNovaliteC1Empty
+  id: MagazineNovaliteC1Rubber
+  name: "clip (.20 rifle rubber)"
+  suffix: full
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-15
+      map: ["enum.GunVisualLayers.Mag"]

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

@@ -154,7 +154,7 @@
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi
   - type: Gun
-    fireRate: 4
+    fireRate: 5
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto

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

@@ -572,6 +572,9 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
+      - MagazineNovaliteC1Empty
+      - MagazineNovaliteC1
+      - MagazineNovaliteC1Rubber
     dynamicRecipes:
       - BoxShellTranquilizer
       - ExplosivePayload