Skip to content

New world generation #1592

Open
fenndragon wants to merge 52 commits into
masterfrom
new-world-generation-
Open

New world generation #1592
fenndragon wants to merge 52 commits into
masterfrom
new-world-generation-

Conversation

@fenndragon
Copy link
Copy Markdown
Collaborator

About the PR

Why / Balance

Technical details

How to test

Media

Breaking changes

Changelog

fenndragon and others added 30 commits April 26, 2026 14:39
* now you see me

* unused depen

* test fail fix attempt 1

* test fail fix attempt 2

* fix test fail attempt 3

* shot in the dark.

* Does this work?

* import cleanup

* taking a shot at this.

* Convert PersistenceSaveCommand to LocalizedEntityCommands.

* requested changes

* requested changes. also dealt with improperly named private const

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Convert PlanetCommand to LocalizedEntityCommand

* Update BiomeSystem.cs

* Update Content.Server/Salvage/SalvageSystem.Runner.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Procedural/DungeonSystem.Rooms.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Station/Systems/StationBiomeSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* revert to latest master.

* slartis suggestion.

* Update SetMapAtmosCommand.cs

* cleanup

* Update PersistenceSaveCommand.cs

* finish localizing persistencesavecommand

* this is icky, I change.

* :sigh:

* revert whatever I did here?

* oh I see, some inconsistencies.

* revert this

* Update PlanetCommand.cs

* move this ftl to the commands folder

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* weather status effect entities

* proto port + fixes

* Update weather.yml

* fix visuals

* Update SharedWeatherSystem.cs

* Update SharedWeatherSystem.cs

* Update WeatherSystem.cs

* Thanks Slarti, thats a much better

* Update WeatherSystem.cs

* Update StencilOverlay.Weather.cs

* Update Content.Client/Overlays/StencilOverlay.Weather.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Update Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Update Content.Client/Overlays/StencilOverlay.Weather.cs

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* Revise weather command help descriptions

Updated weather command help texts for clarity.

* Merge branch 'master' into ed-14-11-2025-weather-entities

* Tayrtahn review apply

* fixes and cleanup

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…null'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
…null'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
…null'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
…null'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
…null'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 2, 2026

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@ShadesMars
Copy link
Copy Markdown
Contributor

I see this has the new weather from wizden, i will say its works.

HOWEVER, some weather errors sometimes happents, do not also port the sand+weather effect from it as currently its just, does not work (ive have to fix it on SL)

@fenndragon
Copy link
Copy Markdown
Collaborator Author

I see this has the new weather from wizden, i will say its works.

HOWEVER, some weather errors sometimes happents, do not also port the sand+weather effect from it as currently its just, does not work (ive have to fix it on SL)

I really need to just... Redo weather in general. It's awful in any method it's been set up so far.

@fenndragon fenndragon added do not merge Circumstances mean the PR should not be merged until the label is removed frozen Rework/Feature Discussion labels May 4, 2026
@Kronyxxx Kronyxxx removed the Docs label May 6, 2026
Copy link
Copy Markdown
Contributor

@Fasuh Fasuh left a comment

Choose a reason for hiding this comment

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

some changes that were never discussed, as well as completely random changes to unrelated systems once again, please clean the PR from unrelated changes,

For things that potentially throw off balance i would massively appreciate having a discussion for it as per this announcement
https://discord.com/channels/1380477227912925194/1380489720101998654/1501609020308328528

though i am aware that these changes are marked as not ready yet, i prefer marking things that are problematic ahead of time.

<Label Text="{Loc 'humanoid-profile-editor-height-label'}" />
<Control HorizontalExpand="True"/>
<Slider Name="HeightSlider" MinValue="0.8" MaxValue="1.2" Value="1.0" HorizontalAlignment="Right" MinSize="200 0" />
<Slider Name="HeightSlider" MinValue="0.4" MaxValue="1.5" Value="1.0" HorizontalAlignment="Right" MinSize="200 0" />
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Unrelated change.

<Label Text="{Loc 'humanoid-profile-editor-width-label'}" />
<Control HorizontalExpand="True"/>
<Slider Name="WidthSlider" MinValue="0.8" MaxValue="1.2" Value="1.0" HorizontalAlignment="Right" MinSize="200 0" />
<Slider Name="WidthSlider" MinValue="0.4" MaxValue="1.5" Value="1.0" HorizontalAlignment="Right" MinSize="200 0" />
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Unrelated change.

HeightSlider.OnValueChanged += args =>
{
SetHeight((float)args.Value);
SetProfileHeight((float)args.Value);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Unrelated change.

@@ -0,0 +1,198 @@
# Sector Worldgen Rewrite
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is not needed in a PR

public float MaxTemperature = 360f;

[DataField]
public float MinOxygen = 0f;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I dont believe limiting atmos to o2, n2, and co2 was ever communicated to the players, this is a massive change for atmosian ships.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Yeah I've been really on the 'no' end from all of this if it's going to be another wholesale replacement of expeds for this exact reason.

@jimmy12or
Copy link
Copy Markdown
Contributor

Does this make current exped disks 100% pointless?

@github-actions
Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C# do not merge Circumstances mean the PR should not be merged until the label is removed frozen FTL Rework/Feature Discussion S: Merge Conflict size/L UI YML

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants