Merge branch 'PortsPsionics' of https://github.com/cowbot92/Yogstation into PortsPsionics

Author: cowbot92

code/__DEFINES/psi.dm

@@ -16,5 +16,4 @@
 #define PSI_IMPLANT_LOG        "Log Incident"
 #define PSI_IMPLANT_DISABLED   "Disabled"
 
-#define COMSIG_PSI_SELECTION "select action"
 #define COMSIG_PSI_INVOKE "invoke selected"

code/_onclick/hud/action_button.dm

@@ -59,10 +59,10 @@
 	if(usr.next_click > world.time)
 		return
 	usr.next_click = world.time + 1
-//	var/trigger_flags
-//	if(LAZYACCESS(modifiers, RIGHT_CLICK)) FUCK COMBAT MODE!!!!
-//		trigger_flags |= TRIGGER_SECONDARY_ACTION
-	linked_action.Trigger()
+	var/trigger_flags
+	if(LAZYACCESS(modifiers, RIGHT_CLICK))
+		trigger_flags |= TRIGGER_SECONDARY_ACTION
+	linked_action.Trigger(trigger_flags)
 	SEND_SOUND(usr, get_sfx(SFX_TERMINAL_TYPE))
 	transform = turn(matrix() * 0.9, pick(-8, 8))
 	alpha = 200

code/_onclick/other_mobs.dm

@@ -50,10 +50,6 @@
 
 	A.attack_hand(src, modifiers)
 
-/mob/living/carbon/human/attack_empty_hand()
-	if(psi)
-		SEND_SIGNAL(src, COMSIG_PSI_SELECTION)
-
 /mob/living/carbon/human/RangedAttack(atom/A, params)
 	if(psi)
 		SEND_SIGNAL(src, COMSIG_PSI_INVOKE, A, FALSE, params)

code/modules/psionics/complexus/complexus.dm

@@ -63,27 +63,31 @@
 	var/image/_aura_image             // Client image
 	var/obj/effect/overlay/aura/image_holder //holder so we don't have to apply the image directly to the mob, making it's clickbox massive
 
+	
+	///weakref to button to access the complexus interface
+	var/datum/weakref/info_button_ref
+
 /datum/psi_complexus/New(mob/M)
 	owner = M
 	image_holder = new(src)
 	owner.vis_contents += image_holder
 	START_PROCESSING(SSpsi, src)
-	RegisterSignal(owner, COMSIG_PSI_SELECTION, PROC_REF(select_power))
 	RegisterSignal(owner, COMSIG_PSI_INVOKE, PROC_REF(invoke_power))
 	thinker = owner.mind
 	if(thinker && istype(thinker))
 		RegisterSignal(thinker, COMSIG_MIND_TRANSFERRED, PROC_REF(mind_swap))
 
+	var/datum/action/complexus_info/info_button = new(src)
+	info_button_ref = WEAKREF(info_button)
+
 /datum/psi_complexus/proc/mind_swap(datum/mind/brain, mob/living/oldbody)
 	if(!brain || !istype(brain) || !brain.current)
 		return
-	UnregisterSignal(owner, COMSIG_PSI_SELECTION)
 	UnregisterSignal(owner, COMSIG_PSI_INVOKE)
 	owner.vis_contents -= image_holder
 	owner.psi = null
 	owner = brain.current
 	owner.vis_contents += image_holder
-	RegisterSignal(owner, COMSIG_PSI_SELECTION, PROC_REF(select_power))
 	RegisterSignal(owner, COMSIG_PSI_INVOKE, PROC_REF(invoke_power))
 	owner.psi = src
 	update(TRUE, TRUE)
@@ -94,7 +98,6 @@
 	if(thinker && istype(thinker))
 		UnregisterSignal(thinker, COMSIG_MIND_TRANSFERRED)
 	if(owner)
-		UnregisterSignal(owner, COMSIG_PSI_SELECTION)
 		UnregisterSignal(owner, COMSIG_PSI_INVOKE)
 		cancel()
 		if(owner.client)
@@ -105,29 +108,163 @@
 		QDEL_NULL(ui)
 		owner.psi = null
 		owner = null
-	QDEL_NULL(image_holder)
+
+	if(image_holder)
+		QDEL_NULL(image_holder)
+
+	if(info_button_ref)
+		QDEL_NULL(info_button_ref)
 
 	if(manifested_items)
 		for(var/thing in manifested_items)
 			qdel(thing)
 		manifested_items.Cut()
 	. = ..()
 
