Merge remote-tracking branch 'origin/main'

Assets/Animations/UpgradeMenu/IdleAnimation.anim

@@ -112,11 +112,7 @@ AnimationClip:
   - serializedVersion: 2
     curve:
     - time: 0
-      value: {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3}
-    - time: 0.16666667
-      value: {fileID: 21300000, guid: d0b5a636d892c76dd8e8234608e1c80e, type: 3}
-    - time: 0.33333334
-      value: {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3}
+      value: {fileID: 21300000, guid: 670f29475a3b18ea9aea72417564111c, type: 3}
     attribute: m_Sprite
     path: Upgrade8
     classID: 114
@@ -223,9 +219,7 @@ AnimationClip:
     - {fileID: 21300000, guid: ffbe7bd179e5b5f6cb29ba280e429e3f, type: 3}
     - {fileID: 21300000, guid: 171c3a1543289b4eda2d95a32ef3d208, type: 3}
     - {fileID: 21300000, guid: ffbe7bd179e5b5f6cb29ba280e429e3f, type: 3}
-    - {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3}
-    - {fileID: 21300000, guid: d0b5a636d892c76dd8e8234608e1c80e, type: 3}
-    - {fileID: 21300000, guid: fdecacfc03d5a47ee8134731daecf4af, type: 3}
+    - {fileID: 21300000, guid: 670f29475a3b18ea9aea72417564111c, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}

Assets/Scenes/GameScene.unity

@@ -644,6 +644,140 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &730370594
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 730370595}
+  - component: {fileID: 730370597}
+  - component: {fileID: 730370596}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &730370595
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 730370594}
+  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: 1375820097}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -210, y: -10}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &730370596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 730370594}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 1x
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 3849a5afa3e47364e935260b9e40a7af, type: 2}
+  m_sharedMaterial: {fileID: -9074696149777367781, guid: 3849a5afa3e47364e935260b9e40a7af, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4286500607
+  m_fontColor: {r: 1, g: 0.8092908, b: 0.495283, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 4
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &730370597
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 730370594}
+  m_CullTransparentMesh: 1
 --- !u!1001 &869964773
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1790,6 +1924,82 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &1375820096
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1375820097}
+  - component: {fileID: 1375820099}
+  - component: {fileID: 1375820098}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1375820097
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375820096}
+  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:
+  - {fileID: 730370595}
+  m_Father: {fileID: 4158834148864819268}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -75, y: 75}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1375820098
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375820096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 670f29475a3b18ea9aea72417564111c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1375820099
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375820096}
+  m_CullTransparentMesh: 1
 --- !u!1001 &1452965467
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8579,6 +8789,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1230350818}
+    - targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1375820097}
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
       insertIndex: -1

Assets/Scripts/BloodComputeShader.cs

@@ -169,7 +169,7 @@ public class BloodComputeShader : MonoBehaviour
                 // float mappedRumble = Convert.ToSingle(bufferData[0]).Remap(0, RumbleAmount, 0, 0.1f);
                 //RumbleManager.StartRumble(-1, 0, mappedRumble, 0.1f);
 
-                squeakVolume += 0.1f;
+                squeakVolume += 0.3f;
 
                 mop1Clean += (int)bufferData[0];
                 mop2Clean += (int)bufferData[1];
@@ -184,7 +184,7 @@ public class BloodComputeShader : MonoBehaviour
             // Blood hitting the floor
             if (bufferData[1] > 0)
             {
-                splatterVolume += bufferData[1] / 25.0f;
+                splatterVolume += bufferData[1] / 10.0f;
 
                 // Debug.Log("splat x" + bufferData[1]);
 

Assets/Scripts/Managers/GameManager.cs

@@ -72,6 +72,10 @@ public class GameManager : MonoBehaviour
         }
     }
 
+    public void AddRevive() {
+        Revives++;
+    }
+
     public void setTime(string t)
     {
         penisSuriveTime = t;

Assets/Scripts/Misc/IngameMusic.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class IngameMusic : MonoBehaviour
 {
-    float volume = 0.4f;
+    float volume = 0.1f;
 
     void Start()
     {
@@ -15,6 +15,6 @@ public class IngameMusic : MonoBehaviour
 
     void PlayMusic()
     {
-        AudioManager.PlaySound("Ingame_Theme", new Vector3(0f, 0f, 0f), false, false, true, true).volume = volume;
+        AudioManager.PlaySound("Ingame_Theme", new Vector3(0f, 0f, 0f), false, false, true, false).volume = volume;
     }
 }

Assets/Scripts/Upgrader.cs

@@ -23,6 +23,7 @@ public class Upgrades
     public Upgrade damageUpgrade = new Upgrade("More rope damage");
     public Upgrade bloodUpgrade = new Upgrade("MORE BLOOD!");
     public Upgrade reelUpgrade = new Upgrade("Faster rope reel speed");
+    public Upgrade reviveUpgrade = new Upgrade("Adds an extra revive");
 }
 
 public class Upgrader : MonoBehaviour
@@ -158,6 +159,7 @@ public class Upgrader : MonoBehaviour
                             ReelUpgrade();
                             break;
                         case 7:
+                            ReviveUpgrade();
                             break;
                     }
 
@@ -175,6 +177,34 @@ public class Upgrader : MonoBehaviour
                         i.gameObject.transform.localScale = Vector3.one;
                     }
 
+                    switch (p1a)
+                    {
+                        case 0:
+                            description.text = upgrades.mopUpgrade.name;
+                            break;
+                        case 1:
+                            description.text = upgrades.speedUpgrade.name;
+                            break;
+                        case 2:
+                            description.text = upgrades.ropeUpgrade.name;
+                            break;
+                        case 3:
+                            description.text = upgrades.healthUpgrade.name;
+                            break;
+                        case 4:
+                            description.text = upgrades.damageUpgrade.name;
+                            break;
+                        case 5:
+                            description.text = upgrades.bloodUpgrade.name;
+                            break;
+                        case 6:
+                            description.text = upgrades.reelUpgrade.name;
+                            break;
+                        case 7:
+                            description.text = upgrades.reviveUpgrade.name;
+                            break;
+                    }
+
                     upgradeImages[p1a].fillAmount = acceptTime / 2f;
                     upgradeImages[p1a].transform.localScale = Vector3.one * 2f;
                 }
@@ -198,7 +228,7 @@ public class Upgrader : MonoBehaviour
         }
         else if (prevCouldUpgrade)
         {
-            // TODO: PLAY SOUND HERE!!
+            AudioManager.PlaySound("Blood_Splatter_Large_SFX", Vector3.zero, false, false);
 
             description.text = "";
             background.color = Color.gray;
@@ -278,6 +308,12 @@ public class Upgrader : MonoBehaviour
         upgrades.reelUpgrade.amount++;
     }
 
+    public void ReviveUpgrade()
+    {
+        description.text = upgrades.reviveUpgrade.name;
+        GameManager.Instance.AddRevive();
+    }
+
     IEnumerator updateBloodMeter()
     {
         while (true)

Assets/UI/UpgradeButton8.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 670f29475a3b18ea9aea72417564111c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: