Fix water physics, add Insta-Shield graphics

External/Sonic 16-bit/Characters/S3K Sonic.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &102736
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 493910}
+  - 95: {fileID: 9551182}
+  m_Layer: 0
+  m_Name: Insta-Shield
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &104412
 GameObject:
   m_ObjectHideFlags: 1
@@ -107,6 +123,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &140262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 470254}
+  - 61: {fileID: 6108368}
+  m_Layer: 0
+  m_Name: Hitbox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &147580
 GameObject:
   m_ObjectHideFlags: 1
@@ -222,6 +254,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &169246
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 434592}
+  - 212: {fileID: 21290172}
+  m_Layer: 0
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &174116
 GameObject:
   m_ObjectHideFlags: 0
@@ -241,6 +289,7 @@ GameObject:
   - 114: {fileID: 11491536}
   - 114: {fileID: 11461730}
   - 114: {fileID: 11439158}
+  - 114: {fileID: 11457154}
   m_Layer: 0
   m_Name: Moves
   m_TagString: Untagged
@@ -464,7 +513,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 151248}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 63.8699989, y: -1.03999996, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 481582}
@@ -472,6 +521,8 @@ Transform:
   - {fileID: 404068}
   - {fileID: 438320}
   - {fileID: 425756}
+  - {fileID: 470254}
+  - {fileID: 493910}
   m_Father: {fileID: 0}
   m_RootOrder: 0
 --- !u!4 &425550
@@ -511,6 +562,18 @@ Transform:
   m_Children: []
   m_Father: {fileID: 404068}
   m_RootOrder: 13
+--- !u!4 &434592
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 169246}
+  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: 493910}
+  m_RootOrder: 0
 --- !u!4 &438320
 Transform:
   m_ObjectHideFlags: 1
@@ -583,6 +646,18 @@ Transform:
   m_Children: []
   m_Father: {fileID: 404068}
   m_RootOrder: 0
+--- !u!4 &470254
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 140262}
+  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: 424606}
+  m_RootOrder: 5
 --- !u!4 &470720
 Transform:
   m_ObjectHideFlags: 1
@@ -655,6 +730,19 @@ Transform:
   m_Children: []
   m_Father: {fileID: 404068}
   m_RootOrder: 3
+--- !u!4 &493910
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 102736}
+  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:
+  - {fileID: 434592}
+  m_Father: {fileID: 424606}
+  m_RootOrder: 6
 --- !u!4 &496620
 Transform:
   m_ObjectHideFlags: 1
@@ -683,6 +771,19 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
+--- !u!61 &6108368
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 140262}
+  m_Enabled: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Size: {x: .239999995, y: .239999995}
 --- !u!61 &6118484
 BoxCollider2D:
   m_ObjectHideFlags: 1
@@ -713,6 +814,23 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!95 &9551182
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 102736}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 02ea6acc1f575c64e8afebbd691bcf26, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
 --- !u!95 &9582648
 Animator:
   serializedVersion: 3
@@ -1086,6 +1204,63 @@ MonoBehaviour:
   RestartDelay: 2.33333302
   RestartTimer: 0
   Restarting: 0
+--- !u!114 &11457154
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 174116}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b10b9cb1540747945be44ff63f2157fe, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Controller: {fileID: 0}
+  Manager: {fileID: 0}
+  Animator: {fileID: 9551182}
+  CurrentState: 0
+  InputActivated: 0
+  InputEnabled: 0
+  OnActive:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  OnEnd:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  OnAdd:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  OnRemove:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  OnAvailable:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  OnUnavailable:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  ActiveTrigger: Insta-Shield
+  ActiveBool: 
+  AvailableBool: 
+  Used: 0
+  Health: {fileID: 11479486}
+  SizeChange: {x: .239999995, y: .239999995}
+  Target: {fileID: 6108368}
+  InvincibilityTime: .100000001
+  InvincibilityTimer: 0
+  HasShield: 0
 --- !u!114 &11461214
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1138,6 +1313,16 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: Hedgehog.Core.Moves.MoveEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
       PublicKeyToken=null
+  OnAdd:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Moves.MoveEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
+  OnRemove:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Moves.MoveEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
+      PublicKeyToken=null
 --- !u!114 &11461730
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1659,6 +1844,32 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingOrder: 10
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+--- !u!212 &21290172
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 169246}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_ReflectionProbeUsage: 0
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_ImportantGI: 0
+  m_AutoUVMaxDistance: .5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
   m_SortingOrder: 0
   m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