-/datum/psi_complexus/proc/select_power(mob/user)
-	if(suppressed)
+////////////////////////////////////////////////////////////////////////////////////
+//----------------------------Ability selection stuff-----------------------------//
+////////////////////////////////////////////////////////////////////////////////////
+/datum/psi_complexus/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "PsionicComplexus", "Psi Complexus")
+		ui.open()
+
+/datum/psi_complexus/ui_data(mob/user)
+	var/list/data = list()
+	var/use_rating
+	var/effective_rating = rating
+	if(effective_rating > 1 && suppressed)
+		effective_rating = max(0, rating-2)
+	var/rating_descriptor
+	if(!use_rating)
+		switch(effective_rating)
+			if(1)
+				use_rating = "[effective_rating]-Epsilon"
+				rating_descriptor = "This indicates the presence of minor latent psi potential with little or no operant capabilities."
+			if(2)
+				use_rating = "[effective_rating]-Delta"
+				rating_descriptor = "This indicates the presence of minor psi capabilities of the Operant rank or higher."
+			if(3)
+				use_rating = "[effective_rating]-Gamma"
+				rating_descriptor = "This indicates the presence of psi capabilities of the Master rank or higher."
+			if(4)
+				use_rating = "[effective_rating]-Beta"
+				rating_descriptor = "This indicates the presence of significant psi capabilities of the Grandmaster rank or higher."
+			if(5)
+				use_rating = "[effective_rating]-Alpha"
+				rating_descriptor = "This indicates the presence of major psi capabilities of the Paramount rank or higher."
+			else
+				use_rating = "[effective_rating]-Lambda"
+				rating_descriptor = "This indicates the presence of trace latent psi capabilities."
+
+	if(selected_power && istype(selected_power))
+		data["selected_power"] = initial(selected_power.name)
+	data["use_rating"] = use_rating
+	data["rating_descriptor"] = rating_descriptor
+	data["faculties"] = list()
+	for(var/faculty_id in ranks)
+		var/list/check_powers = get_powers_by_faculty(faculty_id)
+		if(LAZYLEN(check_powers))
+			var/list/details = list()
+			var/datum/psionic_faculty/faculty = SSpsi.get_faculty(faculty_id)
+			details["name"] += faculty.name
+			details["rank"] += ranks[faculty_id]
+			for(var/datum/psionic_power/power in check_powers)
+				var/list/power_data = list()
+				power_data["name"] = power.name
+				power_data["description"] = power.use_description
+				power_data["path"] = power.type
+				details["powers"] += list(power_data)
+			data["faculties"] += list(details)
+	return data
+
+/datum/psi_complexus/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("select")
+			var/ability = text2path(params["ability"])
+			var/datum/psionic_power/finder = locate(ability) in learned_powers
+			if(!finder || !istype(finder))
+				return
+			selected_power = finder
+			owner.balloon_alert(owner, "Selected [selected_power.name]")
+		if("deselect")
+			selected_power = null
+			owner.balloon_alert(owner, "Deselected power")
+	update_button_icon()
+
+/datum/psi_complexus/ui_state()
+	return GLOB.always_state
+
+/datum/psi_complexus/ui_assets(mob/user)
+    return list(
+        get_asset_datum(/datum/asset/spritesheet/sheetmaterials)
+    )
+
+/datum/asset/spritesheet/psi_icons
+    name = "psi_icons"
+
+/datum/asset/spritesheet/psi_icons/create_spritesheets()
+    InsertAll("", 'icons/obj/psychic_powers.dmi')
+	
+/**
+ * Update the button icon
+ */
+/datum/psi_complexus/proc/update_button_icon()
+	var/datum/action/complexus_info/info_button = info_button_ref?.resolve()
+	if(info_button)
+		if(selected_power)
+			info_button.desc = "Selected power: [selected_power.name]"
+			info_button.button_icon = selected_power.icon
+			info_button.button_icon_state = selected_power.icon_state
+		else
+			info_button.desc = initial(info_button.desc)
+			info_button.button_icon = initial(info_button.button_icon)
+			info_button.button_icon_state = initial(info_button.button_icon_state)
+		info_button.build_all_button_icons()
+
+/**
+ * The ability in question
+ */
+/datum/action/complexus_info
+	name = "Open psi complexus"
+	desc = "No currently selected power."
+	button_icon = 'icons/obj/telescience.dmi'
+	button_icon_state = "psionic_null_skull"
+	show_to_observers = FALSE
+
+/datum/action/complexus_info/Trigger(trigger_flags)
+	. = ..()
+	if(!.)
 		return
