Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

# Conflicts:
#	Assets/_Game/Data/Player Data/Movement Data/Movement States.asset

.gitlab-ci.yml

@@ -16,6 +16,28 @@ variables:
         variables:
             - $RUN_NON_RELEASE_BUILDS
 
+.release_build:
+    artifacts:
+        expire_in: 1 week
+
+WebGL [Release]:
+    when: on_success
+
+pages:
+    when: on_success
+    start_in:
+
+Deploy Nextcloud:
+    when: manual
+    allow_failure: false
+    start_in:
+
+Release:
+    when: manual
+    allow_failure: false
+    dependencies:
+        - Deploy Nextcloud
+
 include:
 # Base
     - https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/build-base.yml

Assets/_Game/Data/Player Data/Movement Data/Movement States.asset

@@ -13,47 +13,47 @@ MonoBehaviour:
   m_Name: Movement States
   m_EditorClassIdentifier: Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
   airMoveState:
-    jumpForce: 13
+    jumpForce: 10
     smoothing: 0.03
     airControl: 1
     canSwim: 1
-    moveSpeed: 35
+    moveSpeed: 30
     maxJumpCount: 5
     mass: 0.1
-    gravity: 1
+    gravity: 0.5
   earthMoveState:
-    jumpForce: 2
+    jumpForce: 100
     smoothing: 0.03
     airControl: 1
     canSwim: 0
-    moveSpeed: 35
+    moveSpeed: 15
     maxJumpCount: 1
-    mass: 5
-    gravity: 1
+    mass: 60
+    gravity: 3
   fireMoveState:
-    jumpForce: 13
+    jumpForce: 15
     smoothing: 0.03
     airControl: 1
     canSwim: 1
-    moveSpeed: 35
-    maxJumpCount: 1
+    moveSpeed: 20
+    maxJumpCount: 2
     mass: 1
-    gravity: 1
+    gravity: 3
   waterMoveState:
-    jumpForce: 13
+    jumpForce: 10
     smoothing: 0.03
     airControl: 1
     canSwim: 1
-    moveSpeed: 35
+    moveSpeed: 20
     maxJumpCount: 1
-    mass: 5
-    gravity: 1
+    mass: 1
+    gravity: 3
   defaultMoveState:
-    jumpForce: 13
+    jumpForce: 15
     smoothing: 0.03
     airControl: 1
     canSwim: 1
-    moveSpeed: 35
+    moveSpeed: 30
     maxJumpCount: 1
     mass: 1
     gravity: 3

Assets/_Game/Data/Player Data/PlayerState.asset

@@ -12,15 +12,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
   m_Name: PlayerState
   m_EditorClassIdentifier: 
-  currentInfusedElement: 2
+  currentInfusedElement: 1
   currentMoveState:
-    jumpForce: 10
+    jumpForce: 15
     smoothing: 0.03
     airControl: 1
     canSwim: 1
     moveSpeed: 20
-    maxJumpCount: 1
+    maxJumpCount: 2
     mass: 1
     gravity: 3
   movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
-  charges: 2
+  onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
+  onChargeChange: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
+  charges: 0

Assets/_Game/Scenes/Pick_Up_Test_Scene.unity

@@ -956,6 +956,12 @@ PrefabInstance:
       propertyPath: m_MaxJumpCount
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: r_State
+      value: 
+      objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
+        type: 2}
     - target: {fileID: 6060985002925283250, guid: 2e3528907311e438dab0d393127aa332,
         type: 3}
       propertyPath: lowJumpMultiplier
@@ -1000,7 +1006,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 83eb4399ff535ee4cbc76de3b8a32e46, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Cooldown: 0
+  cooldown: 0
   volleySize: 10
   launchPower: 10
   attackSpeed: 0.1
@@ -1018,6 +1024,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ad90db0185377664288543ce4696c6b8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cooldown: 0
+  massIncrease: 0
+  isStomping: 0
 --- !u!114 &1876157330
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1049,8 +1058,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   state: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
-  onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
-  onChargeChange: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
+  onElementChanged: {fileID: 0}
 --- !u!4 &1876157337 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,

