mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 00:58:26 +01:00
[MIRROR] Moves "sprite accessories" (e.g. Hair, Undergarments, Mutant Bits) from GLOB to a datasystem (#27561)
* Moves "sprite accessories" (e.g. Hair, Undergarments, Mutant Bits) from `GLOB` to a datasystem * Merge branch 'master' of https://github.com/tgstation/tgstation * Moves everything I can think of to the subsystem * Seems to be working fine now * makes it compile --------- Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Waterpig <wtryoutube@seznam.cz>
This commit is contained in:
SkyratBot
co-authored by
san7890
Waterpig
san7890
Waterpig
parent
7ade3b7806
commit
24151d1228
@@ -0,0 +1,198 @@
|
||||
/// The non gender specific list that we get from init_sprite_accessory_subtypes()
|
||||
#define DEFAULT_SPRITE_LIST "default_sprites"
|
||||
/// The male specific list that we get from init_sprite_accessory_subtypes()
|
||||
#define MALE_SPRITE_LIST "male_sprites"
|
||||
/// The female specific list that we get from init_sprite_accessory_subtypes()
|
||||
#define FEMALE_SPRITE_LIST "female_sprites"
|
||||
|
||||
/// subsystem that just holds lists of sprite accessories for accession in generating said sprites.
|
||||
/// A sprite accessory is something that we add to a human sprite to make them look different. This is hair, facial hair, underwear, mutant bits, etc.
|
||||
SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
|
||||
name = "Sprite Accessories"
|
||||
flags = SS_NO_FIRE | SS_NO_INIT
|
||||
|
||||
//Hairstyles
|
||||
var/list/hairstyles_list //! stores /datum/sprite_accessory/hair indexed by name
|
||||
var/list/hairstyles_male_list //! stores only hair names
|
||||
var/list/hairstyles_female_list //! stores only hair names
|
||||
var/list/facial_hairstyles_list //! stores /datum/sprite_accessory/facial_hair indexed by name
|
||||
var/list/facial_hairstyles_male_list //! stores only hair names
|
||||
var/list/facial_hairstyles_female_list //! stores only hair names
|
||||
var/list/hair_gradients_list //! stores /datum/sprite_accessory/hair_gradient indexed by name
|
||||
var/list/facial_hair_gradients_list //! stores /datum/sprite_accessory/facial_hair_gradient indexed by name
|
||||
|
||||
//Underwear
|
||||
var/list/underwear_list //! stores /datum/sprite_accessory/underwear indexed by name
|
||||
var/list/underwear_m //! stores only underwear name
|
||||
var/list/underwear_f //! stores only underwear name
|
||||
|
||||
//Undershirts
|
||||
var/list/undershirt_list //! stores /datum/sprite_accessory/undershirt indexed by name
|
||||
var/list/undershirt_m //! stores only undershirt name
|
||||
var/list/undershirt_f //! stores only undershirt name
|
||||
|
||||
//Socks
|
||||
var/list/socks_list //! stores /datum/sprite_accessory/socks indexed by name
|
||||
|
||||
//SKYRAT EDIT REMOVAL - CUSTOMIZATION
|
||||
/*
|
||||
//Lizard Bits (all datum lists indexed by name)
|
||||
var/list/body_markings_list
|
||||
var/list/snouts_list
|
||||
var/list/horns_list
|
||||
var/list/frills_list
|
||||
var/list/spines_list
|
||||
var/list/legs_list
|
||||
var/list/tail_spines_list
|
||||
|
||||
//Mutant Human bits
|
||||
var/list/tails_list_human
|
||||
var/list/tails_list_lizard
|
||||
var/list/tails_list_monkey
|
||||
var/list/ears_list
|
||||
var/list/wings_list
|
||||
var/list/wings_open_list
|
||||
var/list/moth_wings_list
|
||||
var/list/moth_antennae_list
|
||||
var/list/moth_markings_list
|
||||
var/list/caps_list
|
||||
*/
|
||||
var/list/pod_hair_list
|
||||
|
||||
// SKYRAT EDIT BEGIN
|
||||
var/list/sprite_accessories
|
||||
|
||||
/// Stores all /datum/sprite_accessory/bra indexed by name.
|
||||
var/list/bra_list
|
||||
/// Stores only the bra names for male-compatible bras.
|
||||
var/list/bra_m
|
||||
/// Stores only the bra names for female-compatible bras.
|
||||
var/list/bra_f
|
||||
|
||||
/// Shroom caps.
|
||||
var/list/caps_list
|
||||
/// Stores moth wings, both open and closed
|
||||
var/list/moth_wings_list
|
||||
/// Monkey tail list
|
||||
var/list/tails_list_monkey
|
||||
/// All the different scream types
|
||||
var/list/scream_types
|
||||
//SKYRAT EDIT END
|
||||
|
||||
/datum/controller/subsystem/accessories/PreInit() // this stuff NEEDS to be set up before GLOB for preferences and stuff to work so this must go here. sorry
|
||||
setup_lists()
|
||||
init_hair_gradients()
|
||||
|
||||
/// Sets up all of the lists for later utilization in the round and building sprites.
|
||||
/// In an ideal world we could tack everything that just needed `DEFAULT_SPRITE_LIST` into static variables on the top, but due to the initialization order
|
||||
/// where this subsystem will initialize BEFORE statics, it's just not feasible since this all needs to be ready for actual subsystems to use.
|
||||
/// Sorry.
|
||||
/datum/controller/subsystem/accessories/proc/setup_lists()
|
||||
var/hair_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/hair)
|
||||
hairstyles_list = hair_lists[DEFAULT_SPRITE_LIST]
|
||||
hairstyles_male_list = hair_lists[MALE_SPRITE_LIST]
|
||||
hairstyles_female_list = hair_lists[FEMALE_SPRITE_LIST]
|
||||
|
||||
var/facial_hair_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair)
|
||||
facial_hairstyles_list = facial_hair_lists[DEFAULT_SPRITE_LIST]
|
||||
facial_hairstyles_male_list = facial_hair_lists[MALE_SPRITE_LIST]
|
||||
facial_hairstyles_female_list = facial_hair_lists[FEMALE_SPRITE_LIST]
|
||||
|
||||
var/underwear_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear)
|
||||
underwear_list = underwear_lists[DEFAULT_SPRITE_LIST]
|
||||
underwear_m = underwear_lists[MALE_SPRITE_LIST]
|
||||
underwear_f = underwear_lists[FEMALE_SPRITE_LIST]
|
||||
|
||||
var/undershirt_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt)
|
||||
undershirt_list = undershirt_lists[DEFAULT_SPRITE_LIST]
|
||||
undershirt_m = undershirt_lists[MALE_SPRITE_LIST]
|
||||
undershirt_f = undershirt_lists[FEMALE_SPRITE_LIST]
|
||||
|
||||
socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST]
|
||||
|
||||
/* //SKYRAT EDIT REMOVAL - CUSTOMIZATION
|
||||
body_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings)[DEFAULT_SPRITE_LIST]
|
||||
tails_list_human = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
|
||||
tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
|
||||
tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
|
||||
snouts_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts)[DEFAULT_SPRITE_LIST]
|
||||
horns_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/horns)[DEFAULT_SPRITE_LIST]
|
||||
ears_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/ears)[DEFAULT_SPRITE_LIST]
|
||||
wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings)[DEFAULT_SPRITE_LIST]
|
||||
wings_open_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings_open)[DEFAULT_SPRITE_LIST]
|
||||
frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills)[DEFAULT_SPRITE_LIST]
|
||||
spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines)[DEFAULT_SPRITE_LIST]
|
||||
tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines)[DEFAULT_SPRITE_LIST]
|
||||
legs_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/legs)[DEFAULT_SPRITE_LIST]
|
||||
caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST]
|
||||
moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST]
|
||||
moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST]
|
||||
moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings)[DEFAULT_SPRITE_LIST]
|
||||
pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair)[DEFAULT_SPRITE_LIST]
|
||||
*/
|
||||
|
||||
var/bra_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/bra) // SKYRAT EDIT ADDITION
|
||||
bra_list = bra_lists[DEFAULT_SPRITE_LIST]
|
||||
bra_m = bra_lists[MALE_SPRITE_LIST]
|
||||
bra_f = bra_lists[FEMALE_SPRITE_LIST]
|
||||
|
||||
moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings/moth)[DEFAULT_SPRITE_LIST] // SKYRAT EDIT ADDITION - Customization
|
||||
tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, add_blank = TRUE)[DEFAULT_SPRITE_LIST] // SKYRAT EDIT ADDITION - We don't want monkeys getting randomized non-monkey tails
|
||||
pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, add_blank = TRUE)[DEFAULT_SPRITE_LIST] // SKYRAT EDIT - Customization - ORIGINAL: init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair, GLOB.pod_hair_list)
|
||||
|
||||
caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST]
|
||||
//SKYRAT EDIT ADDITION BEGIN
|
||||
//Scream types
|
||||
SSaccessories.scream_types = list()
|
||||
for(var/spath in subtypesof(/datum/scream_type))
|
||||
var/datum/scream_type/S = new spath()
|
||||
SSaccessories.scream_types[S.name] = spath
|
||||
sort_list(SSaccessories.scream_types, GLOBAL_PROC_REF(cmp_typepaths_asc))
|
||||
//SKYRAT EDIT END
|
||||
|
||||
/// This proc just intializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
|
||||
/datum/controller/subsystem/accessories/proc/init_hair_gradients()
|
||||
hair_gradients_list = list()
|
||||
facial_hair_gradients_list = list()
|
||||
for(var/path in subtypesof(/datum/sprite_accessory/gradient))
|
||||
var/datum/sprite_accessory/gradient/gradient = new path
|
||||
if(gradient.gradient_category & GRADIENT_APPLIES_TO_HAIR)
|
||||
hair_gradients_list[gradient.name] = gradient
|
||||
if(gradient.gradient_category & GRADIENT_APPLIES_TO_FACIAL_HAIR)
|
||||
facial_hair_gradients_list[gradient.name] = gradient
|
||||
|
||||
/// This reads the applicable sprite accessory datum's subtypes and adds it to the subsystem's list of sprite accessories.
|
||||
/// The boolean `add_blank` argument just adds a "None" option to the list of sprite accessories, like if a felinid doesn't want a tail or something, typically good for gated-off things.
|
||||
/datum/controller/subsystem/accessories/proc/init_sprite_accessory_subtypes(prototype, add_blank = FALSE)
|
||||
RETURN_TYPE(/list)
|
||||
var/returnable_list = list(
|
||||
DEFAULT_SPRITE_LIST = list(),
|
||||
MALE_SPRITE_LIST = list(),
|
||||
FEMALE_SPRITE_LIST = list(),
|
||||
)
|
||||
|
||||
for(var/path in subtypesof(prototype))
|
||||
var/datum/sprite_accessory/accessory = new path
|
||||
|
||||
if(accessory.icon_state)
|
||||
returnable_list[DEFAULT_SPRITE_LIST][accessory.name] = accessory
|
||||
else
|
||||
returnable_list[DEFAULT_SPRITE_LIST] += accessory.name
|
||||
|
||||
switch(accessory.gender)
|
||||
if(MALE)
|
||||
returnable_list[MALE_SPRITE_LIST] += accessory.name
|
||||
if(FEMALE)
|
||||
returnable_list[FEMALE_SPRITE_LIST] += accessory.name
|
||||
else
|
||||
returnable_list[MALE_SPRITE_LIST] += accessory.name
|
||||
returnable_list[FEMALE_SPRITE_LIST] += accessory.name
|
||||
|
||||
if(add_blank)
|
||||
returnable_list[DEFAULT_SPRITE_LIST][SPRITE_ACCESSORY_NONE] = new /datum/sprite_accessory/blank
|
||||
|
||||
return returnable_list
|
||||
|
||||
#undef DEFAULT_SPRITE_LIST
|
||||
#undef MALE_SPRITE_LIST
|
||||
#undef FEMALE_SPRITE_LIST
|
||||
Reference in New Issue
Block a user