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

[PERSONALISATION] Шмотки Празата (Празат, ты заебал делать спрайты 48… #879

Merged
merged 3 commits into from
Dec 10, 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.
Binary file not shown.
32 changes: 32 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -439,3 +439,35 @@ ent-ADTClothingHandsAnagiriGloves = потертые боевые перчатк
ent-ADTClothingOuterCoatOktyabrina = темно-красное пальто
.desc = Тщательно сшитое женское пальто темно-красного цвета, сделанное на заказ и тщательно подогнанное по фигуре владелицы.
.suffix = { "Именное, Октябрина Зуева" }
ent-ADTClothingHeadHatPrazatBeret = берет главы Dar-Vaxed
.desc = Чёрный берет с оранжевой околышем, украшенный кокардой компании "Dar-Vaxed", изготовленной из серебра.
.suffix = { "Именное, 767sikon" }
ent-ADTClothingUniformJumpsuitPrazat = деловой костюм главы Dar-Vaxed
.desc = Стильный деловой костюм представителя компании Dar-Vaxed, выполненный в фирменной чёрно-оранжевом стиле компании.
.suffix = { "Именное, 767sikon" }
ent-ADTClothingOuterCoatPrazat = бронированная пальто главы Dar-Vaxed
.desc = Индивидуальное кожаное пальто представителя компании Dar-Vaxed, дополнительно усиленное внутренним слоем из ткани на основе парамидного волокна.
.suffix = { "Именное, 767sikon" }
ent-ADTWeaponPistolMaria = SNP-44 PDV «Maria»
.desc = Крайне тяжелый пистолет Special Non-standard Pistol .44 Magnum PDV «Мария», созданное по индивидуальному заказу в качестве персонального огнестрельного оружия. Длина ствола составляет 20 см, а отделка из титана придаёт пистолету характерный серебристо-белый цвет. На раме пистолета выполнена изящная гравировка из золота с именем «Мария.М.». Рукоять, выполненная из белого дерева, украшена надписью «Собственность Празат.Д.В.», что подчеркивает индивидуальность изделия.
.suffix = { "Именное, Пистолет, 767sikon" }
ent-ADTWeaponPistolPrazatHawk = SNP-44 PDV "Hawk"
.desc = Массивный крупнокалиберный пистолет, изготовленный по индивидуальному заказу, полное название которого - "Speziell Pistole .44 caliber Prazat-Dar-Vaxed". На пистолете виднеется гравировка "Maria, Sara, Sanreala: beauty in names, in hearts - eternal inspiration"
.suffix = { "Именное, Пистолет, 767sikon" }
ent-ADTWeaponCasePrazat = оружейный кейс Dar-Vaxed
.desc = Кейс для хранения личного оружия Празата выглядит довольно крепким, что позволяет законному владельцу использовать его в качестве оружия ближнего боя. На кейсе изображен логотип компании Dar-Vaxed.
.suffix = { "Именное, 767sikon" }
ent-ADTClothingBeltPrazatSheath = гидравлические ножны с кобурой
.desc = Лично разработан Празатом и предназначен для хранения цепного меча. Конструкция включает массивный стальной контейнер, оснащённый специальной гидравлической системой, обеспечивающей удобное и быстрое извлечение оружия в боевых условиях.
.suffix = { "Именное, 767sikon" }
ent-ADTWeaponMeleePrasatChainsword = Kst Mk. 01M
.desc = Kettenschwert Mark. 01 Modifiziert - экспериментальное оружие представляющий собой ничто иное, как крупный меч, оснащённый зубчатой цепью, проходящей по лезвию аналогично конструкции бензопилы. На цепи используется бритвенно-острые зубы, способные наносить серьёзный урон.
.suffix = { "Именное, 767sikon" }
Original file line number Diff line number Diff line change
Expand Up @@ -670,3 +670,59 @@
sprite: ADT/Personalization/oktyabrina_coat.rsi
- type: Clothing
sprite: ADT/Personalization/oktyabrina_coat.rsi

#ПразатДерВахед
- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatPrazatBeret
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/prazat_beret.rsi
- type: Clothing
sprite: ADT/Personalization/prazat_beret.rsi
- type: StaticPrice
price: 95

- type: entity
parent: ClothingOuterStorageFoldableBase
id: ADTClothingOuterCoatPrazat
name: Prazat coat
description: Prazat coat.
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/prazat_coat.rsi
- type: Clothing
sprite: ADT/Personalization/prazat_coat.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.7
Heat: 0.7
- type: ExplosionResistance
damageCoefficient: 0.9
- type: Storage
grid:
- 0,0,4,2

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformJumpsuitPrazat
name: Prazat clothing
description: Prazat clothin
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/prazat_suit.rsi
- type: Clothing
sprite: ADT/Personalization/prazat_suit.rsi
- type: Butcherable
butcheringType: Knife
spawned:
- id: MaterialDurathread1
amount: 3
- type: StaticPrice
price: 100
Original file line number Diff line number Diff line change
Expand Up @@ -1408,3 +1408,257 @@
- type: Sprite
sprite: ADT/Personalization/toys.rsi
state: plushie_hollowing

#ПразатДерВахед
- type: entity
name: SNP-44 PDV «Maria»
parent: WeaponPistolMk58
id: ADTWeaponPistolMaria
description: SNP-44 PDV «Maria»
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/maria_pistol.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Gun
minAngle: 1
maxAngle: 15
angleIncrease: 8
angleDecay: 9
fireRate: 3
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/ADT/Weapons/Guns/Gunshots/44-shot.ogg
soundEmpty:
path: /Audio/ADT/Weapons/Guns/Empty/44-empty.ogg
- type: Item
size: Small
shape:
- 0,0,3,0
- 0,1,0,1
sprite: ADT/Personalization/maria_pistol_inhand.rsi
- type: Clothing
sprite: ADT/Personalization/maria_pistol_inhand.rsi
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/ADT/Weapons/Guns/Cock/44-bolt-close.ogg
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineMagnum
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
priority: 2
whitelist:
tags:
- MagazineMagnum
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgeMagnum
priority: 1
whitelist:
tags:
- CartridgeMagnum
- type: Tag
tags:
- Sidearm
- ADTWeaponPistolMaria

- type: entity
name: SNP .44 cal auto PDV "Hawk"
parent: ADTWeaponPistolMaria
id: ADTWeaponPistolPrazatHawk
description: SNP .44 cal auto PDV "Hawk"
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/hawk_pistol.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Tag
tags:
- Sidearm
- ADTWeaponPistolPrazatHawk
- type: Item
sprite: ADT/Personalization/hawk_pistol_inhand.rsi
- type: Clothing
sprite: ADT/Personalization/hawk_pistol_inhand.rsi

- type: entity
id: ADTWeaponCasePrazat
name: weapon case Prazat
description: weapon case Prazat
parent: [BaseStorageItem, BaseBagOpenClose]
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/prazat_weaponcase.rsi
state: closed
layers:
- state: closed
map: ["closeLayer"]
- state: open
map: ["openLayer"]
visible: false
- state: pistolhawk
map: ["pistolhawk"]
visible: false
- state: pistolmaria
map: ["pistolmaria"]
visible: false
- type: Appearance
- type: Item
sprite: ADT/Personalization/prazat_weaponcase.rsi
size: Normal
- type: Storage
grid:
- 0,0,4,2
maxItemSize: Small
- type: StorageFill
contents:
- id: ADTWeaponPistolPrazatHawk
- id: ADTWeaponPistolMaria
- id: MagazineMagnum
- id: MagazineMagnum
- type: MeleeWeapon
damage:
types:
Blunt: 12
soundHit:
path: "/Audio/Weapons/smash.ogg"
- type: ItemCounter
count:
tags: [ADTWeaponPistolPrazatHawk, ADTWeaponPistolMaria]
composite: true
layerStates:
- pistolhawk
- pistolmaria

- type: entity
parent: ClothingBeltSheath
id: ADTClothingBeltPrazatSheath
name: Prazat sheath
description: Prazat sheath
suffix: Personal, 767sikon
components:
- type: Sprite
sprite: ADT/Personalization/prazat_sheath.rsi
- type: Clothing
sprite: ADT/Personalization/prazat_sheath.rsi
- type: Item
size: Ginormous
- type: ItemSlots
slots:
item:
name: Sabre
insertVerbText: sheath-insert-verb
ejectVerbText: sheath-eject-verb
insertSound: /Audio/Items/sheath.ogg
ejectSound: /Audio/Items/unsheath.ogg
whitelist:
tags:
- CaptainSabre
- type: ItemMapper
mapLayers:
sheath-sabre:
whitelist:
tags:
- CaptainSabre
- ADTWeaponMeleePrasatChainsword
- type: ContainerFill
containers:
item:
- ADTWeaponMeleePrasatChainsword
- type: Appearance
- type: ClothingSpeedModifier
walkModifier: 0.95
sprintModifier: 0.95

- type: entity
name: Prazat Chainsword
parent: BaseItem
id: ADTWeaponMeleePrasatChainsword
description: Prazat Chainsword
suffix: Personal, 767sikon
components:
- type: Sharp
- type: Sprite
sprite: ADT/Personalization/prazat_chainsword_icon.rsi
layers:
- state: icon
map: [ "enum.ToggleVisuals.Layer" ]
- state: icon_chainsword
visible: false
map: [ "chainsword" ]
- type: MeleeWeapon
attackRate: 1.6
damage:
types:
Blunt: 2.5
Structural: 5
soundHit:
path: "/Audio/Weapons/smash.ogg"
- type: Item
sprite: ADT/Personalization/prazat_chainsword.rsi
- type: DisarmMalus
- type: Tag
tags:
- ADTWeaponMeleePrasatChainsword
- CaptainSabre
- type: Appearance
- type: ItemToggle
soundActivate:
path: /Audio/Weapons/chainsawwield.ogg
params:
volume: -3
soundDeactivate:
path: /Audio/Weapons/chainsawwield.ogg
params:
volume: -3
- type: ItemToggleActiveSound
activeSound:
path: /Audio/Weapons/chainsawidle.ogg
- type: UseDelay
delay: 1.5
- type: ItemToggleMeleeWeapon
activatedSoundOnHit:
path: /Audio/Weapons/chainsaw.ogg
params:
variation: 0.250
activatedSoundOnHitNoDamage:
path: /Audio/Weapons/chainsaw.ogg
params:
variation: 0.250
volume: -10
activatedSoundOnSwing:
path: /Audio/Weapons/chainsaw.ogg
params:
variation: 0.125
activatedDamage:
types:
Slash: 15
Piercing: 2.5
Structural: 30
- type: ToggleableLightVisuals
spriteLayer: chainsword
inhandVisuals:
left:
- state: inhand-left-chainsword
right:
- state: inhand-right-chainsword
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
True: {state: icon_chainsword}
False: {state: icon}
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,13 @@

- type: Tag
id: ADTDogEmotes

#sponsor_items
- type: Tag
id: ADTWeaponPistolPrazatHawk

- type: Tag
id: ADTWeaponPistolMaria

- type: Tag
id: ADTWeaponMeleePrasatChainsword
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.
23 changes: 23 additions & 0 deletions Resources/Textures/ADT/Personalization/hawk_pistol.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat",
"size": {
"x": 48,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "bolt-open"
},
{
"name": "mag-0"
}
]
}
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
Loading