External/Sonic 16-bit/Characters/S3K Sonic/Animations/S3K Sonic.controller

@@ -146,12 +146,6 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
-  - m_Name: Test
-    m_Type: 1
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Move Sprites

External/Sonic 16-bit/Characters/S3K Sonic/Insta-Shield.meta

+fileFormatVersion: 2
+guid: 846a5759b1124d64cac51219cf9868dd
+folderAsset: yes
+timeCreated: 1449450275
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

External/Sonic 16-bit/Characters/S3K Sonic/Insta-Shield/Active.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Active
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - time: .0166666675
+      value: {fileID: 21300002, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - time: .0333333351
+      value: {fileID: 21300004, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - time: .0500000007
+      value: {fileID: 21300006, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - time: .0666666701
+      value: {fileID: 21300008, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - time: .0833333358
+      value: {fileID: 21300010, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    attribute: m_Sprite
+    path: Sprite
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - path: 850496168
+      attribute: 0
+      script: {fileID: 0}
+      classID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - {fileID: 21300002, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - {fileID: 21300004, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - {fileID: 21300006, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - {fileID: 21300008, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+    - {fileID: 21300010, guid: a12f63436e1beb74985ac40206be75b9, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_StartTime: 0
+    m_StopTime: .100000001
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

External/Sonic 16-bit/Characters/S3K Sonic/Insta-Shield/Active.anim.meta

+fileFormatVersion: 2
+guid: deba51f1287ed2149ab5dd62c49973f5
+timeCreated: 1449455443
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

External/Sonic 16-bit/Characters/S3K Sonic/Insta-Shield/Insta-Shield.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Insta-Shield
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Insta-Shield
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 110745752}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1101 &110173768
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Insta-Shield
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110206868}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: .899999976
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &110190142
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110263390}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &110206868
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Active
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 110190142}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: deba51f1287ed2149ab5dd62c49973f5, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1102 &110263390
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 110173768}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1107 &110745752
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 110263390}
+    m_Position: {x: 24, y: 120, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 110206868}
+    m_Position: {x: 24, y: 192, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 48, y: 48, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 110263390}

External/Sonic 16-bit/Characters/S3K Sonic/Insta-Shield/Insta-Shield.controller.meta

+fileFormatVersion: 2
+guid: 02ea6acc1f575c64e8afebbd691bcf26
+timeCreated: 1449455272
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

External/Sonic 16-bit/Characters/S3K Sonic/Insta-Shield/instashield.png.meta

+fileFormatVersion: 2
+guid: a12f63436e1beb74985ac40206be75b9
+timeCreated: 1449450440
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: instashield_01
+    21300002: instashield_02
+    21300004: instashield_03
+    21300006: instashield_04
+    21300008: instashield_05
+    21300010: instashield_06
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -2
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: 0
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites:
+    - name: instashield_01
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 92
+        width: 24
+        height: 36
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: instashield_02
+      rect:
+        serializedVersion: 2
+        x: 28
+        y: 100
+        width: 34
+        height: 28
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: instashield_03
+      rect:
+        serializedVersion: 2
+        x: 65
+        y: 80
+        width: 46
+        height: 46
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: instashield_04
+      rect:
+        serializedVersion: 2
+        x: 112
+        y: 60
+        width: 60
+        height: 68
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: instashield_05
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 33
+        width: 62
+        height: 46
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: instashield_06
+      rect:
+        serializedVersion: 2
+        x: 67
+        y: 13
+        width: 62
+        height: 46
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+  spritePackingTag: S3K Sonic
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

External/Sonic 16-bit/Particles/Bubbles/Drowning/S3K Drowning.controller

@@ -147,6 +147,30 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &110142308
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 4
+    m_ConditionEvent: Air
+    m_EventTreshold: .00999999978
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &110143826
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -414,6 +438,29 @@ AnimatorState:
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
+--- !u!1102 &110244872
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Dead
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
 --- !u!1102 &110253842
 AnimatorState:
   serializedVersion: 5
@@ -475,6 +522,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 110191176}
+  - {fileID: 110142308}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -535,6 +583,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 110201886}
     m_Position: {x: 24, y: 108, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 110244872}
+    m_Position: {x: 24, y: 252, z: 0}
   m_ChildStateMachines:
   - serializedVersion: 1
     m_StateMachine: {fileID: 110729096}
@@ -545,6 +596,7 @@ AnimatorStateMachine:
     data:
       first: {fileID: 110729096}
       second:
+      - {fileID: 110900924}
       - {fileID: 110906752}
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: 50, y: 20, z: 0}
@@ -552,6 +604,22 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 110201886}
+--- !u!1109 &110900924
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 4
+    m_ConditionEvent: Air
+    m_EventTreshold: .00999999978
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110244872}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!1109 &110906752
 AnimatorTransition:
   m_ObjectHideFlags: 1