-	rebuild_power_cache()
-	if(!LAZYLEN(learned_powers))
+	if(trigger_flags & TRIGGER_SECONDARY_ACTION)
+		var/datum/psi_complexus/host = target
+		if(istype(host))
+			if(!host.selected_power)
+				return
+			host.selected_power = null
+			owner.balloon_alert(owner, "Deselected power")
+			host.update_button_icon()
+			return
+		
+	target.ui_interact(owner)
+
+/datum/action/complexus_info/IsAvailable(feedback = FALSE)
+	if(!target)
+		stack_trace("[type] was used without a target psi complexus datum!")
+		return FALSE
+	. = ..()
+	if(!.)
 		return
-	var/list/choice_list = LAZYCOPY(learned_powers)
-	for(var/datum/psionic_power/I as anything in choice_list)
-		choice_list[I] = image(I.icon, null, I.icon_state)
-	var/selection = show_radial_menu(user, user, choice_list, null, 40, tooltips = TRUE, autopick_single_option = FALSE)
-	selected_power = selection
-	if(selection) //wipe the selected power unless something was actually chosen
-		selected_power.on_select(user)
-		user.balloon_alert(user, "Selected [selected_power.name]")
+	if(!owner.mind)
+		return FALSE
+	return TRUE
 
+////////////////////////////////////////////////////////////////////////////////////
+//------------------------------Invoke the power----------------------------------//
+////////////////////////////////////////////////////////////////////////////////////
 /datum/psi_complexus/proc/invoke_power(mob/user, atom/target, proximity, parameters)
 	if(suppressed)
 		return
@@ -137,6 +274,9 @@
 	if(.)
 		selected_power.handle_post_power(user, target)
 
+////////////////////////////////////////////////////////////////////////////////////
+//------------------------------Aura image stuff----------------------------------//
+////////////////////////////////////////////////////////////////////////////////////
 /datum/psi_complexus/proc/get_aura_image()
 	if(_aura_image && !istype(_aura_image))
 		var/atom/A = _aura_image

code/modules/psionics/complexus/complexus_process.dm

@@ -24,6 +24,15 @@
 			highest_faculty = faculty
 			highest_rank = check_rank
 
+	
+	var/datum/action/complexus_info/info_button = info_button_ref?.resolve()
+	if(info_button && istype(info_button))
+		if(highest_rank >= PSI_RANK_OPERANT)
+			info_button.Grant(owner)
+		else
+			info_button.Remove(owner)
+		
+
 	UNSETEMPTY(latencies)
 	var/rank_count = max(1, LAZYLEN(ranks))
 	rebuild_power_cache = TRUE

code/modules/psionics/faculties/_power.dm

@@ -58,6 +58,3 @@
 		log_attack("[user] Used psipower ([name]) on [target]")
 	if(use_sound)
 		playsound(user.loc, use_sound, 75)
-
-/datum/psionic_power/proc/on_select(mob/living/user)
-	return TRUE

code/modules/psionics/faculties/coercion.dm

@@ -24,7 +24,7 @@
 	cooldown =			5 SECONDS
 	min_rank =			PSI_RANK_OPERANT
 	icon_state = "coe_commune"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on a creature on to psionically send them a message."
+	use_description =	"Click on a creature on to psionically send them a message."
 
 /datum/psionic_power/coercion/commune/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!istype(target) || user == target)
@@ -68,7 +68,7 @@
 	cooldown =			5 SECONDS
 	min_rank =			PSI_RANK_OPERANT
 	icon_state = "coe_assay"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on a target in order to perform a deep coercive-redactive probe of their psionic potential."
+	use_description =	"Click on a target in order to perform a deep coercive-redactive probe of their psionic potential."
 
 /datum/psionic_power/coercion/assay/invoke(mob/living/user,  mob/living/target, proximity, parameters)
 	if(!istype(target) || user == target)
@@ -160,7 +160,7 @@
 	cooldown =			2 SECONDS
 	min_rank =			PSI_RANK_OPERANT
 	icon_state = "coe_agony"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, attack someone while in combat mode to deal minor stamina damage. Higher psi levels augment the damage done."
+	use_description =	"Attack someone while in combat mode to deal minor stamina damage. Higher psi levels augment the damage done."
 
 /datum/psionic_power/coercion/agony/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!istype(target) || !proximity || user == target || !user.combat_mode)
