Merge pull request #220 from Succuberry/Resources

О боже, опять патч вектора.
Corvax-Frontier · May 28, 2024 · b700391 · b700391
2 parents 93f3d4f + 7726da8
commit b700391
Show file tree

Hide file tree

Showing 26 changed files with 356 additions and 41 deletions.
diff --git a/...Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl b/...Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl
@@ -1,10 +1,18 @@
 ent-MagazineBoxVector22 = коробка патронов (.22 LR)
     .desc = { ent-BaseItem.desc }
-ent-MagazineBoxVector45 = коробка патронов (.45 APC)
+ent-MagazineBoxVector22Incendiary = коробка патронов (.22 LR зажигательные)
     .desc = { ent-BaseItem.desc }
-ent-MagazineBoxVector45Incendiary = коробка патронов (.45 APC зажигательные)
+ent-MagazineBoxVector22Practice = коробка патронов (.22 LR учебные)
     .desc = { ent-BaseItem.desc }
-ent-MagazineBoxVector45Practice = коробка патронов (.45 APC учебные)
+ent-MagazineBoxVector22Uranium = коробка патронов (.22 LR урановые)
     .desc = { ent-BaseItem.desc }
-ent-MagazineBoxVector45Uranium = коробка патронов (.45 APC урановые)
+ent-MagazineBoxVector45 = коробка патронов (.45 ACP)
+    .desc = { ent-BaseItem.desc }
+ent-MagazineBoxVector45Incendiary = коробка патронов (.45 ACP зажигательные)
+    .desc = { ent-BaseItem.desc }
+ent-MagazineBoxVector45Practice = коробка патронов (.45 ACP учебные)
+    .desc = { ent-BaseItem.desc }
+ent-MagazineBoxVector45Uranium = коробка патронов (.45 ACP урановые)
+    .desc = { ent-BaseItem.desc }
+ent-MagazineBoxVector45AP = коробка патронов (.45 ACP AP)
     .desc = { ent-BaseItem.desc }
diff --git a/...e/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl b/...e/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl
@@ -1,10 +1,18 @@
 ent-CartridgeVector22 = патрон (.22 LR)
     .desc = { ent-BaseCartridgePistol.desc }
+ent-CartridgeVector22Incendiary = патрон (.22 LR зажигательный)
+    .desc = { ent-BaseCartridgePistol.desc }
+ent-CartridgeVector22Practice = патрон (.22 LR учебный)
+    .desc = { ent-BaseCartridgePistol.desc }
+ent-CartridgeVector22Uranium = патрон (.22 LR урановый)
+    .desc = { ent-BaseCartridgePistol.desc }
 ent-CartridgeVector45 = патрон (.45 ACP)
     .desc = { ent-BaseCartridgePistol.desc }
 ent-CartridgeVector45Incendiary = патрон (.45 ACP зажигательный)
     .desc = { ent-BaseCartridgePistol.desc }
 ent-CartridgeVector45Practice = патрон (.45 ACP учебный)
     .desc = { ent-BaseCartridgePistol.desc }
 ent-CartridgeVector45Uranium = патрон (.45 ACP урановый)
+    .desc = { ent-BaseCartridgePistol.desc } 
+ent-CartridgeVector45AP = патрон (.45 ACP AP)
     .desc = { ent-BaseCartridgePistol.desc } 
diff --git a/...le/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl b/...le/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl
@@ -1,5 +1,11 @@
 ent-MagazineVector22 = магазин (.22 LR)
     .desc = До смешного большой магазин с до смешного маленькими и нелепыми патронами калибра .22 LR.
+ent-MagazineVector22Incendiary = магазин (.22 LR зажигательные)
+    .desc = { ent-MagazineVector22 .desc }
+ent-MagazineVector22Practice = магазин (.22 LR учебные)
+    .desc = { ent-MagazineVector22 .desc }
+ent-MagazineVector22Uranium = магазин (.22 LR урановые)
+    .desc = { ent-MagazineVector22 .desc }
 ent-MagazineVector22Empty = { ent-MagazineVector22 }
     .desc = { ent-BaseItem.desc }
     .suffix = Пустой
@@ -14,3 +20,5 @@ ent-MagazineVector45Practice = магазин (.45 ACP учебные)
     .desc = { ent-MagazineVector45 .desc }
 ent-MagazineVector45Uranium = магазин (.45 ACP урановые)
     .desc = { ent-MagazineVector45 .desc }
+ent-MagazineVector45AP = магазин (.45 ACP AP)
+    .desc = { ent-MagazineVector45 .desc }
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -6,11 +6,13 @@
     WeaponSniperMosin: 10
     WeaponSniperRepeater: 10
     WeaponSubMachineGunVector45: 10
+    WeaponSubMachineGunVector22: 10
     MagazineBoxLightRifle: 10
     MagazineBoxLightRiflePractice: 10
     MagazineBoxVector22: 10     #FrontierCorvax
