Salvage mining, ore processing, and material clean-up (#7406)
* adding stuff cuz new computer * removed unused materials * remove unused materials and such, lathe things * material volume no longer hardcoded * fixed mining system * add 5 stacks of materials, and add them to the ore processor * fix copyright for ores and handdrill * comma momma * whyyyyy * more fixes to make the yaml linter happy * i should get my eyes checked * silver proper * more cleanup * leftovers * remove more references to material doors * couldn't bear to be without bearhide * added uranium, added more lathe recipes * copyright fix, stack fix * ore processor sprite and such * ore processing some binches * MaterialCotton removal * 1 uranium ore means 1 sheet * fix merge conflict? idk * time to ketchup * lathe recognizes material volume again * yaml cleanup * forgot to remove adamantine lol * re-added diamond for now * diamond stacks * functional ore processor * added ignoreColor to lathe visuals * ore processor machine board * add board to industrial tech and circuit printer * provided lathes their whitelists * fix wonky ore spawning, added insert sound to lathe, adjusted ore chance * re-added ore processor * typos and cleanup * Update Content.Client/Lathe/LatheSystem.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update Content.Server/Lathe/LatheSystem.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * revert mapchange * VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn * actually null canceltoken * remove five-stacks, ore processor produces full stacks or single sheets/ingots * VV proper * adjust ore chances * readd Cotton * Update Content.Server/Mining/MineableSystem.cs * tweaks * Material is now dict (material, volume) * removed unused property * Space crystal -> space quartz * forgor asteroid space quartz Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Chris V
GitHub
@@ -27,20 +27,6 @@
|
||||
- material: Plasma
|
||||
amount: 20
|
||||
doAfter: 15
|
||||
- to: diamondDoor
|
||||
completed:
|
||||
- !type:SnapToGrid { }
|
||||
steps:
|
||||
- material: Diamond
|
||||
amount: 20
|
||||
doAfter: 15
|
||||
- to: uraniumDoor
|
||||
completed:
|
||||
- !type:SnapToGrid { }
|
||||
steps:
|
||||
- material: Uranium
|
||||
amount: 20
|
||||
doAfter: 15
|
||||
- to: goldDoor
|
||||
completed:
|
||||
- !type:SnapToGrid { }
|
||||
@@ -55,13 +41,6 @@
|
||||
- material: Silver
|
||||
amount: 20
|
||||
doAfter: 15
|
||||
- to: sandstoneDoor
|
||||
completed:
|
||||
- !type:SnapToGrid { }
|
||||
steps:
|
||||
- material: Sand
|
||||
amount: 20
|
||||
doAfter: 15
|
||||
- to: paperDoor
|
||||
completed:
|
||||
- !type:SnapToGrid { }
|
||||
@@ -102,28 +81,6 @@
|
||||
steps:
|
||||
- tool: Anchoring
|
||||
doAfter: 15
|
||||
- node: diamondDoor
|
||||
entity: DiamondDoor
|
||||
edges:
|
||||
- to: start
|
||||
completed:
|
||||
- !type:SpawnPrototype
|
||||
prototype: MaterialDiamond1
|
||||
amount: 20
|
||||
steps:
|
||||
- tool: Anchoring
|
||||
doAfter: 15
|
||||
- node: uraniumDoor
|
||||
entity: UraniumDoor
|
||||
edges:
|
||||
- to: start
|
||||
completed:
|
||||
- !type:SpawnPrototype
|
||||
prototype: SheetUranium1
|
||||
amount: 20
|
||||
steps:
|
||||
- tool: Anchoring
|
||||
doAfter: 15
|
||||
- node: goldDoor
|
||||
entity: GoldDoor
|
||||
edges:
|
||||
@@ -146,17 +103,6 @@
|
||||
steps:
|
||||
- tool: Anchoring
|
||||
doAfter: 15
|
||||
- node: sandstoneDoor
|
||||
entity: SandstoneDoor
|
||||
edges:
|
||||
- to: start
|
||||
completed:
|
||||
- !type:SpawnPrototype
|
||||
prototype: Sand
|
||||
amount: 20
|
||||
steps:
|
||||
- tool: Anchoring
|
||||
doAfter: 15
|
||||
- node: paperDoor
|
||||
entity: PaperDoor
|
||||
edges:
|
||||
|
||||
@@ -573,40 +573,6 @@
|
||||
conditions:
|
||||
- !type:TileNotBlocked
|
||||
|
||||
- type: construction
|
||||
name: diamond door
|
||||
id: DiamondDoor
|
||||
graph: DoorGraph
|
||||
startNode: start
|
||||
targetNode: diamondDoor
|
||||
category: Structures
|
||||
description: A primitive door with manual operation like the cavemen used.
|
||||
objectType: Structure
|
||||
placementMode: SnapgridCenter
|
||||
canBuildInImpassable: false
|
||||
icon:
|
||||
sprite: Structures/Doors/MineralDoors/diamond_door.rsi
|
||||
state: closed
|
||||
conditions:
|
||||
- !type:TileNotBlocked
|
||||
|
||||
- type: construction
|
||||
name: uranium door
|
||||
id: UraniumDoor
|
||||
graph: DoorGraph
|
||||
startNode: start
|
||||
targetNode: uraniumDoor
|
||||
category: Structures
|
||||
description: A primitive door with manual operation like the cavemen used.
|
||||
objectType: Structure
|
||||
placementMode: SnapgridCenter
|
||||
canBuildInImpassable: false
|
||||
icon:
|
||||
sprite: Structures/Doors/MineralDoors/uranium_door.rsi
|
||||
state: closed
|
||||
conditions:
|
||||
- !type:TileNotBlocked
|
||||
|
||||
- type: construction
|
||||
name: gold door
|
||||
id: GoldDoor
|
||||
@@ -641,23 +607,6 @@
|
||||
conditions:
|
||||
- !type:TileNotBlocked
|
||||
|
||||
- type: construction
|
||||
name: sandstone door
|
||||
id: SandstoneDoor
|
||||
graph: DoorGraph
|
||||
startNode: start
|
||||
targetNode: sandstoneDoor
|
||||
category: Structures
|
||||
description: A primitive door with manual operation like the cavemen used.
|
||||
objectType: Structure
|
||||
placementMode: SnapgridCenter
|
||||
canBuildInImpassable: false
|
||||
icon:
|
||||
sprite: Structures/Doors/MineralDoors/sandstone_door.rsi
|
||||
state: closed
|
||||
conditions:
|
||||
- !type:TileNotBlocked
|
||||
|
||||
- type: construction
|
||||
name: paper door
|
||||
id: PaperDoor
|
||||
|
||||
@@ -194,6 +194,16 @@
|
||||
Steel: 100
|
||||
Glass: 900
|
||||
Gold: 100
|
||||
|
||||
- type: latheRecipe
|
||||
id: OreProcessorMachineCircuitboard
|
||||
icon: Objects/Misc/module.rsi/id_mod.png
|
||||
result: OreProcessorMachineCircuitboard
|
||||
completetime: 4
|
||||
materials:
|
||||
Steel: 100
|
||||
Glass: 900
|
||||
Gold: 100
|
||||
# Power
|
||||
- type: latheRecipe
|
||||
id: APCElectronics
|
||||
|
||||
@@ -7,6 +7,16 @@
|
||||
completetime: 2
|
||||
materials:
|
||||
Steel: 100
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetSteel30
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/metal.rsi
|
||||
state: steel_3
|
||||
result: SheetSteel
|
||||
completetime: 2
|
||||
materials:
|
||||
Steel: 3000
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetGlass1
|
||||
@@ -17,6 +27,16 @@
|
||||
completetime: 2
|
||||
materials:
|
||||
Glass: 100
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetGlass30
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/glass.rsi
|
||||
state: glass_3
|
||||
result: SheetGlass
|
||||
completetime: 2
|
||||
materials:
|
||||
Glass: 3000
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetRGlass
|
||||
@@ -28,6 +48,80 @@
|
||||
materials:
|
||||
Glass: 100
|
||||
Steel: 50
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetRGlass30
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/glass.rsi
|
||||
state: rglass_3
|
||||
result: SheetRGlass
|
||||
completetime: 2
|
||||
materials:
|
||||
Glass: 3000
|
||||
Steel: 1500
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetPGlass30
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/glass.rsi
|
||||
state: pglass_3
|
||||
result: SheetPGlass
|
||||
completetime: 2
|
||||
materials:
|
||||
Glass: 3000
|
||||
Plasma: 3000
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetRPGlass30
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/glass.rsi
|
||||
state: rpglass_3
|
||||
result: SheetRPGlass
|
||||
completetime: 2
|
||||
materials:
|
||||
Glass: 3000
|
||||
Plasma: 3000
|
||||
Steel: 1500
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetPlasma30
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/other.rsi
|
||||
state: plasma_3
|
||||
result: SheetPlasma
|
||||
completetime: 2
|
||||
materials:
|
||||
Plasma: 3000
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetUranium1
|
||||
icon:
|
||||
sprite: Objects/Materials/Sheets/other.rsi
|
||||
state: uranium
|
||||
result: SheetUranium1
|
||||
completetime: 2
|
||||
materials:
|
||||
Uranium: 500
|
||||
|
||||
- type: latheRecipe
|
||||
id: IngotGold1
|
||||
icon:
|
||||
sprite: Objects/Materials/ingots.rsi
|
||||
state: gold
|
||||
result: IngotGold1
|
||||
completetime: 2
|
||||
materials:
|
||||
Gold: 500
|
||||
|
||||
- type: latheRecipe
|
||||
id: IngotSilver1
|
||||
icon:
|
||||
sprite: Objects/Materials/ingots.rsi
|
||||
state: silver
|
||||
result: IngotSilver1
|
||||
completetime: 2
|
||||
materials:
|
||||
Silver: 500
|
||||
|
||||
- type: latheRecipe
|
||||
id: SheetPlastic
|
||||
|
||||
Reference in New Issue
Block a user