Actual GGJ Final

jacobcheatley · Jan 31, 2021 · bcf354d · bcf354d
1 parent e68f934
commit bcf354d
Show file tree

Hide file tree

Showing 11 changed files with 185 additions and 33 deletions.
diff --git a/Assets/Audio/Mixers/SFXMixer.mixer b/Assets/Audio/Mixers/SFXMixer.mixer
@@ -65,5 +65,5 @@ AudioMixerSnapshotController:
   m_AudioMixer: {fileID: 24100000}
   m_SnapshotID: cd3c456c861081d45bd38f12e859d11f
   m_FloatValues:
-    fca217934bc9c2a4abf28de31c111103: -40
+    fca217934bc9c2a4abf28de31c111103: -10
   m_TransitionOverrides: {}
diff --git a/Assets/Prefabs/Hookable/ShipPieces/Glue.prefab b/Assets/Prefabs/Hookable/ShipPieces/Glue.prefab
@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 5185249560817745881}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.349, y: -4.645, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2, y: 2, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -97,6 +97,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isRetracting: 0
+  temporarilyPauseRetracting: 0
+  retractingAlongLine: []
   value: 5
   isShipPart: 1
   isHooked: 0

diff --git a/Assets/Prefabs/Hookable/ShipPieces/Leg.prefab b/Assets/Prefabs/Hookable/ShipPieces/Leg.prefab
@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 5185249560817745881}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.349, y: -4.645, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2, y: 2, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -97,6 +97,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isRetracting: 0
+  temporarilyPauseRetracting: 0
+  retractingAlongLine: []
   value: 5
   isShipPart: 1
   isHooked: 0

diff --git a/Assets/Prefabs/Hookable/ShipPieces/Metal.prefab b/Assets/Prefabs/Hookable/ShipPieces/Metal.prefab
@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 5185249560817745881}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.349, y: -4.645, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2, y: 2, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -97,6 +97,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isRetracting: 0
+  temporarilyPauseRetracting: 0
+  retractingAlongLine: []
   value: 5
   isShipPart: 1
   isHooked: 0

diff --git a/Assets/Prefabs/Hookable/ShipPieces/Sheet.prefab b/Assets/Prefabs/Hookable/ShipPieces/Sheet.prefab
@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 5185249560817745881}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.349, y: -4.645, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2, y: 2, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -97,6 +97,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isRetracting: 0
+  temporarilyPauseRetracting: 0
+  retractingAlongLine: []
   value: 5
   isShipPart: 1
   isHooked: 0

diff --git a/Assets/Prefabs/Hookable/ShipPieces/Wing.prefab b/Assets/Prefabs/Hookable/ShipPieces/Wing.prefab
@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 5185249560817745881}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.349, y: -4.645, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2, y: 2, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -97,6 +97,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isRetracting: 0
+  temporarilyPauseRetracting: 0
+  retractingAlongLine: []
   value: 5
   isShipPart: 1
   isHooked: 0

diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -974,7 +974,7 @@ MonoBehaviour:
     density: 0.52
     backgroundPrefab: {fileID: 9211955277169531155, guid: ff18bb931fd6a684f9911e2048c0443c,
       type: 3}
-  - chunkEnd: 22
+  - chunkEnd: 14
     hookables:
     - hookablePrefab: {fileID: 5185249560817745881, guid: f1641980234841f4a86884f61539f68f,
         type: 3}
@@ -999,7 +999,7 @@ MonoBehaviour:
     density: 0.641
     backgroundPrefab: {fileID: 9211955277169531155, guid: d16d2f3e4ef957d4382e8842f7b293f4,
       type: 3}
-  - chunkEnd: 30
+  - chunkEnd: 20
     hookables:
     - hookablePrefab: {fileID: 5185249560817745881, guid: ef38b8973490bdb42b777a76db6952f1,
         type: 3}
@@ -2213,7 +2213,7 @@ Transform:
   m_GameObject: {fileID: 733225998}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 4}
-  m_LocalScale: {x: 50, y: 50, z: 1}
+  m_LocalScale: {x: 1000, y: 1000, z: 1}
   m_Children: []
   m_Father: {fileID: 519420032}
   m_RootOrder: 0
@@ -4131,6 +4131,139 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1393057261}
   m_CullTransparentMesh: 0
+--- !u!1 &1408792382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1408792383}
+  - component: {fileID: 1408792385}
+  - component: {fileID: 1408792384}
+  m_Layer: 5
+  m_Name: NightText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1408792383
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408792382}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1874643403}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 334, y: -496.7}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1408792384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408792382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Night 1
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4280050418
+  m_fontColor: {r: 0.9490197, g: 0.38431376, b: 0.10980393, a: 1}
+  m_enableVertexGradient: 1
+  m_colorMode: 2
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 0.3255814, b: 0, a: 1}
+    topRight: {r: 1, g: 0.3255814, b: 0, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1408792385
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408792382}
+  m_CullTransparentMesh: 0
 --- !u!1 &1428456329
 GameObject:
   m_ObjectHideFlags: 0
@@ -4970,7 +5103,8 @@ AudioSource:
   m_GameObject: {fileID: 1656642759}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: 24300002, guid: 353b5600e302b884c90c024d2c9868ae,
+    type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
   m_Volume: 1
@@ -5968,6 +6102,7 @@ MonoBehaviour:
   alienAnimator: {fileID: 1693420586}
   darkness: {fileID: 733226000}
   hammerAnimator: {fileID: 1317822110}
+  nightText: {fileID: 1408792384}
   starFadeTime: 2
   dayBackground: {r: 0, g: 0.65882355, b: 1, a: 1}
   nightBackground: {r: 0.07058824, g: 0.07058824, b: 0.44705883, a: 1}
@@ -6699,6 +6834,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1476267087}
+  - {fileID: 1408792383}
   m_Father: {fileID: 1321611949}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

diff --git a/Assets/Scripts/DayNightSwitcher.cs b/Assets/Scripts/DayNightSwitcher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System;
 using UnityEngine;
+using TMPro;
 
 public class DayNightSwitcher : MonoBehaviour
 {
@@ -30,6 +31,8 @@ public class DayNightSwitcher : MonoBehaviour
     private SpriteRenderer darkness;
     [SerializeField]
     private Animator hammerAnimator;
+    [SerializeField]
+    private TextMeshProUGUI nightText;
 
     [Header("Properties and settings")]
     [SerializeField]
@@ -51,6 +54,7 @@ public class DayNightSwitcher : MonoBehaviour
     private Camera mainCamera;
     private bool day = true;
     public float cameraSizeDayUpgradeBonus = 0;
+    private int nightCount = 0;
 
     void Start()
     {
@@ -79,6 +83,8 @@ public void Day()
 
     public void Night()
     {
+        nightCount++;
+        nightText.text = $"Night {nightCount}";
         AudioController.EndDepthAudio();
         day = false;
         Debug.Log("Night");

diff --git a/Assets/Scripts/SkillTree/SkillTree.cs b/Assets/Scripts/SkillTree/SkillTree.cs
@@ -60,34 +60,34 @@ public static class SkillTree
 {
     public static readonly Dictionary<SkillID, Skill> skills = new Dictionary<SkillID, Skill> {
         { SkillID.HookDuration1, new Skill(SkillID.None, "Hook Duration +1", "TODO DESC", "", 50) },
-        { SkillID.HookDuration2, new Skill(SkillID.HookDuration1, "Hook Duration +1", "TODO DESC", "", 500 / 2) },
-        { SkillID.HookDuration3, new Skill(SkillID.HookDuration2, "Hook Duration +1", "TODO DESC", "", 1500 / 2) },
-        { SkillID.HookDuration4, new Skill(SkillID.None, "Hook Duration +1", "TODO DESC", "", 1000 / 2 ) },
-        { SkillID.CameraSize1, new Skill(SkillID.HookDuration2, "Camera Size +1", "TODO DESC", "", 1000 / 2) },
-        { SkillID.CameraSize2, new Skill(SkillID.HookDuration3, "Camera Size +1", "TODO DESC", "", 2000 / 2) },
-        { SkillID.Value1, new Skill(SkillID.ValuablesRadar, "Value +25%", "TODO DESC", "", 4000 / 2) },
-        { SkillID.Value2, new Skill(SkillID.Value1, "Value +25%", "TODO DESC", "", 8000 / 2) },
-        { SkillID.Value3, new Skill(SkillID.None, "Value +25%", "TODO DESC", "", 500) },
+        { SkillID.HookDuration2, new Skill(SkillID.HookDuration1, "Hook Duration +1", "TODO DESC", "", 250) },
+        { SkillID.HookDuration3, new Skill(SkillID.HookDuration2, "Hook Duration +1", "TODO DESC", "", 1000) },
+        { SkillID.HookDuration4, new Skill(SkillID.None, "Hook Duration +1", "TODO DESC", "", 1000 ) },
+        { SkillID.CameraSize1, new Skill(SkillID.HookDuration2, "Camera Size +1", "TODO DESC", "", 250 * 4) },
+        { SkillID.CameraSize2, new Skill(SkillID.HookDuration3, "Camera Size +1", "TODO DESC", "", 250 * 4) },
+        { SkillID.Value1, new Skill(SkillID.ValuablesRadar, "Value +25%", "TODO DESC", "", 250) },
+        { SkillID.Value2, new Skill(SkillID.Value1, "Value +25%", "TODO DESC", "", 1000) },
+        { SkillID.Value3, new Skill(SkillID.None, "Value +25%", "TODO DESC", "", 2000) },
         { SkillID.HookSpeed1, new Skill(SkillID.None, "Hook Speed +1", "TODO DESC", "", 50) },
-        { SkillID.HookSpeed2, new Skill(SkillID.LaunchAgain1, "Hook Speed +1", "TODO DESC", "", 800 / 2) },
-        { SkillID.HookSpeed3, new Skill(SkillID.TripleShot, "Hook Speed +1", "TODO DESC", "", 1500 / 2) },
+        { SkillID.HookSpeed2, new Skill(SkillID.LaunchAgain1, "Hook Speed +1", "TODO DESC", "", 400) },
+        { SkillID.HookSpeed3, new Skill(SkillID.TripleShot, "Hook Speed +1", "TODO DESC", "", 600) },
         { SkillID.HookSpeed4, new Skill(SkillID.None, "Hook Speed +1", "TODO DESC", "", 1000) },
         { SkillID.LaunchAgain1, new Skill(SkillID.HookSpeed1, "Launch Again", "TODO DESC", "", 500) },
-        { SkillID.LaunchAgain2, new Skill(SkillID.LaunchAgain1, "Launch Again Again", "TODO DESC", "", 3000 / 2) },
-        { SkillID.LaunchAgain3, new Skill(SkillID.LaunchAgain2, "Launch Again Again Again", "TODO DESC", "", 10000 / 2) },
+        { SkillID.LaunchAgain2, new Skill(SkillID.LaunchAgain1, "Launch Again Again", "TODO DESC", "", 1500) },
+        { SkillID.LaunchAgain3, new Skill(SkillID.LaunchAgain2, "Launch Again Again Again", "TODO DESC", "", 10000) },
         { SkillID.Pierce1, new Skill(SkillID.None, "Pierce +1", "TODO DESC", "", 100) },
-        { SkillID.Pierce2, new Skill(SkillID.Pierce1, "Pierce +1", "TODO DESC", "", 800 / 2) },
-        { SkillID.Pierce3, new Skill(SkillID.Pierce2, "Pierce +1", "TODO DESC", "", 3000 / 2) },
-        { SkillID.Pierce4, new Skill(SkillID.Pierce3, "Pierce +1", "TODO DESC", "", 8000 / 2) },
-        { SkillID.TripleShot, new Skill(SkillID.HookSpeed1, "Triple Shot", "TODO DESC", "", 1500) },
-        { SkillID.PentaShot, new Skill(SkillID.TripleShot, "Penta Shot", "TODO DESC", "", 6000) },
-        { SkillID.SeptaShot, new Skill(SkillID.PentaShot, "Septa Shot", "TODO DESC", "", 10000) },
+        { SkillID.Pierce2, new Skill(SkillID.Pierce1, "Pierce +1", "TODO DESC", "", 450 * 2) },
+        { SkillID.Pierce3, new Skill(SkillID.Pierce2, "Pierce +1", "TODO DESC", "", 1000 * 2) },
+        { SkillID.Pierce4, new Skill(SkillID.Pierce3, "Pierce +1", "TODO DESC", "", 2000 * 4) },
+        { SkillID.TripleShot, new Skill(SkillID.HookSpeed1, "Triple Shot", "TODO DESC", "", 500) },
+        { SkillID.PentaShot, new Skill(SkillID.TripleShot, "Penta Shot", "TODO DESC", "", 1000 * 2) },
+        { SkillID.SeptaShot, new Skill(SkillID.PentaShot, "Septa Shot", "TODO DESC", "", 5000 * 4) },
         { SkillID.ValuablesRadar, new Skill(SkillID.HookDuration2, "Valuables Radar", "TODO DESC", "", 2000) },
-        { SkillID.SlowerSwingSpeed, new Skill(SkillID.ValuablesRadar, "Slower Swing Speed", "TODO DESC", "", 3000) },
-        { SkillID.TargetedLaunch, new Skill(SkillID.SlowerSwingSpeed, "Targeted Launch", "TODO DESC", "", 5000) },
+        { SkillID.SlowerSwingSpeed, new Skill(SkillID.ValuablesRadar, "Slower Swing Speed", "TODO DESC", "", 1000) },
+        { SkillID.TargetedLaunch, new Skill(SkillID.SlowerSwingSpeed, "Targeted Launch", "TODO DESC", "", 1000 * 3) },
         { SkillID.Redirect, new Skill(SkillID.ValuablesRadar, "Targeted Redirect", "TODO DESC", "", 5000) },
         { SkillID.HomingExtraShots, new Skill(SkillID.HookSpeed3, "Homing Extra Shots", "TODO DESC", "", 15000) },
-        { SkillID.QuantumTunnel, new Skill(SkillID.Pierce2, "Quantum Tunnel", "TODO DESC", "", 2500) },
+        { SkillID.QuantumTunnel, new Skill(SkillID.Pierce2, "Quantum Tunnel", "TODO DESC", "", 2500 * 2) },
         //{ SkillID.WaterImmunity, new Skill(SkillID.Pierce2, "Water Immunity", "TODO DESC", "", 300) }, // UNIMPLEMENTED
         //{ SkillID.MagmaImmunity, new Skill(SkillID.Pierce3, "Magma Immunity", "TODO DESC", "", 1000) } // UNIMPLEMENTED
     };

diff --git a/Assets/Sprites/blank.png.meta b/Assets/Sprites/blank.png.meta
diff --git a/Assets/Sprites/star.png.meta b/Assets/Sprites/star.png.meta