More ammo recipies to lathes (SerbiaStrong-220#2173)

MIXnikita · Nov 17, 2024 · 72dfa8b · 72dfa8b
1 parent c3c1aaa
commit 72dfa8b
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 0 deletions.
diff --git a/...cale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/...cale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl
@@ -0,0 +1,2 @@
+ent-MagazineMagnumIncendiary = пистолетный магазин (.45 магнум зажигательные)
+    .desc = { ent-BaseMagazineMagnum.desc }
diff --git a/...cale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/...cale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
@@ -0,0 +1,2 @@
+ent-MagazinePistolSubMachineGunIncendiary = магазин ПП (.35 авто зажигательные)
+    .desc = { ent-BaseMagazinePistolSubMachineGun.desc }
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -231,6 +231,15 @@
       - RiotShield
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      #ss220 more recipies begin
+      - SpeedLoaderLightRifle
+      - MagazineBoxCaselessRifle
+      - MagazinePistolCaselessRifle
+      - MagazineMagnumEmpty
+      - MagazineMagnum
+      - MagazinePistolHighCapacityEmpty
+      - MagazinePistolHighCapacity
+      #ss220 more recipies end
   - type: BlueprintReceiver
     whitelist:
       tags:
@@ -405,6 +414,12 @@
       - WeaponEnergyCrossbow #SS220 Energy Crossbow
       - WeaponTaser #SS220 taserback
       - ClothingEyesThermalGlassesSecurity #SS220 Thermals
+      #ss220 more recipies begin
+      - MagazineMagnumIncendiary
+      - MagazineMagnumUranium
+      - MagazinePistolSubMachineGunIncendiary
+      - MagazinePistolSubMachineGunUranium
+      #ss220 more recipies end
 
 - type: entity
   id: ProtolatheHyperConvection
@@ -803,6 +818,12 @@
       - WeaponDisablerPractice
       - WeaponLaserCarbinePractice
       - Zipties
+      #ss220 more recipies begin
+      - SpeedLoaderLightRifle
+      - MagazineMagnumEmpty
+      - MagazineMagnum
+      - MagazineMagnumRubber
+      #ss220 more recipies end
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -858,6 +879,12 @@
       - WeaponEnergyCrossbow #SS220 Energy Crossbow
       - WeaponTaser #SS220 taserback
       - ClothingEyesThermalGlassesSecurity #SS220 Thermals
+      #ss220 more recipies begin
+      - MagazineMagnumUranium
+      - MagazineMagnumIncendiary
+      - MagazinePistolSubMachineGunUranium
+      - MagazinePistolSubMachineGunIncendiary
+      #ss220 more recipies end
   - type: MaterialStorage
     whitelist:
       tags:
@@ -924,6 +951,11 @@
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumRubber #SS220 missing rubber fix
         - SpeedLoaderMagnumEmpty
+        #ss220 more recipies begin
+        - MagazinePistolCaselessRifle
+        - MagazineBoxCaselessRifle
+        - SpeedLoaderLightRifle
+        #ss220 more recipies end
     - type: MaterialStorage
       whitelist:
         tags:

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -34,6 +34,10 @@
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
   - MagazineBoxRifleIncendiary
+  #ss220 more recipies begin
+  - MagazineMagnumIncendiary
+  - MagazinePistolSubMachineGunIncendiary
+  #ss220 more recipies begin
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -81,6 +85,10 @@
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium
   - BoxShotgunUranium
+  #ss220 more recipies begin
+  - MagazineMagnumUranium
+  - MagazinePistolSubMachineGunUranium
+  #ss220 more recipies end
 
 - type: technology
   id: AdvancedRiotControl

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -1,3 +1,17 @@
+#Svarshik's missing mags
+- type: entity
+  id: MagazineMagnumIncendiary
+  name: pistol magazine (.45 magnum incendiary)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumIncendiary
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+
 - type: entity
   id: MagazineMagnumSubMachineGunSP-91-RC
   name: "SP-91-RC magazine (.45 magnum)"

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -0,0 +1,14 @@
+#Svarshik's missing mags
+- type: entity
+  id: MagazinePistolSubMachineGunIncendiary
+  name: SMG magazine (.35 auto incendiary)
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolIncendiary
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/SS220/Recipes/Lathes/security.yml b/Resources/Prototypes/SS220/Recipes/Lathes/security.yml
@@ -78,3 +78,95 @@
   materials:
     Steel: 175
     Plastic: 300
+
+#Svarshik's missing mags
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: SpeedLoaderLightRifle
+  result: SpeedLoaderLightRifle
+  materials:
+    Steel: 75
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineBoxCaselessRifle
+  result: MagazineBoxCaselessRifle
+  materials:
+    Steel: 600
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolCaselessRifle
+  result: MagazinePistolCaselessRifle
+  materials:
+    Steel: 135
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunIncendiary
+  result: MagazinePistolSubMachineGunIncendiary
+  materials:
+    Steel: 275
+    Plastic: 25
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunUranium
+  result: MagazinePistolSubMachineGunUranium
+  materials:
+    Steel: 25
+    Plastic: 300
+    Uranium: 300
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineMagnumEmpty
+  result: MagazineMagnumEmpty
+  materials:
+    Steel: 60
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineMagnum
+  result: MagazineMagnum
+  materials:
+    Steel: 200
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineMagnumIncendiary
+  result: MagazineMagnumIncendiary
+  materials:
+    Steel: 180
+    Plastic: 25
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineMagnumUranium
+  result: MagazineMagnumUranium
+  materials:
+    Steel: 60
+    Plastic: 150
+    Uranium: 120
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineMagnumRubber
+  result: MagazineMagnumRubber
+  materials:
+    Steel: 180
+    Plastic: 150
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacityEmpty
+  result: MagazinePistolHighCapacityEmpty
+  materials:
+    Steel: 30
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacity
+  result: MagazinePistolHighCapacity
+  materials:
+    Steel: 240
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MagazineMagnumIncendiary = пистолетный магазин (.45 магнум зажигательные)
		.desc = { ent-BaseMagazineMagnum.desc }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-MagazinePistolSubMachineGunIncendiary = магазин ПП (.35 авто зажигательные)
		.desc = { ent-BaseMagazinePistolSubMachineGun.desc }