|
295 | 295 | return atoms |
296 | 296 |
|
297 | 297 | ///Returns the distance between two atoms |
298 | | -/proc/get_dist_euclidean(atom/first_location, atom/second_location) |
299 | | - var/dx = first_location.x - second_location.x |
300 | | - var/dy = first_location.y - second_location.y |
| 298 | +/proc/get_dist_euclidian(atom/Loc1 as turf|mob|obj,atom/Loc2 as turf|mob|obj) |
| 299 | + var/dx = Loc1.x - Loc2.x |
| 300 | + var/dy = Loc1.y - Loc2.y |
301 | 301 |
|
302 | | - var/dist = sqrt(dx ** 2 + dy ** 2) |
| 302 | + var/dist = sqrt(dx**2 + dy**2) |
303 | 303 |
|
304 | 304 | return dist |
305 | 305 |
|
|
318 | 318 | return turfs |
319 | 319 |
|
320 | 320 | ///Returns a list of turfs around a center based on view() |
321 | | -/proc/circle_view_turfs(center=usr,radius=3) //Is there even a diffrence between this proc and circle_range_turfs()? // Yes |
| 321 | +/proc/circleviewturfs(center=usr,radius=3) //Is there even a diffrence between this proc and circle_range_turfs()? // Yes |
322 | 322 | var/turf/center_turf = get_turf(center) |
323 | 323 | var/list/turfs = new/list() |
324 | 324 | var/rsq = radius * (radius + 0.5) |
|
441 | 441 | get_area(get_ranged_target_turf(center, EAST, 1)), |
442 | 442 | get_area(get_ranged_target_turf(center, WEST, 1)) |
443 | 443 | ) |
444 | | - list_clear_nulls(.) |
| 444 | + listclearnulls(.) |
445 | 445 |
|
446 | 446 | ///Checks if the mob provided (must_be_alone) is alone in an area |
447 | 447 | /proc/alone_in_area(area/the_area, mob/must_be_alone, check_type = /mob/living/carbon) |
|
462 | 462 | * @params outer_range - The outer range of the cicle to pull from. |
463 | 463 | * @params inner_range - The inner range of the circle to NOT pull from. |
464 | 464 | * @params center - The center of the circle to pull from, can be an atom (we'll apply get_turf() to it within circle_x_turfs procs.) |
465 | | - * @params view_based - If TRUE, we'll use circle_view_turfs instead of circle_range_turfs procs. |
| 465 | + * @params view_based - If TRUE, we'll use circleviewturfs instead of circle_range_turfs procs. |
466 | 466 | */ |
467 | 467 | /proc/turf_peel(outer_range, inner_range, center, view_based = FALSE) |
468 | 468 | if(inner_range > outer_range) // If the inner range is larger than the outer range, you're using this wrong. |
|
471 | 471 | var/list/outer |
472 | 472 | var/list/inner |
473 | 473 | if(view_based) |
474 | | - outer = circle_view_turfs(center, outer_range) |
475 | | - inner = circle_view_turfs(center, inner_range) |
| 474 | + outer = circleviewturfs(center, outer_range) |
| 475 | + inner = circleviewturfs(center, inner_range) |
476 | 476 | else |
477 | 477 | outer = circle_range_turfs(center, outer_range) |
478 | 478 | inner = circle_range_turfs(center, inner_range) |
|
0 commit comments