diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/shuttles/thrusters.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/shuttles/thrusters.ftl index 8786566a779eab..19b0801c5ee933 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/shuttles/thrusters.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/structures/shuttles/thrusters.ftl @@ -2,9 +2,26 @@ ent-ThrusterShunting = маневровый ракетный двигатель .desc = { ent-BaseThruster.desc } ent-ThrusterShuntingFrame = каркас маневрового ракетного двигателя .desc = { ent-BaseThruster.desc } +ent-DebugThrusterShunting = { ent-ThrusterShunting } + .desc = { ent-BaseThruster.desc } + ent-ThrusterBigLeft = большой ракетный двигатель (левый) .desc = { ent-BaseThruster.desc } +ent-ThrusterBigLeftUnanchored = { ent-ThrusterBigLeft } + .desc = { ent-BaseThruster.desc } +ent-DebugThrusterBigLeft = { ent-ThrusterBigLeft } + .desc = { ent-BaseThruster.desc } + ent-ThrusterBigRight = большой ракетный двигатель (правый) .desc = { ent-BaseThruster.desc } +ent-ThrusterBigRightUnanchored = { ent-ThrusterBigRight } + .desc = { ent-BaseThruster.desc } +ent-DebugThrusterBigRight = { ent-ThrusterBigRight } + .desc = { ent-BaseThruster.desc } + ent-ThrusterBigCenter = большой ракетный двигатель (середина) .desc = { ent-BaseThruster.desc } +ent-ThrusterBigCenterUnanchored = { ent-ThrusterBigCenter } + .desc = { ent-BaseThruster.desc } +ent-DebugThrusterBigCenter = { ent-ThrusterBigCenter } + .desc = { ent-BaseThruster.desc } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 71122a6e6ca877..f5230d9a5122b5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -539,12 +539,12 @@ - PowerCageRechargerCircuitboard - EmitterCircuitboard - ThrusterMachineCircuitboard - # SS220 new thrusters begin + # SS220 engineering-update-thruster begin - ThrusterShuntingMachineCircuitboard - ThrusterBigLeftMachineCircuitboard - ThrusterBigRightMachineCircuitboard - ThrusterBigLeftMachineCircuitboard - # SS220 new thrusters end + # SS220 engineering-update-thruster end - GyroscopeMachineCircuitboard - MiniGravityGeneratorCircuitboard - Thermoelectricgenerator #ss220 thermoelectric generator board diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 47db0df8405d5c..dba3f0f1b1811a 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -135,12 +135,12 @@ recipeUnlocks: - ShuttleConsoleCircuitboard - ThrusterMachineCircuitboard - # SS220 new thrusters begin + # SS220 engineering-update-thruster begin - ThrusterShuntingMachineCircuitboard - ThrusterBigLeftMachineCircuitboard - ThrusterBigRightMachineCircuitboard - ThrusterBigLeftMachineCircuitboard - # SS220 new thrusters end + # SS220 engineering-update-thruster end - GyroscopeMachineCircuitboard - MiniGravityGeneratorCircuitboard diff --git a/Resources/Prototypes/SS220/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/SS220/Entities/Structures/Shuttles/thrusters.yml index f690cafeb110f7..7f25b6bca85ded 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Shuttles/thrusters.yml @@ -2,6 +2,8 @@ id: ThrusterShunting name: shunting thruster parent: [ BaseThruster, ConstructibleMachine ] + placement: + mode: SnapgridCenter components: - type: Thruster thrust: 33 @@ -12,6 +14,11 @@ - type: Construction graph: ThrusterShunting node: thrusterShunting + - type: Rotatable #The component responsible for rotating the pinned object until + rotateWhileAnchored: true #the bug with it flipping 180 degrees during construction is fixed. + - type: Physics + bodyType: Static + canCollide: false - type: Machine board: ThrusterShuntingMachineCircuitboard - type: ApcPowerReceiver @@ -96,6 +103,17 @@ - !type:DoActsBehavior acts: [ "Destruction" ] +- type: entity + id: DebugThrusterShunting + parent: ThrusterShunting + suffix: DEBUG + components: + - type: Thruster + requireSpace: false + - type: ApcPowerReceiver + needsPower: false + powerLoad: 0 + - type: entity id: ThrusterBigLeft name: big thruster (left) @@ -106,6 +124,17 @@ damage: types: Heat: 20 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.05,0.45" + density: 20 + mask: + - MachineMask + layer: + - MachineLayer - type: Machine board: ThrusterBigLeftMachineCircuitboard - type: ApcPowerReceiver @@ -144,16 +173,69 @@ visible: false offset: 0, 1 +- type: entity + id: ThrusterBigLeftUnanchored + parent: ThrusterBigLeft + suffix: Unanchored + components: + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic + +- type: entity + id: DebugThrusterBigLeft + parent: ThrusterBigLeft + suffix: DEBUG + components: + - type: Thruster + requireSpace: false + - type: ApcPowerReceiver + needsPower: false + powerLoad: 0 + - type: entity id: ThrusterBigRight name: big thruster (right) parent: [ ThrusterBigLeft ] components: + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.05,-0.45,0.45,0.45" + density: 20 + mask: + - MachineMask + layer: + - MachineLayer - type: Machine board: ThrusterBigRightMachineCircuitboard - type: Sprite sprite: SS220/Structures/Shuttles/thruster_big_right.rsi +- type: entity + id: ThrusterBigRightUnanchored + parent: ThrusterBigRight + suffix: Unanchored + components: + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic + +- type: entity + id: DebugThrusterBigRight + parent: ThrusterBigRight + suffix: DEBUG + components: + - type: Thruster + requireSpace: false + - type: ApcPowerReceiver + needsPower: false + powerLoad: 0 + - type: entity id: ThrusterBigCenter name: big thruster (center) @@ -201,3 +283,24 @@ shader: unshaded visible: false offset: 0, 1 + +- type: entity + id: ThrusterBigCenterUnanchored + parent: ThrusterBigCenter + suffix: Unanchored + components: + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic + +- type: entity + id: DebugThrusterBigCenter + parent: ThrusterBigCenter + suffix: DEBUG + components: + - type: Thruster + requireSpace: false + - type: ApcPowerReceiver + needsPower: false + powerLoad: 0 diff --git a/Resources/Prototypes/SS220/Recipes/Construction/Graphs/utilities/thruster_shunting.yml b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/utilities/thruster_shunting.yml index 47398a6d4df2d8..046a1771370335 100644 --- a/Resources/Prototypes/SS220/Recipes/Construction/Graphs/utilities/thruster_shunting.yml +++ b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/utilities/thruster_shunting.yml @@ -2,39 +2,46 @@ id: ThrusterShunting start: start graph: - - node: start - edges: - - to: thrusterShuntingFrame - steps: - - material: Steel - amount: 2 + - node: start + edges: + - to: thrusterShuntingFrame + steps: + - material: Steel + amount: 2 + doAfter: 1 - - 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: thrusterShuntingFrame + entity: ThrusterShuntingFrame + edges: + - to: thrusterShunting + steps: + - tag: ThrusterShuntingMachineCircuitboard + name: shunting thruster machine board + doAfter: 2 + - to: start + completed: + - !type:GivePrototype + prototype: SheetSteel1 + mount: 2 + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 2 + - to: thrusterShunting + conditions: + - !type:EntityAnchored {} + steps: + - tool: Welding + doAfter: 5 - - node: thrusterShunting - entity: ThrusterShunting - edges: - - to: thrusterShuntingFrame - completed: - - !type:GivePrototype - prototype: ThrusterShuntingMachineCircuitboard - amount: 1 - steps: - - tool: Prying - doAfter: 4 + - node: thrusterShunting + entity: ThrusterShunting + edges: + - to: thrusterShuntingFrame + completed: + - !type:GivePrototype + prototype: ThrusterShuntingMachineCircuitboard + amount: 1 + steps: + - tool: Prying + doAfter: 4 diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index ea648ac28ce73c..4b20a24e0ce47f 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -143,6 +143,6 @@ - type: Tag id: Bed -# Add new thrusters +# engineering-update-thruster - type: Tag id: ThrusterShuntingMachineCircuitboard