cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 07:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #4739 from monster860/vg-parallax"

Browse Source 
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
This commit is contained in:
Tigercat2000
2016-07-28 15:48:27 -07:00
parent 794760dd27
commit 288af9f92c
23 changed files with 7 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/client/client defines.dm
View File

@@ -88,16 +88,4 @@
// Their chat window, sort of important.
// See /goon/code/datums/browserOutput.dm
var/datum/chatOutput/chatOutput
////////////
//PARALLAX//
////////////
var/updating_parallax = 0
var/list/parallax = list()
var/list/parallax_offset = list()
var/turf/previous_turf = null
var/obj/screen/plane_master/parallax_master/parallax_master = null
var/obj/screen/plane_master/parallax_dustmaster/parallax_dustmaster = null
var/obj/screen/plane_master/parallax_spacemaster/parallax_spacemaster = null
var/last_parallax_shift
var/datum/chatOutput/chatOutput

23
code/modules/client/preference/preferences.dm
View File

@@ -93,9 +93,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/show_ghostitem_attack = TRUE
var/UI_style_color = "#ffffff"
var/UI_style_alpha = 255
var/space_parallax = 1
var/space_dust = 1
var/parallax_speed = 1
//character preferences
@@ -381,9 +378,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(TAB_GAME) // General Preferences
dat += "<table><tr><td width='340px' height='300px' valign='top'>"
dat += "<h2>General Settings</h2>"
dat += "<b>Space Parallax:</b> <a href='?_src_=prefs;preference=parallax'><b>[space_parallax ? "Enabled" : "Disabled"]</b></a><br>"
dat += "<b>Parallax Speed:</b> <a href='?_src_=prefs;preference=p_speed'><b>[parallax_speed]</b></a><br>"
dat += "<b>Space Dust:</b> <a href='?_src_=prefs;preference=dust'><b>[space_dust ? "Yes" : "No"]</b></a><br>"
dat += "<b>Fancy NanoUI:</b> <a href='?_src_=prefs;preference=nanoui'>[(nanoui_fancy) ? "Yes" : "No"]</a><br>"
dat += "<b>Ghost-Item Attack Animation:</b> <a href='?_src_=prefs;preference=ghost_att_anim'>[(show_ghostitem_attack) ? "Yes" : "No"]</a><br>"
dat += "<b>Custom UI settings:</b><br>"
@@ -1761,21 +1755,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/mob/living/carbon/human/H = usr
H.remake_hud()
if("parallax")
space_parallax = !space_parallax
if(usr && usr.hud_used)
usr.hud_used.update_parallax_and_dust()
if("dust")
space_dust = !space_dust
if(usr && usr.hud_used)
usr.hud_used.update_parallax_and_dust()
if("p_speed")
parallax_speed = min(max(input(user, "Enter a number between 0 and 5 included (default=2)","Parallax Speed Preferences",parallax_speed),0),5)
if("be_special")
var/r = href_list["role"]
if(!(r in special_roles))
@@ -2038,4 +2017,4 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
popup.open(0)
/datum/preferences/proc/close_load_dialog(mob/user)
user << browse(null, "window=saves")
user << browse(null, "window=saves")

16
code/modules/client/preference/preferences_mysql.dm
View File

@@ -13,10 +13,7 @@
volume,
nanoui_fancy,
show_ghostitem_attack,
lastchangelog,
space_parallax,
space_dust,
parallax_speed
lastchangelog
FROM [format_table_name("player")]
WHERE ckey='[C.ckey]'"}
)
@@ -43,9 +40,6 @@
nanoui_fancy = text2num(query.item[11])
show_ghostitem_attack = text2num(query.item[12])
lastchangelog = query.item[13]
space_parallax = text2num(query.item[14])
space_dust = text2num(query.item[15])
parallax_speed = text2num(query.item[16])
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -60,9 +54,6 @@
nanoui_fancy = sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy))
show_ghostitem_attack = sanitize_integer(show_ghostitem_attack, 0, 1, initial(show_ghostitem_attack))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
space_parallax = sanitize_integer(space_parallax, 0, 1, initial(space_parallax))
space_dust = sanitize_integer(space_dust, 0, 1, initial(space_dust))
parallax_speed = sanitize_integer(parallax_speed, 0, 5, initial(parallax_speed))
return 1
/datum/preferences/proc/save_preferences(client/C)
@@ -87,10 +78,7 @@
volume='[volume]',
nanoui_fancy='[nanoui_fancy]',
show_ghostitem_attack='[show_ghostitem_attack]',
lastchangelog='[lastchangelog]',
space_parallax='[space_parallax]',
space_dust='[space_dust]',
parallax_speed='[parallax_speed]'
lastchangelog='[lastchangelog]'
WHERE ckey='[C.ckey]'"}
)

43
code/modules/client/preference/preferences_toggles.dm
View File

@@ -213,45 +213,4 @@
set category = "Preferences"
set desc = "Allows you to access the Setup Character screen. Changes to your character won't take effect until next round, but other changes will."
prefs.current_tab = 1
prefs.ShowChoices(usr)
/client/verb/toggle_space_parallax()
set name = "Toggle Space Parallax"
set category = "Preferences"
set desc = "Toggle the parallax effect of space turfs."
prefs.space_parallax = !prefs.space_parallax
prefs.save_preferences(src)
if(!prefs.space_parallax)
to_chat(usr, "Space parallax is now deactivated.")
else
to_chat(usr, "Space parallax is now activated.")
if(mob && mob.hud_used)
mob.hud_used.update_parallax_and_dust()
/client/verb/toggle_space_dust()
set name = "Toggle Space Dust"
set category = "Preferences"
set desc = "Toggle the presence of dust on space turfs."
prefs.space_dust = !prefs.space_dust
prefs.save_preferences(src)
if(!prefs.space_dust)
to_chat(usr, "Space dust is now deactivated.")
else
to_chat(usr, "Space dust is now activated.")
if(mob && mob.hud_used)
mob.hud_used.update_parallax_and_dust()
/client/verb/toggle_parallax_speed()
set name = "Change Parallax Speed"
set category = "Preferences"
set desc = "Change the speed at which parallax moves."
prefs.parallax_speed = min(max(input(usr, "Enter a number between 0 and 5 included (default=2)","Parallax Speed Preferences",prefs.parallax_speed),0),5)
prefs.save_preferences(src)
prefs.ShowChoices(usr)