cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

A lot of fixing up job preferences.

Browse Source
This commit is contained in:
ZomgPonies
2014-01-16 09:18:49 -05:00
parent 2525a3d057
commit 48403dcc8e
6 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+45
View File
@@ -90,6 +90,10 @@ datum/preferences
var/job_engsec_med = 0
var/job_engsec_low = 0
var/job_karma_high = 0
var/job_karma_med = 0
var/job_karma_low = 0
//Keeps track of preferrence for not getting any wanted jobs
var/alternate_option = 0
@@ -483,9 +487,11 @@ datum/preferences
job_civilian_med |= job_civilian_high
job_engsec_med |= job_engsec_high
job_medsci_med |= job_medsci_high
job_karma_med |= job_karma_high
job_civilian_high = 0
job_engsec_high = 0
job_medsci_high = 0
job_karma_high = 0
if (job.department_flag == CIVILIAN)
job_civilian_low &= ~job.flag
@@ -529,6 +535,20 @@ datum/preferences
job_medsci_low |= job.flag
return 1
else if (job.department_flag == KARMA)
job_karma_low &= ~job.flag
job_karma_med &= ~job.flag
job_karma_high &= ~job.flag
switch(level)
if (1)
job_karma_high |= job.flag
if (2)
job_karma_med |= job.flag
if (3)
job_karma_low |= job.flag
return 1
return 0
@@ -675,6 +695,10 @@ datum/preferences
job_engsec_med = 0
job_engsec_low = 0
job_karma_high = 0
job_karma_med = 0
job_karma_low = 0
proc/GetJobDepartment(var/datum/job/job, var/level)
if(!job || !level) return 0
@@ -703,6 +727,14 @@ datum/preferences
return job_engsec_med
if(3)
return job_engsec_low
if(KARMA)
switch(level)
if(1)
return job_karma_high
if(2)
return job_karma_med
if(3)
return job_karma_low
return 0
proc/SetJobDepartment(var/datum/job/job, var/level)
@@ -712,14 +744,17 @@ datum/preferences
job_civilian_high = 0
job_medsci_high = 0
job_engsec_high = 0
job_karma_high = 0
return 1
if(2)//Set current highs to med, then reset them
job_civilian_med |= job_civilian_high
job_medsci_med |= job_medsci_high
job_engsec_med |= job_engsec_high
job_karma_med |= job_karma_high
job_civilian_high = 0
job_medsci_high = 0
job_engsec_high = 0
job_karma_high = 0
switch(job.department_flag)
if(CIVILIAN)
@@ -752,6 +787,16 @@ datum/preferences
job_engsec_low &= ~job.flag
else
job_engsec_low |= job.flag
if(KARMA)
switch(level)
if(2)
job_karma_high = job.flag
job_karma_med &= ~job.flag
if(3)
job_karma_med |= job.flag
job_karma_low &= ~job.flag
else
job_karma_low |= job.flag
return 1
proc/process_link(mob/user, list/href_list)
code/modules/client/preferences_savefile.dm
+9
View File
@@ -132,6 +132,9 @@
S["job_engsec_high"] >> job_engsec_high
S["job_engsec_med"] >> job_engsec_med
S["job_engsec_low"] >> job_engsec_low
S["job_karma_high"] >> job_karma_high
S["job_karma_med"] >> job_karma_med
S["job_karma_low"] >> job_karma_low
//Miscellaneous
S["flavor_text"] >> flavor_text
@@ -182,6 +185,9 @@
job_engsec_high = sanitize_integer(job_engsec_high, 0, 65535, initial(job_engsec_high))
job_engsec_med = sanitize_integer(job_engsec_med, 0, 65535, initial(job_engsec_med))
job_engsec_low = sanitize_integer(job_engsec_low, 0, 65535, initial(job_engsec_low))
job_karma_high = sanitize_integer(job_karma_high, 0, 65535, initial(job_karma_high))
job_karma_med = sanitize_integer(job_karma_med, 0, 65535, initial(job_karma_med))
job_karma_low = sanitize_integer(job_karma_low, 0, 65535, initial(job_karma_low))
if(isnull(disabilities)) disabilities = 0
if(!player_alt_titles) player_alt_titles = new()
@@ -358,6 +364,9 @@
S["job_engsec_high"] << job_engsec_high
S["job_engsec_med"] << job_engsec_med
S["job_engsec_low"] << job_engsec_low
S["job_karma_high"] << job_karma_high
S["job_karma_med"] << job_karma_med
S["job_karma_low"] << job_karma_low
//Miscellaneous
S["flavor_text"] << flavor_text