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.

Sign up for GitHub

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 EE Specific Ores To Lavaland #1864

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Add EE Specific Ores To Lavaland #1864

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4cbb8
Add EE Specific Ores to Lavaland
VMSolidus Mar 3, 2025
bdcb84c
Update asteroid.yml
VMSolidus Mar 3, 2025
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
138 changes: 135 additions & 3 deletions Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,28 @@
state: rock_asteroid_west
- state: rock_copper

- type: entity
id: AsteroidRockTungsten
parent: AsteroidRock
description: An ore vein rich with wolframite.
suffix: Copper
components:
- type: OreVein
oreChance: 1.0
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock_asteroid
- map: [ "enum.EdgeLayer.South" ]
state: rock_asteroid_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_asteroid_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_asteroid_north
- map: [ "enum.EdgeLayer.West" ]
Comment on lines +511 to +517
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

YAML Formatting: Extraneous Spaces in Bracket Lists
Our YAML static analysis tools have flagged multiple instances where there appear to be too many spaces inside bracketed lists (for example, lines like

- map: [ "enum.EdgeLayer.South" ]

may benefit from tighter spacing, e.g.,

- map: ["enum.EdgeLayer.South"]

While these warnings can sometimes be false positives, please verify that our YAML style guidelines are met across these ranges. Consistent formatting will help keep our code as shipshape as our fleet!

Also applies to: 934-940, 1331-1337, 1728-1734, 2124-2130, 2521-2527, 2918-2924

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 511-511: too many spaces inside brackets

(brackets)

[error] 511-511: too many spaces inside brackets

(brackets)

[error] 513-513: too many spaces inside brackets

(brackets)

[error] 513-513: too many spaces inside brackets

(brackets)

[error] 515-515: too many spaces inside brackets

(brackets)

[error] 515-515: too many spaces inside brackets

(brackets)

[error] 517-517: too many spaces inside brackets

(brackets)

[error] 517-517: too many spaces inside brackets

(brackets)

state: rock_asteroid_west
- state: rock_copper


Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

⚠️ Potential issue

AsteroidRockTungsten: Incorrect Suffix and Sprite State!
The new asteroid tungsten ore entity is intended to represent an ore vein rich with wolframite, yet it still uses suffix: Copper and references rock_copper for its sprite. This mislabelling could confuse both players and subsequent systems. Please update these to reflect tungsten (for example, use suffix: Tungsten and set the sprite state to something like rock_tungsten).

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 511-511: too many spaces inside brackets

(brackets)

[error] 511-511: too many spaces inside brackets

(brackets)

[error] 513-513: too many spaces inside brackets

(brackets)

[error] 513-513: too many spaces inside brackets

(brackets)

[error] 515-515: too many spaces inside brackets

(brackets)

[error] 515-515: too many spaces inside brackets

(brackets)

[error] 517-517: too many spaces inside brackets

(brackets)

[error] 517-517: too many spaces inside brackets

(brackets)

# Rocks and ore veins
- type: entity
Expand Down Expand Up @@ -897,6 +919,28 @@
state: rock_west
- state: rock_copper

- type: entity
id: WallRockTungsten
parent: WallRock
description: An ore vein rich with wolframite.
suffix: Copper
components:
- type: OreVein
oreChance: 1.0
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock
- map: [ "enum.EdgeLayer.South" ]
state: rock_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_west
- state: rock_copper

Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

⚠️ Potential issue

WallRockTungsten: Suffix and Sprite Mismatch!
The wall variant for tungsten ore currently misuses suffix: Copper and ends its sprite definition with rock_copper. Adjust these so that the entity clearly represents tungsten—for example, use suffix: Tungsten and update sprite layers accordingly (e.g. rock_tungsten).

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 934-934: too many spaces inside brackets

(brackets)

[error] 934-934: too many spaces inside brackets

(brackets)

[error] 936-936: too many spaces inside brackets

(brackets)

[error] 936-936: too many spaces inside brackets

(brackets)

[error] 938-938: too many spaces inside brackets

(brackets)

[error] 938-938: too many spaces inside brackets

(brackets)

[error] 940-940: too many spaces inside brackets

(brackets)

[error] 940-940: too many spaces inside brackets

(brackets)

# Basalt variants
- type: entity
id: WallRockBasalt
Expand Down Expand Up @@ -1272,6 +1316,28 @@
state: rock_wall_west
- state: rock_copper

- type: entity
id: WallRockBasaltTungsten
parent: WallRockBasalt
description: An ore vein rich with wolframite.
suffix: Copper
components:
- type: OreVein
oreChance: 1.0
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock_wall
- map: [ "enum.EdgeLayer.South" ]
state: rock_wall_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_wall_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_wall_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_wall_west
- state: rock_copper

Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

⚠️ Potential issue

WallRockBasaltTungsten: Mismatched Suffix and Visuals!
This basalt tungsten entity is incorrectly labelled with suffix: Copper and utilizes a sprite state of rock_copper. Correct these identifiers to better reflect its tungsten nature (suggested: suffix: Tungsten and a sprite state like rock_tungsten).

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 1331-1331: too many spaces inside brackets

(brackets)

[error] 1331-1331: too many spaces inside brackets

(brackets)

[error] 1333-1333: too many spaces inside brackets

(brackets)

[error] 1333-1333: too many spaces inside brackets

(brackets)

[error] 1335-1335: too many spaces inside brackets

(brackets)

[error] 1335-1335: too many spaces inside brackets

(brackets)

[error] 1337-1337: too many spaces inside brackets

(brackets)

[error] 1337-1337: too many spaces inside brackets

(brackets)

# Snow variants
- type: entity
id: WallRockSnow
Expand Down Expand Up @@ -1647,6 +1713,28 @@
state: rock_snow_west
- state: rock_copper

- type: entity
id: WallRockSnowTungsten
parent: WallRockSnow
description: An ore vein rich with wolframite.
suffix: Copper
components:
- type: OreVein
oreChance: 1.0
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock_snow
- map: [ "enum.EdgeLayer.South" ]
state: rock_snow_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_snow_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_snow_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_snow_west
- state: rock_copper

Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

⚠️ Potential issue

WallRockSnowTungsten: Inconsistent Labeling!
The snow variant for tungsten still carries the suffix: Copper and references rock_copper in its sprite layers. Update these to use tungsten-specific naming (e.g. suffix: Tungsten and a sprite state such as rock_tungsten) to maintain consistency across ore types.

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 1728-1728: too many spaces inside brackets

(brackets)

[error] 1728-1728: too many spaces inside brackets

(brackets)

[error] 1730-1730: too many spaces inside brackets

(brackets)

[error] 1730-1730: too many spaces inside brackets

(brackets)

[error] 1732-1732: too many spaces inside brackets

(brackets)

[error] 1732-1732: too many spaces inside brackets

(brackets)

[error] 1734-1734: too many spaces inside brackets

(brackets)

[error] 1734-1734: too many spaces inside brackets

(brackets)

# Sand variants
- type: entity
id: WallRockSand
Expand Down Expand Up @@ -2021,6 +2109,28 @@
state: rock_sand_west
- state: rock_copper

- type: entity
id: WallRockSandTungsten
parent: WallRockSand
description: An ore vein rich with wolframite.
suffix: Tungsten
components:
- type: OreVein
oreChance: 1.0
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock_sand
- map: [ "enum.EdgeLayer.South" ]
state: rock_sand_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_sand_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_sand_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_sand_west
- state: rock_copper

Comment on lines +2112 to +2133
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

⚠️ Potential issue

WallRockSandTungsten: Sprite State Issue!
While the entity designation is correct with suffix: Tungsten, the sprite layer erroneously references rock_copper. Please amend the sprite state to reflect tungsten, for example to rock_tungsten.

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 2124-2124: too many spaces inside brackets

(brackets)

[error] 2124-2124: too many spaces inside brackets

(brackets)

[error] 2126-2126: too many spaces inside brackets

(brackets)

[error] 2126-2126: too many spaces inside brackets

(brackets)

[error] 2128-2128: too many spaces inside brackets

(brackets)

[error] 2128-2128: too many spaces inside brackets

(brackets)

[error] 2130-2130: too many spaces inside brackets

(brackets)

[error] 2130-2130: too many spaces inside brackets

(brackets)

# Chromite variants
- type: entity
id: WallRockChromite
Expand Down Expand Up @@ -2375,14 +2485,14 @@
- state: rock_lead

- type: entity
id: WallRockChromiteCopper
id: WallRockChromiteTungsten
parent: WallRockChromite
description: An ore vein rich with native copper.
description: An ore vein rich with wolframite.
suffix: Copper
components:
- type: OreVein
oreChance: 1.0
currentOre: OreCopper
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock_chromite
Expand Down Expand Up @@ -2770,3 +2880,25 @@
- map: [ "enum.EdgeLayer.West" ]
state: rock_andesite_west
- state: rock_copper

- type: entity
id: WallRockAndesiteTungsten
parent: WallRockAndesite
description: An ore vein rich with wolframite.
suffix: Tungsten
components:
- type: OreVein
oreChance: 1.0
currentOre: OreTungsten
- type: Sprite
layers:
- state: rock_andesite
- map: [ "enum.EdgeLayer.South" ]
state: rock_andesite_south
- map: [ "enum.EdgeLayer.East" ]
state: rock_andesite_east
- map: [ "enum.EdgeLayer.North" ]
state: rock_andesite_north
- map: [ "enum.EdgeLayer.West" ]
state: rock_andesite_west
- state: rock_copper
14 changes: 14 additions & 0 deletions Resources/Prototypes/Procedural/biome_ore_templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,20 @@
maxGroupSize: 2
radius: 4

- type: biomeMarkerLayer
id: OreTungsten
entityMask:
AsteroidRock: AsteroidRockTungsten
WallRock: WallRockTungsten
WallRockBasalt: WallRockBasaltTungsten
WallRockChromite: WallRockChromiteTungsten
WallRockSand: WallRockSandTungsten
WallRockSnow: WallRockSnowTungsten
maxCount: 6
minGroupSize: 3
maxGroupSize: 6
radius: 4

# Artifact Fragment
- type: biomeMarkerLayer
id: OreArtifactFragment
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Procedural/salvage_loot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,10 @@
loots:
- !type:BiomeMarkerLoot
proto: OreNormality

- type: salvageLoot
id: OreTungsten
guaranteed: true
loots:
- !type:BiomeMarkerLoot
proto: OreTungsten
7 changes: 6 additions & 1 deletion Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
- OreSilver
- OrePlasma
- OreUranium
#- OreBananium
- OreBananium
- OreArtifactFragment
- OreDiamond
- OreBluespace
- OreAluminium
- OreCopper
- OreTungsten
- OreLead
- OreNormality
Loading