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

Jump to bottom

Implmement trading post and finish shuttle refactor cherry-pick #941

Merged
merged 20 commits into from
Mar 11, 2024
Merged

Implmement trading post and finish shuttle refactor cherry-pick #941

merged 20 commits into from
Mar 11, 2024

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Mar 8, 2024 •
edited
Loading

About the PR

See https://discord.com/channels/968983104247185448/976726219875831828/1215605251885899796

WIP, I still need to clean the trading post code

Changelog
🆑

  • add: Added the trading post, cargo technicians will now have to travel on the shuttle to collect their goodies
  • add: Merged the shuttle console refactor. This may bring some bugs
  • tweak: The trading post will give you cash instead of directly adding funds to the stations account. To turn this into money you can spend, click the cargo requests computer while holding the spesos

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: UI labels Mar 8, 2024
@DebugOk
Copy link
Contributor Author

DebugOk commented Mar 8, 2024

I'll end up squashing all my changes together so I can merge commit this

@DebugOk
Copy link
Contributor Author

DebugOk commented Mar 8, 2024

Its missing markers pretty much everywhere but in this case its whatever, these files will probably always conflict, and require manual merging.

I might add them if I feel like it, but I dunno

DebugOk and others added 19 commits March 8, 2024 12:54
@DebugOk
Modify trade station for Delta
76d0641
@metalgearsloth @DebugOk
Run fixgridatmos on trading outpost (#24264)
8246734 
(cherry picked from commit 129892f)
@UbaserB @DebugOk
Update Trading Outpost (#24281)
b330429 
* add

* yes

(cherry picked from commit 8364086)
@metalgearsloth @DebugOk
Clear cargo orders on approval (#24278)
fa3e17d 
(cherry picked from commit f82fd23)
@UbaserB @DebugOk
Update Trade Station (#24295)
0f85467 
add

(cherry picked from commit 00e770d)
@metalgearsloth @DebugOk
Resave trading outpost (#24536)
5c7b5ac 
Removes metadata merge alongside space-wizards/RobustToolbox#4861

(cherry picked from commit 6ae4537)
@themias @DebugOk
Fix centcom cargo gifts (#24701)
554f664 
(cherry picked from commit 3933490)
@Hmeister-real @DebugOk
Update cargo guidebook entry and other minor guidebook changes (#24828)
0129a6e 
* Minor cloning change in guidebook

Cloning this should be removed at some point anyway, but im unsure if it can still be found in salv? can anyone confirm?

* Changes and updates to survival, removed fluff

* Create TradeStation.xml

* Forgor

* Change hex

* Rework this cause it was out of date

* Pointless spacing fixed (copy and pasted made it funny,)

* revert (somewhat)

Science cant set up cloning, so i just removed that part

* Remove more space

(cherry picked from commit 7ba6a27)
@Hmeister-real @DebugOk
Fix guidebook (#24947)
b7619d3 
Co-authored-by: Kevin Zheng <[email protected]>
(cherry picked from commit 1837459)
@PolterTzi @DebugOk
Made ordering multiple crates at cargo order multiple crates (#25518)
44613e6 
* please tell me this is empty

* it wasn't empty, fixing that

* This should fix it

* fix for the fix

* address changes

* fix

* Added some comments, hoping that failed test was a fluke.

(cherry picked from commit aa4e7c0)
@metalgearsloth @DebugOk
Shuttle console + FTL rework (#24430)
f102e8f 
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup

(cherry picked from commit c548687)
@metalgearsloth @DebugOk
Fix FTLToDock (#25803)
f5a6a11 
* Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check

(cherry picked from commit 92872e5)
@metalgearsloth @DebugOk
Fix shuttle console UI scaling (#25807)
772218a 
(cherry picked from commit b7ccf73)
@metalgearsloth @DebugOk
Fix FTL docks not opening (#25808)
5ada275 
(cherry picked from commit 21a9596)
@metalgearsloth @DebugOk
Fix shuttle IFF drawing (#25821)
02c58d4 
Didn't account for UI scale properly I love transforms.

(cherry picked from commit 87e2755)
@metalgearsloth @DebugOk
Fix drone console docking (#25822)
27f43cc 
(cherry picked from commit 4b6e5de)
@metalgearsloth @DebugOk
Fix exped FTL (#25823)
132d026 
Also fixed some other stuff I noticed.

(cherry picked from commit c23b3d8)
@metalgearsloth @DebugOk
Fix docking fallback (#25854)
c30ff6e 
Only thing that even triggers it atm is escape pods.

(cherry picked from commit bbb7880)
@metalgearsloth @DebugOk
Fix shuttle disabling on ftl (#25859)
5de30d1 
Branch moment.

(cherry picked from commit 574c625)
@DebugOk DebugOk force-pushed the 2024/03/08-Trading-posts branch from 868ffbd to 5de30d1 Compare March 8, 2024 11:55
@DebugOk
Copy link
Contributor Author

DebugOk commented Mar 8, 2024

I'll need to check over my changes again later, but I'm marking it as ready so tests run and stuff

@DebugOk DebugOk marked this pull request as ready for review March 8, 2024 11:56
@DebugOk DebugOk requested a review from IamVelcroboy as a code owner March 8, 2024 11:56
VMSolidus
VMSolidus reviewed Mar 11, 2024
View reviewed changes
Copy link
Contributor

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

I'm not exactly going to approve or deny this, since it's a Wizden kinda thing upstream. My own review would just be does it work or not, and does it break anything? Whether it breaks things isn't something I can easily test.

@DebugOk
Copy link
Contributor Author

DebugOk commented Mar 11, 2024

The only thing that matters are changes done in commit 76d0641 as those aren't original

@DebugOk DebugOk merged commit f2a4a9c into DeltaV-Station:master Mar 11, 2024
20 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Mar 11, 2024
Automatic Changelog Update (#941)
a807993
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VMSolidus VMSolidus VMSolidus left review comments

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: UI S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@DebugOk @VMSolidus @metalgearsloth @UbaserB @themias @Hmeister-real @PolterTzi