Fix some mistakes and clean up actions

Signed-off-by: Christian Schamara <[email protected]>
Salja · Jan 29, 2018 · 933a048 · 933a048
1 parent bace4da
commit 933a048
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 60 deletions.
diff --git a/ootii/EnableWeaponSet.cs b/ootii/EnableWeaponSet.cs
@@ -49,15 +49,9 @@ void isWeaponSet()
 
             mBasicInventory = go.GetComponent<BasicInventory>();
 
-            if (mBasicInventory == null)
-            {
-                Finish();
-                return;
-            }
-
             BasicInventorySet lWeaponSet = mBasicInventory.GetWeaponSet(mWeaponSet.Value);
 
-            if (lWeaponSet != null)
+            if (mBasicInventory != null && lWeaponSet != null)
             {
                 lWeaponSet.IsEnabled = enable;
             }

diff --git a/ootii/EquipWeaponSet.cs b/ootii/EquipWeaponSet.cs
@@ -49,23 +49,18 @@ void Equip()
 
             mBasicInventory = go.GetComponent<BasicInventory>();
 
-            if (mBasicInventory == null)
-            {
-                Finish();
-                return;
-            }
-
             int lWeaponSetIndex = (UseCurrentSet ? -1 : weaponSet.Value);
 
-            // Check if it's already equipped
-            if (mBasicInventory.IsWeaponSetEquipped(lWeaponSetIndex))
+            if (mBasicInventory != null)
             {
-                Finish();
-                return;
-            }
+                if (mBasicInventory.IsWeaponSetEquipped(lWeaponSetIndex))
+                {
+                    Finish();
+                    return;
+                }
 
-            // Equip
-            mBasicInventory.EquipWeaponSet(lWeaponSetIndex);
+                mBasicInventory.EquipWeaponSet(lWeaponSetIndex);
+            }
         }
     }
 }
diff --git a/ootii/GetStance.cs b/ootii/GetStance.cs
@@ -54,7 +54,10 @@ void GetPlayerStance()
 
             mActorController = go.GetComponent<ActorController>();
 
-            store.Value = mActorController.State.Stance;
+            if(mActorController != null)
+            {
+                store.Value = mActorController.State.Stance;
+            }
         }
     }
 }

diff --git a/ootii/IsRunning.cs b/ootii/IsRunning.cs
@@ -63,7 +63,7 @@ void IsRun()
 
             IWalkRunMotion lMotion = mMotionController.ActiveMotion as IWalkRunMotion;
 
-            if (lMotion != null)
+            if (mMotionController != null && lMotion != null)
             {
                 store.Value = lMotion.IsRunActive;
                 Fsm.Event(lMotion.IsRunActive ? trueEvent : falseEvent);

diff --git a/ootii/IsStance.cs b/ootii/IsStance.cs
@@ -67,16 +67,19 @@ void DoCompare()
 
             mActorController = go.GetComponent<ActorController>();
 
-            if (stance.Value == mActorController.State.Stance)
+            if (mActorController != null)
             {
-                store.Value = true;
-                Fsm.Event(trueEvent);
-            }
-
-            else
-            {
-                store.Value = false;
-                Fsm.Event(falseEvent);
+                if (stance.Value == mActorController.State.Stance)
+                {
+                    store.Value = true;
+                    Fsm.Event(trueEvent);
+                }
+
+                else
+                {
+                    store.Value = false;
+                    Fsm.Event(falseEvent);
+                }
             }
         }
     }

diff --git a/ootii/IsWeaponSet.cs b/ootii/IsWeaponSet.cs
@@ -73,16 +73,19 @@ void DoCompare()
 
             int lWeaponSetIndex = (checkCurrentSet ? -1 : weaponSet.Value);
 
