hacking 1678

J-Barta · Aug 24, 2024 · c5b4fe1 · c5b4fe1
1 parent d790c3c
commit c5b4fe1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/FRCDrivingSimulator/Assets/Materials/SignalLight.mat b/FRCDrivingSimulator/Assets/Materials/SignalLight.mat
@@ -80,6 +80,6 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 0, g: 0, b: 0, a: 1}
-    - _EmissionColor: {r: 2, g: 0.61046064, b: 0, a: 2}
+    - _EmissionColor: {r: 0.5, g: 0.15261516, b: 0, a: 0.5}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
diff --git a/FRCDrivingSimulator/Assets/Scenes/Crescendo.unity b/FRCDrivingSimulator/Assets/Scenes/Crescendo.unity
@@ -294809,7 +294809,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &905055556
 Transform:
   m_ObjectHideFlags: 0
@@ -598422,7 +598422,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1870384711
 Transform:
   m_ObjectHideFlags: 0
@@ -598498,7 +598498,7 @@ MonoBehaviour:
   player: {fileID: 68329602}
   shootSound: {fileID: 8300000, guid: 766670c41f3c6e6479bf8e00ce4216e9, type: 3}
   spedUpSound: {fileID: 8300000, guid: 3b824dd9b5158ce49ba7facfb7c0d616, type: 3}
-  shootingLatency: 0.6
+  shootingLatency: 0.3
   intakeLatency: 0
   ampingLatency: 0.4
   hiddenNote: {fileID: 1476096484}
@@ -599315,7 +599315,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   alliance: 0
-  robot: 0
+  robot: 2
   target: {fileID: 2059917030}
   lobTarget: {fileID: 0}
   shooterPivot: {fileID: 1727389363}
@@ -1029021,7 +1029021,7 @@ MeshCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 5
   m_Convex: 1
   m_CookingOptions: 30
@@ -1029043,7 +1029043,7 @@ MeshCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 5
   m_Convex: 1
   m_CookingOptions: 30
@@ -1208199,7 +1208199,7 @@ MeshCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 5
   m_Convex: 1
   m_CookingOptions: 30
@@ -1208221,7 +1208221,7 @@ MeshCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 5
   m_Convex: 1
   m_CookingOptions: 30

diff --git a/FRCDrivingSimulator/Assets/Scripts/2024/AmpMechScripts/JointBackpackAmpArm.cs b/FRCDrivingSimulator/Assets/Scripts/2024/AmpMechScripts/JointBackpackAmpArm.cs
@@ -74,10 +74,6 @@ private void Update()
         }
         else 
         {
-            if (robot == RobotSettings.CitrusCircuits) 
-            {
-                if (!moveIntake) { intake.StowIntake(); moveIntake = true; intake.isAmping = false; }
-            }
             robotController.canIntake = true;
         }
     }
@@ -92,11 +88,17 @@ private IEnumerator AmpArm()
 
         source.resource = stall;
         source.Play();
-
-        yield return new WaitForSeconds(0.98f);
+        yield return new WaitForSeconds(0.4f);
 
         isAtPosition = true;
         isMoving = false;
+        if (robot == RobotSettings.CitrusCircuits)
+        {
+            if (!moveIntake) { intake.StowIntake(); moveIntake = true; intake.isAmping = false; }
+        }
+        robotController.canIntake = true;
+
+        yield return new WaitForSeconds(0.58f);
     }
 
 

diff --git a/FRCDrivingSimulator/Assets/Scripts/2024/RobotAlignToSpeaker.cs b/FRCDrivingSimulator/Assets/Scripts/2024/RobotAlignToSpeaker.cs
@@ -268,7 +268,7 @@ private IEnumerator RotateTowardsTarget(Quaternion targetRotation, Transform tar
         if (alliance == Alliance.Blue) { DriveController.canBlueRotate = false; }
         else { DriveController.canRedRotate = false; }
 
-        if (robot != RobotSettings.CCShambots) {
+        if (robot != RobotSettings.CCShambots && robot != RobotSettings.CitrusCircuits) {
             while (Quaternion.Angle(robotRigidbody.rotation, targetRotation) > 0.1f) { 
 
                 robotRigidbody.rotation = Quaternion.RotateTowards(robotRigidbody.rotation, targetRotation, rotationSpeed * Time.deltaTime);

diff --git a/FRCDrivingSimulator/Assets/Scripts/2024/SourceRingLoader.cs b/FRCDrivingSimulator/Assets/Scripts/2024/SourceRingLoader.cs
@@ -24,7 +24,7 @@ public class SourceRingLoader : MonoBehaviour, IResettable
     private float drop;
 
     private int lastRandomNum = -1;
-    private int noteCount = 45;
+    private int noteCount = 60;
 
     private void Start() 
     {
@@ -141,7 +141,7 @@ private SourceMode GetSourceMode()
 
     public void Reset() 
     {
-        noteCount = 45;
+        noteCount = 60;
         counterText.text = noteCount.ToString();
     }