Assets/_Game/Scripts/Elements/InteractionObject.cs

 using UnityEngine;
+using _Game.Scripts.Scriptable_Object;
 
 namespace _Game.Scripts.Elements
 {
 	public class InteractionObject : MonoBehaviour
 	{
+		[SerializeField] private InfusedElement element;
 		public void InfuseElement()
 		{
 			//this.GetComponent<SpriteRenderer>().color = Color.green;
 			Debug.Log("Infused " + this.gameObject.tag);
 		}
+
+		public InfusedElement GetElement()
+		{
+			return element;
+		}
 	}
 }

Assets/_Game/Scripts/Player/InputController.cs

@@ -5,11 +5,11 @@ using UnityEngine;
 [RequireComponent(typeof(MovementController))]
 public class InputController : MonoBehaviour {
 
-    private MovementController m_Controller;
+	private MovementController m_Controller;
     private float m_XAxis, m_YAxis;
     private bool m_Jump = false;
 
-    void Start () { 
+    void Start () {
         //Sucht nach MovementController auf dem selben Gameobject
         m_Controller = GetComponent<MovementController>();
     }
@@ -24,4 +24,4 @@ public class InputController : MonoBehaviour {
         //Ruft Move Methode im MovementController auf dient der Bewegung des Charakters
 		m_Controller.Move(new Vector2(m_XAxis, m_YAxis), m_Jump);
     }
-}
\ No newline at end of file
+}

Assets/_Game/Scripts/Player/MovementController.cs

@@ -17,8 +17,9 @@ public class MovementController : MonoBehaviour
 	[SerializeField] private bool m_AirControl = false; // Whether or not a player can steer while jumping;
 	[SerializeField] private bool m_CanSwim = true;
 
-	[Header("Ground Check Control")]
-	[SerializeField] private LayerMask m_WhatIsGround; // A mask determining what is ground to the character
+	[Header("Ground Check Control")] [SerializeField]
+	private LayerMask m_WhatIsGround; // A mask determining what is ground to the character
+
 	[SerializeField] private Transform m_GroundCheck; // A position marking where to check if the player is grounded.
 	[SerializeField] private float m_GroundCheckDistance = 1.5f;
 	[SerializeField] private float m_GroundedRadius = .2f;
@@ -47,19 +48,6 @@ public class MovementController : MonoBehaviour
 	public UnityEvent OnSwimEvent;
 	public UnityEvent OnJumpEvent;
 