-            if (mBasicInventory.IsWeaponSetEquipped(lWeaponSetIndex))
+            if (mBasicInventory != null)
             {
-                store.Value = true;
-                Fsm.Event(trueEvent);
-            }
-
-            else
-            {
-                store.Value = false;
-                Fsm.Event(falseEvent);
+                if (mBasicInventory.IsWeaponSetEquipped(lWeaponSetIndex))
+                {
+                    store.Value = true;
+                    Fsm.Event(trueEvent);
+                }
+
+                else
+                {
+                    store.Value = false;
+                    Fsm.Event(falseEvent);
+                }
             }
         }
     }

diff --git a/ootii/ModifyAttributeFloat.cs b/ootii/ModifyAttributeFloat.cs
@@ -61,15 +61,18 @@ void ModifyAttribute()
 
             mBasicAttributes = go.GetComponent<BasicAttributes>();
 
-            if (!perSecond)
+            if (mBasicAttributes != null)
             {
-                float lValue = mBasicAttributes.GetAttributeValue<float>(attribute.Value);
-                mBasicAttributes.SetAttributeValue(attribute.Value, lValue + floatValue.Value);
-            }
-            else
-            {
-                float lValue = mBasicAttributes.GetAttributeValue<float>(attribute.Value);
-                mBasicAttributes.SetAttributeValue(attribute.Value, lValue + floatValue.Value * Time.deltaTime);
+                if (!perSecond)
+                {
+                    float lValue = mBasicAttributes.GetAttributeValue<float>(attribute.Value);
+                    mBasicAttributes.SetAttributeValue(attribute.Value, lValue + floatValue.Value);
+                }
+                else
+                {
+                    float lValue = mBasicAttributes.GetAttributeValue<float>(attribute.Value);
+                    mBasicAttributes.SetAttributeValue(attribute.Value, lValue + floatValue.Value * Time.deltaTime);
+                }
             }
         }
     }

diff --git a/ootii/SendPlayerDeath.cs b/ootii/SendPlayerDeath.cs
@@ -44,10 +44,12 @@ void SendDeath()
 
             mActorCore = go.GetComponent<ActorCore>();
 
-            DamageMessage lDamage = DamageMessage.Allocate();
-            mActorCore.OnKilled(lDamage);
-            lDamage.Release();
+            if (mActorCore != null)
+            {
+                DamageMessage lDamage = DamageMessage.Allocate();
+                mActorCore.OnKilled(lDamage);
+                lDamage.Release();
+            }
         }
-
     }
 }
diff --git a/ootii/SetAttributeFloat.cs b/ootii/SetAttributeFloat.cs
@@ -57,8 +57,11 @@ void SetAttribute()
 
             mBasicAttributes = go.GetComponent<BasicAttributes>();
 
-            float lValue = mBasicAttributes.GetAttributeValue<float>(attribute.Value);
-            mBasicAttributes.SetAttributeValue(attribute.Value, floatValue.Value);
+            if (mBasicAttributes != null)
+            {
+                float lValue = mBasicAttributes.GetAttributeValue<float>(attribute.Value);
+                mBasicAttributes.SetAttributeValue(attribute.Value, floatValue.Value);
+            }
         }
     }
 }

diff --git a/ootii/SetStance.cs b/ootii/SetStance.cs
@@ -53,7 +53,10 @@ void SetPlayerStance()
 
             mActorController = go.GetComponent<ActorController>();
 
-            mActorController.State.Stance = stance.Value;
+            if (mActorController != null)
+            {
+                mActorController.State.Stance = stance.Value;
+            }
         }
     }
 }

diff --git a/ootii/StoreWeaponSet.cs b/ootii/StoreWeaponSet.cs
@@ -50,13 +50,10 @@ void Store()
 
             mBasicInventory = go.GetComponent<BasicInventory>();
 
-            if (mBasicInventory == null)
+            if (mBasicInventory != null)
             {
-                Finish();
-                return;
+                mBasicInventory.StoreWeaponSet(-1);
             }
-
-            mBasicInventory.StoreWeaponSet(-1);
         }
     }
 }