Renamed TowerScript -> TowerScriptableObject

hackerspace-ntnu · Nov 24, 2021 · 3edb005 · 3edb005
1 parent 2f1115a
commit 3edb005
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/Assets/Prefabs/Towers/AxeTurret/AxeTurret.prefab b/Assets/Prefabs/Towers/AxeTurret/AxeTurret.prefab
@@ -772,7 +772,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canInteract: 1
-  towerScript: {fileID: 11400000, guid: a59d08db63548fb4b851e0848fc561ec, type: 2}
+  _towerScriptableObject: {fileID: 11400000, guid: a59d08db63548fb4b851e0848fc561ec, type: 2}
   turretInput: {fileID: 0}
   rotAxis: {fileID: 929849385462332844}
   arrowPointer: {fileID: 8198781589771022394}

diff --git a/Assets/Prefabs/Towers/LightningTurret/LightningTurret.prefab b/Assets/Prefabs/Towers/LightningTurret/LightningTurret.prefab
@@ -570,7 +570,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canInteract: 1
-  towerScript: {fileID: 11400000, guid: 2ec78001a1c2b2d4bbf643cf65b22984, type: 2}
+  _towerScriptableObject: {fileID: 11400000, guid: 2ec78001a1c2b2d4bbf643cf65b22984, type: 2}
   turretInput: {fileID: 0}
 --- !u!208 &-9140866788019457868
 NavMeshObstacle:

diff --git a/Assets/Prefabs/Towers/WheelTurret/WheelTurret.prefab b/Assets/Prefabs/Towers/WheelTurret/WheelTurret.prefab
@@ -162,7 +162,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canInteract: 1
-  towerScript: {fileID: 11400000, guid: 2c0affb1e8eaf774a9e76ec9e5098216, type: 2}
+  _towerScriptableObject: {fileID: 11400000, guid: 2c0affb1e8eaf774a9e76ec9e5098216, type: 2}
   turretInput: {fileID: 0}
   rotAxis: {fileID: 769070955576516685}
   arrowPointer: {fileID: 8246341762033966926}

diff --git a/Assets/Prefabs/Towers/tower_pendulum.prefab b/Assets/Prefabs/Towers/tower_pendulum.prefab
@@ -49,7 +49,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canInteract: 1
-  towerScript: {fileID: 0}
+  _towerScriptableObject: {fileID: 0}
   turretInput: {fileID: 0}
   rotAxis: {fileID: 5529524980676544149}
   arrowPointer: {fileID: 4654737029441173943}

diff --git a/Assets/Scripts/Player/PlayerStateController.cs b/Assets/Scripts/Player/PlayerStateController.cs
@@ -261,7 +261,7 @@ private void OnMoveTower()
         if (!(focusedInteractable is TowerLogic tower))
             return;
 
-        tower.TowerScript.InstantiateConstructionTower(this);
+        tower.TowerScriptableObject.InstantiateConstructionTower(this);
         SetState(PlayerStates.BUILDING);
 
         RemoveInteractable(tower);

diff --git a/Assets/Scripts/Player/PlayerUi.cs b/Assets/Scripts/Player/PlayerUi.cs
@@ -36,7 +36,7 @@ void LateUpdate()
         ui.transform.LookAt(lookAtPos, mainCameraTransform.rotation * Vector3.up);
     }
 
-    public TowerScript GetSelectedSegment()
+    public TowerScriptableObject GetSelectedSegment()
     {
         return controllerWheel.GetSelectedTower();
     }
@@ -49,7 +49,7 @@ public void Select()
         //Turns off the UI if button no longer held
         if (!state.Select)
         {
-            TowerScript selectedSegment = GetSelectedSegment();
+            TowerScriptableObject selectedSegment = GetSelectedSegment();
             if (selectedSegment
                 && inventory.ResourceAmount - selectedSegment.cost >= 0)
             {

diff --git a/.../Scripts/ScriptableObjects/TowerScript.cs → ...criptableObjects/TowerScriptableObject.cs b/.../Scripts/ScriptableObjects/TowerScript.cs → ...criptableObjects/TowerScriptableObject.cs
@@ -4,7 +4,7 @@
 using UnityEngine.UI;
 
 [CreateAssetMenu(menuName = "TowerScriptableObject")]
-public class TowerScript : ScriptableObject
+public class TowerScriptableObject : ScriptableObject
 {
     public string towerName;
     public int cost;

diff --git a/...pts/ScriptableObjects/TowerScript.cs.meta → ...ableObjects/TowerScriptableObject.cs.meta b/...pts/ScriptableObjects/TowerScript.cs.meta → ...ableObjects/TowerScriptableObject.cs.meta
diff --git a/Assets/Scripts/Towers/TowerLogic.cs b/Assets/Scripts/Towers/TowerLogic.cs
@@ -5,12 +5,12 @@
 public class TowerLogic : Interactable
 {
     [SerializeField]
-    private TowerScript towerScript;
+    private TowerScriptableObject _towerScriptableObject;
 
     [ReadOnly, SerializeField]
     protected TurretInput turretInput;
 
-    public TowerScript TowerScript => towerScript;
+    public TowerScriptableObject TowerScriptableObject => _towerScriptableObject;
 
     protected void Start()
     {

diff --git a/Assets/Scripts/UI/UIControllerWheel.cs b/Assets/Scripts/UI/UIControllerWheel.cs
@@ -6,7 +6,7 @@
 public class UIControllerWheel : MonoBehaviour
 {
     [SerializeField]
-    private TowerScript[] towers;
+    private TowerScriptableObject[] towers;
 
     [SerializeField]
     private GameObject[] menuSegments;
@@ -76,14 +76,14 @@ public int GetNumSegments()
     }
 
     /// <summary>
-    /// Returns the `TowerScript` (`ScriptableObject`) at the provided index of the wheel segments.
+    /// Returns the `TowerScriptableObject` at the provided index of the wheel segments.
     /// </summary>
-    public TowerScript GetTower(int index)
+    public TowerScriptableObject GetTower(int index)
     {
         return towers[index];
     }
 
-    public TowerScript GetSelectedTower()
+    public TowerScriptableObject GetSelectedTower()
     {
         if (SelectedSegmentIndex == null)
             return null;