Nature Overhaul, Infinite Trees - #5479
Conversation
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughSummaryThis PR updates natural-area visuals with Crystal Punk grass and tree assets.
User impactMappers can combine mowed and unmowed astro-grass to control grass-edge blending. Players see more varied trees, grass, snowy vegetation, dead trees, and water-reed decorations in natural areas. Notable upstream-file changes
Risk areas
Guideline gaps
WalkthroughChangesAdds CP14 grass tiles and flora sprites, defines Starlight tree and water-reed prototypes, updates existing tree resources, adds grass localization, and connects Starlight trees to random flora spawners. ChangesCP14 flora and grass integration
Estimated code review effort: 3 (Moderate) | ~25 minutes Suggested reviewers: Sequence Diagram(s)sequenceDiagram
participant RandomTreeSpawner
participant TreePrototypePool
participant StarlightTreePrototype
RandomTreeSpawner->>TreePrototypePool: Select a regular or rare tree prototype
TreePrototypePool->>StarlightTreePrototype: Instantiate the selected Starlight tree
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Resources/Locale/en-US/_Starlight/tiles/tiles.ftl`:
- Around line 55-62: Add the missing `tiles-astro-grass-classic` localization
entry in the Grass section alongside the existing classic astro-grass keys,
using the appropriate classic astro-grass display text so
`FloorAstroGrassClassic` resolves without showing the raw key.
In `@Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml`:
- Around line 298-301: Update the name field of FloraTreeConiferBigSL from
“medium conifer tree” to “large conifer tree” so it accurately identifies the
big conifer and differs from FloraTreeConiferMediumSL.
In `@Resources/Prototypes/Entities/Objects/Decoration/flora.yml`:
- Line 304: Remove the trailing whitespace after the `#SL` Starlight markers in
Resources/Prototypes/Entities/Objects/Decoration/flora.yml at lines 304, 312,
and 360, leaving the inheritance declarations otherwise unchanged.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 243702b9-9501-4039-b27f-44bd97192506
⛔ Files ignored due to path filters (89)
Resources/Textures/_CP14/Decals/water_reeds.rsi/big1.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big2.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big3.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big4.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big5.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big6.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big7.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/big8.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small1.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small10.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small11.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small2.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small3.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small4.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small5.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small6.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small7.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small8.pngis excluded by!**/*.pngResources/Textures/_CP14/Decals/water_reeds.rsi/small9.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree05.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/tree06.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge05.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/treelarge06.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_big.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_big.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_medium.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_medium.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_small.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_small.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree05.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/tree06.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_big.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_big.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree01.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree02.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree03.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree04.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree05.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/tree06.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/1.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/2.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/3.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/4.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/5.pngis excluded by!**/*.pngResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/6.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/Grass/double_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/Grass/grass.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/Grass/single_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/Grass/triple_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassDark/double_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassDark/grass.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassDark/single_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassDark/triple_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassLight/double_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassLight/grass.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassLight/single_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassLight/triple_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassTall/double_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassTall/grass.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassTall/single_edge.pngis excluded by!**/*.pngResources/Textures/_CP14/Tiles/GrassTall/triple_edge.pngis excluded by!**/*.png
📒 Files selected for processing (26)
Resources/Locale/en-US/_Starlight/tiles/tiles.ftlResources/Prototypes/Entities/Markers/Spawners/Random/flora.ymlResources/Prototypes/Entities/Objects/Decoration/flora.ymlResources/Prototypes/Tiles/floors.ymlResources/Prototypes/Tiles/planet.ymlResources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.ymlResources/Prototypes/_Starlight/Tiles/floors.ymlResources/Prototypes/_Starlight/Tiles/planet.ymlResources/Textures/_CP14/Decals/water_reeds.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/flora_trees.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/flora_treeslarge.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_big.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_medium.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_birch_small.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_died.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_died_small.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_snow.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_big.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_medium_snow.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/meta.jsonResources/Textures/_CP14/Objects/Decoration/Flora/tree_vampire.rsi/meta.jsonResources/Textures/_CP14/Tiles/Grass/attribution.ymlResources/Textures/_CP14/Tiles/GrassDark/attribution.ymlResources/Textures/_CP14/Tiles/GrassLight/attribution.ymlResources/Textures/_CP14/Tiles/GrassTall/attribution.yml
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Resources/Prototypes/_Starlight/Decals/flora.yml`:
- Around line 127-134: Add a WaterReedsSmall7 decal prototype immediately before
WaterReedsSmall8, matching the neighboring reed entries’ flora tag, snapping
settings, sprite resource, and using state small7.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: f1db11a2-89aa-4bce-9ae6-656fe3654fa5
📒 Files selected for processing (6)
Resources/Locale/en-US/_Starlight/tiles/tiles.ftlResources/Prototypes/Entities/Objects/Decoration/flora.ymlResources/Prototypes/Tiles/floors.ymlResources/Prototypes/Tiles/planet.ymlResources/Prototypes/_Starlight/Decals/flora.ymlResources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/meta.json
🚧 Files skipped from review as they are similar to previous changes (5)
- Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
- Resources/Prototypes/Tiles/planet.yml
- Resources/Prototypes/Entities/Objects/Decoration/flora.yml
- Resources/Textures/_CP14/Objects/Decoration/Flora/tree_spruce_small.rsi/meta.json
- Resources/Prototypes/Tiles/floors.yml
redmushie
left a comment
There was a problem hiding this comment.
Stopping now because some major changes required; all files must move from _CP14 to _Starlight since the source fork is defunct and thus will inevitably no longer produce updates. Therefore we now maintain the content.
|
Hell yeah we playing stardew valley now |
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Resources/Prototypes/_Starlight/Decals/flora.yml (1)
154-161: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick winRename the
WaterReedsSmall0prototype.The new
WaterReedsSmall7entry correctly fills the previous gap. However, Line 155 declaresWaterReedsSmall0while Line 161 uses statesmall10. This leavesWaterReedsSmall10unavailable.Proposed fix
- id: WaterReedsSmall0 + id: WaterReedsSmall10🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Resources/Prototypes/_Starlight/Decals/flora.yml` around lines 154 - 161, Rename the decal prototype id from WaterReedsSmall0 to WaterReedsSmall10 in the entry using sprite state small10, so the prototype id matches its state and makes WaterReedsSmall10 available.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Resources/Prototypes/_Starlight/Decals/flora.yml`:
- Line 16: Remove the trailing whitespace after the *waterReeds value in the
sprite entry so the line ends immediately after the anchor reference.
---
Outside diff comments:
In `@Resources/Prototypes/_Starlight/Decals/flora.yml`:
- Around line 154-161: Rename the decal prototype id from WaterReedsSmall0 to
WaterReedsSmall10 in the entry using sprite state small10, so the prototype id
matches its state and makes WaterReedsSmall10 available.
🪄 Autofix
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI (base), Organization UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 2754e4f4-fb25-41fc-ac38-9b20f59e75ee
📒 Files selected for processing (4)
Resources/Locale/en-US/_Starlight/tiles/tiles.ftlResources/Prototypes/_Starlight/Decals/flora.ymlResources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.ymlResources/Prototypes/_Starlight/Tiles/floors.yml
🚧 Files skipped from review as they are similar to previous changes (3)
- Resources/Prototypes/_Starlight/Tiles/floors.yml
- Resources/Prototypes/_Starlight/Entities/Objects/Decoration/flora.yml
- Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
|
r4r |
redmushie
left a comment
There was a problem hiding this comment.
As stated previously:
Stopping now because some major changes required; all files must move from _CP14 to _Starlight since the source fork is defunct and thus will inevitably no longer produce updates. Therefore we now maintain the content.
This includes textures. Crystall Punk as an upstream is defunct, therefore we maintain it, therefore _Starlight.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Note GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer. |
|
this is going to take a fucking hour i dont want to do this shit im sick of ten billion tiny changessssssss |
|
moved everything i think if its still fucked im killing the pr |
RedSpeeds
left a comment
There was a problem hiding this comment.
Seems fine. Just a minor point of state based copyright but beyond that i dont see any issues
cd14551
Short description
Resprites Grass, Light Grass, Dark Grass, and Jungle Grass to be usable to create gradients to blend patches of grass and make grassy areas look less flat. Ported from Crystal Punk
Resprites and adds a fuck ton of new trees, including birch, non-snowy conifer trees, red vampiric 'gulthias' trees, etc. Ported from Crystal Punk crystallpunk-14/crystall-punk-14#1539 crystallpunk-14/crystall-punk-14#1672 crystallpunk-14/crystall-punk-14#1154 crystallpunk-14/crystall-punk-14#1172
Also added Water Reeds floral decals from Crystal Punk
Why we need to add this
Better grass and trees makes natural areas look way nicer.
Mappers can use a clever mix of mowed and unmowed astro-grasses to control how the edges blend over each other depending on what they want. Takes a little tinkering but the effect is very pretty.
Media (Video/Screenshots)
Checks
Changelog
🆑 Conflee