Added glow to BBW, cleaned up some scripts

I added a glow to BBW when he is able to jump (when LRRH is in contact with him)
ribbybibby · Jan 24, 2015 · df61e60 · df61e60
1 parent 1dad3d0
commit df61e60
Show file tree

Hide file tree

Showing 27 changed files with 71 additions and 38 deletions.
diff --git a/Assets/Axe.cs b/Assets/Axe.cs
@@ -13,13 +13,7 @@ void Start ()
 		SoundManager play = GameObject.Find("SoundManager").gameObject.GetComponent<SoundManager>();
 		play.PlayWoodCutterAxe ();
 	}
-
-	// Update is called once per frame
-	void Update () 
-	{
-
-	}
-
+
 	void OnTriggerEnter2D(Collider2D other) 
 	{
 		if(other.gameObject.layer == 12 || other.gameObject.layer == 13)

diff --git a/Assets/Objects_Characters/BBW/BBW1.prefab b/Assets/Objects_Characters/BBW/BBW1.prefab
diff --git a/Assets/Objects_Characters/BBW/BBW1.prefab.meta b/Assets/Objects_Characters/BBW/BBW1.prefab.meta
diff --git a/Assets/Objects_Characters/BBW/BBW2.prefab b/Assets/Objects_Characters/BBW/BBW2.prefab
diff --git a/Assets/Objects_Characters/BBW/BBWController.cs b/Assets/Objects_Characters/BBW/BBWController.cs
@@ -17,7 +17,6 @@ public class BBWController : MonoBehaviour {
 	public bool facingRight; // Allows Melee System to tell which direction BBW is facing 
 
 
-
 	//Used to load in the textures for the swap (left text for moving left / right text for moving right)
 	public Texture leftTexture;
 	public Texture rightTexture;
@@ -29,6 +28,10 @@ public class BBWController : MonoBehaviour {
 	private float airGravity; //Incremented value for x-axis movement while in the air
 	private float origGravity; //Original gravity of the character
 	private SoundManager play; // The sound manager
+	//private Transform[] findGlowTransform;
+	//private Transform glowTransform;
+	private GameObject[] findGlow;
+	private GameObject glow;
 
 
 	// At start we set the number of jumps performed since leaving the ground to 0
@@ -46,72 +49,103 @@ void Start ()
 
 		airMoves = 1;
 		origGravity = gameObject.rigidbody2D.gravityScale;
+
+		// Find the attached Glow object
+		glow = GameObject.Find ("Glow");
+		glow.renderer.enabled = false;
 	}
 
 	// Movement controls
 	void Update () 
 	{
+		// Make sure we still have the correct Glow object
+		glow = GameObject.Find ("Glow");
+
+		//Fix rotation every update
 		transform.eulerAngles = new Vector3(0,0,0);
-		//Debug.Log(Input.GetAxis("Horizontal_PLR1"));
+
 		if (gameObject.tag == "BBW") {
 			//We check the layer to make sure its player one (layer 12)
 			// If it is we let the pad controls work fine if its not we dont cause it's not player one
 			if (gameObject.layer == 12) {
 				//Move Right
 				if (Input.GetKey (moveRight) || Input.GetAxis ("Horizontal_PLR1") > 0) {
-					if (airMoves == 1) {
+					if (airMoves == 1) 
+					{
 						transform.Translate (Vector2.right * speed * Time.deltaTime);
-					} else if (airMoves > 1) {
+					} 
+					else if (airMoves > 1) 
+					{
 						transform.Translate (Vector2.right * (speed / airMoves) * Time.deltaTime);
 						airMoves = airMoves + airMoveIncrement; 
 						gameObject.rigidbody2D.gravityScale = gameObject.rigidbody2D.gravityScale + airGravityIncrement;
 					}
-
+
+					//Switch to Right Texture, position glow
 					GameObject.Find ("BBW").gameObject.GetComponent<Renderer> ().material.SetTexture ("_MainTex", rightTexture);
+					glow.transform.localPosition = new Vector3 (-0.1f, -0.039f, 0.2f);
 					facingRight = true;
 
 				}
 				//Move Left
+				// If BBW is in the air, start to limit movement
 				if (Input.GetKey (moveLeft) || Input.GetAxis ("Horizontal_PLR1") < 0) {
-					if (airMoves == 1) {
+					if (airMoves == 1) 
+					{
 						transform.Translate (-Vector2.right * speed * Time.deltaTime);
-					} else if (airMoves > 1) {
+					} 
+					else if (airMoves > 1) 
+					{
 						transform.Translate (-Vector2.right * (speed / airMoves) * Time.deltaTime);
 						airMoves = airMoves + airMoveIncrement; 
 						gameObject.rigidbody2D.gravityScale = gameObject.rigidbody2D.gravityScale + airGravityIncrement;
 					}
-
+
+					//Switch to Left Texture, position glow
 					GameObject.Find ("BBW").gameObject.GetComponent<Renderer> ().material.SetTexture ("_MainTex", leftTexture);
+					glow.transform.localPosition = new Vector3 (0.08f, -0.04f, 0.2f);
 					facingRight = false;
 				}	
 			}else{
 			//END OF PLAYER 1 LAYER CHECK
 				if (gameObject.tag == "BBW") {
 					//Move Right
+					// If BBW is in the air, start to limit movement
 					if (Input.GetKey (moveRight)) {
-						if (airMoves == 1) {
+						if (airMoves == 1) 
+						{
 							transform.Translate (Vector2.right * speed * Time.deltaTime);
-						} else if (airMoves > 1) {
+						} 
+						else if (airMoves > 1) 
+						{
 							transform.Translate (Vector2.right * (speed / airMoves) * Time.deltaTime);
 							airMoves = airMoves + airMoveIncrement; 
 							gameObject.rigidbody2D.gravityScale = gameObject.rigidbody2D.gravityScale + airGravityIncrement;
 						}
-
+
+						//Switch to Right Texture, position glow
 						GameObject.Find ("BBW").gameObject.GetComponent<Renderer> ().material.SetTexture ("_MainTex", rightTexture);
+						glow.transform.localPosition = new Vector3 (-0.1f, -0.039f, 0.2f);
 						facingRight = true;
 
 					}
 					//Move Left
+					// If BBW is in the air, start to limit movement
 					if (Input.GetKey (moveLeft)) {
-						if (airMoves == 1) {
+						if (airMoves == 1) 
+						{
 							transform.Translate (-Vector2.right * speed * Time.deltaTime);
-						} else if (airMoves > 1) {
+						} 
+						else if (airMoves > 1) 
+						{
 							transform.Translate (-Vector2.right * (speed / airMoves) * Time.deltaTime);
 							airMoves = airMoves + airMoveIncrement; 
 							gameObject.rigidbody2D.gravityScale = gameObject.rigidbody2D.gravityScale + airGravityIncrement;
 						}
-
+
+						//Switch to Left Texture, position glow
 						GameObject.Find ("BBW").gameObject.GetComponent<Renderer> ().material.SetTexture ("_MainTex", leftTexture);
+						glow.transform.localPosition = new Vector3 (0.08f, -0.04f, 0.2f);
 						facingRight = false;
 					}
 				}
@@ -124,17 +158,18 @@ void OnTriggerEnter2D(Collider2D other)
 	{
 
 		if (other.gameObject.tag == "LRRHTrigger") {
-					if (gameObject.layer == 12) {
-
-							//Jump
-							if (Input.GetKeyDown (moveJump) || Input.GetButtonUp ("Jump")) {
-									if (jumpsMade < jumpLimit) {
-																		play.PlayJumpBBW ();
-											rigidbody2D.AddForce (Vector2.up * jumpHeight);
-											jumpsMade++;
-									}
-							}
+			glow.renderer.enabled = true;		
+			if (gameObject.layer == 12) {
+
+				//Jump
+				if (Input.GetKeyDown (moveJump) || Input.GetButtonUp ("Jump")) {
+					if (jumpsMade < jumpLimit) {
+						play.PlayJumpBBW ();
+						rigidbody2D.AddForce (Vector2.up * jumpHeight);
+						jumpsMade++;
 					}
+				}
+			}
 
 			//Jump
 			if (Input.GetKeyDown (moveJump)) {
@@ -160,6 +195,7 @@ void OnTriggerStay2D(Collider2D other)
 
 		if (other.gameObject.tag == "LRRHTrigger") 
 		{
+			glow.renderer.enabled = true;		
 			if (gameObject.layer == 12) 
 			{
 				//Jump
@@ -190,7 +226,7 @@ void OnTriggerStay2D(Collider2D other)
 
 	void OnTriggerExit2D(Collider2D other)
 	{
-
+		glow.renderer.enabled = false;		
 		if (other.gameObject.tag == "LRRHTrigger") 
 		{
 			if (gameObject.layer == 12)

diff --git a/Assets/Objects_Characters/Pickup/PickUp.prefab b/Assets/Objects_Characters/Pickup/PickUp.prefab
diff --git a/Assets/Scenes/1.unity b/Assets/Scenes/1.unity
diff --git a/Library/AssetServerCacheV3 b/Library/AssetServerCacheV3
diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt
diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/expandedItems b/Library/expandedItems
diff --git a/Library/guidmapper b/Library/guidmapper
diff --git a/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1 b/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
diff --git a/Library/metadata/3a/3a6b09fe1ede02e47bc66dddc24e8b23 b/Library/metadata/3a/3a6b09fe1ede02e47bc66dddc24e8b23
diff --git a/Library/metadata/40/40d8d533082629345bef7dd965fbd3fe b/Library/metadata/40/40d8d533082629345bef7dd965fbd3fe
diff --git a/Library/metadata/49/491c7d77f986244fb9e96434c4e82dae b/Library/metadata/49/491c7d77f986244fb9e96434c4e82dae
diff --git a/Library/metadata/70/7068d080e9d2e4a2b93a0e0c3a934f2c b/Library/metadata/70/7068d080e9d2e4a2b93a0e0c3a934f2c
diff --git a/...adata/7f/7f8eb66de2b5c444a9ce6e7a76b665b2 → ...adata/8f/8f16558f860ff4e77ab9e12c75892846 b/...adata/7f/7f8eb66de2b5c444a9ce6e7a76b665b2 → ...adata/8f/8f16558f860ff4e77ab9e12c75892846
diff --git a/LudumDare31-csharp.sln b/LudumDare31-csharp.sln
@@ -29,7 +29,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																													GlobalSection(MonoDevelopProperties) = preSolution
+																																																														GlobalSection(MonoDevelopProperties) = preSolution
 =======
 																																																					GlobalSection(MonoDevelopProperties) = preSolution
 >>>>>>> Stashed changes

diff --git a/LudumDare31.sln b/LudumDare31.sln
@@ -35,7 +35,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																												GlobalSection(MonoDevelopProperties) = preSolution
+																																																													GlobalSection(MonoDevelopProperties) = preSolution
 =======
 																																																					GlobalSection(MonoDevelopProperties) = preSolution
 >>>>>>> Stashed changes

diff --git a/LudumDare31.userprefs b/LudumDare31.userprefs
@@ -1,9 +1,12 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Objects_Characters/Cat/CatMovement.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Objects_Characters/SoundManager/SoundManager.cs">
     <Files>
-      <File FileName="Assets/Objects_Characters/Enemy1/Scripts/EnemyReceiver.cs" Line="40" Column="79" />
-      <File FileName="Assets/Objects_Characters/Cat/CatMovement.cs" Line="19" Column="63" />
+      <File FileName="Assets/Objects_Characters/SoundManager/SoundManager.cs" Line="39" Column="15" />
+      <File FileName="Assets/Objects_Characters/Pickup/PickUpBehaviour.cs" Line="30" Column="1" />
+      <File FileName="Assets/Objects_Characters/Witch/WitchController.cs" Line="152" Column="3" />
+      <File FileName="Assets/Objects_Characters/Spawn/SpawnController.cs" Line="1" Column="1" />
+      <File FileName="Assets/Axe.cs" Line="12" Column="3" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset