cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: Tweak map-loading in some ways

Browse Source
This commit is contained in:
Arokha Sieyes
2018-01-25 16:33:36 -05:00
parent 026fdb1e76
commit 8f19fa41c8
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/admin/verbs/map_template_loadverb.dm
View File

@@ -41,7 +41,12 @@
if(!map) if(!map)
return return
template = map_templates[map] template = map_templates[map]
if(template.width > world.maxx || template.height > world.maxy)
if(alert(usr,"This template is larger than the existing z-levels. It will EXPAND ALL Z-LEVELS to match the size of the template. This may cause chaos. Are you sure you want to do this?","DANGER!!!","Cancel","Yes") == "Cancel")
to_chat(usr,"Template placement aborted.")
return
if(alert(usr,"Confirm map load.", "Template Confirm","No","Yes") == "Yes") if(alert(usr,"Confirm map load.", "Template Confirm","No","Yes") == "Yes")
if(template.load_new_z()) if(template.load_new_z())
message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) on Z level [world.maxz].</span>") message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) on Z level [world.maxz].</span>")

15
code/modules/maps/tg/map_template.dm
View File

@@ -102,18 +102,23 @@ var/list/global/map_templates = list()
admin_notice("<span class='danger'>Submap initializations finished.</span>", R_DEBUG) admin_notice("<span class='danger'>Submap initializations finished.</span>", R_DEBUG)
/datum/map_template/proc/load_new_z() /datum/map_template/proc/load_new_z(var/centered = FALSE, var/dont_init = FALSE)
var/x = round(world.maxx/2) var/x = 1
var/y = round(world.maxy/2) var/y = 1
var/list/bounds = maploader.load_map(file(mappath), x, y) if(centered)
x = round((world.maxx - width)/2)
y = round((world.maxy - height)/2)
var/list/bounds = maploader.load_map(file(mappath), x, y, no_changeturf = TRUE)
if(!bounds) if(!bounds)
return FALSE return FALSE
// repopulate_sorted_areas() // repopulate_sorted_areas()
//initialize things that are normally initialized after map load //initialize things that are normally initialized after map load
initTemplateBounds(bounds) if(!dont_init)
initTemplateBounds(bounds)
log_game("Z-level [name] loaded at at [x],[y],[world.maxz]") log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")
return TRUE return TRUE

8
maps/~map_system/maps.dm
View File

@@ -38,6 +38,12 @@ var/list/all_maps = list()
//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there. //This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there.
var/list/accessible_z_levels = list() var/list/accessible_z_levels = list()
//List of additional z-levels to load above the existing .dmm file z-levels using the maploader. Must be map template >>> NAMES <<<.
var/list/lateload_z_levels = list()
//Similar to above, but only pick ONE to load, useful for random away missions and whatnot
var/list/lateload_single_pick = list()
var/list/allowed_jobs = list() //Job datums to use. var/list/allowed_jobs = list() //Job datums to use.
//Works a lot better so if we get to a point where three-ish maps are used //Works a lot better so if we get to a point where three-ish maps are used
//We don't have to C&P ones that are only common between two of them //We don't have to C&P ones that are only common between two of them
@@ -187,7 +193,7 @@ var/list/all_maps = list()
if(transit_chance) if(transit_chance)
map.accessible_z_levels["[z]"] = transit_chance map.accessible_z_levels["[z]"] = transit_chance
// VOREStation Edit - Holomaps // VOREStation Edit - Holomaps
// Auto-center the map if needed (Guess based on maxx/maxy) // Auto-center the map if needed (Guess based on maxx/maxy)
if (holomap_offset_x < 0) if (holomap_offset_x < 0)
holomap_offset_x = ((HOLOMAP_ICON_SIZE - world.maxx) / 2) holomap_offset_x = ((HOLOMAP_ICON_SIZE - world.maxx) / 2)
if (holomap_offset_x < 0) if (holomap_offset_x < 0)