Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893

[MIRROR] Datum abductors refactor

code/game/gamemodes/miniantags/abduction/abduction.dm

@@ -1,5 +1,17 @@
+/datum/objective_team/abductor_team
+	member_name = "abductor" 
+	var/list/objectives = list()
+	var/team_number
+
+/datum/objective_team/abductor_team/is_solo()
+	return FALSE
+
+/datum/objective_team/abductor_team/proc/add_objective(datum/objective/O)
+	O.team = src
+	O.update_explanation_text()
+	objectives += O
+
 /datum/game_mode
-	var/abductor_teams = 0
 	var/list/datum/mind/abductors = list()
 	var/list/datum/mind/abductees = list()
 
@@ -12,12 +24,8 @@
 	required_players = 15
 	maximum_players = 50
 	var/max_teams = 4
-	abductor_teams = 1
-	var/list/datum/mind/scientists = list()
-	var/list/datum/mind/agents = list()
-	var/list/datum/objective/team_objectives = list()
-	var/list/team_names = list()
-	var/finished = 0
+	var/list/datum/objective_team/abductor_team/abductor_teams = list()
+	var/finished = FALSE
 
 /datum/game_mode/abduction/announce()
 	to_chat(world, "<B>The current game mode is - Abduction!</B>")
@@ -26,163 +34,78 @@
 	to_chat(world, "<b>Crew</b> - don't get abducted and stop the abductors.")
 
 /datum/game_mode/abduction/pre_setup()
-	abductor_teams = max(1, min(max_teams,round(num_players()/config.abductor_scaling_coeff)))
-	var/possible_teams = max(1,round(antag_candidates.len / 2))
-	abductor_teams = min(abductor_teams,possible_teams)
+	var/num_teams = max(1, min(max_teams, round(num_players() / config.abductor_scaling_coeff)))
+	var/possible_teams = max(1, round(antag_candidates.len / 2))
+	num_teams = min(num_teams, possible_teams)
 
-	abductors.len = 2*abductor_teams
-	scientists.len = abductor_teams
-	agents.len = abductor_teams
-	team_objectives.len = abductor_teams
-	team_names.len = abductor_teams
+	for(var/i = 1 to num_teams)
+		if(!make_abductor_team())
+			return FALSE
+	return TRUE
 
-	for(var/i=1,i<=abductor_teams,i++)
-		if(!make_abductor_team(i))
-			return 0
+/datum/game_mode/abduction/proc/make_abductor_team(datum/mind/agent, datum/mind/scientist)
+	var/team_number = abductor_teams.len+1
 
-	return 1
+	var/datum/objective_team/abductor_team/team = new
+	team.team_number = team_number
+	team.name = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
+	team.add_objective(new/datum/objective/experiment)
 
-/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null)
-	//Team Name
-	team_names[team_number] = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
-	//Team Objective
-	var/datum/objective/experiment/team_objective = new
-	team_objective.team_number = team_number
-	team_objectives[team_number] = team_objective
-	//Team Members
+	if(antag_candidates.len < (!agent + !scientist))
+		return
 
-	if(!preset_agent || !preset_scientist)
-		if(antag_candidates.len <=2)
-			return 0
-
-	var/datum/mind/scientist
-	var/datum/mind/agent
-
-	if(!preset_scientist)
+	if(!scientist)
 		scientist = pick(antag_candidates)
-		antag_candidates -= scientist
-	else
-		scientist = preset_scientist
+	antag_candidates -= scientist
+	team.members |= scientist
+	scientist.assigned_role = "Abductor Scientist"
+	log_game("[scientist.key] (ckey) has been selected as [team.name] abductor scientist.")
 
-	if(!preset_agent)
+	if(!agent)
 		agent = pick(antag_candidates)
-		antag_candidates -= agent
-	else
-		agent = preset_agent
+	antag_candidates -= agent
+	team.members |= agent
+	agent.assigned_role = "Abductor Agent"
+	log_game("[agent.key] (ckey) has been selected as [team.name] abductor agent.")
 
-
-	scientist.assigned_role = "abductor scientist"
-	scientist.special_role = "abductor scientist"
-	log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.")
-
-	agent.assigned_role = "abductor agent"
-	agent.special_role = "abductor agent"
-	log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.")
-
-	abductors |= agent
-	abductors |= scientist
-	scientists[team_number] = scientist
-	agents[team_number] = agent
-	return 1
+	abductor_teams += team
+	return team
 
 /datum/game_mode/abduction/post_setup()
-	for(var/team_number=1,team_number<=abductor_teams,team_number++)
-		post_setup_team(team_number)
+	for(var/datum/objective_team/abductor_team/team in abductor_teams)
+		post_setup_team(team)
 	return ..()
 
 //Used for create antag buttons
-/datum/game_mode/abduction/proc/post_setup_team(team_number)
-	var/list/obj/effect/landmark/abductor/agent_landmarks = list()
-	var/list/obj/effect/landmark/abductor/scientist_landmarks = list()
-	agent_landmarks.len = max_teams
-	scientist_landmarks.len = max_teams
-	for(var/obj/effect/landmark/abductor/A in GLOB.landmarks_list)
-		if(istype(A, /obj/effect/landmark/abductor/agent))
-			agent_landmarks[text2num(A.team)] = A
-		else if(istype(A, /obj/effect/landmark/abductor/scientist))
-			scientist_landmarks[text2num(A.team)] = A
-
-	var/team_name = team_names[team_number]
-
-	var/datum/mind/agent
-	var/obj/effect/landmark/L
-	var/datum/mind/scientist
-	var/mob/living/carbon/human/H
-	var/datum/species/abductor/S
-
-	agent = agents[team_number]
-	H = agent.current
-	L = agent_landmarks[team_number]
-	H.forceMove(L.loc)
-	H.set_species(/datum/species/abductor)
-	S = H.dna.species
-	S.team = team_number
-	H.real_name = team_name + " Agent"
-	H.equipOutfit(/datum/outfit/abductor/agent)
-	greet_agent(agent,team_number)
-
-
-	scientist = scientists[team_number]
-	H = scientist.current
-	L = scientist_landmarks[team_number]
-	H.forceMove(L.loc)
-	H.set_species(/datum/species/abductor)
-	S = H.dna.species
-	S.scientist = TRUE
-	S.team = team_number
-	H.real_name = team_name + " Scientist"
-	H.equipOutfit(/datum/outfit/abductor/scientist)
-	greet_scientist(scientist,team_number)
-
-
-
-/datum/game_mode/abduction/proc/greet_agent(datum/mind/abductor,team_number)
-	abductor.objectives += team_objectives[team_number]
-	var/team_name = team_names[team_number]
-
-	to_chat(abductor.current, "<span class='notice'>You are an agent of [team_name]!</span>")
-	to_chat(abductor.current, "<span class='notice'>With the help of your teammate, kidnap and experiment on station crew members!</span>")
-	to_chat(abductor.current, "<span class='notice'>Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.</span>")
-
-	abductor.announce_objectives()
-
-/datum/game_mode/abduction/proc/greet_scientist(datum/mind/abductor,team_number)
-	abductor.objectives += team_objectives[team_number]
-	var/team_name = team_names[team_number]
-
-	to_chat(abductor.current, "<span class='notice'>You are a scientist of [team_name]!</span>")
-	to_chat(abductor.current, "<span class='notice'>With the help of your teammate, kidnap and experiment on station crew members!</span>")
-	to_chat(abductor.current, "<span class='notice'>Use your tool and ship consoles to support the agent and retrieve human specimens.</span>")
-
-	abductor.announce_objectives()
-
-/datum/game_mode/abduction/proc/get_team_console(team_number)
-	for(var/obj/machinery/abductor/console/C in GLOB.machines)
-		if(C.team == team_number)
-			return C
+/datum/game_mode/abduction/proc/post_setup_team(datum/objective_team/abductor_team/team)
+	for(var/datum/mind/M in team.members)
+		if(M.assigned_role == "Abductor Scientist")
+			M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_SCIENTIST, team)
+		else
+			M.add_antag_datum(ANTAG_DATUM_ABDUCTOR_AGENT, team)
 
 /datum/game_mode/abduction/check_finished()
 	if(!finished)
-		for(var/team_number=1,team_number<=abductor_teams,team_number++)
-			var/obj/machinery/abductor/console/con = get_team_console(team_number)
-			var/datum/objective/objective = team_objectives[team_number]
-			if (con.experiment.points >= objective.target_amount)
-				SSshuttle.emergency.request(null, set_coefficient = 0.5)
-				finished = 1
-				return ..()
+		for(var/datum/objective_team/abductor_team/team in abductor_teams)
+			for(var/datum/objective/O in team.objectives)
+				if(O.check_completion())
+					SSshuttle.emergency.request(null, set_coefficient = 0.5)
+					finished = TRUE
+					return ..()
 	return ..()
 
 /datum/game_mode/abduction/declare_completion()
-	for(var/team_number=1,team_number<=abductor_teams,team_number++)
-		var/obj/machinery/abductor/console/console = get_team_console(team_number)
-		var/datum/objective/objective = team_objectives[team_number]
-		var/team_name = team_names[team_number]
-		if(console.experiment.points >= objective.target_amount)
-			to_chat(world, "<span class='greenannounce'>[team_name] team fulfilled its mission!</span>")
+	for(var/datum/objective_team/abductor_team/team in abductor_teams)
+		var/won = TRUE
+		for(var/datum/objective/O in team.objectives)
+			if(!O.check_completion())
+				won = FALSE
+		if(won)
+			to_chat(world, "<span class='greenannounce'>[team.name] team fulfilled its mission!</span>")
 		else
-			to_chat(world, "<span class='boldannounce'>[team_name] team failed its mission.</span>")
+			to_chat(world, "<span class='boldannounce'>[team.name] team failed its mission.</span>")
 	..()
-	return 1
+	return TRUE
 
 /datum/game_mode/proc/auto_declare_completion_abduction()
 	var/text = ""
@@ -200,40 +123,28 @@
 	text += "<br>"
 	to_chat(world, text)
 
-//Landmarks
-// TODO: Split into separate landmarks for prettier ships
+// LANDMARKS
 /obj/effect/landmark/abductor
-	var/team = 1
+	var/team_number = 1
 
 /obj/effect/landmark/abductor/agent
 /obj/effect/landmark/abductor/scientist
 
-
 // OBJECTIVES
 /datum/objective/experiment
 	target_amount = 6
-	var/team_number
 
 /datum/objective/experiment/New()
 	explanation_text = "Experiment on [target_amount] humans."
 
 /datum/objective/experiment/check_completion()
-	var/ab_team = team_number
-	if(owner)
-		if(!owner.current || !ishuman(owner.current))
-			return 0
-		var/mob/living/carbon/human/H = owner.current
-		if(H.dna.species.id != "abductor")
-			return 0
-		var/datum/species/abductor/S = H.dna.species
-		ab_team = S.team
 	for(var/obj/machinery/abductor/experiment/E in GLOB.machines)
-		if(E.team == ab_team)
-			if(E.points >= target_amount)
-				return 1
-			else
-				return 0
-	return 0
+		if(!istype(team, /datum/objective_team/abductor_team))
+			return FALSE
+		var/datum/objective_team/abductor_team/T = team
+		if(E.team_number == T.team_number)
+			return E.points >= target_amount
+	return FALSE
 
 /datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind)
 	var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_ABDUCTOR]

code/game/gamemodes/miniantags/abduction/abduction_outfits.dm

@@ -5,20 +5,14 @@
 	back = /obj/item/storage/backpack
 	ears = /obj/item/device/radio/headset/abductor
 
-/datum/outfit/abductor/proc/get_team_console(team_number)
-	for(var/obj/machinery/abductor/console/C in GLOB.machines)
-		if(C.team == team_number)
-			return C
-
 /datum/outfit/abductor/proc/link_to_console(mob/living/carbon/human/H, team_number)
-	if(!team_number && isabductor(H))
-		var/datum/species/abductor/S = H.dna.species
-		team_number = S.team
-
+	var/datum/antagonist/abductor/A = H.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR)
+	if(!team_number && A)
+		team_number = A.team.team_number
 	if(!team_number)
 		team_number = 1
 
-	var/obj/machinery/abductor/console/console = get_team_console(team_number)
+	var/obj/machinery/abductor/console/console = get_abductor_console(team_number)
 	if(console)
 		var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H
 		if(V)

code/game/gamemodes/miniantags/abduction/machinery/camera.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/camera_advanced/abductor
 	name = "Human Observation Console"
-	var/team = 0
+	var/team_number = 0
 	networks = list("SS13","Abductor")
 	var/datum/action/innate/teleport_in/tele_in_action = new
 	var/datum/action/innate/teleport_out/tele_out_action = new

code/game/gamemodes/miniantags/abduction/machinery/console.dm

@@ -1,8 +1,13 @@
+/proc/get_abductor_console(team_number)
+	for(var/obj/machinery/abductor/console/C in GLOB.machines)
+		if(C.team_number == team_number)
+			return C
+
 //Common
 
 /obj/machinery/abductor
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	var/team = 0
+	var/team_number = 0
 
 //Console
 
@@ -139,21 +144,21 @@
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/abductor/console/LateInitialize()
-	if(!team)
+	if(!team_number)
 		return
 
 	for(var/obj/machinery/abductor/pad/p in GLOB.machines)
-		if(p.team == team)
+		if(p.team_number == team_number)
 			pad = p
 			break
 
 	for(var/obj/machinery/abductor/experiment/e in GLOB.machines)
-		if(e.team == team)
+		if(e.team_number == team_number)
 			experiment = e
 			e.console = src
 
 	for(var/obj/machinery/computer/camera_advanced/abductor/c in GLOB.machines)
-		if(c.team == team)
+		if(c.team_number == team_number)
 			camera = c
 			c.console = src
 

code/game/objects/items/implants/implant_abductor.dm

@@ -26,21 +26,15 @@
 	if(..())
 		var/obj/machinery/abductor/console/console
 		if(ishuman(target))
-			var/mob/living/carbon/human/H = target
-			if(H.dna.species.id == "abductor")
-				var/datum/species/abductor/S = H.dna.species
-				console = get_team_console(S.team)
+			var/datum/antagonist/abductor/A = target.mind.has_antag_datum(ANTAG_DATUM_ABDUCTOR)
+			if(A)
+				console = get_abductor_console(A.team.team_number)
 				home = console.pad
 
 		if(!home)
-			console = get_team_console(pick(1, 2, 3, 4))
+			var/list/consoles = list()
+			for(var/obj/machinery/abductor/console/C in GLOB.machines)
+				consoles += C
+			console = pick(consoles)
 			home = console.pad
-		return 1
-
-/obj/item/implant/abductor/proc/get_team_console(var/team)
-	var/obj/machinery/abductor/console/console
-	for(var/obj/machinery/abductor/console/c in GLOB.machines)
-		if(c.team == team)
-			console = c
-			break
-	return console
+		return TRUE