Merge pull request #107 from MistakeNot4892/fork/pyrelight

[IDB IGNORE] [MDB IGNORE] Updating from Neb dev

Author: MistakeNot4892

code/__defines/hud.dm

@@ -11,7 +11,6 @@
 #define UI_ICON_NUTRITION   "icon_nutrition"
 #define UI_ICON_HYDRATION   "icon_hydration"
 #define UI_ICON_FIRE_INTENT "icon_fire_intent"
-#define UI_ICON_INTENT      "icon_intent"
 #define UI_ICON_UP_HINT     "icon_uphint"
 #define UI_ICON_STATUS      "icon_status"
 #define UI_ICON_STATUS_FIRE "icon_status_fire"

code/__defines/intent.dm

@@ -0,0 +1,11 @@
+// Intent bitflags for use in check_intent()
+#define I_FLAG_HELP   BITFLAG(0)
+#define I_FLAG_DISARM BITFLAG(1)
+#define I_FLAG_GRAB   BITFLAG(2)
+#define I_FLAG_HARM   BITFLAG(3)
+#define I_FLAG_ALL    (I_FLAG_HELP|I_FLAG_DISARM|I_FLAG_GRAB|I_FLAG_HARM)
+
+//NOTE: INTENT_HOTKEY_* defines are not actual intents!
+//they are here to support hotkeys
+#define INTENT_HOTKEY_LEFT  "left"
+#define INTENT_HOTKEY_RIGHT "right"

code/__defines/misc.dm

@@ -270,11 +270,6 @@
 /// Returns the hex value of a number given a value assumed to be a base-ten value, padded to a supplied minimum length.
 #define num2hex_padded(num, len) num2text(num, len, 16)
 
-//NOTE: INTENT_HOTKEY_* defines are not actual intents!
-//they are here to support hotkeys
-#define INTENT_HOTKEY_LEFT  "left"
-#define INTENT_HOTKEY_RIGHT "right"
-
 //Turf/area values for 'this space is outside' checks
 #define OUTSIDE_AREA null
 #define OUTSIDE_NO   FALSE

code/__defines/mobs.dm

@@ -34,12 +34,6 @@
 #define GETPULSE_TOOL 1   // More accurate. (med scanner, sleeper, etc.)
 #define PULSE_MAX_BPM 250 // Highest, readable BPM by machines and humans.
 
-//intent flags
-#define I_HELP		"help"
-#define I_DISARM	"disarm"
-#define I_GRAB		"grab"
-#define I_HURT		"harm"
-
 //These are used Bump() code for living mobs, in the mob_bump_flag, mob_swap_flags, and mob_push_flags vars to determine whom can bump/swap with whom.
 #define HUMAN 1
 #define MONKEY 2

code/_helpers/cmp.dm

@@ -137,6 +137,9 @@
 /proc/cmp_decl_uid_asc(decl/a, decl/b)
 	return sorttext(b.uid, a.uid)
 
+/proc/cmp_decl_sort_value_asc(decl/a, decl/b)
+	return a.sort_order - b.sort_order
+
 /proc/cmp_inventory_slot_desc(datum/inventory_slot/a, datum/inventory_slot/b)
 	return b.quick_equip_priority - a.quick_equip_priority
 
@@ -154,4 +157,7 @@
 		if(a == prerequisite)
 			return -1 // goes after
 		return cmp_skill_asc(a, GET_DECL(b.prerequisites[1]))
-	return cmp_name_or_type_asc(a, b)
+	return cmp_name_or_type_asc(a, b)
+
+/proc/cmp_priority_list(list/A, list/B)
+	return A["priority"] - B["priority"]

code/_helpers/visual_filters.dm

@@ -5,9 +5,6 @@
 /atom/movable
 	var/list/filter_data // For handling persistent filters
 
