dangerbear/JourneyProject3
1
0
Fork 0
forked from Wireline-Studios/JourneyProject
Code Pull Requests Activity

w

Browse Source
This commit is contained in:
Garrett Kaiser
2026-02-04 14:03:52 -08:00
parent 65001c0ecb
commit 9ab4578f31
11 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Scripts/IntroWagon.cs
View File

@@ -108,8 +108,17 @@ public class IntroWagon : MonoBehaviour
transform.rotation = Quaternion.Euler(currentEuler);
transform.position += transform.forward * 2.25f * Time.deltaTime;
player.transform.position = Vector3.MoveTowards(player.transform.position, playerKeeper.transform.position, Mathf.Infinity * Time.deltaTime);
npc.transform.position = Vector3.MoveTowards(npc.transform.position, npcKeeper.transform.position, Mathf.Infinity * Time.deltaTime);
if (Time.deltaTime > 0)
{
player.transform.position = Vector3.MoveTowards(player.transform.position, playerKeeper.transform.position, Mathf.Infinity * Time.deltaTime);
npc.transform.position = Vector3.MoveTowards(npc.transform.position, npcKeeper.transform.position, Mathf.Infinity * Time.deltaTime);
}
else
{
player.transform.position = Vector3.MoveTowards(player.transform.position, playerKeeper.transform.position, Mathf.Infinity);
npc.transform.position = Vector3.MoveTowards(npc.transform.position, npcKeeper.transform.position, Mathf.Infinity);
}
npc.transform.rotation = npcKeeper.transform.rotation;
player.GetComponent<PlayerMovement>().energy = 0;
@@ -120,7 +129,7 @@ public class IntroWagon : MonoBehaviour
timer3 += Time.deltaTime;
if (timer3 > .8 && timer3 < .9)
{
npc.GetComponent<MouthOpenClose>().whatToSay = "You had me scared for a moment there!";
npc.GetComponent<MouthOpenClose>().whatToSay = "It looks like the city is under attack!";
npc.gameObject.GetComponent<MouthOpenClose>().interacted = true;
npc.gameObject.GetComponent<MouthOpenClose>().prompt.SetActive(false);

19
Assets/Scripts/PlayerMovement.cs
View File

@@ -120,14 +120,13 @@ public class PlayerMovement : MonoBehaviour
moveInput = walkAction.ReadValue<Vector2>();
if (runAction.WasPressedThisFrame() && moveAnimationInputY == 1 && !running)
if (runAction.WasPressedThisFrame() && !running)
{
running = true;
}
else if (runAction.WasPressedThisFrame() && moveAnimationInputY == 2 && running)
else if (runAction.WasPressedThisFrame() && running)
{
running = false;
moveAnimationInputY = 1;
}
playerCam.lookInput = lookAction.ReadValue<Vector2>();
@@ -285,18 +284,18 @@ public class PlayerMovement : MonoBehaviour
//Debug.Log(controller.isGrounded);
if (canWalk /*&& !running*/)
if (canWalk && !running)
{
Vector3 move = new Vector3(moveInput.x * speed, 0, moveInput.y * speed);
Vector3 move2 = transform.TransformDirection(move);
controller.Move(move2 * Time.deltaTime);
}
//else if (canWalk && running)
//{
// Vector3 move = new Vector3(moveInput.x * speed, 0, moveInput.y * runSpeed);
// Vector3 move2 = transform.TransformDirection(move);
// controller.Move(move2 * Time.deltaTime);
//}
else if (canWalk && running)
{
Vector3 move = new Vector3(moveInput.x * speed, 0, moveInput.y * runSpeed);
Vector3 move2 = transform.TransformDirection(move);
controller.Move(move2 * Time.deltaTime);
}
controller.Move(velocity * Time.deltaTime);
}
private void MyInput()