aboutsummaryrefslogtreecommitdiffstats
path: root/Assets/Scripts/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/Core')
-rw-r--r--Assets/Scripts/Core/Interfaces/IFollowable.cs1
-rw-r--r--Assets/Scripts/Core/Rope.cs16
-rw-r--r--Assets/Scripts/Core/RopeNoSwing.cs11
-rw-r--r--Assets/Scripts/Core/RopeNoSwing.cs.meta11
-rw-r--r--Assets/Scripts/Core/Stats.cs5
5 files changed, 37 insertions, 7 deletions
diff --git a/Assets/Scripts/Core/Interfaces/IFollowable.cs b/Assets/Scripts/Core/Interfaces/IFollowable.cs
index 92320de..4184c2e 100644
--- a/Assets/Scripts/Core/Interfaces/IFollowable.cs
+++ b/Assets/Scripts/Core/Interfaces/IFollowable.cs
@@ -12,6 +12,7 @@ namespace MontanaJohns.Core.Interfaces
{
Vector3 pos = MainCamera.transform.position;
pos.x = Mathf.Lerp(ActorTransform.position.x, MainCamera.transform.position.x, 0.25f);
+ pos.y = Mathf.Lerp(ActorTransform.position.y, MainCamera.transform.position.y, 0.25f);
MainCamera.transform.position = pos;
}
}
diff --git a/Assets/Scripts/Core/Rope.cs b/Assets/Scripts/Core/Rope.cs
index aff295a..0e12382 100644
--- a/Assets/Scripts/Core/Rope.cs
+++ b/Assets/Scripts/Core/Rope.cs
@@ -17,7 +17,7 @@ public class Rope : MonoBehaviour
protected bool ropeCreated = false;
// Start is called before the first frame update
- private void Start()
+ protected void Start()
{
player = GameObject.FindGameObjectWithTag("Player");
dj = GetComponent<DistanceJoint2D>();
@@ -36,18 +36,22 @@ public class Rope : MonoBehaviour
}
// Update is called once per frame
- private void Update()
+ protected void Update()
{
if (!ropeCreated)
{
CreateRope();
ropeCreated = true;
}
+ else
+ {
+
+ }
RenderLine();
Simulate();
}
- private void RenderLine()
+ protected void RenderLine()
{
for (int i = 0; i < ropePositions.Length; i++)
{
@@ -56,14 +60,14 @@ public class Rope : MonoBehaviour
lr.SetPositions(ropePositions);
}
- private void CreateRope()
+ protected void CreateRope()
{
dj.connectedBody = player.GetComponent<Rigidbody2D>();
dj.maxDistanceOnly = true;
dj.distance = Vector2.Distance(player.transform.position, transform.position);
}
- private void Simulate()
+ protected void Simulate()
{
Vector2 gravityForce = new Vector2(0f, -gravityMultiplier);
@@ -83,7 +87,7 @@ public class Rope : MonoBehaviour
}
}
- private void ApplyContraint()
+ protected void ApplyContraint()
{
RopeSegment endSegment1 = ropeSegments[0];
endSegment1.posNow = transform.position;
diff --git a/Assets/Scripts/Core/RopeNoSwing.cs b/Assets/Scripts/Core/RopeNoSwing.cs
new file mode 100644
index 0000000..84ce1e3
--- /dev/null
+++ b/Assets/Scripts/Core/RopeNoSwing.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RopeNoSwing : Rope
+{
+ protected new void Update()
+ {
+ RenderLine();
+ Simulate();
+ }
+}
diff --git a/Assets/Scripts/Core/RopeNoSwing.cs.meta b/Assets/Scripts/Core/RopeNoSwing.cs.meta
new file mode 100644
index 0000000..a08048a
--- /dev/null
+++ b/Assets/Scripts/Core/RopeNoSwing.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6d8b5c110f12ee048a9dbe9c32e5ef65
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Core/Stats.cs b/Assets/Scripts/Core/Stats.cs
index 6916005..aac6fe7 100644
--- a/Assets/Scripts/Core/Stats.cs
+++ b/Assets/Scripts/Core/Stats.cs
@@ -24,6 +24,7 @@ namespace MontanaJohns.Core
[SerializeField] public float speedMultiplier;
[SerializeField] public int maxJumps;
[SerializeField] public float jumpForce;
+ [SerializeField] public int damage;
public static Stats operator +(Stats x, Stats y)
{
@@ -32,7 +33,8 @@ namespace MontanaJohns.Core
maxHealth = x.maxHealth + y.maxHealth,
speedMultiplier = x.speedMultiplier + y.speedMultiplier,
maxJumps = x.maxJumps + y.maxJumps,
- jumpForce = x.jumpForce + y.jumpForce
+ jumpForce = x.jumpForce + y.jumpForce,
+ damage = x.damage + y.damage,
};
}
@@ -44,6 +46,7 @@ namespace MontanaJohns.Core
speedMultiplier = 1,
maxJumps = 1,
jumpForce = 500f,
+ damage = 0,
};
}
}