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

Teleport noobs off Arrivals shuttle to spawn #17189

Merged

metalgearsloth merged 6 commits into space-wizards:master from tom-leys:feat/arrivals-respawn

Aug 22, 2023

Contributor

tom-leys commented Jun 7, 2023 •

edited

Loading

About the PR

Resolve Arrivals kills new players #17154 by teleporting arriving players to a late-spawn point on station if they dawdle on the shuttle. Currently only does this on first arrival for a player.
Estimate shuttle arrival time when you spawn in arrivals
AutoOrientComponent is only removed as the shuttle warps away leaving you on station. This means you will auto-rotate as you enter the station grid.
PendingClockInComponent is removed as the ship warps away and you're on station, rather than as you ride the shuttle away from Arrivals. Resolves If you have a skill issue arrivals shuttle will leave you behind #14937
If you are teleported away from arrivals anywhere else by an admin, you'll still lose these components up to a minute later when the shuttle next FTLs to arrivals.
You don't need PendingClockInComponent to ride the shuttle AWAY from arrivals if you somehow end up there again. Should resolve Reinforcement teleporter goonie gets stuck in Arrivals #15271

Requires: space-wizards/RobustToolbox#4257

Media

arrival_teleport.mp4

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑

add: To increase employee retention and new staff experience, we've installed a short range teleporter on our Arrivals Shuttle. However we only had sufficient budget to use it once per shift per staff member.
tweak: You might notice yourself adjusting as you step off the arrivals shuttle, with our patented rotation acclimation system. It might make you dizzy, but it helps the station make sense.


          Teleport noobs off Arrivals shuttle to spawn

50521e2

- Estimate arrival time

tom-leys requested review from RemieRichards and moonheart08 as code owners

June 7, 2023 11:20

github-actions bot added the S: Needs Review label

tom-leys mentioned this pull request

arrivals system needs to not dump players/also reorient them #16336

Closed

Contributor Author

tom-leys commented Jun 7, 2023

@metalgearsloth This Arrivals PR transports players off the arrival shuttle. It spaces them if they come back to the shuttle. Should it teleport them every time?

Contributor

metalgearsloth commented Jun 7, 2023

Nah just the first time, we just need turnstiles for other times to avoid people using it for easy spacing #16419

tom-leys closed this


          Merge remote-tracking branch 'default/master' into feat/arrivals-respawn

1d62f3c

tom-leys reopened this

tom-leys requested a review from EmoGarbage404 as a code owner

July 31, 2023 22:04

Contributor Author

tom-leys commented Jul 31, 2023

Nice to see you in the code owner rotation now @EmoGarbage404

EmoGarbage404 previously requested changes

View reviewed changes

Member

EmoGarbage404 left a comment

very cool, just a few things that caught my eye.

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated

Comment on lines 280 to 290

+                      // Spawn them at a passenger location
+                      foreach (var (spawnPoint, xform) in points)
+                      {
+                          if (spawnPoint?.Job?.ID != "Passenger" || _station.GetOwningStation(spawnPoint.Owner, xform) != stationId)
+                              continue;
+                          // Move the player to the spawnpoint.
+                          transform.Coordinates = xform.Coordinates;
+                          return true;
+                      }

Member

EmoGarbage404 Jul 31, 2023

All stations have latejoin spawn points already so there isn't really a need to have a hardcoded backup to passengers.

Contributor Author

tom-leys Aug 2, 2023

Is there any harm in doing so though? I'm coding defensively here I guess.

Member

EmoGarbage404 Aug 4, 2023

it's unnecessary but moreover, hardcoding in a prototype ID is generally frowned upon.

Content.Server/Spawners/Components/SpawnPointComponent.cs Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

Slava0135 added the S: Awaiting Changes label


          PR changes requested by EmoGarbage

95b1bc8

tom-leys requested a review from EmoGarbage404

August 2, 2023 05:28

github-actions bot removed the S: Awaiting Changes label

Contributor Author

tom-leys commented Aug 2, 2023

Thanks for the review @EmoGarbage404. I have applied your suggestions which was mostly changing how I got TransformComponent and adding better comments.

metalgearsloth requested changes

View reviewed changes

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

metalgearsloth added S: Awaiting Changes and removed S: Needs Review labels


          Refactor respawn system to avoid .Owner and .ToList() on query

04d86c1

tom-leys force-pushed the feat/arrivals-respawn branch from 5f502df to 04d86c1 Compare

August 2, 2023 23:05


          Fix bugs in teleport refactor

54e4917

tom-leys requested a review from metalgearsloth

August 3, 2023 02:35

github-actions bot added S: Needs Review and removed S: Awaiting Changes labels

metalgearsloth requested changes

View reviewed changes

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated

Comment on lines 383 to 387

+                                  // The ArrivalsCooldown includes the trip there, so we only need to add the time taken for
+                                  // the trip back.
+                                  comp.NextArrivalsTime = _ticker.RoundDuration() +
+                                       TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown) + tripTime);

Contributor

metalgearsloth Aug 7, 2023

Shouldn't be using RoundDuration and also += like NextTransfer is.

Contributor Author

tom-leys Aug 11, 2023

I removed roundDuration. However it doesn't make sense to use += here because the time estimate is not based on the old time estimate.

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated Show resolved Hide resolved

Content.Server/Shuttles/Systems/ArrivalsSystem.cs Outdated

Comment on lines 269 to 270

		var possiblePositions = new List<EntityCoordinates>();
		var passengerPositions = new List<EntityCoordinates>();

Contributor

metalgearsloth Aug 7, 2023

ValueList?

Contributor Author

tom-leys Aug 11, 2023

Wow, I didn't know we had that.

Contributor Author

tom-leys Aug 11, 2023 •

edited

Loading

~~Now require space-wizards/RobustToolbox#4257 for Pick(ValueList)~~

metalgearsloth added S: Awaiting Changes and removed S: Needs Review labels


          Use CurTime rather than RoundDuration, remove Passenger

3540bf7

tom-leys mentioned this pull request

Add implementation of Random.Pick(ValueList<T> ..) space-wizards/RobustToolbox#4257

Merged

tom-leys requested a review from metalgearsloth

August 21, 2023 21:59

github-actions bot added S: Needs Review and removed S: Awaiting Changes labels

DrSmugleaf approved these changes

View reviewed changes

DrSmugleaf mentioned this pull request

Update RobustToolbox to f6c55085fe9a798a45b531c056f5545db1bf4475 #19418

Merged

metalgearsloth enabled auto-merge (squash)

August 22, 2023 10:46

metalgearsloth approved these changes

View reviewed changes

metalgearsloth dismissed EmoGarbage404’s stale review

August 22, 2023 10:46

noob

metalgearsloth merged commit bc097c7 into space-wizards:master

Partmedia mentioned this pull request

EasyPry airlocks for arrivals. Now also prying refactor I guess #19394

Merged

1 task

metalgearsloth mentioned this pull request

Arrivals rotation issues #19721

Closed

BasedUser pushed a commit to cube-station-14/cube-station-14 that referenced this pull request


          Teleport noobs off Arrivals shuttle to spawn (space-wizards#17189)

e46fd57

nikthechampiongr mentioned this pull request

Remove unecessary easy pry prototypes #25893

Merged

1 task

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

Reviewers

DrSmugleaf DrSmugleaf approved these changes

metalgearsloth metalgearsloth approved these changes

RemieRichards Awaiting requested review from RemieRichards

moonheart08 Awaiting requested review from moonheart08

EmoGarbage404 Awaiting requested review from EmoGarbage404

Labels

S: Needs Review