magnus/tarkov-hax
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup and optimizations

Browse Source
This commit is contained in:
Magnus von Wachenfeldt 2017-12-08 00:58:05 +01:00
parent 76dc99eb62
commit f30c8dd5a0
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
TarkovHax/TarkovHaxBehaviour.cs
View File

@ -11,11 +11,9 @@ namespace TarkovHax
{ {
public TarkovHaxBehaviour() public TarkovHaxBehaviour()
{ {
_randomizer = new System.Random();
} }
public GameObject GameObjectHolder; private GameObject GameObjectHolder;
private System.Random _randomizer;
private IEnumerable<Player> _players; private IEnumerable<Player> _players;
private IEnumerable<LootableContainer> _lootableContainers; private IEnumerable<LootableContainer> _lootableContainers;
@ -87,15 +85,14 @@ namespace TarkovHax
private void OpenDoors() private void OpenDoors()
{ {
var doors = FindObjectsOfType<Door>(); var doors = FindObjectsOfType<Door>();
foreach (var door in doors) foreach (var door in doors.Where(d => d.DoorState == WorldInteractiveObject.EDoorState.Locked))
{
if (door.DoorState == WorldInteractiveObject.EDoorState.Locked)
{ {
door.DoorState = WorldInteractiveObject.EDoorState.Shut; door.DoorState = WorldInteractiveObject.EDoorState.Shut;
} }
} }
}
// TODO: draw in direction player is looking
// TODO: investigate why not all corpses are lootable
private void TeleportItemsToPlayer() private void TeleportItemsToPlayer()
{ {
var lootItems = FindObjectsOfType<LootItem>(); var lootItems = FindObjectsOfType<LootItem>();
@ -109,6 +106,7 @@ namespace TarkovHax
Camera.main.transform.position.z + yOffset); Camera.main.transform.position.z + yOffset);
lootItem.transform.position = newPosition; lootItem.transform.position = newPosition;
xOffset += 0.1f; xOffset += 0.1f;
yOffset += 0.1f; yOffset += 0.1f;
} }
@ -149,11 +147,8 @@ namespace TarkovHax
private void DrawLootableContainers() private void DrawLootableContainers()
{ {
foreach (var lootableContainer in _lootableContainers) foreach (var lootableContainer in _lootableContainers.Where(lc => lc.name == "weapon_box_cover"))
{ {
if (lootableContainer.name != "weapon_box_cover")
continue;
float distanceToObject = Vector3.Distance(Camera.main.transform.position, lootableContainer.transform.position); float distanceToObject = Vector3.Distance(Camera.main.transform.position, lootableContainer.transform.position);
var viewTransform = new Vector3( var viewTransform = new Vector3(
Camera.main.WorldToScreenPoint(lootableContainer.transform.position).x, Camera.main.WorldToScreenPoint(lootableContainer.transform.position).x,
@ -175,24 +170,24 @@ namespace TarkovHax
{ {
foreach (var player in _players) foreach (var player in _players)
{ {
float distanceToObject = Vector3.Distance(Camera.main.transform.position, player.Transform.position);
var playerBoundingVector = new Vector3( var playerBoundingVector = new Vector3(
Camera.main.WorldToScreenPoint(player.Transform.position).x, Camera.main.WorldToScreenPoint(player.Transform.position).x,
Camera.main.WorldToScreenPoint(player.Transform.position).y, Camera.main.WorldToScreenPoint(player.Transform.position).y,
Camera.main.WorldToScreenPoint(player.Transform.position).z); Camera.main.WorldToScreenPoint(player.Transform.position).z);
if (distanceToObject <= _maxDrawingDistance && playerBoundingVector.z > 0.01)
{
var playerHeadVector = new Vector3( var playerHeadVector = new Vector3(
Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).x, Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).x,
Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).y, Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).y,
Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).z); Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).z);
float distanceToObject = Vector3.Distance(Camera.main.transform.position, player.Transform.position);
float boxXOffset = Camera.main.WorldToScreenPoint(player.Transform.position).x; float boxXOffset = Camera.main.WorldToScreenPoint(player.Transform.position).x;
float boxYOffset = Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).y + 10f; float boxYOffset = Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).y + 10f;
float boxHeight = Math.Abs(Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).y - Camera.main.WorldToScreenPoint(player.Transform.position).y) + 10f; float boxHeight = Math.Abs(Camera.main.WorldToScreenPoint(player.PlayerBones.Head.position).y - Camera.main.WorldToScreenPoint(player.Transform.position).y) + 10f;
float boxWidth = boxHeight * 0.65f; float boxWidth = boxHeight * 0.65f;
if (distanceToObject <= _maxDrawingDistance && playerBoundingVector.z > 0.01)
{
var playerColor = player.AIData != null && player.AIData.IsAI ? Color.cyan : Color.red; var playerColor = player.AIData != null && player.AIData.IsAI ? Color.cyan : Color.red;
var espColor = player.Profile.Health.IsAlive ? playerColor : Color.white; var espColor = player.Profile.Health.IsAlive ? playerColor : Color.white;
GUI.color = espColor; GUI.color = espColor;
@ -208,10 +203,6 @@ namespace TarkovHax
var playerTextVector = GUI.skin.GetStyle(playerText).CalcSize(new GUIContent(playerText)); var playerTextVector = GUI.skin.GetStyle(playerText).CalcSize(new GUIContent(playerText));
GUI.Label(new Rect(playerBoundingVector.x - playerTextVector.x / 2f, (float)Screen.height - boxYOffset - 20f, 300f, 50f), playerText); GUI.Label(new Rect(playerBoundingVector.x - playerTextVector.x / 2f, (float)Screen.height - boxYOffset - 20f, 300f, 50f), playerText);
//var weaponInfoStyle = GUI.skin.GetStyle(player.Weapon.Template.ShortName);
//var weaponInfoVector = weaponInfoStyle.CalcSize(new GUIContent(player.Weapon.Template.ShortName));
//GUI.Label(new Rect(playerBoundingVector.x - weaponInfoVector.x / 2f, (float)Screen.height - playerBoundingVector.y + 2f, 300f, 20f), player.Weapon.Template.ShortName);
} }
} }
} }