21(Это отсылка, а не кол-во оружия) Guns update (#287)

Lost-Paradise-Project · Oct 19, 2024 · 664c1a4 · 664c1a4
1 parent d4ee1bf
commit 664c1a4
Show file tree

Hide file tree

Showing 48 changed files with 480 additions and 72 deletions.
diff --git a/...ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/box/antimateriel.ftl b/...ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/box/antimateriel.ftl
@@ -0,0 +1,4 @@
+ent-LPPMagazineBoxAntiMaterielNonLethal = ammunition box (.60 Non-Lethal)
+    .desc = { ent-BaseMagazineBoxAntiMateriel.desc }
+ent-LPPMagazineBoxAntiMaterielCocnterePiercing = ammunition box (.60 Cocntere-Piercing)
+    .desc = { ent-BaseMagazineBoxAntiMateriel.desc }
diff --git a/...otypes/_lostparadise/entities/objects/weapons/guns/ammunition/cartridges/LPPCartridge.ftl b/...otypes/_lostparadise/entities/objects/weapons/guns/ammunition/cartridges/LPPCartridge.ftl
@@ -24,3 +24,7 @@ ent-LPPCartridgeMinigunAP = bullet (.10 rifle AP)
     .desc = { ent-LPPBaseCartridgeMinigun.desc }
 ent-LPPCartridgeMinigunUranium = bullet (.10 rifle uranium)
     .desc = { ent-LPPBaseCartridgeMinigun.desc }
+ent-LPPCartridgeAntiMaterielNonLethal = cartridge (.60 Non-lethal)
+    .desc = { ent-CartridgeAntiMateriel.desc }
+ent-LPPCartridgeAntiMaterielCP = cartridge (.60 Cocntere-Piercing)
+    .desc = { ent-CartridgeAntiMateriel.desc }
diff --git a/...ototypes/_lostparadise/entities/objects/weapons/guns/ammunition/projectile/LPPBullets.ftl b/...ototypes/_lostparadise/entities/objects/weapons/guns/ammunition/projectile/LPPBullets.ftl
@@ -20,3 +20,7 @@ ent-LPPBulletMinigunAP = minigun bullet (.10 rifle AP)
     .desc = { ent-BulletHeavyRifle.desc }
 ent-LPPBulletMinigunUranium = minigun bullet (.10 rifle uranium)
     .desc = { ent-BaseBulletPractice.desc }
+ent-LPPBulletAntiMaterielNonlethal = bullet (.60 anti-materiel Non-lethal)
+    .desc = { ent-BaseBullet.desc }
+ent-LPPBulletAntiMaterielCP = bullet (.60 Concrete projectile)
+    .desc = { ent-BaseBullet.desc }
diff --git a/.../en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/pistols/pistols.ftl b/.../en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -16,3 +16,5 @@ ent-LPPWeaponPistolMaria = maria
     .desc = A very iconic, to some extent acceptable weapon, looking at it, you were exposed to someone else's presence. Uses .35 auto ammo.
 ent-LPPWeaponPistolninemile = HM34
     .desc = An acceptable-medium quality pistol manufactured by a subsidiary of NanoTrasen. Uses .35 auto ammo.
+ent-LPPWeaponPistolPMm = PMm
+    .desc = Widely used in service of USSP pistol now repainted and used by some old-school securities. Uses .38 scecial ammo.
diff --git a/...US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/revolvers/revolvers.ftl b/...US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -8,10 +8,18 @@ ent-LPPWeaponRevolverColtspecial = Colt Special
     .desc = Uses .45 magnum bullets
 ent-LPPWeaponRevolverAmina = scarlet lawyer
     .desc = Used by Amina Ignatieva, in case of "important litigation", the recoil of this weapon is so lethal that a person can barely stand on his feet. Uses .60 anti-materiel rounds.
+    .suffix = Non-Lethal
+ent-LPPWeaponRevolverAminaLethal = scarlet lawyer
+    .desc = Used by Amina Ignatieva, in case of "important litigation", the recoil of this weapon is so lethal that a person can barely stand on his feet. Uses .60 anti-materiel rounds.
+    .suffix = Lethal
 ent-LPPWeaponRevolverInspectorCollection = collection inspector
     .desc = Basically, this is given for special merits before the law, order, and professionalism. Uses .45 magnum cartridges.
+ent-LPPWeaponRevolverJudgeLethal = Judge
+    .desc = There is only one sentence with this revolver - death, the recoil of this weapon is so lethal that a person can hardly stand on his feet. Uses .60 anti-materiel rounds.
+    .suffix = Lethal
 ent-LPPWeaponRevolverJudge = Judge
     .desc = There is only one sentence with this revolver - death, the recoil of this weapon is so lethal that a person can hardly stand on his feet. Uses .60 anti-materiel rounds.
+    .suffix = NonLethal
 ent-LPPPantherBase = LPPPantherBase
     .desc = A fast revolver for quick decision making. Uses .45 magnum cartridges.
 ent-LPPWeaponRevolverPanther = panther

diff --git a/.../en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Snipers.ftl b/.../en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Snipers.ftl
@@ -0,0 +1,8 @@
+ent-LPPBaseWeaponLeverSniper = BaseWeaponSniperLever
+    .desc = A rooty tooty point and shooty.
+ent-LPPWeaponSniperLeverPravoved = Pravoved
+    .desc = See you soon... Space cowboy... Uses .45 magnum bullets
+ent-LPPBaseWeaponSniper = LPPBaseWeaponSniper
+    .desc = A rooty tooty point and shooty.
+ent-LPPWeaponGoliath = Goliath
+    .desc = Specialised "tool" for breaching . Uses .60 anti-materiel ammo.
diff --git a/...ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/box/antimateriel.ftl b/...ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/box/antimateriel.ftl
@@ -0,0 +1,4 @@
+ent-LPPMagazineBoxAntiMaterielNonLethal = Коробка патронов (.60 Нелетальные)
+    .desc = { ent-BaseMagazineBoxAntiMateriel.desc }
+ent-LPPMagazineBoxAntiMaterielCocnterePiercing = Коробка патронов (.60 Бетонобойные)
+    .desc = { ent-BaseMagazineBoxAntiMateriel.desc }
diff --git a/...otypes/_lostparadise/entities/objects/weapons/guns/ammunition/cartridges/LPPCartridge.ftl b/...otypes/_lostparadise/entities/objects/weapons/guns/ammunition/cartridges/LPPCartridge.ftl
@@ -24,3 +24,7 @@ ent-LPPCartridgeMinigunAP = Патрон (.10 винтовочные броне
     .desc = { ent-LPPBaseCartridgeMinigun.desc }
 ent-LPPCartridgeMinigunUranium = Патрон (.10 винтовочные урановые)
     .desc = { ent-LPPBaseCartridgeMinigun.desc }
+ent-LPPCartridgeAntiMaterielNonLethal = Патрон (.60 Нелетальный)
+    .desc = { ent-CartridgeAntiMateriel.desc }
+ent-LPPCartridgeAntiMaterielCP = Патрон (.60 Бетонобойный)
+    .desc = { ent-CartridgeAntiMateriel.desc }
diff --git a/...ototypes/_lostparadise/entities/objects/weapons/guns/ammunition/projectile/LPPBullets.ftl b/...ototypes/_lostparadise/entities/objects/weapons/guns/ammunition/projectile/LPPBullets.ftl
@@ -18,5 +18,9 @@ ent-LPPBulletMinigunPractice = Пуля (.10 винтовочная учебна
     .desc = { ent-BaseBulletPractice.desc }
 ent-LPPBulletMinigunAP = Пуля (.10 винтовочная бронебойные)
     .desc = { ent-BulletHeavyRifle.desc }
-ent-LPPBulletMinigunUranium = Пуляt (.10 винтовочная урановая)
+ent-LPPBulletMinigunUranium = Пуля (.10 винтовочная урановая)
     .desc = { ent-BaseBulletPractice.desc }
+ent-LPPBulletAntiMaterielNonlethal = Пуля (.60 Нелетальный)
+    .desc = { ent-BaseBullet.desc }
+ent-LPPBulletAntiMaterielCP = Пуля (.60 Бетонобойный)
+    .desc = { ent-BaseBullet.desc }
diff --git a/.../ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/pistols/pistols.ftl b/.../ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -16,3 +16,5 @@ ent-LPPWeaponPistolMaria = Мария
     .desc = Очень знаковое, в какой-то степение религиозное оружие, смотря на него вы чувствуете чье-то присутствие. Использует патроны калибра .35 авто.
 ent-LPPWeaponPistolninemile = HM34
     .desc = Пистолет приемлемо-среднего качества, производимый дочерней компанией NanoTrasen. Использует патроны калибра .35 авто.
+ent-LPPWeaponPistolPMm = ПМм
+    .desc = Широко использовавшийся на вооружении СССП пистолет сейчас перекрашен и используется некоторыми офицерами СБ старой школы. Использует патроны .38 специальные.
diff --git a/...RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/revolvers/revolvers.ftl b/...RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -8,10 +8,18 @@ ent-LPPWeaponRevolverColtspecial = Кольт спешл
     .desc = Гравированный кольт. Гравировка, конечно, не даёт никакого тактического преимцущества. Использует патроны .45 калибра
 ent-LPPWeaponRevolverAmina = Алый адвокат
     .desc = Используется Аминой Игнатьевой, в случае "Важных судебных разбирательств" Отдача от этого орудия настолько сильная, что тяжело устоять на ногах. Использует патроны .60 антиматериальный.
+    .suffix = Нелетальный
+ent-LPPWeaponRevolverAminaLethal = Алый адвокат
+    .desc = Используется Аминой Игнатьевой, в случае "Важных судебных разбирательств" Отдача от этого орудия настолько сильная, что тяжело устоять на ногах. Использует патроны .60 антиматериальный.
+    .suffix = Летальный
 ent-LPPWeaponRevolverInspectorCollection = Коллекционный инспектор
     .desc = Обычно, его дают за заслуги перед законом и профессионализм. Использует патроны 45 калибра.
+ent-LPPWeaponRevolverJudgeLethal = Судья
+    .desc = С этим револьвером приговор только один - смерть, отдача этого оружия настолько смертельная, что человек едва может стоять на ногах. Использует антиматериальные снаряды калибра .60.
+    .suffix = Летальный
 ent-LPPWeaponRevolverJudge = Судья
     .desc = С этим револьвером приговор только один - смерть, отдача этого оружия настолько смертельная, что человек едва может стоять на ногах. Использует антиматериальные снаряды калибра .60.
+    .suffix = Нелетальный
 ent-LPPPantherBase = Основа пантеры
     .desc = Быстрый револьвер для быстрых решений. Использует патроны .45 калибра.
 ent-LPPWeaponRevolverPanther = Пантера

diff --git a/.../ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Snipers.ftl b/.../ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/snipers/Snipers.ftl
@@ -0,0 +1,6 @@
+
+
+ent-LPPBaseWeaponSniper = LPPBaseWeaponSniper
+    .desc = A rooty tooty point and shooty.
+ent-LPPWeaponGoliath = Голиаф
+    .desc = Специализированный "инструмент" для ликвидации преград. Использует .60 антиматериальные.
diff --git a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml b/Resources/Prototypes/CharacterItemGroups/securityGroups.yml
@@ -151,6 +151,8 @@
       id: LoadoutSecurityCombatKnife
     - type: loadout
       id: LoadoutSecurityFlash
+    - type: loadout
+      id: LoadoutSecurityCP
     - type: loadout
       id: LoadoutSecurityAM
     - type: loadout
@@ -262,8 +264,6 @@
       id: LoadoutSecurityLaserKomissar
     - type: loadout
       id: LoadoutSecurityJudge
-    - type: loadout
-      id: LoadoutSecurityAmina
 
 - type: characterItemGroup
   maxItems: 1

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -195,15 +195,15 @@
     startingCharge: 800
   - type: ProjectileBatteryAmmoProvider
     proto: BulletDisabler
-    fireCost: 50
+    fireCost: 25
   - type: EnergyGun
     fireModes:
     - proto: BulletDisabler
-      fireCost: 50
+      fireCost: 25
       name: дизейблер
       state: disabler
     - proto: BulletEnergyGunLaser
-      fireCost: 100
+      fireCost: 40
       name: летальный
       state: lethal
   - type: MagazineVisuals

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -25,6 +25,8 @@
     slots:
     - suitStorage
     - Belt
+  - type: UseDelay
+    delay: 0
   - type: Gun
     fireRate: 6
     selectedMode: SemiAuto

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -31,7 +31,7 @@
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
     fireOnDropChance: 0.5
   - type: UseDelay
-    delay: 0.66
+    delay: 0
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -81,7 +81,7 @@
     whitelist:
       tags:
       - CartridgeAntiMateriel
-    capacity: 5
+    capacity: 10
     proto: CartridgeAntiMateriel
   - type: Telescope
 

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -777,6 +777,11 @@
       #LPP
       - LPPMagazineMagnumSubMachineGun
       - LPPMagazineBoxMinigun
+      - LPPMagazineBoxAntiMaterielNL
+      - LPPMagazineBoxAntiMaterielCP
+      - LPPCartridgeAntiMaterielCP
+      - LPPCartridgeAntiMaterielNL
+      - LPPWeaponGoliathSniper
       # End of modified code
     dynamicRecipes:
       - LPPSpaceForgeCircuitBoardCMDAndSec

diff --git a/...es/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Box/antimateriel.yml b/...es/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Box/antimateriel.yml
@@ -0,0 +1,29 @@
+- type: entity
+  parent: BaseMagazineBoxAntiMateriel
+  id: LPPMagazineBoxAntiMaterielNonLethal
+  name: ammunition box (.60 Non-Lethal)
+  components:
+  - type: BallisticAmmoProvider
+    proto: LPPCartridgeAntiMaterielNonLethal
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
+
+- type: entity
+  parent: BaseMagazineBoxAntiMateriel
+  id: LPPMagazineBoxAntiMaterielCocnterePiercing
+  name: ammunition box (.60 Cocntere-Piercing)
+  components:
+  - type: BallisticAmmoProvider
+    proto: LPPCartridgeAntiMaterielCP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: piercing
diff --git a/...otypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/LPPCartridge.yml b/...otypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/LPPCartridge.yml
@@ -143,3 +143,51 @@
   - type: CartridgeAmmo
     proto: LPPBulletMinigunUranium
     deleteOnSpawn: true
+
+- type: entity
+  parent: CartridgeAntiMateriel
+  id: LPPCartridgeAntiMaterielNonLethal
+  name: cartridge (.60 Non-lethal)
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - CartridgeAntiMateriel
+  - type: CartridgeAmmo
+    proto: LPPBulletAntiMaterielNonlethal
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
+    - state: tip
+      map: [ "enum.AmmoVisualLayers.Tip" ]
+      color: "#32a2a8"
+  - type: Appearance
+  - type: SpentAmmoVisuals
+  - type: StaticPrice
+    price: 20
+
+- type: entity
+  parent: CartridgeAntiMateriel
+  id: LPPCartridgeAntiMaterielCP
+  name: cartridge (.60 Cocntere-Piercing)
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - CartridgeAntiMateriel
+  - type: CartridgeAmmo
+    proto: LPPBulletAntiMaterielCP
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
+    - state: tip
+      map: [ "enum.AmmoVisualLayers.Tip" ]
+      color: "#870e0e"
+  - type: Appearance
+  - type: SpentAmmoVisuals
+  - type: StaticPrice
+    price: 20
diff --git a/...ototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml b/...ototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml
@@ -167,3 +167,30 @@
       types:
         Piercing: 3
         Radiation: 8
+
+- type: entity
+  noSpawn: true
+  parent: BaseBullet
+  id: LPPBulletAntiMaterielNonlethal
+  name: bullet (.60 anti-materiel Non-lethal)
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 10
+  - type: StaminaDamageOnCollide
+    damage: 60
+
+- type: entity
+  noSpawn: true
+  parent: BaseBullet
+  id: LPPBulletAntiMaterielCP
+  name: bullet (.60 Concrete projectile)
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 20
+        Structural: 120
+  - type: StaminaDamageOnCollide
+    damage: 10
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -219,3 +219,19 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+
+- type: entity
+  name: PMm
+  parent: LPPWeaponPistolPMgufuded112
+  id: LPPWeaponPistolPMm
+  description: Widely used in service of USSP pistol now repainted and used by some old-school securities. Uses .38 scecial ammo.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Guns/Pistols/PMm.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Guns/Pistols/PMm.rsi
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -92,6 +92,7 @@
   name: scarlet lawyer
   parent: LPPBaseWeaponLeverSniper
   id: LPPWeaponRevolverAmina
+  suffix: Non-Lethal
   description: Used by Amina Ignatieva, in case of "important litigation", the recoil of this weapon is so lethal that a person can barely stand on his feet. Uses .60 anti-materiel rounds.
   components:
   - type: Sprite
@@ -103,8 +104,25 @@
       tags:
         - CartridgeAntiMateriel
     capacity: 3
-    proto: CartridgeAntiMateriel
+    proto: LPPCartridgeAntiMaterielNonLethal
 
+- type: entity
+  name: scarlet lawyer
+  parent: LPPBaseWeaponLeverSniper
+  id: LPPWeaponRevolverAminaLethal
+  suffix: Lethal
+  description: Used by Amina Ignatieva, in case of "important litigation", the recoil of this weapon is so lethal that a person can barely stand on his feet. Uses .60 anti-materiel rounds.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeAntiMateriel
+    capacity: 3
+    proto: CartridgeAntiMateriel
 
 - type: entity
   name: collection inspector
@@ -124,7 +142,8 @@
 - type: entity
   name: Judge
   parent: LPPBaseWeaponLeverSniper
-  id: LPPWeaponRevolverJudge
+  id: LPPWeaponRevolverJudgeLethal
+  suffix: Lethal
   description: There is only one sentence with this revolver - death, the recoil of this weapon is so lethal that a person can hardly stand on his feet. Uses .60 anti-materiel rounds.
   components:
   - type: Sprite
@@ -138,6 +157,24 @@
     capacity: 3
     proto: CartridgeAntiMateriel
 
+- type: entity
+  name: Judge
+  parent: LPPBaseWeaponLeverSniper
+  id: LPPWeaponRevolverJudge
+  suffix: NonLethal
+  description: There is only one sentence with this revolver - death, the recoil of this weapon is so lethal that a person can hardly stand on his feet. Uses .60 anti-materiel rounds.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeAntiMateriel
+    capacity: 3
+    proto: LPPCartridgeAntiMaterielNonLethal
+
 - type: entity
   name: LPPPantherBase
   parent: BaseItem