Merge remote-tracking branch 'origin/dev' into TeamSelection

mat.aules · mat.aules · commit 53529916c3a0 · 2017-10-17T15:09:29.000+02:00
diff --git a/SlothWars/Assets/Scenes/default_scene.unity b/SlothWars/Assets/Scenes/default_scene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657856, g: 0.49641234, b: 0.57481724, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -77,17 +77,15 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
+    m_PVRFiltering: 0
     m_PVRFilteringMode: 1
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
     m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_PVRFilteringAtrousColorSigma: 1
+    m_PVRFilteringAtrousNormalSigma: 1
+    m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -299,7 +297,12 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 1878489649262260, guid: 49710df063248494fbb28fe741dc775b, type: 2}
       propertyPath: m_Name
-      value: gunSlothTeamA
+      value: GUN
+      objectReference: {fileID: 0}
+    - target: {fileID: 114500882488181320, guid: 49710df063248494fbb28fe741dc775b,
+        type: 2}
+      propertyPath: m_Enabled
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 49710df063248494fbb28fe741dc775b, type: 2}
@@ -804,6 +807,19 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9217be4c5654d8545809336a807839ac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &479133157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 479133150}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 43b2eecf02afb5e44a261d2f02b03a2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Projectile: {fileID: 1897508314032064, guid: 37ba6968a8d4194479ad619a3904d2e1, type: 2}
+  ForceBar: {fileID: 1638866425143238, guid: bac708725c5b2d94ba3edc48c75ec110, type: 2}
 --- !u!1 &491567807
 GameObject:
   m_ObjectHideFlags: 0
@@ -2092,6 +2108,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 112
   m_CollisionDetection: 0
+--- !u!114 &1441490849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1441490842}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 43b2eecf02afb5e44a261d2f02b03a2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Projectile: {fileID: 1897508314032064, guid: 37ba6968a8d4194479ad619a3904d2e1, type: 2}
+  ForceBar: {fileID: 1638866425143238, guid: bac708725c5b2d94ba3edc48c75ec110, type: 2}
 --- !u!1 &1442695950
 GameObject:
   m_ObjectHideFlags: 0
@@ -2444,7 +2473,12 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 1878489649262260, guid: 49710df063248494fbb28fe741dc775b, type: 2}
       propertyPath: m_Name
-      value: gunSlothTeamB
+      value: GUN
+      objectReference: {fileID: 0}
+    - target: {fileID: 114500882488181320, guid: 49710df063248494fbb28fe741dc775b,
+        type: 2}
+      propertyPath: m_Enabled
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 49710df063248494fbb28fe741dc775b, type: 2}
diff --git a/SlothWars/Assets/Scripts/ChangeTurn.cs b/SlothWars/Assets/Scripts/ChangeTurn.cs
@@ -26,21 +26,21 @@ private void Start()
         slothTurnB = 0;
 
         slothTeamA = new List<GameObject>();
-        gunSlothTeamA = new List<GameObject>();
+        //gunSlothTeamA = new List<GameObject>();
 
         slothTeamB = new List<GameObject>();
-        gunSlothTeamB = new List<GameObject>();
+        //gunSlothTeamB = new List<GameObject>();
 
         managerTeam = GameObject.Find("managerTeam");
     }
 
     private void Update()
     {
         slothTeamA = managerTeam.GetComponent<CreateSloth>().teamA;
-        gunSlothTeamA = managerTeam.GetComponent<CreateSloth>().gunsTeamA;
+        //gunSlothTeamA = managerTeam.GetComponent<CreateSloth>().gunsTeamA;
 
         slothTeamB = managerTeam.GetComponent<CreateSloth>().teamB;
-        gunSlothTeamB = managerTeam.GetComponent<CreateSloth>().gunsTeamB;
+        //gunSlothTeamB = managerTeam.GetComponent<CreateSloth>().gunsTeamB;
 
     }
 
