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.

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

Add generator scrap (Plasma / uranium scrap) #32198

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
- id: SheetSteel10
- id: SheetGlass10
- id: SheetPlastic10
- id: ScrapGeneratorFuelTank
weight: 0.5
- id: PartRodMetal10
weight: 0.33
- id: MaterialWoodPlank10
Expand All @@ -64,6 +66,9 @@
id: SalvageScrapLarge
table: !type:GroupSelector
children:
- !type:NestedSelector
tableId: RandomGeneratorTable
weight: 2
- id: ScrapAirlock1
- id: ScrapCloset
- id: ScrapFirelock1
Expand Down Expand Up @@ -250,3 +255,16 @@
children:
- id: JetpackBlueFilled
- id: JetpackBlackFilled

- type: entityTable
id: RandomGeneratorTable
table: !type:GroupSelector
children:
- id: ScrapGeneratorPlasmaLeaking
- id: ScrapGeneratorUraniumLeaking
- id: ScrapGeneratorPlasma
weight: 0.5
- id: ScrapGeneratorUranium
weight: 0.5
Copy link
Contributor

@Blackern5000 Blackern5000 Sep 17, 2024

Choose a reason for hiding this comment

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

Why are the ones worth less plasma/uranium less common than the ones that give full stacks?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just wanted them to be less common! I think it would be better for the higher plasma/uranium generators to appear more frequently.

Copy link
Contributor

Choose a reason for hiding this comment

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

Just wanted them to be less common! I think it would be better for the higher plasma/uranium generators to appear more frequently.

More valuable things are rarer because you want them more, I don't think it makes much sense to have the less valuable version be less common, especially with just how much material you get from the filled generator.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Remember this is scrap so being in better condition would make it less common (The two leaking ones are in much worse condition). Secondly, the other two generators are not very good so making them more common wouldn't be that helpful. Having to drag something that big for only 45 metal, 5 plastic, and 5 special is probably not worth it (At least when I'm doing salvage).

Copy link
Contributor

Choose a reason for hiding this comment

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

Having to drag something that big for only 45 metal, 5 plastic, and 5 special is probably not worth it (At least when I'm doing salvage).

If you're exclusively dragging with a fire extinguisher, yeah it might not be worthwhile, but it's very common for salvage to build a lattice bridge or have fultons, which makes it very easy to gather most or all of the scrap on a debris regardless of transportation difficulty.
What if you increased the value of the leaking one a bit, and decrease the value of the intact one? I feel bringing them a bit closer (maybe 10/20 or 12/20 for leaking/intact) would work out well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry forgot reply but yeah that makes sense! Tweaking the values to basically that now

- id: ScrapGeneratorFrame
weight: 0.25
149 changes: 149 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/scrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,46 @@
tags:
- Recyclable

- type: entity
parent: BaseStructure
id: BaseScrapLarge
abstract: true
name: scrap
description: Worthless junk. You could probably get some materials out of it though.
suffix: Scrap
components:
- type: InteractionOutline
- type: Damageable
damageContainer: Inorganic
damageModifierSet: FlimsyMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Tag
tags:
- Recyclable
- type: Transform
anchored: False
noRot: true
- type: Physics
bodyType: Dynamic
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.40,-0.40,0.40,0.40"
density: 200
mask:
- MachineMask
layer:
- MachineLayer

- type: entity
parent: BaseScrap
id: ScrapSteel
Expand Down Expand Up @@ -404,5 +444,114 @@
Glass: 500 # 5 sheets
Plastic: 100 # 1 sheet

- type: entity
parent: BaseScrapLarge
id: ScrapGeneratorPlasmaLeaking
name: leaking P.A.C.M.A.N. generator
description: An old looking P.A.C.M.A.N. generator whos plasma tanks started leaking.
components:
- type: Sprite
sprite: Objects/Materials/Scrap/generator.rsi
snapCardinals: true
layers:
- state: old_generator_plasma
- state: old_generator_plasma_fuel_leak
- type: PhysicalComposition
materialComposition:
Steel: 4000 # 40 sheets
Plasma: 2500 # 25 sheets
Plastic: 500 # 5 sheets

- type: entity
parent: BaseScrapLarge
id: ScrapGeneratorPlasma
name: old P.A.C.M.A.N. generator
description: An old looking P.A.C.M.A.N. generator. It's in very poor condition and non functional.
components:
- type: Sprite
sprite: Objects/Materials/Scrap/generator.rsi
layers:
- state: old_generator_plasma
- type: PhysicalComposition
materialComposition:
Steel: 4000 # 40 sheets
Plasma: 1000 # 10 sheets
Plastic: 500 # 5 sheets

- type: entity
parent: BaseScrapLarge
id: ScrapGeneratorUraniumLeaking
name: leaking S.U.P.E.R.P.A.C.M.A.N. generator
description: A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure. Its leaking uranium.
components:
- type: Sprite
sprite: Objects/Materials/Scrap/generator.rsi
layers:
- state: uranium_generator
- map: [ "extra" ]
- state: rad_dripping
shader: unshaded
- state: rad_outline
shader: unshaded
- type: RandomSprite
available:
- extra:
red_x: ""
nothing: ""
- type: MultiHandedItem
- type: PhysicalComposition
materialComposition:
Steel: 4000 # 40 sheets
Uranium: 2500 # 25 sheets
Plastic: 500 # 5 sheets

- type: entity
parent: BaseScrapLarge
id: ScrapGeneratorUranium
name: destroyed S.U.P.E.R.P.A.C.M.A.N. generator
description: A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure.
components:
- type: Sprite
sprite: Objects/Materials/Scrap/generator.rsi
layers:
- state: uranium_generator
- map: [ "extra" ]
- type: RandomSprite
available:
- extra:
red_x: ""
nothing: ""
- type: PhysicalComposition
materialComposition:
Steel: 4000 # 40 sheets
Uranium: 1000 # 10 sheets
Plastic: 500 # 5 sheets

- type: entity
parent: BaseScrapLarge
id: ScrapGeneratorFrame
name: generator frame
description: A frame of a P.A.C.M.A.N. or S.U.P.E.R.P.A.C.M.A.N. type generator. Where is the rest of it?
components:
- type: Sprite
sprite: Objects/Materials/Scrap/generator.rsi
layers:
- state: generator_frame
- type: PhysicalComposition
materialComposition:
Steel: 1500 # 15 sheets

- type: entity
parent: BaseScrap
id: ScrapGeneratorFuelTank
name: fuel tank
description: A fuel tank from a S.U.P.E.R.P.A.C.M.A.N. type generator. The gauge indicates its got a little fuel left.
components:
- type: Sprite
sprite: Objects/Materials/Scrap/generator.rsi
layers:
- state: uranium_generator_fuel_tank
- type: PhysicalComposition
materialComposition:
Steel: 200 # 2 sheets
Uranium: 500 # 5 sheets
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions Resources/Textures/Objects/Materials/Scrap/generator.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Beck Thompson using assets from https://github.com/Baystation12/Baystation12/blob/caa635edb97c58301ccdc64757eba323b6673cf3/icons/obj/structures/portgen.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "old_generator_plasma"
},
{
"name": "old_generator_plasma_fuel_leak"
},
{
"name": "generator_frame"
},
{
"name": "uranium_generator"
},
{
"name": "uranium_generator_fuel_tank"
},
{
"name": "red_x"
},
{
"name": "nothing"
},
{
"name": "rad_outline",
"delays": [
[
0.3,
0.3,
0.3,
0.3
]
]
},
{
"name": "rad_dripping",
"delays": [
[
2.0,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading