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.

Sign up for GitHub

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

Jump to bottom

Улучшение энергетического вооружения #328

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Улучшение энергетического вооружения #328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3355239
Улучшение энергетического вооружения
Nov 11, 2024
e5177d1
Merge branch 'master' into 8
DarkSide-droids Nov 11, 2024
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
37 changes: 32 additions & 5 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
- type: entity
name : disabler bolt
id: BulletDisabler
parent: BaseBullet
parent: [ BaseBullet, BaseBulletTrigger ]
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Исправьте отступы в квадратных скобках

Уберите лишние пробелы в объявлении родительских классов:

-  parent: [ BaseBullet, BaseBulletTrigger ]
+  parent: [BaseBullet, BaseBulletTrigger]

Also applies to: 942-942

🧰 Tools
🪛 yamllint

[error] 221-221: too many spaces inside brackets

(brackets)

[error] 221-221: too many spaces inside brackets

(brackets)

noSpawn: true
components:
- type: Reflective
Expand All @@ -232,8 +232,9 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
layers:
- state: omnilaser
- state: omnilaser_greyscale
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Исправьте отступы в определении слоев

Отступ для определения слоев должен быть 6 пробелов вместо 4:

-    - state: omnilaser_greyscale
+      - state: omnilaser_greyscale

Also applies to: 284-284, 956-956

🧰 Tools
🪛 yamllint

[error] 235-235: wrong indentation: expected 6 but found 4

(indentation)

shader: unshaded
color: '#00DCF0'
- type: Physics
- type: Fixtures
fixtures:
Expand All @@ -249,6 +250,14 @@
- type: Ammo
- type: StaminaDamageOnCollide
damage: 30
- type: EmpOnTrigger
range: 0.5
energyConsumption: 10
disableDuration: 0.1
- type: PointLight
radius: 2.3
color: '#00DCF0'
energy: 0.7
- type: Projectile
impactEffect: BulletImpactEffectDisabler
damage:
Expand All @@ -272,8 +281,9 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
layers:
- state: omnilaser
- state: omnilaser_greyscale
shader: unshaded
color: '#00DCF0'
- type: Physics
- type: Fixtures
fixtures:
Expand All @@ -289,6 +299,10 @@
- type: Ammo
- type: StaminaDamageOnCollide
damage: 1
- type: PointLight
radius: 2.3
color: '#00DCF0'
energy: 0.7
- type: Projectile
impactEffect: BulletImpactEffectDisabler
damage:
Expand Down Expand Up @@ -925,7 +939,7 @@
- type: entity
name : disabler bolt smg
id: BulletDisablerSmg
parent: BaseBullet
parent: [ BaseBullet, BaseBulletTrigger ]
noSpawn: true
components:
- type: Reflective
Expand All @@ -939,8 +953,9 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
layers:
- state: omnilaser
- state: omnilaser_greyscale
shader: unshaded
color: '#00DCF0'
- type: Physics
- type: Fixtures
fixtures:
Expand All @@ -956,6 +971,14 @@
- type: Ammo
- type: StaminaDamageOnCollide
damage: 15
- type: EmpOnTrigger
range: 0.5
energyConsumption: 5
disableDuration: 0.1
- type: PointLight
radius: 2.3
color: '#00DCF0'
energy: 0.7
- type: Projectile
impactEffect: BulletImpactEffectDisabler
damage:
Expand Down Expand Up @@ -1041,3 +1064,7 @@
Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
soundHit:
collection: MeatLaserImpact
- type: PointLight
radius: 2.3
color: red
energy: 0.7
Loading