Adds Bitfields to the VV menu (#27266)

* Adds Bitfields to the VV menu

* oops

* fixed

* oops

* woo

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Contrabang
2024-11-09 17:49:51 -05:00
committed by GitHub
parent 0b79bc23e9
commit 9b2cd0abea
12 changed files with 347 additions and 87 deletions
+4 -4
View File
@@ -65,14 +65,14 @@
if(prompt != "Continue")
return
default = vv_get_class(var_value)
default = vv_get_class(variable, var_value)
if(isnull(default))
to_chat(src, "Unable to determine variable type.")
else
to_chat(src, "Variable appears to be <b>[uppertext(default)]</b>.")
to_chat(src, "Variable contains: [var_value]")
to_chat(src, "Variable contains: [translate_bitfield(default, variable, var_value)]")
if(default == VV_NUM)
var/dir_text = ""
@@ -89,7 +89,7 @@
if(dir_text)
to_chat(src, "If a direction, direction is: [dir_text]")
var/value = vv_get_value(default_class = default)
var/value = vv_get_value(class = (default == VV_BITFIELD ? VV_BITFIELD : null), default_class = default, var_name = variable)
var/new_value = value["value"]
var/class = value["class"]
@@ -207,7 +207,7 @@
log_world("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])")
log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] (Type: [class]) ([accepted] objects modified)")
message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [html_encode("[O.vars[variable]]")] (Type: [class]) ([accepted] objects modified)")
message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [html_encode(translate_bitfield(default, variable, O.vars[variable]))] (Type: [class]) ([accepted] objects modified)")
/proc/get_all_of_type(T, subtypes = TRUE)
var/list/typecache = list()
+16 -9
View File
@@ -12,12 +12,15 @@ GLOBAL_PROTECT(VVckey_edit)
GLOBAL_PROTECT(VVpixelmovement)
GLOBAL_PROTECT(VVmaint_only)
/client/proc/vv_get_class(var_value)
/client/proc/vv_get_class(var_name, var_value)
if(isnull(var_value))
. = VV_NULL
else if(isnum(var_value))
. = VV_NUM
if(var_name in GLOB.bitfields)
. = VV_BITFIELD
else
. = VV_NUM
else if(istext(var_value))
if(findtext(var_value, "\n"))
@@ -61,7 +64,7 @@ GLOBAL_PROTECT(VVmaint_only)
else
. = VV_NULL
/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes)
/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes, var_name)
. = list("class" = class, "value" = null)
if(!class)
if(!classes)
@@ -120,6 +123,11 @@ GLOBAL_PROTECT(VVmaint_only)
.["class"] = null
return
if(VV_BITFIELD)
.["value"] = input_bitfield(usr, var_name, current_value)
if(.["value"] == null)
.["class"] = null
return
if(VV_ATOM_TYPE)
.["value"] = pick_closest_path(FALSE)
@@ -451,7 +459,7 @@ GLOBAL_PROTECT(VVmaint_only)
else
variable = L[index]
default = vv_get_class(variable)
default = vv_get_class(objectvar, variable)
to_chat(src, "Variable appears to be <b>[uppertext(default)]</b>.")
@@ -582,14 +590,14 @@ GLOBAL_PROTECT(VVmaint_only)
var_value = O.vars[variable]
var/default = vv_get_class(var_value)
var/default = vv_get_class(variable, var_value)
if(isnull(default))
to_chat(src, "Unable to determine variable type.")
else
to_chat(src, "Variable appears to be <b>[uppertext(default)]</b>.")
to_chat(src, "Variable contains: [var_value]")
to_chat(src, "Variable contains: [translate_bitfield(default, variable, var_value)]")
if(default == VV_NUM)
var/dir_text = ""
@@ -611,7 +619,7 @@ GLOBAL_PROTECT(VVmaint_only)
default = VV_MESSAGE
class = default
var/list/value = vv_get_value(class, default, var_value, extra_classes = list(VV_LIST))
var/list/value = vv_get_value(class, default, var_value, extra_classes = list(VV_LIST), var_name = variable)
class = value["class"]
if(!class)
@@ -645,5 +653,4 @@ GLOBAL_PROTECT(VVmaint_only)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VAR_EDIT, args)
log_world("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")] (Type: [class])")
log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new] (Type: [class])")
var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [html_encode("[var_new]")] (Type: [class])"
message_admins(msg)
message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [html_encode(translate_bitfield(default, variable, var_new))] (Type: [class])")