mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
[FEATURE] Decal painter (#27036)
* Add_Decal_Painter * Seperate TGUI file * Decal painter DmIcon * Fix some merge errors * I don't know why this merge is so incredibly fucked * Update TGUI bundle * I swear to god * Fixes DmIcon * TGUI bundle build * Remove implicit var * Final cleanup * Add decal_painter sprite * Update code/game/objects/items/devices/painter/decal_painter.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Chap <erwin@lombok.demon.nl> * Add helper proc for deleting all components of a type from a datum * Added comments to cycle_style * Elementized decal fixes * Use the new decal system * TGUI bundle --------- Signed-off-by: Chap <erwin@lombok.demon.nl> Co-authored-by: Adrer <adrermail@gmail.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
@@ -3,11 +3,11 @@
|
||||
icon_state = "warningline"
|
||||
layer = TURF_DECAL_LAYER
|
||||
|
||||
/obj/effect/turf_decal/Initialize(mapload)
|
||||
/obj/effect/turf_decal/Initialize(mapload, _dir)
|
||||
..()
|
||||
. = INITIALIZE_HINT_QDEL
|
||||
var/turf/T = loc
|
||||
if(!istype(T)) //you know this will happen somehow
|
||||
CRASH("Turf decal initialized in an object/nullspace")
|
||||
|
||||
T.AddElement(/datum/element/decal, icon, icon_state, dir, layer, alpha, color, FALSE, null)
|
||||
T.AddElement(/datum/element/decal, icon, icon_state, _dir || dir, layer, alpha, color, FALSE, null)
|
||||
|
||||
@@ -199,9 +199,6 @@
|
||||
/obj/effect/turf_decal/siding/box
|
||||
icon_state = "siding_box"
|
||||
|
||||
/obj/effect/turf_decal/raven_ship_sign
|
||||
icon_state = "RAVEN2"
|
||||
|
||||
/obj/effect/turf_decal/raven/one
|
||||
icon_state = "RAVEN1"
|
||||
|
||||
|
||||
@@ -2,6 +2,11 @@
|
||||
name = "sandy floor"
|
||||
icon_state = "sandyfloor"
|
||||
|
||||
/obj/effect/turf_decal/weather/snow
|
||||
name = "snowy floor"
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
icon_state = "snow"
|
||||
|
||||
/obj/effect/turf_decal/weather/snow/corner
|
||||
name = "snow corner piece"
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
/datum/painter/decal
|
||||
module_name = "decal painter"
|
||||
module_state = "decal_painter"
|
||||
/// icon that contains the decal sprites
|
||||
var/decal_icon = 'icons/turf/decals.dmi'
|
||||
/// icon_state of the selected decal
|
||||
var/decal_state = "warn_box"
|
||||
var/decal_dir = SOUTH
|
||||
/// When removal_mode is TRUE the decal painter will remove decals instead
|
||||
var/removal_mode = FALSE
|
||||
var/max_decals = 3
|
||||
var/static/list/decal_blacklist = typecacheof(
|
||||
list(
|
||||
/obj/effect/turf_decal/raven,
|
||||
/obj/effect/turf_decal/weather,
|
||||
/obj/effect/turf_decal/stripes/asteroid,
|
||||
/obj/effect/turf_decal/tile,
|
||||
/obj/effect/turf_decal/sand
|
||||
)
|
||||
)
|
||||
/// Assoc list with icon_state of the decal as the key, and decal path as the value.
|
||||
var/static/list/lookup_cache_decals = list()
|
||||
|
||||
/datum/painter/decal/New(obj/item/painter/parent_painter)
|
||||
. = ..()
|
||||
if(!length(lookup_cache_decals))
|
||||
for(var/D in subtypesof(/obj/effect/turf_decal))
|
||||
var/obj/effect/turf_decal/decal = D
|
||||
if(decal in decal_blacklist)
|
||||
continue
|
||||
lookup_cache_decals[decal::icon_state] = decal
|
||||
|
||||
/datum/painter/decal/paint_atom(atom/target, mob/user)
|
||||
if(!istype(target, /turf/simulated/floor))
|
||||
to_chat(user, "<span class='warning'>[holder] can only be used on flooring.</span>")
|
||||
return FALSE
|
||||
var/turf/target_turf = get_turf(target)
|
||||
var/list/datum/element/decal/decals = target_turf.get_decals()
|
||||
if(removal_mode)
|
||||
remove_decals(target)
|
||||
return TRUE
|
||||
if(length(decals) >= max_decals)
|
||||
to_chat(user, "<span class='warning'>You can't fit more decals on [target].</span>")
|
||||
return FALSE
|
||||
var/typepath = lookup_cache_decals[decal_state]
|
||||
new typepath(target_turf, decal_dir)
|
||||
return TRUE
|
||||
|
||||
/datum/painter/decal/pick_color(mob/user)
|
||||
if(!user)
|
||||
return
|
||||
ui_interact(user)
|
||||
|
||||
/datum/painter/decal/ui_state(mob/user)
|
||||
return GLOB.inventory_state
|
||||
|
||||
/datum/painter/decal/ui_interact(mob/user, datum/tgui/ui = null)
|
||||
ui = SStgui.try_update_ui(user, src, ui)
|
||||
if(!ui)
|
||||
ui = new(user, src, "DecalPainter", module_name)
|
||||
ui.set_autoupdate(FALSE)
|
||||
ui.open()
|
||||
|
||||
/datum/painter/decal/ui_data(mob/user)
|
||||
var/list/data = list()
|
||||
data["selectedStyle"] = decal_state
|
||||
data["selectedDir"] = decal_dir
|
||||
data["removalMode"] = removal_mode
|
||||
|
||||
return data
|
||||
|
||||
|
||||
/datum/painter/decal/ui_static_data(mob/user)
|
||||
var/list/data = list()
|
||||
data["icon"] = decal_icon
|
||||
data["availableStyles"] = list()
|
||||
for(var/decal in lookup_cache_decals)
|
||||
data["availableStyles"] += decal
|
||||
|
||||
return data
|
||||
|
||||
/datum/painter/decal/ui_act(action, params)
|
||||
if(..())
|
||||
return
|
||||
|
||||
if(action == "select_style")
|
||||
var/new_style = params["style"]
|
||||
if(lookup_cache_decals.Find(new_style) != 0)
|
||||
decal_state = new_style
|
||||
removal_mode = FALSE
|
||||
|
||||
if(action == "cycle_style") // Cycles through the available styles one at a time
|
||||
var/index = lookup_cache_decals.Find(decal_state) // Find the index of the currently selected style in the lookup cache
|
||||
index += params["offset"] // Offset is either -1 or 1. Add this to the index to get the style before or after the current style.
|
||||
if(index < 1) // If the index is below 1, loop back to the last item in the cache.
|
||||
index = length(lookup_cache_decals)
|
||||
if(index > length(lookup_cache_decals)) // If the index is above the length of the cache, loop back to the first item in the cache.
|
||||
index = 1
|
||||
decal_state = lookup_cache_decals[index] // Then set our state to the index
|
||||
removal_mode = FALSE
|
||||
|
||||
if(action == "select_direction")
|
||||
var/dir = params["direction"]
|
||||
removal_mode = FALSE
|
||||
if(dir != 0)
|
||||
decal_dir = dir
|
||||
|
||||
if(action == "removal_mode")
|
||||
removal_mode = !removal_mode
|
||||
return TRUE
|
||||
|
||||
/datum/painter/decal/proc/remove_decals(atom/target)
|
||||
var/turf/target_turf = get_turf(target)
|
||||
var/list/datum/element/decal/decals = target_turf.get_decals()
|
||||
for(var/datum/element/decal/dcl in decals)
|
||||
dcl.Detach(target)
|
||||
target_turf.RemoveElement(/datum/element/decal)
|
||||
@@ -12,14 +12,16 @@
|
||||
"Floor Painter" = /datum/painter/floor,
|
||||
"Pipe Painter" = /datum/painter/pipe,
|
||||
"Window Painter" = /datum/painter/pipe/window,
|
||||
"Airlock Painter" = /datum/painter/airlock)
|
||||
"Airlock Painter" = /datum/painter/airlock,
|
||||
"Decal Painter" = /datum/painter/decal)
|
||||
|
||||
/// Associative list of painter types, with the value being the icon. (For use in the radial menu)
|
||||
var/static/list/painter_icon_list = list(
|
||||
"Floor Painter" = image(icon = 'icons/obj/painting.dmi', icon_state = "floor_painter"),
|
||||
"Pipe Painter" = image(icon = 'icons/obj/painting.dmi', icon_state = "pipe_painter"),
|
||||
"Window Painter" = image(icon = 'icons/obj/painting.dmi', icon_state = "window_painter"),
|
||||
"Airlock Painter" = image(icon = 'icons/obj/painting.dmi', icon_state = "airlock_painter"))
|
||||
"Airlock Painter" = image(icon = 'icons/obj/painting.dmi', icon_state = "airlock_painter"),
|
||||
"Decal Painter" = image(icon = 'icons/obj/painting.dmi', icon_state = "decal_painter"))
|
||||
|
||||
/// The [/datum/painter] which is currently active.
|
||||
var/datum/painter/selected_module = null
|
||||
|
||||
Reference in New Issue
Block a user