Hedgehog/DEBUG.unity

@@ -19581,11 +19581,11 @@ Prefab:
     m_Modifications:
     - target: {fileID: 424606, guid: dbca39c759708bb4dbdc512f0b2a13b2, type: 2}
       propertyPath: m_LocalPosition.x
-      value: 63.8699989
+      value: 63.9700012
       objectReference: {fileID: 0}
     - target: {fileID: 424606, guid: dbca39c759708bb4dbdc512f0b2a13b2, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -1.03999996
+      value: -.889999986
       objectReference: {fileID: 0}
     - target: {fileID: 424606, guid: dbca39c759708bb4dbdc512f0b2a13b2, type: 2}
       propertyPath: m_LocalPosition.z
@@ -27180,6 +27180,140 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: f452eb7b0f89ab0438b651ef9ab3c280, type: 2}
   m_IsPrefabParent: 0
+--- !u!1 &1889864415 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 106706, guid: 5a08ec9bc89a15c46884752787693d86, type: 2}
+  m_PrefabInternal: {fileID: 754679811}
+--- !u!114 &1889864418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1889864415}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 83d39d78dab2827469a7c7c41069bec2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ObjectTrigger: {fileID: 1889864421}
+  Animator: {fileID: 0}
+  PlatformTrigger: {fileID: 0}
+  CollidingTrigger: 
+  CollidingBool: 
+  SurfaceTrigger: 
+  SurfaceBool: 
+  WhenColliding: 0
+  WhenOnSurface: 1
+  LimitAngle: 0
+  RelativeToRotation: 1
+  SurfaceAngleMin: -45
+  SurfaceAngleMax: 45
+--- !u!114 &1889864419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1889864415}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 90b4c07f75e2a40449585367aa1bb30c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TriggerFromChildren: 1
+  OnEnter:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnStay:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnExit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  AlwaysCollide: 0
+  OnSurfaceEnter:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.PlatformSurfaceEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnSurfaceStay:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.PlatformSurfaceEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnSurfaceExit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.PlatformSurfaceEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnPlatformEnter:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.PlatformCollisionEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnPlatformStay:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.PlatformCollisionEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnPlatformExit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.PlatformCollisionEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &1889864421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1889864415}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3049f730761aaaf4d962d6508f24b499, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TriggerFromChildren: 1
+  OnEnter:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnStay:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnExit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.TriggerEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  Collisions: []
+  AllowReactivation: 1
+  OnActivateEnter:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.ObjectEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnActivateStay:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.ObjectEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  OnActivateExit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: Hedgehog.Core.Triggers.ObjectEvent, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  Activated: 0
+  Animator: {fileID: 0}
+  ActivatedTrigger: 
+  ActivatedBool: 
 --- !u!4 &1891832776 stripped
 Transform:
   m_PrefabParentObject: {fileID: 439892, guid: 183440d2220653142b1ff5a236aeddcd, type: 2}

Hedgehog/Scripts/Core/Moves/BubbleSpecial.cs

@@ -63,13 +63,13 @@ public void OnCollide(TerrainCastHit hit)
             // Bounce only if it's the controller's bottom colliding with the floor
             if ((hit.Side & ControllerSide.Bottom) == 0) return;
-            Controller.RelativeVelocity = BounceVelocity;
-            Controller.OnCollide.RemoveListener(OnCollide);
-            End();
-
             // Normally we can't use a double jump again until we attach to the floor, so make
             // it available manually
             Used = false;
+
+            Controller.RelativeVelocity = BounceVelocity;
+            Controller.OnCollide.RemoveListener(OnCollide);
+            End();
         }
     }
 }

Hedgehog/Scripts/Core/Moves/Death.cs

