fix: Updated instructions and documented the Unity version

Merge branch 'FinalSubmission'
put tambourine back on player prefab
2023-06-01 18:05:18 -07:00 · 2023-05-07 00:30:47 -07:00 · 2023-05-07 00:30:33 -07:00 · 2023-05-07 00:27:39 -07:00 · 2023-05-07 00:09:47 -07:00 · 2023-05-07 00:09:47 -07:00
8 changed files with 26220 additions and 177 deletions
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@ -674,6 +674,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: b0115312556794123a3cafad4b83d0a7, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  forward: 1
  playerInput: {fileID: 1407172087}
  launcher: {fileID: 6559806128767475056}
  hasTambourine: 1
@ -684,7 +685,7 @@ MonoBehaviour:
  waterGravity: 0.5
  velocityCut: 1.5
  cymbalBounceForce: 10
-  cymbalHitboxRange: 3
+  cymbalHitboxRange: 2.5
  cymbalAudio: {fileID: 264629194984044240}
  grapplingGun: {fileID: 3465910379319867675}
  grapplingRope: {fileID: 7648135587659148198}
@ -1009,7 +1010,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  grappleRope: {fileID: 7648135587659148198}
-  m_camera: {fileID: 0}
  gunHolder: {fileID: 5885597207104481986}
  gunPivot: {fileID: 5885597207531562994}
  firePoint: {fileID: 5885597208857297552}
@ -1486,7 +1486,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: b49ff353512cc43728014da636fce388, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  tambourine: {fileID: 1383583972917023564, guid: f8f8a87d4db1d45a19b751cae19fe4f6, type: 3}
+  tambourine: {fileID: 846954788906673686, guid: f8f8a87d4db1d45a19b751cae19fe4f6, type: 3}
  horizSpeed: 10
  vertSpeed: 14
 --- !u!1 &5885597208857297553
--- a/Assets/Prefabs/tambourine.prefab
+++ b/Assets/Prefabs/tambourine.prefab
@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &1383583972917023564
+--- !u!1 &846954788906673686
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -8,13 +8,13 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 1383583972917023563}
-  - component: {fileID: 7137590925806210046}
-  - component: {fileID: 4280484977328239622}
-  - component: {fileID: 3514624092989024146}
-  - component: {fileID: -618517480110831953}
-  - component: {fileID: 8586493026733961254}
-  - component: {fileID: 4464024349174775543}
+  - component: {fileID: 4169947924414531487}
+  - component: {fileID: 767994494619494189}
+  - component: {fileID: 2737831488321223751}
+  - component: {fileID: 5459201274984818219}
+  - component: {fileID: 8615781453448118873}
+  - component: {fileID: 3870016400149749308}
+  - component: {fileID: 5743551219668214514}
  m_Layer: 0
  m_Name: tambourine
  m_TagString: tambourine
@ -22,44 +22,44 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &1383583972917023563
+--- !u!4 &4169947924414531487
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: -2.98, y: -0.67, z: 0}
  m_LocalScale: {x: 0.04, y: 0.04, z: 0.04}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 8074438095219817362}
+  - {fileID: 9029893400482145899}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7137590925806210046
+--- !u!114 &767994494619494189
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 4797d7ba2c50b4594bb88bfffee1f8d0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
-  tambourineHitSound: {fileID: -618517480110831953}
--- !u!50 &4280484977328239622
+  tambourineHitSound: {fileID: 8615781453448118873}
+--- !u!50 &2737831488321223751
 Rigidbody2D:
  serializedVersion: 4
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_BodyType: 0
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
@ -79,13 +79,13 @@ Rigidbody2D:
  m_SleepingMode: 1
  m_CollisionDetection: 1
  m_Constraints: 4
--- !u!58 &3514624092989024146
+--- !u!58 &5459201274984818219
 CircleCollider2D:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_Enabled: 1
  m_Density: 1
  m_Material: {fileID: 0}
@ -114,13 +114,13 @@ CircleCollider2D:
  m_Offset: {x: 0, y: 0}
  serializedVersion: 2
  m_Radius: 5.6
--- !u!82 &-618517480110831953
+--- !u!82 &8615781453448118873
 AudioSource:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_Enabled: 1
  serializedVersion: 4
  OutputAudioMixerGroup: {fileID: 0}
