cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 21:10:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates Loadout Backend (#18095)

Browse Source 
* Updates Loadout Backend

Updates the loadout backend to store gear data in a separate table.

This might enable us to increase the number of loadout points available

* Bump MariaDB Version to 10.11

* Update editorconfig for SQL

* Fix update_character_gear

* tgui_alert and TOPIC_NOACTION

* Fix missing sur

* Actually, its user

* Adds a CHECK_TICK, just in case

---------

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
This commit is contained in:
Werner
2024-01-02 22:54:49 +01:00
committed by GitHub
parent 66f92c62ef
commit bff569a6da
12 changed files with 310 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/01_basic.dm
+2 -2
View File
@@ -115,7 +115,7 @@
"ckey" = PREF_CLIENT_CKEY
)
/datum/category_item/player_setup_item/general/basic/load_special()
/datum/category_item/player_setup_item/general/basic/load_character_special()
pref.can_edit_name = TRUE
pref.can_edit_ipc_tag = TRUE
@@ -134,7 +134,7 @@
if(GLOB.config.ipc_timelock_active)
pref.can_edit_ipc_tag = FALSE
else
log_world("ERROR: SQL CHARACTER LOAD: Logic error, general/basic/load_special() didn't return any rows when it should have. Character ID: [pref.current_character].")
log_world("ERROR: SQL CHARACTER LOAD: Logic error, general/basic/load_character_special() didn't return any rows when it should have. Character ID: [pref.current_character].")
/datum/category_item/player_setup_item/general/basic/sanitize_character()
if(!pref.species)
code/modules/client/preference_setup/general/07_psionics.dm
+1 -1
View File
@@ -48,7 +48,7 @@
"ckey" = PREF_CLIENT_CKEY
)
/datum/category_item/player_setup_item/general/psionics/load_special(savefile/S)
/datum/category_item/player_setup_item/general/psionics/load_character_special(savefile/S)
if(!pref.psionics)
pref.psionics = "{}"
code/modules/client/preference_setup/loadout/loadout.dm
+53 -13
View File
@@ -41,27 +41,58 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/load_character(var/savefile/S)
S["gear"] >> pref.gear
S["gear_list"] >> pref.gear_list
if(pref.gear_list!=null && pref.gear_slot!=null)
pref.gear = pref.gear_list["[pref.gear_slot]"]
else
S["gear"] >> pref.gear
/datum/category_item/player_setup_item/loadout/load_character_special(var/savefile/S)
pref.gear_modified = FALSE
//Query the ss13_characters_gear table
if(GLOB.config.sql_saves && establish_db_connection(GLOB.dbcon))
var/fetched_gear = list()
var/DBQuery/character_gear_query = GLOB.dbcon.NewQuery("SELECT slot, name, tweaks FROM ss13_characters_gear WHERE char_id = :char_id:")
character_gear_query.Execute(list("char_id"=pref.current_character))
while(character_gear_query.NextRow())
CHECK_TICK
var/slot = character_gear_query.item[1]
var/name = character_gear_query.item[2]
if(!fetched_gear[slot])
fetched_gear[slot] = list()
var/tweaks = list()
if(character_gear_query.item[3])
tweaks = json_decode(character_gear_query.item[3])
fetched_gear[slot][name]=tweaks
pref.gear_list = fetched_gear
return
/datum/category_item/player_setup_item/loadout/save_character_special(var/savefile/S)
//Persist the loadout to the database
if(GLOB.config.sql_saves && establish_db_connection(GLOB.dbcon) && pref.gear_modified)
var/gear_string = json_encode(pref.gear_list["[pref.gear_slot]"])
var/DBQuery/character_gear_save_query = GLOB.dbcon.NewQuery("CALL `update_character_gear`(:char_id:, :slot_id:, :gear_data:)")
character_gear_save_query.Execute(list("char_id"=pref.current_character,"slot_id"=pref.gear_slot,"gear_data"=gear_string))
pref.gear_modified = FALSE
return
/datum/category_item/player_setup_item/loadout/save_character(var/savefile/S)
pref.gear_list["[pref.gear_slot]"] = pref.gear
to_file(S["gear_list"], pref.gear_list)
to_file(S["gear_slot"], pref.gear_slot)
/datum/category_item/player_setup_item/loadout/gather_load_query()
return list("ss13_characters" = list("vars" = list("gear_slot"), "args" = list("id")))
/datum/category_item/player_setup_item/loadout/gather_load_parameters()
return list("id" = pref.current_character)
/datum/category_item/player_setup_item/loadout/gather_load_query()
return list("ss13_characters" = list("vars" = list("gear" = "gear_list", "gear_slot"), "args" = list("id")))
/datum/category_item/player_setup_item/loadout/gather_save_query()
return list("ss13_characters" = list("gear", "gear_slot", "id" = 1, "ckey" = 1))
return list("ss13_characters" = list("gear_slot", "id" = 1, "ckey" = 1))
/datum/category_item/player_setup_item/loadout/gather_save_parameters()
return list("gear" = json_encode(pref.gear_list), "gear_slot" = pref.gear_slot, "id" = pref.current_character, "ckey" = PREF_CLIENT_CKEY)
return list("gear_slot" = pref.gear_slot, "id" = pref.current_character, "ckey" = PREF_CLIENT_CKEY)
/datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
. = list()
@@ -131,7 +162,7 @@ var/list/gear_datums = list()
pref.gear -= gear_name
else
var/datum/gear/G = gear_datums[gear_name]
if(total_cost + G.cost > MAX_GEAR_COST)
if(total_cost + G.cost > GLOB.config.loadout_cost)
pref.gear -= gear_name
to_chat(preference_mob, "<span class='warning'>You cannot afford to take \the [gear_name]</span>")
else
@@ -146,13 +177,13 @@ var/list/gear_datums = list()
total_cost += G.cost
var/fcolor = "#3366CC"
if(total_cost < MAX_GEAR_COST)
if(total_cost < GLOB.config.loadout_cost)
fcolor = "#E67300"
. = list()
. += "<table align = 'center' width = 100%>"
if (gear_reset)
. += "<tr><td colspan=3><center><i>Your loadout failed to load and will be reset if you save this slot.</i></center></td></tr>"
. += "<tr><td colspan=3><center><a href='?src=\ref[src];prev_slot=1'>\<\<</a><b><font color = '[fcolor]'>\[[pref.gear_slot]\]</font> </b><a href='?src=\ref[src];next_slot=1'>\>\></a><b><font color = '[fcolor]'>[total_cost]/[MAX_GEAR_COST]</font> loadout points spent.</b> \[<a href='?src=\ref[src];clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
. += "<tr><td colspan=3><center><a href='?src=\ref[src];prev_slot=1'>\<\<</a><b><font color = '[fcolor]'>\[[pref.gear_slot]\]</font> </b><a href='?src=\ref[src];next_slot=1'>\>\></a><b><font color = '[fcolor]'>[total_cost]/[GLOB.config.loadout_cost]</font> loadout points spent.</b> \[<a href='?src=\ref[src];clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
. += "<tr><td colspan=3><center><b>"
var/firstcat = 1
@@ -307,6 +338,7 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/OnTopic(href, href_list, user)
if(href_list["toggle_gear"])
pref.gear_modified = TRUE
var/datum/gear/TG = gear_datums[href_list["toggle_gear"]]
if(TG.display_name in pref.gear)
pref.gear -= TG.display_name
@@ -315,10 +347,11 @@ var/list/gear_datums = list()
for(var/gear_name in pref.gear)
var/datum/gear/G = gear_datums[gear_name]
if(istype(G)) total_cost += G.cost
if((total_cost+TG.cost) <= MAX_GEAR_COST)
if((total_cost+TG.cost) <= GLOB.config.loadout_cost)
pref.gear += TG.display_name
return TOPIC_REFRESH_UPDATE_PREVIEW
if(href_list["gear"] && href_list["tweak"])
pref.gear_modified = TRUE
var/datum/gear/gear = gear_datums[href_list["gear"]]
var/datum/gear_tweak/tweak = locate(href_list["tweak"])
if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks))
@@ -330,6 +363,9 @@ var/list/gear_datums = list()
return TOPIC_REFRESH_UPDATE_PREVIEW
if(href_list["next_slot"] || href_list["prev_slot"])
if(pref.gear_modified)
tgui_alert(user, "Gear has been Modified - Save First or Reload", "Gear Modified", list("OK"))
return TOPIC_NOACTION
//Set the current slot in the gear list to the currently selected gear
pref.gear_list["[pref.gear_slot]"] = pref.gear
@@ -357,12 +393,16 @@ var/list/gear_datums = list()
else if(href_list["select_category"])
current_tab = href_list["select_category"]
return TOPIC_REFRESH
else if(href_list["clear_loadout"])
pref.gear_modified = TRUE
pref.gear.Cut()
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["search_input_refresh"] != null) // empty str is false
search_input_value = sanitize(href_list["search_input_refresh"], 100)
return TOPIC_REFRESH_UPDATE_PREVIEW
return ..()
/datum/gear
code/modules/client/preference_setup/other/01_incidents.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Incidents"
sort_order = 7
/datum/category_item/player_setup_item/other/incidents/load_special(var/savefile/S)
/datum/category_item/player_setup_item/other/incidents/load_character_special(var/savefile/S)
pref.incidents = list()
pref.ccia_actions = list()
code/modules/client/preference_setup/preference_setup.dm
+17 -7
View File
@@ -153,7 +153,7 @@
handle_sql_loading(SQL_CHARACTER)
for(var/datum/category_item/player_setup_item/PI in items)
PI.load_special(S)
PI.load_character_special(S)
PI.sanitize_character(GLOB.config.sql_saves)
/datum/category_group/player_setup_category/proc/save_character(var/savefile/S)
@@ -161,10 +161,14 @@
for (var/datum/category_item/player_setup_item/PI in items)
PI.sanitize_character()
if (!GLOB.config.sql_saves || !establish_db_connection(GLOB.dbcon))
for (var/datum/category_item/player_setup_item/PI in items)
var/db_available = GLOB.config.sql_saves && establish_db_connection(GLOB.dbcon)
for (var/datum/category_item/player_setup_item/PI in items)
PI.save_character_special(S)
if(!db_available)
PI.save_character(S)
else if (modified)
if (db_available && modified)
// No save here, because this is only called from the menu and needs to save /everything/.
handle_sql_saving(SQL_CHARACTER)
modified = 0
@@ -238,17 +242,23 @@
return
/*
* Called no matter if sql safes are enabled or disabled
* Called no matter if sql saves are enabled or disabled (After load_character)
*/
/datum/category_item/player_setup_item/proc/load_special(var/savefile/S)
/datum/category_item/player_setup_item/proc/load_character_special(var/savefile/S)
return
/*
* Called when the item is asked to save per character settings
* Called when the item is asked to save per character settings - Only called when sql saves are disabled or unavailable
*/
/datum/category_item/player_setup_item/proc/save_character(var/savefile/S)
return
/*
* Called no matter if sql saves are enabled or disabled (Before save_character / handle_sql_saving)
*/
/datum/category_item/player_setup_item/proc/save_character_special(var/savefile/S)
return
/*
* Called when the item is asked to load user/global settings
*/