mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 10:03:50 +01:00
Replacing civilian with support department. Still need to make changes on MySQL schema.
This commit is contained in:
ZomgPonies
@@ -84,9 +84,9 @@ datum/preferences
|
||||
var/icon/preview_icon_side = null
|
||||
|
||||
//Jobs, uses bitflags
|
||||
var/job_civilian_high = 0
|
||||
var/job_civilian_med = 0
|
||||
var/job_civilian_low = 0
|
||||
var/job_support_high = 0
|
||||
var/job_support_med = 0
|
||||
var/job_support_low = 0
|
||||
|
||||
var/job_medsci_high = 0
|
||||
var/job_medsci_med = 0
|
||||
@@ -400,7 +400,7 @@ datum/preferences
|
||||
var/available_in_days = job.available_in_days(user.client)
|
||||
HTML += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
|
||||
continue
|
||||
if((job_civilian_low & ASSISTANT) && (rank != "Assistant"))
|
||||
if((job_support_low & ASSISTANT) && (rank != "Assistant"))
|
||||
HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
|
||||
continue
|
||||
if((rank in command_positions) || (rank == "AI"))//Bold head jobs
|
||||
@@ -442,7 +442,7 @@ datum/preferences
|
||||
// HTML += "<a href='?_src_=prefs;preference=job;task=input;text=[rank]'>"
|
||||
|
||||
if(rank == "Assistant")//Assistant is special
|
||||
if(job_civilian_low & ASSISTANT)
|
||||
if(job_support_low & ASSISTANT)
|
||||
HTML += " <font color=green>\[Yes]</font>"
|
||||
else
|
||||
HTML += " <font color=red>\[No]</font>"
|
||||
@@ -498,27 +498,27 @@ datum/preferences
|
||||
|
||||
if (level == 1) // to high
|
||||
// remove any other job(s) set to high
|
||||
job_civilian_med |= job_civilian_high
|
||||
job_support_med |= job_support_high
|
||||
job_engsec_med |= job_engsec_high
|
||||
job_medsci_med |= job_medsci_high
|
||||
job_karma_med |= job_karma_high
|
||||
job_civilian_high = 0
|
||||
job_support_high = 0
|
||||
job_engsec_high = 0
|
||||
job_medsci_high = 0
|
||||
job_karma_high = 0
|
||||
|
||||
if (job.department_flag == CIVILIAN)
|
||||
job_civilian_low &= ~job.flag
|
||||
job_civilian_med &= ~job.flag
|
||||
job_civilian_high &= ~job.flag
|
||||
if (job.department_flag == SUPPORT)
|
||||
job_support_low &= ~job.flag
|
||||
job_support_med &= ~job.flag
|
||||
job_support_high &= ~job.flag
|
||||
|
||||
switch(level)
|
||||
if (1)
|
||||
job_civilian_high |= job.flag
|
||||
job_support_high |= job.flag
|
||||
if (2)
|
||||
job_civilian_med |= job.flag
|
||||
job_support_med |= job.flag
|
||||
if (3)
|
||||
job_civilian_low |= job.flag
|
||||
job_support_low |= job.flag
|
||||
|
||||
return 1
|
||||
else if (job.department_flag == ENGSEC)
|
||||
@@ -580,10 +580,10 @@ datum/preferences
|
||||
return
|
||||
|
||||
if(role == "Assistant")
|
||||
if(job_civilian_low & job.flag)
|
||||
job_civilian_low &= ~job.flag
|
||||
if(job_support_low & job.flag)
|
||||
job_support_low &= ~job.flag
|
||||
else
|
||||
job_civilian_low |= job.flag
|
||||
job_support_low |= job.flag
|
||||
SetChoices(user)
|
||||
return 1
|
||||
|
||||
@@ -677,10 +677,10 @@ datum/preferences
|
||||
return
|
||||
|
||||
if(role == "Assistant")
|
||||
if(job_civilian_low & job.flag)
|
||||
job_civilian_low &= ~job.flag
|
||||
if(job_support_low & job.flag)
|
||||
job_support_low &= ~job.flag
|
||||
else
|
||||
job_civilian_low |= job.flag
|
||||
job_support_low |= job.flag
|
||||
SetChoices(user)
|
||||
return 1
|
||||
|
||||
@@ -697,9 +697,9 @@ datum/preferences
|
||||
return 1
|
||||
|
||||
proc/ResetJobs()
|
||||
job_civilian_high = 0
|
||||
job_civilian_med = 0
|
||||
job_civilian_low = 0
|
||||
job_support_high = 0
|
||||
job_support_med = 0
|
||||
job_support_low = 0
|
||||
|
||||
job_medsci_high = 0
|
||||
job_medsci_med = 0
|
||||
@@ -717,14 +717,14 @@ datum/preferences
|
||||
proc/GetJobDepartment(var/datum/job/job, var/level)
|
||||
if(!job || !level) return 0
|
||||
switch(job.department_flag)
|
||||
if(CIVILIAN)
|
||||
if(SUPPORT)
|
||||
switch(level)
|
||||
if(1)
|
||||
return job_civilian_high
|
||||
return job_support_high
|
||||
if(2)
|
||||
return job_civilian_med
|
||||
return job_support_med
|
||||
if(3)
|
||||
return job_civilian_low
|
||||
return job_support_low
|
||||
if(MEDSCI)
|
||||
switch(level)
|
||||
if(1)
|
||||
@@ -755,32 +755,32 @@ datum/preferences
|
||||
if(!job || !level) return 0
|
||||
switch(level)
|
||||
if(1)//Only one of these should ever be active at once so clear them all here
|
||||
job_civilian_high = 0
|
||||
job_support_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_support_med |= job_support_high
|
||||
job_medsci_med |= job_medsci_high
|
||||
job_engsec_med |= job_engsec_high
|
||||
job_karma_med |= job_karma_high
|
||||
job_civilian_high = 0
|
||||
job_support_high = 0
|
||||
job_medsci_high = 0
|
||||
job_engsec_high = 0
|
||||
job_karma_high = 0
|
||||
|
||||
switch(job.department_flag)
|
||||
if(CIVILIAN)
|
||||
if(SUPPORT)
|
||||
switch(level)
|
||||
if(2)
|
||||
job_civilian_high = job.flag
|
||||
job_civilian_med &= ~job.flag
|
||||
job_support_high = job.flag
|
||||
job_support_med &= ~job.flag
|
||||
if(3)
|
||||
job_civilian_med |= job.flag
|
||||
job_civilian_low &= ~job.flag
|
||||
job_support_med |= job.flag
|
||||
job_support_low &= ~job.flag
|
||||
else
|
||||
job_civilian_low |= job.flag
|
||||
job_support_low |= job.flag
|
||||
if(MEDSCI)
|
||||
switch(level)
|
||||
if(2)
|
||||
|
||||
@@ -95,9 +95,9 @@
|
||||
|
||||
//Jobs
|
||||
alternate_option = text2num(query.item[30])
|
||||
job_civilian_high = text2num(query.item[31])
|
||||
job_civilian_med = text2num(query.item[32])
|
||||
job_civilian_low = text2num(query.item[33])
|
||||
job_support_high = text2num(query.item[31])
|
||||
job_support_med = text2num(query.item[32])
|
||||
job_support_low = text2num(query.item[33])
|
||||
job_medsci_high = text2num(query.item[34])
|
||||
job_medsci_med = text2num(query.item[35])
|
||||
job_medsci_low = text2num(query.item[36])
|
||||
@@ -151,9 +151,9 @@
|
||||
b_type = sanitize_text(b_type, initial(b_type))
|
||||
|
||||
alternate_option = sanitize_integer(alternate_option, 0, 2, initial(alternate_option))
|
||||
job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
|
||||
job_civilian_med = sanitize_integer(job_civilian_med, 0, 65535, initial(job_civilian_med))
|
||||
job_civilian_low = sanitize_integer(job_civilian_low, 0, 65535, initial(job_civilian_low))
|
||||
job_support_high = sanitize_integer(job_support_high, 0, 65535, initial(job_support_high))
|
||||
job_support_med = sanitize_integer(job_support_med, 0, 65535, initial(job_support_med))
|
||||
job_support_low = sanitize_integer(job_support_low, 0, 65535, initial(job_support_low))
|
||||
job_medsci_high = sanitize_integer(job_medsci_high, 0, 65535, initial(job_medsci_high))
|
||||
job_medsci_med = sanitize_integer(job_medsci_med, 0, 65535, initial(job_medsci_med))
|
||||
job_medsci_low = sanitize_integer(job_medsci_low, 0, 65535, initial(job_medsci_low))
|
||||
@@ -184,14 +184,14 @@
|
||||
firstquery.Execute()
|
||||
while(firstquery.NextRow())
|
||||
if(text2num(firstquery.item[1]) == default_slot)
|
||||
var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sanitizeSQL(metadata)]',real_name='[sanitizeSQL(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sanitizeSQL(species)]',language='[sanitizeSQL(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sanitizeSQL(h_style)]',facial_style_name='[sanitizeSQL(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_civilian_high='[job_civilian_high]',job_civilian_med='[job_civilian_med]',job_civilian_low='[job_civilian_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sanitizeSQL(flavor_text)]',med_record='[sanitizeSQL(med_record)]',sec_record='[sanitizeSQL(sec_record)]',gen_record='[sanitizeSQL(gen_record)]',player_alt_titles='[sanitizeSQL(playertitlelist)]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
|
||||
var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sanitizeSQL(metadata)]',real_name='[sanitizeSQL(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sanitizeSQL(species)]',language='[sanitizeSQL(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sanitizeSQL(h_style)]',facial_style_name='[sanitizeSQL(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_support_high='[job_support_high]',job_support_med='[job_support_med]',job_support_low='[job_support_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sanitizeSQL(flavor_text)]',med_record='[sanitizeSQL(med_record)]',sec_record='[sanitizeSQL(sec_record)]',gen_record='[sanitizeSQL(gen_record)]',player_alt_titles='[sanitizeSQL(playertitlelist)]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
|
||||
if(!query.Execute())
|
||||
var/err = query.ErrorMsg()
|
||||
log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
|
||||
message_admins("SQL ERROR during character slot saving. Error : \[[err]\]\n")
|
||||
return
|
||||
return 1
|
||||
var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_civilian_high,job_civilian_med,job_civilian_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,nanotrasen_relation) VALUES ('[C.ckey]','[default_slot]','[sanitizeSQL(metadata)]','[sanitizeSQL(real_name)]','[be_random_name]','[gender]','[age]','[sanitizeSQL(species)]','[sanitizeSQL(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sanitizeSQL(h_style)]','[sanitizeSQL(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_civilian_high]','[job_civilian_med]','[job_civilian_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sanitizeSQL(flavor_text)]','[sanitizeSQL(med_record)]','[sanitizeSQL(sec_record)]','[sanitizeSQL(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[nanotrasen_relation]')")
|
||||
var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_support_high,job_support_med,job_support_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,nanotrasen_relation) VALUES ('[C.ckey]','[default_slot]','[sanitizeSQL(metadata)]','[sanitizeSQL(real_name)]','[be_random_name]','[gender]','[age]','[sanitizeSQL(species)]','[sanitizeSQL(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sanitizeSQL(h_style)]','[sanitizeSQL(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_support_high]','[job_support_med]','[job_support_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sanitizeSQL(flavor_text)]','[sanitizeSQL(med_record)]','[sanitizeSQL(sec_record)]','[sanitizeSQL(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[nanotrasen_relation]')")
|
||||
if(!query.Execute())
|
||||
var/err = query.ErrorMsg()
|
||||
log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
|
||||
|
||||
Reference in New Issue
Block a user