prediction check if dead

Sacchan-VRC · Oct 3, 2021 · 33c4326 · 33c4326
1 parent 896cb9f
commit 33c4326
Show file tree

Hide file tree

Showing 21 changed files with 1,954 additions and 689 deletions.
diff --git a/AAGun/Animations/AAGunHealthSmoke.anim b/AAGun/Animations/AAGunHealthSmoke.anim
@@ -40,7 +40,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    path: PitchRotator/HUDController/bigstuff/hud_healthbar
+    path: PitchRotator/InVehicleOnly/HUDController/bigstuff/hud_healthbar
   m_FloatCurves:
   - curve:
       serializedVersion: 2
@@ -437,7 +437,7 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
-      path: 3797047904
+      path: 1641591473
       attribute: 3
       script: {fileID: 0}
       typeID: 4
@@ -521,90 +521,6 @@ AnimationClip:
     m_HeightFromFeet: 0
     m_Mirror: 0
   m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0.6
-        tangentMode: 69
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.6666666
-        value: 1
-        inSlope: 0.6
-        outSlope: 0
-        tangentMode: 69
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.x
-    path: PitchRotator/HUDController/bigstuff/hud_healthbar
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 69
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.6666666
-        value: 1
-        inSlope: -0
-        outSlope: 0
-        tangentMode: 69
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.y
-    path: PitchRotator/HUDController/bigstuff/hud_healthbar
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 69
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.6666666
-        value: 1
-        inSlope: -0
-        outSlope: 0
-        tangentMode: 69
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.z
-    path: PitchRotator/HUDController/bigstuff/hud_healthbar
-    classID: 4
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
@@ -991,6 +907,90 @@ AnimationClip:
     path: PitchRotator/Effects/HealthSmoke
     classID: 198
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0.6
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 1
+        inSlope: 0.6
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: PitchRotator/InVehicleOnly/HUDController/bigstuff/hud_healthbar
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 1
+        inSlope: -0
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: PitchRotator/InVehicleOnly/HUDController/bigstuff/hud_healthbar
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 1
+        inSlope: -0
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: PitchRotator/InVehicleOnly/HUDController/bigstuff/hud_healthbar
+    classID: 4
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

diff --git a/Prefabs/AAGun.prefab b/Prefabs/AAGun.prefab
diff --git a/Prefabs/SB-1Main.prefab b/Prefabs/SB-1Main.prefab
diff --git a/Prefabs/SC-1Main.prefab b/Prefabs/SC-1Main.prefab
diff --git a/Prefabs/SF-1Main.prefab b/Prefabs/SF-1Main.prefab
diff --git a/Prefabs/SH-1Main.prefab b/Prefabs/SH-1Main.prefab
diff --git a/Scripts/DFUNC/DFUNC_AAM.cs b/Scripts/DFUNC/DFUNC_AAM.cs
@@ -111,7 +111,6 @@ public void SFEXT_O_PilotExit()
     {
         Pilot = false;
         TriggerLastFrame = false;
-        RequestSerialization();
         gameObject.SetActive(false);
         AAMLockTimer = 0;
         AAMHasTarget = false;
@@ -237,12 +236,6 @@ void Update()
                     TriggerLastFrame = true;
                 }
                 else TriggerLastFrame = false;
-
-                if (TimeSinceSerialization > .5f)
-                {
-                    TimeSinceSerialization = 0;
-                    RequestSerialization();
-                }
             }
             else { AAMLocked = false; AAMHasTarget = false; }
 
@@ -336,6 +329,7 @@ private void FixedUpdate()//old AAMTargeting function
                         AAMCurrentTargetSAVControl = NextTargetSAVontrol;
                         AAMLockTimer = 0;
                         AAMTargetedTimer = .9f;//send targeted .1s after targeting so it can't get spammed too fast (and doesnt send if you instantly target something else)
+                        RequestSerialization();
                     }
                 }
             }

diff --git a/Scripts/DFUNC/DFUNC_Limits.cs b/Scripts/DFUNC/DFUNC_Limits.cs
@@ -57,11 +57,6 @@ public void SFEXT_O_PilotExit()
         Selected = false;
         Piloting = false;
     }
-    public void SFEXT_G_TouchDown()
-    {
-        if (Piloting && FlightLimitsEnabled)
-        { SendCustomNetworkEvent(VRC.Udon.Common.Interfaces.NetworkEventTarget.All, nameof(SetLimitsOff)); }
-    }
     public void SFEXT_O_EnterVTOL()
     {
         if (FlightLimitsEnabled)

diff --git a/Scripts/Other/SaccScoreboard_Kills.cs b/Scripts/Other/SaccScoreboard_Kills.cs
@@ -8,12 +8,22 @@
 [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
 public class SaccScoreboard_Kills : UdonSharpBehaviour
 {
-    [System.NonSerializedAttribute] [UdonSynced(UdonSyncMode.None)] public string TopKiller = "Nobody";
+    public string TopKiller
+    {
+        set
+        {
+            _TopKiller = value;
+            UpdateScores();
+        }
+        get => _TopKiller;
+    }
+    [System.NonSerializedAttribute] [UdonSynced(UdonSyncMode.None)] public string _TopKiller = "Nobody";
     [System.NonSerializedAttribute] [UdonSynced(UdonSyncMode.None)] public int TopKills = 0;
     [System.NonSerializedAttribute] public int MyKills = 0;
     [System.NonSerializedAttribute] public int MyBestKills = 0;
     public Text Scores;
     private VRCPlayerApi localPlayer;
+    private bool Initialized;
     private void Start()
     {
         localPlayer = Networking.LocalPlayer;
@@ -23,4 +33,8 @@ public void UpdateScores()
     {
         Scores.text = string.Concat("Instance Best Killing Spree: ", TopKiller, " : ", TopKills, "\nMy Best Killing Spree: ", MyBestKills);
     }
+    public override void OnPlayerJoined(VRCPlayerApi player)
+    {
+        RequestSerialization();
+    }
 }
diff --git a/Scripts/Other/SaccViewScreenButton.cs b/Scripts/Other/SaccViewScreenButton.cs
@@ -37,8 +37,4 @@ public override void Interact()
             ViewScreenControl.RequestSerialization();
         }
     }
-    public override void OnPlayerJoined(VRCPlayerApi player)
-    {
-        ViewScreenControl.RequestSerialization();
-    }
 }
diff --git a/Scripts/SaccAAGun/SAAG_SyncScript.cs b/Scripts/SaccAAGun/SAAG_SyncScript.cs
@@ -55,6 +55,7 @@ public class SAAG_SyncScript : UdonSharpBehaviour
     //private Vector3 NonOwnerRotLerper;
     private float UpAngleMax = 89;
     private float DownAngleMax = 35;
+    private Quaternion RotatorStartRot;
     private void Start()
     {
         if (!Initialized)//shouldn't be active until entitystart
@@ -75,6 +76,11 @@ public void SFEXT_L_EntityStart()
         gameObject.SetActive(false);
         UpAngleMax = (float)AAGunControl.GetProgramVariable("UpAngleMax");
         DownAngleMax = (float)AAGunControl.GetProgramVariable("DownAngleMax");
+        RotatorStartRot = Rotator.localRotation;
+    }
+    public void SFEXT_G_ReAppear()
+    {
+        Rotator.localRotation = RotatorStartRot;
     }
     public void SFEXT_O_TakeOwnership()
     {