fully functional combo, several object types

Assets/Resources/Games/karateManNew.prefab

@@ -223,7 +223,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 676219503303960657}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.9, y: -1.485, z: 0}
+  m_LocalPosition: {x: 1.8, y: -1.485, z: 0}
   m_LocalScale: {x: 0.64, y: 0.64, z: 1}
   m_Children: []
   m_Father: {fileID: 5764267227668832721}
@@ -613,7 +613,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1361561967555302870}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.869, y: -2.05, z: 0}
+  m_LocalPosition: {x: 0.769, y: -2.05, z: 0}
   m_LocalScale: {x: 0.64, y: 0.64, z: 1}
   m_Children: []
   m_Father: {fileID: 5764267227668832721}
@@ -1646,7 +1646,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -5000
-  m_Sprite: {fileID: 21300000, guid: 28e26f10ed5280947ab4a982344f2a12, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c64c7787d5638454d94c6d1fc5bb46e8, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0.6117647}
   m_FlipX: 0
   m_FlipY: 0
@@ -1737,7 +1737,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5764267227668832721
 Transform:
   m_ObjectHideFlags: 0
@@ -2725,14 +2725,14 @@ MonoBehaviour:
   - 0
   - 0.65
   - 0.825
-  - 0.9875
+  - 0.999
   - 0.8
   - 0.625
   StartPositionOffset:
   - {x: 1.5, y: 0, z: -9}
   - {x: 1.5, y: 0, z: -8}
   - {x: 1, y: 0, z: -8.75}
-  - {x: -2.25, y: 0, z: -10}
+  - {x: -2.25, y: 0, z: -9.5}
   - {x: 0.25, y: 0, z: -8.5}
   - {x: 2.25, y: 0, z: -9.5}
   ItemSlipRt:
@@ -2742,6 +2742,7 @@ MonoBehaviour:
   - 0.35
   - 0.3
   - 0.1
+  BulbLight: {fileID: 6100859660585592015}
 --- !u!1 &4199646893499933531
 GameObject:
   m_ObjectHideFlags: 0
@@ -2934,7 +2935,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4756044026693426509}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.594, y: -3.739, z: 0}
+  m_LocalPosition: {x: 3.494, y: -3.739, z: 0}
   m_LocalScale: {x: 0.64, y: 0.64, z: 1}
   m_Children: []
   m_Father: {fileID: 5764267227668832721}
@@ -3597,7 +3598,7 @@ SpriteRenderer:
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 3.8888888, y: 6.5555553}
+  m_Size: {x: 10.25, y: 1.9722222}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
@@ -3628,7 +3629,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7395954162971010416}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.784, y: 1.612, z: 0}
+  m_LocalPosition: {x: 0.584, y: 1.612, z: 0}
   m_LocalScale: {x: 0.64, y: 0.64, z: 1}
   m_Children: []
   m_Father: {fileID: 5764267227668832721}
@@ -3710,7 +3711,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7505887227269335280}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.92, y: -3.9, z: 0}
+  m_LocalPosition: {x: 0.92, y: -3.75, z: 0}
   m_LocalScale: {x: 0.64, y: 0.64, z: 1}
   m_Children: []
   m_Father: {fileID: 5764267227668832721}

Assets/Resources/Sfx/games/karateman/offbeatLightbulbOut.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bb6291d2cefe00640bdf0e221cf377b8
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/karateman/one.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3cbbeff0175204742b32bc20a3d047ba
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/anime/karateman/KarateMan.controller

@@ -26,6 +26,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-9171775684717427265
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ToReady
+  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_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 22af2ac82c369e34ab1c376e2503b98a, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-7840309356215755865
 AnimatorState:
   serializedVersion: 6
@@ -243,6 +269,12 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 5344696757423606487}
     m_Position: {x: 515, y: 585, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4946513776586294822}
+    m_Position: {x: 550, y: 650, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -9171775684717427265}
+    m_Position: {x: 585, y: 715, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -253,6 +285,32 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -842243592876171120}
+--- !u!1102 &4946513776586294822
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UpperCut
+  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_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: f54cfb35db53daa488c288d868486c05, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &5344696757423606487
 AnimatorState:
   serializedVersion: 6

Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Straight.anim

