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

Craftable desword #2404

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Craftable desword #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
- type: Sprite
sprite: Objects/Fun/Instruments/kalimba.rsi
state: icon
- type: Tag

Copy link
Collaborator

Choose a reason for hiding this comment

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

Что здесь произошло?

tags:
- KeyedInstrument
- type: Item
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,6 +1421,15 @@
path: /Audio/Weapons/eblademiss.ogg
params:
variation: 0.125
#SS220 craftable desword start
- type: Tag
tags:
- ToyEnergySword
- type: Construction
deconstructionTarget: null
graph: DoubleToySwordGraph
node: esword
#SS220 craftable desword end

- type: entity
parent: BasePlushie
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,15 @@
reflectProbProjectile: 0.40 #ss220 ttkTweaks
spreadProjectile: 180
#ss220lowTTKUpdate
#SS220 craftable desword start
- type: Tag
tags:
- EnergySword
- type: Construction
deconstructionTarget: null
graph: EnergyDoubleSwordGraph
node: esword
#SS220 craftable desword end

- type: entity
name: energy dagger
Expand Down Expand Up @@ -398,6 +407,12 @@
reflectProbProjectile: 0.70 #ss220lowTTKUpdate
spreadProjectile: 180
# ss220 FixESword
#SS220 craftable desword start
- type: Construction
deconstructionTarget: null
graph: EnergyDoubleSwordGraph
node: desword
#SS220 craftable desword end

- type: entity
suffix: One-Handed, For Borgs
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/SS220/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
right:
- state: inhand-right-blade
shader: unshaded
#SS220 craftable desword start
- type: Construction
deconstructionTarget: null
graph: DoubleToySwordGraph
node: desword
#SS220 craftable desword end

#Svarshik's toy guns!

Expand Down
23 changes: 23 additions & 0 deletions Resources/Prototypes/SS220/Recipes/Crafting/Graphs/desword.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: constructionGraph
id: EnergyDoubleSwordGraph
start: esword
graph:
- node: esword
edges:
- to: desword
steps:
- tag: EnergySword
- node: desword
entity: EnergySwordDouble

- type: constructionGraph
id: DoubleToySwordGraph
start: esword
graph:
- node: esword
edges:
- to: desword
steps:
- tag: ToyEnergySword
- node: desword
entity: DoubleToySword
34 changes: 30 additions & 4 deletions Resources/Prototypes/SS220/Shitspawn/FractWarEbent/Weapons/Melee/soldiers_weapon.yml
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

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

Измнения этого файла здесь должны быть? В описании PR ничего про них не написано

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# USSP
- type: entity
name: Энергетический молот
parent: EnergySword
parent: BaseMeleeWeaponEnergy
id: EnergyHammer
description: Новейшая разработка пытливых советских умов. Незаменимая вещь как в хозяйстве, так и на войне.
suffix: Shitspawn, Ebent, FractWar
Expand Down Expand Up @@ -37,10 +37,18 @@
- type: Item
size: Normal
sprite: SS220/Objects/Weapons/Melee/e_hammer.rsi
- type: Reflect
reflectProb: 0.45 #ss220 ttkTweaks
reflects:
- NonEnergy
- Energy #SS220-FixReflects
spread: 80
reflectProbProjectile: 0.40 #ss220 ttkTweaks
spreadProjectile: 180

- type: entity
name: Энергетический серп
parent: EnergySword
parent: BaseMeleeWeaponEnergy
id: EnergySickle
description: Новейшая разработка пытливых советских умов. Незаменимая вещь как в хозяйстве, так и на войне.
suffix: Shitspawn, Ebent, FractWar
Expand Down Expand Up @@ -72,11 +80,20 @@
- type: Item
size: Normal
sprite: SS220/Objects/Weapons/Melee/e_sickle.rsi
#ss220lowTTKUpdate
- type: Reflect
reflectProb: 0.45 #ss220 ttkTweaks
reflects:
- NonEnergy
- Energy #SS220-FixReflects
spread: 80
reflectProbProjectile: 0.40 #ss220 ttkTweaks
spreadProjectile: 180

# ERT
- type: entity
name: энергетическая сабля
parent: EnergySword
parent: BaseMeleeWeaponEnergy
id: EnergySaberNT
description: Передовое оружие NanoTrasen для ведения ближнего боя.
suffix: Shitspawn, Ebent, FractWar
Expand Down Expand Up @@ -109,4 +126,13 @@
types:
Blunt: 4.5
- type: Item
sprite: SS220/Objects/Weapons/Melee/e_saber.rsi
sprite: SS220/Objects/Weapons/Melee/e_saber.rsi
#ss220lowTTKUpdate
- type: Reflect
reflectProb: 0.45 #ss220 ttkTweaks
reflects:
- NonEnergy
- Energy #SS220-FixReflects
spread: 80
reflectProbProjectile: 0.40 #ss220 ttkTweaks
spreadProjectile: 180
7 changes: 7 additions & 0 deletions Resources/Prototypes/SS220/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,10 @@
#HOCebent
- type: Tag
id: CartridgeUnitary

#Craftable desword
- type: Tag
id: EnergySword

- type: Tag
id: ToyEnergySword
Loading