-
-	public void SetMovementParameters(MovementState state)
-	{
-		m_JumpForce = state.jumpForce;
-		m_MovementSmoothing = state.smoothing;
-		m_AirControl = state.airControl;
-		m_CanSwim = state.canSwim;
-		m_Speed = state.moveSpeed;
-		m_MaxJumpCount = state.maxJumpCount;
-		m_Rigidbody2D.mass = state.mass;
-		m_Rigidbody2D.gravityScale = state.gravity;
-	}
-
 	private void Awake()
 	{
 		m_Rigidbody2D = GetComponent<Rigidbody2D>();
@@ -96,7 +84,15 @@ public class MovementController : MonoBehaviour
 			if (m_RaycastHits2D[i].transform.gameObject == gameObject) continue;
 
 			m_Grounded = true;
-			m_TempJumpCount = m_MaxJumpCount;
+			if (r_State.GetCurrentElement() != InfusedElement.Air)
+			{
+				m_TempJumpCount = m_MaxJumpCount;
+			}
+			else
+			{
+				m_TempJumpCount = r_State.GetCharges();
+			}
+
 			m_CurrentGroundNormal = m_RaycastHits2D[i].normal;
 			if (!wasGrounded)
 			{
@@ -106,7 +102,6 @@ public class MovementController : MonoBehaviour
 	}
 
 
-
 	public void Move(Vector2 move, bool jump)
 	{
 		//only control the player if grounded or airControl is turned on
@@ -136,12 +131,18 @@ public class MovementController : MonoBehaviour
 		// If the player should jump...
 		if (jump)
 		{
-			if (((m_Grounded) || (m_TempJumpCount > 1) || (m_Swimming && m_CanSwim)) && !m_Jumped)
+			if (m_Grounded || (m_Swimming && m_CanSwim) && !m_Jumped)
+			{
+				m_Grounded = false;
+				m_Rigidbody2D.velocity = Vector2.up * m_JumpForce;
+				OnJumpEvent.Invoke();
+				StartCoroutine(Wait(m_SecondsWaitToJump));
+			}
+			else if ((m_TempJumpCount > 0) && !m_Jumped)
 			{
-				// Add a vertical force to the player.
 				m_Grounded = false;
 				m_TempJumpCount--;
-				//m_Rigidbody2D.AddForce (new Vector2 (0f, m_JumpForce));
+				if (r_State.GetCurrentElement() == InfusedElement.Air) r_State.ChangeCharges(-1);
 				m_Rigidbody2D.velocity = Vector2.up * m_JumpForce;
 				OnJumpEvent.Invoke();
 				StartCoroutine(Wait(m_SecondsWaitToJump));
@@ -152,10 +153,23 @@ public class MovementController : MonoBehaviour
 		{
 			m_Rigidbody2D.velocity += Vector2.up * Physics2D.gravity.y * (m_fallMultiplier - 1) * Time.deltaTime;
 		}
-		//else if (m_Rigidbody2D.velocity.y > 0 && !Input.GetButton("Jump"))
-		//{
-		//	m_Rigidbody2D.velocity += Vector2.up * Physics2D.gravity.y * (m_lowJumpMultiplier - 1) * Time.deltaTime;
-		//}
+		else if (m_Rigidbody2D.velocity.y > 0 && !Input.GetButton("Jump"))
+		{
+			m_Rigidbody2D.velocity += Vector2.up * Physics2D.gravity.y * (m_lowJumpMultiplier - 1) * Time.deltaTime;
+		}
+	}
+
+	public void UpdateMovementParameters()
+	{
+		MovementState state = r_State.GetCurrentMovementState();
+		m_JumpForce = state.jumpForce;
+		m_MovementSmoothing = state.smoothing;
+		m_AirControl = state.airControl;
+		m_CanSwim = state.canSwim;
+		m_Speed = state.moveSpeed;
+		m_MaxJumpCount = state.maxJumpCount;
+		m_Rigidbody2D.mass = state.mass;
+		m_Rigidbody2D.gravityScale = state.gravity;
 	}
 
 	public void SetSwimming(bool value)
@@ -178,6 +192,12 @@ public class MovementController : MonoBehaviour
 		get => m_Grounded;
 	}
 
+	public float GroundCheckDistance
+	{
+		set => m_GroundCheckDistance = value;
+		get => m_GroundCheckDistance;
+	}
+
 	public void AddJumpCharge(int amount)
 	{
 		m_TempJumpCount += amount;
@@ -203,14 +223,14 @@ public class MovementController : MonoBehaviour
 
 	private void OnCollisionEnter2D(Collision2D other)
 	{
-		if(other.gameObject.layer == m_WhatIsGround)
-		m_Airborn = false;
+		if (other.gameObject.layer == 9)
+			m_Airborn = false;
 	}
 
 	private void OnCollisionExit2D(Collision2D other)
 	{
-		if(other.gameObject.layer == m_WhatIsGround)
-		m_Airborn = true;
+		if (other.gameObject.layer == 9)
+			m_Airborn = true;
 	}
 
 

Assets/_Game/Scripts/Player/PlayerAnimation.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerAnimation : MonoBehaviour
+{
+	public AnimationCurve m_AirScale;
+	public float m_Time = 10f;
+
+	private bool m_isAnimating = false;
+	private bool m_isScaled = false;
+
+	private MovementController r_Controller;
+
+	// Start is called before the first frame update
+	void Start()
+	{
+		r_Controller = GetComponent<MovementController>();
+	}
+
+	// Update is called once per frame
+	void Update()
+	{
+		ScalePlayer();
+	}
+
+	public void ScalePlayer()
+	{
+		if (Input.GetKeyDown(KeyCode.P) && !m_isAnimating)
+		{
+			if (!m_isScaled)
+			{
+				StartCoroutine(ScaleUp(m_Time));
+			}
+			else
+			{
+				StartCoroutine(ScaleDown(m_Time));
+			}
+		}
+	}
+
+	private IEnumerator ScaleUp(float t)
+	{
+		m_isAnimating = true;
+		m_isScaled = true;
+		Vector3 s = transform.localScale;
+		float step = 1 / t;
+		for (float i = 0; i <= 1; i += step)
+		{
+			float x = m_AirScale.Evaluate(i);
+			transform.localScale = s + new Vector3(x * Mathf.Sign(s.x), x, x);
+			r_Controller.GroundCheckDistance += x/2;
+			yield return new WaitForFixedUpdate();
+		}
+
+		m_isAnimating = false;
+	}
+
+	private IEnumerator ScaleDown(float t)
+	{
+		m_isAnimating = true;
+		m_isScaled = false;
+		Vector3 s = transform.localScale;
+		float step = 1 / t;
+		for (float i = 0; i <= 1; i += step)
+		{
+			float x = m_AirScale.Evaluate(i);
+			transform.localScale = s - new Vector3(x * Mathf.Sign(s.x), x, x);
+			r_Controller.GroundCheckDistance -= x/2;
+			yield return new WaitForFixedUpdate();
+		}
+
+		m_isAnimating = false;
+	}
+}

Assets/_Game/Scripts/Player/PlayerAnimation.cs.meta

+fileFormatVersion: 2
+guid: 04143d4b812b542329f18723f680be69
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Scripts/Player/PlayerInteract.cs

@@ -19,9 +19,7 @@ namespace _Game.Scripts.Player
 
 		[SerializeField] private PlayerState state;
 
-		[SerializeField] private ElementGameEvent onElementInfused;
-
-		[SerializeField] private ChargeGameEvent onChargeChange;
+		[SerializeField] private ElementGameEventListener onElementChanged;
 
 		private PlayerAirAttack _airAttack;
 		private PlayerEarthAttack _earthAttack;
@@ -44,7 +42,7 @@ namespace _Game.Scripts.Player
 			_earthAttack.enabled = false;
 			_fireAttack.enabled = false;
 			_waterAttack.enabled = false;
-			_controller.SetMovementParameters(state.GetCurrentMovementState());
+//			_controller.SetMovementParameters(state.GetCurrentMovementState());
 		}
 
 		private void Update()
@@ -64,88 +62,77 @@ namespace _Game.Scripts.Player
 						if (_earthAttack.Attack())
 						{
 							state.ChangeCharges(-1);
-							onChargeChange.Raise();
 						}
 						break;
 					case InfusedElement.Fire:
 						if (_fireAttack.Attack())
 						{
 							state.ChangeCharges(-1);
-							onChargeChange.Raise();
 						}
 						break;
 					case InfusedElement.Water:
-						print("done");
 						if(_waterAttack.Attack())
 						{
 							state.ChangeCharges(-1);
-							onChargeChange.Raise();
 						}
 						break;
 					case InfusedElement.None:
 						break;
+					case InfusedElement.Air:
+						break;
 					default:
 						throw new ArgumentOutOfRangeException();
 				}
 			}
 
