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

new_weapon_for_sec #51

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 4 additions & 0 deletions Resources/Audio/Exodus/Weapons/HoSLaser/Atttribution.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["HoSLaser.ogg"]
license: "CC-BY03.0"
copyright: "Created by https://zvukogram.com"
source: "https://zvukogram.com/category/zvuki-lazera/"
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/Exodus/Weapons/MiniEnergyGun/Atttribution.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["MiniEnergyGun.ogg"]
license: "CC-BY03.0"
copyright: "Created by https://Zvukipro.com"
source: "https://zvukipro.com/oryjie/196-zvuki-blastera.html"
Binary file not shown.
Binary file added Resources/Audio/Weapons/HoSLaser.ogg
Binary file not shown.
Binary file added Resources/Audio/Weapons/MiniEnergyGun.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-CrateSecurityMiniEnergyGun = Ящик с миниатюрными энергетическими пистолетами
.desc = Этот ящик содержит в себе два миниатюрных энергетических пистолетов. Для открытия требуется доступ службы безопасности
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-WeaponMiniEnergyGun = Миниатюрный энергетический пистолет
.desc = Небольшой энергетический пистолет со встроенным фонариком. У него есть две настройки; отключить и убить. Обычно выдается офицерам службы безопасности как табельное оружие.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-WeaponX2DualphaseEnergyLaserGun = Х-2 Двухфазовый энергетический лазерный пистолет
.desc = Этот передовой и дорогой лазерный пистолет главы службы безопасности космической станции был изготовлен на заказ. Он сочетает в себе мощь и функциональность. Пистолет имеет два режима стрельбы - лазерный, который наносит урон ожогами на расстоянии, и станер, предназначенный для обезвреживания и задержания противников. Это оружие символизирует власть и ответственность главы службы безопасности. Однако оно не перезаряжается автоматически
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-LaserBulletForHoS = лазера
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-stanerBullet = станера
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-LaserBulletForMEG = лазера
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-LaserBulletStan = станнера
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,13 @@
cost: 1000
category: cargoproduct-category-name-security
group: market

- type: cargoProduct
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Переместить в отдельный yml в Exodus/Catalog/Cargo/...yml

id: SecurityMiniEnergyGun
icon:
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
state: base
product: CrateSecurityMiniEnergyGun
cost: 2500
category: cargoproduct-category-name-security
group: market
11 changes: 11 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,14 @@
amount: 4

# Cosmetic Crates

- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Аналогично переместить в отдельный yml

id: CrateSecurityMiniEnergyGun
parent: CrateSecgear
name: Ящик с миниатюрными энергетическими пистолетами
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Локализация через FTL

description: Этот ящик содержит в себе два миниатюрных энергетических пистолетов. Для открытия требуется доступ службы безопасности.
components:
- type: StorageFill
contents:
- id: WeaponMiniEnergyGun
amount: 2
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
- id: BookSecretDocumentsExodus #Exodus
- id: BookBusido # Corvax-Books
- id: BookSpaceLaw
- id: WeaponX2DualphaseEnergyLaserGun # кастомное оружие для гсб, сделано для exodus

- type: entity
id: LockerHeadOfSecurityFilled
Expand Down Expand Up @@ -321,6 +322,7 @@
- id: HoloprojectorSecurity
- id: BookSecretDocumentsExodus # Exodus-NukeSecretDocuments
- id: BookSpaceLaw
- id: WeaponX2DualphaseEnergyLaserGun # кастомное оружие для гсб, сделано для exodus

- type: entity
id: LockerFreezerVaultFilled
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
# Сам прототип оружия
- type: entity
name: Миниатюрный энергетический пистолет
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Локализация. Переместить в Exodus

parent: BaseWeaponBatterySmall
id: WeaponMiniEnergyGun
description: Небольшой энергетический пистолет со встроенным фонариком. У него есть две настройки; отключить и убить. Обычно выдается офицерам службы безопасности как табельное оружие.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 1.5
projectileSpeed: 75
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/MiniEnergyGun.ogg
- type: Item
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
size: Small
- type: ProjectileBatteryAmmoProvider
proto: LaserBulletForMEG
fireCost: 200
- type: BatteryWeaponFireModes
fireModes:
- proto: LaserBulletForMEG
fireCost: 200
- proto: LaserBulletStan
fireCost: 100
- type: Battery
maxCharge: 1200
startingCharge: 1200
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: StaticPrice
price: 250
- type: Sharp
- type: UnpoweredFlashlight
- type: PointLight
enabled: false
mask: /Textures/Effects/LightMasks/cone.png
autoRot: true
radius: 4
netsync: false

