Skip to content

Commit

Permalink
[FIX] Быстренькие починки (AdventureTimeSS14#903)
Browse files Browse the repository at this point in the history
## Описание PR
Починка всего, что было сломанно

## Почему / Баланс
Починка разнообразного контента

## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
<!-- Изменения и прочие фиксы моих же новвоведений🆑 Sh4zik
-->

:cl: Sh4zik
- tweak: Были переработаны кинжалы
- fix: Были починены крафты кинжалов
- fix: Был починен вес новогодних саней
  • Loading branch information
sh4zik authored Dec 21, 2024
1 parent ee51094 commit 2b6fe4a
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 10 deletions.
26 changes: 24 additions & 2 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- type: entity
parent: [BaseBallBat, ClothingHandsBase]
id: ADTHalloweenBroom
name: witch broom
name: witch broom
description: time to fly
suffix: Halloween
components:
Expand Down Expand Up @@ -72,9 +72,31 @@
- type: entity
name: New Year gurney
id: ADTNewYearKatalka
parent: ChairBase
parent: BaseStructure
description: Yea.
placement:
mode: PlaceFree
components:
- type: Sprite
sprite: ADT/Structures/Specific/newyearkatalki.rsi
state: newyearkatalka
- type: Anchorable
- type: Rotatable
- type: Physics # ADT CHANGE START sleep
bodyType: Static
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
density: 10
mask:
- TableMask
- type: HealOnBuckle
damage:
types:
Poison: -0.1
Blunt: -0.1
- type: Strap
position: Down
rotation: 0 # ADT CHANGE END sleep
106 changes: 102 additions & 4 deletions Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,31 @@
attackRate: 1.75
damage:
types:
Slash: 6.3
Piercing: 8
- type: SolutionContainerManager
solutions:
melee:
maxVol: 1
- type: MeleeChemicalInjector
solution: melee
- type: RefillableSolution
solution: melee
- type: InjectableSolution
solution: melee
- type: SolutionInjectOnEmbed
transferAmount: 1
solution: melee
- type: SolutionTransfer
maxTransferAmount: 1
- type: DamageOtherOnHit
damage:
types:
Piercing: 15
- type: EmbeddableProjectile
offset: -0.15,0.0
- type: ThrowingAngle
angle: 225
- type: LandAtCursor

- type: entity
name: dagger reinforced
Expand Down Expand Up @@ -140,7 +164,31 @@
attackRate: 1.75
damage:
types:
Slash: 6
Piercing: 7
- type: SolutionContainerManager
solutions:
melee:
maxVol: 1
- type: MeleeChemicalInjector
solution: melee
- type: RefillableSolution
solution: melee
- type: InjectableSolution
solution: melee
- type: SolutionInjectOnEmbed
transferAmount: 1
solution: melee
- type: SolutionTransfer
maxTransferAmount: 1
- type: DamageOtherOnHit
damage:
types:
Piercing: 12
- type: EmbeddableProjectile
offset: -0.15,0.0
- type: ThrowingAngle
angle: 225
- type: LandAtCursor

- type: entity
name: dagger glass
Expand Down Expand Up @@ -170,7 +218,31 @@
attackRate: 1.75
damage:
types:
Slash: 5
Piercing: 6
- type: SolutionContainerManager
solutions:
melee:
maxVol: 1
- type: MeleeChemicalInjector
solution: melee
- type: RefillableSolution
solution: melee
- type: InjectableSolution
solution: melee
- type: SolutionInjectOnEmbed
transferAmount: 1
solution: melee
- type: SolutionTransfer
maxTransferAmount: 1
- type: DamageOtherOnHit
damage:
types:
Piercing: 10
- type: EmbeddableProjectile
offset: -0.15,0.0
- type: ThrowingAngle
angle: 225
- type: LandAtCursor

- type: entity
name: dagger uranium
Expand Down Expand Up @@ -200,7 +272,33 @@
attackRate: 1.75
damage:
types:
Slash: 9
Piercing: 5
Radiation: 5
- type: SolutionContainerManager
solutions:
melee:
maxVol: 1
- type: MeleeChemicalInjector
solution: melee
- type: RefillableSolution
solution: melee
- type: InjectableSolution
solution: melee
- type: SolutionInjectOnEmbed
transferAmount: 1
solution: melee
- type: SolutionTransfer
maxTransferAmount: 1
- type: DamageOtherOnHit
damage:
types:
Piercing: 9
Radiation: 9
- type: EmbeddableProjectile
offset: -0.15,0.0
- type: ThrowingAngle
angle: 225
- type: LandAtCursor

- type: entity
name: wooden sword
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@
edges:
- to: ADTCompGlassDager
steps:
- material: Cloth
- material: MetalRod
amount: 1
- material: Cable
amount: 1
- tag: GlassShard
name: glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
doAfter: 1
- node: ADTCompGlassDager
entity: ADTGlassDagger
Expand All @@ -20,8 +27,15 @@
edges:
- to: ADTCompGlassRefDager
steps:
- material: Cloth
- material: MetalRod
amount: 1
- material: Cable
amount: 1
- tag: ReinforcedGlassShard
name: reinforced glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
doAfter: 1
- node: ADTCompGlassRefDager
entity: ADTGlassReinDagger
Expand All @@ -34,8 +48,15 @@
edges:
- to: ADTCompUranDager
steps:
- material: Cloth
- material: MetalRod
amount: 1
- material: Cable
amount: 1
- tag: UraniumGlassShard
name: uranium glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
doAfter: 1
- node: ADTCompUranDager
entity: ADTGlassUranDagger
Expand All @@ -48,8 +69,15 @@
edges:
- to: ADTCompPlasmaDager
steps:
- material: Cloth
- material: MetalRod
amount: 1
- material: Cable
amount: 1
- tag: PlasmaGlassShard
name: plasma glass shard
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
doAfter: 1
- node: ADTCompPlasmaDager
entity: ADTPlasmaDagger

0 comments on commit 2b6fe4a

Please sign in to comment.