@@ -45,11 +45,12 @@ public override void Awake()
         public override void OnActiveEnter(State previousState)
         {
+            // Bounce up and ignore collisions
+            Controller.Detach();
+
             // End all moves (except for this one)
             Manager.EndAll(move => move != this);
-            // Bounce up and ignore collisions
-            Controller.Detach();
             Controller.IgnoreCollision = true;
             Controller.RelativeVelocity = new Vector2(0.0f, Velocity);

Hedgehog/Scripts/Core/Moves/DoubleJump.cs

@@ -37,7 +37,7 @@ protected void OnRollEnd()
         public override bool Available()
         {
-            return !Controller.Grounded && Jump.Used && !Used;
+            return !Controller.Grounded && Jump.Used && !Used && Roll.Active;
         }
         public override bool InputActivate()

Hedgehog/Scripts/Core/Moves/InstaShield.cs

-namespace Hedgehog.Core.Moves
+using UnityEngine;
+using Hedgehog.Core.Actors;
+
+namespace Hedgehog.Core.Moves
 {
-    public class InstaShield
+    /// <summary>
+    /// The insta-shield move from Sonic 3 & Knuckles. Widens the player hitbox and gives
+    /// invincibility for a short time.
+    /// </summary>
+    public class InstaShield : DoubleJump
     {
+        /// <summary>
+        /// The controller's health system.
+        /// </summary>
+        [Tooltip("The controller's health system.")]
+        public HedgehogHealth Health;
+
+        /// <summary>
+        /// The amount by which the controller's hitbox changes, in units.
+        /// </summary>
+        [Tooltip("The amount by which the controller's hitbox changes, in units.")]
+        public Vector2 SizeChange;
+
+        /// <summary>
+        /// The collider whose size will be changed while the move is active.
+        /// </summary>
+        [Tooltip("The collider whose size will be changed while the move is active.")]
+        public BoxCollider2D Target;
+
+        /// <summary>
+        /// The time during which the controller is invincible, in seconds.
+        /// </summary>
+        [Tooltip("The time during which the controller is invincible, in seconds.")]
+        public float InvincibilityTime;
+
+        /// <summary>
+        /// Time left until the move's invincibility ends.
+        /// </summary>
+        [HideInInspector]
+        public float InvincibilityTimer;
+
+        /// <summary>
+        /// Whether the controller has a shield. The insta-shield is disabled while it does.
+        /// </summary>
+        [HideInInspector]
+        public bool HasShield;
+
+        public override void Reset()
+        {
+            base.Reset();
+            Health = GetComponentInParent<HedgehogController>()
+                ? GetComponentInParent<HedgehogController>().GetComponent<HedgehogHealth>()
+                : null;
+            SizeChange = new Vector2(0.24f, 0.24f);
+            Target = GetComponentInParent<HedgehogController>()
+                ? GetComponentInParent<HedgehogController>().GetComponentInChildren<BoxCollider2D>()
+                : null;
+            InvincibilityTime = 0.1f;
+        }
+
+        public override void Awake()
+        {
+            base.Awake();
+            InvincibilityTimer = 0.0f;
+            HasShield = false;
+        }
+
+        public override void Start()
+        {
+            base.Start();
+            Health = Health ? Health : Controller.GetComponent<HedgehogHealth>();
+        }
+
+        public override void OnManagerAdd()
+        {
+            base.OnManagerAdd();
+            
+            // Listening for when the controller gets a shield, so we can disable ourselves
+            Manager.OnAdd.AddListener(OnMoveList);
+            Manager.OnRemove.AddListener(OnMoveList);
+        }
+
+        public override void OnManagerRemove()
+        {
+            base.OnManagerRemove();
+            Manager.OnAdd.RemoveListener(OnMoveList);
+            Manager.OnRemove.RemoveListener(OnMoveList);
+        }
+
+        protected void OnMoveList(Move move)
+        {
+            HasShield = Manager.GetMove<Shield>();
+        }
+
+        public override bool Available()
+        {
+            return base.Available() && !HasShield;
+        }
+
+        public override void OnActiveEnter()
+        {
+            base.OnActiveEnter();
+            InvincibilityTimer = InvincibilityTime;
+            Target.size += SizeChange;
+            Health.Invincible = true;
+        }
+
+        public override void OnActiveUpdate()
+        {
+            base.OnActiveUpdate();
+            InvincibilityTimer -= Time.deltaTime;
+            if (InvincibilityTimer < 0.0f)
+            {
+                InvincibilityTimer = 0.0f;
+                End();
+            }
+        }
+        public override void OnActiveExit()
+        {
+            base.OnActiveExit();
+            InvincibilityTimer = 0.0f;
+            Target.size -= SizeChange;
+            Health.Invincible = false;
+        }
     }
 }

Hedgehog/Scripts/Core/Moves/MoveManager.cs

@@ -75,6 +75,16 @@ public class MoveManager : MonoBehaviour
         /// Invoked when a move becomes unavailable.
         /// </summary>
         public MoveEvent OnUnavailable;
+
+        /// <summary>
+        /// Invoked when a move is added to the list.
+        /// </summary>
+        public MoveEvent OnAdd;
+
+        /// <summary>
+        /// Invoked when a move is removed from the list.
+        /// </summary>
+        public MoveEvent OnRemove;
         #endregion
         public void Reset()
@@ -85,17 +95,27 @@ public void Reset()
         public void Awake()
         {
-            GetComponentsInChildren(Moves);
-
-            ActiveMoves = new List<Move>();
-            AvailableMoves = new List<Move>();
-            UnavailableMoves = new List<Move>(Moves);
-
             OnPerform = OnPerform ?? new MoveEvent();
             OnInterrupted = OnInterrupted ?? new MoveEvent();
             OnEnd = OnEnd ?? new MoveEvent();
             OnAvailable = OnAvailable ?? new MoveEvent();
             OnUnavailable = OnUnavailable ?? new MoveEvent();
+            OnAdd = OnAdd ?? new MoveEvent();
+            OnRemove = OnRemove ?? new MoveEvent();
+
+            ActiveMoves = new List<Move>();
+            AvailableMoves = new List<Move>();
+            UnavailableMoves = new List<Move>();
+        }
+
+        public void Start()
+        {
+            foreach (var move in Moves)
+            {
+                AddMove(move);
+            }
+
+            UpdateList();
         }
         public void Update()
@@ -227,6 +247,7 @@ public void UpdateList()
                 }
                 move.OnManagerRemove();
