cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some Preview Stuff (#19308)

Browse Source 
* Added more backgrounds to choose from in the character preview screen.
* You can now selectively hide your job uniform, suit, or hat.

---------

Signed-off-by: Geeves <ggrobler447@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Geeves
2024-06-10 11:54:20 +00:00
committed by GitHub
co-authored by Fluffy
parent 6b30f10cce
commit c40a37db22
8 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/prefs.dm
+19 -3
View File
@@ -1,6 +1,22 @@
#define EQUIP_PREVIEW_LOADOUT 1
#define EQUIP_PREVIEW_JOB 2
#define EQUIP_PREVIEW_ALL (EQUIP_PREVIEW_LOADOUT|EQUIP_PREVIEW_JOB)
// Character Preview Bitflags
/// Will show loadout items
#define EQUIP_PREVIEW_LOADOUT BITFLAG(0)
/// Will show job items, specific item bitflags will determine if those ones are shown or not
#define EQUIP_PREVIEW_JOB BITFLAG(1)
/// Will show job hat if true, will hide if this is false or EQUIP_PREVIEW_JOB is false
#define EQUIP_PREVIEW_JOB_HAT BITFLAG(2)
/// Will show job uniform if true, will hide if this is false or EQUIP_PREVIEW_JOB is false
#define EQUIP_PREVIEW_JOB_UNIFORM BITFLAG(3)
/// Will show job suit if true, will hide if this is false or EQUIP_PREVIEW_JOB is false
#define EQUIP_PREVIEW_JOB_SUIT BITFLAG(4)
/// The default EQUIP_PREVIEW bitflag, with this, all character creation items are shown
#define EQUIP_PREVIEW_ALL (EQUIP_PREVIEW_LOADOUT|EQUIP_PREVIEW_JOB|EQUIP_PREVIEW_JOB_HAT|EQUIP_PREVIEW_JOB_UNIFORM|EQUIP_PREVIEW_JOB_SUIT)
/// External organ. Is a prosthesis with a robo-limb manufacturer.
#define ORGAN_PREF_CYBORG "cyborg"
code/__HELPERS/lists.dm
+16
View File
@@ -295,6 +295,22 @@
return L[i+1]
return L[1]
/// Returns the value after the current value in a key-value pair associated list. If this is the last element, or the element isn't present in the list, it'll return the first value in the list
/proc/next_in_assoc_list(element, list/our_list)
// this is the index we'll use to get the key at the end of the function, which is used to get the value
var/index = 1
// loop through to the list to find where exactly our value element is in the list
for(var/i in 1 to length(our_list))
if(our_list[our_list[i]] == element)
// we've found our value, now we need to check if it's at the end of the list
// if not, we can select our index + 1
// First element in the list if we're at the end of it, next one otherwise
index = ((i == length(our_list)) ? 1 : i + 1)
break
return our_list[our_list[index]]
/*
* Sorting
*/
code/game/jobs/job/job.dm
+25 -1
View File
@@ -111,7 +111,7 @@
to_chat(H, SPAN_BOLD(SPAN_NOTICE("Your account number is: [account.account_number], your account pin is: [account.remote_access_pin]")))
// overrideable separately so AIs/borgs can have cardborg hats without unneccessary new()/del()
/datum/job/proc/equip_preview(mob/living/carbon/human/H, var/alt_title, var/faction_override)
/datum/job/proc/equip_preview(mob/living/carbon/human/H, datum/preferences/prefs, var/alt_title, var/faction_override)
if(faction_override)
var/faction = SSjobs.name_factions[faction_override]
if(faction)
@@ -123,9 +123,33 @@
O.pre_equip(H, TRUE)
O.equip(H, TRUE)
return
var/pre_hat_ref = H.head ? REF(H.head) : null
var/pre_uniform_ref = H.w_uniform ? REF(H.w_uniform) : null
var/pre_suit_ref = H.wear_suit ? REF(H.wear_suit) : null
pre_equip(H, TRUE)
. = equip(H, TRUE, FALSE, alt_title=alt_title)
// slightly hacky, but effectively what we're doing here is checking whether we want this preview mob to actually have the uniform we're putting onto it
// if not, we drop it from the inventory into nullspace, and then deleting it
// i don't THINK this'll make performance that much worse, considering how much we already do to equip the mob in the first place
// the reasoning for the ref checks is that we don't want to delete loadout uniforms, just the job ones, so we need to confirm the before and after
var/equip_preview_mob = prefs.equip_preview_mob
if(!(equip_preview_mob & EQUIP_PREVIEW_JOB_HAT) && H.head && REF(H.head) != pre_hat_ref)
H.drop_from_inventory(H.head)
qdel(H.head)
if(!(equip_preview_mob & EQUIP_PREVIEW_JOB_UNIFORM) && H.w_uniform && REF(H.w_uniform) != pre_uniform_ref)
H.drop_from_inventory(H.w_uniform)
qdel(H.w_uniform)
if(!(equip_preview_mob & EQUIP_PREVIEW_JOB_UNIFORM) && H.wear_suit && REF(H.wear_suit) != pre_suit_ref)
H.drop_from_inventory(H.wear_suit)
qdel(H.wear_suit)
/datum/job/proc/get_access(selected_title)
SHOULD_NOT_SLEEP(TRUE)
code/modules/client/preference_setup/general/03_body.dm
+14 -4
View File
@@ -214,8 +214,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if (!pref.disabilities || !islist(pref.disabilities))
pref.disabilities = list()
if(!pref.bgstate || !(pref.bgstate in pref.bgstate_options))
pref.bgstate = "000000"
if(!pref.bgstate || !(pref.bgstate in list_values(pref.bgstate_options)))
pref.bgstate = "plain_black"
/datum/category_item/player_setup_item/general/body/content(var/mob/user)
var/list/out = list()
@@ -283,10 +283,14 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
out += "<br><br>"
out += "</td><td><b>Preview</b>"
out += "<br><a href='?src=\ref[src];cycle_bg=1'>Cycle background</a>"
out += "<br><a href='?src=\ref[src];cycle_bg=1'>Cycle Background</a>"
out += "<br><a href='?src=\ref[src];select_bg=1'>Select Background</a>"
out += "<br><a href='?src=\ref[src];set_preview_scale=1'>Set Preview Scale - [pref.scale_x] - [pref.scale_y]</a>"
out += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_LOADOUT]'>[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]</a>"
out += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]</a>"
out += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB_HAT]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB_HAT ? "Hide job hat" : "Show job hat"]</a>"
out += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB_UNIFORM]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB_UNIFORM ? "Hide job uniform" : "Show job uniform"]</a>"
out += "<br><a href='?src=\ref[src];toggle_preview_value=[EQUIP_PREVIEW_JOB_SUIT]'>[pref.equip_preview_mob & EQUIP_PREVIEW_JOB_SUIT ? "Hide job suit" : "Show job suit"]</a>"
out += "</td></tr></table>"
var/tail_spacing = FALSE
@@ -894,7 +898,13 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["cycle_bg"])
pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options)
pref.bgstate = next_in_assoc_list(pref.bgstate, pref.bgstate_options)
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["select_bg"])
var/choice = tgui_input_list(user, "Which background would you like for your preview?", "Select Preview Background", pref.bgstate_options)
if(choice)
pref.bgstate = pref.bgstate_options[choice]
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["set_preview_scale"])
code/modules/client/preferences.dm
+23 -15
View File
@@ -180,21 +180,29 @@ var/list/preferences_datums = list()
var/savefile/loaded_character
var/datum/category_collection/player_setup_collection/player_setup
var/bgstate = "000000"
var/bgstate = "plain_black"
var/list/bgstate_options = list(
"FFFFFF",
"000000",
"tiled_preview",
"monotile_preview",
"dark_preview",
"wood",
"grass",
"reinforced",
"white_preview",
"freezer",
"carpet",
"reinforced"
)
"Plain Black" = "plain_black",
"Plain White" = "plain_white",
"Monotile" = "monotile",
"Tiles" = "tile",
"Dark Tiles" = "dark_tile",
"Freezer Tiles" = "freezer_tile",
"Reinforced Tiles" = "reinforced",
"Wood Floor" = "wood",
"Grass" = "grass",
"Red Carpet" = "carpet_red",
"Cyan Carpet" = "carpet_cyan",
"Green Carpet" = "carpet_green",
"Purple Carpet" = "carpet_purple",
"Magenta Carpet" = "carpet_magenta",
"Rubber Carpet" = "carpet_rubber",
"Blue Circuits" = "circuit_blue",
"Green Circuits" = "circuit_green",
"Asteroid Turf" = "asteroid",
"Desert Turf" = "desert",
"Space" = "space"
)
var/fov_cone_alpha = 255
@@ -283,7 +291,7 @@ var/list/preferences_datums = list()
BG = new
BG.appearance_flags = TILE_BOUND|PIXEL_SCALE|NO_CLIENT_COLOR
BG.layer = TURF_LAYER
BG.icon = 'icons/turf/flooring/tiles.dmi'
BG.icon = 'icons/turf/flooring/character_preview.dmi'
LAZYSET(char_render_holders, "BG", BG)
client.screen |= BG
BG.icon_state = bgstate
code/modules/mob/abstract/new_player/preferences_setup.dm
+1 -1
View File
@@ -221,7 +221,7 @@
SSjobs.EquipCustom(mannequin, previewJob, src, leftovers, null, used_slots)
if((equip_preview_mob & EQUIP_PREVIEW_JOB) && previewJob)
previewJob.equip_preview(mannequin, player_alt_titles[previewJob.title], faction)
previewJob.equip_preview(mannequin, src, player_alt_titles[previewJob.title], faction)
if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && leftovers.len)
SSjobs.EquipCustomDeferred(mannequin, src, leftovers, used_slots)