Skip to content

Commit

Permalink
Revert "Add 4 New Mining Materials (#1693)"
Browse files Browse the repository at this point in the history
This reverts commit dad3d5d.
The ores are, as TCJ says in the PR above, unfinished. As such, they are not ready for gameplay.
Only one material in this list has a use- for T3 Epi End-Game research thats likely not going to be used anytime soon.
Also, the sell prices for the new mats aren't good for outright selling
The Lava Planet rework is not good, as well. It devalues exploring the planet and instead just
incentivizes minecraft-ass strip mining for efficiency because you're effectively gambling.
  • Loading branch information
RadsammyT committed Feb 8, 2025
1 parent 099594b commit 2c20a2e
Show file tree
Hide file tree
Showing 119 changed files with 26 additions and 1,526 deletions.
9 changes: 0 additions & 9 deletions Resources/Locale/en-US/materials/materials.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ materials-steel = steel
materials-gold = gold
materials-silver = silver
materials-plasteel = plasteel
materials-aluminium = aluminium
materials-copper = copper
materials-tungsten = tungsten-carbide
materials-lead = lead
# Other
materials-biomass = biomass
Expand Down Expand Up @@ -45,11 +41,6 @@ materials-raw-bananium = raw bananium
materials-raw-salt = raw salt
materials-raw-bluespace = raw bluespace
materials-raw-normality = raw normality
materials-raw-aluminium = raw aluminium
materials-raw-lead = raw lead
materials-raw-sulfur = raw sulfur
materials-raw-copper = raw copper
materials-raw-tungsten = raw tungsten
# Material Reclaimer
material-reclaimer-upgrade-process-rate = process rate
37 changes: 0 additions & 37 deletions Resources/Prototypes/Entities/Objects/Materials/ingots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,40 +115,3 @@
state: silver
- type: Stack
count: 1

- type: entity
parent: IngotBase
id: IngotTungsten
name: tungsten-carbide bar
suffix: Full
components:
- type: Material
- type: PhysicalComposition
materialComposition:
Tungsten: 100
- type: Stack
stackType: Tungsten
baseLayer: base
layerStates:
- tungsten_1
- tungsten_2
- tungsten_3
- type: Sprite
state: tungsten_3
layers:
- state: tungsten_3
map: ["base"]
- type: Item
heldPrefix: tungsten
- type: Appearance

- type: entity
parent: IngotTungsten
id: IngotTungsten1
name: tungsten-carbide bar
suffix: Single
components:
- type: Sprite
state: tungsten_1
- type: Stack
count: 1
23 changes: 0 additions & 23 deletions Resources/Prototypes/Entities/Objects/Materials/ore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,26 +424,3 @@
components:
- type: Stack
count: 1

- type: entity
parent: OreBase
id: TungstenOre
name: wolframite
suffix: Full
components:
- type: Stack
stackType: TungstenOre
- type: Sprite
state: tungsten
- type: Material
- type: PhysicalComposition
materialComposition:
RawTungsten: 500

- type: entity
parent: TungstenOre
id: TungstenOre1
suffix: Single
components:
- type: Stack
count: 1
10 changes: 0 additions & 10 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
- RootSpeakTranslator
- BasicGalaticCommonTranslatorImplanter
- MofficTranslator
- N14MaterialCircuitry
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxLethalshot
Expand Down Expand Up @@ -296,7 +295,6 @@
- LargeBeaker
- Dropper
- ClothingEyesGlassesChemical
- N14MaterialCircuitry
dynamicRecipes:
- PowerDrill
- MiningDrill
Expand Down Expand Up @@ -496,7 +494,6 @@
- ReagentGrinderIndustrialMachineCircuitboard
- StasisBedMachineCircuitboard
- CryoPodMachineCircuitboard
- N14MaterialCircuitry
dynamicRecipes:
- ThermomachineFreezerMachineCircuitBoard
- HellfireFreezerMachineCircuitBoard
Expand Down Expand Up @@ -1059,9 +1056,6 @@
- WeaponMechCombatDisabler
- WeaponMechCombatFlashbangLauncher
- WeaponMechCombatMissileRack8
- EnergySword
- EnergySwordDouble
- EnergyCutlass
- type: MaterialStorage
whitelist:
tags:
Expand Down Expand Up @@ -1488,10 +1482,6 @@
- IngotGold1
- IngotSilver1
- MaterialBananium1
- N14IngotLead1
- N14IngotCopper1
- N14IngotAluminium1
- IngotTungsten1
- type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
magnetEnabled: True
range: 0.30 # Delta V - End Magnet Pull
Expand Down
Loading

0 comments on commit 2c20a2e

Please sign in to comment.