diff --git a/IW4MAdmin.sln b/IW4MAdmin.sln index 3d3a90ecf..541d851e4 100644 --- a/IW4MAdmin.sln +++ b/IW4MAdmin.sln @@ -53,7 +53,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatsWeb", "Plugins\Web\Sta EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveRadar", "Plugins\LiveRadar\LiveRadar.csproj", "{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiveRadar", "Plugins\LiveRadar\LiveRadar.csproj", "{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -363,8 +363,8 @@ Global {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x64.Build.0 = Debug|Any CPU {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.ActiveCfg = Debug|Any CPU {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.Build.0 = Debug|Any CPU - {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU - {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Debug|Any CPU + {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU + {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU {F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x64.ActiveCfg = Debug|Any CPU @@ -387,8 +387,8 @@ Global {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x64.Build.0 = Debug|Any CPU {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x86.ActiveCfg = Debug|Any CPU {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x86.Build.0 = Debug|Any CPU - {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU - {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.Build.0 = Debug|Any CPU + {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU + {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU {00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x64.ActiveCfg = Debug|Any CPU diff --git a/Plugins/AutomessageFeed/AutomessageFeed.csproj b/Plugins/AutomessageFeed/AutomessageFeed.csproj index 47d92a060..c1e8b4905 100644 --- a/Plugins/AutomessageFeed/AutomessageFeed.csproj +++ b/Plugins/AutomessageFeed/AutomessageFeed.csproj @@ -4,6 +4,7 @@ netcoreapp2.2 true 7.1 + Debug;Release;Prerelease diff --git a/Plugins/LiveRadar/Configuration/LiveRadarConfiguration.cs b/Plugins/LiveRadar/Configuration/LiveRadarConfiguration.cs index f4483d25f..e529154a7 100644 --- a/Plugins/LiveRadar/Configuration/LiveRadarConfiguration.cs +++ b/Plugins/LiveRadar/Configuration/LiveRadarConfiguration.cs @@ -51,8 +51,7 @@ namespace LiveRadar.Configuration Right = 968, // pxmax Bottom = 864, // pymax Top = 160, // pymin - CenterX = 0, - CenterY = 0 + ViewPositionRotation = 180, }, new MapInfo() @@ -60,12 +59,12 @@ namespace LiveRadar.Configuration Name = "mp_estate", Top = 52, Bottom = 999, - Left= 173, + Left = 173, Right = 942, - MaxTop = 2103, - MaxBottom = -5077, - MaxLeft = 4437, - MaxRight = -1240, + MaxTop = 2103, // x max + MaxBottom = -5077, //x min + MaxLeft = 4437, // ymax + MaxRight = -1240, // y min Rotation = 143, CenterX = -1440, CenterY = 1920, @@ -148,8 +147,7 @@ namespace LiveRadar.Configuration Left = 130, Right = 892, Top = 210, - Bottom = 829, - ViewPositionRotation = 180 + Bottom = 829 }, new MapInfo() @@ -215,7 +213,138 @@ namespace LiveRadar.Configuration Right = 978, Top = 157, Bottom = 944 - } + }, + + new MapInfo() + { + Name = "mp_abandon", + MaxBottom = -1290, + MaxTop = 3855, + MaxRight = -2907, + MaxLeft = 2723, + Left = 6, + Right = 1016, + Top = 32, + Bottom = 945 + }, + + new MapInfo() + { + Name = "mp_compact", + MaxBottom = 0, + MaxTop = 4264, + MaxRight = -1552, + MaxLeft = 3344, + Left = 35, + Right = 1003, + Top = 94, + Bottom = 935 + }, + + new MapInfo() + { + Name = "mp_complex", + MaxBottom = -2869, + MaxTop = 2867, + MaxRight = -4204, + MaxLeft = -1218, + Left = 282, + Right = 749, + Top = 48, + Bottom = 991 + }, + + + new MapInfo() + { + Name = "mp_crash", + MaxBottom = -953, + MaxTop = 1811, + MaxRight = -2129, + MaxLeft = 2277, + Left = 52, + Right = 1017, + Top = 201, + Bottom = 807 + }, + + new MapInfo() + { + Name = "mp_fuel2", + MaxBottom = -2218, + MaxTop = 4324, + MaxRight = -3115, + MaxLeft = 3193, + Left = 39, + Right = 888, + Top = 24, + Bottom = 906 + }, + + new MapInfo() + { + Name = "mp_overgrown", + MaxBottom = -2052, + MaxTop = 3236, + MaxRight = -5393, + MaxLeft = 808, + Left = 17, + Right = 1024, + Top = 0, + Bottom = 847 + }, + + new MapInfo() + { + Name = "mp_storm", + MaxBottom = -2317, + MaxTop = 2537, + MaxRight = -2223, + MaxLeft = 2097, + Left = 79, + Right = 932, + Top = 20, + Bottom = 995 + }, + + new MapInfo() + { + Name = "mp_strike", + MaxBottom = -2504, + MaxTop = 3359, + MaxRight = -3105, + MaxLeft = 2822, + Left = 40, + Right = 969, + Top = 36, + Bottom = 955 + }, + + new MapInfo() + { + Name = "mp_trailerpark", + MaxBottom = -2709, + MaxTop = 2027, + MaxRight = -1719, + MaxLeft = 1666, + Left = 152, + Right = 785, + Top = 50, + Bottom = 931 + }, + + new MapInfo() + { + Name = "mp_vacant", + MaxBottom = -2089, + MaxTop = 1652, + MaxRight = -1393, + MaxLeft = 1789, + Left = 122, + Right = 909, + Top = 16, + Bottom = 951 + }, }; return this; diff --git a/Plugins/LiveRadar/LiveRadar.csproj b/Plugins/LiveRadar/LiveRadar.csproj index 0eea9ca31..800e5dc58 100644 --- a/Plugins/LiveRadar/LiveRadar.csproj +++ b/Plugins/LiveRadar/LiveRadar.csproj @@ -2,7 +2,10 @@ netcoreapp2.2 + true + true 0.1.0.0 + Debug;Release;Prerelease diff --git a/Plugins/LiveRadar/MapInfo.cs b/Plugins/LiveRadar/MapInfo.cs index d914b3468..cb2899267 100644 --- a/Plugins/LiveRadar/MapInfo.cs +++ b/Plugins/LiveRadar/MapInfo.cs @@ -7,6 +7,7 @@ namespace LiveRadar public class MapInfo { public string Name { get; set; } + public string Alias { get; set; } // distance from the edge of the minimap image // to the "playable" area public int Top { get; set; } diff --git a/Plugins/LiveRadar/Web/Controllers/RadarController.cs b/Plugins/LiveRadar/Web/Controllers/RadarController.cs index dbb17dec6..8920091b0 100644 --- a/Plugins/LiveRadar/Web/Controllers/RadarController.cs +++ b/Plugins/LiveRadar/Web/Controllers/RadarController.cs @@ -28,6 +28,7 @@ namespace LiveRadar.Web.Controllers var server = Manager.GetServers().FirstOrDefault(); var map = Plugin.Config.Configuration().Maps.FirstOrDefault(_map => _map.Name == server.CurrentMap.Name); + map.Alias = server.CurrentMap.Alias; return Json(map); } diff --git a/Plugins/LiveRadar/Web/Views/LiveRadar/Index.cshtml b/Plugins/LiveRadar/Web/Views/LiveRadar/Index.cshtml index 899641362..c819e3fae 100644 --- a/Plugins/LiveRadar/Web/Views/LiveRadar/Index.cshtml +++ b/Plugins/LiveRadar/Web/Views/LiveRadar/Index.cshtml @@ -26,7 +26,7 @@ - + @section scripts { @@ -131,13 +131,14 @@ function drawText(context, x, y, text, size, fillColor, strokeColor, alignment = 'left') { context.beginPath(); - context.font = `bold ${size * stateInfo.imageScaler}px verdana`; + context.save(); + context.font = `bold ${Math.max(12, size * stateInfo.imageScaler)}px courier new`; context.fillStyle = fillColor; - context.strokeStyle = strokeColor; - context.lineWidth = 1 * stateInfo.imageScaler; + context.shadowColor = strokeColor; + context.shadowBlur = 4; context.textAlign = alignment; context.fillText(text, x, y); - context.strokeText(text, x, y); + context.restore(); context.closePath(); } @@ -163,11 +164,12 @@ } stateInfo.imageScaler = (stateInfo.canvas.width() / 1024) - stateInfo.mapScaler = ((stateInfo.mapInfo.right - stateInfo.mapInfo.left) / stateInfo.mapInfo.width) * stateInfo.imageScaler; - stateInfo.mapScalerY =((stateInfo.mapInfo.bottom - stateInfo.mapInfo.top) / stateInfo.mapInfo.height) * stateInfo.imageScaler; + stateInfo.mapScalerX = (((stateInfo.mapInfo.right * stateInfo.imageScaler) - (stateInfo.mapInfo.left * stateInfo.imageScaler)) / stateInfo.mapInfo.width); + stateInfo.mapScalerY = (((stateInfo.mapInfo.bottom * stateInfo.imageScaler) - (stateInfo.mapInfo.top * stateInfo.imageScaler)) / stateInfo.mapInfo.height); + stateInfo.mapScaler = (stateInfo.mapScalerX + stateInfo.mapScalerY) / 2 - stateInfo.forwardDistance = 500.0 * ((stateInfo.mapInfo.right - stateInfo.mapInfo.left) / stateInfo.mapInfo.width) * stateInfo.imageScaler; - stateInfo.fovWidth = 32.5 * ((stateInfo.mapInfo.right - stateInfo.mapInfo.left) / stateInfo.mapInfo.width); + stateInfo.forwardDistance = 500.0; + stateInfo.fovWidth = 40; } function calculateViewPosition(x, y, distance) { @@ -175,7 +177,7 @@ let ny = Math.sin(x) * Math.cos(y); let nz = Math.sin(360.0 - y); - return { x: nx * distance, y: ny * distance, z: nz * distance}; + return { x: (nx * distance) * stateInfo.mapScaler, y: (ny * distance) * stateInfo.mapScaler, z: (nz * distance) * stateInfo.mapScaler }; } function lerp(start, end, complete) { @@ -238,7 +240,7 @@ name = "none"; } - return `../images/hud_weapons/hud_${weapons[name]}.png`; + return `../images/radar/hud_weapons/hud_${weapons[name]}.png`; } function updatePlayerData() { @@ -266,9 +268,8 @@
${player.deaths == 0 ? player.kills.toFixed(2) : (player.kills / player.deaths).toFixed(2)}
-
${Math.round(player.score / (player.playTime / 60))}
+
${ player.playTime == 0 ? '—' : Math.round(player.score / (player.playTime / 60))}
`); - // }); $('.player-data-left').delay(1000).animate({opacity: 1}, 500); @@ -340,11 +341,10 @@ // we switch out the items to previousRadarData = newRadarData; - $('#map_name').html(stateInfo.mapInfo.name); - $('#map_list').css('background-image', `url(../images/radar/minimaps/compass_map_${stateInfo.mapInfo.name}@('@')2x.png)`); + $('#map_name').html(stateInfo.mapInfo.alias); + $('#map_list').css('background-image', `url(../images/radar/minimaps/compass_map_${stateInfo.mapInfo.name}@('@')2x.jpg)`); checkCanvasSize(stateInfo.canvas, stateInfo.ctx, $('#map_list'), stateInfo.mapInfo); updatePlayerData(); - window.requestAnimationFrame(updateMap); } function updateMap() { @@ -385,8 +385,8 @@ const endX = ((stateInfo.mapInfo.maxLeft - rotatedCurrentLocation.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler); const endY = ((stateInfo.mapInfo.maxTop - rotatedCurrentLocation.x) * stateInfo.mapScalerY) + (stateInfo.mapInfo.top * stateInfo.imageScaler); - let teamColor = value.team == 'allies' ? 'rgba(0, 122, 204, 1)' : 'rgba(255,69,69,.85)'; - let fovColor = value.team == 'allies' ? 'rgba(0, 122, 204, 0.2)' : 'rgba(255,69,69,.2)'; + let teamColor = value.team == 'allies' ? 'rgb(0, 122, 204, 1)' : 'rgb(255, 69, 69)'; + let fovColor = value.team == 'allies' ? 'rgba(0, 122, 204, 0.2)' : 'rgba(255, 69, 69, 0.2)'; // this takes care of moving past the roll-over point of yaw/pitch (ie 360->0) const rollAngleFix = fixRollAngles(value.previous.radianAngles, value.radianAngles); @@ -395,8 +395,8 @@ const radianLerpY = lerp(value.previous.radianAngles.y, rollAngleFix.y, completionPercent); // this is some jankiness to get the fov to point the right direction - let firstVertex = calculateViewPosition((Math.PI / 2) + toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPosRotation) - radianLerpX - (Math.PI + stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance); - let secondVertex = calculateViewPosition((Math.PI / 2) + toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPosRotation) - radianLerpX + (Math.PI + stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance); + let firstVertex = calculateViewPosition(toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPositionRotation - 90) - radianLerpX + toRadians(stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance); + let secondVertex = calculateViewPosition(toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPositionRotation - 90) - radianLerpX - toRadians(stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance); let currentX = lerp(startX, endX, completionPercent); let currentY = lerp(startY, endY, completionPercent); @@ -409,14 +409,13 @@ currentX = lerp(centerX, currentX, stateInfo.mapInfo.scaler); currentY = lerp(centerY, currentY, stateInfo.mapInfo.scaler); - drawCircle(ctx, centerX, centerY, 'green'); drawCircle(ctx, currentX, currentY, teamColor); drawTriangle(ctx, { x: currentX, y: currentY }, { x: currentX + firstVertex.x, y: currentY + firstVertex.y }, { x: currentX + secondVertex.x, y: currentY + secondVertex.y }, fovColor); - drawText(ctx, currentX, currentY - textOffset, value.name, 24, 'white', teamColor, 'center') + drawText(ctx, currentX, currentY - (textOffset * stateInfo.imageScaler), value.name, 16, 'white', teamColor, 'center') }); const completedIcons = []; @@ -449,7 +448,8 @@ $.getJSON('@Url.Action("Map", "Radar", null)', function (_map) { stateInfo.mapInfo = _map; updateRadarData(); - setInterval(updateRadarData, stateInfo.updateFrequency); + setInterval(updateRadarData, stateInfo.updateFrequency); + window.requestAnimationFrame(updateMap); }); }) diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_40mmgrenade.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_40mmgrenade.webp deleted file mode 100644 index 750c075d2..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_40mmgrenade.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.webp deleted file mode 100644 index 620cc0614..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.webp deleted file mode 100644 index 01a6b2b20..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.webp deleted file mode 100644 index 17ba4699a..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_at4.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_at4.webp deleted file mode 100644 index fa5461529..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_at4.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.webp deleted file mode 100644 index fa39bb4ef..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.webp deleted file mode 100644 index 7098224e2..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.webp deleted file mode 100644 index 6edaf0199..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.webp deleted file mode 100644 index 28cacb3c7..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_colt45.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_colt45.webp deleted file mode 100644 index 3916c53b7..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_colt45.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.webp deleted file mode 100644 index 1eebaae3e..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.webp deleted file mode 100644 index e9eb3123d..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.webp deleted file mode 100644 index 47c27d103..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.webp deleted file mode 100644 index 7e9f7b0c1..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_famas.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_famas.webp deleted file mode 100644 index 86d56e1e3..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_famas.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.webp deleted file mode 100644 index 3ce1c090e..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.webp deleted file mode 100644 index e272def08..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_g36c_mp.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_g36c_mp.webp deleted file mode 100644 index de99eff16..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_g36c_mp.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_glock.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_glock.webp deleted file mode 100644 index 63bf06a9e..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_glock.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.webp deleted file mode 100644 index 2ed14ccff..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.webp deleted file mode 100644 index 732c2eac5..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.webp deleted file mode 100644 index 80c72fd83..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.webp deleted file mode 100644 index 4966d605a..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.webp deleted file mode 100644 index 382929bf2..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m240.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m240.webp deleted file mode 100644 index def4d5e73..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m240.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m249saw.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m249saw.webp deleted file mode 100644 index b93acd374..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m249saw.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.webp deleted file mode 100644 index 18f21d40c..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.webp deleted file mode 100644 index 91d00f3e2..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m79.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m79.webp deleted file mode 100644 index 057fe3b5f..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m79.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.webp deleted file mode 100644 index 12f0ff209..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_masada.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_masada.webp deleted file mode 100644 index b8281a475..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_masada.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.webp deleted file mode 100644 index 2ff5b6acb..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.webp deleted file mode 100644 index f95b70222..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.webp deleted file mode 100644 index 63961d28a..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.webp deleted file mode 100644 index 9a254fa99..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.webp deleted file mode 100644 index 02fdde0cb..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.webp deleted file mode 100644 index 95797af13..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_p90.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_p90.webp deleted file mode 100644 index 77dde060f..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_p90.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.webp deleted file mode 100644 index b7aabb520..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.webp deleted file mode 100644 index 06edb397d..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_remington_700.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_remington_700.webp deleted file mode 100644 index 6ff2b2f96..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_remington_700.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.webp deleted file mode 100644 index 25b734b86..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.webp deleted file mode 100644 index 20e5652eb..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.webp deleted file mode 100644 index fbcffbc7f..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.webp deleted file mode 100644 index 311717042..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.webp deleted file mode 100644 index 3cddac4d4..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.webp deleted file mode 100644 index 0c14dc7b7..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_skorpian.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_skorpian.webp deleted file mode 100644 index 81bf64753..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_skorpian.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.webp deleted file mode 100644 index c52c5a03a..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.webp deleted file mode 100644 index a354b944c..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.webp deleted file mode 100644 index c7e7c6129..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_striker.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_striker.webp deleted file mode 100644 index e3a9b0810..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_striker.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_tavor.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_tavor.webp deleted file mode 100644 index 944d9355d..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_tavor.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_ump45.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_ump45.webp deleted file mode 100644 index 6ec50b0bf..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_ump45.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_undermounted_shotgun.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_undermounted_shotgun.webp deleted file mode 100644 index 5e884af4e..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_undermounted_shotgun.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_usp_45.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_usp_45.webp deleted file mode 100644 index 25605ac2e..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_usp_45.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_wa2000.webp b/WebfrontCore/wwwroot/images/hud_weapons/hud_wa2000.webp deleted file mode 100644 index 71dd9c849..000000000 Binary files a/WebfrontCore/wwwroot/images/hud_weapons/hud_wa2000.webp and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_death.png b/WebfrontCore/wwwroot/images/radar/death.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_death.png rename to WebfrontCore/wwwroot/images/radar/death.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_aa12.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_aa12.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_ak47.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_ak47.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_akd74u.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_akd74u.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_at4.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_at4.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_at4.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_at4.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_barrett50cal.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_barrett50cal.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_benelli_m4.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_benelli_m4.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_beretta393.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_beretta393.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_cheytac.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_cheytac.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_colt_anaconda.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_colt_anaconda.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_desert_eagle.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_desert_eagle.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_desert_eagle_gold.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_desert_eagle_gold.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_dragunovsvd.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_dragunovsvd.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_famas.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_famas.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_famas.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_famas.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_fn2000.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_fn2000.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_fnfal.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_fnfal.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_glock.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_glock.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_glock.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_glock.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_icon_ak47_classic.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_icon_ak47_classic.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_javelin.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_javelin.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_kriss.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_kriss.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m14ebr.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m14ebr.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m16a4.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m16a4.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m240.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m240.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m240.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m240.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m40a3.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m40a3.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m4carbine.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m4carbine.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m79.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m79.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m79.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m79.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m9beretta.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_m9beretta.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_masada.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_masada.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_masada.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_masada.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mg4.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mg4.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mini_uzi.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mini_uzi.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_model1887.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_model1887.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mp5k.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mp5k.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mp9.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_mp9.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_neutral.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_neutral.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_p90.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_p90.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_p90.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_p90.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_peacekeeper.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_peacekeeper.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_pp2000.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_pp2000.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_riot_shield.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_riot_shield.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_rpd.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_rpd.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_rpg.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_rpg.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_sa80_lmg.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_sa80_lmg.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_sawed_off.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_sawed_off.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_scar_h.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_scar_h.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_spas12.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_spas12.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_steyr.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_steyr.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_stinger.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_stinger.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_striker.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_striker.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_striker.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_striker.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_tavor.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_tavor.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_tavor.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_tavor.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_ump45.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_ump45.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_ump45.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_ump45.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_usp_45.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_usp_45.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_usp_45.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_usp_45.png diff --git a/WebfrontCore/wwwroot/images/hud_weapons/hud_wa2000.png b/WebfrontCore/wwwroot/images/radar/hud_weapons/hud_wa2000.png similarity index 100% rename from WebfrontCore/wwwroot/images/hud_weapons/hud_wa2000.png rename to WebfrontCore/wwwroot/images/radar/hud_weapons/hud_wa2000.png diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_abandon@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_abandon@2x.jpg new file mode 100644 index 000000000..b2e067e2e Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_abandon@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_afghan@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_afghan@2x.jpg new file mode 100644 index 000000000..3412a107d Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_afghan@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_afghan@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_afghan@2x.png deleted file mode 100644 index 3a7798c89..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_afghan@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_boneyard@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_boneyard@2x.jpg new file mode 100644 index 000000000..5059b8dae Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_boneyard@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_boneyard@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_boneyard@2x.png deleted file mode 100644 index d32272188..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_boneyard@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_brecourt@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_brecourt@2x.jpg new file mode 100644 index 000000000..eb9439ac7 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_brecourt@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_brecourt@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_brecourt@2x.png deleted file mode 100644 index 74bbff451..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_brecourt@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_checkpoint@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_checkpoint@2x.jpg new file mode 100644 index 000000000..44b7b0db9 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_checkpoint@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_checkpoint@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_checkpoint@2x.png deleted file mode 100644 index 3f33c3a4f..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_checkpoint@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_compact@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_compact@2x.jpg new file mode 100644 index 000000000..48d7ac061 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_compact@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_complex@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_complex@2x.jpg new file mode 100644 index 000000000..4b67b3d28 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_complex@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_crash_dlc@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_crash_dlc@2x.jpg new file mode 100644 index 000000000..387f1ceba Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_crash_dlc@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_derail@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_derail@2x.jpg new file mode 100644 index 000000000..798f8033d Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_derail@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_derail@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_derail@2x.png deleted file mode 100644 index b1d9e0a51..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_derail@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_estate@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_estate@2x.jpg new file mode 100644 index 000000000..5708050f3 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_estate@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_estate@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_estate@2x.png deleted file mode 100644 index d2618a06d..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_estate@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_favela@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_favela@2x.jpg new file mode 100644 index 000000000..5d52aeab8 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_favela@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_favela@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_favela@2x.png deleted file mode 100644 index 156cf9989..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_favela@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_fuel@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_fuel@2x.jpg new file mode 100644 index 000000000..f6e41a114 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_fuel@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_highrise@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_highrise@2x.jpg new file mode 100644 index 000000000..b1a35a1fa Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_highrise@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_highrise@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_highrise@2x.png deleted file mode 100644 index 28e1e032e..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_highrise@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_invasion@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_invasion@2x.jpg new file mode 100644 index 000000000..6693e15df Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_invasion@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_invasion@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_invasion@2x.png deleted file mode 100644 index 621cd1dc6..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_invasion@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_nightshift@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_nightshift@2x.jpg new file mode 100644 index 000000000..aa2eafcca Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_nightshift@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_nightshift@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_nightshift@2x.png deleted file mode 100644 index dafba2605..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_nightshift@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_overgrown_dlc@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_overgrown_dlc@2x.jpg new file mode 100644 index 000000000..ca5c0f0d0 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_overgrown_dlc@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_quarry@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_quarry@2x.jpg new file mode 100644 index 000000000..7f530c96e Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_quarry@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_quarry@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_quarry@2x.png deleted file mode 100644 index 40f32278b..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_quarry@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rundown@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rundown@2x.jpg new file mode 100644 index 000000000..a478ed094 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rundown@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rundown@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rundown@2x.png deleted file mode 100644 index f4032c807..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rundown@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rust@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rust@2x.jpg new file mode 100644 index 000000000..5a2e0112f Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rust@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rust@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rust@2x.png deleted file mode 100644 index f2bece270..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_rust@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_storm@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_storm@2x.jpg new file mode 100644 index 000000000..477c7361e Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_storm@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_strike@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_strike@2x.jpg new file mode 100644 index 000000000..91f0bbfce Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_strike@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_subbase@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_subbase@2x.jpg new file mode 100644 index 000000000..7c0dbdd33 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_subbase@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_subbase@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_subbase@2x.png deleted file mode 100644 index b24c7bb30..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_subbase@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_terminal@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_terminal@2x.jpg new file mode 100644 index 000000000..66fd46e21 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_terminal@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_terminal@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_terminal@2x.png deleted file mode 100644 index a080e11a5..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_terminal@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_trailerpark@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_trailerpark@2x.jpg new file mode 100644 index 000000000..b7b58f209 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_trailerpark@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_underpass@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_underpass@2x.jpg new file mode 100644 index 000000000..18f6a7f91 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_underpass@2x.jpg differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_underpass@2x.png b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_underpass@2x.png deleted file mode 100644 index 3b92b0010..000000000 Binary files a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_underpass@2x.png and /dev/null differ diff --git a/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_vacant_dlc@2x.jpg b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_vacant_dlc@2x.jpg new file mode 100644 index 000000000..992f84f88 Binary files /dev/null and b/WebfrontCore/wwwroot/images/radar/minimaps/compass_map_mp_vacant_dlc@2x.jpg differ