@@ -8245,7 +8245,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: ManShadowM
+    path: ManShadowL
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8255,7 +8255,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: ManShadowM
+    path: ManShadowL
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8265,7 +8265,37 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: ManShadowM
+    path: ManShadowL
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: ManShadowR
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: ManShadowR
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: ManShadowR
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8335,7 +8365,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: RightLeg
+    path: ManShadowM
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8345,7 +8375,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: RightLeg
+    path: ManShadowM
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8355,7 +8385,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: RightLeg
+    path: ManShadowM
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -8508,6 +8538,36 @@ AnimationClip:
     path: LeftLeg
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: RightLeg
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: RightLeg
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: RightLeg
+    classID: 4
+    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve: []
@@ -8544,7 +8604,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
+    attribute: m_LocalEulerAngles.x
     path: RightLeg/LeftLegAttatch
     classID: 4
     script: {fileID: 0}
@@ -8564,70 +8624,10 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
+    attribute: m_LocalEulerAngles.z
     path: RightLeg/LeftLegAttatch
     classID: 4
     script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: ManShadowL
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: ManShadowL
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: ManShadowL
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: ManShadowR
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: ManShadowR
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: ManShadowR
-    classID: 4
-    script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Resources/Sprites/Games/KarateMan/anime/karateman/ToReady.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22af2ac82c369e34ab1c376e2503b98a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/anime/karateman/UpperCut.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f54cfb35db53daa488c288d868486c05
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/reference/BackHand.000.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 0a57ef5652bf9ca4d98c7b111d45f33d
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/reference/BackHand.001.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: b73947e19f5468f428c7b363cdbae6db
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/reference/BackHand.002.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: d6ca0bee8ed4b68479b6a8278821cb37
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/reference/BackHand.003.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 89c82dbfa2fecc44b81b72add70d6ad1
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/reference/BackHand.004.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 28e26f10ed5280947ab4a982344f2a12
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Games/KarateMan/reference/Beat.002.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 25c403b9649727b40b27570c680ff612
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Games/KarateMan/KarateManJoeNew.cs

@@ -15,6 +15,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
         float lastPunchTime = Single.MinValue;
         float lastComboMissTime = Single.MinValue;
+        float lastUpperCutTime = Single.MinValue;
         public bool inCombo = false;
         int inComboId = -1;
         int shouldComboId = -1;
@@ -38,20 +39,19 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
             if (inCombo && shouldComboId == -2)
             {
-                float missProg = cond.GetPositionFromBeat(lastComboMissTime, 3.25f);
+                float missProg = cond.GetPositionFromBeat(lastComboMissTime, 3f);
                 if (missProg >= 0f && missProg < 1f)
                 {
-                    anim.DoScaledAnimation("LowKickMiss", lastComboMissTime, 3.25f);
+                    anim.DoScaledAnimation("LowKickMiss", lastComboMissTime, 3f);
                 }
                 else if (missProg >= 1f)
                 {
                     anim.speed = 1f;
-                    bop.startBeat = lastComboMissTime + 3.25f;
+                    bop.startBeat = lastComboMissTime + 3f;
                     lastComboMissTime = Single.MinValue;
                     inCombo = false;
                     inComboId = -1;
                     shouldComboId = -1;
-                    Debug.Log("Getup");
                 }
             }
 
@@ -68,22 +68,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                 if (!KarateManNew.instance.IsExpectingInputNow())
                 {
                     //start a forced-fail combo sequence
-                    float beat = cond.songPositionInBeats;
+                    ForceFailCombo(cond.songPositionInBeats);
-                    BeatAction.New(gameObject, new List<BeatAction.Action>()
-                    {
-                        new BeatAction.Action(beat, delegate { Punch(1); inCombo = true; inComboId = -1; shouldComboId = -1;}),
-                        new BeatAction.Action(beat + 0.25f, delegate { Punch(2); }),
-                        new BeatAction.Action(beat + 0.5f, delegate { ComboSequence(0); }),
-                        new BeatAction.Action(beat + 0.75f, delegate { shouldComboId = -2; ComboMiss(beat + 0.75f); }),
-                    });
-
-                    MultiSound.Play(new MultiSound.Sound[] 
-                    {
-                        new MultiSound.Sound("karateman/swingNoHit", beat), 
-                        new MultiSound.Sound("karateman/swingNoHit_Alt", beat + 0.25f), 
-                        new MultiSound.Sound("karateman/swingNoHit_Alt", beat + 0.5f), 
-                        new MultiSound.Sound("karateman/comboMiss", beat + 0.75f),  
-                    }, forcePlay: true);
                 }
             }
             else if (PlayerInput.AltPressedUp())
