Traitors 2.0: Priority directives #10745

PowerfulBacon · 2024-03-14T22:55:53Z

About The Pull Request

Implements priority directives, as defined by the design documents posted in the associated thread in discord.

Priority directives are optional missions given to traitors that can grant the traitor with additional TC if they complete the mission. The only catch is that other traitors may be trying to complete the same objectives, and only 1 person can claim the prize!

Here is a bullet point list of things:

New UI tab on the uplink, detailing assignments and priority directives.
You can now track assassinate and steal objectives via the uplink.
Priority directives will spawn at the 20-30 minute mark.
Priority directives can be every man for himself, team vs team, and can optionally involve security.
The uplink will now list the objectives of its owner, but only if those objectives relate to an antagonist that is in the syndicate faction. (becoming a cultist will not show your non-syndicate objectives in the uplink)

There will be 3 priority directives implemented with this update:

Secure deposit box: A trackable box containing a set amount of TC will be shown to all traitors, after the time limit expires the box will unlock and the holder of the box can take the TC from it. Will you work together and split the prize, or fight to take it all?
Communication Beacon: Team vs Team, half the traitors need to setup a beacon in a determined location, while the other half need to prevent the deployment of that beacon. TC is rewarded to the winners automatically at the end regardless of their participation. The catch is that you don't know who is on your team, and who you can trust.
Assassination: Independent vs Security: Security is informed of a suspect that has had a target placed on their back. All traitors are given the directive to eliminate them. Once a photo of their corpse is uploaded, then the reward can be claimed by the person who uploaded that photo.

TODO:

Make it so the notification bell appears when a directive is new.
Give a sound to any traitors holding their uplink when a directive comes in.
Fix the bottom left of the UI saying no reward when there is a reward.
Add in a security console that can support important directive notification with the future possibility for training exercise expansions.

Why It's Good For The Game

We currently suffer from a big issue with our antagonists where they are not acting until late in the round, and while I like people having the option to plan and strategically execute their plans, it often leads to rounds that consist primarilly of traitors to be incredibly boring to play with little drama to promote any meaningful gameplay or story.

This gains the following things:

Gameplay driven control over traitor progression, allowing options for giving antagonists more freedom within the rules without disrupting gameplay.
Ways for antagonists to have conflict, even if their objectives are completed in a stealthy manner or if the traitor is aiming to complete their objectives after the 1-hour mark.
Some things for security to watch over on shifts that are slower or lower population (for objectives that inform security about the directive).

This attempts to avoid the following things:

Gamey objectives that can be grinded by completing them rapidly.
Objectives that lead to no conflict and that don't develop the round.

Testing Photographs and Procedure

The new UI for uplinks. Shows the objectives of the owner, if those objectives are tied to a syndicate based antagonist role.

Non-trackable objectives.

Syndicate uplink base user interface.

Secure deaddrop mission.

Priority directive received

Beacon

Reputation system on the shop

Changelog

🆑
add: Priority directives, drama causing time-limited objectives that encourage you to maintain suspicions over your fellow traitors.
add: Certain traitor objectives are now trackable via the uplink.
tweak: Traitor TC reduced from 20 TC to 15 TC.
add: Traitor reputation system, reputation increases by completing directives and decreases slightly when failed.
balance: The cost and reputation requirements of various syndicate items has been altered.
/:cl:

…n/BeeStation-Hornet-Bacons-Fork into priority-directives

PowerfulBacon · 2024-03-14T22:56:13Z

The list of things left to do is small, should be testmergable in a few days

tgui/packages/tgui/styles/components/Uplink.scss

tgui/packages/tgui/interfaces/Uplink.js

EvilDragonfiend

Prioritise merging this please:

Fixes some weird bahaviour of picking up an item from storage #10729

MovedRelay component is broken, and this PR is necessary to fix that first.

code/controllers/subsystem/priority_directives.dm

code/modules/antagonists/traitor/directives/priority_directive.dm

EvilDragonfiend · 2024-03-15T01:02:00Z

code/modules/antagonists/traitor/directives/secure_deaddrop/secure_deaddrop.dm

+	details = "We have identified a deaddrop that has been placed by a rival spy agency and have maintained an accurate track on the box. \
+		You have the option to track and secure the valuable items before anyone else gets to them. The items are stored in a trackable \
+		box which will automatically unlock after a set period of time."
+	var/obj/item/storage/deaddrop_box/target


hard reference.

EvilDragonfiend · 2024-03-15T01:25:58Z

code/game/gamemodes/objectives/_objective.dm

+		// Must be something that we can store in
+		if (!istype(stash.parent, /obj/item/storage))
+			continue
+		secret_bag = stash.parent


missing of break

code/game/gamemodes/objectives/_objective.dm

EvilDragonfiend · 2024-03-15T01:34:32Z

code/game/gamemodes/objectives/_objective.dm

-		to_chat(receiver?.current, "<span class='notice bold'>You have a secret stash at [get_area(secret_bag)], more details are stored in your notes. (IC > Notes)</span>")
+		for (var/datum/mind/receiver in owners)
+			receiver.store_memory("You have a secret stash of items hidden on the station required for your objectives. It is hidden inside of [atom_text] ([secret_bag.loc]) located at [get_area(secret_bag.loc)] [COORD(secret_bag.loc)], you may have to search around for it. (Use alt click on the object the stash is inside to access it).")
+			to_chat(receiver?.current, "<span class='notice bold'>You have a secret stash at [get_area(secret_bag)], more details are stored in your notes. (IC > Notes)</span>")


I think there should be signalRegister with MobLogin for those who are somehow DC'ed at the moment

code/game/gamemodes/objectives/basic/steal.dm

…) to start() and check() to can_run()

EvilDragonfiend

Maybe helpful, but I am not sure

EvilDragonfiend · 2024-03-21T00:50:16Z

code/controllers/subsystem/priority_directives.dm

+		data["pos_x"] = uplink_turf?.x
+		data["pos_y"] = uplink_turf?.y
+		data["pos_z"] = uplink_turf?.z


I think ? is redundant. it's typechecked.

EvilDragonfiend · 2024-03-21T00:57:34Z

code/controllers/subsystem/priority_directives.dm

+	if (uplink.owner)
+		var/list/known_objectives = list()
+		for (var/datum/antagonist/antagonist_type in uplink.owner.antag_datums)
+			// The syndicate uplink is only aware of syndicate-given objectives.
+			if (antagonist_type.faction != FACTION_SYNDICATE)
+				continue
+			for (var/datum/objective/objective in antagonist_type.objectives)
+				var/atom/tracking_target = objective.get_tracking_target(uplink_turf)
+				var/turf/tracking_turf = tracking_target && get_turf(tracking_target)
+				known_objectives += list(list(
+					"name" = objective.name,
+					"tasks" = list(objective.explanation_text),
+					"track_x" = tracking_turf?.x,
+					"track_y" = tracking_turf?.y,
+					"track_z" = tracking_turf?.z,
+				))
+		// Add the priority directive
+		if (active_directive)
+			var/atom/track_atom = active_directive.get_track_atom()
+			var/turf/track_turf = get_turf(track_atom)
+			known_objectives += list(list(
+				"name" = active_directive.name,
+				"tasks" = list(active_directive.get_explanation(uplink)),
+				"time" = active_directive.end_at,
+				"details" = active_directive.get_details(uplink),
+				"reward" = active_directive.tc_reward,
+				"track_x" = track_turf?.x,
+				"track_y" = track_turf?.y,
+				"track_z" = track_turf?.z,
+				"action" = active_directive.get_special_action()?.action_name
+			))
+		data["objectives"] =  known_objectives
+	return data


z information isn't sufficient. people won't know if 1 is centcom, or 8 is multifloored station or away. try to use compare_z proc since it just tells if compared things are at the same z category.
(altho It looks I need to improve the proc a bit)

EvilDragonfiend · 2024-04-09T04:42:26Z

code/game/alternate_appearance.dm