@@ -51,43 +51,44 @@ public void DeactivateAllExceptOne(List<GameObject> slothTeamA, List<GameObject>
         {
             sloth.GetComponent<Animator>().enabled = false;
             sloth.GetComponent<player>().enabled = false;
-            
+            sloth.GetComponent<ShotScript>().enabled = false;
         }
 
-        foreach (GameObject gun in gunSlothTeamB)
+        /*foreach (GameObject gun in gunSlothTeamB)
         {
             gun.GetComponent<ShotScript>().enabled = false;
-        }
+        }*/
 
         for (int i = 1; i<slothTeamA.Count; i++)
         {
             slothTeamA[i].GetComponent<Animator>().enabled = false;
             slothTeamA[i].GetComponent<player>().enabled = false;
+            slothTeamA[i].GetComponent<ShotScript>().enabled = false;
         }
-
+        /*
         for (int i = 1; i < slothTeamA.Count; i++)
         {
             gunSlothTeamA[i].GetComponent<ShotScript>().enabled = false;
         
-        }
+        }*/
     }
 
     // Functions to activate and deactivate sloth's animations
-    private void ActivateSloth(GameObject slothTeam, GameObject gunTeamSloth)
+    private void ActivateSloth(GameObject slothTeam)
     {
         slothTeam.GetComponent<Animator>().enabled = true;
         slothTeam.GetComponent<player>().enabled = true;
-        gunTeamSloth.GetComponent<ShotScript>().enabled = true;
+        slothTeam.GetComponent<ShotScript>().enabled = true;
 
 
     }
 
-    private void DeactivateSloth(GameObject slothTeam, GameObject gunTeamSloth)
+    private void DeactivateSloth(GameObject slothTeam)
     {
         
         slothTeam.GetComponent<Animator>().enabled = false;
         slothTeam.GetComponent<player>().enabled = false;
-        gunTeamSloth.GetComponent<ShotScript>().enabled = false;
+        slothTeam.GetComponent<ShotScript>().enabled = false;
 
     
     }
