Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FN-fal и фиксы #146

Merged
merged 6 commits into from
Nov 22, 2023
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.
Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,11 @@ ent-WeaponRevolverPython357AP = Питон .357
ent-ADTWeaponPistolX01 = X-01 Мультифазовый энергетический пистолет
.desc = Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени.
.suffix = Пистолет

ent-ADTMagazineRifleFNFAL = Магазин 6.5х39 мм TSF
.desc = Магазин под патрон 6.5х39 мм, с вместимостью в 20 единиц.
.suffix = { "" }

ent-ADTGunRifleFNFAL = AR-6.5 "Свободоносец"
.desc = Автоматическая винтовка, разработанная дочерней компанией NanoTrasen, данная оружие стал одним из наиболее распространенных и широко используемых стрелковых оружий во второй половине 25 века. Свободоносец известен своей универсальностью, надежностью и высокой огневой мощью. Внешне очень схож на немало известную FN FAL, но конструктивно это два разные оружия, из-за этого он и был прозван "Свободоносец" или "Правая рука свободы".
.suffix = { "" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
- type: entity
name: FN FAL
parent: BaseItem
id: ADTGunRifleFNFAL
description: Rifles
components:
- type: Sprite
sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi
quickEquip: false
slots:
- Back
- suitStorage
- type: ChamberMagazineAmmoProvider
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: ADTMagazineRifleFNFAL
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
priority: 1
whitelist:
tags:
- ADTMagazineRifleFNFAL
gun_chamber:
name: Chamber
startingItem: CartridgeRifle
priority: 1
whitelist:
tags:
- CartridgeRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: StaticPrice
price: 500
- type: AmmoCounter
- type: Gun
fireRate: 7
selectedMode: Burst
availableModes:
#- FullAuto
- SemiAuto
- Burst
soundGunshot:
collection: FN_Fal_choot
- type: Item
size: Large



## рандомизатор звуков для разнообразия звуков выстрела
- type: soundCollection
id: FN_Fal_choot
files:
- /Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg
- /Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg
- /Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg
- /Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg

# Base mags
- type: entity
id: ADTBaseMagazineRifleFNFAL
name: "extended magazine (.20 rifle)"
parent: BaseItem
abstract: true
components:
- type: Tag
tags:
- ADTMagazineRifleFNFAL
- type: Item
size: Small
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- CartridgeRifle
capacity: 20
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.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

# Magazines FN_FAL
- type: entity
id: ADTMagazineRifleFNFAL
name: "extended magazine (.20 rifle)"
parent: ADTBaseMagazineRifleFNFAL
components:
- type: BallisticAmmoProvider
proto: CartridgeRifle
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
3 changes: 3 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1110,3 +1110,6 @@

- type: Tag
id: ADTExtMagazineRifle

- type: Tag
id: ADTMagazineRifleFNFAL
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat911 Approved for use ONLY on the Adventure Time project.",
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-1"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat911 Approved for use ONLY on the Adventure Time project.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-0"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading