Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
This commit is contained in:
Poojawa
@@ -0,0 +1,50 @@
|
||||
/datum/buildmode_mode/advanced
|
||||
key = "advanced"
|
||||
var/objholder = null
|
||||
|
||||
// FIXME: add logic which adds a button displaying the icon
|
||||
// of the currently selected path
|
||||
|
||||
/datum/buildmode_mode/advanced/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on buildmode button = Set object type</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on turf/obj = Place objects</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button = Delete objects</span>")
|
||||
to_chat(c, "")
|
||||
to_chat(c, "<span class='notice'>Use the button in the upper left corner to</span>")
|
||||
to_chat(c, "<span class='notice'>change the direction of built objects.</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/advanced/change_settings(client/c)
|
||||
var/target_path = input(c, "Enter typepath:", "Typepath", "/obj/structure/closet")
|
||||
objholder = text2path(target_path)
|
||||
if(!ispath(objholder))
|
||||
objholder = pick_closest_path(target_path)
|
||||
if(!objholder)
|
||||
alert("No path was selected")
|
||||
return
|
||||
else if(ispath(objholder, /area))
|
||||
objholder = null
|
||||
alert("That path is not allowed.")
|
||||
return
|
||||
|
||||
/datum/buildmode_mode/advanced/handle_click(client/c, params, obj/object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/right_click = pa.Find("right")
|
||||
if(left_click)
|
||||
if(ispath(objholder,/turf))
|
||||
var/turf/T = get_turf(object)
|
||||
log_admin("Build Mode: [key_name(c)] modified [T] in [AREACOORD(object)] to [objholder]")
|
||||
T.ChangeTurf(objholder)
|
||||
else if(!isnull(objholder))
|
||||
var/obj/A = new objholder (get_turf(object))
|
||||
A.setDir(BM.build_dir)
|
||||
log_admin("Build Mode: [key_name(c)] modified [A]'s [COORD(A)] dir to [BM.build_dir]")
|
||||
else
|
||||
to_chat(c, "<span class='warning'>Select object type first.</span>")
|
||||
else if(right_click)
|
||||
if(isobj(object))
|
||||
log_admin("Build Mode: [key_name(c)] deleted [object] at [AREACOORD(object)]")
|
||||
qdel(object)
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
/datum/buildmode_mode/area_edit
|
||||
key = "areaedit"
|
||||
var/area/storedarea
|
||||
var/image/areaimage
|
||||
|
||||
/datum/buildmode_mode/area_edit/New()
|
||||
areaimage = image('icons/turf/areas.dmi', null, "yellow")
|
||||
..()
|
||||
|
||||
/datum/buildmode_mode/area_edit/enter_mode(datum/buildmode/BM)
|
||||
BM.holder.images += areaimage
|
||||
|
||||
/datum/buildmode_mode/area_edit/exit_mode(datum/buildmode/BM)
|
||||
areaimage.loc = null // de-color the area
|
||||
BM.holder.images -= areaimage
|
||||
return ..()
|
||||
|
||||
/datum/buildmode_mode/area_edit/Destroy()
|
||||
QDEL_NULL(areaimage)
|
||||
storedarea = null
|
||||
return ..()
|
||||
|
||||
/datum/buildmode_mode/area_edit/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on obj/turf/mob = Paint area</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on obj/turf/mob = Select area to paint</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on buildmode button = Create new area</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/area_edit/change_settings(client/c)
|
||||
var/target_path = input(c, "Enter typepath:", "Typepath", "/area")
|
||||
var/areatype = text2path(target_path)
|
||||
if(ispath(areatype,/area))
|
||||
var/areaname = input(c, "Enter area name:", "Area name", "Area")
|
||||
if(!areaname || !length(areaname))
|
||||
return
|
||||
storedarea = new areatype
|
||||
storedarea.power_equip = 0
|
||||
storedarea.power_light = 0
|
||||
storedarea.power_environ = 0
|
||||
storedarea.always_unpowered = 0
|
||||
storedarea.name = areaname
|
||||
areaimage.loc = storedarea // color our area
|
||||
|
||||
/datum/buildmode_mode/area_edit/handle_click(client/c, params, object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/right_click = pa.Find("right")
|
||||
|
||||
if(left_click)
|
||||
if(!storedarea)
|
||||
to_chat(c, "<span class='warning'>Configure or select the area you want to paint first!</span>")
|
||||
return
|
||||
var/turf/T = get_turf(object)
|
||||
if(get_area(T) != storedarea)
|
||||
log_admin("Build Mode: [key_name(c)] added [AREACOORD(T)] to [storedarea]")
|
||||
storedarea.contents.Add(T)
|
||||
else if(right_click)
|
||||
var/turf/T = get_turf(object)
|
||||
storedarea = get_area(T)
|
||||
areaimage.loc = storedarea // color our area
|
||||
@@ -0,0 +1,52 @@
|
||||
/datum/buildmode_mode/basic
|
||||
key = "basic"
|
||||
|
||||
/datum/buildmode_mode/basic/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button = Construct / Upgrade</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button = Deconstruct / Delete / Downgrade</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button + ctrl = R-Window</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button + alt = Airlock</span>")
|
||||
to_chat(c, "")
|
||||
to_chat(c, "<span class='notice'>Use the button in the upper left corner to</span>")
|
||||
to_chat(c, "<span class='notice'>change the direction of built objects.</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/basic/handle_click(client/c, params, obj/object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/right_click = pa.Find("right")
|
||||
var/ctrl_click = pa.Find("ctrl")
|
||||
var/alt_click = pa.Find("alt")
|
||||
|
||||
if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
|
||||
var/turf/T = object
|
||||
if(isspaceturf(object))
|
||||
T.PlaceOnTop(/turf/open/floor/plating)
|
||||
else if(isplatingturf(object))
|
||||
T.PlaceOnTop(/turf/open/floor/plasteel)
|
||||
else if(isfloorturf(object))
|
||||
T.PlaceOnTop(/turf/closed/wall)
|
||||
else if(iswallturf(object))
|
||||
T.PlaceOnTop(/turf/closed/wall/r_wall)
|
||||
log_admin("Build Mode: [key_name(c)] built [T] at [AREACOORD(T)]")
|
||||
return
|
||||
else if(right_click)
|
||||
log_admin("Build Mode: [key_name(c)] deleted [object] at [AREACOORD(object)]")
|
||||
if(isturf(object))
|
||||
var/turf/T = object
|
||||
T.ScrapeAway()
|
||||
else if(isobj(object))
|
||||
qdel(object)
|
||||
return
|
||||
else if(istype(object,/turf) && alt_click && left_click)
|
||||
log_admin("Build Mode: [key_name(c)] built an airlock at [AREACOORD(object)]")
|
||||
new/obj/machinery/door/airlock(get_turf(object))
|
||||
else if(istype(object,/turf) && ctrl_click && left_click)
|
||||
var/obj/structure/window/reinforced/window
|
||||
if(BM.build_dir == NORTHWEST)
|
||||
window = new /obj/structure/window/reinforced/fulltile(get_turf(object))
|
||||
else
|
||||
window = new /obj/structure/window/reinforced(get_turf(object))
|
||||
window.setDir(BM.build_dir)
|
||||
log_admin("Build Mode: [key_name(c)] built a window at [AREACOORD(object)]")
|
||||
@@ -0,0 +1,38 @@
|
||||
/datum/buildmode_mode/boom
|
||||
key = "boom"
|
||||
|
||||
var/devastation = -1
|
||||
var/heavy = -1
|
||||
var/light = -1
|
||||
var/flash = -1
|
||||
var/flames = -1
|
||||
|
||||
/datum/buildmode_mode/boom/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Mouse Button on obj = Kaboom</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/boom/change_settings(client/c)
|
||||
devastation = input(c, "Range of total devastation. -1 to none", text("Input")) as num|null
|
||||
if(devastation == null)
|
||||
devastation = -1
|
||||
heavy = input(c, "Range of heavy impact. -1 to none", text("Input")) as num|null
|
||||
if(heavy == null)
|
||||
heavy = -1
|
||||
light = input(c, "Range of light impact. -1 to none", text("Input")) as num|null
|
||||
if(light == null)
|
||||
light = -1
|
||||
flash = input(c, "Range of flash. -1 to none", text("Input")) as num|null
|
||||
if(flash == null)
|
||||
flash = -1
|
||||
flames = input(c, "Range of flames. -1 to none", text("Input")) as num|null
|
||||
if(flames == null)
|
||||
flames = -1
|
||||
|
||||
/datum/buildmode_mode/boom/handle_click(client/c, params, obj/object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
|
||||
if(left_click)
|
||||
explosion(object, devastation, heavy, light, flash, FALSE, TRUE, flames)
|
||||
log_admin("Build Mode: [key_name(c)] caused an explosion(dev=[devastation], hvy=[heavy], lgt=[light], flash=[flash], flames=[flames]) at [AREACOORD(object)]")
|
||||
@@ -0,0 +1,28 @@
|
||||
/datum/buildmode_mode/copy
|
||||
key = "copy"
|
||||
var/atom/movable/stored = null
|
||||
|
||||
/datum/buildmode_mode/copy/Destroy()
|
||||
stored = null
|
||||
return ..()
|
||||
|
||||
/datum/buildmode_mode/copy/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on obj/mob = Select target to copy</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/copy/handle_click(client/c, params, obj/object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/right_click = pa.Find("right")
|
||||
|
||||
if(left_click)
|
||||
var/turf/T = get_turf(object)
|
||||
if(stored)
|
||||
DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T)
|
||||
log_admin("Build Mode: [key_name(c)] copied [stored] to [AREACOORD(object)]")
|
||||
else if(right_click)
|
||||
if(ismovableatom(object)) // No copying turfs for now.
|
||||
to_chat(c, "<span class='notice'>[object] set as template.</span>")
|
||||
stored = object
|
||||
@@ -0,0 +1,62 @@
|
||||
/datum/buildmode_mode/fill
|
||||
key = "fill"
|
||||
|
||||
use_corner_selection = TRUE
|
||||
var/objholder = null
|
||||
|
||||
/datum/buildmode_mode/fill/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on turf/obj/mob = Select corner</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button + Alt on turf/obj/mob = Delete region</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on buildmode button = Select object type</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/fill/change_settings(client/c)
|
||||
var/target_path = input(c, "Enter typepath:" ,"Typepath","/obj/structure/closet")
|
||||
objholder = text2path(target_path)
|
||||
if(!ispath(objholder))
|
||||
objholder = pick_closest_path(target_path)
|
||||
if(!objholder)
|
||||
alert("No path has been selected.")
|
||||
return
|
||||
else if(ispath(objholder, /area))
|
||||
objholder = null
|
||||
alert("Area paths are not supported for this mode, use the area edit mode instead.")
|
||||
return
|
||||
deselect_region()
|
||||
|
||||
/datum/buildmode_mode/fill/handle_click(client/c, params, obj/object)
|
||||
if(isnull(objholder))
|
||||
to_chat(c, "<span class='warning'>Select an object type first.</span>")
|
||||
deselect_region()
|
||||
return
|
||||
..()
|
||||
|
||||
/datum/buildmode_mode/fill/handle_selected_area(client/c, params)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/alt_click = pa.Find("alt")
|
||||
|
||||
if(left_click) //rectangular
|
||||
if(alt_click)
|
||||
var/list/deletion_area = block(get_turf(cornerA),get_turf(cornerB))
|
||||
for(var/beep in deletion_area)
|
||||
var/turf/T = beep
|
||||
for(var/atom/movable/AM in T)
|
||||
qdel(AM)
|
||||
// extreme haircut
|
||||
T.ScrapeAway(INFINITY, CHANGETURF_DEFER_CHANGE)
|
||||
for(var/beep in deletion_area)
|
||||
var/turf/T = beep
|
||||
T.AfterChange()
|
||||
log_admin("Build Mode: [key_name(c)] deleted turfs from [AREACOORD(cornerA)] through [AREACOORD(cornerB)]")
|
||||
// if there's an analogous proc for this on tg lmk
|
||||
// empty_region(block(get_turf(cornerA),get_turf(cornerB)))
|
||||
else
|
||||
for(var/turf/T in block(get_turf(cornerA),get_turf(cornerB)))
|
||||
if(ispath(objholder,/turf))
|
||||
T.PlaceOnTop(objholder)
|
||||
else
|
||||
var/obj/A = new objholder(T)
|
||||
A.setDir(BM.build_dir)
|
||||
log_admin("Build Mode: [key_name(c)] with path [objholder], filled the region from [AREACOORD(cornerA)] through [AREACOORD(cornerB)]")
|
||||
@@ -0,0 +1,48 @@
|
||||
/datum/buildmode_mode/mapgen
|
||||
key = "mapgen"
|
||||
|
||||
use_corner_selection = TRUE
|
||||
var/generator_path
|
||||
|
||||
/datum/buildmode_mode/mapgen/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on turf/obj/mob = Select corner</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on buildmode button = Select generator</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/mapgen/change_settings(client/c)
|
||||
var/list/gen_paths = subtypesof(/datum/mapGenerator)
|
||||
var/list/options = list()
|
||||
for(var/path in gen_paths)
|
||||
var/datum/mapGenerator/MP = path
|
||||
options[initial(MP.buildmode_name)] = path
|
||||
var/type = input(c,"Select Generator Type","Type") as null|anything in options
|
||||
if(!type)
|
||||
return
|
||||
|
||||
generator_path = options[type]
|
||||
deselect_region()
|
||||
|
||||
/datum/buildmode_mode/mapgen/handle_click(client/c, params, obj/object)
|
||||
if(isnull(generator_path))
|
||||
to_chat(c, "<span class='warning'>Select generator type first.</span>")
|
||||
deselect_region()
|
||||
return
|
||||
..()
|
||||
|
||||
/datum/buildmode_mode/mapgen/handle_selected_area(client/c, params)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
if(left_click)
|
||||
var/datum/mapGenerator/G = new generator_path
|
||||
if(istype(G, /datum/mapGenerator/repair/reload_station_map))
|
||||
if(GLOB.reloading_map)
|
||||
to_chat(c, "<span class='boldwarning'>You are already reloading an area! Please wait for it to fully finish loading before trying to load another!</span>")
|
||||
deselect_region()
|
||||
return
|
||||
G.defineRegion(cornerA, cornerB, 1)
|
||||
highlight_region(G.map)
|
||||
var/confirm = alert("Are you sure you want run the map generator?", "Run generator", "Yes", "No")
|
||||
if(confirm == "Yes")
|
||||
G.generate()
|
||||
log_admin("Build Mode: [key_name(c)] ran the map generator '[G.buildmode_name]' in the region from [AREACOORD(cornerA)] to [AREACOORD(cornerB)]")
|
||||
@@ -0,0 +1,29 @@
|
||||
/datum/buildmode_mode/throwing
|
||||
key = "throw"
|
||||
|
||||
var/atom/movable/throw_atom = null
|
||||
|
||||
/datum/buildmode_mode/throwing/Destroy()
|
||||
throw_atom = null
|
||||
return ..()
|
||||
|
||||
/datum/buildmode_mode/throwing/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on turf/obj/mob = Select</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on turf/obj/mob = Throw</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/throwing/handle_click(client/c, params, obj/object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/right_click = pa.Find("right")
|
||||
|
||||
if(left_click)
|
||||
if(isturf(object))
|
||||
return
|
||||
throw_atom = object
|
||||
to_chat(c, "Selected object '[throw_atom]'")
|
||||
if(right_click)
|
||||
if(throw_atom)
|
||||
throw_atom.throw_at(object, 10, 1, c.mob)
|
||||
log_admin("Build Mode: [key_name(c)] threw [throw_atom] at [object] ([AREACOORD(object)])")
|
||||
@@ -0,0 +1,62 @@
|
||||
/datum/buildmode_mode/varedit
|
||||
key = "edit"
|
||||
// Varedit mode
|
||||
var/varholder = null
|
||||
var/valueholder = null
|
||||
|
||||
/datum/buildmode_mode/varedit/Destroy()
|
||||
varholder = null
|
||||
valueholder = null
|
||||
return ..()
|
||||
|
||||
/datum/buildmode_mode/varedit/show_help(client/c)
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on buildmode button = Select var(type) & value</span>")
|
||||
to_chat(c, "<span class='notice'>Left Mouse Button on turf/obj/mob = Set var(type) & value</span>")
|
||||
to_chat(c, "<span class='notice'>Right Mouse Button on turf/obj/mob = Reset var's value</span>")
|
||||
to_chat(c, "<span class='notice'>***********************************************************</span>")
|
||||
|
||||
/datum/buildmode_mode/varedit/Reset()
|
||||
. = ..()
|
||||
varholder = null
|
||||
valueholder = null
|
||||
|
||||
/datum/buildmode_mode/varedit/change_settings(client/c)
|
||||
varholder = input(c, "Enter variable name:" ,"Name", "name")
|
||||
|
||||
if(!vv_varname_lockcheck(varholder))
|
||||
return
|
||||
|
||||
var/temp_value = c.vv_get_value()
|
||||
if(isnull(temp_value["class"]))
|
||||
Reset()
|
||||
to_chat(c, "<span class='notice'>Variable unset.</span>")
|
||||
return
|
||||
valueholder = temp_value["value"]
|
||||
|
||||
/datum/buildmode_mode/varedit/handle_click(client/c, params, obj/object)
|
||||
var/list/pa = params2list(params)
|
||||
var/left_click = pa.Find("left")
|
||||
var/right_click = pa.Find("right")
|
||||
|
||||
if(isnull(varholder))
|
||||
to_chat(c, "<span class='warning'>Choose a variable to modify first.</span>")
|
||||
return
|
||||
if(left_click)
|
||||
if(object.vars.Find(varholder))
|
||||
if(object.vv_edit_var(varholder, valueholder) == FALSE)
|
||||
to_chat(c, "<span class='warning'>Your edit was rejected by the object.</span>")
|
||||
return
|
||||
log_admin("Build Mode: [key_name(c)] modified [object.name]'s [varholder] to [valueholder]")
|
||||
else
|
||||
to_chat(c, "<span class='warning'>[initial(object.name)] does not have a var called '[varholder]'</span>")
|
||||
if(right_click)
|
||||
if(object.vars.Find(varholder))
|
||||
var/reset_value = initial(object.vars[varholder])
|
||||
if(object.vv_edit_var(varholder, reset_value) == FALSE)
|
||||
to_chat(c, "<span class='warning'>Your edit was rejected by the object.</span>")
|
||||
return
|
||||
log_admin("Build Mode: [key_name(c)] modified [object.name]'s [varholder] to [reset_value]")
|
||||
else
|
||||
to_chat(c, "<span class='warning'>[initial(object.name)] does not have a var called '[varholder]'</span>")
|
||||
|
||||
Reference in New Issue
Block a user