@@ -105,8 +106,8 @@ public void FinishTurn()
         if (endTurnOfSloth)
         {
             endTurnOfSloth = false;
-            DeactivateSloth(slothTeamB[slothTurnB], gunSlothTeamA[slothTurnB]);
-            ActivateSloth(slothTeamA[slothTurnA], gunSlothTeamA[slothTurnA]);
+            DeactivateSloth(slothTeamB[slothTurnB]); // DeactivateSloth(slothTeamB[slothTurnB], gunSlothTeamA[slothTurnB])
+            ActivateSloth(slothTeamA[slothTurnA]);
             slothTurnB += 1;
             if(slothTurnB == slothTeamB.Count)
             {
@@ -120,8 +121,8 @@ it will change the variable to false.*/
         else
         {
             endTurnOfSloth = true;
-            DeactivateSloth(slothTeamA[slothTurnA], gunSlothTeamA[slothTurnA]);
-            ActivateSloth(slothTeamB[slothTurnB], gunSlothTeamB[slothTurnB]);
+            DeactivateSloth(slothTeamA[slothTurnA]);
+            ActivateSloth(slothTeamB[slothTurnB]);
             slothTurnA += 1;
             if (slothTurnA == slothTeamA.Count)
             {
diff --git a/SlothWars/Assets/Scripts/CreateSloth.cs b/SlothWars/Assets/Scripts/CreateSloth.cs
@@ -13,23 +13,23 @@ public class CreateSloth : MonoBehaviour {
 	void Start(){
 
 		teamA = new List<GameObject>();
-        gunsTeamA = new List<GameObject>();
+        //gunsTeamA = new List<GameObject>();
 
 		teamB = new List<GameObject>();
-        gunsTeamB = new List<GameObject>();
+        //gunsTeamB = new List<GameObject>();
 
         slothTeamA = GameObject.Find ("avatarSlothTeamA");
         teamA.Add(slothTeamA);
        
-        gunSlothTeamA = GameObject.Find("gunSlothTeamA");
-        gunsTeamA.Add(gunSlothTeamA);
+        //gunSlothTeamA = GameObject.Find("gunSlothTeamA");
+        //gunsTeamA.Add(gunSlothTeamA);
 
 
         slothTeamB = GameObject.Find ("avatarSlothTeamB");
         teamB.Add(slothTeamB);
 
-        gunSlothTeamB = GameObject.Find("gunSlothTeamB");
-        gunsTeamB.Add(gunSlothTeamB);
+        //gunSlothTeamB = GameObject.Find("gunSlothTeamB");
+        //gunsTeamB.Add(gunSlothTeamB);
 
 
 		CreateTeamA ();
@@ -39,26 +39,26 @@ void Start(){
 	public void CreateTeamA(){
 		for (int i = 0; i < 3; i++) {
 			GameObject newSlothTeamA = Instantiate(slothTeamA);
-			GameObject newGunTeamA = Instantiate(gunSlothTeamA);
+			//GameObject newGunTeamA = Instantiate(gunSlothTeamA);
 
 			newSlothTeamA.transform.position = new Vector3 (-teamA.Count - 1, 0.5F, 0);
-			newGunTeamA.transform.position = new Vector3(-gunsTeamA.Count - 1, 0.5F, 0);
+			//newGunTeamA.transform.position = new Vector3(-gunsTeamA.Count - 1, 0.5F, 0);
 
 			teamA.Add (newSlothTeamA);
-			gunsTeamA.Add(newGunTeamA);
+			//gunsTeamA.Add(newGunTeamA);
 		}
 	}
 
 	public void CreateTeamB(){
 		for (int i = 0; i < 3; i++) {
 			GameObject newSlothTeamB = Instantiate(slothTeamB);
-			GameObject newGunTeamB = Instantiate(gunSlothTeamB);
+			//GameObject newGunTeamB = Instantiate(gunSlothTeamB);
 
 			newSlothTeamB.transform.position = new Vector3 (teamB.Count + 1, 0.5F, 0);
-			newGunTeamB.transform.position = new Vector3(+gunsTeamB.Count + 1, 0.5F, 0);
+			//newGunTeamB.transform.position = new Vector3(+gunsTeamB.Count + 1, 0.5F, 0);
 
 			teamB.Add (newSlothTeamB);
-			gunsTeamB.Add(newGunTeamB);
+			//gunsTeamB.Add(newGunTeamB);
 		}
 	}
 
@@ -68,13 +68,13 @@ public void CreateSlothTeamA () {
         {
 
 			GameObject newSlothTeamA = Instantiate(slothTeamA);
-            GameObject newGunTeamA = Instantiate(gunSlothTeamA);
+            //GameObject newGunTeamA = Instantiate(gunSlothTeamA);
 
 			newSlothTeamA.transform.position = new Vector3 (-teamA.Count - 1, 0.5F, 0);
-            newGunTeamA.transform.position = new Vector3(-gunsTeamA.Count - 1, 0.5F, 0);
+            //newGunTeamA.transform.position = new Vector3(-gunsTeamA.Count - 1, 0.5F, 0);
 
             teamA.Add (newSlothTeamA);
-            gunsTeamA.Add(newGunTeamA);
+            //gunsTeamA.Add(newGunTeamA);
 		}
 
 	}
@@ -98,13 +98,13 @@ public void CreateSlothTeamB () {
         {
 
 			GameObject newSlothTeamB = Instantiate(slothTeamB);
-            GameObject newGunTeamB = Instantiate(gunSlothTeamB);
+            //GameObject newGunTeamB = Instantiate(gunSlothTeamB);
 
 			newSlothTeamB.transform.position = new Vector3 (+teamB.Count + 1, 0.5F, 0);
-            newGunTeamB.transform.position = new Vector3(-gunsTeamB.Count - 1, 0.5F, 0);
+            //newGunTeamB.transform.position = new Vector3(-gunsTeamB.Count - 1, 0.5F, 0);
 
             teamB.Add (newSlothTeamB);
-            gunsTeamB.Add(newGunTeamB);
+            //gunsTeamB.Add(newGunTeamB);
 
         }
 
diff --git a/SlothWars/Assets/Scripts/HealthScript.cs b/SlothWars/Assets/Scripts/HealthScript.cs
@@ -13,21 +13,21 @@ void Start () {
 	}
 	// Update is called once per frame
 	void Update () {
-        float inputH = Input.GetAxis("Horizontal");
-        if (inputH > 0)
-        {
-            text.transform.eulerAngles = new Vector3(0, 0, 0);
-            text.transform.localPosition = new Vector3(0, 3, -0.5f);
-        }
-        if (inputH < 0)
-        {
-            text.transform.eulerAngles = new Vector3(0, 360,0);
-            text.transform.localPosition = new Vector3(0, 3, 0.5f);
-        }
+     
     }
     public void TakeDamage(int d)
     {
         health -= d;
         text.text = "" + health;
     }
+    public void turnRight()
+    {
+        text.transform.eulerAngles = new Vector3(0, 0, 0);
+        text.transform.localPosition = new Vector3(0, 3, -0.5f);
+    }
+    public void turnLeft()
+    {
+        text.transform.eulerAngles = new Vector3(0, 360, 0);
+        text.transform.localPosition = new Vector3(0, 3, 0.5f);
+    }
 }
diff --git a/SlothWars/Assets/Scripts/ShotScript.cs b/SlothWars/Assets/Scripts/ShotScript.cs
@@ -9,33 +9,37 @@ public class ShotScript : MonoBehaviour {
     private int rotate = 0;
     private float baseForce= 700;
     bool shotLoad = false;
+    bool mov = false;
     ForceBarScript st;
 	//initialization
 	void Start () {
-        gun = GetComponent<Transform>();
+        gun = this.GetComponentInChildren<Transform>().Find("GUN");
 
     }
 	// creates a force bar with the first Q , shoots with the second Q and aims with the vertical axis 
 	void Update () {
-        gun.Rotate(0 , 0, Time.deltaTime * Input.GetAxis("Vertical")*100);
-        float inputH = Input.GetAxis("Horizontal");
-        if (inputH > 0)
+        if (!mov)
         {
-            rotate = 0;
-        }
-        if (inputH < 0)
-        {
-            rotate = 1;
-        }
-        if (Input.GetKeyDown(KeyCode.Q))
-        {
-            if (!shotLoad)
+            gun.Rotate(0, 0, Time.deltaTime * Input.GetAxis("Vertical") * 100);
+            float inputH = Input.GetAxis("Horizontal");
+            if (inputH > 0)
+            {
+                rotate = 0;
+            }
+            if (inputH < 0)
             {
-                Bar();
+                rotate = 1;
             }
-            else
+            if (Input.GetKeyDown(KeyCode.Q))
             {
-                ShootAfterBar();
+                if (!shotLoad)
+                {
+                    Bar();
+                }
+                else
+                {
+                    ShootAfterBar();
+                }
             }
         }
 	}
@@ -56,4 +60,12 @@ private void ShootAfterBar()
         st.Destroy();
         shotLoad = false;
     }
+    public void IsMoving()
+    {
+        mov = true;
+    }
+    public void IsNotMoving()
+    {
+        mov = false;
+    }
 }
diff --git a/SlothWars/Assets/Scripts/player.cs b/SlothWars/Assets/Scripts/player.cs

Original file line number	Diff line number	Diff line change
`@@ -26,21 +26,21 @@ private void Start()`
`26`	`26`	`slothTurnB = 0;`
`27`	`27`
`28`	`28`	`slothTeamA = new List<GameObject>();`
`29`		`- gunSlothTeamA = new List<GameObject>();`
	`29`	`+ //gunSlothTeamA = new List<GameObject>();`
`30`	`30`
`31`	`31`	`slothTeamB = new List<GameObject>();`
`32`		`- gunSlothTeamB = new List<GameObject>();`
	`32`	`+ //gunSlothTeamB = new List<GameObject>();`
`33`	`33`
`34`	`34`	`managerTeam = GameObject.Find("managerTeam");`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private void Update()`
`38`	`38`	`{`
`39`	`39`	`slothTeamA = managerTeam.GetComponent<CreateSloth>().teamA;`
`40`		`- gunSlothTeamA = managerTeam.GetComponent<CreateSloth>().gunsTeamA;`
	`40`	`+ //gunSlothTeamA = managerTeam.GetComponent<CreateSloth>().gunsTeamA;`
`41`	`41`
`42`	`42`	`slothTeamB = managerTeam.GetComponent<CreateSloth>().teamB;`
`43`		`- gunSlothTeamB = managerTeam.GetComponent<CreateSloth>().gunsTeamB;`
	`43`	`+ //gunSlothTeamB = managerTeam.GetComponent<CreateSloth>().gunsTeamB;`
`44`	`44`
`45`	`45`	`}`
`46`	`46`
`@@ -51,43 +51,44 @@ public void DeactivateAllExceptOne(List<GameObject> slothTeamA, List<GameObject>`
`51`	`51`	`{`
`52`	`52`	`sloth.GetComponent<Animator>().enabled = false;`
`53`	`53`	`sloth.GetComponent<player>().enabled = false;`
`54`		`-`
	`54`	`+ sloth.GetComponent<ShotScript>().enabled = false;`
`55`	`55`	`}`
`56`	`56`
`57`		`- foreach (GameObject gun in gunSlothTeamB)`
	`57`	`+ /*foreach (GameObject gun in gunSlothTeamB)`
`58`	`58`	`{`
`59`	`59`	`gun.GetComponent<ShotScript>().enabled = false;`
`60`		`- }`
	`60`	`+ }*/`
`61`	`61`
`62`	`62`	`for (int i = 1; i<slothTeamA.Count; i++)`
`63`	`63`	`{`
`64`	`64`	`slothTeamA[i].GetComponent<Animator>().enabled = false;`
`65`	`65`	`slothTeamA[i].GetComponent<player>().enabled = false;`
	`66`	`+ slothTeamA[i].GetComponent<ShotScript>().enabled = false;`
`66`	`67`	`}`
`67`		`-`
	`68`	`+ /*`
`68`	`69`	`for (int i = 1; i < slothTeamA.Count; i++)`
`69`	`70`	`{`
`70`	`71`	`gunSlothTeamA[i].GetComponent<ShotScript>().enabled = false;`
`71`	`72`
`72`		`- }`
	`73`	`+ }*/`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`// Functions to activate and deactivate sloth's animations`
`76`		`- private void ActivateSloth(GameObject slothTeam, GameObject gunTeamSloth)`
	`77`	`+ private void ActivateSloth(GameObject slothTeam)`
`77`	`78`	`{`
`78`	`79`	`slothTeam.GetComponent<Animator>().enabled = true;`
`79`	`80`	`slothTeam.GetComponent<player>().enabled = true;`
`80`		`- gunTeamSloth.GetComponent<ShotScript>().enabled = true;`
	`81`	`+ slothTeam.GetComponent<ShotScript>().enabled = true;`
`81`	`82`
`82`	`83`
`83`	`84`	`}`
`84`	`85`
`85`		`- private void DeactivateSloth(GameObject slothTeam, GameObject gunTeamSloth)`
	`86`	`+ private void DeactivateSloth(GameObject slothTeam)`
`86`	`87`	`{`
`87`	`88`
`88`	`89`	`slothTeam.GetComponent<Animator>().enabled = false;`
`89`	`90`	`slothTeam.GetComponent<player>().enabled = false;`
`90`		`- gunTeamSloth.GetComponent<ShotScript>().enabled = false;`
	`91`	`+ slothTeam.GetComponent<ShotScript>().enabled = false;`
`91`	`92`
`92`	`93`
`93`	`94`	`}`
`@@ -105,8 +106,8 @@ public void FinishTurn()`
`105`	`106`	`if (endTurnOfSloth)`
`106`	`107`	`{`
`107`	`108`	`endTurnOfSloth = false;`
`108`		`- DeactivateSloth(slothTeamB[slothTurnB], gunSlothTeamA[slothTurnB]);`
`109`		`- ActivateSloth(slothTeamA[slothTurnA], gunSlothTeamA[slothTurnA]);`
	`109`	`+ DeactivateSloth(slothTeamB[slothTurnB]); // DeactivateSloth(slothTeamB[slothTurnB], gunSlothTeamA[slothTurnB])`
	`110`	`+ ActivateSloth(slothTeamA[slothTurnA]);`
`110`	`111`	`slothTurnB += 1;`
`111`	`112`	`if(slothTurnB == slothTeamB.Count)`
`112`	`113`	`{`
`@@ -120,8 +121,8 @@ it will change the variable to false.*/`
`120`	`121`	`else`
`121`	`122`	`{`
`122`	`123`	`endTurnOfSloth = true;`
`123`		`- DeactivateSloth(slothTeamA[slothTurnA], gunSlothTeamA[slothTurnA]);`
`124`		`- ActivateSloth(slothTeamB[slothTurnB], gunSlothTeamB[slothTurnB]);`
	`124`	`+ DeactivateSloth(slothTeamA[slothTurnA]);`
	`125`	`+ ActivateSloth(slothTeamB[slothTurnB]);`
`125`	`126`	`slothTurnA += 1;`
`126`	`127`	`if (slothTurnA == slothTeamA.Count)`
`127`	`128`	`{`