From 7e698e06d2e7e797deb1e071c132a94c787b4929 Mon Sep 17 00:00:00 2001 From: Succuberry Date: Tue, 28 May 2024 13:28:54 +0300 Subject: [PATCH] Fixes, add ammo variables --- .../weapons/guns/ammunition/boxes/vector.ftl | 16 ++- .../guns/ammunition/cartridges/vector.ftl | 8 ++ .../guns/ammunition/magazines/vector.ftl | 8 ++ .../Guns/Ammunition/Boxes/Vector/vector.yml | 64 ++++++++++- .../Ammunition/Cartridges/SMGs/SMGsAmmo.yml | 60 +++++++++++ .../Magazines/VectorMags/VectorMags.yml | 64 ++++++++++- .../Guns/Ammunition/Projectiles/SMGsAmmo.yml | 74 ++++++++++--- .../Corvax/Recipes/Lathes/security.yml | 101 ------------------ .../Entities/Structures/Machines/lathe.yml | 12 +++ Resources/Prototypes/Research/arsenal.yml | 6 ++ .../Random/dungeon_rng_items_armory.yml | 1 - .../Boxes/Vector/Vector22.rsi/22LR.png | Bin 335 -> 0 bytes .../Boxes/Vector/Vector22.rsi/base.png | Bin 483 -> 335 bytes .../Boxes/Vector/Vector22.rsi/emp.png | Bin 302 -> 0 bytes .../Boxes/Vector/Vector22.rsi/incendiary.png | Bin 264 -> 302 bytes .../Vector/Vector22.rsi/incendiarydisplay.png | Bin 472 -> 0 bytes .../Boxes/Vector/Vector22.rsi/meta.json | 12 --- .../Boxes/Vector/Vector22.rsi/practice.png | Bin 264 -> 301 bytes .../Boxes/Vector/Vector22.rsi/rubber.png | Bin 264 -> 0 bytes .../Boxes/Vector/Vector22.rsi/uranium.png | Bin 214 -> 301 bytes .../Vector/vector22mag.rsi/incendiary.png | Bin 0 -> 566 bytes .../Magazine/Vector/vector22mag.rsi/meta.json | 9 ++ .../Vector/vector22mag.rsi/practice.png | Bin 0 -> 592 bytes .../Vector/vector22mag.rsi/uranium.png | Bin 0 -> 596 bytes 24 files changed, 302 insertions(+), 133 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Recipes/Lathes/security.yml delete mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/22LR.png delete mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/emp.png delete mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiarydisplay.png delete mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/rubber.png create mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/incendiary.png create mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/practice.png create mode 100644 Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/uranium.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl index 27d9a8bc57a..c22c02d8cff 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl +++ b/Resources/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 } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl index 7e197f97f21..bb026be34b0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl @@ -1,5 +1,11 @@ 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 зажигательный) @@ -7,4 +13,6 @@ ent-CartridgeVector45Incendiary = патрон (.45 ACP зажигательны 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 } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl index fbba82f878b..099085d441f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl +++ b/Resources/Locale/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/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml index 525d2364609..3c986928004 100644 --- 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/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml index c10389f2693..b03ac80c96b 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml +++ b/Resources/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/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml index a41e4f828bc..a8e4276d0cb 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml +++ b/Resources/Prototypes/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"] diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml index 24bd9929973..87ae73a84dc 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml @@ -1,59 +1,109 @@ - type: entity #FrontierCorvax id: BulletVector22 - name: Пуля (.22 LR) + name: bullet (.22 LR) parent: BaseBullet noSpawn: true components: - type: Projectile damage: types: - Piercing: 7 + Piercing: 5 + Blunt: 4 + +- type: entity #FrontierCorvax + id: BulletVector22Incendiary + parent: BaseBulletIncendiary + name: bullet .22 LR (incendiary) + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + Heat: 6 + +- type: entity #FrontierCorvax + id: BulletVector22Practice + name: bullet .22 LR (practice) + parent: BaseBulletPractice + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 1 + +- type: entity #FrontierCorvax + id: BulletVector22Uranium + name: bullet .22 LR (uranium) + parent: BaseBulletUranium + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 3 Blunt: 3 + Radiation: 9 - type: entity #FrontierCorvax id: BulletVector45 - name: Пуля (.45 ACP) + name: bullet (.45 ACP) parent: BaseBullet noSpawn: true components: - type: Projectile damage: types: - Piercing: 15 - Blunt: 5 + Piercing: 17 + Blunt: 6 - type: entity #FrontierCorvax id: BulletVector45Incendiary parent: BaseBulletIncendiary - name: Пуля .45 ACP (Зажигательная) + name: bullet .45 ACP (incendiary) noSpawn: true components: - type: Projectile damage: types: Blunt: 3 - Heat: 16 + Heat: 14 - type: entity #FrontierCorvax id: BulletVector45Practice - name: Пуля .45 ACP (Учебная) + name: bullet .45 ACP (practice) parent: BaseBulletPractice noSpawn: true components: - type: Projectile damage: types: - Blunt: 1 + Blunt: 3 - type: entity #FrontierCorvax id: BulletVector45Uranium - name: Пуля .45 ACP (Урановая) + name: bullet .45 ACP (uranium) parent: BaseBulletUranium noSpawn: true components: - type: Projectile damage: types: - Piercing: 10 + Piercing: 6 Blunt: 3 - Radiation: 10 + Radiation: 14 + +- type: entity + id: BulletVector45AP + name: bullet (.45 ACP AP) + parent: BaseBulletAP + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 12 + Blunt: 3 # 20% decrease + penetrationScore: 2 + ignoreResistances: true diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml deleted file mode 100644 index 970bd239fc7..00000000000 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml +++ /dev/null @@ -1,101 +0,0 @@ -- type: latheRecipe #Vector - id: MagazineVector45 - result: MagazineVector45 - category: Ammo - completetime: 5 - materials: - Steel: 260 - -- type: latheRecipe #Vector - id: MagazineVector45Empty - result: MagazineVector45Empty - category: Ammo - completetime: 5 - materials: - Steel: 110 - -- type: latheRecipe #Vector - id: MagazineVector22 - result: MagazineVector22 - category: Ammo - completetime: 5 - materials: - Steel: 240 - -- type: latheRecipe #Vector - id: MagazineVector22Empty - result: MagazineVector22Empty - category: Ammo - completetime: 5 - materials: - Steel: 150 - -- type: latheRecipe #Vector - id: MagazineBoxVector22 - result: MagazineBoxVector22 - category: Ammo - completetime: 5 - materials: - Steel: 240 - -- type: latheRecipe #Vector - id: MagazineBoxVector45 - result: MagazineBoxVector45 - category: Ammo - completetime: 5 - materials: - Steel: 450 - -- type: latheRecipe #Vector - id: MagazineBoxVector45Uranium - result: MagazineBoxVector45Uranium - category: Ammo - completetime: 5 - materials: - Steel: 580 - Uranium: 580 - -- type: latheRecipe #Vector - id: MagazineBoxVector45Incendiary - result: MagazineBoxVector45Incendiary - category: Ammo - completetime: 5 - materials: - Steel: 340 - Plastic: 800 - -- type: latheRecipe #Vector - id: MagazineBoxVector45Practice - result: MagazineBoxVector45Practice - category: Ammo - completetime: 5 - materials: - Steel: 410 - Plastic: 310 - -- type: latheRecipe #Vector - id: MagazineVector45Practice - result: MagazineVector45Practice - category: Ammo - completetime: 5 - materials: - Steel: 160 - Plastic: 160 - -- type: latheRecipe #Vector - id: MagazineVector45Incendiary - result: MagazineVector45Incendiary - category: Ammo - completetime: 5 - materials: - Steel: 180 - Plastic: 450 - -- type: latheRecipe #Vector - id: MagazineVector45Uranium - result: MagazineVector45Uranium - category: Ammo - completetime: 5 - materials: - Steel: 300 - Uranium: 300 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e9f984f7e46..2e08ffeda12 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -914,6 +914,12 @@ - Zipties dynamicRecipes: #CorvaxFrontier Start + - MagazineBoxVector22Practice + - MagazineBoxVector22Incendiary + - MagazineBoxVector22Uranium + - MagazineVector22Practice + - MagazineVector22Incendiary + - MagazineVector22Uranium - MagazineBoxVector45Practice - MagazineBoxVector45Incendiary - MagazineBoxVector45Uranium @@ -1018,6 +1024,12 @@ - MagazineBoxVector45Practice - MagazineBoxVector45Uranium - MagazineBoxVector22 + - MagazineBoxVector22Incendiary + - MagazineBoxVector22Practice + - MagazineBoxVector22Uranium + - MagazineVector22Incendiary + - MagazineVector22Practice + - MagazineVector22Uranium - BoxLethalshot - BoxShotgunFlare - BoxShotgunSlug diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 5b89e5d2fda..e681edde32c 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -28,6 +28,8 @@ tier: 1 cost: 10000 recipeUnlocks: + - MagazineVector22Incendiary #CorvaxFrontier + - MagazineBoxVector22Incendiary #CorvaxFrontier - MagazineVector45Incendiary #CorvaxFrontier - MagazineBoxVector45Incendiary #CorvaxFrontier - BoxShotgunIncendiary @@ -63,6 +65,8 @@ tier: 1 cost: 5000 recipeUnlocks: + - MagazineBoxVector22Practice #CorvaxFrontier + - MagazineVector22Practice #CorvaxFrontier - MagazineBoxVector45Practice #CorvaxFrontier - MagazineVector45Practice #CorvaxFrontier - MagazineShotgunBeanbag @@ -80,6 +84,8 @@ tier: 1 cost: 7500 recipeUnlocks: + - MagazineBoxVector22Uranium #CorvaxFrontier + - MagazineVector22Uranium #CorvaxFrontier - MagazineBoxVector45Uranium #CorvaxFrontier - MagazineVector45Uranium #CorvaxFrontier - MagazineRifleUranium diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml index f50a7036135..db8be0d43c8 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml @@ -100,7 +100,6 @@ - type: RandomSpawner prototypes: - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier - - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier - WeaponCaseShortMk58Expedition - WeaponCaseShortMk58Expedition - WeaponCaseShortDeckardExpedition diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/22LR.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/22LR.png deleted file mode 100644 index a11d3aee7e7ad8d611fdf598864d57d9a4bed0c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbU6YQ1WTxFUWsrdJ~%(-1mK87+rmRbp(W}U^Jb6Ua!U9<|~ZC6i9 z4DvJs>ev|hDiTQXmjw9*|3?7~SMJPM2$bS1@Q5sCVBk9p!i>lBSEK+1CwRIzhFJLD zJ#~}sumX=u;3byiYybb>;Y&5{zVf|i!i1WBuljFM3zpsHyHe`8iLoSSg6M*JuFUpd z*T2@yKltLjV8$ug_jP>^lMT~e3T;UJuDpr6;oP~#32&GyO5V@i?6Rr+fwRN+1eZ-yKa`3GN|7tA;% z`@XKvVX|S`OQ8*^-<3CUH=H}yIN=R*MalcQn_V`QKX7*Vp5U^HKOvXHVyE%TDlK6K zmbuUEn(rjrZZQ=|X3T!SV8UMR2`BHV7u=C{@QTk2HL`uBDex5NI0jEwKbLh*2~7Zj CZ-#IH delta 468 zcmV;_0W1E`0^?Kw=$2kppm9j_i>6Z$2=z z+`5O;9c8gZ}C%tA&Tw@q8$L!2y)2BPv78C0uq1u>JnL& z6BPv@pP~a;dVnR!b=yyo>~olzcr^xjnn9{qYef_{z)c(g$_cf*ilr&$3{c|J2~X&T?tT;uA#-dZ%UIZ#h)!-SbqzAxv+__OsI%?>eP4 zn$K`fV1L8xQgoFeJhU(C~(-S^j+7Ao>22WQ%mvv4FO#s;&d$0fi diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiary.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiary.png index 226711c301a27937e5e8228fd391b0a489b0910c..124dd2a46b49aa3f23368d55c841c4a8820e43bc 100644 GIT binary patch delta 275 zcmV+u0qp*W0_Yc`}5E}-FwVZ5_;AsX=SipGxhaCTZ zpUeC|w~Gmk3B^Cf0O$~S2-4khWB_x>fLM+U2Gnv809yVP${YowU=)mkQ7{UI3SeLW Z0LGntMhMIUgA4!w002ovPDHLkV1jm)Y7GDY delta 236 zcmV_B22LXiV-S&rN|i~%R!Ezi330eqx%-!=dfs?nPmfD7GMi@Vl4-$BRdVC zXGxGlU@4!Npoi(Fngc)v!U`io!H(>Bsyl!b%c&X#Aj1l)YX9TQ^VmvKs)hhLt*cQ7 mjE2By2#kinXb6mk001X-c_EVbo!S5Z002ovPDHLkV1fVu+Gp_q diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiarydisplay.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiarydisplay.png deleted file mode 100644 index 1d8de97957ef2eb23d269a003d60aa48d14e6362..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn>6P)Px$l1W5CR9J=WmcL5^VHn3hiZn$-L|f<5WJO9#R96R~V=Xpoi?bBb-{24uI61Y~ z(wY>K1TLu&Hbfy_))47pOVis>+L=Gj_fTrM?{s%B_k2F@!*jd`cI?>s<2bCmluoDH zp6Rb|0zjFZXsfAdTGv`GD*~P1Q;PC+t?OMyh9Y2u1IUUv2MKrAc3VWI6ou2Xb1@Ww zUhqbqbltR$C4p}6^7w%i94yShj^86zMh~I(12lqV;2_z79lu8e)<&B5?%Hl!>y7Yy z;fBq?`e24I8dAlga)%c5l89Hi&(+&RWZ``aL_?}ra%I@q3scFa=pKERZz;Adi z^V}j*AM=rjS1rN8WC)`nRYbyDz!sHktOcISJmZ+(=IZ*PxeHl1n4AUCkSdlJrU96l z^8qkYjs7x@Hzk5jgR3=A9lx&I`x0{NT;9+AZi419+`m{C;2 zs{tr@$kW9!B*Hyef^~6%2#@rHg!O;qTNcLrVw!L?f1OdI;Yz;5mP;wj6H;w2zjLnS z2$-~#W0|_h0e&|NGC4 z{-1xF#FXsx(ch54ibbxeWV?*y0U0BOY0AxvTV+@prq#C^xgXR3ySJxlA(Mmz!;~9U WE8RcdeZ{~H^pK~kpUXO@geCyWbY|)R delta 236 zcmZ3>)WI}CrT(0!i(^QHdvc0I!U2l|-;8^#5=>ay{5gC+PWZupD$vq8Zo(7INg|I= zZBjTLd&T9zrRu!BjF*pCwIs1CMEAXMNRoA$$XpQF_hy3X^LWE8GIgz&EDn4#?y*WR zVQKT{@Oa|;i~m%hzS`4?Pc$cqJU+Ea;q=W=o&%Tc-^VaqK4R69#I6wC_r@Vf)@dSh zL1f>X3I6V827BVKwqKUpB-@bp^RSJz+fUE-11}klv9%sLFV4T>JwuW%`*O}G3x*Vf zUHKPl`MTL=Su&(CZc9+VRy4tC(`AOLX)Km3(>`@_R?VneWyz4Du*N`1GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3 zR|8P+kf)1dNQ8T`1nc4i5gzFY3G4sJw=9hL#Wdk){yL*Z!DB-Ef_bQmpo^6@aBmb0T~94nUfed)t`5*voP56(1IaNnb}cMQ-j-F z;WXossJf4zj5YYp6>c)xwHfu~*KKV6^4EEr%#k+6BwclBm5Nyhg~bf!{Z~Bx|Ne8M z|L5N(F(o^F^fzR%Vv%bq*)Ah_K*mU6nsPJaRvDItY4xo}?gur%?(Jz>$Rr`bka(!F W;p|+QN(OGAhdf>VT-G@yGywq9B4eun delta 186 zcmZ3>bd7O>O8s0<7srr@!^sH}tcw#wc*F$^Z6DSj`O@-#$*bfg)1GRdk#oGU{D}kz zgr(>uEa_&RpzAKEeo3)s%LWPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0n155K~z{r<(J8B z!Y~kqouwf11Y80)9+G3#V~3<*{$MK@Ldt2`HQB zkCLBRuh%7}>)*X4?zy>b~~5;UZ)^Y*8t7{{-)~DzlQ$afvGdF z*=!!BKM5_uhv9T!Hk(~plrGqZt3Iw!g(Jqf|Kkq*o!#%2kX_JfpgI4gNWBShpbu60 ziMIod_O2EH2~;I2U_26^hb77`V*A{j`Xwr{$33TeFhF5 zJ>m!64j}px`X{T^O75Hy{q2W>7EK0D@AAOmAfkWe{y=I+D}mYX_vYjC%Z|ng5M~{y z9GE}9*k+WY6?2f+w|6^-;=OHf5V@jEaR~9hz+b|cZyXr7bQOe7T>t<807*qoM6N<$ Eg3_}0WdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json index 3800ed4dd0d..1fe2f39459c 100644 --- a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json @@ -9,6 +9,15 @@ "states": [ { "name": "base" + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" }, { "name": "mag-1" diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/practice.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/practice.png new file mode 100644 index 0000000000000000000000000000000000000000..1fa3e9517d868413460358da982a0a8ff3dc9cb3 GIT binary patch literal 592 zcmV-W0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0p&?VK~z{r<(Erx zgD?z+je$^df@~5NoyoqtZhDTMp$F)dlT6on1EKmIkp~52n{>M9H>0s*oJiI$+eH0) z0&cw+kH=^tvK$?vAd9Q23IO#_+wImo=t6Vr%&qg$XryMd87v~_@P5KLCP;W^00EG% zNNb%>r&G09EEM(CWHK?&m&>Kf^ITB|dVP3j08ju}=>__19K(_%!O-3FHoOAh)rUk` zul_9gmGydEQWKs(bu%afHBINddMkzmKuM^$+lp0vc?AH+l6OMXABY+?Nz)V!6}&!S z>!IM9?Du;($Cgw@fuo@t=M1pkovUa4&7|FKho+Z@6yXrO0-%*i`b*C*SXJsRbOzu% zo%+-12j_aT+5Fg^Z8&Fue%MNX8|T2c2z!xkz+1!s=JWZTN4^F7us9;F*yV{~=OyW{ zJM@PIxD^kF1CRFOvkO{-uFwBCj!giz_yizgTY$hifLeP=Ul;v>YXHbHf zY4z1ZcR_>J`L+JEdZ(fWP64>4*9O-NND(+^!1{e4ilUPA4_B)dk6fYqA5BR5i~j?f zxMbimmk%7%AEG~Sl|UVjNA>ykWULN?`TYRivoCYVygsMKz{gAfE0=_I)N~L@1sIbR et~Kz-DD@3VH@qC!(vSuK0000IusL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/uranium.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..f220c71766077f9aba86dffb719f29ad99a398ee GIT binary patch literal 596 zcmV-a0;~OrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0qIFZK~z{r<(E5h z!Y~kqW!Z*-G8GNb`6j7Trp~0!X*fd;kaOf7zyWyM#`%9C^KfkIVKNl?W;83yf?e&u zl0f`>0&Tq*4u>=mTFMT{(Bh&f0)qZ=v)QN@O-OB>xpv;`^~7W{VT<6L-j5vT1QXsF zU;ywHNh#Cucr51gxj*SO$9R0>ccw&1OafRXYi~Xv-SIZ4&A)3!z%#2 z`Vi#h>Q9niSglq$On7=~rc(w=s?PQ5t>_W}l2GVwEmrmA6#yNZyaS{D#Hdk~!C*jx zf|o~bJr-P*-EK$c+>#>8cr-NQoB^$Oy zoB{kyqy9Mk=v=PX>tEZm4(ANui>>sxaZY@Tuocq{c#ScDBuQ>O>RYf4izDKKU7j@B zc@F($gZ^v*Z^iw7uSeVQ*#)&hm*;;R$0`6@d;&0HTY$tmfKq#tzApL`*9@f7=`^U* zANN0v#OjN??t%)n^Gp4)dZ(f$P64>4*9O-Nm?Ch_fc5WzD2j6EA1;?mJ#qo}KTQbz zjsF9xxMbiwS06a4-$j4oDuFm04&wdmL$xvp&EE&`JbO`x%