From a6dd6bfa4a2aa48a32da9171c6c5c53df06c0a97 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 12 May 2016 09:50:13 +0200 Subject: [PATCH] Ports Bay's adjustments of the faux-nanoui character setup and related --- .../preference_setup/general/01_basic.dm | 4 +++- .../preference_setup/general/03_body.dm | 2 ++ .../preference_setup/global/02_settings.dm | 4 ++-- .../preference_setup/loadout/loadout.dm | 20 ++++++++++++++----- .../preference_setup/occupation/occupation.dm | 14 ++++++------- .../client/preference_setup/skills/skills.dm | 15 ++++++++++---- code/modules/mob/new_player/new_player.dm | 7 +++---- 7 files changed, 43 insertions(+), 23 deletions(-) diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 701f24dc2e..2588836df5 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -41,7 +41,8 @@ datum/preferences/proc/set_biological_gender(var/gender) pref.be_random_name = sanitize_integer(pref.be_random_name, 0, 1, initial(pref.be_random_name)) /datum/category_item/player_setup_item/general/basic/content() - . = "Name: " + . = list() + . += "Name: " . += "[pref.real_name]
" . += "Randomize Name
" . += "Always Random Name: [pref.be_random_name ? "Yes" : "No"]" @@ -52,6 +53,7 @@ datum/preferences/proc/set_biological_gender(var/gender) . += "Spawn Point: [pref.spawnpoint]
" if(config.allow_Metadata) . += "OOC Notes: Edit
" + . = jointext(.,null) /datum/category_item/player_setup_item/general/basic/OnTopic(var/href,var/list/href_list, var/mob/user) var/datum/species/S = all_species[pref.species] diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index ef9b419d97..0f26f2d55b 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -73,6 +73,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(!pref.rlimb_data) pref.rlimb_data = list() /datum/category_item/player_setup_item/general/body/content(var/mob/user) + . = list() pref.update_preview_icon() if(pref.preview_icon_front && pref.preview_icon_side) user << browse_rsc(pref.preview_icon_front, "preview_icon.png") @@ -186,6 +187,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(has_flag(mob_species, HAS_SKIN_COLOR)) . += "
Body Color
" . += "Change Color
__

" + . = jointext(.,null) /datum/category_item/player_setup_item/general/body/proc/has_flag(var/datum/species/mob_species, var/flag) return mob_species && (mob_species.appearance_flags & flag) diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm index 60eeeb144e..c7635cbb91 100644 --- a/code/modules/client/preference_setup/global/02_settings.dm +++ b/code/modules/client/preference_setup/global/02_settings.dm @@ -61,9 +61,9 @@ . += "[client_pref.description]: " if(pref_mob.is_preference_enabled(client_pref.key)) - . += "[client_pref.enabled_description] [client_pref.disabled_description]" + . += "[client_pref.enabled_description] [client_pref.disabled_description]" else - . += "[client_pref.enabled_description] [client_pref.disabled_description]" + . += "[client_pref.enabled_description] [client_pref.disabled_description]" . += "" . += "" diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index e8794a4256..cd1e3eff4c 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -82,6 +82,7 @@ var/list/gear_datums = list() total_cost += G.cost /datum/category_item/player_setup_item/loadout/content() + . = list() var/total_cost = 0 if(pref.gear && pref.gear.len) for(var/i = 1; i <= pref.gear.len; i++) @@ -92,8 +93,8 @@ var/list/gear_datums = list() var/fcolor = "#3366CC" if(total_cost < MAX_GEAR_COST) fcolor = "#E67300" - . += list() - . += "" + + . += "
" . += "" . += "" var/datum/loadout_category/LC = loadout_categories[current_tab] @@ -117,7 +127,7 @@ var/list/gear_datums = list() for(var/gear_name in LC.gear) var/datum/gear/G = LC.gear[gear_name] var/ticked = (G.display_name in pref.gear) - . += "" + . += "" . += "" . += "" if(ticked) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index f37f7631cf..09dd7f573e 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -58,6 +58,7 @@ if(!job_master) return + . = list() . += "
" . += "Choose occupation chances
Unavailable occupations are crossed out.
" . += "
[total_cost]/[MAX_GEAR_COST] loadout points spent. \[Clear Loadout\]
" @@ -105,9 +106,18 @@ var/list/gear_datums = list() else . += " |" if(category == current_tab) - . += " [category] " + . += " [category] " else - . += " [category] " + var/datum/loadout_category/LC = loadout_categories[category] + var/make_orange = FALSE + for(var/thing in LC.gear) + if(thing in pref.gear) + make_orange = TRUE + break + if(make_orange) + . += " [category] " + else + . += " [category] " . += "
[G.display_name]
[G.display_name][G.cost][G.description]
" . += "" - . += "
" // Table within a table for alignment, also allows you to easily add more columns. @@ -125,21 +126,20 @@ if(job.alt_titles) . += "
 \[[pref.GetPlayerAltTitle(job)]\]