@@ -132,6 +117,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
         public void ComboSequence(int seq)
         {
             var cond = Conductor.instance;
+            bop.startBeat = cond.songPositionInBeats + 1f;
             switch (seq)
             {
                 case 0:
@@ -141,19 +127,51 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                     anim.Play("LowKick", -1, 0);
                     break;
                 case 2:
-                    anim.Play("BackHand", -1, 0);
+                    anim.DoScaledAnimationAsync("BackHand", 0.5f);
+                    break;
+                case 3:
+                    anim.DoScaledAnimationAsync("UpperCut", 0.5f);
+                    break;
+                case 4:
+                    anim.Play("ToReady", -1, 0);
+                    bop.startBeat = cond.songPositionInBeats + 0.5f;
                     break;
                 default:
                     break;
             }
-            bop.startBeat = cond.songPositionInBeats + 1f;
         }
 
         public void ComboMiss(float beat)
         {
             var cond = Conductor.instance;
             lastComboMissTime = beat;
-            bop.startBeat = beat + 3.25f;
+            bop.startBeat = beat + 3f;
+        }
+
+        public void ComboEnd(float beat, bool miss = false)
+        {
+            var cond = Conductor.instance;
+            bop.startBeat = cond.songPositionInBeats + 1f;
+        }
+
+        public void ForceFailCombo(float beat)
+        {
+            if (inCombo) return;
+            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate { Punch(1); inCombo = true; inComboId = -1; shouldComboId = -1;}),
+                new BeatAction.Action(beat + 0.25f, delegate { Punch(2); }),
+                new BeatAction.Action(beat + 0.5f, delegate { ComboSequence(0); }),
+                new BeatAction.Action(beat + 0.75f, delegate { shouldComboId = -2; ComboMiss(beat + 0.75f); }),
+            });
+
+            MultiSound.Play(new MultiSound.Sound[] 
+            {
+                new MultiSound.Sound("karateman/swingNoHit", beat), 
+                new MultiSound.Sound("karateman/swingNoHit_Alt", beat + 0.25f), 
+                new MultiSound.Sound("karateman/swingNoHit_Alt", beat + 0.5f), 
+                new MultiSound.Sound("karateman/comboMiss", beat + 0.75f),  
+            }, forcePlay: true);
         }
     }
 }

Assets/Scripts/Games/KarateMan/KarateManNew.cs

@@ -20,7 +20,7 @@ namespace HeavenStudio.Games.Loaders
                     {
                         new Param("type", KarateManNew.HitType.Pot, "Object", "The object to fire")
                     }),