-			if (!Input.GetButtonDown("Interact") || !_currentObject) return;
+			if (Input.GetButtonDown("Interact") && _currentObject)
+			{
+				switch (_currentObject.tag)
+				{
+					case "Air":
+						state.UpdateElement(InfusedElement.Air);
+						_airAttack.enabled = true;
+						_earthAttack.enabled = false;
+						_fireAttack.enabled = false;
+						_waterAttack.enabled = false;
+						break;
+					case "Earth":
+						state.UpdateElement(InfusedElement.Earth);
+						_airAttack.enabled = false;
+						_earthAttack.enabled = true;
+						_fireAttack.enabled = false;
+						_waterAttack.enabled = false;
+						break;
+					case "Fire":
+						state.UpdateElement(InfusedElement.Fire);
+						_airAttack.enabled = false;
+						_earthAttack.enabled = false;
+						_fireAttack.enabled = true;
+						_waterAttack.enabled = false;
+						break;
+					case "Water":
+						state.UpdateElement(InfusedElement.Water);
+						_airAttack.enabled = false;
+						_earthAttack.enabled = false;
+						_fireAttack.enabled = false;
+						_waterAttack.enabled = true;
+						break;
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+				_targetScript.InfuseElement();
+			}
 
-			switch (_currentObject.tag)
+			if (Input.GetButtonDown("Cancel Element"))
 			{
-				case "Air":
-					state.UpdateElement(InfusedElement.Air);
-					state.ChangeCharges(3);
-					onElementInfused.Raise(InfusedElement.Air);
-					onChargeChange.Raise();
-					_airAttack.enabled = true;
-					_earthAttack.enabled = false;
-					_fireAttack.enabled = false;
-					_waterAttack.enabled = false;
-					break;
-				case "Earth":
-					state.UpdateElement(InfusedElement.Earth);
-					state.ChangeCharges(3);
-					onElementInfused.Raise(InfusedElement.Earth);
-					onChargeChange.Raise();
-					_airAttack.enabled = false;
-					_earthAttack.enabled = true;
-					_fireAttack.enabled = false;
-					_waterAttack.enabled = false;
-					break;
-				case "Fire":
-					state.UpdateElement(InfusedElement.Fire);
-					state.ChangeCharges(3);
-					onElementInfused.Raise(InfusedElement.Fire);
-					onChargeChange.Raise();
-					_airAttack.enabled = false;
-					_earthAttack.enabled = false;
-					_fireAttack.enabled = true;
-					_waterAttack.enabled = false;
-					break;
-				case "Water":
-					state.UpdateElement(InfusedElement.Water);
-					state.ChangeCharges(3);
-					onElementInfused.Raise(InfusedElement.Water);
-					onChargeChange.Raise();
-					_airAttack.enabled = false;
-					_earthAttack.enabled = false;
-					_fireAttack.enabled = false;
-					_waterAttack.enabled = true;
-					break;
-				default:
-					state.UpdateElement(InfusedElement.None);
-					state.ChangeCharges(3);
-					onElementInfused.Raise(InfusedElement.None);
-					onChargeChange.Raise();
-					_airAttack.enabled = false;
-					_earthAttack.enabled = false;
-					_fireAttack.enabled = false;
-					_waterAttack.enabled = false;
-					break;
+				state.UpdateElement(InfusedElement.None);
+				state.ChangeCharges(-5);
+				_airAttack.enabled = false;
+				_earthAttack.enabled = false;
+				_fireAttack.enabled = false;
+				_waterAttack.enabled = false;
 			}
-			_controller.SetMovementParameters(state.GetCurrentMovementState());
-			_targetScript.InfuseElement();
+			//_controller.SetMovementParameters(state.GetCurrentMovementState());
 		}
 
 

Assets/_Game/Scripts/Scriptable Object/ElementGameEventListener.cs

@@ -8,6 +8,7 @@ namespace _Game.Scripts.Scriptable_Object
 	{
 		[SerializeField] private ElementGameEvent gameEvent;
 
+		[SerializeField] private UnityEvent allResponse;
 		[SerializeField] private UnityEvent airResponse;
 		[SerializeField] private UnityEvent earthResponse;
 		[SerializeField] private UnityEvent fireResponse;
@@ -26,6 +27,7 @@ namespace _Game.Scripts.Scriptable_Object
 
 		public void OnEventRaised(InfusedElement element)
 		{
+			allResponse.Invoke();
 			switch (element)
 			{