Skip to content

Commit

Permalink
now_skills_is_fluff
Browse files Browse the repository at this point in the history
  • Loading branch information
Deahaka committed Nov 23, 2024
1 parent dbd6c6e commit 3c38e28
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
7 changes: 5 additions & 2 deletions code/game/jobs/job/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,11 @@
for(var/moveset in moveset_types)
H.add_moveset(new moveset(), MOVESET_JOB)

if (H.mind)
H.mind.skills.add_available_skillset(get_skillset(H))
if(H.mind)
var/use_job_skillsets = TRUE
if(H.client)
use_job_skillsets = !H.client.prefs.full_skillset
H.mind.skills.add_available_skillset(use_job_skillsets ? get_skillset(H) : /datum/skillset/max)
H.mind.skills.maximize_active_skills()

post_equip(H, visualsOnly)
Expand Down
4 changes: 4 additions & 0 deletions code/modules/client/character_menu/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
. += "Body: <a href='?_src_=prefs;preference=all;task=random'>&reg;</a>"
. += "<br>Species: <a href='byond://?src=\ref[user];preference=species;task=input'>[species]</a>"
. += "<br>Secondary Language: <a href='byond://?src=\ref[user];preference=language;task=input'>[language]</a>"
. += "<br>Skillsets: <a href='?_src_=prefs;preference=skillset_option'>[full_skillset ? "Default" : "Custom"]</a>"
. += "<br>Insurance: <a href='byond://?src=\ref[user];preference=insurance;task=input'>[insurance]</a>"
if(specie_obj.flags[HAS_SKIN_TONE])
. += "<br>Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220</a>"
Expand Down Expand Up @@ -633,6 +634,9 @@

if("gear")
submenu_type = "gear"

if("skillset_option")
full_skillset = !full_skillset

/datum/preferences/proc/get_valid_styles_from_cache(list/styles_cache)
var/hash = "[species][gender][species == IPC ? ipc_head : ""]"
Expand Down
1 change: 1 addition & 0 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ var/global/list/datum/preferences/preferences_datums = list()
var/b_belly = 0
var/species = HUMAN
var/language = "None" //Secondary language
var/full_skillset = TRUE //0 - using skillsets of job and roles
var/insurance = INSURANCE_NONE

//Some faction information.
Expand Down
8 changes: 6 additions & 2 deletions code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

//This is the current version, anything below this will attempt to update (if it's not obsolete)

#define SAVEFILE_VERSION_MAX 52
#define SAVEFILE_VERSION_MAX 53

//For repetitive updates, should be the same or below SAVEFILE_VERSION_MAX
//set this to (current SAVEFILE_VERSION_MAX)+1 when you need to update:
Expand Down Expand Up @@ -465,7 +465,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
)
if (pre_52_hairstyles_to_modern_ones[h_style])
h_style = pre_52_hairstyles_to_modern_ones[h_style]

//important to Optional using skillsets for new players
if(current_version < 53)
full_skillset = TRUE
//
/datum/preferences/proc/repetitive_updates_character(current_version, savefile/S)

Expand Down Expand Up @@ -797,6 +799,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["home_system"] >> home_system
S["citizenship"] >> citizenship
S["insurance"] >> insurance
S["full_skillset"] >> full_skillset
S["faction"] >> faction
S["religion"] >> religion
S["vox_rank"] >> vox_rank
Expand Down Expand Up @@ -995,6 +998,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["home_system"] << home_system
S["citizenship"] << citizenship
S["insurance"] << insurance
S["full_skillset"] << full_skillset
S["faction"] << faction
S["religion"] << religion
S["vox_rank"] << vox_rank
Expand Down

0 comments on commit 3c38e28

Please sign in to comment.