Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Emik03 committed May 28, 2021
1 parent 0e98bff commit 185ea27
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 4 deletions.
19 changes: 16 additions & 3 deletions KeepCoding.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Emik</Copyright>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<AssemblyVersion>3.1.0.0</AssemblyVersion>
<FileVersion>3.1.0.0</FileVersion>
<Version>3.1</Version>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
<FileVersion>3.2.0.0</FileVersion>
<Version>3.2</Version>
<PackageId>KeepCoding</PackageId>
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
Expand All @@ -39,6 +39,11 @@
</PropertyGroup>

<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>D:\Steam\steamapps\common\Keep Talking and Nobody Explodes\ktane_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>false</Private>
<Aliases></Aliases>
</Reference>
<Reference Include="KMFramework">
<HintPath>D:\ktanemodkit-master\Assets\Plugins\Managed\KMFramework.dll</HintPath>
<Private>false</Private>
Expand All @@ -52,6 +57,14 @@
<Reference Include="UnityEditor">
<HintPath>..\..\..\..\..\Program Files\Editor\Data\Managed\UnityEditor.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="TweaksAssembly">
<HintPath>D:\Steam\steamapps\workshop\content\341800\1366808675\TweaksAssembly.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="TwitchPlaysAssembly">
<HintPath>D:\Steam\steamapps\workshop\content\341800\1711408527\TwitchPlaysAssembly.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\Program Files\Editor\Data\Managed\UnityEngine.dll</HintPath>
Expand Down
12 changes: 12 additions & 0 deletions Source/MonoBehaviours/ModuleScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,11 @@ private void RemoveStrikeOnException(string condition, string stackTrace, LogTyp
{
if (type != LogType.Exception || !IsLogFromThis(stackTrace))
return;

var bomb = (Bomb)Bomb(gameObject);

bomb.NumStrikes--;
bomb.StrikeIndicator.StrikeCount = bomb.NumStrikes;
}

private void SolveOnException(string condition, string stackTrace, LogType type)
Expand All @@ -473,6 +478,13 @@ private void SolveOnException(string condition, string stackTrace, LogType type)

private void TimerTick()
{
var bomb = (Bomb)Bomb(gameObject);

bomb.GetTimer().TimerTick += (elapsed, remaining) =>
{
OnTimerTick();
TimeLeft = remaining;
};
}

private bool IsLogFromThis(string stackTrace) => stackTrace.Split('\n').Any(s => Regex.IsMatch(s, @$"^{GetType().Name}"));
Expand Down
2 changes: 1 addition & 1 deletion latest
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1
3.2

0 comments on commit 185ea27

Please sign in to comment.