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

Improved antagonist managing tools for admins. #10046

Merged
merged 29 commits into from Oct 22, 2023
Merged

Improved antagonist managing tools for admins. #10046

merged 29 commits into from Oct 22, 2023

Conversation

SerheyKr
Copy link
Contributor

@SerheyKr SerheyKr commented Sep 1, 2023 •
edited

Purpose

PR implements #5816

Changelog:

CL: [New] New tools for admins to manage players objectives, teams, ghost roles
CL: [New] Teams for some of antagonists
image
image (1)
image (3)
image (2)
image (4)

SerheyKr and others added 3 commits September 2, 2023 00:33
@SerheyKr
Improved Antagonist Managing tools for Admins. Part one.
31322b9 
Adding custom objectives, objectives viewer, adding new objectives to player. Moving SpawnedAntag to MonoBehaviour and attaching to Mind.
@SerheyKr
Update ObjectiveManagerPage.cs
228147f
@SerheyKr
Merge branch 'unitystation:develop' into Improved-Antagonist-Managing…
b942f7f 
…-tools-for-Admins
@github-actions github-actions bot added the UI label Sep 1, 2023
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Your PR has no registered changes in its description!

@SerheyKr SerheyKr changed the title [DNM] Improved antagonist managing tools for admins part 1. [DNM] Improved antagonist managing tools for admins. Part 1. Sep 1, 2023
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Your PR has no registered changes in its description!

1 similar comment
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Your PR has no registered changes in its description!

@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Your PR has no registered changes in its description!

@SerheyKr SerheyKr changed the title [DNM] Improved antagonist managing tools for admins. Part 1. [DNM] Improved antagonist managing tools for admins. Sep 1, 2023
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Your PR has no registered changes in its description!

1 similar comment
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Your PR has no registered changes in its description!

@github-actions github-actions bot added the Status: Merge Conflicts No one likes conflicts, solve them! label Sep 4, 2023
@github-actions
Copy link

github-actions bot commented Sep 4, 2023

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

@github-actions
Copy link

github-actions bot commented Oct 1, 2023

Your PR has no registered changes in its description!

@github-actions
Copy link

github-actions bot commented Oct 1, 2023

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot removed the Status: Merge Conflicts No one likes conflicts, solve them! label Oct 1, 2023
@github-actions
Copy link

github-actions bot commented Oct 4, 2023

Your PR has no registered changes in its description!

1 similar comment
@github-actions
Copy link

github-actions bot commented Oct 4, 2023

Your PR has no registered changes in its description!

@corp-0
Copy link
Member

corp-0 commented Oct 7, 2023

we will do a test build after tomorrow's playtest for this PR

@corp-0 corp-0 mentioned this pull request Oct 9, 2023
Closed
8 tasks
corp-0
corp-0 requested changes Oct 9, 2023
View reviewed changes
Copy link
Member

@corp-0 corp-0 left a comment

Choose a reason for hiding this comment

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

I read like half of the PR, it is long.

UnityProject/Assets/Scripts/Items/Traits/CommonTraits.cs Show resolved Hide resolved
UnityProject/Assets/Scripts/Items/Traits/CommonTraits.cs Show resolved Hide resolved
UnityProject/Assets/Scripts/Player/Mind.cs Outdated Show resolved Hide resolved
UnityProject/Assets/Scripts/ScriptableObjects/GhostRoleList.cs Show resolved Hide resolved
UnityProject/Assets/Scripts/Systems/Antagonists/AntagData.cs Show resolved Hide resolved
UnityProject/Assets/Scripts/Systems/Antagonists/Objective.cs Outdated Show resolved Hide resolved
UnityProject/Assets/Scripts/Systems/Antagonists/Objective.cs Outdated Show resolved Hide resolved
@MaxIsJoe
Copy link
Contributor

Some notes from testing on 19/10/2023:

image

  • Team Objectives should have a "Round not ready" screen to avoid problems before the round starts.

image

  • You can set ghost roles without their requirements ever getting met. (example: Adding a cyborg brain role without any brains present for ghosts to possess)

image

  • Team objectives reports no players on the station team?

image

  • A choised?

image

  • Input field needs a background to be clear that you can write there

image

  • Custom objective progress have a new line for some reason? Also the progress on them appears before the round even ends.

@AtnerNT
Copy link
Contributor

AtnerNT commented Oct 19, 2023

Don’t think the custom objectives showing completion before round end is an issue, I honestly think that should be true for any objective that can completed prior to round end (like assassinate objectives). Stuff like escape and steal objectives are obviously only completed in round end, but other than that I don’t think that is an issue.

@corp-0
Copy link
Member

corp-0 commented Oct 21, 2023

we will merge this and playtest it tomorrow. Any further issue we find has to be tackled in following PRs

@corp-0
Copy link
Member

corp-0 commented Oct 21, 2023

ah fuck you have a conflict

@github-actions
Copy link

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

@github-actions github-actions bot added the Status: Merge Conflicts No one likes conflicts, solve them! label Oct 21, 2023
@github-actions github-actions bot removed the Status: Merge Conflicts No one likes conflicts, solve them! label Oct 22, 2023
@github-actions
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@corp-0 corp-0 merged commit bf58ebd into unitystation:develop Oct 22, 2023
1 of 3 checks passed
@SerheyKr SerheyKr changed the title [DNM] Improved antagonist managing tools for admins. Improved antagonist managing tools for admins. Oct 23, 2023
@SerheyKr SerheyKr deleted the Improved-Antagonist-Managing-tools-for-Admins branch October 23, 2023 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corp-0 corp-0 corp-0 requested changes

Assignees
No one assigned
Labels
UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@SerheyKr @corp-0 @MaxIsJoe @AtnerNT