+                OnRemove.Invoke(move);
                 move.OnRemove.Invoke();
                 return true;
             });
@@ -238,15 +259,25 @@ public void UpdateList()
             // Compare the copied list with the new, add/notify the ones they don't have in common
             foreach (var move in Moves.Where(move => !moves.Contains(move)))
             {
-                move.Controller = Controller;
-                move.Manager = this;
-                move.ChangeState(Move.State.Unavailable);
-                UnavailableMoves.Add(move);
-                move.OnManagerAdd();
-                move.OnAdd.Invoke();
-            }
+                AddMove(move);
+            }
+        }
+        /// <summary>
+        /// Adds the specified move to the move list.
+        /// </summary>
+        /// <param name="move"></param>
+        protected void AddMove(Move move)
+        {
+            move.Controller = Controller;
+            move.Manager = this;
+            move.ChangeState(Move.State.Unavailable);
+            UnavailableMoves.Add(move);
+
+            move.OnManagerAdd();
+            OnAdd.Invoke(move);
+            move.OnAdd.Invoke();
         }
         /// <summary>

Hedgehog/Scripts/Level/Areas/Water.cs

@@ -71,21 +71,8 @@ public override bool IsSolid(TerrainCastHit hit)
         // Apply new physics values based on viscosity
         public override void OnAreaEnter(HedgehogController controller)
         {
-            controller.GroundControl.Acceleration /= Viscosity;
-            controller.GroundControl.Deceleration /= Viscosity;
-            controller.GroundControl.TopSpeed /= Viscosity;
-            controller.GroundFriction /= Viscosity;
-            controller.AirControl.Acceleration /= Viscosity;
-            controller.AirGravity /= Viscosity;
             controller.Vx /= Viscosity;
             controller.Vy /= Viscosity*2.0f;
-            controller.DetachSpeed /= Viscosity;
-
-            var jump = controller.MoveManager.GetMove<Jump>();
-            if (jump == null)
-                return;
-            jump.ActivateSpeed /= Viscosity;
-            jump.ReleaseSpeed /= Viscosity;
         }
         
         // Constantly apply buoyancy.
@@ -97,20 +84,7 @@ public override void OnAreaStay(HedgehogController controller)
         // Restore old physics values.
         public override void OnAreaExit(HedgehogController controller)
         {
-            controller.GroundControl.Acceleration *= Viscosity;
-            controller.GroundControl.Deceleration *= Viscosity;
-            controller.GroundControl.TopSpeed *= Viscosity;
-            controller.GroundFriction *= Viscosity;
-            controller.AirControl.Acceleration *= Viscosity;
-            controller.AirGravity *= Viscosity;
             controller.Vy *= Viscosity;
-            controller.DetachSpeed *= Viscosity;
-
-            var jump = controller.MoveManager.GetMove<Jump>();
-            if (jump == null)
-                return;
-            jump.ActivateSpeed *= Viscosity;
-            jump.ReleaseSpeed *= Viscosity;
         }
     }
 }