# продект лазера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это лучше переместить отдельно в Exodus, Projectiles

name: Режим лазера
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Локализация

id: LaserBulletForMEG
parent: EmitterBolt
noSpawn: true
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
layers:
- state: BlueTrac
shader: unshaded
- type: Projectile
impactEffect: BulletImpactEffectLaserForMEG
damage:
types:
Heat: 20

# эффект от лазера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/Guns/Projectiles/

id: BulletImpactEffectLaserForMEG
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.3
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
state: impact_laser
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu

# проджект станера(написан на основе проджекта лазера, ибо другие ломали фонарик)
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/Guns/Projectiles/

name: Режим станнера
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Локализация

id: LaserBulletStan
parent: EmitterBolt
noSpawn: true
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
layers:
- state: omnilaser
shader: unshaded
- type: StaminaDamageOnCollide
damage: 25
- type: Projectile
impactEffect: BulletImpactEffectLaserStan
damage:
types:
Heat: 4.2

# эффект от станера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/Guns/Projectiles/

id: BulletImpactEffectLaserStan
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.3
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
state: impact_laser_blue
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
# сам лазер
- type: entity
name: Х-2 Двухфазовый энергетический лазерный пистолет
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Локализация

parent: BaseWeaponBatterySmall
id: WeaponX-2Dual-phaseEnergyLaserGun
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ID обычно делают не в шашлычной форме. Используй нижнее подчёркивание

description: Этот передовой и дорогой лазерный пистолет главы службы безопасности космической станции был изготовлен на заказ. Он сочетает в себе мощь и функциональность. Пистолет имеет два режима стрельбы - лазерный, который наносит урон ожогами на расстоянии, и станер, предназначенный для обезвреживания и задержания противников. Это оружие символизирует власть и ответственность главы службы безопасности. Однако оно не перезаряжается автоматически
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 2
projectileSpeed: 100
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/HoSLaser.ogg
- type: Item
sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
size: Small
- type: ProjectileBatteryAmmoProvider
proto: LaserBulletForHoS
fireCost: 200
- type: BatteryWeaponFireModes
fireModes:
- proto: LaserBulletForHoS
fireCost: 200
- proto: stanerBullet
fireCost: 175
- type: Battery
maxCharge: 2800
startingCharge: 2800
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: StaticPrice
price: 1000

# проджект лазера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/Guns/Projectiles/

name: Режим лазера
id: LaserBulletForHoS
parent: EmitterBolt
noSpawn: true
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
layers:
- state: redtrac
shader: unshaded
- type: Projectile
impactEffect: BulletImpactEffectLaserForHoS
damage:
types:
Heat: 17

# проджект станера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/Guns/Projectiles/

name: Режим станера
id: stanerBullet
parent: BulletDisabler
noSpawn: true
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
layers:
- state: omnilaser
shader: unshaded
- type: StaminaDamageOnCollide
damage: 30
- type: Projectile
impactEffect: BulletImpactEffectDisablerRed
damage:
types:
Heat: 5
soundHit:
collection: WeakHit
forceSound: true

# эффект от станера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/ Effects?..

id: BulletImpactEffectDisablerRed
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.2
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
state: impact_laser_red
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu

# эффект от лазера
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переместить в Exodus/Entities/Objects/Weapons/ Effects?..

id: BulletImpactEffectLaserForHoS
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.2
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
state: impact_laser
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu





Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: cargoProduct
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Заменить название файла на security.yml

id: SecurityMiniEnergyGun
icon:
sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
state: base
product: CrateSecurityMiniEnergyGun
cost: 2500
category: cargoproduct-category-name-security
group: market
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Заменить название файла на security.yml

id: CrateSecurityMiniEnergyGun
parent: CrateSecgear
name: A case of miniature energy pistols.
description: This box contains two miniature energy pistols. Security access is required to open it.
components:
- type: StorageFill
contents:
- id: WeaponMiniEnergyGun
amount: 2
Loading
Loading