Skip to content

Commit

Permalink
Merge remote-tracking branch 'kirus/Add-new-thrusters' into engineeri…
Browse files Browse the repository at this point in the history
…ng-update-thruster
  • Loading branch information
EstKemran committed Dec 9, 2024
2 parents 4ec8cd1 + fa007cd commit 329cf74
Show file tree
Hide file tree
Showing 26 changed files with 656 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-ThrusterShuntingMachineCircuitboard = маневровый ракетный двигатель (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ThrusterBigLeftMachineCircuitboard = большой ракетный двигатель (левый) (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ThrusterBigRightMachineCircuitboard = большой ракетный двигатель (правый) (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ThrusterBigCenterMachineCircuitboard = большой ракетный двигатель (середина) (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ThrusterShunting = маневровый ракетный двигатель
.desc = { ent-BaseThruster.desc }
ent-ThrusterShuntingFrame = каркас маневрового ракетного двигателя
.desc = { ent-BaseThruster.desc }
ent-ThrusterBigLeft = большой ракетный двигатель (левый)
.desc = { ent-BaseThruster.desc }
ent-ThrusterBigRight = большой ракетный двигатель (правый)
.desc = { ent-BaseThruster.desc }
ent-ThrusterBigCenter = большой ракетный двигатель (середина)
.desc = { ent-BaseThruster.desc }
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,12 @@
- PowerCageRechargerCircuitboard
- EmitterCircuitboard
- ThrusterMachineCircuitboard
# SS220 new thrusters begin
- ThrusterShuntingMachineCircuitboard
- ThrusterBigLeftMachineCircuitboard
- ThrusterBigRightMachineCircuitboard
- ThrusterBigLeftMachineCircuitboard
# SS220 new thrusters end
- GyroscopeMachineCircuitboard
- MiniGravityGeneratorCircuitboard
- Thermoelectricgenerator #ss220 thermoelectric generator board
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@
recipeUnlocks:
- ShuttleConsoleCircuitboard
- ThrusterMachineCircuitboard
# SS220 new thrusters begin
- ThrusterShuntingMachineCircuitboard
- ThrusterBigLeftMachineCircuitboard
- ThrusterBigRightMachineCircuitboard
- ThrusterBigLeftMachineCircuitboard
# SS220 new thrusters end
- GyroscopeMachineCircuitboard
- MiniGravityGeneratorCircuitboard

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,50 @@
Manipulator: 1
Steel: 5
Gold: 1

- type: entity
id: ThrusterShuntingMachineCircuitboard
parent: BaseMachineCircuitboard
name: shunting thruster machine board
components:
- type: MachineBoard
prototype: ThrusterShunting
stackRequirements:
Capacitor: 1
Steel: 2
- type: Tag
tags:
- ThrusterShuntingMachineCircuitboard

- type: entity
id: ThrusterBigLeftMachineCircuitboard
parent: BaseMachineCircuitboard
name: big thruster machine board (left)
components:
- type: MachineBoard
prototype: ThrusterBigLeft
stackRequirements:
Capacitor: 2
Steel: 3

- type: entity
id: ThrusterBigRightMachineCircuitboard
parent: BaseMachineCircuitboard
name: big thruster machine board (right)
components:
- type: MachineBoard
prototype: ThrusterBigRight
stackRequirements:
Capacitor: 2
Steel: 3

- type: entity
id: ThrusterBigCenterMachineCircuitboard
parent: BaseMachineCircuitboard
name: big thruster machine board (center)
components:
- type: MachineBoard
prototype: ThrusterBigCenter
stackRequirements:
Capacitor: 6
Steel: 10
203 changes: 203 additions & 0 deletions Resources/Prototypes/SS220/Entities/Structures/Shuttles/thrusters.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
- type: entity
id: ThrusterShunting
name: shunting thruster
parent: [ BaseThruster, ConstructibleMachine ]
components:
- type: Thruster
thrust: 33
damage:
types:
Heat: 13
- type: WallMount
- type: Construction
graph: ThrusterShunting
node: thrusterShunting
- type: Machine
board: ThrusterShuntingMachineCircuitboard
- type: ApcPowerReceiver
powerLoad: 500
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- type: Sprite
sprite: SS220/Structures/Shuttles/thruster_shunting.rsi
layers:
- state: base
map: ["enum.ThrusterVisualLayers.Base"]
- state: thrust
map: ["enum.ThrusterVisualLayers.ThrustOn"]
shader: unshaded
visible: false
- state: thrust_burn_unshaded
map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
shader: unshaded
visible: false
offset: 0, 1

- type: entity
categories: [ HideSpawnMenu ]
id: ThrusterShuntingFrame
name: shunting thruster frame
description: A thruster that allows a shuttle to move.
placement:
mode: SnapgridCenter
components:
- type: Clickable
- type: InteractionOutline
- type: Transform
anchored: true
- type: Sprite
drawdepth: WallMountedItems
sprite: Structures/Power/apc.rsi
state: frame
- type: Construction
graph: ThrusterShunting
node: thrusterShuntingFrame
- type: WallMount
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
behaviors: #excess damage, don't spawn entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
id: ThrusterBigLeft
name: big thruster (left)
parent: [ BaseThruster, ConstructibleMachine ]
components:
- type: Thruster
thrust: 50
damage:
types:
Heat: 20
- type: Machine
board: ThrusterBigLeftMachineCircuitboard
- type: ApcPowerReceiver
powerLoad: 750
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 75
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- type: Sprite
sprite: SS220/Structures/Shuttles/thruster_big_left.rsi
layers:
- state: base
map: ["enum.ThrusterVisualLayers.Base"]
- state: thrust
map: ["enum.ThrusterVisualLayers.ThrustOn"]
shader: unshaded
visible: false
- state: thrust_burn_unshaded
map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
shader: unshaded
visible: false
offset: 0, 1

- type: entity
id: ThrusterBigRight
name: big thruster (right)
parent: [ ThrusterBigLeft ]
components:
- type: Machine
board: ThrusterBigRightMachineCircuitboard
- type: Sprite
sprite: SS220/Structures/Shuttles/thruster_big_right.rsi

- type: entity
id: ThrusterBigCenter
name: big thruster (center)
parent: [ BaseThruster, ConstructibleMachine ]
components:
- type: Thruster
thrust: 200
damage:
types:
Heat: 80
- type: Machine
board: ThrusterBigCenterMachineCircuitboard
- type: ApcPowerReceiver
powerLoad: 3000
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 450
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 150
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ChangeConstructionNodeBehavior
node: machineFrame
- type: Sprite
sprite: SS220/Structures/Shuttles/thruster_big_center.rsi
layers:
- state: base
map: ["enum.ThrusterVisualLayers.Base"]
- state: thrust
map: ["enum.ThrusterVisualLayers.ThrustOn"]
shader: unshaded
visible: false
- state: thrust_burn_unshaded
map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
shader: unshaded
visible: false
offset: 0, 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
- type: constructionGraph
id: ThrusterShunting
start: start
graph:
- node: start
edges:
- to: thrusterShuntingFrame
steps:
- material: Steel
amount: 2

- node: thrusterShuntingFrame
entity: ThrusterShuntingFrame
edges:
- to: thrusterShunting
steps:
- tag: ThrusterShuntingMachineCircuitboard
name: shunting thruster machine board
doAfter: 2
- to: start
completed:
- !type:GivePrototype
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2

- node: thrusterShunting
entity: ThrusterShunting
edges:
- to: thrusterShuntingFrame
completed:
- !type:GivePrototype
prototype: ThrusterShuntingMachineCircuitboard
amount: 1
steps:
- tool: Prying
doAfter: 4
14 changes: 14 additions & 0 deletions Resources/Prototypes/SS220/Recipes/Construction/utilities.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: construction
name: thruster shunting
id: ThrusterShunting
graph: ThrusterShunting
startNode: start
targetNode: thrusterShunting
category: construction-category-utilities
description: "A thruster that allows a shuttle to move."
icon:
sprite: Structures/Power/apc.rsi
state: base
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: true
34 changes: 33 additions & 1 deletion Resources/Prototypes/SS220/Recipes/Lathes/electronics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,36 @@
Steel: 100
Glass: 900
Silver: 100
Gold: 100
Gold: 100

- type: latheRecipe
parent: BaseCircuitboardRecipe
id: ThrusterShuntingMachineCircuitboard
result: ThrusterShuntingMachineCircuitboard
materials:
Steel: 50
Glass: 150

- type: latheRecipe
parent: BaseCircuitboardRecipe
id: ThrusterBigLeftMachineCircuitboard
result: ThrusterBigLeftMachineCircuitboard
materials:
Steel: 50
Glass: 250

- type: latheRecipe
parent: BaseCircuitboardRecipe
id: ThrusterBigRightMachineCircuitboard
result: ThrusterBigRightMachineCircuitboard
materials:
Steel: 50
Glass: 250

- type: latheRecipe
parent: BaseCircuitboardRecipe
id: ThrusterBigCenterMachineCircuitboard
result: ThrusterBigCenterMachineCircuitboard
materials:
Steel: 200
Glass: 1000
Loading

0 comments on commit 329cf74

Please sign in to comment.