cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom map loading ignoring JSON values (#88720)

Browse Source 
## About The Pull Request
The map loading function was ignoring JSON values when a map's config
file was custom loaded. (things like - minetype, planetary, etc.)

To resolve this I just made the loadConfig return a json and then use
that json.

## Why It's Good For The Game
Better custom map support!

## Changelog
🆑
fix: Fix custom map loading ignoring JSON values that were ignored
previously. (minetype, planetary, etc.)
/🆑
This commit is contained in:
Tim
2024-12-26 08:30:56 +01:00
committed by GitHub
parent 1c2ade688b
commit f07cdf2871
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/maprotation.dm
+4 -11
View File
@@ -67,19 +67,12 @@ ADMIN_VERB(admin_change_map, R_SERVER, "Change Map", "Set the next map.", ADMIN_
fdel("data/custom_map_json/[config_file]")
if(!fcopy(config_file, "data/custom_map_json/[config_file]"))
return
if (virtual_map.LoadConfig("data/custom_map_json/[config_file]", TRUE) != TRUE)
json_value = virtual_map.LoadConfig("data/custom_map_json/[config_file]", TRUE)
if(!json_value)
to_chat(src, span_warning("Failed to load config: [config_file]. Check that the fields are filled out correctly. \"map_path\": \"custom\" and \"map_file\": \"your_map_name.dmm\""))
return
json_value = list(
"version" = MAP_CURRENT_VERSION,
"map_name" = virtual_map.map_name,
"map_path" = virtual_map.map_path,
"map_file" = virtual_map.map_file,
"shuttles" = virtual_map.shuttles,
"traits" = virtual_map.traits,
"job_changes" = virtual_map.job_changes,
"library_areas" = virtual_map.library_areas,
)
else
virtual_map = load_map_config()
virtual_map.map_name = input(user, "Choose the name for the map", "Map Name") as null|text