-                new GameAction("bulb",                  delegate {}, 2, false, 
+                new GameAction("bulb",                  delegate { var e = eventCaller.currentEntity; KarateManNew.instance.CreateBulbSpecial(e.beat, e.type, e.colorA); }, 2, false, 
                     new List<Param>()
                     {
                         new Param("type", KarateManNew.LightBulbType.Normal, "Type", "The preset bulb type. Yellow is used for kicks while Blue is used for combos"),
@@ -28,12 +28,37 @@ namespace HeavenStudio.Games.Loaders
                     }),
                 new GameAction("kick",                  delegate { }, 4.5f),
                 new GameAction("combo",                 delegate { var e = eventCaller.currentEntity; KarateManNew.instance.Combo(e.beat); }, 4f),
-                new GameAction("hit3",                  delegate { }, 1f, false, 
+                new GameAction("hitX",                  delegate { }, 1f, false, 
                     new List<Param>()
                     {
                         new Param("type", KarateManNew.HitThree.HitThree, "Type", "What should be called out")
                     }),
                 new GameAction("prepare",               delegate { }, 1f, true),
+                new GameAction("set background effects",  delegate {
+                }, 0.5f, false, new List<Param>()
+                {
+                    new Param("type", KarateMan.BackgroundType.Yellow, "Background Type", "The preset background type"),
+                    new Param("type2", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom"),
+                    new Param("colorA", new Color(), "Custom Background Color", "The background color to use when background type is set to Custom"),
+                    new Param("colorB", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom"),
+                    new Param("type3", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed")
+
+                }),
+
+                // These are still here for backwards-compatibility but are hidden in the editor
+                new GameAction("pot",                   delegate { }, 2, hidden: true),
+                new GameAction("rock",                  delegate { }, 2, hidden: true),
+                new GameAction("ball",                  delegate { }, 2, hidden: true),
+                new GameAction("tacobell",              delegate { }, 2, hidden: true),
+                new GameAction("hit4",                  delegate { }, hidden: true),
+                new GameAction("bgfxon",                delegate { }, hidden: true),
+                new GameAction("bgfxoff",               delegate { }, hidden: true),
+                new GameAction("hit3",                  delegate { }, 1f, false, 
+                    new List<Param>()
+                    {
+                        new Param("type", KarateManNew.HitThree.HitThree, "Type", "What should be called out")
+                    }, 
+                hidden: true),
                 new GameAction("set background color",  delegate { }, 0.5f, false, 
                     new List<Param>()
                     {
@@ -43,20 +68,12 @@ namespace HeavenStudio.Games.Loaders
                         new Param("colorB", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom"),
 
                     }),
-                new GameAction("set background fx",  delegate { }, 0.5f, false, 
+                new GameAction("set background fx",  delegate {
-                    new List<Param>()
+                }, 0.5f, false, new List<Param>()
-                    {
+                {
-                        new Param("type", KarateManNew.BackgroundFXType.None, "FX Type", "The background effect to be displayed")
+                    new Param("type", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed")
-
+                },
-                    }),
+                hidden: true)
-                // These are still here for backwards-compatibility but are hidden in the editor
-                new GameAction("pot",                   delegate { }, 2, hidden: true),
-                new GameAction("rock",                  delegate { }, 2, hidden: true),
-                new GameAction("ball",                  delegate { }, 2, hidden: true),
-                new GameAction("tacobell",              delegate { }, 2, hidden: true),
-                new GameAction("hit4",                  delegate { }, hidden: true),
-                new GameAction("bgfxon",                delegate { }, hidden: true),
-                new GameAction("bgfxoff",               delegate { }, hidden: true),
 
             });
         }
@@ -78,7 +95,6 @@ namespace HeavenStudio.Games
             Ball = 3,
             CookingPot = 6,
             Alien = 7,
-
             TacoBell = 999
         }
 
@@ -87,7 +103,10 @@ namespace HeavenStudio.Games
             HitTwo,
             HitThree,
             HitThreeAlt,
-            HitFour
+            HitFour,
+            Grr,
+            Warning,
+            HitOne,
         }
 
         public enum LightBulbType
@@ -158,27 +177,60 @@ namespace HeavenStudio.Games
         {
 
             string outSound;
+            if (Starpelly.Mathp.GetDecimalFromFloat(beat) == 0f)
+                outSound = "karateman/objectOut";
+            else
+                outSound = "karateman/offbeatObjectOut";
 
             switch (type)
             {
                 case (int) HitType.Pot:
-                    if (Starpelly.Mathp.GetDecimalFromFloat(beat) == 0f)
-                        outSound = "karateman/objectOut";
-                    else
-                        outSound = "karateman/offbeatObjectOut";
                     CreateItemInstance(beat, "Item00");
                     break;
-                default:
+                case (int) HitType.Lightbulb:
                     if (Starpelly.Mathp.GetDecimalFromFloat(beat) == 0f)
-                        outSound = "karateman/objectOut";
+                        outSound = "karateman/lightbulbOut";
                     else
-                        outSound = "karateman/offbeatObjectOut";
+                        outSound = "karateman/offbeatLightbulbOut";
+                    CreateItemInstance(beat, "Item01", KarateManPotNew.ItemType.Bulb);
+                    break;
+                case (int) HitType.Rock:
+                    CreateItemInstance(beat, "Item02", KarateManPotNew.ItemType.Rock);
+                    break;
+                case (int) HitType.Ball:
+                    CreateItemInstance(beat, "Item03", KarateManPotNew.ItemType.Ball);
+                    break;
+                case (int) HitType.CookingPot:
+                    CreateItemInstance(beat, "Item06", KarateManPotNew.ItemType.Cooking);
+                    break;
+                case (int) HitType.Alien:
+                    CreateItemInstance(beat, "Item07", KarateManPotNew.ItemType.Alien);
+                    break;
+                case (int) HitType.TacoBell:
+                    CreateItemInstance(beat, "Item99", KarateManPotNew.ItemType.TacoBell);
+                    break;
+                default:
                     CreateItemInstance(beat, "Item00");
                     break;
             }
             Jukebox.PlayOneShotGame(outSound, forcePlay: true);
         }
 
+        public void CreateBulbSpecial(float beat, int type, Color c)
+        {
+            string outSound;
+            if (Starpelly.Mathp.GetDecimalFromFloat(beat) == 0f)
+                outSound = "karateman/lightbulbOut";
+            else
+                outSound = "karateman/offbeatLightbulbOut";
+            var mobj = CreateItemInstance(beat, "Item01", KarateManPotNew.ItemType.Bulb);
+            if (type == (int) LightBulbType.Custom)
+                mobj.GetComponent<KarateManPotNew>().SetBulbColor(c);
+            else
+                mobj.GetComponent<KarateManPotNew>().SetBulbColor(LightBulbColors[type]);
+            Jukebox.PlayOneShotGame(outSound, forcePlay: true);
+        }
+
         public void Combo(float beat)
         {
             Jukebox.PlayOneShotGame("karateman/barrelOutCombos", forcePlay: true);

Assets/Scripts/Games/KarateMan/KarateManPotNew.cs

@@ -17,6 +17,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
         public string awakeAnim;
         FlyStatus status = FlyStatus.Fly;
+        Color effectTint = Color.white;
 
         public int comboId = -1;
         static int _lastCombo = -1;
@@ -57,6 +58,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan
         public Vector3[] StartPositionOffset;
         public float[] ItemSlipRt;
 
+        public SpriteRenderer BulbLight;
+
+        public void SetBulbColor(Color c) { 
+            effectTint = c; 
+            BulbLight.color = c;
+        }
+
         float ProgressToHitPosition(float progress) {
             return progress + (HitPositionOffset[path] - 0.5f);
         }
@@ -94,6 +102,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
             {
                 case ItemType.ComboPot1:
                     KarateManNew.instance.ScheduleInput(startBeat, 1f, InputType.STANDARD_ALT_DOWN, ComboStartJustOrNg, ComboStartThrough, ComboStartOut);
+                    KarateManNew.instance.ScheduleUserInput(startBeat, 1f, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, ComboStartWrongAction, ComboStartOut, ComboStartOut);
                     path = 1;
                     break;
                 case ItemType.ComboPot2:
@@ -114,12 +123,16 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                     BeatAction.New(gameObject, new List<BeatAction.Action>() { new BeatAction.Action(startBeat + 1f, delegate { JoeComboSequence(); }) });
                     break;
                 case ItemType.ComboBarrel:
-                    KarateManNew.instance.ScheduleInput(startBeat, 1f, InputType.STANDARD_ALT_UP, ComboEndJustOrNg, ComboEndThrough, ComboEndOut);
-                    path = 5;
                     //check for button release
+                    KarateManNew.instance.ScheduleInput(startBeat, 1f, InputType.STANDARD_ALT_UP, ComboEndJustOrNg, ComboEndThrough, ComboEndOut);
+                    //button presses
+                    KarateManNew.instance.ScheduleUserInput(startBeat, 1f, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, ComboEndWrongAction, ItemOut, ItemOut);
+                    KarateManNew.instance.ScheduleUserInput(startBeat, 1f, InputType.STANDARD_ALT_DOWN, ComboEndWrongActionAlt, ItemOut, ItemOut);
+                    path = 5;
                     break;
                 default:
                     KarateManNew.instance.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, ItemJustOrNg, ItemThrough, ItemOut);
+                    KarateManNew.instance.ScheduleUserInput(startBeat, 1f, InputType.STANDARD_ALT_DOWN, ItemWrongAction, ItemOut, ItemOut);
                     path = 1;
                     comboId = -1;
                     break;
@@ -171,6 +184,75 @@ namespace HeavenStudio.Games.Scripts_KarateMan
             }
         }
 
+        //handles hitsound and particles
+        void ItemHitEffect()
+        {
+            switch (type)
+            {
+                case ItemType.Bulb:
+                    Jukebox.PlayOneShotGame("karateman/lightbulbHit", forcePlay: true);
+                    break;
+                case ItemType.Rock:
+                    Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true);
+                    break;
+                case ItemType.Ball:
+                    Jukebox.PlayOneShotGame("karateman/soccerHit", forcePlay: true);
+                    break;
+                case ItemType.Cooking:
+                    Jukebox.PlayOneShotGame("karateman/cookingPot", forcePlay: true);
+                    break;
+                case ItemType.Alien:
+                    Jukebox.PlayOneShotGame("karateman/alienHit", forcePlay: true);
+                    break;
+                case ItemType.TacoBell:
+                    Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true);
+                    Jukebox.PlayOneShotGame("karateman/tacobell", forcePlay: true);
+                    break;
+                case ItemType.ComboPot1:
+                    Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true);
+                    break;
+                case ItemType.ComboPot2:
+                    Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true);
+                    break;
+                case ItemType.ComboPot3:
+                    Jukebox.PlayOneShotGame("karateman/comboHit2", forcePlay: true);
+                    break;
+                case ItemType.ComboPot4:
+                    Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true);
+                    break;
+                case ItemType.ComboPot5:
+                    Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true);
+                    break;
+                case ItemType.ComboBarrel:
+                    Jukebox.PlayOneShotGame("karateman/comboHit4", forcePlay: true);
+                    break;
+                default:
+                    Jukebox.PlayOneShotGame("karateman/potHit", forcePlay: true);
+                    break;
+            }
+
+            status = FlyStatus.Hit;
+        }
+
+        int ItemPunchHand()
+        {
+            switch (type)
+            {
+                case ItemType.Rock:
+                    return 2;
+                case ItemType.Ball:
+                    return 2;
+                case ItemType.Cooking:
+                    return 2;
+                case ItemType.Alien:
+                    return 2;
+                case ItemType.TacoBell:
+                    return 2;
+                default:
+                    return 0;
+            }
+        }
+
         void JoeComboSequence()
         {
             var joe = KarateManNew.instance.Joe;
@@ -183,8 +265,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                         Jukebox.PlayOneShotGame("karateman/swingNoHit_Alt", forcePlay: true);
                     else
                     {
-                        Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true);
+                        ItemHitEffect();
-                        status = FlyStatus.Hit;
                     }
                     break;
                 case ItemType.ComboPot3:
