From 71134ed8c3a7d28283d1695182cc82ad3a563577 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sun, 25 Oct 2020 01:08:35 +0000 Subject: [PATCH] better loadout flags --- code/__DEFINES/citadel_defines.dm | 5 ----- code/__DEFINES/loadout.dm | 13 ++++++++----- code/modules/client/preferences.dm | 5 ++++- .../code/modules/client/loadout/__donator.dm | 2 +- .../code/modules/client/loadout/_loadout.dm | 3 ++- .../code/modules/client/loadout/neck.dm | 4 ++-- .../code/modules/client/loadout/suit.dm | 2 +- .../code/modules/client/loadout/uniform.dm | 14 +++++++------- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index e9aa603d8a..923355b340 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -114,8 +114,3 @@ //special species definitions #define MINIMUM_MUTANT_COLOR "#202020" //this is how dark players mutant parts and skin can be - -//loadout defines -#define MAXIMUM_LOADOUT_SAVES 5 -#define LOADOUT_ITEM "loadout_item" -#define LOADOUT_COLOR "loadout_color" \ No newline at end of file diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 8e46b57d85..d477dff551 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -68,9 +68,12 @@ #define LOADOUT_LIMBS list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though -//options for modifiying color of loadout items -#define LOADOUT_COLOR_TYPE_NONE "no_color" -#define LOADOUT_COLOR_TYPE_POLYCHROMIC "polychromic" +//loadout saving/loading specific defines +#define MAXIMUM_LOADOUT_SAVES 5 +#define LOADOUT_ITEM "loadout_item" +#define LOADOUT_COLOR "loadout_color" -//maximum loadout slots you can have (as in, how many stored loadout sets) -#define LOADOUT_MAXIMUM_SLOTS 5 +//loadout item flags +#define LOADOUT_CAN_NAME (1<<0) //renaming items +#define LOADOUT_CAN_DESCRIPTION (1<<1) //adding a custom description to items +#define LOADOUT_CAN_COLOR_POLYCHROMIC \ No newline at end of file diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 49822faadd..76f986a42e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -894,8 +894,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(donoritem && !gear.donator_ckey_check(user.ckey)) continue var/class_link = "" - if(has_loadout_gear(loadout_slot, gear.type)) + var/list/loadout_item = has_loadout_gear(loadout_slot, gear.type) + if(loadout_item) class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(name)];toggle_gear=0'" + if(gear.loadout_flags & LOADOUT_CAN_COLOR_POLYCHROMIC) + else if(gear_points <= 0) class_link = "style='white-space:normal;' class='linkOff'" else if(donoritem) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index b6a1492af0..e00c586e62 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -287,7 +287,7 @@ slot = SLOT_IN_BACKPACK path = /obj/item/clothing/neck/cloak/polychromic/polyce ckeywhitelist = list("worksbythesea", "blakeryan") - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/donator/ssk name = "Stun Sword Kit" diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm index 7d890a00fd..d8962aa839 100644 --- a/modular_citadel/code/modules/client/loadout/_loadout.dm +++ b/modular_citadel/code/modules/client/loadout/_loadout.dm @@ -53,7 +53,8 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/path //item-to-spawn path var/cost = 1 //normally, each loadout costs a single point. var/geargroupID //defines the ID that the gear inherits from the config - var/color_type = LOADOUT_COLOR_TYPE_NONE + var/loadout_flags + var/loadout_initial_colors = list() //NEW DONATOR SYTSEM STUFF var/donoritem //autoset on new if null diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm index d10df3bc38..7e2a7fa00e 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -86,9 +86,9 @@ /datum/gear/neck/polycloak name = "Polychromatic Cloak" path = /obj/item/clothing/neck/cloak/polychromic - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/neck/altpolycloak name = "Alternate Cloak" path = /obj/item/clothing/neck/cloak/alt/polychromic - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 4bda8328d7..27b735f959 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -101,7 +101,7 @@ name = "Polychromic winter coat" path = /obj/item/clothing/suit/hooded/wintercoat/polychromic cost = 4 //too many people with neon green coats is hard on the eyes - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/suit/coat/med name = "Medical winter coat" diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 0152a2d75a..9578605064 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -223,43 +223,43 @@ name = "Polychromic Jumpsuit" path = /obj/item/clothing/under/misc/polyjumpsuit cost = 2 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/skirt/poly name = "Polychromic Jumpskirt" path = /obj/item/clothing/under/dress/skirt/polychromic cost = 2 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/suit/poly name = "Polychromic Button-up Shirt" path = /obj/item/clothing/under/misc/poly_shirt cost = 3 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/skirt/poly/pleated name = "Polychromic Pleated Sweaterskirt" path = /obj/item/clothing/under/dress/skirt/polychromic/pleated cost = 3 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/polykilt name = "Polychromic Kilt" path = /obj/item/clothing/under/costume/kilt/polychromic cost = 3 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/shorts/poly name = "Polychromic Shorts" path = /obj/item/clothing/under/misc/polyshorts cost = 3 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/shorts/poly/athletic name = "Polychromic Athletic Shorts" path = /obj/item/clothing/under/shorts/polychromic cost = 2 - color_type = LOADOUT_COLOR_TYPE_POLYCHROMIC + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC /datum/gear/uniform/hopcasual name = "Casual Head of Personnel's uniform"