mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-02 21:11:57 +00:00
* Refactors sheet crafting to better support directional construction (#74572)
## About The Pull Request
0426f7ddba/code/game/objects/items/stacks/stack.dm (L449)
Ok, but can we not?
This PR refactors sheet crafting to generalize all the cases that were
previously locked behind grille/window type checks and such. In their
stead there are bitflags that can be set to achieve certain behaviors.
All the behavior from before should be preserved, but now it can be
extended to other items. E.g. if you want a railing that can be crafted
underneath directional windows, or an item that behaves like a grille
does--it's just a matter of setting the right obj_flags for it now.
This makes it very simple and painless to add new recipes that use
directional crafting! It's all modular now.
<details><summary>Details</summary>
---
### What I've done:
-Eliminated all the type checks, instead it will now be handled by
object flags and recipe vars, making for a much more configurable
system.
-Added two new obj_flags: `BLOCKS_CONSTRUCTION_DIR` and
`IGNORE_DENSITY`.
-Additionally, I renamed the existing flag `NO_BUILD` to
`BLOCKS_CONSTRUCTION`.
-Changes the proc `valid_window_location` to `valid_build_direction`,
and makes it work for things other than windows.
-Removed a deprecated `window_checks` var from the stack_recipe datum.
-Added three more vars to the stack_recipe datum: `check_direction` and
`check_density`, `is_fulltile`
-Decoupled `on_solid_ground` from the object density check. Now you can
set those separately, allowing you to make recipes that forbid/allow
building things over other things while in space.
---
### What the new flags do:
`BLOCKS_CONSTRUCTION` works as before---prevents objects from being
built on the object. I felt that the previous name was not descriptive
enough, you should know exactly what it does just from looking at the
name.
_example: dna scanner_
`BLOCKS_CONSTRUCTION_DIR` -- setting this on an object will prevent
objects from being built on it when their directions are the same.
_example: directional windows, windoors, railings_
`IGNORE_DENSITY` -- setting this on an object will cause its density to
be ignored when performing the construction density check. This could
have other potential uses as well in the future.
_example: grilles, directional windows, tables_
These three flags cover all the bases for the types of items that are
currently craftable, so there is no more need for any type checking or
weird snowflake window checks. Simply set the appropriate flag and it'll
work as you would expect.
---
### What the recipe vars do:
`check_direction` tells the recipe to check if there's something in that
direction with the `BLOCKS_CONSTRUCTION_DIR` flag set.
`check_density` tells the recipe to run the density check when set. This
is true by default. There are very few items in the game that currently
have this set to false--namely grilles. Setting this to false will make
it so that the object can be constructed regardless of what is in that
tile (unless `one_per_turf` is also set, which will make it so that you
can't craft the same thing twice in the same turf).
`is_fulltile` is used for fulltile windows, but it doesn't necessarily
have to be--you can give this to any recipe and it will adopt the same
properties as that of the fulltile window. Basically they have a special
case where they shouldn't be able to be built over directional
constructions, where normally things would be able to be. Setting this
makes check_direction true as well.
---
### In summary:
Sheet crafting still works just as it did before. But the backend of it
has gotten a glow up and will be able to more easily support new
behaviors.
</details>
## Why It's Good For The Game
This makes the crafting system much more flexible to add recipes to, and
will prevent bad code practices of stacking more conditionals down the
line whenever someone wants to add an item that behaves like grilles or
directional windows in how they are constructed.
It had to be done. Those window checks were a mess.
## Changelog
🆑
qol: added fifty stack versions of remaining glass sheet stacks for ease
of debugging
refactor: refactored sheet crafting to better support directional
constructions that aren't windows
/🆑
---------
Co-authored-by: san7890 <the@ san7890.com>
* Refactors sheet crafting to better support directional construction
* fex
* https://github.com/Skyrat-SS13/Skyrat-tg/pull/20636
---------
Co-authored-by: Bloop <vinylspiders@gmail.com>
Co-authored-by: san7890 <the@ san7890.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
351 lines
11 KiB
Plaintext
351 lines
11 KiB
Plaintext
/* Windoor (window door) assembly -Nodrak
|
|
* Step 1: Create a windoor out of rglass
|
|
* Step 2: Add r-glass to the assembly to make a secure windoor (Optional)
|
|
* Step 3: Rotate or Flip the assembly to face and open the way you want
|
|
* Step 4: Wrench the assembly in place
|
|
* Step 5: Add cables to the assembly
|
|
* Step 6: Set access for the door.
|
|
* Step 7: Screwdriver the door to complete
|
|
*/
|
|
|
|
|
|
/obj/structure/windoor_assembly
|
|
icon = 'icons/obj/doors/windoor.dmi'
|
|
|
|
name = "windoor Assembly"
|
|
icon_state = "l_windoor_assembly01"
|
|
desc = "A small glass and wire assembly for windoors."
|
|
anchored = FALSE
|
|
density = FALSE
|
|
dir = NORTH
|
|
obj_flags = CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR
|
|
set_dir_on_move = FALSE
|
|
|
|
var/obj/item/electronics/airlock/electronics = null
|
|
var/created_name = null
|
|
|
|
//Vars to help with the icon's name
|
|
var/facing = "l" //Does the windoor open to the left or right?
|
|
var/secure = FALSE //Whether or not this creates a secure windoor
|
|
var/state = "01" //How far the door assembly has progressed
|
|
can_atmos_pass = ATMOS_PASS_PROC
|
|
|
|
/obj/structure/windoor_assembly/Initialize(mapload, loc, set_dir)
|
|
. = ..()
|
|
if(set_dir)
|
|
setDir(set_dir)
|
|
air_update_turf(TRUE, TRUE)
|
|
|
|
var/static/list/loc_connections = list(
|
|
COMSIG_ATOM_EXIT = PROC_REF(on_exit),
|
|
)
|
|
|
|
AddElement(/datum/element/connect_loc, loc_connections)
|
|
AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
|
|
|
|
/obj/structure/windoor_assembly/Destroy()
|
|
set_density(FALSE)
|
|
air_update_turf(TRUE, FALSE)
|
|
return ..()
|
|
|
|
/obj/structure/windoor_assembly/Move()
|
|
var/turf/T = loc
|
|
. = ..()
|
|
move_update_air(T)
|
|
|
|
/obj/structure/windoor_assembly/update_icon_state()
|
|
icon_state = "[facing]_[secure ? "secure_" : ""]windoor_assembly[state]"
|
|
return ..()
|
|
|
|
/obj/structure/windoor_assembly/CanAllowThrough(atom/movable/mover, border_dir)
|
|
. = ..()
|
|
|
|
if(border_dir == dir)
|
|
return
|
|
|
|
if(istype(mover, /obj/structure/window))
|
|
var/obj/structure/window/moved_window = mover
|
|
return valid_build_direction(loc, moved_window.dir, is_fulltile = moved_window.fulltile)
|
|
|
|
if(istype(mover, /obj/structure/windoor_assembly) || istype(mover, /obj/machinery/door/window))
|
|
return valid_build_direction(loc, mover.dir, is_fulltile = FALSE)
|
|
|
|
/obj/structure/windoor_assembly/can_atmos_pass(turf/T, vertical = FALSE)
|
|
if(get_dir(loc, T) == dir)
|
|
return !density
|
|
else
|
|
return TRUE
|
|
|
|
/obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, direction)
|
|
SIGNAL_HANDLER
|
|
|
|
if(leaving.movement_type & PHASING)
|
|
return
|
|
|
|
if(leaving == src)
|
|
return // Let's not block ourselves.
|
|
|
|
if (leaving.pass_flags & pass_flags_self)
|
|
return
|
|
|
|
if (direction == dir && density)
|
|
leaving.Bump(src)
|
|
return COMPONENT_ATOM_BLOCK_EXIT
|
|
|
|
/obj/structure/windoor_assembly/attackby(obj/item/W, mob/user, params)
|
|
//I really should have spread this out across more states but thin little windoors are hard to sprite.
|
|
add_fingerprint(user)
|
|
switch(state)
|
|
if("01")
|
|
if(W.tool_behaviour == TOOL_WELDER && !anchored)
|
|
if(!W.tool_start_check(user, amount=0))
|
|
return
|
|
|
|
user.visible_message(span_notice("[user] disassembles the windoor assembly."),
|
|
span_notice("You start to disassemble the windoor assembly..."))
|
|
|
|
if(W.use_tool(src, user, 40, volume=50))
|
|
to_chat(user, span_notice("You disassemble the windoor assembly."))
|
|
var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5)
|
|
if (!QDELETED(RG))
|
|
RG.add_fingerprint(user)
|
|
if(secure)
|
|
var/obj/item/stack/rods/R = new (get_turf(src), 4)
|
|
if (!QDELETED(R))
|
|
R.add_fingerprint(user)
|
|
qdel(src)
|
|
return
|
|
|
|
//Wrenching an unsecure assembly anchors it in place. Step 4 complete
|
|
if(W.tool_behaviour == TOOL_WRENCH && !anchored)
|
|
for(var/obj/machinery/door/window/WD in loc)
|
|
if(WD.dir == dir)
|
|
to_chat(user, span_warning("There is already a windoor in that location!"))
|
|
return
|
|
user.visible_message(span_notice("[user] secures the windoor assembly to the floor."),
|
|
span_notice("You start to secure the windoor assembly to the floor..."))
|
|
|
|
if(W.use_tool(src, user, 40, volume=100))
|
|
if(anchored)
|
|
return
|
|
for(var/obj/machinery/door/window/WD in loc)
|
|
if(WD.dir == dir)
|
|
to_chat(user, span_warning("There is already a windoor in that location!"))
|
|
return
|
|
to_chat(user, span_notice("You secure the windoor assembly."))
|
|
set_anchored(TRUE)
|
|
if(secure)
|
|
name = "secure anchored windoor assembly"
|
|
else
|
|
name = "anchored windoor assembly"
|
|
|
|
//Unwrenching an unsecure assembly un-anchors it. Step 4 undone
|
|
else if(W.tool_behaviour == TOOL_WRENCH && anchored)
|
|
user.visible_message(span_notice("[user] unsecures the windoor assembly to the floor."),
|
|
span_notice("You start to unsecure the windoor assembly to the floor..."))
|
|
|
|
if(W.use_tool(src, user, 40, volume=100))
|
|
if(!anchored)
|
|
return
|
|
to_chat(user, span_notice("You unsecure the windoor assembly."))
|
|
set_anchored(FALSE)
|
|
if(secure)
|
|
name = "secure windoor assembly"
|
|
else
|
|
name = "windoor assembly"
|
|
|
|
//Adding plasteel makes the assembly a secure windoor assembly. Step 2 (optional) complete.
|
|
else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure)
|
|
var/obj/item/stack/sheet/plasteel/P = W
|
|
if(P.get_amount() < 2)
|
|
to_chat(user, span_warning("You need more plasteel to do this!"))
|
|
return
|
|
to_chat(user, span_notice("You start to reinforce the windoor with plasteel..."))
|
|
|
|
if(do_after(user,40, target = src))
|
|
if(!src || secure || P.get_amount() < 2)
|
|
return
|
|
|
|
P.use(2)
|
|
to_chat(user, span_notice("You reinforce the windoor."))
|
|
secure = TRUE
|
|
if(anchored)
|
|
name = "secure anchored windoor assembly"
|
|
else
|
|
name = "secure windoor assembly"
|
|
|
|
//Adding cable to the assembly. Step 5 complete.
|
|
else if(istype(W, /obj/item/stack/cable_coil) && anchored)
|
|
user.visible_message(span_notice("[user] wires the windoor assembly."), span_notice("You start to wire the windoor assembly..."))
|
|
|
|
if(do_after(user, 40, target = src))
|
|
if(!src || !anchored || src.state != "01")
|
|
return
|
|
var/obj/item/stack/cable_coil/CC = W
|
|
if(!CC.use(1))
|
|
to_chat(user, span_warning("You need more cable to do this!"))
|
|
return
|
|
to_chat(user, span_notice("You wire the windoor."))
|
|
state = "02"
|
|
if(secure)
|
|
name = "secure wired windoor assembly"
|
|
else
|
|
name = "wired windoor assembly"
|
|
else
|
|
return ..()
|
|
|
|
if("02")
|
|
|
|
//Removing wire from the assembly. Step 5 undone.
|
|
if(W.tool_behaviour == TOOL_WIRECUTTER)
|
|
user.visible_message(span_notice("[user] cuts the wires from the airlock assembly."), span_notice("You start to cut the wires from airlock assembly..."))
|
|
|
|
if(W.use_tool(src, user, 40, volume=100))
|
|
if(state != "02")
|
|
return
|
|
|
|
to_chat(user, span_notice("You cut the windoor wires."))
|
|
new/obj/item/stack/cable_coil(get_turf(user), 1)
|
|
state = "01"
|
|
if(secure)
|
|
name = "secure anchored windoor assembly"
|
|
else
|
|
name = "anchored windoor assembly"
|
|
|
|
//Adding airlock electronics for access. Step 6 complete.
|
|
else if(istype(W, /obj/item/electronics/airlock))
|
|
if(!user.transferItemToLoc(W, src))
|
|
return
|
|
W.play_tool_sound(src, 100)
|
|
user.visible_message(span_notice("[user] installs the electronics into the airlock assembly."),
|
|
span_notice("You start to install electronics into the airlock assembly..."))
|
|
|
|
if(do_after(user, 40, target = src))
|
|
if(!src || electronics)
|
|
W.forceMove(drop_location())
|
|
return
|
|
to_chat(user, span_notice("You install the airlock electronics."))
|
|
name = "near finished windoor assembly"
|
|
electronics = W
|
|
else
|
|
W.forceMove(drop_location())
|
|
|
|
//Screwdriver to remove airlock electronics. Step 6 undone.
|
|
else if(W.tool_behaviour == TOOL_SCREWDRIVER)
|
|
if(!electronics)
|
|
return
|
|
|
|
user.visible_message(span_notice("[user] removes the electronics from the airlock assembly."),
|
|
span_notice("You start to uninstall electronics from the airlock assembly..."))
|
|
|
|
if(W.use_tool(src, user, 40, volume=100) && electronics)
|
|
to_chat(user, span_notice("You remove the airlock electronics."))
|
|
name = "wired windoor assembly"
|
|
var/obj/item/electronics/airlock/ae
|
|
ae = electronics
|
|
electronics = null
|
|
ae.forceMove(drop_location())
|
|
|
|
else if(istype(W, /obj/item/pen))
|
|
var/t = tgui_input_text(user, "Enter the name for the door", "Windoor Renaming", created_name, MAX_NAME_LEN)
|
|
if(!t)
|
|
return
|
|
if(!in_range(src, usr) && loc != usr)
|
|
return
|
|
created_name = t
|
|
return
|
|
|
|
|
|
|
|
//Crowbar to complete the assembly, Step 7 complete.
|
|
else if(W.tool_behaviour == TOOL_CROWBAR)
|
|
if(!electronics)
|
|
to_chat(usr, span_warning("The assembly is missing electronics!"))
|
|
return
|
|
user << browse(null, "window=windoor_access")
|
|
user.visible_message(span_notice("[user] pries the windoor into the frame."),
|
|
span_notice("You start prying the windoor into the frame..."))
|
|
|
|
if(W.use_tool(src, user, 40, volume=100) && electronics)
|
|
|
|
set_density(TRUE) //Shouldn't matter but just incase
|
|
to_chat(user, span_notice("You finish the windoor."))
|
|
|
|
if(secure)
|
|
var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(loc)
|
|
if(facing == "l")
|
|
windoor.icon_state = "leftsecureopen"
|
|
windoor.base_state = "leftsecure"
|
|
else
|
|
windoor.icon_state = "rightsecureopen"
|
|
windoor.base_state = "rightsecure"
|
|
windoor.setDir(dir)
|
|
windoor.set_density(FALSE)
|
|
|
|
if(electronics.one_access)
|
|
windoor.req_one_access = electronics.accesses
|
|
else
|
|
windoor.req_access = electronics.accesses
|
|
windoor.electronics = electronics
|
|
electronics.forceMove(windoor)
|
|
if(created_name)
|
|
windoor.name = created_name
|
|
qdel(src)
|
|
windoor.close()
|
|
|
|
|
|
else
|
|
var/obj/machinery/door/window/windoor = new /obj/machinery/door/window(loc)
|
|
if(facing == "l")
|
|
windoor.icon_state = "leftopen"
|
|
windoor.base_state = "left"
|
|
else
|
|
windoor.icon_state = "rightopen"
|
|
windoor.base_state = "right"
|
|
windoor.setDir(dir)
|
|
windoor.set_density(FALSE)
|
|
|
|
if(electronics.one_access)
|
|
windoor.req_one_access = electronics.accesses
|
|
else
|
|
windoor.req_access = electronics.accesses
|
|
windoor.electronics = electronics
|
|
electronics.forceMove(windoor)
|
|
if(created_name)
|
|
windoor.name = created_name
|
|
qdel(src)
|
|
windoor.close()
|
|
|
|
|
|
else
|
|
return ..()
|
|
|
|
//Update to reflect changes(if applicable)
|
|
update_appearance()
|
|
|
|
/obj/structure/windoor_assembly/AltClick(mob/user)
|
|
return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation
|
|
|
|
//Flips the windoor assembly, determines whather the door opens to the left or the right
|
|
/obj/structure/windoor_assembly/verb/flip()
|
|
set name = "Flip Windoor Assembly"
|
|
set category = "Object"
|
|
set src in oview(1)
|
|
if(usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))
|
|
return
|
|
|
|
if(isliving(usr))
|
|
var/mob/living/L = usr
|
|
if(!(L.mobility_flags & MOBILITY_USE))
|
|
return
|
|
|
|
if(facing == "l")
|
|
to_chat(usr, span_notice("The windoor will now slide to the right."))
|
|
facing = "r"
|
|
else
|
|
facing = "l"
|
|
to_chat(usr, span_notice("The windoor will now slide to the left."))
|
|
|
|
update_appearance()
|
|
return
|