+/datum/atom_hud/alternate_appearance/basic/some_people
+	var/list/seers
+
+/datum/atom_hud/alternate_appearance/basic/some_people/mobShouldSee(mob/M)
+	if(M in seers)
+		return TRUE
+	return FALSE
+
+/datum/atom_hud/alternate_appearance/basic/some_people/New(key, image/I, list/mobs)
+	..(key, I, FALSE)
+	seers = mobs
+	for (var/mob/seer in mobs)
+		add_hud_to(seer)
+


considering using this:

Client image controller system + minor implementations #10789

(Comment continued in stash component)

EvilDragonfiend · 2024-04-09T05:25:22Z

code/game/gamemodes/objectives/stash_component.dm

@@ -1,57 +1,64 @@
 /datum/component/stash
 	dupe_mode = COMPONENT_DUPE_ALLOWED
 	var/atom/movable/stash_item
-	var/datum/mind/stash_owner
+	var/list/stash_minds


I made change from your version to mix it with my client image system.
Please check: 493e0db

my client image system can keep client images to minds instead of mob based. This makes that you don't have to refresh mob based client images every time mind is changed or something. This is why I nuked transfer_mind() here.
Even if they aghost or got brain-transfered, they keep this, and you don't have to send a signal here.

This can be easily expanded to allow non-stash owners see this (i.e. Detective)
showing stash image won't be done through this component. You just need to find out which cimg_key is used, and just do validate_mob(stash_cimg_key, detective_mob) and then they'll be able to investigate it. (They won't be able to access. just can see it)

add_membership() and remove_membership() is likely necessary here because someone can be removed, or someone can be added to the party.
Admin might want to add a new member to a stash when they have to fix or do some admeme.

The proc owner_deleted() in the original code calls create_owner_icon() everytime when alternative appearance should be updated, but my client image system can simplify this much.

31e665a

Original stash code change example if this is too much

EvilDragonfiend · 2024-04-09T05:40:13Z

Also, please prioritise #10729

Fixes some weird bahaviour of picking up an item from storage #10729

I am starting to forget the detail of the issue about why MovedRelay is broken.

PowerfulBacon · 2024-04-11T08:22:32Z

Ready for TM

github-actions · 2024-05-07T16:06:47Z

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

github-actions · 2024-06-29T23:49:23Z

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

PowerfulBacon added 14 commits March 12, 2024 08:58

Directive framework

15ced36

Directives

f672e58

stuff

22bd6f7

Update Uplink.js

eb6915a

Wraps it all together

e54d4ee

Merge branch 'priority-directives' of https://github.com/PowerfulBaco…

fbcf141

…n/BeeStation-Hornet-Bacons-Fork into priority-directives

Resizable radar component

94bb2d5

Completes the UI with a ringing notification bell

97cc819

Updates directives to work with uplinks instead of antag datums

ba85b19

A bit of morning integration coding

d82a58d

Steal objectives can now be tracked

3b0afb9

Live objective tracking

b6c4179

Completes secure deaddrop

e82058e

Update secure_deaddrop.dm

397c077

PowerfulBacon added the Strategic Milestone A long-term strategic development. PRs completed for issues with this tag will be high-priority. label Mar 14, 2024

solid-octo-guacamole bot added the Feature label Mar 14, 2024

PowerfulBacon commented Mar 14, 2024

View reviewed changes

tgui/packages/tgui/styles/components/Uplink.scss Outdated Show resolved Hide resolved

github-actions bot added Administration TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0 labels Mar 14, 2024

PowerfulBacon added 2 commits March 14, 2024 22:58

Moves the uplink styling sheets to the correct place

2d45631

Executes TGUI prettier.

6a6b45e

PowerfulBacon added the Needs Testmerge label Mar 14, 2024

PowerfulBacon changed the title ~~Priority directives~~ Traitors 2.0: Priority directives Mar 14, 2024

PowerfulBacon commented Mar 14, 2024

View reviewed changes

tgui/packages/tgui/interfaces/Uplink.js Outdated Show resolved Hide resolved

Update tgui/packages/tgui/interfaces/Uplink.js

ec48143

EvilDragonfiend requested changes Mar 15, 2024

View reviewed changes

PowerfulBacon added 3 commits March 15, 2024 07:31

Uses SSticker.minds instead of looping through mobs

d819134

Make things in different orbital locations not trackable entirely

7cefd47

Clearly indicates internal function vs public ones, renames activate(…

c0a7f2b

…) to start() and check() to can_run()

Backend reputation and a host of balancing changes to the uplink

f92d4d7

github-actions bot added the Config Update label Mar 31, 2024

Adds in ranks and reputation

b06f5bc

solid-octo-guacamole bot added the Balance/Rebalance label Mar 31, 2024

PowerfulBacon added 6 commits April 8, 2024 17:42

Ties reputation to directives

48a2374

Compilation issue

39f0752

Fixes victory not working

042cc03

Stops bags from spawning under objects

cb8e5a5

Update beacon.dm

af4b579

Protect from nulls in ui_itneract

6508273

EvilDragonfiend requested changes Apr 9, 2024

View reviewed changes

Display reputation and fix nukies

02a9ac9

Revert DB config

b21b4a4

github-actions bot removed the Config Update label Apr 11, 2024

PowerfulBacon added 5 commits April 11, 2024 09:30

Runs TGUI uglify

932cbbd

Fixes this being wrong

b970c8d

Fixes TC amounts being given away, makes beacons appear more often

80ff3e2

Further decreases TC amounts gained

06aa32e

Delays the first directive a bit

ff2f1c2

github-actions bot added the Merge Conflict label May 7, 2024

Merge remote-tracking branch 'upstream/master' into priority-directives

39c8b2c

github-actions bot removed the Merge Conflict label May 14, 2024

Update priority_directive.dm

f1644b3

github-actions bot added the Merge Conflict label Jun 29, 2024

PowerfulBacon added the Stale label Jul 30, 2024

PowerfulBacon closed this Jul 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Traitors 2.0: Priority directives #10745

Traitors 2.0: Priority directives #10745

PowerfulBacon commented Mar 14, 2024 •

edited

Loading

PowerfulBacon commented Mar 14, 2024

EvilDragonfiend left a comment

EvilDragonfiend Mar 15, 2024

EvilDragonfiend Mar 15, 2024

EvilDragonfiend Mar 15, 2024

EvilDragonfiend left a comment

EvilDragonfiend Mar 21, 2024

EvilDragonfiend Mar 21, 2024

EvilDragonfiend Apr 9, 2024

EvilDragonfiend Apr 9, 2024 •

edited

Loading

EvilDragonfiend Apr 9, 2024

EvilDragonfiend commented Apr 9, 2024 •

edited

Loading

PowerfulBacon commented Apr 11, 2024

github-actions bot commented May 7, 2024

github-actions bot commented Jun 29, 2024

Traitors 2.0: Priority directives #10745

Traitors 2.0: Priority directives #10745

Conversation

PowerfulBacon commented Mar 14, 2024 • edited Loading

About The Pull Request

Why It's Good For The Game

Testing Photographs and Procedure

Changelog

PowerfulBacon commented Mar 14, 2024

EvilDragonfiend left a comment

Choose a reason for hiding this comment

EvilDragonfiend Mar 15, 2024

Choose a reason for hiding this comment

EvilDragonfiend Mar 15, 2024

Choose a reason for hiding this comment

EvilDragonfiend Mar 15, 2024

Choose a reason for hiding this comment

EvilDragonfiend left a comment

Choose a reason for hiding this comment

EvilDragonfiend Mar 21, 2024

Choose a reason for hiding this comment

EvilDragonfiend Mar 21, 2024

Choose a reason for hiding this comment

EvilDragonfiend Apr 9, 2024

Choose a reason for hiding this comment

EvilDragonfiend Apr 9, 2024 • edited Loading

Choose a reason for hiding this comment

EvilDragonfiend Apr 9, 2024

Choose a reason for hiding this comment

EvilDragonfiend commented Apr 9, 2024 • edited Loading

PowerfulBacon commented Apr 11, 2024

github-actions bot commented May 7, 2024

github-actions bot commented Jun 29, 2024

PowerfulBacon commented Mar 14, 2024 •

edited

Loading

EvilDragonfiend Apr 9, 2024 •

edited

Loading

EvilDragonfiend commented Apr 9, 2024 •

edited

Loading