" - - . += "" + . += "
" switch(pref.alternate_option) if(GET_RANDOM_JOB) - . += "

Get random job if preferences unavailable

" + . += "Get random job if preferences unavailable" if(BE_ASSISTANT) - . += "

Be assistant if preference unavailable

" + . += "Be assistant if preference unavailable" if(RETURN_TO_LOBBY) - . += "

Return to lobby if preference unavailable

" + . += "Return to lobby if preference unavailable" - . += "
\[Reset\]
" + . += "\[Reset\]
" . += "" + . = jointext(.,null) /datum/category_item/player_setup_item/occupation/OnTopic(href, href_list, user) if(href_list["reset_jobs"]) diff --git a/code/modules/client/preference_setup/skills/skills.dm b/code/modules/client/preference_setup/skills/skills.dm index 8370f35668..7255e25bc4 100644 --- a/code/modules/client/preference_setup/skills/skills.dm +++ b/code/modules/client/preference_setup/skills/skills.dm @@ -19,6 +19,7 @@ if(pref.used_skillpoints < 0) pref.used_skillpoints = 0 /datum/category_item/player_setup_item/skills/content() + . = list() . += "Select your Skills
" . += "Current skill level: [pref.GetSkillClass(pref.used_skillpoints)] ([pref.used_skillpoints])
" . += "Use preconfigured skillset
" @@ -30,16 +31,22 @@ var/level = pref.skills[S.ID] . += "" . += "[S.name]" - . += "\[Untrained\]" + . += skill_to_button(S, "Untrained", level, SKILL_NONE) // secondary skills don't have an amateur level if(S.secondary) . += "" else - . += "\[Amateur\]" - . += "\[Trained\]" - . += "\[Professional\]" + . += skill_to_button(S, "Amateur", level, SKILL_BASIC) + . += skill_to_button(S, "Trained", level, SKILL_ADEPT) + . += skill_to_button(S, "Professional", level, SKILL_EXPERT) . += "" . += "" + . = jointext(.,null) + +/datum/category_item/player_setup_item/proc/skill_to_button(var/skill, var/level_name, var/current_level, var/selection_level) + if(current_level == selection_level) + return "[level_name]" + return "[level_name]" /datum/category_item/player_setup_item/skills/OnTopic(href, href_list, user) if(href_list["skillinfo"]) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 488d2068ac..b6c210ac56 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -31,9 +31,9 @@ if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) if(ready) - output += "

\[ Ready | Not Ready \]

" + output += "

\[ Ready | Not Ready \]

" else - output += "

\[ Ready | Not Ready \]

" + output += "

\[ Ready | Not Ready \]

" else output += "View the Crew Manifest

" @@ -62,8 +62,7 @@ output += "" - //src << browse(output,"window=playersetup;size=210x280;can_close=0") - panel = new(src, "New Player","New Player", 210, 280, src) + panel = new(src, "Welcome","Welcome", 210, 280, src) panel.set_window_options("can_close=0") panel.set_content(output) panel.open()