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

Correction

Browse Source 
CMC offset applies to GPS coords, but NOT minimap coordinates
This commit is contained in:
clusterfack
2015-07-13 23:06:37 -05:00
parent 6919cf2d9c
commit 3e66fa4bdd
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/html_interface/crew/crew.dm
View File

@@ -158,6 +158,8 @@ var/global/datum/crewmonitor/crewmonitor = new
var/area
var/pos_x
var/pos_y
var/see_pos_x
var/see_pos_y
var/life_status
for(var/mob/living/carbon/human/H in mob_list)
@@ -203,14 +205,18 @@ var/global/datum/crewmonitor/crewmonitor = new
var/area/player_area = get_area(H)
area = format_text(player_area.name)
pos_x = pos.x + WORLD_X_OFFSET[z]
pos_y = pos.y + WORLD_Y_OFFSET[z]
pos_x = pos.x
pos_y = pos.y
see_pos_x = pos.x + WORLD_X_OFFSET[z]
see_pos_y = pos.y + WORLD_Y_OFFSET[z]
else
area = null
pos_x = null
pos_y = null
see_pos_x = null
see_pos_y = null
results[++results.len] = list(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area, pos_x, pos_y, H.monitor_check())
results[++results.len] = list(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area, pos_x, pos_y, H.monitor_check(), see_pos_x, see_pos_y)
src.data = results
src.updateFor(null, hi, z) // updates for everyone

6
code/modules/html_interface/crew/crew.js
View File

@@ -436,7 +436,7 @@ function getColor(ijob)
else { return "#C38312"; } // other / unknown
}
function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area, pos_x, pos_y, in_range)
function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area, pos_x, pos_y, in_range, see_pos_x, see_pos_y)
{
try { ijob = parseInt(ijob); }
catch (ex) { ijob = 0; }
@@ -509,7 +509,7 @@ function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area,
tdElem = $("<td style=\"cursor: default;\"></td>");
if (area && pos_x && pos_y) { tdElem.append($("<div></div>").text(area).addClass("tt").append($("<div></div>").append($("<span></span>").text("(" + pos_x + ", " + pos_y + ")")))); }
if (area && pos_x && pos_y) { tdElem.append($("<div></div>").text(area).addClass("tt").append($("<div></div>").append($("<span></span>").text("(" + see_pos_x + ", " + see_pos_y + ")")))); }
else { tdElem.text("Not Available"); }
trElem.append(tdElem);
@@ -527,7 +527,7 @@ function add(name, assignment, ijob, life_status, dam1, dam2, dam3, dam4, area,
var tx = (translate(x - 1, scale_x) - 1).toFixed(0);
var ty = (translate(y - 1, scale_y) + 7).toFixed(0);
var dotElem = $("<div class=\"mapIcon mapIcon16 rank-" + ijobNames[ijob.toString()] + " " + (avg_dam <= 25 ? 'good' : (avg_dam > 25 && avg_dam <= 90 ? 'average' : 'bad')) + "\" style =\"top:" + ty +"px; left: " + tx + "px;\" z-index: 2; unselectable=\"on\"><div class=\"tooltip hidden\">" + name + " " + (life_status ? "<span class='good'>Living</span>" : "<span class='bad'>Deceased</span>") + " (<span class=\"oxyloss_light\">" + dam1 + "</span>/<span class=\"toxin_light\">" + dam2 + "</span>/<span class=\"fire\">" + dam3 + "</span>/<span class=\"brute\">" + dam4 + "</span>) "+area+": "+pos_x+", "+pos_y+")</div></div>");
var dotElem = $("<div class=\"mapIcon mapIcon16 rank-" + ijobNames[ijob.toString()] + " " + (avg_dam <= 25 ? 'good' : (avg_dam > 25 && avg_dam <= 90 ? 'average' : 'bad')) + "\" style =\"top:" + ty +"px; left: " + tx + "px;\" z-index: 2; unselectable=\"on\"><div class=\"tooltip hidden\">" + name + " " + (life_status ? "<span class='good'>Living</span>" : "<span class='bad'>Deceased</span>") + " (<span class=\"oxyloss_light\">" + dam1 + "</span>/<span class=\"toxin_light\">" + dam2 + "</span>/<span class=\"fire\">" + dam3 + "</span>/<span class=\"brute\">" + dam4 + "</span>) "+area+": "+see_pos_x+", "+see_pos_y+")</div></div>");
//$("#uiMap").append("<div class=\"dot\" style=\"top: " + ty + "px; left: " + tx + "px; background-color: " + color + "; z-index: " + 999 + ";\"></div>");
$("#uiMap").append(dotElem);