Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Add new weapon #214

Merged
merged 9 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/corvax/_NF/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
uplink-security-vector-magazines-name = Магазины для Вектора .45
uplink-security-vector-magazines-desc = Заводские магазины со стандартными патронами для Вектора .45ACP.
uplink-security-vector-name = Вектор (.45)
uplink-security-vector-desc = Гражданская версия уже легендарного и забытого пистолета-пулемёта. Использует патроны калибра .45ACP. Автоматический огонь в комплект не входит.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-BoxMagazineVector45 = коробка магазинов .45 APC
.desc = Полная коробка магазинов .45 APC.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-MagazineBoxVector22 = коробка патронов (.22 LR)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxVector45 = коробка патронов (.45 APC)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxVector45Incendiary = коробка патронов (.45 APC зажигательные)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxVector45Practice = коробка патронов (.45 APC учебные)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxVector45Uranium = коробка патронов (.45 APC урановые)
.desc = { ent-BaseItem.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-CartridgeVector22 = патрон (.22 LR)
.desc = { ent-BaseCartridgePistol.desc }
ent-CartridgeVector45 = патрон (.45 APC)
.desc = { ent-BaseCartridgePistol.desc }
ent-CartridgeVector45Incendiary = патрон (.45 APC зажигательный)
.desc = { ent-BaseCartridgePistol.desc }
ent-CartridgeVector45Practice = патрон (.45 APC учебный)
.desc = { ent-BaseCartridgePistol.desc }
ent-CartridgeVector45Uranium = патрон (.45 APC урановый)
.desc = { ent-BaseCartridgePistol.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ent-MagazineVector22 = магазин (.22 LR)
.desc = { ent-BaseItem.desc }
ent-MagazineVector22Empty = { ent-MagazineVector22 }
.desc = { ent-BaseItem.desc }
.suffix = Пустой
ent-MagazineVector45 = магазин (.45 APC)
.desc = { ent-BaseItem.desc }
ent-MagazineVector45Empty = { ent-MagazineVector45 }
.desc = { ent-BaseItem.desc }
.suffix = Пустой
ent-MagazineVector45Incendiary = магазин (.45 APC зажигательные)
.desc = { ent-MagazineVector45 .desc }
ent-MagazineVector45Practice = магазин (.45 APC учебные)
.desc = { ent-MagazineVector45 .desc }
ent-MagazineVector45Uranium =магазин (.45 APC урановые)
.desc = { ent-MagazineVector45 .desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-WeaponSubMachineGunVector22 = Вектор (.22)
.desc = Вектор.
.suffix = Пистолет-пулемёт
ent-WeaponSubMachineGunVector45 = Вектор (.45 APC)
.desc = Гражданская версия уже легендарного и забытого пистолета-пулемёта. Использует патроны калибра .45 ACP. Автоматический огонь в комплект не входит.
.suffix = Пистолет-пулемёт
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
WeaponSniperRepeater: 10
MagazineBoxLightRifle: 10
MagazineBoxLightRiflePractice: 10
MagazineBoxVector22: 10 #FrontierCorvax
# MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber
WeaponShotgunDoubleBarreled: 10
BoxShotgunSlug: 10
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Corvax/Catalog/Fills/Boxes/ammunition.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
name: box of magazines .45ACP
parent: BoxMagazine
id: BoxMagazineVector45
description: A box full of magazines .45ACP.
components:
- type: StorageFill
contents:
- id: MagazineVector45
amount: 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
- type: entity
parent: BaseItem
id: MagazineBoxVector45
name: ammunition box (.45 APC)
components:
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- CartridgeVector45
proto: CartridgeVector45
capacity: 25
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector45.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
zeroVisible: false
- type: Appearance

- type: entity
parent: MagazineBoxVector45
id: MagazineBoxVector45Incendiary
name: ammunition box (.45 APC incendiary)
components:
- type: BallisticAmmoProvider
proto: CartridgeVector45Incendiary
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: incendiary

- type: entity
parent: MagazineBoxVector45
id: MagazineBoxVector45Practice
name: ammunition box (.45 APC practice)
components:
- type: BallisticAmmoProvider
proto: CartridgeVector45Practice
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: practice

- type: entity
parent: MagazineBoxVector45
id: MagazineBoxVector45Uranium
name: ammunition box (.45 APC uranium)
components:
- type: BallisticAmmoProvider
proto: CartridgeVector45Uranium
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: uranium

- type: entity
parent: BaseItem
id: MagazineBoxVector22
name: ammunition box (.22 LR)
components:
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- CartridgeVector22
proto: CartridgeVector22
capacity: 60
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi
layers:
- state: 22LR
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
zeroVisible: false
- type: Appearance
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
- type: entity #Vector
id: CartridgeVector22
name: cartridge (.22 LR)
parent: BaseCartridgePistol
components:
- type: Tag
tags:
- CartridgeVector22
- type: CartridgeAmmo
proto: BulletVector22

- type: entity #Vector
id: CartridgeVector45
name: cartridge (.45 APC)
parent: BaseCartridgePistol
components:
- type: Tag
tags:
- CartridgeVector45
- type: CartridgeAmmo
proto: BulletVector45

- type: entity
id: CartridgeVector45Incendiary
name: cartridge (.45 APC incendiary)
parent: CartridgeVector45
components:
- type: CartridgeAmmo
proto: BulletVector45Incendiary
- type: Sprite
layers:
- state: base
map: [ "enum.AmmoVisualLayers.Base" ]
- state: tip
map: [ "enum.AmmoVisualLayers.Tip" ]
color: "#ff6e52"

- type: entity
id: CartridgeVector45Practice
name: cartridge (.45 APC practice)
parent: CartridgeVector45
components:
- type: CartridgeAmmo
proto: BulletVector45Practice
- type: Sprite
layers:
- state: base
map: [ "enum.AmmoVisualLayers.Base" ]
- state: tip
map: [ "enum.AmmoVisualLayers.Tip" ]
color: "#dbdbdb"

- type: entity
id: CartridgeVector45Uranium
name: cartridge (.45 APC uranium)
parent: CartridgeVector45
components:
- type: CartridgeAmmo
proto: BulletVector45Uranium
- type: Sprite
layers:
- state: base
map: [ "enum.AmmoVisualLayers.Base" ]
- state: tip
map: [ "enum.AmmoVisualLayers.Tip" ]
color: "#65fe08"
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
- type: entity #Vector
id: MagazineVector22
name: magazine (.22 LR)
parent: BaseItem
components:
- type: Tag
tags:
- MagazineVector22
- type: BallisticAmmoProvider
proto: CartridgeVector22
mayTransfer: true
whitelist:
tags:
- CartridgeVector22
capacity: 25
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
zeroVisible: false
- type: Appearance

- type: entity
id: MagazineVector22Empty
parent: MagazineVector22
suffix: Empty
components:
- type: BallisticAmmoProvider
proto: null
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]

- type: entity #Vector
id: MagazineVector45
name: magazine (.45 APC)
parent: BaseItem
components:
- type: Tag
tags:
- MagazineVector45
- type: BallisticAmmoProvider
proto: CartridgeVector45
mayTransfer: true
whitelist:
tags:
- CartridgeVector45
capacity: 13
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector45mag.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
zeroVisible: false
- type: Appearance

- type: entity
id: MagazineVector45Empty
parent: MagazineVector45
suffix: Empty
components:
- type: BallisticAmmoProvider
proto: null
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]

- type: entity
id: MagazineVector45Incendiary
name: magazine (.45 APC incendiary)
parent: MagazineVector45
components:
- type: Sprite
layers:
- state: incendiary
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]

- type: entity
id: MagazineVector45Practice
name: magazine (.45 APC practice)
parent: MagazineVector45
components:
- type: Sprite
layers:
- state: practice
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]

- type: entity
id: MagazineVector45Uranium
name: magazine (.45 APC uranium)
parent: MagazineVector45
components:
- type: Sprite
layers:
- state: uranium
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
Loading
Loading