@ -210,13 +210,13 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
--- !u!61 &8586493026733961254
+--- !u!61 &3870016400149749308
 BoxCollider2D:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_Enabled: 1
  m_Density: 1
  m_Material: {fileID: 0}
@ -242,7 +242,7 @@ BoxCollider2D:
  m_IsTrigger: 1
  m_UsedByEffector: 0
  m_UsedByComposite: 0
-  m_Offset: {x: 60, y: 60}
+  m_Offset: {x: 58.32233, y: 58.315758}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0.5, y: 0.5}
@ -253,15 +253,15 @@ BoxCollider2D:
    adaptiveTiling: 0
  m_AutoTiling: 0
  serializedVersion: 2
-  m_Size: {x: 125, y: 125}
+  m_Size: {x: 128.35533, y: 128.36848}
  m_EdgeRadius: 0
--- !u!60 &4464024349174775543
+--- !u!60 &5743551219668214514
 PolygonCollider2D:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1383583972917023564}
+  m_GameObject: {fileID: 846954788906673686}
  m_Enabled: 0
  m_Density: 1
  m_Material: {fileID: 0}
@ -305,7 +305,7 @@ PolygonCollider2D:
      - {x: 12, y: 94}
      - {x: 121, y: 94}
  m_UseDelaunayMesh: 1
--- !u!1 &7218975625062829832
+--- !u!1 &7197847412137544156
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -313,9 +313,9 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 8074438095219817362}
-  - component: {fileID: 5289674117813526079}
-  - component: {fileID: 1153042263548898733}
+  - component: {fileID: 9029893400482145899}
+  - component: {fileID: 7145655876668355451}
+  - component: {fileID: 4313813593087747928}
  m_Layer: 0
  m_Name: tambourineSprite
  m_TagString: Untagged
@ -323,28 +323,28 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &8074438095219817362
+--- !u!4 &9029893400482145899
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7218975625062829832}
+  m_GameObject: {fileID: 7197847412137544156}
  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_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 1383583972917023563}
+  m_Father: {fileID: 4169947924414531487}
  m_RootOrder: -1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5289674117813526079
+--- !u!212 &7145655876668355451
 SpriteRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7218975625062829832}
+  m_GameObject: {fileID: 7197847412137544156}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
@ -390,14 +390,14 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!95 &1153042263548898733
+--- !u!95 &4313813593087747928
 Animator:
  serializedVersion: 5
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7218975625062829832}
+  m_GameObject: {fileID: 7197847412137544156}
  m_Enabled: 1
  m_Avatar: {fileID: 0}
  m_Controller: {fileID: 9100000, guid: c55b775f272db4472814cb6f30ac169e, type: 2}