+    MagazineBoxVector22Practice: 10
     MagazineBoxVector45: 10
-    MagazineVector45Practice: 10
+    MagazineBoxVector45Practice: 10
 #    MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber
     WeaponShotgunDoubleBarreled: 10
     BoxShotgunSlug: 10

diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml
@@ -73,6 +73,21 @@
       map: ["enum.GunVisualLayers.Mag"]
     - state: uranium
 
+- type: entity #FrontierCorvax
+  parent: MagazineBoxVector45
+  id: MagazineBoxVector45AP
+  name: ammunition box (.45 ACP AP)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector45AP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: piercing
+
 - type: entity #FrontierCorvax
   parent: BaseItem
   id: MagazineBoxVector22
@@ -84,7 +99,7 @@
       tags:
         - CartridgeVector22
     proto: CartridgeVector22
-    capacity: 60
+    capacity: 70
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -93,7 +108,7 @@
   - type: Sprite
     sprite: Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi
     layers:
-    - state: 22LR
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
@@ -102,3 +117,48 @@
     steps: 2
     zeroVisible: false
   - type: Appearance
+
+- type: entity #FrontierCorvax
+  parent: MagazineBoxVector22
+  id: MagazineBoxVector22Incendiary
+  name: ammunition box (.22 LR incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector22Incendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
+
+- type: entity #FrontierCorvax
+  parent: MagazineBoxVector22
+  id: MagazineBoxVector22Practice
+  name: ammunition box (.22 LR practice)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector22Practice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: practice
+
+- type: entity #FrontierCorvax
+  parent: MagazineBoxVector22
+  id: MagazineBoxVector22Uranium
+  name: ammunition box (.22 LR uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector22Uranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium
diff --git a/...s/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml b/...s/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml
@@ -9,6 +9,51 @@
   - type: CartridgeAmmo
     proto: BulletVector22
 
+- type: entity #FrontierCorvax
+  id: CartridgeVector22Incendiary
+  name: cartridge (.22 LR incendiary)
+  parent: CartridgeVector22
+  components:
+  - type: CartridgeAmmo
+    proto: BulletVector22Incendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
+
+- type: entity #FrontierCorvax
+  id: CartridgeVector22Practice
+  name: cartridge (.22 LR practice)
+  parent: CartridgeVector22
+  components:
+  - type: CartridgeAmmo
+    proto: BulletVector22Practice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
+
+- type: entity #FrontierCorvax
+  id: CartridgeVector22Uranium
+  name: cartridge (.22 LR uranium)
+  parent: CartridgeVector22
+  components:
+  - type: CartridgeAmmo
+    proto: BulletVector22Uranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
+
 - type: entity #FrontierCorvax
   id: CartridgeVector45
   name: cartridge (.45 ACP)
@@ -64,3 +109,18 @@
       - state: tip
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#65fe08"
+
+- type: entity #FrontierCorvax
+  id: CartridgeVector45AP
+  name: cartridge (.45 ACP AP)
+  parent: CartridgeVector45
+  components:
+  - type: CartridgeAmmo
+    proto: BulletVector45AP
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#330707"
diff --git a/...types/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml b/...types/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml
@@ -13,7 +13,7 @@
     whitelist:
       tags:
         - CartridgeVector22
-    capacity: 25
+    capacity: 33
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -44,6 +44,48 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
 
+- type: entity #FrontierCorvax
+  id: MagazineVector22Incendiary
+  name: magazine (.22 LR incendiary)
+  parent: MagazineVector22
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector22Incendiary
+  - type: Sprite
+    layers:
+    - state: incendiary
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity #FrontierCorvax
+  id: MagazineVector22Practice
+  name: magazine (.22 LR practice)
+  parent: MagazineVector22
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector22Practice
+  - type: Sprite
+    layers:
+    - state: practice
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity #FrontierCorvax
+  id: MagazineVector22Uranium
+  name: magazine (.22 LR uranium)
+  parent: MagazineVector22
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector22Uranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 - type: entity #FrontierCorvax
   id: MagazineVector45
   name: magazine (.45 ACP)
@@ -95,6 +137,8 @@
   name: magazine (.45 ACP incendiary)
   parent: MagazineVector45
   components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector45Incendiary
   - type: Sprite
     layers:
     - state: incendiary
@@ -107,6 +151,8 @@
   name: magazine (.45 ACP practice)
   parent: MagazineVector45
   components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector45Practice
   - type: Sprite
     layers:
     - state: practice
@@ -119,9 +165,25 @@
   name: magazine (.45 ACP uranium)
   parent: MagazineVector45
   components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector45Uranium
   - type: Sprite
     layers:
     - state: uranium
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity #FrontierCorvax
+  id: MagazineVector45AP
+  name: magazine (.45 ACP AP)
+  parent: MagazineVector45
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeVector45AP
+  - type: Sprite
+    layers:
+    - state: piercing
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]