mirror of
https://github.com/fulpstation/fulpstation.git
synced 2025-12-10 01:57:01 +00:00
test
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Delta Station",
|
"map_name": "Delta Station",
|
||||||
"map_path": "map_files/Deltastation",
|
"map_path": "_maps/map_files/Deltastation",
|
||||||
"map_file": "DeltaStation2.dmm",
|
"map_file": "DeltaStation2.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"emergency": "emergency_delta",
|
"emergency": "emergency_delta",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Heliostation",
|
"map_name": "Heliostation",
|
||||||
"map_path": "map_files/Heliostation",
|
"map_path": "_maps/map_files/Heliostation",
|
||||||
"map_file": "Heliostation.dmm",
|
"map_file": "Heliostation.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"cargo": "cargo_helio",
|
"cargo": "cargo_helio",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Ice Box Station",
|
"map_name": "Ice Box Station",
|
||||||
"map_path": "map_files/IceBoxStation",
|
"map_path": "_maps/map_files/IceBoxStation",
|
||||||
"map_file": "IceBoxStation.dmm",
|
"map_file": "IceBoxStation.dmm",
|
||||||
"space_ruin_levels": 0,
|
"space_ruin_levels": 0,
|
||||||
"space_empty_levels": 0,
|
"space_empty_levels": 0,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Kilo Station",
|
"map_name": "Kilo Station",
|
||||||
"map_path": "map_files/KiloStation",
|
"map_path": "_maps/map_files/KiloStation",
|
||||||
"map_file": "KiloStation.dmm",
|
"map_file": "KiloStation.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"emergency": "emergency_kilo",
|
"emergency": "emergency_kilo",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "MetaStation",
|
"map_name": "MetaStation",
|
||||||
"map_path": "map_files/MetaStation",
|
"map_path": "_maps/map_files/MetaStation",
|
||||||
"map_file": "MetaStation.dmm",
|
"map_file": "MetaStation.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"cargo": "cargo_box",
|
"cargo": "cargo_box",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "MultiZ Debug",
|
"map_name": "MultiZ Debug",
|
||||||
"map_path": "map_files/debug",
|
"map_path": "_maps/map_files/debug",
|
||||||
"map_file": "multiz.dmm",
|
"map_file": "multiz.dmm",
|
||||||
"traits": [
|
"traits": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Pubby Station",
|
"map_name": "Pubby Station",
|
||||||
"map_path": "map_files/PubbyStation",
|
"map_path": "_maps/map_files/PubbyStation",
|
||||||
"map_file": "PubbyStation.dmm",
|
"map_file": "PubbyStation.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"emergency": "emergency_pubby",
|
"emergency": "emergency_pubby",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Runtime Station",
|
"map_name": "Runtime Station",
|
||||||
"map_path": "map_files/debug",
|
"map_path": "_maps/map_files/debug",
|
||||||
"map_file": "runtimestation.dmm",
|
"map_file": "runtimestation.dmm",
|
||||||
"space_ruin_levels": 1,
|
"space_ruin_levels": 1,
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Selene Station",
|
"map_name": "Selene Station",
|
||||||
"map_path": "map_files/SeleneStation",
|
"map_path": "_maps/map_files/SeleneStation",
|
||||||
"map_file": "SeleneStation.dmm",
|
"map_file": "SeleneStation.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"cargo": "cargo_selene",
|
"cargo": "cargo_selene",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"map_name": "Tramstation",
|
"map_name": "Tramstation",
|
||||||
"map_path": "map_files/tramstation",
|
"map_path": "_maps/map_files/tramstation",
|
||||||
"map_file": "tramstation.dmm",
|
"map_file": "tramstation.dmm",
|
||||||
"shuttles": {
|
"shuttles": {
|
||||||
"cargo": "cargo_box",
|
"cargo": "cargo_box",
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ Used by the AI doomsday and the self-destruct nuke.
|
|||||||
var/total_z = 0
|
var/total_z = 0
|
||||||
var/list/parsed_maps = list()
|
var/list/parsed_maps = list()
|
||||||
for (var/file in files)
|
for (var/file in files)
|
||||||
var/full_path = "_maps/[path]/[file]"
|
var/full_path = "[path]/[file]"
|
||||||
var/datum/parsed_map/pm = new(file(full_path))
|
var/datum/parsed_map/pm = new(file(full_path))
|
||||||
var/bounds = pm?.bounds
|
var/bounds = pm?.bounds
|
||||||
if (!bounds)
|
if (!bounds)
|
||||||
@@ -289,7 +289,7 @@ Used by the AI doomsday and the self-destruct nuke.
|
|||||||
add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE)
|
add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE)
|
||||||
|
|
||||||
if(config.minetype == "lavaland")
|
if(config.minetype == "lavaland")
|
||||||
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
|
LoadGroup(FailedZs, "Lavaland", "_maps/map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
|
||||||
else if (!isnull(config.minetype) && config.minetype != "none")
|
else if (!isnull(config.minetype) && config.minetype != "none")
|
||||||
INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
|
INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
// Config actually from the JSON - should default to Meta
|
// Config actually from the JSON - should default to Meta
|
||||||
var/map_name = "Meta Station"
|
var/map_name = "Meta Station"
|
||||||
var/map_path = "map_files/MetaStation"
|
var/map_path = "_maps/map_files/MetaStation"
|
||||||
var/map_file = "MetaStation.dmm"
|
var/map_file = "MetaStation.dmm"
|
||||||
|
|
||||||
var/traits = null
|
var/traits = null
|
||||||
@@ -117,13 +117,13 @@
|
|||||||
map_file = json["map_file"]
|
map_file = json["map_file"]
|
||||||
// "map_file": "MetaStation.dmm"
|
// "map_file": "MetaStation.dmm"
|
||||||
if (istext(map_file))
|
if (istext(map_file))
|
||||||
if (!fexists("_maps/[map_path]/[map_file]"))
|
if (!fexists("[map_path]/[map_file]"))
|
||||||
log_world("Map file ([map_path]/[map_file]) does not exist!")
|
log_world("Map file ([map_path]/[map_file]) does not exist!")
|
||||||
return
|
return
|
||||||
// "map_file": ["Lower.dmm", "Upper.dmm"]
|
// "map_file": ["Lower.dmm", "Upper.dmm"]
|
||||||
else if (islist(map_file))
|
else if (islist(map_file))
|
||||||
for (var/file in map_file)
|
for (var/file in map_file)
|
||||||
if (!fexists("_maps/[map_path]/[file]"))
|
if (!fexists("[map_path]/[file]"))
|
||||||
log_world("Map file ([map_path]/[file]) does not exist!")
|
log_world("Map file ([map_path]/[file]) does not exist!")
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
@@ -194,10 +194,10 @@
|
|||||||
|
|
||||||
/datum/map_config/proc/GetFullMapPaths()
|
/datum/map_config/proc/GetFullMapPaths()
|
||||||
if (istext(map_file))
|
if (istext(map_file))
|
||||||
return list("_maps/[map_path]/[map_file]")
|
return list("[map_path]/[map_file]")
|
||||||
. = list()
|
. = list()
|
||||||
for (var/file in map_file)
|
for (var/file in map_file)
|
||||||
. += "_maps/[map_path]/[file]"
|
. += "[map_path]/[file]"
|
||||||
|
|
||||||
/datum/map_config/proc/MakeNextMap()
|
/datum/map_config/proc/MakeNextMap()
|
||||||
return config_filename == PATH_TO_NEXT_MAP_JSON || fcopy(config_filename, PATH_TO_NEXT_MAP_JSON)
|
return config_filename == PATH_TO_NEXT_MAP_JSON || fcopy(config_filename, PATH_TO_NEXT_MAP_JSON)
|
||||||
|
|||||||
Reference in New Issue
Block a user