--- a/Assets/Scenes/Brasslands.unity
+++ b/Assets/Scenes/Brasslands.unity
@ -2174,8 +2174,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 75995289}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -6.117, y: -7.5057, z: 0}
-  m_LocalScale: {x: 11.755, y: 14.772899, z: 10}
+  m_LocalPosition: {x: -6.117, y: -7.5735, z: 0}
+  m_LocalScale: {x: 11.755, y: 14.82717, z: 10}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 721142256}
@ -8198,7 +8198,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 331950543}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 81.77, y: -0.2, z: 0}
+  m_LocalPosition: {x: 81.77, y: 0.23, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -8229,7 +8229,7 @@ MonoBehaviour:
  xRight: 0
  movementVectorHorizontal: {x: 1, y: 0}
  isVertical: 1
-  rangeVertical: 2
+  rangeVertical: 3
  yUp: 0
  yDown: 0
  movementVectorVertical: {x: 0, y: 1}
@ -22845,7 +22845,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 889351563}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 63.76, y: 9.81, z: 0}
+  m_LocalPosition: {x: 63.76, y: 8.88, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -22876,7 +22876,7 @@ MonoBehaviour:
  xRight: 0
  movementVectorHorizontal: {x: 1, y: 0}
  isVertical: 1
-  rangeVertical: 1
+  rangeVertical: 2
  yUp: 0
  yDown: 0
  movementVectorVertical: {x: 0, y: 1}
@ -43512,11 +43512,11 @@ MonoBehaviour:
  xRight: 0
  movementVectorHorizontal: {x: 1, y: 0}
  isVertical: 1
-  rangeVertical: 2
+  rangeVertical: 3
  yUp: 0
  yDown: 0
  movementVectorVertical: {x: 0, y: 1}
-  moveSpeed: 2.5
+  moveSpeed: 3
  isPlayingDefeatAnimation: 0
 --- !u!251 &1767761847
 PlatformEffector2D:
@ -50654,11 +50654,11 @@ MonoBehaviour:
  xRight: 0
  movementVectorHorizontal: {x: 1, y: 0}
  isVertical: 1
-  rangeVertical: 2
+  rangeVertical: 3
  yUp: 0
  yDown: 0
  movementVectorVertical: {x: 0, y: 1}
-  moveSpeed: 2.5
+  moveSpeed: 2
  isPlayingDefeatAnimation: 0
 --- !u!251 &2042660774
 PlatformEffector2D:
--- a/Assets/Scenes/ClarinetScene.unity
+++ b/Assets/Scenes/ClarinetScene.unity
--- a/Assets/Scenes/GrenouilleVillage.unity
+++ b/Assets/Scenes/GrenouilleVillage.unity
@ -7124,6 +7124,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 4.48
  xLeft: 1.57
@ -9096,6 +9097,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 0.7
  xLeft: 2
@ -42116,6 +42118,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 1.21
  xLeft: 0.03
@ -44947,6 +44950,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 2.03
  xLeft: 0
@ -48029,6 +48033,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 1.21
  xLeft: 0.03
@ -52246,9 +52251,9 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: -2
+  m_SortingOrder: -10
  m_Sprite: {fileID: 21300000, guid: 22183c3d48b869f448732f46fda3b201, type: 3}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 0.72156864, b: 0.41960785, a: 1}
  m_FlipX: 0
  m_FlipY: 0
  m_DrawMode: 0
@ -52688,6 +52693,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 2.03
  xLeft: 0
@ -60661,6 +60667,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  pinned: 0
+  pinnedTambourine: {fileID: 0}
  isHorizontal: 1
  rangeHorizontal: 0.59
  xLeft: 0.03
--- a/Assets/Scenes/MushroomForest.unity
+++ b/Assets/Scenes/MushroomForest.unity
@ -184,7 +184,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_RootOrder
-      value: 34
+      value: 33
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_LocalPosition.x
@ -399,11 +399,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -26
+      value: -23.1
      objectReference: {fileID: 0}
    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 35.8
+      value: 31.5
      objectReference: {fileID: 0}
    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
      propertyPath: m_LocalPosition.z
@ -538,7 +538,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &272640804
 GameObject:
@ -631,7 +631,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &277557301
 PrefabInstance:
@ -825,7 +825,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 18
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &353472570
 GameObject:
@ -971,7 +971,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 23
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &377548165
 GameObject:
@ -1055,7 +1055,7 @@ Transform:
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 29
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &380422480
 GameObject:
@ -1148,7 +1148,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 19
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &404810523
 PrefabInstance:
@ -1354,7 +1354,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 22
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &440397388
 BoxCollider2D:
@ -1432,7 +1432,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &599868449
 BoxCollider2D:
@ -1589,7 +1589,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &625004206
 GameObject:
@ -1717,7 +1717,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 39
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &708704664
 GameObject:
@ -1861,6 +1861,7 @@ Transform:
  m_Children:
  - {fileID: 1809671261}
  - {fileID: 168704917}
+  - {fileID: 1755104000}
  m_Father: {fileID: 0}
  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2008,7 +2009,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 31
+  m_RootOrder: 30
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &881612903
 PrefabInstance:
@ -2276,7 +2277,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 36
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -4528,7 +4529,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
      propertyPath: m_RootOrder
-      value: 26
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
      propertyPath: m_LocalPosition.x
@ -6084,7 +6085,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 28
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.086}
 --- !u!1001 &1300684579
 PrefabInstance:
@ -6269,7 +6270,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 37
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -23.922}
 --- !u!1 &1464762821
 GameObject:
@ -6417,71 +6418,6 @@ BoxCollider2D:
  serializedVersion: 2
  m_Size: {x: 1, y: 1}
  m_EdgeRadius: 0
