CHANGED: BoltEntity method and property namings

Ramon Melo · Ramon Melo · commit 0f1b66ab7b9e · 2019-03-28T12:01:51.000-03:00
diff --git a/AdvancedTutorial/scripts/Player/PlayerController.cs b/AdvancedTutorial/scripts/Player/PlayerController.cs
@@ -45,7 +45,7 @@ void Update()
 		{
 			PollKeys(true);
 
-			if (entity.isOwner && entity.hasControl && Input.GetKey(KeyCode.L))
+			if (entity.IsOwner && entity.HasControl && Input.GetKey(KeyCode.L))
 			{
 				for (int i = 0; i < 100; ++i)
 				{
@@ -85,7 +85,7 @@ void PollKeys(bool mouse)
 
 		public override void Attached()
 		{
-			if (entity.isOwner)
+			if (entity.IsOwner)
 			{
 				state.tokenTest = new TestToken() { Number = 1337 };
 			}
@@ -146,7 +146,7 @@ public void ApplyDamage(byte damage)
 
 			if (state.health == 0)
 			{
-				entity.controller.GetPlayer().Kill();
+				entity.Controller.GetPlayer().Kill();
 			}
 		}
 
@@ -222,7 +222,7 @@ public override void ExecuteCommand(Bolt.Command c, bool resetState)
 					}
 				}
 
-				if (entity.isOwner)
+				if (entity.IsOwner)
 				{
 					cmd.Result.Token = new TestToken();
 				}
@@ -267,7 +267,7 @@ void FireWeapon(PlayerCommand cmd)
 				state.Fire();
 
 				// if we are the owner and the active weapon is a hitscan weapon, do logic
-				if (entity.isOwner)
+				if (entity.IsOwner)
 				{
 					activeWeapon.OnOwner(cmd, entity);
 				}
diff --git a/AdvancedTutorial/scripts/Player/PlayerNamePlate.cs b/AdvancedTutorial/scripts/Player/PlayerNamePlate.cs
@@ -30,9 +30,9 @@ void TeamChanged ()
 
 		void Update ()
 		{
-			text.GetComponent<Renderer> ().enabled = !entity.hasControl;
+			text.GetComponent<Renderer> ().enabled = !entity.HasControl;
 
-			if (!entity.hasControl) {
+			if (!entity.HasControl) {
 				try {
 					transform.LookAt (PlayerCamera.instance.transform);
 					transform.rotation = Quaternion.LookRotation (-transform.forward);
diff --git a/AdvancedTutorial/scripts/Weapon/WeaponRifle.cs b/AdvancedTutorial/scripts/Weapon/WeaponRifle.cs
@@ -7,7 +7,7 @@ public class WeaponRifle : WeaponBase
 	{
 		public override void OnOwner (PlayerCommand cmd, BoltEntity entity)
 		{
-			if (entity.isOwner) {
+			if (entity.IsOwner) {
 				IPlayerState state = entity.GetState<IPlayerState> ();
 				PlayerController controller = entity.GetComponent<PlayerController> ();
 
diff --git a/GettingStarted/Scripts/CubeBehavior.cs b/GettingStarted/Scripts/CubeBehavior.cs
@@ -16,7 +16,7 @@ public override void Attached()
 
             state.SetTransforms(state.CubeTransform, transform);
 
-            if (entity.isOwner)
+            if (entity.IsOwner)
             {
                 state.CubeColor = new Color(Random.value, Random.value, Random.value);
 
@@ -39,7 +39,7 @@ public override void Attached()
 
         void OnGUI()
         {
-            if (entity.isOwner)
+            if (entity.IsOwner)
             {
                 GUI.color = state.CubeColor;
                 GUILayout.Label("@@@");
diff --git a/GettingStarted/Scripts/InteractiveBehavior.cs b/GettingStarted/Scripts/InteractiveBehavior.cs
@@ -23,7 +23,7 @@ public override void Attached()
 	{
 		state.SetTransforms(state.Transform, transform);
 
-		if (entity.isOwner)
+		if (entity.IsOwner)
 		{
 			state.Color = normalColor;
 		}
@@ -36,7 +36,7 @@ public override void Attached()
 
 	private void Update()
 	{
-		if (entity.isAttached && entity.isOwner)
+		if (entity.IsAttached && entity.IsOwner)
 		{
 			var nearbyPlayer = (from player in GameObject.FindGameObjectsWithTag("Player")
 									where Vector3.Distance(transform.position, player.transform.position) < interactiveRadius
diff --git a/GettingStarted/Scripts/RobotBehavior.cs b/GettingStarted/Scripts/RobotBehavior.cs
@@ -13,7 +13,7 @@ public override void Attached()
 		{
 			state.SetTransforms(state.Transform, transform);
 			state.SetAnimator(GetComponent<Animator>());
-			state.Animator.applyRootMotion = entity.isOwner;
+			state.Animator.applyRootMotion = entity.IsOwner;
 		}
 
 		public void AddBox(BoltEntity box)
diff --git a/PhotonCloud/demo_lobby/Scripts/Controllers/BomberPlayerController.cs b/PhotonCloud/demo_lobby/Scripts/Controllers/BomberPlayerController.cs
@@ -12,7 +12,7 @@ public override void Attached()
 
 			state.SetTransforms(state.Transform, transform);
 
-			if (entity.isOwner)
+			if (entity.IsOwner)
 			{
 				state.Color = Color.white;
 			}
@@ -60,7 +60,7 @@ private void Setup(string playerName, Color playerColor)
 		{
 			BoltConsole.Write("Setup BomberPlayer");
 
-			if (entity.isOwner)
+			if (entity.IsOwner)
 			{
 				state.Color = playerColor;
 				state.Name = playerName;
diff --git a/PhotonCloud/demo_lobby/Scripts/Lobby/LobbyManager.cs b/PhotonCloud/demo_lobby/Scripts/Lobby/LobbyManager.cs
@@ -332,7 +332,7 @@ public override void EntityAttached(BoltEntity entity)
         {
             BoltConsole.Write("EntityAttached");
 
-            if (!entity.isControlled)
+            if (!entity.IsControlled)
             {
                 LobbyPhotonPlayer photonPlayer =  entity.gameObject.GetComponent<LobbyPhotonPlayer>();
 
diff --git a/PhotonCloud/demo_lobby/Scripts/Lobby/LobbyPhotonPlayer.cs b/PhotonCloud/demo_lobby/Scripts/Lobby/LobbyPhotonPlayer.cs
@@ -42,7 +42,7 @@ public bool IsReady
 
         public override void Attached()
         {
-            if (entity.isOwner)
+            if (entity.IsOwner)
             {
                 state.Color = Random.ColorHSV();
                 state.Name = "Player #" + Random.Range(1, 100);
@@ -106,7 +106,7 @@ public override void SimulateController()
 
         public override void ExecuteCommand(Command command, bool resetState)
         {
-            if (!entity.isOwner) { return; }
+            if (!entity.IsOwner) { return; }
 
             if (!resetState && command.IsFirstExecution)
             {
@@ -233,14 +233,14 @@ public void OnClientReady(bool readyState)
             }
             else
             {
-                ChangeReadyButtonColor(entity.isControlled ? JoinColor : NotReadyColor);
+                ChangeReadyButtonColor(entity.IsControlled ? JoinColor : NotReadyColor);
 
                 Text textComponent = readyButton.transform.GetChild(0).GetComponent<Text>();
-                textComponent.text = entity.isControlled ? "JOIN" : "...";
+                textComponent.text = entity.IsControlled ? "JOIN" : "...";
                 textComponent.color = Color.white;
-                readyButton.interactable = entity.isControlled;
-                colorButton.interactable = entity.isControlled;
-                nameInput.interactable = entity.isControlled;
+                readyButton.interactable = entity.IsControlled;
+                colorButton.interactable = entity.IsControlled;
+                nameInput.interactable = entity.IsControlled;
             }
         }
     }
diff --git a/ThirdPersonCharacter/Scripts/TPCControllerClientAuth.cs b/ThirdPersonCharacter/Scripts/TPCControllerClientAuth.cs
@@ -13,7 +13,7 @@ public override void Attached()
 
 		anim = GetComponent<Animator>();
 
-		if (!entity.isOwner)
+		if (!entity.IsOwner)
 		{
 			Destroy(GetComponent<ThirdPersonUserControl>());
 			Destroy(GetComponent<ThirdPersonCharacter>());
@@ -38,7 +38,7 @@ void Update()
 
 	void FixedUpdate()
 	{
-		if (entity.isOwner)
+		if (entity.IsOwner)
 		{
 			state.grounded = anim.GetBool("OnGround");
 			state.crouch = anim.GetBool("Crouch");
diff --git a/ThirdPersonCharacter/Scripts/TPCcontroller.cs b/ThirdPersonCharacter/Scripts/TPCcontroller.cs
@@ -70,7 +70,7 @@ void Start()
 
 	void FixedUpdate()
 	{
-		if (entity.isControllerOrOwner)
+		if (entity.IsControllerOrOwner)
 		{
 			//  if (_velocity != null)
 			//     _cc.Move(_velocity);
@@ -154,7 +154,7 @@ public override void ExecuteCommand(Bolt.Command c, bool resetState)
 			m_Animator.SetBool("Crouch", cmd.Input.crouch);
 			m_Animator.SetBool("OnGround", cmd.Result.isGrounded);
 
-			if (entity.isOwner)
+			if (entity.IsOwner)
 			{
 				state.forward = m_Animator.GetFloat("Forward");
 				state.turn = m_Animator.GetFloat("Turn");

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void Update()`
`45`	`45`	`{`
`46`	`46`	`PollKeys(true);`
`47`	`47`
`48`		`- if (entity.isOwner && entity.hasControl && Input.GetKey(KeyCode.L))`
	`48`	`+ if (entity.IsOwner && entity.HasControl && Input.GetKey(KeyCode.L))`
`49`	`49`	`{`
`50`	`50`	`for (int i = 0; i < 100; ++i)`
`51`	`51`	`{`
`@@ -85,7 +85,7 @@ void PollKeys(bool mouse)`
`85`	`85`
`86`	`86`	`public override void Attached()`
`87`	`87`	`{`
`88`		`- if (entity.isOwner)`
	`88`	`+ if (entity.IsOwner)`
`89`	`89`	`{`
`90`	`90`	`state.tokenTest = new TestToken() { Number = 1337 };`
`91`	`91`	`}`
`@@ -146,7 +146,7 @@ public void ApplyDamage(byte damage)`
`146`	`146`
`147`	`147`	`if (state.health == 0)`
`148`	`148`	`{`
`149`		`- entity.controller.GetPlayer().Kill();`
	`149`	`+ entity.Controller.GetPlayer().Kill();`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`@@ -222,7 +222,7 @@ public override void ExecuteCommand(Bolt.Command c, bool resetState)`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`225`		`- if (entity.isOwner)`
	`225`	`+ if (entity.IsOwner)`
`226`	`226`	`{`
`227`	`227`	`cmd.Result.Token = new TestToken();`
`228`	`228`	`}`
`@@ -267,7 +267,7 @@ void FireWeapon(PlayerCommand cmd)`
`267`	`267`	`state.Fire();`
`268`	`268`
`269`	`269`	`// if we are the owner and the active weapon is a hitscan weapon, do logic`
`270`		`- if (entity.isOwner)`
	`270`	`+ if (entity.IsOwner)`
`271`	`271`	`{`
`272`	`272`	`activeWeapon.OnOwner(cmd, entity);`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class WeaponRifle : WeaponBase`
`7`	`7`	`{`
`8`	`8`	`public override void OnOwner (PlayerCommand cmd, BoltEntity entity)`
`9`	`9`	`{`
`10`		`- if (entity.isOwner) {`
	`10`	`+ if (entity.IsOwner) {`
`11`	`11`	`IPlayerState state = entity.GetState<IPlayerState> ();`
`12`	`12`	`PlayerController controller = entity.GetComponent<PlayerController> ();`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public override void Attached()`
`16`	`16`
`17`	`17`	`state.SetTransforms(state.CubeTransform, transform);`
`18`	`18`
`19`		`- if (entity.isOwner)`
	`19`	`+ if (entity.IsOwner)`
`20`	`20`	`{`
`21`	`21`	`state.CubeColor = new Color(Random.value, Random.value, Random.value);`
`22`	`22`
`@@ -39,7 +39,7 @@ public override void Attached()`
`39`	`39`
`40`	`40`	`void OnGUI()`
`41`	`41`	`{`
`42`		`- if (entity.isOwner)`
	`42`	`+ if (entity.IsOwner)`
`43`	`43`	`{`
`44`	`44`	`GUI.color = state.CubeColor;`
`45`	`45`	`GUILayout.Label("@@@");`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public override void Attached()`
`23`	`23`	`{`
`24`	`24`	`state.SetTransforms(state.Transform, transform);`
`25`	`25`
`26`		`- if (entity.isOwner)`
	`26`	`+ if (entity.IsOwner)`
`27`	`27`	`{`
`28`	`28`	`state.Color = normalColor;`
`29`	`29`	`}`
`@@ -36,7 +36,7 @@ public override void Attached()`
`36`	`36`
`37`	`37`	`private void Update()`
`38`	`38`	`{`
`39`		`- if (entity.isAttached && entity.isOwner)`
	`39`	`+ if (entity.IsAttached && entity.IsOwner)`
`40`	`40`	`{`
`41`	`41`	`var nearbyPlayer = (from player in GameObject.FindGameObjectsWithTag("Player")`
`42`	`42`	`where Vector3.Distance(transform.position, player.transform.position) < interactiveRadius`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public override void Attached()`
`13`	`13`	`{`
`14`	`14`	`state.SetTransforms(state.Transform, transform);`
`15`	`15`	`state.SetAnimator(GetComponent<Animator>());`
`16`		`- state.Animator.applyRootMotion = entity.isOwner;`
	`16`	`+ state.Animator.applyRootMotion = entity.IsOwner;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void AddBox(BoltEntity box)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public override void Attached()`
`12`	`12`
`13`	`13`	`state.SetTransforms(state.Transform, transform);`
`14`	`14`
`15`		`- if (entity.isOwner)`
	`15`	`+ if (entity.IsOwner)`
`16`	`16`	`{`
`17`	`17`	`state.Color = Color.white;`
`18`	`18`	`}`
`@@ -60,7 +60,7 @@ private void Setup(string playerName, Color playerColor)`
`60`	`60`	`{`
`61`	`61`	`BoltConsole.Write("Setup BomberPlayer");`
`62`	`62`
`63`		`- if (entity.isOwner)`
	`63`	`+ if (entity.IsOwner)`
`64`	`64`	`{`
`65`	`65`	`state.Color = playerColor;`
`66`	`66`	`state.Name = playerName;`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public override void EntityAttached(BoltEntity entity)`
`332`	`332`	`{`
`333`	`333`	`BoltConsole.Write("EntityAttached");`
`334`	`334`
`335`		`- if (!entity.isControlled)`
	`335`	`+ if (!entity.IsControlled)`
`336`	`336`	`{`
`337`	`337`	`LobbyPhotonPlayer photonPlayer = entity.gameObject.GetComponent<LobbyPhotonPlayer>();`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public bool IsReady`
`42`	`42`
`43`	`43`	`public override void Attached()`
`44`	`44`	`{`
`45`		`- if (entity.isOwner)`
	`45`	`+ if (entity.IsOwner)`
`46`	`46`	`{`
`47`	`47`	`state.Color = Random.ColorHSV();`
`48`	`48`	`state.Name = "Player #" + Random.Range(1, 100);`
`@@ -106,7 +106,7 @@ public override void SimulateController()`
`106`	`106`
`107`	`107`	`public override void ExecuteCommand(Command command, bool resetState)`
`108`	`108`	`{`
`109`		`- if (!entity.isOwner) { return; }`
	`109`	`+ if (!entity.IsOwner) { return; }`
`110`	`110`
`111`	`111`	`if (!resetState && command.IsFirstExecution)`
`112`	`112`	`{`
`@@ -233,14 +233,14 @@ public void OnClientReady(bool readyState)`
`233`	`233`	`}`
`234`	`234`	`else`
`235`	`235`	`{`
`236`		`- ChangeReadyButtonColor(entity.isControlled ? JoinColor : NotReadyColor);`
	`236`	`+ ChangeReadyButtonColor(entity.IsControlled ? JoinColor : NotReadyColor);`
`237`	`237`
`238`	`238`	`Text textComponent = readyButton.transform.GetChild(0).GetComponent<Text>();`
`239`		`- textComponent.text = entity.isControlled ? "JOIN" : "...";`
	`239`	`+ textComponent.text = entity.IsControlled ? "JOIN" : "...";`
`240`	`240`	`textComponent.color = Color.white;`
`241`		`- readyButton.interactable = entity.isControlled;`
`242`		`- colorButton.interactable = entity.isControlled;`
`243`		`- nameInput.interactable = entity.isControlled;`
	`241`	`+ readyButton.interactable = entity.IsControlled;`
	`242`	`+ colorButton.interactable = entity.IsControlled;`
	`243`	`+ nameInput.interactable = entity.IsControlled;`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`	`}`