@@ -180,7 +180,7 @@
 	cooldown =			10 SECONDS
 	min_rank =			PSI_RANK_MASTER
 	icon_state = "coe_spasm"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target a creature to use a ranged attack that may rip the weapons away from the target."
+	use_description =	"Target a creature to use a ranged attack that may rip the weapons away from the target."
 
 /datum/psionic_power/coercion/spasm/invoke(mob/living/user, mob/living/carbon/human/target, proximity, parameters)
 	if(!istype(target) || user == target || !user.combat_mode)
@@ -204,7 +204,7 @@
 	cooldown =			8 SECONDS
 	min_rank =			PSI_RANK_MASTER
 	icon_state = "coe_focus"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on someone in order to cure ailments of the mind."
+	use_description =	"Click on someone in order to cure ailments of the mind."
 
 /datum/psionic_power/coercion/focus/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!istype(target) || !proximity || user == target)
@@ -243,7 +243,7 @@
 	cooldown =			25 SECONDS //It should take a WHILE to be able to use this again.
 	min_rank =			PSI_RANK_MASTER
 	icon_state = "coe_mindread"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on someone in melee range to attempt to read a surface level thought."
+	use_description =	"Click on someone in melee range to attempt to read a surface level thought."
 
 /datum/psionic_power/coercion/mindread/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!istype(target) || target == user || !proximity)
@@ -280,7 +280,7 @@
 	cooldown =			10 SECONDS
 	min_rank =			PSI_RANK_GRANDMASTER
 	icon_state = "coe_blindstrike"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click anywhere to use a radial attack that blinds, deafens and disorients everyone near you."
+	use_description =	"Click anywhere to use a radial attack that blinds, deafens and disorients everyone near you."
 
 /datum/psionic_power/coercion/blindstrike/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	. = ..()
@@ -304,7 +304,7 @@
 	cooldown =			100 SECONDS
 	min_rank =			PSI_RANK_PARAMOUNT
 	icon_state = "coe_disarm"
-	use_description =	"Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click your target with combat mode to Psionically rip their arms off."
+	use_description =	"Click your target with combat mode to Psionically rip their arms off."
 
 /datum/psionic_power/coercion/dis_arm/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!user.combat_mode || user == target)

code/modules/psionics/faculties/energistics.dm

@@ -13,7 +13,7 @@
 	cooldown =        7.5 SECONDS
 	min_rank =        PSI_RANK_OPERANT
 	icon_state = "ene_ele"
-	use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, in an empty, then Enter combat mode to use a melee attack that electrocutes a victim, or charge an energy cell."
+	use_description = "Enter combat mode to use a melee attack that electrocutes a victim, or charge an energy cell."
 
 /datum/psionic_power/energistics/electrocute/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!user.combat_mode || !istype(target) || !proximity) 
@@ -40,7 +40,7 @@
 	cooldown =        1 SECONDS
 	min_rank =        PSI_RANK_OPERANT
 	icon_state = "ene_spark"
-	use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target a non-living thing in melee range with combat mode on to cause some sparks to appear. This can light fires."
+	use_description = "Target a non-living thing in melee range with combat mode on to cause some sparks to appear. This can light fires."
 
 /datum/psionic_power/energistics/spark/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!user.combat_mode || isnull(target) || istype(target) || !proximity) 
@@ -65,7 +65,7 @@
 	cooldown =         2 SECONDS
 	min_rank =         PSI_RANK_MASTER
 	icon_state = "ene_zorch"
-	use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then use this ranged laser attack with combat mode on. Your mastery of Energistics will determine how powerful the laser is. Be wary of overuse, and try not to fry your own brain."
+	use_description = "Use this ranged laser attack with combat mode on. Your mastery of Energistics will determine how powerful the laser is. Be wary of overuse, and try not to fry your own brain."
 
 /datum/psionic_power/energistics/zorch/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!user.combat_mode) 
@@ -114,7 +114,7 @@
 	cooldown =        10 SECONDS
 	min_rank =        PSI_RANK_GRANDMASTER
 	icon_state = "ene_disrupt"
-	use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then attack a target while in combat mode to cause a localized electromagnetic pulse."
+	use_description = "Attack a target while in combat mode to cause a localized electromagnetic pulse."
 
 /datum/psionic_power/energistics/disrupt/invoke(mob/living/user, mob/living/target, proximity, parameters)
 	if(!user.combat_mode || !istype(target) || !proximity)