/Vengeance

Permalink
Browse files

Adding forgivness endgame

1 parent 07e8ede commit 7c53da9831b4813d440c4da4621a2a0e42e5058e @asiepshtain committed Dec 1, 2017
View
496 Assets/Scenes/main.unity

Large diffs are not rendered by default.

Oops, something went wrong.
View
85 Assets/Scripts/GameManager.cs
@@ -19,6 +19,14 @@ public enum Sides { Green, Blue };
public List<Player> Friends;
public List<GameObject> projectiles;
public Player ActivePlayer;
+ private List<Vector3> greenGraves;
+ private List<Vector3> blueGraves;
+
+ private bool resetPending = false;
+ private int deathCounter = 0;
+ private bool forgivness = true;
+ private bool hugmovment = false;
+ private bool gameover = true;
/// <summary>
@@ -39,10 +47,10 @@ public enum Sides { Green, Blue };
public GameObject ForgiveOne;
public GameObject ForgiveTwo;
public SoundManager sndManager;
-
+ public GameObject[] DeathTexts;
- private bool resetPending = false;
+
// Use this for initialization
void Start()
@@ -73,14 +81,29 @@ void CharacterShotHandler(GameObject shot)
sndManager.playShot();
}
+
+ public void HugZoneEnter()
+ {
+ if (hugmovment)
+ {
+ ActivePlayer.stopRecording();
+ ActivePlayer.interactive = false;
+ ActivePlayer.GetComponent<Transform>().position = Vector3.Lerp( ActivePlayer.GetComponent<Transform>().position, new Vector3(0, -0.6f, 0), 0.04f);
+
+ gameover = true;
+ }
+
+ }
+
void CharacterHitHandler(Player p)
{
- if (AllowForgivness)
+ if (forgivness)
{
- AllowForgivness = false;
+ //forgivness = false;
+ hugmovment = false;
ForgiveOne.SetActive(false);
ForgiveTwo.SetActive(false);
- StopCoroutine("Forgiveness");
+ StopCoroutine("ForgivenessCount");
}
@@ -95,7 +118,7 @@ void CharacterHitHandler(Player p)
p.killAnim();
Invoke("resetLevel", 1);
resetPending = true;
- AllowForgivness = true;
+
}
else if ( Enemies.IndexOf(p) != -1 )
{
@@ -129,8 +152,16 @@ void resetLevel()
if (CurrentSide == Sides.Green)
background.GetComponent<Animator>().SetTrigger("flip");
-
- BlueText.SetActive(true);
+
+
+
+ //BlueText.SetActive(true);
+
+ DeathTexts[deathCounter % DeathTexts.Length].SetActive(true);
+ deathCounter++;
+
+ if (deathCounter > 5)
+ forgivness = true;
resetPending = false;
@@ -181,6 +212,11 @@ void EndCurrentLevel()
public void StartPlay()
{
level = 0;
+
+ foreach ( GameObject g in DeathTexts)
+ {
+ g.SetActive(false);
+ }
BlueText.SetActive(false);
@@ -213,29 +249,33 @@ public void StartPlay()
Enemies.Add(G);
ActivePlayer = B;
- if (AllowForgivness)
- StartCoroutine("Forgiveness");
+ if (forgivness)
+ StartCoroutine("ForgivenessCount");
}
- public IEnumerator Forgiveness()
+ public IEnumerator ForgivenessCount()
{
- yield return new WaitForSeconds(20);
+ yield return new WaitForSeconds(5);
ForgiveOne.SetActive(true);
yield return new WaitForSeconds(5);
ForgiveOne.SetActive(false);
- yield return new WaitForSeconds(15);
+ yield return new WaitForSeconds(3);
ForgiveTwo.SetActive(true);
- yield return new WaitForSeconds(10);
+ yield return new WaitForSeconds(5);
ForgiveTwo.SetActive(false);
+ yield return new WaitForSeconds(3);
+
+ hugmovment = true;
+
}
void StartNextLevel()
@@ -247,6 +287,14 @@ void StartNextLevel()
//Debug.Log("start next level");
level++;
+ Debug.Log(level);
+
+ if (level > 8)
+ {
+
+ Debug.Log("forgive");
+ forgivness = true;
+ }
if (CurrentSide == Sides.Blue)
{
@@ -371,6 +419,15 @@ void StartPlayback()
Pause();
}
+ if ( Input.GetKeyUp(KeyCode.Escape))
+ {
+ SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+ }
+
+ if ( hugmovment )
+ {
+ Enemies[0].GetComponent<Transform>().position = Vector3.Lerp(Enemies[0].GetComponent<Transform>().position, new Vector3(0, 0.4f, 0), 0.02f);
+ }
}
View
11 Assets/Scripts/Player.cs
@@ -182,11 +182,14 @@ private void EndIt()
void OnTriggerEnter2D(Collider2D other)
{
- //Debug.Log("COLLIDE");
- Destroy(other.gameObject);
+ if (other.name != "forgivness")
+ {
+ Destroy(other.gameObject);
- if (HitDetected != null )
- HitDetected(this);
+ if (HitDetected != null)
+ HitDetected(this);
+ }
+
}
// Update is called once per frame
View
BIN Assets/Sprites/d1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
76 Assets/Sprites/d1.png.meta

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
BIN Assets/Sprites/d2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
76 Assets/Sprites/d2.png.meta

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
BIN Assets/Sprites/d3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 7c53da9

Please sign in to comment.