moreproblems (#11732)

This commit is contained in:
JMWTurner
2016-09-03 01:40:18 +02:00
committed by clusterfack
parent 92b1e8a902
commit 1a4ed406d1

View File

@@ -75,17 +75,32 @@ var/list/holomap_cache = list()
holomap_images.len = 0
var/image/bgmap
var/holomap_bgmap
if(T.z == map.zCentcomm)
bgmap = image(centcommMiniMaps[HOLOMAP_FILTER_DEATHSQUAD])
holomap_bgmap = "deathsquad_background_\ref[src]_[map.zCentcomm]"
if(!(holomap_bgmap in holomap_cache))
holomap_cache[holomap_bgmap] = image(centcommMiniMaps[HOLOMAP_FILTER_DEATHSQUAD])
else
bgmap = image(holoMiniMaps[T.z])
animate(bgmap,pixel_x = -1*T.x + activator.client.view*WORLD_ICON_SIZE + 16*(WORLD_ICON_SIZE/32), time = 5, easing = LINEAR_EASING)
animate(bgmap,pixel_y = -1*T.y + activator.client.view*WORLD_ICON_SIZE + 17*(WORLD_ICON_SIZE/32), time = 5, easing = LINEAR_EASING)
holomap_bgmap = "deathsquad_background_\ref[src]_[T.z]"
if(!(holomap_bgmap in holomap_cache))
holomap_cache[holomap_bgmap] = image(holoMiniMaps[T.z])
bgmap = holomap_cache[holomap_bgmap]
bgmap.plane = HUD_PLANE
bgmap.layer = HUD_BASE_LAYER
bgmap.color = "#0B74B4"
bgmap.loc = activator.hud_used.holomap_obj
if(!bgmap.pixel_x)
bgmap.pixel_x = -1*T.x + activator.client.view*WORLD_ICON_SIZE + 16*(WORLD_ICON_SIZE/32)
if(!bgmap.pixel_y)
bgmap.pixel_y = -1*T.y + activator.client.view*WORLD_ICON_SIZE + 17*(WORLD_ICON_SIZE/32)
animate(bgmap,pixel_x = -1*T.x + activator.client.view*WORLD_ICON_SIZE + 16*(WORLD_ICON_SIZE/32), pixel_y = -1*T.y + activator.client.view*WORLD_ICON_SIZE + 17*(WORLD_ICON_SIZE/32), time = 5, easing = LINEAR_EASING)
holomap_images += bgmap
for(var/obj/item/clothing/under/deathsquad/D in deathsquad_uniforms)
@@ -111,15 +126,19 @@ var/list/holomap_cache = list()
holomap_cache[holomap_marker] = image('icons/12x12.dmi',"ds[mob_indicator]")
var/image/I = holomap_cache[holomap_marker]
animate(I,pixel_x = TD.x - T.x + activator.client.view*WORLD_ICON_SIZE + 8*(WORLD_ICON_SIZE/32), time = 5, easing = LINEAR_EASING)
animate(I,pixel_y = TD.y - T.y + activator.client.view*WORLD_ICON_SIZE + 9*(WORLD_ICON_SIZE/32), time = 5, easing = LINEAR_EASING)
I.plane = HUD_PLANE
if(mob_indicator == HOLOMAP_YOU)
I.layer = HUD_ABOVE_ITEM_LAYER
else
I.layer = HUD_ITEM_LAYER
I.loc = activator.hud_used.holomap_obj
animate(I,alpha = 255, time = 13, loop = -1, easing = SINE_EASING)
if(!I.pixel_x || !I.pixel_y)
I.pixel_x = TD.x - T.x + activator.client.view*WORLD_ICON_SIZE + 8*(WORLD_ICON_SIZE/32)
I.pixel_y = TD.y - T.y + activator.client.view*WORLD_ICON_SIZE + 9*(WORLD_ICON_SIZE/32)
animate(I,alpha = 255, pixel_x = TD.x - T.x + activator.client.view*WORLD_ICON_SIZE + 8*(WORLD_ICON_SIZE/32), pixel_y = TD.y - T.y + activator.client.view*WORLD_ICON_SIZE + 9*(WORLD_ICON_SIZE/32), time = 5, loop = -1, easing = LINEAR_EASING)
animate(alpha = 255, time = 8, loop = -1, easing = SINE_EASING)
animate(alpha = 0, time = 5, easing = SINE_EASING)
animate(alpha = 255, time = 2, easing = SINE_EASING)
holomap_images += I