missing boat stuff

Sacchan-VRC · Oct 6, 2021 · e23fd1c · e23fd1c
1 parent 5c11c56
commit e23fd1c
Show file tree

Hide file tree

Showing 38 changed files with 10,822 additions and 649 deletions.
diff --git a/Prefabs/SS-1Main.prefab b/Prefabs/SS-1Main.prefab
@@ -20414,8 +20414,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 3.29, y: 8.765795, z: 1.4736332}
-  m_Center: {x: 0, y: 0.384305, z: 0.03247094}
+  m_Size: {x: 3.29, y: 8.765795, z: 1.110249}
+  m_Center: {x: 2.558749e-14, y: 0.38430503, z: -0.14922118}
 --- !u!65 &6744154986112755806
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -20427,8 +20427,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1.405578, z: 1.4736332}
-  m_Center: {x: 0, y: -4.693947, z: 0.03247094}
+  m_Size: {x: 1, y: 1.4055783, z: 1.110249}
+  m_Center: {x: 2.0679037e-13, y: -4.693947, z: -0.1492212}
 --- !u!1 &6340063017892226262
 GameObject:
   m_ObjectHideFlags: 0
@@ -26069,7 +26069,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7105509204358593803
 Transform:
   m_ObjectHideFlags: 0
@@ -53485,7 +53485,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7105509205813945997}
-  m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523}
+  m_LocalRotation: {x: -0, y: -1, z: 0, w: -0.0000001872535}
   m_LocalPosition: {x: -161.1, y: 11.480696, z: 38}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -53682,7 +53682,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7105509206185676041}
   serializedVersion: 2
-  m_Mass: 19000
+  m_Mass: 2000
   m_Drag: 0
   m_AngularDrag: 0
   m_UseGravity: 1
@@ -54406,7 +54406,7 @@ PrefabInstance:
     - target: {fileID: 919132149155446097, guid: 341178132686ee84386bf7dc115459cb,
         type: 3}
       propertyPath: m_Name
-      value: saccboat
+      value: SS-1
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 341178132686ee84386bf7dc115459cb,
         type: 3}

diff --git a/SS-1.meta b/SS-1.meta
diff --git a/SS-1/Animations.meta b/SS-1/Animations.meta
diff --git a/SS-1/Models.meta b/SS-1/Models.meta
diff --git a/SS-1/Models/SS-1.fbx b/SS-1/Models/SS-1.fbx
diff --git a/SS-1/Models/SS-1.fbx.meta b/SS-1/Models/SS-1.fbx.meta
diff --git a/SS-1/Sounds.meta b/SS-1/Sounds.meta
diff --git a/SS-1/Sounds/BoatDistant.wav b/SS-1/Sounds/BoatDistant.wav
diff --git a/SS-1/Sounds/BoatDistant.wav.meta b/SS-1/Sounds/BoatDistant.wav.meta
diff --git a/SS-1/Sounds/BoatIdle.wav b/SS-1/Sounds/BoatIdle.wav
diff --git a/SS-1/Sounds/BoatIdle.wav.meta b/SS-1/Sounds/BoatIdle.wav.meta
diff --git a/SS-1/Sounds/WaterThrust.wav b/SS-1/Sounds/WaterThrust.wav
diff --git a/SS-1/Sounds/WaterThrust.wav.meta b/SS-1/Sounds/WaterThrust.wav.meta
diff --git a/Scripts/DFUNC/DFUNC_AGM.cs b/Scripts/DFUNC/DFUNC_AGM.cs
@@ -23,6 +23,7 @@ public class DFUNC_AGM : UdonSharpBehaviour
     [SerializeField] private float FullReloadTimeSec = 8;
     [SerializeField] private AudioSource AGMLock;
     [SerializeField] private AudioSource AGMUnlock;
+    [SerializeField] private bool AllowFiringWhenGrounded;
     [SerializeField] private bool DoAnimBool = false;
     [SerializeField] private string AnimBoolName = "AGMSelected";
     [Tooltip("Should the boolean stay true if the pilot exits with it selected?")]
@@ -199,7 +200,7 @@ private void Update()
                     {//double tap detected
                         if (AGMLocked)
                         {//locked on, launch missile
-                            if (NumAGM > 0 && !(bool)SAVControl.GetProgramVariable("Taxiing"))
+                            if (NumAGM > 0 && (AllowFiringWhenGrounded || !(bool)SAVControl.GetProgramVariable("Taxiing")))
                             {
                                 AGMFire++;//launch AGM using set
                                 RequestSerialization();

diff --git a/Scripts/DFUNC/DFUNC_AltHold.cs b/Scripts/DFUNC/DFUNC_AltHold.cs
@@ -59,7 +59,7 @@ public void SFEXT_O_PilotEnter()
         Piloting = true;
         if (Dial_Funcon) Dial_Funcon.SetActive(AltHold);
     }
-    public void SFEXT_O_PassengerEnter()
+    public void SFEXT_L_PassengerEnter()
     {
         if (Dial_Funcon) Dial_Funcon.SetActive(AltHold);
     }

diff --git a/Scripts/DFUNC/DFUNC_Brake.cs b/Scripts/DFUNC/DFUNC_Brake.cs
@@ -78,7 +78,7 @@ public void SFEXT_O_PilotEnter()
             }
         }
     }
