From e3097aee9a07c371fc38d68fe024faf7fa9c5a16 Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:58:33 +0300 Subject: [PATCH] minimap_fix --- code/controllers/subsystem/minimap.dm | 28 +++++++++---------- .../objects/items/devices/radio/headset.dm | 1 + code/modules/admin/game_master/game_master.dm | 2 +- code/modules/almayer/machinery.dm | 6 ++-- maps/map_files/chapaev/chapaev.dmm | 3 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 491be1708a..36d73c7ea1 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -381,7 +381,7 @@ SUBSYSTEM_DEF(minimaps) /proc/get_tacmap_data_png(faction) var/list/map_list - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) map_list = GLOB.uscm_flat_tacmap_data else if(faction == XENO_HIVE_NORMAL) map_list = GLOB.xeno_flat_tacmap_data @@ -402,7 +402,7 @@ SUBSYSTEM_DEF(minimaps) * * faction: FACTION_MARINE or XENO_HIVE_NORMAL */ /proc/get_unannounced_tacmap_data_png(faction) - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) return GLOB.uscm_unannounced_map else if(faction == XENO_HIVE_NORMAL) return GLOB.xeno_unannounced_map @@ -418,7 +418,7 @@ SUBSYSTEM_DEF(minimaps) /proc/get_tacmap_data_svg(faction) var/list/map_list - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) map_list = GLOB.uscm_svg_tacmap_data else if(faction == XENO_HIVE_NORMAL) map_list = GLOB.xeno_svg_tacmap_data @@ -443,9 +443,9 @@ SUBSYSTEM_DEF(minimaps) return var/is_observer = user.faction == FACTION_NEUTRAL && isobserver(user) - if(is_observer || user.faction == FACTION_MARINE) + if(is_observer || user.faction in FACTION_LIST_HUMANOID ) // Send marine maps - var/datum/flattened_tacmap/latest = get_tacmap_data_png(FACTION_MARINE) + var/datum/flattened_tacmap/latest = get_tacmap_data_png(user.faction) if(latest) SSassets.transport.send_assets(user.client, latest.asset_key) var/datum/flattened_tacmap/unannounced = get_unannounced_tacmap_data_png(FACTION_MARINE) @@ -471,7 +471,7 @@ SUBSYSTEM_DEF(minimaps) * * Returns a boolean value, TRUE if the operation was successful, FALSE if it was not (on cooldown generally). */ /datum/tacmap/drawing/proc/distribute_current_map_png(faction) - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID) if(!COOLDOWN_FINISHED(GLOB, uscm_flatten_map_icon_cooldown)) return FALSE COOLDOWN_START(GLOB, uscm_flatten_map_icon_cooldown, flatten_map_cooldown_time) @@ -493,7 +493,7 @@ SUBSYSTEM_DEF(minimaps) if(!client || !client.mob) continue var/mob/client_mob = client.mob - if(client_mob.faction == faction) + if(client_mob.faction in FACTION_LIST_HUMANOID ) faction_clients += client else if(client_mob.faction == FACTION_NEUTRAL && isobserver(client_mob)) faction_clients += client @@ -510,7 +510,7 @@ SUBSYSTEM_DEF(minimaps) var/flat_tacmap_png = SSassets.transport.get_asset_url(flat_tacmap_key) var/datum/flattened_tacmap/new_flat = new(flat_tacmap_png, flat_tacmap_key) - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) GLOB.uscm_unannounced_map = new_flat else //if(faction == XENO_HIVE_NORMAL) GLOB.xeno_unannounced_map = new_flat @@ -528,7 +528,7 @@ SUBSYSTEM_DEF(minimaps) /datum/tacmap/drawing/proc/store_current_svg_coords(faction, svg_coords, ckey) var/datum/svg_overlay/svg_store_overlay = new(svg_coords, ckey) - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) GLOB.uscm_svg_tacmap_data += svg_store_overlay else if(faction == XENO_HIVE_NORMAL) GLOB.xeno_svg_tacmap_data += svg_store_overlay @@ -729,7 +729,7 @@ SUBSYSTEM_DEF(minimaps) old_map = get_tacmap_data_png(faction) current_svg = get_tacmap_data_svg(faction) - var/use_live_map = faction == FACTION_MARINE && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || is_xeno + var/use_live_map = skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || is_xeno if(use_live_map && !map_holder) var/level = SSmapping.levels_by_trait(targeted_ztrait) @@ -807,9 +807,9 @@ SUBSYSTEM_DEF(minimaps) data["isXeno"] = is_xeno data["canViewTacmap"] = is_xeno - data["canViewCanvas"] = faction == FACTION_MARINE || faction == XENO_HIVE_NORMAL + data["canViewCanvas"] = faction in FACTION_LIST_HUMANOID || faction == XENO_HIVE_NORMAL - if(faction == FACTION_MARINE && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || faction == XENO_HIVE_NORMAL && isqueen(user)) + if(skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || faction == XENO_HIVE_NORMAL && isqueen(user)) data["canDraw"] = TRUE data["canViewTacmap"] = TRUE @@ -898,7 +898,7 @@ SUBSYSTEM_DEF(minimaps) if(!istype(params["image"], /list)) // potentially very serious? return FALSE - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) GLOB.uscm_flat_tacmap_data += new_current_map else if(faction == XENO_HIVE_NORMAL) GLOB.xeno_flat_tacmap_data += new_current_map @@ -907,7 +907,7 @@ SUBSYSTEM_DEF(minimaps) current_svg = get_tacmap_data_svg(faction) old_map = get_tacmap_data_png(faction) - if(faction == FACTION_MARINE) + if(faction in FACTION_LIST_HUMANOID ) COOLDOWN_START(GLOB, uscm_canvas_cooldown, canvas_cooldown_time) var/mob/living/carbon/human/human_leader = user for(var/datum/squad/current_squad in RoleAuthority.squads) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 95d73d7030..1ec8398121 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -931,6 +931,7 @@ initial_keys = list(/obj/item/device/encryptionkey/colony) has_hud = TRUE hud_type = MOB_HUD_FACTION_UPP + minimap_type = MINIMAP_FLAG_UPP /obj/item/device/radio/headset/distress/UPP/cct name = "UPP-CCT headset" diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm index 0ec9ee7e3e..dd534cc1f1 100644 --- a/code/modules/admin/game_master/game_master.dm +++ b/code/modules/admin/game_master/game_master.dm @@ -404,7 +404,7 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100) if(!object || !z_level) return - SSminimaps.add_marker(object, z_level, MINIMAP_FLAG_USCM, given_image = background) + SSminimaps.add_marker(object, z_level, MINIMAP_FLAG_ALL, given_image = background) var/objective_info = tgui_input_text(user, "Objective info?", "Objective Info") diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index 4fd9e7c88a..4c29fe9d5f 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -89,10 +89,8 @@ /obj/structure/machinery/prop/almayer/CICmap/Initialize() . = ..() - if (faction == FACTION_MARINE) - map = new /datum/tacmap/drawing(src, minimap_type) - else - map = new(src, minimap_type) // Non-drawing version + map = new /datum/tacmap/drawing(src, minimap_type) + /obj/structure/machinery/prop/almayer/CICmap/Destroy() QDEL_NULL(map) diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 504af7d57d..fc0d3d808d 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -2747,7 +2747,8 @@ layer = 2.97; name = "Tactical Map Display"; pixel_x = 7; - faction = "UPP" + faction = "UPP"; + minimap_type = 8 }, /obj/structure/machinery/computer/cameras/almayer/vehicle{ pixel_x = -12;