@@ -192,8 +273,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                     if (joe.GetComboId() != comboId) {}
                     else
                     {
-                        Jukebox.PlayOneShotGame("karateman/comboHit2", forcePlay: true);
+                        ItemHitEffect();
-                        status = FlyStatus.Hit;
                     }
                     break;
                 case ItemType.ComboPot4:
@@ -206,8 +286,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                     else
                     {
                         joe.ComboSequence(1);
-                        Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true);
+                        ItemHitEffect();
-                        status = FlyStatus.Hit;
                     }
                     break;
                 case ItemType.ComboPot5:
@@ -215,8 +294,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                     if (joe.GetComboId() != comboId) {}
                     else
                     {
-                        Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true);
+                        ItemHitEffect();
-                        status = FlyStatus.Hit;
                     }
                     break;
                 default:
@@ -226,14 +304,15 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
         public void ItemJustOrNg(PlayerActionEvent caller, float state)
         {
-            if (status == FlyStatus.Fly) {
+            var joe = KarateManNew.instance.Joe;
-                KarateManNew.instance.Joe.Punch();
+            if (status == FlyStatus.Fly && !joe.inCombo) {
+                joe.Punch(ItemPunchHand());
                 if (state <= -1f || state >= 1f) {
                     Jukebox.PlayOneShot("miss");
                     status = FlyStatus.NG;
                 }
                 else {
-                    Jukebox.PlayOneShotGame("karateman/potHit", forcePlay: true);
+                    ItemHitEffect();
                     status = FlyStatus.Hit;
                 }
             }
@@ -242,12 +321,25 @@ namespace HeavenStudio.Games.Scripts_KarateMan
         public void ItemWrongAction(PlayerActionEvent caller, float state)
         { 
             //hitting a normal object with the alt input
+            //WHEN SCORING THIS IS A MISS
+            var joe = KarateManNew.instance.Joe;
+            if (status == FlyStatus.Fly && !joe.inCombo) {
+                joe.ForceFailCombo(Conductor.instance.songPositionInBeats);
+                if (state <= -1f || state >= 1f) {
+                    Jukebox.PlayOneShot("miss");
+                    status = FlyStatus.NG;
+                }
+                else {
+                    ItemHitEffect();
+                }
+            }
         }
 
         public void ItemOut(PlayerActionEvent caller) {}
 
         public void ItemThrough(PlayerActionEvent caller)
         {
+            if (status != FlyStatus.Fly || gameObject == null) return;
             BeatAction.New(gameObject, new List<BeatAction.Action>()
             {
                 new BeatAction.Action(startBeat + 2f, delegate { 
@@ -270,18 +362,32 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                     status = FlyStatus.NG;
                 }
                 else {
-                    Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true);
+                    ItemHitEffect();
-                    status = FlyStatus.Hit;
                 }
             }
         }
 
         public void ComboStartOut(PlayerActionEvent caller) {}
-        public void ComboStartThrough(PlayerActionEvent caller) {}
+        public void ComboStartThrough(PlayerActionEvent caller) 
+        {
+            if (status != FlyStatus.Fly || gameObject == null) return;
+        }
 
         public void ComboStartWrongAction(PlayerActionEvent caller, float state)
         { 
-            //hitting a combo start object with the normal input
+            //hitting a combo start with the normal input
+            //WHEN SCORING THIS IS A MISS
+            var joe = KarateManNew.instance.Joe;
+            if (status == FlyStatus.Fly && !joe.inCombo) {
+                joe.Punch(ItemPunchHand());
+                if (state <= -1f || state >= 1f) {
+                    Jukebox.PlayOneShot("miss");
+                    status = FlyStatus.NG;
+                }
+                else {
+                    ItemHitEffect();
+                }
+            }
         }
 
         public void ComboEndJustOrNg(PlayerActionEvent caller, float state)
@@ -291,19 +397,42 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                 joe.inCombo = false;
                 joe.SetComboId(-1);
                 joe.SetShouldComboId(-1);
-                //UpperCut
+                joe.ComboSequence(3);
                 if (state <= -1f || state >= 1f) {
                     Jukebox.PlayOneShot("miss");
                     status = FlyStatus.NG;
                 }
                 else {
-                    Jukebox.PlayOneShotGame("karateman/comboHit4", forcePlay: true);
+                    ItemHitEffect();
-                    status = FlyStatus.Hit;
                 }
             }
         }
 
         public void ComboEndOut(PlayerActionEvent caller) {}
-        public void ComboEndThrough(PlayerActionEvent caller) {}
+        public void ComboEndThrough(PlayerActionEvent caller) 
+        {
+            if (status != FlyStatus.Fly || gameObject == null) return;
+            var joe = KarateManNew.instance.Joe;
+            if (joe.GetComboId() != comboId || !joe.inCombo) return;
+            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(startBeat + 1.5f, delegate { 
+                    joe.inCombo = false;
+                    joe.SetComboId(-1);
+                    joe.SetShouldComboId(-1);
+                    joe.ComboSequence(4);
+                })
+            });
+        }
+
+        public void ComboEndWrongAction(PlayerActionEvent caller, float state)
+        {
+            KarateManNew.instance.Joe.Punch(1);
+        }
+
+        public void ComboEndWrongActionAlt(PlayerActionEvent caller, float state)
+        {
+            KarateManNew.instance.Joe.ForceFailCombo(Conductor.instance.songPositionInBeats);
+        }
     }
 }