tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nerfs Gatfruit & reduces its spawn probability (#6601)

Browse Source
This commit is contained in:
Rane
2022-02-09 20:49:05 -05:00
committed by GitHub
parent 3bc188b3a4
commit 47c31fac47
3 changed files with 147 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

460
Resources/Maps/Salvage/small-3.yml
View File

@@ -57,6 +57,84 @@ grids:
tiles: FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== tiles: FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
entities: entities:
- uid: 0 - uid: 0
type: WallSolid
components:
- pos: -0.5,-2.5
parent: 10
type: Transform
- uid: 1
type: SalvageCanisterSpawner
components:
- pos: -0.5,-0.5
parent: 10
type: Transform
- uid: 2
type: ClosetFireFilled
components:
- pos: -2.254117,1.5
parent: 10
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 3
type: SalvageMaterialCrateSpawner
components:
- pos: -0.5,1.5
parent: 10
type: Transform
- uid: 4
type: SalvageMaterialCrateSpawner
components:
- pos: -1.5,-0.5
parent: 10
type: Transform
- uid: 5
type: WallSolid
components:
- pos: -1.5,-2.5
parent: 10
type: Transform
- uid: 6
type: ClosetEmergencyFilledRandom
components:
- pos: -1.2175364,1.5
parent: 10
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 7
type: ClosetLegal
components:
- pos: -2.7688956,1.5
parent: 10
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 8
type: SalvageCanisterSpawner
components:
- pos: -1.5,-1.5
parent: 10
type: Transform
- uid: 9
type: WallSolid
components:
- pos: 0.5,-2.5
parent: 10
type: Transform
- uid: 10
components: components:
- pos: 0.5,0.5 - pos: 0.5,0.5
parent: null parent: null
@@ -68,32 +146,6 @@ entities:
bodyType: Dynamic bodyType: Dynamic
type: Physics type: Physics
- fixtures: - fixtures:
- shape: !type:PolygonShape
vertices:
- -3.01,2.01
- -3.01,2.99
- -3.99,2.99
- -3.99,2.01
id: grid_chunk--3.99-2.01
mask:
- MapGrid
layer:
- MapGrid
mass: 3.8416002
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -0.01,-1.99
- -0.01,-0.01
- -3.99,-0.01
- -3.99,-1.99
id: grid_chunk--3.99--1.99
mask:
- MapGrid
layer:
- MapGrid
mass: 31.5216
restitution: 0.1
- shape: !type:PolygonShape - shape: !type:PolygonShape
vertices: vertices:
- -0.01,-3.99 - -0.01,-3.99
@@ -120,6 +172,19 @@ entities:
- MapGrid - MapGrid
mass: 7.7616 mass: 7.7616
restitution: 0.1 restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -0.01,-1.99
- -0.01,-0.01
- -3.99,-0.01
- -3.99,-1.99
id: grid_chunk--3.99--1.99
mask:
- MapGrid
layer:
- MapGrid
mass: 31.5216
restitution: 0.1
- shape: !type:PolygonShape - shape: !type:PolygonShape
vertices: vertices:
- 0.99,-3.99 - 0.99,-3.99
@@ -146,19 +211,6 @@ entities:
- MapGrid - MapGrid
mass: 7.7616 mass: 7.7616
restitution: 0.1 restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -1.01,2.01
- -1.01,2.99
- -1.99,2.99
- -1.99,2.01
id: grid_chunk--1.99-2.01
mask:
- MapGrid
layer:
- MapGrid
mass: 3.8416002
restitution: 0.1
- shape: !type:PolygonShape - shape: !type:PolygonShape
vertices: vertices:
- -0.01,0.01 - -0.01,0.01
@@ -172,6 +224,32 @@ entities:
- MapGrid - MapGrid
mass: 31.5216 mass: 31.5216
restitution: 0.1 restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -3.01,2.01
- -3.01,2.99
- -3.99,2.99
- -3.99,2.01
id: grid_chunk--3.99-2.01
mask:
- MapGrid
layer:
- MapGrid
mass: 3.8416002
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -1.01,2.01
- -1.01,2.99
- -1.99,2.99
- -1.99,2.01
id: grid_chunk--1.99-2.01
mask:
- MapGrid
layer:
- MapGrid
mass: 3.8416002
restitution: 0.1
- shape: !type:PolygonShape - shape: !type:PolygonShape
vertices: vertices:
- 0.99,0.01 - 0.99,0.01
@@ -185,308 +263,22 @@ entities:
- MapGrid - MapGrid
mass: 7.7616 mass: 7.7616
restitution: 0.1 restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -3,-3
- -3,-1
- -4,-1
- -4,-3
id: grid_chunk--4--3
mask:
- MapGrid
layer:
- MapGrid
mass: 8
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 1,-2
- 1,-1
- 0,-1
- 0,-2
id: grid_chunk-0--2
mask:
- MapGrid
layer:
- MapGrid
mass: 4
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,-3
- 0,-2
- -1,-2
- -1,-3
id: grid_chunk--1--3
mask:
- MapGrid
layer:
- MapGrid
mass: 4
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- -3,0
- -3,2
- -4,2
- -4,0
id: grid_chunk--4-0
mask:
- MapGrid
layer:
- MapGrid
mass: 8
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 3,0
- 3,2
- 2,2
- 2,0
id: grid_chunk-2-0
mask:
- MapGrid
layer:
- MapGrid
mass: 8
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,-2
- 0,-1
- -2,-1
- -2,-2
id: grid_chunk--2--2
mask:
- MapGrid
layer:
- MapGrid
mass: 8
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,-4
- 0,-3
- -4,-3
- -4,-4
id: grid_chunk--4--4
mask:
- MapGrid
layer:
- MapGrid
mass: 16
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,-1
- 0,0
- -4,0
- -4,-1
id: grid_chunk--4--1
mask:
- MapGrid
layer:
- MapGrid
mass: 16
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,1
- 0,2
- -1,2
- -1,1
id: grid_chunk--1-1
mask:
- MapGrid
layer:
- MapGrid
mass: 4
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 3,2
- 3,3
- 0,3
- 0,2
id: grid_chunk-0-2
mask:
- MapGrid
layer:
- MapGrid
mass: 12
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 1,0
- 1,1
- 0,1
- 0,0
id: grid_chunk-0-0
mask:
- MapGrid
layer:
- MapGrid
mass: 4
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 3,-3
- 3,-1
- 2,-1
- 2,-3
id: grid_chunk-2--3
mask:
- MapGrid
layer:
- MapGrid
mass: 8
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 3,-1
- 3,0
- 0,0
- 0,-1
id: grid_chunk-0--1
mask:
- MapGrid
layer:
- MapGrid
mass: 12
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 3,-4
- 3,-3
- 0,-3
- 0,-4
id: grid_chunk-0--4
mask:
- MapGrid
layer:
- MapGrid
mass: 12
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,2
- 0,3
- -4,3
- -4,2
id: grid_chunk--4-2
mask:
- MapGrid
layer:
- MapGrid
mass: 16
restitution: 0.1
- shape: !type:PolygonShape
vertices:
- 0,0
- 0,1
- -2,1
- -2,0
id: grid_chunk--2-0
mask:
- MapGrid
layer:
- MapGrid
mass: 8
restitution: 0.1
type: Fixtures type: Fixtures
- gravityShakeSound: !type:SoundPathSpecifier - gravityShakeSound: !type:SoundPathSpecifier
path: /Audio/Effects/alert.ogg path: /Audio/Effects/alert.ogg
type: Gravity type: Gravity
- chunkCollection: {} - chunkCollection: {}
type: DecalGrid type: DecalGrid
- uid: 1
type: WallSolid
components:
- pos: 0.5,-2.5
parent: 0
type: Transform
- uid: 2
type: ClosetLegal
components:
- pos: -2.7649975,1.5
parent: 0
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 3
type: ClosetFireFilled
components:
- pos: -2.249998,1.5
parent: 0
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 4
type: ClosetCursed
components:
- pos: -1.7349985,1.5
parent: 0
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 5
type: ClosetEmergencyFilledRandom
components:
- pos: -1.2199987,1.5
parent: 0
type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
- uid: 6
type: WallSolid
components:
- pos: -0.5,-2.5
parent: 0
type: Transform
- uid: 7
type: WallSolid
components:
- pos: -1.5,-2.5
parent: 0
type: Transform
- uid: 8
type: SalvageMaterialCrateSpawner
components:
- pos: -1.5,-0.5
parent: 0
type: Transform
- uid: 9
type: SalvageCanisterSpawner
components:
- pos: -0.5,-0.5
parent: 0
type: Transform
- uid: 10
type: SalvageCanisterSpawner
components:
- pos: -1.5,-1.5
parent: 0
type: Transform
- uid: 11 - uid: 11
type: SalvageMaterialCrateSpawner type: LockerBotanistLoot
components: components:
- pos: -0.5,1.5 - pos: -1.7394279,1.5
parent: 0 parent: 10
type: Transform type: Transform
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents: []
type: ContainerContainer
... ...

17
Resources/Prototypes/Catalog/Fills/Lockers/service.yml
View File

@@ -103,3 +103,20 @@
prob: 1 prob: 1
- id: ClothingHeadHatTrucker - id: ClothingHeadHatTrucker
prob: 0.1 prob: 0.1
- type: entity
id: LockerBotanistLoot
suffix: Loot
parent: LockerBotanist
components:
- type: StorageFill
contents:
- id: ClothingUniformOveralls
- id: ClothingHeadHatTrucker
prob: 0.3
- id: GatfruitSeeds
prob: 0.1
- id: FlyAmanitaSeeds
prob: 0.5
- id: NettleSeeds
prob: 0.7

9
Resources/Prototypes/Hydroponics/seeds.yml
View File

@@ -632,11 +632,10 @@
plantRsi: Objects/Specific/Hydroponics/gatfruit.rsi plantRsi: Objects/Specific/Hydroponics/gatfruit.rsi
productPrototypes: productPrototypes:
- FoodGatfruit - FoodGatfruit
harvestRepeat: Repeat lifespan: 65
lifespan: 55 maturation: 25
maturation: 6 production: 25
production: 6 yield: 1
yield: 2
potency: 10 potency: 10
growthStages: 2 growthStages: 2
idealLight: 6 idealLight: 6