cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 17:43:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port Atlas's implementation of -tg-'s canvas art.

Browse Source
This commit is contained in:
Tigercat2000
2015-05-29 12:19:27 -07:00
parent ab3267f897
commit cced767094
8 changed files with 223 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/icons.dm
+24 -1
View File
@@ -699,7 +699,7 @@ proc // Creates a single icon from a given /atom or /image. Only the first argu
while(TRUE)
if(curIndex<=process.len)
current = process[curIndex]
if(!current)
if(!current)
curIndex++ //Skip this bad layer item
continue
currentLayer = current:layer
@@ -857,3 +857,26 @@ proc/sort_atoms_by_layer(var/list/atoms)
result.Swap(i, gap + i)
swapped = 1
return result
//Interface for using DrawBox() to draw 1 pixel on a coordinate.
//Returns the same icon specifed in the argument, but with the pixel drawn
/proc/DrawPixel(var/icon/I,var/colour,var/drawX,var/drawY)
if(!I)
return 0
var/Iwidth = I.Width()
var/Iheight = I.Height()
if(drawX > Iwidth || drawX <= 0)
return 0
if(drawY > Iheight || drawY <= 0)
return 0
I.DrawBox(colour,drawX, drawY)
return I
//Interface for easy drawing of one pixel on an atom.
/atom/proc/DrawPixelOn(var/colour, var/drawX, var/drawY)
var/icon/I = new(icon)
var/icon/J = DrawPixel(I, colour, drawX, drawY)
if(J) //Only set the icon if it succeeded, the icon without the pixel is 1000x better than a black square.
icon = J
return J
return 0
code/game/objects/items/stacks/sheets/sheet_types.dm
+1
View File
@@ -155,6 +155,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \
new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \
)
/obj/item/stack/sheet/wood
code/game/objects/structures/artstuff.dm
+151
View File
@@ -0,0 +1,151 @@
/////////////////
// NEW DEFINES //
/////////////////
/client
var/viewingCanvas = 0 //If this is 1, as soon as client /TRIES/ to move the view resets.
///////////
// EASEL //
///////////
/obj/structure/easel
name = "easel"
desc = "only for the finest of art!"
icon = 'icons/obj/artstuff.dmi'
icon_state = "easel"
density = 1
var/obj/item/weapon/canvas/painting = null
//Adding canvases
/obj/structure/easel/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/canvas))
var/obj/item/weapon/canvas/C = I
user.unEquip(C)
painting = C
C.loc = get_turf(src)
C.layer = layer+0.1
user.visible_message("<span class='notice'>[user] puts \the [C] on \the [src].</span>","<span class='notice'>You place \the [C] on \the [src].</span>")
return
..()
//Stick to the easel like glue
/obj/structure/easel/Move()
var/turf/T = get_turf(src)
..()
if(painting && painting.loc == T) //Only move if it's near us.
painting.loc = get_turf(src)
else
painting = null
//////////////
// CANVASES //
//////////////
#define AMT_OF_CANVASES 4 //Keep this up to date or shit will break.
//To safe memory on making /icons we cache the blanks..
var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
/obj/item/weapon/canvas
name = "11px by 11px canvas"
desc = "Draw out your soul on this canvas! Only crayons can draw on it. Examine it to focus on the canvas."
icon = 'icons/obj/artstuff.dmi'
icon_state = "11x11"
var/whichGlobalBackup = 1 //List index
/obj/item/weapon/canvas/nineteenXnineteen
name = "19px by 19px canvas"
icon_state = "19x19"
whichGlobalBackup = 2
/obj/item/weapon/canvas/twentythreeXnineteen
name = "23px by 19px canvas"
icon_state = "23x19"
whichGlobalBackup = 3
/obj/item/weapon/canvas/twentythreeXtwentythree
name = "23px by 23px canvas"
icon_state = "23x23"
whichGlobalBackup = 4
//Find the right size blank canvas
/obj/item/weapon/canvas/proc/getGlobalBackup()
. = null
if(globalBlankCanvases[whichGlobalBackup])
. = globalBlankCanvases[whichGlobalBackup]
else
var/icon/I = icon(initial(icon),initial(icon_state))
globalBlankCanvases[whichGlobalBackup] = I
. = I
//One pixel increments
/obj/item/weapon/canvas/attackby(var/obj/item/I, var/mob/user, params)
//Click info
var/list/click_params = params2list(params)
var/pixX = text2num(click_params["icon-x"])
var/pixY = text2num(click_params["icon-y"])
//Should always be true, otherwise you didn't click the object, but let's check because SS13~
if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
return
var/icon/masterpiece = icon(icon,icon_state)
//Cleaning one pixel with a soap or rag
if(istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag))
//Pixel info created only when needed
var/thePix = masterpiece.GetPixel(pixX,pixY)
var/icon/Ico = getGlobalBackup()
if(!Ico)
qdel(masterpiece)
return
var/theOriginalPix = Ico.GetPixel(pixX,pixY)
if(thePix != theOriginalPix) //colour changed
DrawPixelOn(theOriginalPix,pixX,pixY)
qdel(masterpiece)
return
//Drawing one pixel with a crayon
if(istype(I, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = I
if(masterpiece.GetPixel(pixX, pixY)) // if the located pixel isn't blank (null))
DrawPixelOn(C.colour, pixX, pixY)
return
..()
//Clean the whole canvas
/obj/item/weapon/canvas/attack_self(var/mob/user)
if(!user)
return
var/icon/blank = getGlobalBackup()
if(blank)
//it's basically a giant etch-a-sketch
icon = blank
user.visible_message("<span class='notice'>[user] cleans the canvas.</span>","<span class='notice'>You clean the canvas.</span>")
//Examine to enlarge
/obj/item/weapon/canvas/examine(var/mob/user = usr)
..()
if(in_range(user, src) && get_turf(src) && user.client && ishuman(user)) //Let only humans be the robust zoominators. I'm too spooked other mobs trying to use it may get broken huds.
if(src.loc == user || get_turf(src) == get_turf(user))
user << "<span class='notice'>[src] has to be on the ground to focus on it!</span>"
return
user << "<span class='notice'>You focus on \the [src].</span>"
user.client.screen = list() //This is because screen objects go way past the view bounds we set, therefore not allowing stretch to fit to zoom in properly.
user.client.reset_stretch = winget(user.client, "mapwindow.map", "icon-size") //Remember previous icon-size
user.client.view = 3 //Decrease view
winset(user.client, "mapwindow.map", "icon-size=0") //Enable stretch-to-fit
user.client.viewingCanvas = 1 //Reset everything we just changed as soon as client tries to move
else
user << "<span class='notice'>It is too far away.</span>"
#undef AMT_OF_CANVASES
code/modules/client/client defines.dm
+3 -1
View File
@@ -70,4 +70,6 @@
"AZERTY" = list(
"on" = "AZERTYon",
"off" = "AZERTYoff")
)
)
var/reset_stretch = 0 //Used by things that fiddle with client's stretch-to-fit.
code/modules/mob/mob_movement.dm
+11
View File
@@ -176,6 +176,17 @@
/client/Move(n, direct)
if(viewingCanvas)
view = world.view //Reset the view
winset(src, "mapwindow.map", "icon-size=[src.reset_stretch]")
viewingCanvas = 0
mob.reset_view()
mob.button_pressed_F12()
if(!mob.hud_used.hud_shown)
mob.button_pressed_F12()
mob.update_hud()
mob.update_action_buttons()
if(mob.control_object) Move_object(direct)
if(world.time < move_delay) return
code/modules/research/designs/autolathe_designs.dm
+32
View File
@@ -226,6 +226,38 @@
build_path = /obj/item/device/assembly/voice
category = list("initial", "Miscellaneous")
/datum/design/canvas
name = "11px by 11px Canvas"
id = "canvas"
build_type = AUTOLATHE
materials = list("$metal" = 50)
build_path = /obj/item/weapon/canvas
category = list("initial", "Miscellaneous")
/datum/design/canvas/nineteenXnineteen
name = "19px by 19px Canvas"
id = "canvas19x19"
build_type = AUTOLATHE
materials = list("$metal" = 50)
build_path = /obj/item/weapon/canvas/nineteenXnineteen
category = list("initial", "Miscellaneous")
/datum/design/canvas/twentythreeXnineteen
name = "23px by 19px Canvas"
id = "canvas23x19"
build_type = AUTOLATHE
materials = list("$metal" = 70)
build_path = /obj/item/weapon/canvas/twentythreeXnineteen
category = list("initial", "Miscellaneous")
/datum/design/canvas/twentythreeXtwentythree
name = "23px by 23px Canvas"
id = "canvas23x23"
build_type = AUTOLATHE
materials = list("$metal" = 100)
build_path = /obj/item/weapon/canvas/twentythreeXtwentythree
category = list("initial", "Miscellaneous")
/datum/design/camera_assembly
name = "Camera Assembly"
id = "camera_assembly"