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

Обновление для ЯО #55

Merged
merged 1 commit into from
Jun 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.
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/SyndiGuns/usp_1.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/SyndiGuns/usp_2.ogg
Binary file not shown.
20 changes: 20 additions & 0 deletions Resources/Changelog/ChangelogSunrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,23 @@ Entries:
type: Fix
id: 38
time: '2024-06-09T22:14:50.302018+00:00'
- author: Babaev
changes:
- message: "\u0412 \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u044F\u0434\u0435\
\u0440\u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\
\u0438\u043A\u043E\u0432 \u043F\u043E\u044F\u0432\u0438\u043B\u043E\u0441\u044C\
\ \u043D\u043E\u0432\u043E\u0435 \u043E\u0440\u0443\u0436\u0438\u0435: \u041F\
\u0438\u0441\u0442\u043E\u043B\u0435\u0442-\u043F\u0443\u043B\u0451\u043C\u0435\
\u0442 SIAR-52, \u0422\u044F\u0436\u0451\u043B\u044B\u0439 \u043F\u0443\u043B\
\u0435\u043C\u0451\u0442 Cybersun, \u041B\u0430\u0437\u0435\u0440\u043D\u044B\
\u0439 \u043F\u0438\u0441\u0442\u043E\u043B\u0435\u0442 \u0421\u0438\u043D\u0434\
\u0438\u043A\u0430\u0442\u0430, UVL-21 \xAB\u0412\u0438\u0432\u0435\u0440\u043D\
\u0430\xBB, S-13 \xAB\u0427\u0451\u0440\u043D\u0430\u044F \u043C\u0430\u043C\
\u0431\u0430\xBB, AJ-100- \u0412\u044B\u0441\u043E\u043A\u043E\u0441\u043A\u043E\
\u0440\u043E\u0441\u0442\u0440\u0435\u043B\u044C\u043D\u044B\u0439 \u041F\u041F\
, MS-42 - \u0411\u043E\u043B\u0435\u0435 \u0441\u043E\u0432\u0435\u0440\u0448\
\u0435\u043D\u043D\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F \u041B\u0435\
\u043A\u0442\u0435\u0440\u0430."
type: Add
id: 39
time: '2024-06-10T17:12:10.931916+00:00'
12 changes: 12 additions & 0 deletions Resources/Locale/ru-RU/_sunrise/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
uplink-magazine-shotgun-name = Барабан (.50 дробь).
uplink-magazine-shotgun-desc = Барабан на 8 выстрелов для дробовика. Совместим с "Бульдогом".
uplink-magazine-lmg-name = Коробка патронов (.30 винтовочные)
uplink-magazine-lmg-desc = Коробка патронов на 100 выстрелов. Совместим с "L6-SAW".
uplink-grenade-frag-name = Осколочная граната
uplink-grenade-frag-desc = Осколочная граната. Совместима с "China-Lake".
uplink-grenade-blast-name = Фугасная граната
uplink-grenade-blast-desc = Фугасная граната. Совместима с "China-Lake".
uplink-hardsuit-syndie-commander-name = скафандр Командира Синдиката
uplink-hardsuit-syndie-commander-desc = Скафандр предназначеный для командиров отрядов Горлекса.
uplink-hardsuit-syndie-medic-name = скафандр Медика Синдиката
uplink-hardsuit-syndie-medic-desc = Скафандр предназначеный для боевых врачей отрядов Горлекса.
Original file line number Diff line number Diff line change
Expand Up @@ -978,3 +978,133 @@
- type: Tag
tags:
- HideContextMenu

# SUNRISE

- type: entity
name : syndie plasma
id: BulletSyndiPlasma
parent: BaseBullet
noSpawn: true
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: _Sunrise/SyndieGuns/red_projectile.rsi
layers:
- state: omnilaser
shader: unshaded
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
fly-by: *flybyfixture
- type: Ammo
- type: StaminaDamageOnCollide
damage: 1
- type: Projectile
impactEffect: BulletImpactEffectSyndiPlasma
damage:
types:
Heat: 12
soundHit:
collection: WeakHit

- type: entity
name : syndie plasma
id: BulletSyndiPlasma2
parent: BaseBullet
noSpawn: true
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: _Sunrise/SyndieGuns/red_projectile.rsi
layers:
- state: omnilaser
shader: unshaded
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
fly-by: *flybyfixture
- type: Ammo
- type: StaminaDamageOnCollide
damage: 1
- type: Projectile
impactEffect: BulletImpactEffectSyndiPlasma
damage:
types:
Heat: 8
soundHit:
collection: WeakHit
soundForce: true

- type: entity
name : syndie plasma
id: BulletSyndiPlasma3
parent: BaseBullet
noSpawn: true
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: _Sunrise/SyndieGuns/big_red_projectile.rsi
layers:
- state: omnilaser
shader: unshaded
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
fly-by: *flybyfixture
- type: Ammo
- type: StaminaDamageOnCollide
damage: 1
- type: Projectile
impactEffect: BulletImpactEffectSyndiPlasma
damage:
types:
Heat: 20
soundHit:
collection: WeakHit
soundForce: true
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,41 @@
contents:
- id: BoxSurvivalBrigmedic
- id: Flash

- type: entity
noSpawn: true
parent: ClothingBackpackSyndie
id: ClothingBackpackSyndieAJ100Filled
name: набор AJ-10
description: Включает в себя пистолет-пулемёт AJ-100 и два магазина патрон.
components:
- type: StorageFill
contents:
- id: WeaponAJ100Biocode
- id: MagazinePistolSubMachineGun
amount: 2

- type: entity
noSpawn: true
parent: ClothingBackpackSyndie
id: ClothingBackpackSyndieDL6902Filled
name: набор DL-6902
description: Включает в себя пулемёт DL6902 и один магазин патрон.
components:
- type: StorageFill
contents:
- id: WeaponDL6902Biocode
- id: MagazineDl6902

- type: entity
noSpawn: true
parent: ClothingBackpackSyndie
id: ClothingBackpackSyndieSIAR52Filled
name: набор SIAR-52
description: Включает в себя пулемёт SIAR-52 и два магазина патрон.
components:
- type: StorageFill
contents:
- id: WeaponSIAR52Biocode
- id: MagazinePistolSubMachineGunSIAR52
amount: 2
Loading
Loading