From 86c1e36cd54c474f87a9873e34f78a517b6410bd Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 5 Jan 2024 21:52:40 -0500 Subject: [PATCH] Fix iron naming, add specific materials for ores (#23590) add materials for ores, fix iron naming --- .../Components/GatewayGeneratorComponent.cs | 2 +- .../Locale/en-US/materials/materials.ftl | 9 +++ Resources/Locale/en-US/materials/units.ftl | 2 + .../Locale/en-US/salvage/salvage-magnet.ftl | 2 +- .../Entities/Objects/Materials/ore.yml | 16 ++--- .../Entities/Structures/Machines/lathe.yml | 2 - .../Prototypes/Procedural/Magnet/asteroid.yml | 2 +- .../Procedural/biome_ore_templates.yml | 2 +- .../Prototypes/Procedural/salvage_loot.yml | 4 +- .../Prototypes/Reagents/Materials/ores.yml | 61 +++++++++++++++++++ Resources/Prototypes/Recipes/Lathes/sheet.yml | 26 ++++---- Resources/Prototypes/Stacks/Materials/ore.yml | 2 +- 12 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 Resources/Prototypes/Reagents/Materials/ores.yml diff --git a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs index 90b86bad52..670cbea307 100644 --- a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs +++ b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs @@ -55,7 +55,7 @@ public sealed partial class GatewayGeneratorComponent : Component /// public List> LootLayers = new() { - "OreTin", + "OreIron", "OreQuartz", "OreGold", "OreSilver", diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index a25cf2da14..689fca4dd7 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -26,5 +26,14 @@ materials-web = silk materials-bones = bone materials-coal = coal +# Ores +materials-raw-iron = raw iron +materials-raw-quartz = raw quartz +materials-raw-gold = raw gold +materials-raw-silver = raw silver +materials-raw-plasma = raw plasma +materials-raw-uranium = raw uranium +materials-raw-bananium = raw bananium + # Material Reclaimer material-reclaimer-upgrade-process-rate = process rate diff --git a/Resources/Locale/en-US/materials/units.ftl b/Resources/Locale/en-US/materials/units.ftl index 9915444bdc..bff854086b 100644 --- a/Resources/Locale/en-US/materials/units.ftl +++ b/Resources/Locale/en-US/materials/units.ftl @@ -14,6 +14,8 @@ materials-unit-bunch = bunch materials-unit-slab = slab # webs of silk materials-unit-web = web +# chunks of ore +materials-unit-chunk = chunk # bills of spesos... not very good but they are not (yet?) used for crafting anything # also the lathe/atm would need bigger denominations to output... diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl index 72ae64a633..82d84fe74c 100644 --- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl +++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl @@ -7,7 +7,7 @@ salvage-asteroid-name = Asteroid salvage-expedition-window-progression = Progression salvage-magnet-resources = {$resource -> - [OreTin] Tin + [OreIron] Iron [OreCoal] Coal [OreQuartz] Quartz [OreGold] Gold diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml index aa3ebfaaf2..2159f3abb2 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -48,7 +48,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Gold: 500 + RawGold: 500 - type: entity parent: GoldOre @@ -61,7 +61,7 @@ - type: entity parent: OreBase id: SteelOre - name: steel ore + name: iron ore suffix: Full components: - type: Stack @@ -71,7 +71,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Steel: 500 + RawIron: 500 - type: entity id: SteelOre1 @@ -94,7 +94,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Plasma: 500 + RawPlasma: 500 - type: entity parent: PlasmaOre @@ -117,7 +117,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Silver: 500 + RawSilver: 500 - type: entity parent: SilverOre @@ -140,7 +140,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Glass: 500 + RawQuartz: 500 - type: entity parent: SpaceQuartz @@ -163,7 +163,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Uranium: 500 + RawUranium: 500 - type: entity parent: UraniumOre @@ -186,7 +186,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Bananium: 500 + RawBananium: 500 - type: entity parent: BananiumOre diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 25c2355015..dad8dad66d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -988,9 +988,7 @@ - type: Machine board: OreProcessorMachineCircuitboard - type: MaterialStorage - dropOnDeconstruct: false #should drop ores instead of ingots/sheets ignoreColor: true - canEjectStoredMaterials: false whitelist: tags: - Ore diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml index 6fb74994cc..df5e40da23 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml @@ -1,7 +1,7 @@ - type: weightedRandom id: AsteroidOre weights: - OreTin: 1.0 + OreIron: 1.0 OreQuartz: 1.0 OreCoal: 1.0 OreGold: 0.25 diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml index cebc4cb3c4..1aba55128f 100644 --- a/Resources/Prototypes/Procedural/biome_ore_templates.yml +++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml @@ -1,6 +1,6 @@ # Low value - type: biomeMarkerLayer - id: OreTin + id: OreIron entityMask: AsteroidRock: AsteroidRockTin WallRock: WallRockTin diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 8c3b2c697f..5456603ef9 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -119,11 +119,11 @@ # Ores - these are guaranteed # - Low value - type: salvageLoot - id: OreTin + id: OreIron guaranteed: true loots: - !type:BiomeMarkerLoot - proto: OreTin + proto: OreIron - type: salvageLoot id: OreCoal diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml new file mode 100644 index 0000000000..4f4dceea8b --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/ores.yml @@ -0,0 +1,61 @@ +- type: material + id: RawIron + stackEntity: SteelOre1 + name: materials-raw-iron + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: iron } + price: 0.05 + +- type: material + id: RawQuartz + stackEntity: SpaceQuartz1 + name: materials-raw-quartz + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: spacequartz } + color: "#a8ccd7" + price: 0.075 + +- type: material + id: RawGold + stackEntity: GoldOre1 + name: materials-raw-gold + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: gold } + color: "#FFD700" + price: 0.2 + +- type: material + id: RawSilver + stackEntity: SilverOre1 + name: materials-raw-silver + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: silver } + color: "#C0C0C0" + price: 0.15 + +- type: material + id: RawPlasma + stackEntity: PlasmaOre1 + name: materials-raw-plasma + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: plasma } + color: "#7e009e" + price: 0.2 + +- type: material + id: RawUranium + stackEntity: UraniumOre1 + name: materials-raw-uranium + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: uranium } + color: "#32a852" + price: 0.2 + +- type: material + id: RawBananium + stackEntity: BananiumOre1 + name: materials-raw-bananium + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: bananium } + color: "#32a852" + price: 0.2 diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index cb31c55dda..9f742ffe73 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -4,14 +4,14 @@ applyMaterialDiscount: false completetime: 2 materials: - Steel: 100 + RawIron: 100 - type: latheRecipe id: SheetSteel30 result: SheetSteel completetime: 2 materials: - Steel: 3000 + RawIron: 3000 Coal: 1000 - type: latheRecipe @@ -20,14 +20,14 @@ applyMaterialDiscount: false completetime: 2 materials: - Glass: 100 + RawQuartz: 100 - type: latheRecipe id: SheetGlass30 result: SheetGlass completetime: 2 materials: - Glass: 3000 + RawQuartz: 3000 - type: latheRecipe id: SheetRGlass @@ -68,56 +68,56 @@ result: SheetPlasma completetime: 2 materials: - Plasma: 3000 + RawPlasma: 3000 - type: latheRecipe id: SheetUranium30 result: SheetUranium completetime: 2 materials: - Uranium: 3000 + RawUranium: 3000 - type: latheRecipe id: IngotGold30 result: IngotGold completetime: 2 materials: - Gold: 3000 + RawGold: 3000 - type: latheRecipe id: IngotSilver30 result: IngotSilver completetime: 2 materials: - Silver: 3000 + RawSilver: 3000 - type: latheRecipe id: MaterialBananium10 result: MaterialBananium completetime: 2 materials: - Bananium: 3000 + RawBananium: 3000 - type: latheRecipe id: SheetUranium1 result: SheetUranium1 completetime: 2 materials: - Uranium: 500 + RawUranium: 500 - type: latheRecipe id: IngotGold1 result: IngotGold1 completetime: 2 materials: - Gold: 500 + RawGold: 500 - type: latheRecipe id: IngotSilver1 result: IngotSilver1 completetime: 2 materials: - Silver: 500 + RawSilver: 500 - type: latheRecipe id: SheetPlastic @@ -132,7 +132,7 @@ result: MaterialBananium1 completetime: 2 materials: - Bananium: 500 + RawBananium: 500 - type: latheRecipe id: MaterialSheetMeat diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml index 087786ded8..b7b32c8b23 100644 --- a/Resources/Prototypes/Stacks/Materials/ore.yml +++ b/Resources/Prototypes/Stacks/Materials/ore.yml @@ -8,7 +8,7 @@ - type: stack id: SteelOre - name: steel ore + name: iron ore icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron } spawn: SteelOre1 maxCount: 30