Skip to content

Port: Frontier's Expedition System Rework - #443

Draft
Wuffindy wants to merge 14 commits into
Triad-Sector:mainfrom
Wuffindy:Themed-Dungeon-Port
Draft

Port: Frontier's Expedition System Rework#443
Wuffindy wants to merge 14 commits into
Triad-Sector:mainfrom
Wuffindy:Themed-Dungeon-Port

Conversation

@Wuffindy

@Wuffindy Wuffindy commented Jul 31, 2026

Copy link
Copy Markdown
Collaborator

About the PR

updates Triad's expedition to frontier's newer or well closer to upstream's version, most of these are for easier implemetation of future contents, and a step closer to themed expedition
new-frontiers-14/frontier-station-14#3046
drafting this for now while awaiting the coyot exped retrieval and some guidance on some c# stuff
to do:

  • figure out limit frontier's difficulty limit and how to undo it (figured it out, but keeping frontier's difficulty based on faction, till future changes)
    Understanding of how frontier's code work depends on whether there's difficulty in the faction proto, otherwise it ignores it and is eligible for all difficulty
  • readds reward system (moves the reward into the salvage difficulty prototypes, this simplifies a lot and makes reward based on difficulty)
  • readds weather modifier (or remove em if it doesnt do much)
  • reconsider adding back different timed expedition modifier (rush 8/10m ones) (new one defaults everything to 15minute)
  • consider adding a new Extremous Difficulty, of absurd difficulty

Why / Balance

current ones outdated, this should get us up closer and easier for future content

Media

Requirements

  • I have read relevant guidelines/documentation to this PR found on our devwiki.
  • I have added media to this PR or it does not require an ingame showcase.
  • I can confirm this PR contains either no AI-generated content, or AI-generated content that meets our guidelines.

How to test

buy shipwith exp console, claim, finish expeditions, claim, finish expedition, etc

Breaking changes

needs intensive testing on running expeditions multiple times, previously no error, but still lacking rewards and removed weather from this
Changelog

non player facing

  • tweak: updates the entire expedition to frontier's newer version
  • tweak: readds the rewards & weather system from exped

Wuffindy and others added 7 commits July 28, 2026 10:11
This reverts commit d707d55.

revert mono's weather system
* Expo Dework For Rework

* Upstream stuff

* multiple difficulties, failure timeouts

* big wip, comment 33105 cherry-picks

* SalvageExpeditions: early finish, mission params

* restore more params

* random expedition types

* compilation fixes, copy OfferingWindow layout

* More salvage job jank

* expedition/destruction logic, move missions to _NF

* early finish handler

* lingering FTL

* cooldown when in FTL

* build errors

* Frontier-specific salvage loot

* optional loot tables per difficulty

* Cleanup

* Update SalvageSystem.ExpeditionConsole.cs

* Update salvage_factions.yml

* Update salvage_factions.yml

* mob costs update

* order missions by difficulty (scuffed)

* Update salvage-faction.ftl

* more fiddling with costs

* loc strings

* expedition map wrangling

* frontier comments, empty array safety

* return structures/enemies to salvage missions

* structure count per difficulty level

* asteroid.id is fine

* Fix timer bar

* "expedition console", objective announcement

* Remove difficulty and rewards from expedition comp

* salvage system: fix timeout announcements

* Remove unneeded grid params, use obj-scoped mapUid

* Loot test

* Update loot tables test

* Update salvage_loot.yml

* Make the contravend more of a goal then random syndicate stuff

* salvage expeditions: weights and difficulties

* debug params, yeet ghosts

* using the wrong entity on expedition finish

* entity/structure spawning, admin ghost extraction

* Increase glider cost to 2

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: steinhauer.erhard <steinhauer.erhard@gmail.com>
* DoMapInitialize and SetMapPaused

* GridTileToLocal

* Formatting

* Remove unused variables

* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
@Wuffindy Wuffindy added Needs Discussion Further information is requested DO NOT MERGE labels Jul 31, 2026
@github-actions github-actions Bot added S: Untriaged size/L C# YML FTL Changes to localization files UI labels Jul 31, 2026
@DDrakov

DDrakov commented Jul 31, 2026

Copy link
Copy Markdown
Collaborator

Gem, speedmerging this

@Wuffindy

Copy link
Copy Markdown
Collaborator Author

Gem, speedmerging this

if i remove the reward, can be speedmerged ironically, but not yet

@TschudyNF

Copy link
Copy Markdown

I'm down to have expeds be great again

@Wuffindy Wuffindy changed the title Port: Expedition Rework Port: Frontier's Expedition System Rework Aug 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C# DO NOT MERGE FTL Changes to localization files Needs Discussion Further information is requested S: Untriaged size/L UI YML

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants