Merge pull request #231 from Succuberry/Resources

Околофинальные правки.
Corvax-Frontier · May 30, 2024 · 5db4115 · 5db4115
2 parents 1490853 + af1dcd5
commit 5db4115
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 26 deletions.
diff --git a/Resources/Locale/ru-RU/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/_NF/ghost/roles/ghost-role-component.ftl
@@ -5,6 +5,8 @@ ghost-role-information-clippy-name = Клиппи
 ghost-role-information-clippy-description = Представитель станции, преданный работник, пахнет картоном и бумагой.
 ghost-role-information-clarpy-name = Кларпи
 ghost-role-information-clarpy-description = Заблокируйте вашу почту! Разыскивается NanoTrasen за преступления против мышей.
+ghost-role-information-cappy-name = Коппи
+ghost-role-information-cappy-description = Перестаньте сопротивляться! Сертифицирован по летальной и оборонительной тактике.
 ghost-role-information-crispy-name = Хрустик
 ghost-role-information-crispy-description = Ты будешь гореть в аду.
 ghost-role-information-mistake-name = ?????

diff --git a/Resources/Locale/ru-RU/corvax/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/corvax/_NF/store/uplink-catalog.ftl
@@ -2,3 +2,5 @@ uplink-security-vector-magazines-name = Магазины для Вектора .
 uplink-security-vector-magazines-desc = Заводские магазины со стандартными патронами для Вектора .45ACP.
 uplink-security-vector-name = Вектор (.45)
 uplink-security-vector-desc = Гражданская версия уже легендарного и забытого пистолета-пулемёта. Использует патроны калибра .45ACP. Автоматический огонь в комплект не входит.
+uplink-security-magazine-magnum-name = Магазин для N1984
+uplink-security-magazine-magnum-desc = Пистолетный магазин калибра .45 магнум.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/mobs/npcs/pets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/mobs/npcs/pets.ftl
@@ -2,5 +2,7 @@ ent-MobCatClippy = Клиппи
     .desc = Лучший помощник при заполнении документации.
 ent-MobCatClarpy = Кларпи
     .desc = Первый кот, самостоятельно выполнивший контракт.
+ent-MobCatCappy = Коппи
+    .desc = Первый кот, которому удалось выстрелить из пистолета.
 ent-MobCatMistake = Ошибкот
     .desc = ???
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/spawners/mobs.ftl
@@ -2,3 +2,5 @@ ent-SpawnMobCatClippy = Спавнер Клиппи
     .desc = { ent-MarkerBase.desc }
 ent-SpawnMobCatClarpy = Спавнер Кларпи
     .desc = { ent-MarkerBase.desc }
+ent-SpawnMobCatCappy = Спавнер Коппи
+    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/boxes/ammunition.ftl
@@ -1,2 +1,4 @@
-ent-BoxMagazineVector45 = коробка магазинов .45 APC
-    .desc = Полная коробка магазинов .45 APC.
+ent-BoxMagazineVector45 = Коробка магазинов .45 ACP
+    .desc = Полная коробка магазинов .45 APC.
+ent-BoxMagazineVector22 = Коробка магазинов .22 LR
+    .desc = Полная коробка магазинов .22 LR.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -5,14 +5,13 @@
     WeaponLaserGun: 10
     WeaponSniperMosin: 10
     WeaponSniperRepeater: 10
-    WeaponSubMachineGunVector45: 10
-    WeaponSubMachineGunVector22: 10
+    WeaponSubMachineGunVector45: 3 #FrontierCorvax
     MagazineBoxLightRifle: 10
     MagazineBoxLightRiflePractice: 10
-    MagazineBoxVector22: 10     #FrontierCorvax
-    MagazineBoxVector22Practice: 10
-    MagazineBoxVector45: 10
-    MagazineBoxVector45Practice: 10
+    MagazineVector45: 5 #FrontierCorvax
+    MagazineVector45Practice: 10 #FrontierCorvax
+    MagazineBoxVector45: 5 #FrontierCorvax
+    MagazineBoxVector45Practice: 10 #FrontierCorvax
 #    MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber
     WeaponShotgunDoubleBarreled: 10
     BoxShotgunSlug: 10

diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Boxes/ammunition.yml
@@ -1,10 +1,21 @@
 - type: entity
-  name: box of magazines .45ACP
+  name: box of magazines .45 ACP
   parent: BoxMagazine
   id: BoxMagazineVector45
-  description: A box full of magazines .45ACP.
+  description: A box full of magazines .45 ACP.
   components:
   - type: StorageFill
     contents:
       - id: MagazineVector45
         amount: 3
+
+- type: entity
+  name: box of magazines .22 LR
+  parent: BoxMagazine
+  id: BoxMagazineVector22
+  description: A box full of magazines .22 LR.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineVector22
+        amount: 3
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
@@ -9,7 +9,7 @@
       tags:
         - CartridgeVector45
     proto: CartridgeVector45
-    capacity: 25
+    capacity: 40
   - type: Item
     size: Small
   - type: ContainerContainer

