mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
Brighter ghost hair and new preferences.
+Ghost hair is now brighter than before. +Added a new preference ghost_accs that stores what you want your own ghost to display. +Added a new preference ghost_others that stores what you want other people's ghosts to display.
This commit is contained in:
Ricotez
@@ -34,6 +34,8 @@ var/list/preferences_datums = list()
|
||||
var/chat_toggles = TOGGLES_DEFAULT_CHAT
|
||||
var/ghost_form = "ghost"
|
||||
var/ghost_orbit = GHOST_ORBIT_CIRCLE
|
||||
var/ghost_accs = GHOST_ACCS_DEFAULT_OPTION
|
||||
var/ghost_others = GHOST_OTHERS_DEFAULT_OPTION
|
||||
var/ghost_hud = 1
|
||||
var/inquisitive_ghost = 1
|
||||
var/allow_midround_antag = 1
|
||||
@@ -357,6 +359,27 @@ var/list/preferences_datums = list()
|
||||
dat += "<b>Ghost Form:</b> <a href='?_src_=prefs;task=input;preference=ghostform'>[ghost_form]</a><br>"
|
||||
dat += "<B>Ghost Orbit: </B> <a href='?_src_=prefs;task=input;preference=ghostorbit'>[ghost_orbit]</a><br>"
|
||||
|
||||
var/button_name = "If you see this something went wrong."
|
||||
switch(ghost_accs)
|
||||
if(GHOST_ACCS_FULL)
|
||||
button_name = GHOST_ACCS_FULL_NAME
|
||||
if(GHOST_ACCS_DIR)
|
||||
button_name = GHOST_ACCS_DIR_NAME
|
||||
if(GHOST_ACCS_NONE)
|
||||
button_name = GHOST_ACCS_NONE_NAME
|
||||
|
||||
dat += "<b>Ghost Accessories:</b> <a href='?_src_=prefs;task=input;preference=ghostaccs'>[button_name]</a><br>"
|
||||
|
||||
switch(ghost_others)
|
||||
if(GHOST_OTHERS_THEIR_SETTING)
|
||||
button_name = GHOST_OTHERS_THEIR_SETTING_NAME
|
||||
if(GHOST_OTHERS_DEFAULT_SPRITE)
|
||||
button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME
|
||||
if(GHOST_OTHERS_SIMPLE)
|
||||
button_name = GHOST_OTHERS_SIMPLE_NAME
|
||||
|
||||
dat += "<b>Ghosts of Others:</b> <a href='?_src_=prefs;task=input;preference=ghostothers'>[button_name]</a><br>"
|
||||
|
||||
if (SERVERTOOLS && config.maprotation)
|
||||
var/p_map = preferred_map
|
||||
if (!p_map)
|
||||
@@ -752,6 +775,26 @@ var/list/preferences_datums = list()
|
||||
if(new_orbit)
|
||||
ghost_orbit = new_orbit
|
||||
|
||||
if("ghostaccs")
|
||||
var/new_ghost_accs = alert("Do you want your ghost to show full accessories where possible, hide accessories but still use the directional sprites where possible, or also ignore the directions and stick to the default sprites?",,GHOST_ACCS_FULL_NAME, GHOST_ACCS_DIR_NAME, GHOST_ACCS_NONE_NAME)
|
||||
switch(new_ghost_accs)
|
||||
if(GHOST_ACCS_FULL_NAME)
|
||||
ghost_accs = GHOST_ACCS_FULL
|
||||
if(GHOST_ACCS_DIR_NAME)
|
||||
ghost_accs = GHOST_ACCS_DIR
|
||||
if(GHOST_ACCS_NONE_NAME)
|
||||
ghost_accs = GHOST_ACCS_NONE
|
||||
|
||||
if("ghostothers")
|
||||
var/new_ghost_others = alert("Do you want the ghosts of others to show up as their own setting, as their default sprites or always as the default white ghost?",,GHOST_OTHERS_THEIR_SETTING_NAME, GHOST_OTHERS_DEFAULT_SPRITE_NAME, GHOST_OTHERS_SIMPLE_NAME)
|
||||
switch(new_ghost_others)
|
||||
if(GHOST_OTHERS_THEIR_SETTING_NAME)
|
||||
ghost_others = GHOST_OTHERS_THEIR_SETTING
|
||||
if(GHOST_OTHERS_DEFAULT_SPRITE_NAME)
|
||||
ghost_others = GHOST_OTHERS_DEFAULT_SPRITE
|
||||
if(GHOST_OTHERS_SIMPLE_NAME)
|
||||
ghost_others = GHOST_OTHERS_SIMPLE
|
||||
|
||||
if("name")
|
||||
var/new_name = reject_bad_name( input(user, "Choose your character's name:", "Character Preference") as text|null )
|
||||
if(new_name)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#define SAVEFILE_VERSION_MIN 8
|
||||
|
||||
//This is the current version, anything below this will attempt to update (if it's not obsolete)
|
||||
#define SAVEFILE_VERSION_MAX 13
|
||||
#define SAVEFILE_VERSION_MAX 14
|
||||
/*
|
||||
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
|
||||
This proc checks if the current directory of the savefile S needs updating
|
||||
@@ -217,6 +217,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["toggles"] >> toggles
|
||||
S["ghost_form"] >> ghost_form
|
||||
S["ghost_orbit"] >> ghost_orbit
|
||||
S["ghost_accs"] >> ghost_accs
|
||||
S["ghost_others"] >> ghost_others
|
||||
S["preferred_map"] >> preferred_map
|
||||
S["ignoring"] >> ignoring
|
||||
S["ghost_hud"] >> ghost_hud
|
||||
@@ -238,6 +240,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
toggles = sanitize_integer(toggles, 0, 65535, initial(toggles))
|
||||
ghost_form = sanitize_inlist(ghost_form, ghost_forms, initial(ghost_form))
|
||||
ghost_orbit = sanitize_inlist(ghost_orbit, ghost_orbits, initial(ghost_orbit))
|
||||
ghost_accs = sanitize_inlist(ghost_accs, ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION)
|
||||
ghost_others = sanitize_inlist(ghost_others, ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
|
||||
|
||||
return 1
|
||||
|
||||
@@ -264,6 +268,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["chat_toggles"] << chat_toggles
|
||||
S["ghost_form"] << ghost_form
|
||||
S["ghost_orbit"] << ghost_orbit
|
||||
S["ghost_accs"] << ghost_accs
|
||||
S["ghost_others"] << ghost_others
|
||||
S["preferred_map"] << preferred_map
|
||||
S["ignoring"] << ignoring
|
||||
S["ghost_hud"] << ghost_hud
|
||||
|
||||
@@ -212,11 +212,9 @@ var/global/list/ghost_forms = list("ghost","ghostking","ghostian2","skeleghost",
|
||||
"ghost_cyan","ghost_dblue","ghost_dred","ghost_dgreen", \
|
||||
"ghost_dcyan","ghost_grey","ghost_dyellow","ghost_dpink", "ghost_purpleswirl","ghost_funkypurp","ghost_pinksherbert","ghost_blazeit",\
|
||||
"ghost_mellow","ghost_rainbow","ghost_camo","ghost_fire")
|
||||
/client/verb/pick_form()
|
||||
set name = "Choose Ghost Form"
|
||||
set category = "Preferences"
|
||||
set desc = "Choose your preferred ghostly appearance."
|
||||
/client/proc/pick_form()
|
||||
if(!is_content_unlocked())
|
||||
alert("This setting is for accounts with BYOND premium only.")
|
||||
return
|
||||
var/new_form = input(src, "Thanks for supporting BYOND - Choose your ghostly form:","Thanks for supporting BYOND",null) as null|anything in ghost_forms
|
||||
if(new_form)
|
||||
@@ -228,11 +226,9 @@ var/global/list/ghost_forms = list("ghost","ghostking","ghostian2","skeleghost",
|
||||
|
||||
var/global/list/ghost_orbits = list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOST_ORBIT_SQUARE,GHOST_ORBIT_HEXAGON,GHOST_ORBIT_PENTAGON)
|
||||
|
||||
/client/verb/pick_ghost_orbit()
|
||||
set name = "Choose Ghost Orbit"
|
||||
set category = "Preferences"
|
||||
set desc = "Choose your preferred ghostly orbit."
|
||||
/client/proc/pick_ghost_orbit()
|
||||
if(!is_content_unlocked())
|
||||
alert("This setting is for accounts with BYOND premium only.")
|
||||
return
|
||||
var/new_orbit = input(src, "Thanks for supporting BYOND - Choose your ghostly orbit:","Thanks for supporting BYOND",null) as null|anything in ghost_orbits
|
||||
if(new_orbit)
|
||||
@@ -242,6 +238,50 @@ var/global/list/ghost_orbits = list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
|
||||
var/mob/dead/observer/O = mob
|
||||
O.ghost_orbit = new_orbit
|
||||
|
||||
/client/proc/pick_ghost_accs()
|
||||
var/new_ghost_accs = alert("Do you want your ghost to show full accessories where possible, hide accessories but still use the directional sprites where possible, or also ignore the directions and stick to the default sprites?",,"full accessories", "only directional sprites", "default sprites")
|
||||
switch(new_ghost_accs)
|
||||
if("full accessories")
|
||||
prefs.ghost_accs = GHOST_ACCS_FULL
|
||||
if("only directional sprites")
|
||||
prefs.ghost_accs = GHOST_ACCS_DIR
|
||||
if("default sprites")
|
||||
prefs.ghost_accs = GHOST_ACCS_NONE
|
||||
if(istype(mob, /mob/dead/observer))
|
||||
var/mob/dead/observer/O = mob
|
||||
O.update_icon()
|
||||
|
||||
/client/verb/pick_ghost_customization()
|
||||
set name = "Ghost Customization"
|
||||
set category = "Preferences"
|
||||
set desc = "Customize your ghastly appearance."
|
||||
if(is_content_unlocked())
|
||||
switch(alert("Which setting do you want to change?",,"Ghost Form","Ghost Orbit","Ghost Accessories"))
|
||||
if("Ghost Form")
|
||||
pick_form()
|
||||
if("Ghost Orbit")
|
||||
pick_ghost_orbit()
|
||||
if("Ghost Accessories")
|
||||
pick_ghost_accs()
|
||||
else
|
||||
pick_ghost_accs()
|
||||
|
||||
/client/verb/pick_ghost_others()
|
||||
set name = "Ghost Display Settings"
|
||||
set category = "Preferences"
|
||||
set desc = "Change display settings for the ghosts of other players."
|
||||
var/new_ghost_others = alert("Do you want the ghosts of others to show up as their own setting, as their default sprites or always as the default white ghost?",,"Their Setting", "Default Sprites", "White Ghost")
|
||||
switch(new_ghost_others)
|
||||
if("Their Setting")
|
||||
prefs.ghost_others = GHOST_OTHERS_THEIR_SETTING
|
||||
if("Default Sprites")
|
||||
prefs.ghost_others = GHOST_OTHERS_DEFAULT_SPRITE
|
||||
if("White Ghost")
|
||||
prefs.ghost_others = GHOST_OTHERS_SIMPLE
|
||||
if(istype(mob, /mob/dead/observer))
|
||||
var/mob/dead/observer/O = mob
|
||||
O.updateghostsight()
|
||||
|
||||
/client/verb/toggle_intent_style()
|
||||
set name = "Toggle Intent Selection Style"
|
||||
set category = "Preferences"
|
||||
|
||||
Reference in New Issue
Block a user