-    public void SFEXT_O_PilotExit()
+    public void SFEXT_P_PilotExit()
     {
         BrakeInput = 0;
         Selected = false;
@@ -235,10 +235,12 @@ private void Update()
                 return;
             }
         }
-
         AirbrakeLerper = Mathf.Lerp(AirbrakeLerper, BrakeInput, 2f * DeltaTime);
         BrakeAnimator.SetFloat(BRAKE_STRING, AirbrakeLerper);
-        Airbrake_snd.pitch = BrakeInput * .2f + .9f;
-        Airbrake_snd.volume = AirbrakeLerper * (float)SAVControl.GetProgramVariable("rotlift");
+        if (Airbrake_snd)
+        {
+            Airbrake_snd.pitch = BrakeInput * .2f + .9f;
+            Airbrake_snd.volume = AirbrakeLerper * (float)SAVControl.GetProgramVariable("rotlift");
+        }
     }
 }
diff --git a/Scripts/DFUNC/DFUNC_Catapult.cs b/Scripts/DFUNC/DFUNC_Catapult.cs
@@ -83,7 +83,7 @@ public void SFEXT_O_PilotExit()
         Selected = false;
         DisableOverrides();
     }
-    public void SFEXT_O_PassengerEnter()
+    public void SFEXT_L_PassengerEnter()
     {
         if (Dial_Funcon) Dial_Funcon.SetActive(OnCatapult);
     }

diff --git a/Scripts/DFUNC/DFUNC_Cruise.cs b/Scripts/DFUNC/DFUNC_Cruise.cs
@@ -11,6 +11,7 @@ public class DFUNC_Cruise : UdonSharpBehaviour
     [SerializeField] UdonSharpBehaviour SAVControl;
     [Tooltip("Object enabled when function is active (used on MFD)")]
     [SerializeField] private GameObject Dial_Funcon;
+    [SerializeField] private bool AllowCruiseGrounded;
     [SerializeField] private Text HUDText_knotstarget;
     private SaccEntity EntityControl;
     private bool UseLeftTrigger = false;
@@ -87,7 +88,7 @@ public void SFEXT_G_Explode()
     }
     public void SFEXT_G_TouchDown()
     {
-        if (Cruise)
+        if (Cruise && !AllowCruiseGrounded)
         { SetCruiseOff(); }
     }
     public void SFEXT_O_EnterVTOL()
@@ -120,7 +121,7 @@ private void LateUpdate()
                         {
                             if (!Cruise)
                             {
-                                if (!(bool)SAVControl.GetProgramVariable("Taxiing"))
+                                if (!(bool)SAVControl.GetProgramVariable("Taxiing") || AllowCruiseGrounded)
                                 { SetCruiseOn(); }
                             }
                             if (TriggerTapTime > .4f)//no double tap
@@ -197,7 +198,7 @@ public void KeyboardInput()
     {
         if (!Cruise)
         {
-            if (!(bool)SAVControl.GetProgramVariable("Taxiing") && !(bool)SAVControl.GetProgramVariable("InVTOL"))
+            if ((!(bool)SAVControl.GetProgramVariable("Taxiing") || AllowCruiseGrounded) && !(bool)SAVControl.GetProgramVariable("InVTOL"))
             { SetCruiseOn(); }
         }
         else

diff --git a/Scripts/DFUNC/DFUNC_Flaps.cs b/Scripts/DFUNC/DFUNC_Flaps.cs
@@ -69,7 +69,7 @@ public void SFEXT_O_PilotExit()
     {
         DFUNC_Deselected();
     }
-    public void SFEXT_O_PassengerEnter()
+    public void SFEXT_L_PassengerEnter()
     {
         if (Dial_Funcon) Dial_Funcon.SetActive(Flaps);
     }

diff --git a/Scripts/DFUNC/DFUNC_Gear.cs b/Scripts/DFUNC/DFUNC_Gear.cs
@@ -51,7 +51,7 @@ public void SFEXT_O_PilotExit()
     {
         DFUNC_Deselected();
     }
-    public void SFEXT_O_PassengerEnter()
+    public void SFEXT_L_PassengerEnter()
     {
         if (Dial_Funcon) Dial_Funcon.SetActive(!GearUp);
     }

diff --git a/Scripts/DFUNC/DFUNC_Hook.cs b/Scripts/DFUNC/DFUNC_Hook.cs
@@ -81,7 +81,7 @@ public void SFEXT_G_RespawnButton()
     {
         SetHookUp();
     }
-    public void SFEXT_O_PassengerEnter()
+    public void SFEXT_L_PassengerEnter()
     {
         if (Dial_Funcon) { Dial_Funcon.SetActive(HookDown); }
     }

diff --git a/Scripts/DFUNC/DFUNC_Limits.cs b/Scripts/DFUNC/DFUNC_Limits.cs
@@ -93,7 +93,7 @@ public void SetLimitsOff()
         if (Dial_Funcon) { Dial_Funcon.SetActive(false); }
         SAVControl.SetProgramVariable("Limits", 1f);
     }
-    public void SFEXT_O_PassengerEnter()
+    public void SFEXT_L_PassengerEnter()
     {
         if (Dial_Funcon) { Dial_Funcon.SetActive(FlightLimitsEnabled); }
     }