Skip to content

Commit 6f668bc

Browse files
committed
Added Missing interactible cases
1 parent fca76a9 commit 6f668bc

4 files changed

Lines changed: 33 additions & 21 deletions

File tree

MiniMapLibrary/Factory.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

MiniMapLibrary/MiniMapLibrary.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,4 @@
88
<PackageReference Include="Unity3D" Version="1.7.0" />
99
</ItemGroup>
1010

11-
<ItemGroup>
12-
<Folder Include="Helpers\" />
13-
</ItemGroup>
14-
1511
</Project>

MiniMapMod/MiniMapPlugin.cs

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public void Awake()
3636
Log.Init(Logger);
3737

3838
GlobalEventManager.onCharacterDeathGlobal += OnCharacterDeath;
39+
GlobalEventManager.OnInteractionsGlobal += (x, y, z) => ScanScene();
3940
}
4041

4142
private void OnCharacterDeath(object o)
@@ -51,23 +52,39 @@ private void Update()
5152
if (Input.GetKeyDown(KeyCode.M))
5253
{
5354
Enable = !Enable;
55+
56+
if (Enable == false)
57+
{
58+
Reset();
59+
}
5460
}
5561

5662
if (Enable)
5763
{
58-
Log.LogInfo($"Minimap Created({Minimap.Created})");
59-
6064
if (Minimap.Created)
6165
{
62-
Minimap.SetRotation(Camera.main.transform.rotation);
66+
if (Camera.main == null)
67+
{
68+
Reset();
69+
return;
70+
}
71+
72+
try
73+
{
74+
Minimap.SetRotation(Camera.main.transform.rotation);
75+
}
76+
catch (NullReferenceException)
77+
{
78+
Reset();
79+
return;
80+
}
6381

6482
for (int i = 0; i < TrackedObjects.Count; i++)
6583
{
6684
var item = TrackedObjects[i];
6785

6886
if (item.MinimapTransform == null)
6987
{
70-
Log.LogInfo($"Created icon for {item.gameObject.name}");
7188
item.MinimapTransform = Minimap.CreateIcon(item.InteractableType, WorldToMinimap(item.gameObject.transform.position) - WorldToMinimap(Camera.main.transform.position), this.SpriteManager);
7289
}
7390
else
@@ -103,6 +120,13 @@ private void Update()
103120
}
104121
}
105122

123+
private void Reset()
124+
{
125+
TrackedObjects.Clear();
126+
ResetGlobalDimensions();
127+
Minimap.Destroy();
128+
}
129+
106130
private void ScanScene()
107131
{
108132
ResetGlobalDimensions();
@@ -129,6 +153,10 @@ private void ScanScene()
129153

130154
RegisterTypes(typeof(BarrelInteraction), InteractableKind.Utility);
131155

156+
RegisterTypes(typeof(ScrapperController), InteractableKind.Utility);
157+
158+
RegisterTypes(typeof(GenericInteraction), InteractableKind.Special);
159+
132160
// set the values used to calculate the scaled positions in the minimap for the items
133161

134162
// at this point the global mins and maxes are set determine the differences

MiniMapMod/Minimap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private GameObject CreateMask()
154154
mask.AddComponent<CanvasRenderer>();
155155
//mask.AddComponent<Image>();
156156

157-
//mask.AddComponent<Mask>();
157+
mask.AddComponent<Mask>();
158158

159159
LayoutElement element = mask.AddComponent<LayoutElement>();
160160

0 commit comments

Comments
 (0)