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.

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

Pilot Rework 2.0 #5958

Merged
merged 23 commits into from
Mar 18, 2024
Merged

Pilot Rework 2.0 #5958

merged 23 commits into from
Mar 18, 2024

Conversation

567Turtle
Copy link
Contributor

@567Turtle 567Turtle commented Mar 16, 2024

About the pull request

Removes the Pilot Officer role. Replaces it with the Gunship Pilot and the Dropship Pilot. One mans the CAS ship, one mans the transport ship always. No more petty arguing.

Explain why it's good for the game

Currently with two pilot officers, the round goes one of two ways.

Either A, there's only one at round start and they get CAS.

Or B, there's two POs and they argue and bicker over who gets CAS. Eventually one of them gets CAS and the other one either cryo's or spends the next 2~ hours bored out of their mind.

Dropship PO is NOT fun. It just isn't. Anybody who says they have ever enjoyed dropship PO is a liar and a rube sent here by the CLF to spread lies and deceit AND they're paid off by the Rothschilds. The whole point of the second PO is to man the Alamo, but with how different CAS PO and Dropship PO are they might as well be two roles.

I really enjoy playing CAS, but the issue is every time I want to roll PO to do so I'm scared away by the thought that I'll get trapped playing dropship for the whole round instead of a marine roll. By separating the two roles like this, now whenever you role CAS pilot, if you get it, you will always get the experience which you want. If you roll Dropship pilot, you will always get the experience you want.

This PR will prevent the countless rounds wasted rolling PO, losing rock paper scissors, and cryoing, having to sit and wait for the next round to start to try again.

Screenshots & Videos

🐾🐾🐾🐾🐾🐾🐾🐾🐾

Changelog

🆑
add: PO has been split into two roles, the gunship pilot and the dropship pilot, no more arguing over who gets CAS.
/:cl:

e
@github-actions github-actions bot added the Feature Feature coder badge label Mar 16, 2024
@567Turtle 567Turtle mentioned this pull request Mar 16, 2024
a
b
@567Turtle
Copy link
Contributor Author

I think this works but I wrote all of this in like 10 minutes so it probably doesnt, I tested it briefly and it worked.
image

d
d
ff
afs
d
f
d
f
s
d
@Drulikar Drulikar added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. labels Mar 16, 2024
@Drulikar Drulikar marked this pull request as draft March 16, 2024 08:43
e
a
@koltoast
Copy link

Alternate solution: instead of this PR just reduce the Dropship Pilot slots from two to one. That way if you roll it you can always do CAS. But then only one Auxiliary support personnel will have CAS skills, which might mean more CAS mishaps since there would be no more tutoring I suppose. I've never done CAS though so I wouldn't really know. It just looks difficult and intimidating to get into.

@567Turtle
Copy link
Contributor Author

Alternate solution: instead of this PR just reduce the Dropship Pilot slots from two to one. That way if you roll it you can always do CAS. But then only one Auxiliary support personnel will have CAS skills, which might mean more CAS mishaps since there would be no more tutoring I suppose. I've never done CAS though so I wouldn't really know. It just looks difficult and intimidating to get into.

This was the original intention but then I didn't want to do that.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Previous issues with the landmarks are still unresolved.

Both spawn here like this (fallback position - with wrong squad icon)
image
image
Also role preference page is very wonky:
image

@567Turtle
Copy link
Contributor Author

pr done i think :)

code/modules/client/preferences.dm Outdated Show resolved Hide resolved
code/modules/client/preferences.dm Outdated Show resolved Hide resolved
code/modules/client/preferences.dm Outdated Show resolved Hide resolved
maps/map_files/USS_Runtime/USS_Runtime.dmm Show resolved Hide resolved
tools/UpdatePaths/pilot.txt Outdated Show resolved Hide resolved
code/game/jobs/job/command/auxiliary/pilot.dm Show resolved Hide resolved
@Drulikar Drulikar added the Mapping did you remember to save in tgm format? label Mar 17, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

mapping lgtm

Copy link
Member

Choose a reason for hiding this comment

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

mapping seems fine

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Mar 17, 2024
@567Turtle
Copy link
Contributor Author

done :)

@Drulikar
Copy link
Contributor

Undrafting because I assume you mean for it to be undrafted (use the Ready for review button). Will let Harry be the one to merge since you wanted to do it the database migration way for hours.

@Drulikar Drulikar marked this pull request as ready for review March 18, 2024 05:20
@harryob harryob added this pull request to the merge queue Mar 18, 2024
cm13-github added a commit that referenced this pull request Mar 18, 2024
Merged via the queue into cmss13-devs:master with commit 63903da Mar 18, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Mar 18, 2024
@ondrej008
Copy link
Contributor

Is it intentional that playtime isn't shared between the two (three) roles?

@567Turtle
Copy link
Contributor Author

Is it intentional that playtime isn't shared between the two (three) roles?

It can be considered an oversight but as no roles are dependant on either POs playtime it's not really an issue I don't think. Plus, I believe the twos jobs are different enough to warrant seperate playtimes.

@harryob
Copy link
Member

harryob commented Mar 18, 2024

Is it intentional that playtime isn't shared between the two (three) roles?

literally nothing to do with the pr, just how i chose to do the db migration

github-merge-queue bot pushed a commit that referenced this pull request Mar 22, 2024
# About the pull request

This PR is a follow up to #5958 which added a role requiring the role
preferences and character assignment panels in character preferences to
be adjusted. See screenshots for examples.

# Explain why it's good for the game
Fixes:


![image](https://github.com/cmss13-devs/cmss13/assets/76988376/97086058-70b2-42e2-a090-42f2fedff10c)

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![distress1](https://github.com/cmss13-devs/cmss13/assets/76988376/10e5af6d-47f0-47b1-9460-4175ee638315)

![distress2](https://github.com/cmss13-devs/cmss13/assets/76988376/404bbccc-265f-4a44-87ef-3da2184348ae)

![WO](https://github.com/cmss13-devs/cmss13/assets/76988376/46f18c7f-b036-4011-bc17-d3ad4076ba50)

![WO2](https://github.com/cmss13-devs/cmss13/assets/76988376/0cf8d150-5628-4bbe-82a7-2b041198dc75)

![extended](https://github.com/cmss13-devs/cmss13/assets/76988376/69625a2c-88a7-4c3e-8fc9-18549b9eb2e7)

</details>


# Changelog
:cl: Drathek
ui: Tweaked layout for role preferences windows
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants