diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index abda72495..f4f9ae3a7 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -1144,12 +1144,12 @@ End If End If - 'Turn count - If own Then - BattleScreen.FieldEffects.OwnTurnCounts += 1 - Else - BattleScreen.FieldEffects.OppTurnCounts += 1 - End If + ''Turn count + 'If own Then + ' BattleScreen.FieldEffects.OwnTurnCounts += 1 + 'Else + ' BattleScreen.FieldEffects.OppTurnCounts += 1 + 'End If 'Reset Destiny Bond: If moveUsed.ID <> 194 Then @@ -4652,7 +4652,11 @@ Private Sub EndTurnOwn(ByVal BattleScreen As BattleScreen) With BattleScreen - 'Turn count (currently used for Fake Out only) + + 'Turn count since battle started + .FieldEffects.OwnTurnCounts += 1 + + 'Turn count since pokemon switched in(currently used for Fake Out only) .FieldEffects.OwnPokemonTurns += 1 If HasSwitchedInOwn Then .FieldEffects.OwnPokemonTurns = 0 @@ -5391,6 +5395,10 @@ Private Sub EndTurnOpp(ByVal BattleScreen As BattleScreen) With BattleScreen + + 'Turn count since battle started + .FieldEffects.OppTurnCounts += 1 + 'Turn count (Currently used for Fake Out only) .FieldEffects.OppPokemonTurns += 1 If HasSwitchedInOpp Then diff --git a/P3D/Content/Data/maps/knot/kindle.dat b/P3D/Content/Data/maps/knot/kindle.dat index 62d199102..99cf00032 100644 Binary files a/P3D/Content/Data/maps/knot/kindle.dat and b/P3D/Content/Data/maps/knot/kindle.dat differ diff --git a/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb b/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb index 1e1275ee7..0384fe079 100644 --- a/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb +++ b/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb @@ -16,7 +16,7 @@ Me.Category = Categories.Physical Me.ContestCategory = ContestCategories.Tough Me.Name = "Hyperspace Fury" - Me.Description = "Using its many arms, the user unleashes a barrage of attacks that ignore the effects of moves like Protect and Detect. But the user’s Defense stat falls." + Me.Description = "Using its many arms, the user unleashes a barrage of attacks that ignore the effects of moves like Protect and Detect. But the user's Defense stat falls." Me.CriticalChance = 1 Me.IsHMMove = False Me.Target = Targets.OneAdjacentTarget diff --git a/P3D/Pokemon/Attacks/Dark/NastyPlot.vb b/P3D/Pokemon/Attacks/Dark/NastyPlot.vb index ba17b16df..60b649488 100644 --- a/P3D/Pokemon/Attacks/Dark/NastyPlot.vb +++ b/P3D/Pokemon/Attacks/Dark/NastyPlot.vb @@ -16,7 +16,7 @@ Me.Category = Categories.Status Me.ContestCategory = ContestCategories.Cute Me.Name = "Nasty Plot" - Me.Description = "The user stimulates its brain by thinking bad thoughts. It sharply raises the user’s Sp. Atk." + Me.Description = "The user stimulates its brain by thinking bad thoughts. It sharply raises the user's Sp. Atk." Me.CriticalChance = 0 Me.IsHMMove = False Me.Target = Targets.Self diff --git a/P3D/World/ActionScript/ActionScript.vb b/P3D/World/ActionScript/ActionScript.vb index e1b3f3779..fefd18ba8 100644 --- a/P3D/World/ActionScript/ActionScript.vb +++ b/P3D/World/ActionScript/ActionScript.vb @@ -1,3 +1,4 @@ +Imports System.Globalization Public Class ActionScript Public Scripts As New List(Of Script) @@ -443,7 +444,8 @@ nextScript: End Function Public Shared Function TimeToUnix(ByVal dteDate As Date) As String - Return (dteDate.ToUniversalTime() - New Date(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds.ToString() + Dim invC = CultureInfo.InvariantCulture + Return (dteDate.ToUniversalTime() - New Date(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds.ToString(invC) End Function Public Shared Sub RegisterID(ByVal i As String) diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe index 85542428b..0c440e716 100644 Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