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

Changes grid logic to be slightly less convoluted, clamp position to inside the object's icon

Browse Source
This commit is contained in:
GinjaNinja32
2015-02-26 18:46:10 +00:00
parent 0dca584103
commit 8483d7c679
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/reagents/reagent_containers/food.dm
View File

@@ -1,3 +1,6 @@
#define CELLS 4
#define CELLSIZE (32/CELLS)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// Food. /// Food.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@@ -6,7 +9,7 @@
volume = 50 //Sets the default container amount for all food items. volume = 50 //Sets the default container amount for all food items.
var/filling_color = "#FFFFFF" //Used by sandwiches. var/filling_color = "#FFFFFF" //Used by sandwiches.
var/list/center_of_mass = newlist() //Center of mass var/list/center_of_mass = list() // Used for table placement
/obj/item/weapon/reagent_containers/food/New() /obj/item/weapon/reagent_containers/food/New()
..() ..()
@@ -18,17 +21,18 @@
if(proximity && params && istype(A, /obj/structure/table) && center_of_mass.len) if(proximity && params && istype(A, /obj/structure/table) && center_of_mass.len)
//Places the item on a grid //Places the item on a grid
var/list/mouse_control = params2list(params) var/list/mouse_control = params2list(params)
var/cellnumber = 4
var/mouse_x = text2num(mouse_control["icon-x"]) var/mouse_x = text2num(mouse_control["icon-x"])
var/mouse_y = text2num(mouse_control["icon-y"]) var/mouse_y = text2num(mouse_control["icon-y"])
var/grid_x = round(mouse_x, 32/cellnumber) if(!isnum(mouse_x) || !isnum(mouse_y))
var/grid_y = round(mouse_y, 32/cellnumber) return
if(mouse_control["icon-x"]) var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
var/sign = mouse_x - grid_x != 0 ? sign(mouse_x - grid_x) : -1 //positive if rounded down, else negative var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
pixel_x = grid_x - center_of_mass["x"] + sign*16/cellnumber //center of the cell
if(mouse_control["icon-y"]) pixel_x = (CELLSIZE * (0.5 + cell_x)) - center_of_mass["x"]
var/sign = mouse_y - grid_y != 0 ? sign(mouse_y - grid_y) : -1 pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass["y"]
pixel_y = grid_y - center_of_mass["y"] + sign*16/cellnumber
#undef CELLS
#undef CELLSIZE