--- !u!1001 &1510697823
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 367295637452716247, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_Name
-      value: GrappleBox (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_Radius
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_RootOrder
-      value: 13
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 6.0668344
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 45.00944
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
 --- !u!1 &1581570628
 GameObject:
  m_ObjectHideFlags: 0
@ -6558,7 +6494,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 27
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1612458169
 PrefabInstance:
@ -6635,7 +6571,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
      propertyPath: m_RootOrder
-      value: 14
+      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
      propertyPath: m_LocalPosition.x
@ -6826,7 +6762,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1689909171
 GameObject:
@ -6997,7 +6933,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 39
+  m_RootOrder: 38
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -7018,7 +6954,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_RootOrder
-      value: 33
+      value: 32
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_LocalPosition.x
@ -7069,6 +7005,76 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
+--- !u!1001 &1755103999
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 784959645}
+    m_Modifications:
+    - target: {fileID: 3694183975375614525, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_Name
+      value: DeathZone (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 64.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 8.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 49.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.6646442
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+--- !u!4 &1755104000 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
+  m_PrefabInstance: {fileID: 1755103999}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1757844132
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -7091,7 +7097,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
      propertyPath: m_RootOrder
-      value: 27
+      value: 26
      objectReference: {fileID: 0}
    - target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
      propertyPath: m_LocalPosition.x
@ -19756,7 +19762,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_RootOrder
-      value: 36
+      value: 35
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_LocalPosition.x
@ -19902,7 +19908,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1932598057
 GameObject:
@ -19995,7 +20001,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1997830446
 PrefabInstance:
@ -20015,7 +20021,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_RootOrder
-      value: 35
+      value: 34
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_LocalPosition.x
@ -20076,7 +20082,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_RootOrder
-      value: 32
+      value: 31
      objectReference: {fileID: 0}
    - target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/Scripts/ProjectileBehavior.cs
+++ b/Assets/Scripts/ProjectileBehavior.cs
@ -20,7 +20,7 @@ public class ProjectileBehavior : MonoBehaviour

    public void OnCollisionEnter2D(Collision2D col)
    {
-        if (col.gameObject.tag == "wall")
+        if (col.gameObject.tag == "wall" || col.gameObject.tag == "Player")
        {
            Explode();
        }
--- a/README.md
+++ b/README.md
@ -2,18 +2,4 @@

 ## Requirements

-1. [aseprite](https://www.aseprite.org/)
-2. python (To automatically compile the assets)
-
-## First Time Setup
-
-The assets for the game are stored separately to the code. To retrieve the assets for the first time, run:
-
-1. `git submodule init`
-2. `git submodule update --init --recursive --remote`
-
-From there, only the second command has to be run in order to update the assets
-
-## Compiling the Assets
-
-`python compile_assets.py`
+* [Unity (2022.2.15f1](https://unity.com/download)
Author	SHA1	Message	Date
Nicholas Novak	c4a618ac80	fix: Updated instructions and documented the Unity version	2023-06-01 18:05:18 -07:00
Sam	873f9216ce	Merge branch 'FinalSubmission'	2023-05-07 00:30:47 -07:00
Sam	3a2368d8b7	put tambourine back on player prefab	2023-05-07 00:30:33 -07:00
Sam	76fe0be86d	Merge branch 'master' into FinalSubmission	2023-05-07 00:27:39 -07:00
Nicholas Novak	5333e6028d	fix: Re-added projectiles deleting themselves when they hit the player	2023-05-07 00:09:47 -07:00
Nicholas Novak	f5beaf0fe9	change: Fixed some of the colliders on geometry, and removed an old grapple point	2023-05-07 00:09:47 -07:00
Nicholas Novak	4135171a79	change: Reduced cymbal range to make it harder	2023-05-07 00:09:47 -07:00
Sam	bf6996b029	expanded borders of clarinet tilemap	2023-05-07 00:00:21 -07:00
Sam	c2b9a2aa88	Merge remote-tracking branch 'origin/master'	2023-05-06 23:59:14 -07:00
Bryanna	fc4a9a74d7	minor changes to gv and bl	2023-05-06 23:57:50 -07:00
Sam	56c9c0e1bb	improved tambourine collider just expanded it slightly so it doesn't get stuck on the bats' heads anymore	2023-05-06 23:53:25 -07:00