-/proc/cmp_filter_data_priority(list/A, list/B)
-	return A["priority"] - B["priority"]
-
 // Defining this for future proofing and ease of searching for erroneous usage.
 /image/proc/add_filter(filter_name, priority, list/params)
 	filters += filter(arglist(params))
@@ -35,7 +32,7 @@
 
 /atom/movable/proc/update_filters()
 	filters = null
-	filter_data = sortTim(filter_data, /proc/cmp_filter_data_priority, TRUE)
+	filter_data = sortTim(filter_data, /proc/cmp_priority_list, TRUE)
 	for(var/f in filter_data)
 		var/list/data = filter_data[f]
 		var/list/arguments = data.Copy()

code/_onclick/MouseDrag.dm

@@ -15,7 +15,7 @@
 			return
 
 	var/obj/item/gun/gun = get_active_held_item()
-	if(a_intent == I_HURT && istype(over_object) && (isturf(over_object) || isturf(over_object.loc)) && !incapacitated() && istype(gun))
+	if(check_intent(I_FLAG_HARM) && istype(over_object) && (isturf(over_object) || isturf(over_object.loc)) && !incapacitated() && istype(gun))
 		gun.set_autofire(over_object, src)
 
 /mob/proc/OnMouseDown(atom/object, location, control, params)
@@ -25,7 +25,7 @@
 			return
 
 	var/obj/item/gun/gun = get_active_held_item()
-	if(a_intent == I_HURT && istype(object) && (isturf(object) || isturf(object.loc)) && !incapacitated() && istype(gun))
+	if(check_intent(I_FLAG_HARM) && istype(object) && (isturf(object) || isturf(object.loc)) && !incapacitated() && istype(gun))
 		gun.set_autofire(object, src)
 
 /mob/proc/OnMouseUp(atom/object, location, control, params)

code/_onclick/click.dm

@@ -118,7 +118,7 @@
 		if(holding)
 
 			// AI driven mobs have a melee telegraph that needs to be handled here.
-			if(a_intent == I_HURT && istype(A) && (!do_attack_windup_checking(A) || holding != get_active_held_item()))
+			if(check_intent(I_FLAG_HARM) && istype(A) && (!do_attack_windup_checking(A) || holding != get_active_held_item()))
 				return TRUE
 
 			var/resolved = holding.resolve_attackby(A, src, params)
@@ -144,7 +144,7 @@
 			if(holding)
 
 				// AI driven mobs have a melee telegraph that needs to be handled here.
-				if(a_intent == I_HURT && istype(A) && (!do_attack_windup_checking(A) || holding != get_active_held_item()))
+				if(check_intent(I_FLAG_HARM) && istype(A) && (!do_attack_windup_checking(A) || holding != get_active_held_item()))
 					return TRUE
 
 				// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
@@ -225,7 +225,7 @@
 	// corgis attacking a tree, for example, will do the windup animation despite
 	// having no interaction or message shown at the end of it.
 	// AI driven mobs have a melee telegraph that needs to be handled here.
-	if(a_intent == I_HURT && istype(A) && !do_attack_windup_checking(A))
+	if(check_intent(I_FLAG_HARM) && istype(A) && !do_attack_windup_checking(A))
 		return TRUE
 
 	return FALSE

code/_onclick/cyborg.dm

@@ -137,7 +137,7 @@
 	return
 
 /obj/machinery/door/airlock/BorgAltClick() // Eletrifies doors. Forwards to AI code.
-	if (usr.a_intent != I_HELP)
+	if (!usr.check_intent(I_FLAG_HELP))
 		AICtrlAltClick()
 	else
 		..()

code/_onclick/hud/animal.dm

@@ -11,6 +11,6 @@
 	move_intent = new(null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_MOVEMENT)
 	move_intent.icon_state = mymob.move_intent.hud_icon_state
 	adding += move_intent
-	action_intent = new(null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_INTENT)
+	action_intent = new(null, mymob, ui_style, ui_color, ui_alpha)
 	adding += action_intent
 	..()