diff --git a/...urces/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml b/...urces/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml
@@ -20,7 +20,7 @@
     damage:
       types:
         Blunt: 3
-        Heat: 6
+        Heat: 3
 
 - type: entity #FrontierCorvax
   id: BulletVector22Practice
@@ -44,7 +44,7 @@
       types:
         Piercing: 3
         Blunt: 3
-        Radiation: 9
+        Radiation: 8
 
 - type: entity #FrontierCorvax
   id: BulletVector45
@@ -69,7 +69,7 @@
     damage:
       types:
         Blunt: 3
-        Heat: 14
+        Heat: 11
 
 - type: entity #FrontierCorvax
   id: BulletVector45Practice

diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/SMGs/vector.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/SMGs/vector.yml
@@ -11,6 +11,8 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: Huge
   - type: Clothing
     sprite: Corvax/Objects/Weapons/Guns/SMGs/vector22.rsi
     quickEquip: false
@@ -68,7 +70,9 @@
     - suitStorage
     - Belt
   - type: Gun
-    fireRate: 3.8
+    minAngle: 2
+    maxAngle: 8
+    fireRate: 4.2
     selectedMode: SemiAuto
     soundGunshot:
       path: /Audio/Corvax/Weapons/Guns/Gunshots/Vector45.ogg

diff --git a/Resources/Prototypes/Corvax/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/Corvax/_NF/Catalog/security_uplink_catalog.yml
@@ -14,16 +14,16 @@
         tags:
           - SecurityUplink
 
-- type: listing
-  id: UplinkSecurityVector45 
-  name:  uplink-security-vector-name
-  description: uplink-security-vector-desc
-  productEntity: WeaponSubMachineGunVector45
-  icon: { sprite: Corvax/Objects/Weapons/Guns/SMGs/vector45.rsi, state: icon }
+- type: listing 
+  id: UplinkMagazineMagnum
+  name: uplink-security-magazine-magnum-name
+  description: uplink-security-magazine-magnum-desc
+  productEntity: MagazineMagnum
+  icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red }
   cost:
-    FrontierUplinkCoin: 7
+    FrontierUplinkCoin: 2
   categories:
-    - UplinkSecurityWeapons
+    - UplinkSecurityAmmo
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -173,6 +173,12 @@
       - ClothingOuterHardsuitEVA # Frontier
   - type: EmagLatheRecipes
     emagStaticRecipes:
+      - MagazineVector22 #CorvaxFrontier
+      - MagazineVector22Empty #CorvaxFrontier
+      - MagazineVector45 #CorvaxFrontier
+      - MagazineVector45Empty #CorvaxFrontier
+      - MagazineBoxVector45 #CorvaxFrontier
+      - MagazineBoxVector22 #CorvaxFrontier
       - BoxLethalshot
       - BoxShotgunFlare
       - MagazineBoxLightRifle
@@ -199,6 +205,14 @@
       - GrenadeBlast
       - GrenadeEMP
       - GrenadeFlash
+      - MagazineBoxVector22Incendiary #CorvaxFrontier
+      - MagazineBoxVector22Uranium #CorvaxFrontier
+      - MagazineVector22Incendiary #CorvaxFrontier
+      - MagazineVector22Uranium #CorvaxFrontier
+      - MagazineBoxVector45Incendiary #CorvaxFrontier
+      - MagazineBoxVector45Uranium #CorvaxFrontier
+      - MagazineVector45Incendiary #CorvaxFrontier
+      - MagazineVector45Uranium #CorvaxFrontier
       - MagazineBoxLightRifleIncendiary
       - MagazineBoxLightRifleUranium
       - MagazineBoxMagnumIncendiary

diff --git a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/boxes.yml
@@ -95,7 +95,8 @@
     rarePrototypes:
       - BoxMagazinePistolCaselessRifle
       - BoxMagazineLightRifle
-      - BoxMagazineMagnumSubMachineGun
+      - BoxMagazineVector22
+      - BoxMagazineVector45
       - BoxMagazinePistolSubMachineGunTopMounted
       - BoxMagazinePistol
       - BoxMagazinePistolHighCapacity

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
@@ -99,7 +99,6 @@
         color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier
     - WeaponCaseShortMk58Expedition
     - WeaponCaseShortMk58Expedition
     - WeaponCaseShortDeckardExpedition
@@ -134,6 +133,8 @@
         color: red
   - type: RandomSpawner
     prototypes:
+    - WeaponCaseWeaponSubMachineGunVector45Expedition #CorvaxFrontier
+    - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier
     - WeaponCaseLongDrozdExpedition
     - WeaponCaseLongWT550Expedition
     - WeaponCaseLongAtreidesExpedition
@@ -143,7 +144,6 @@
     chance: 0.75
     offset: 0.0
     rarePrototypes:
-    - WeaponCaseWeaponSubMachineGunVector45Expedition #CorvaxFrontier
     - WeaponCaseLongAkExpedition
     - WeaponCaseLongLecterExpedition
     - WeaponCaseLongHristovExpedition