Implemented Moves:

- Roar of Time
- Magnet Rise
- Trick Room
- Autotomize

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -451,6 +451,7 @@
     <Compile Include="Pokemon\Attacks\Dark\Taunt.vb" />
     <Compile Include="Pokemon\Attacks\Dark\Thief.vb" />
     <Compile Include="Pokemon\Attacks\Dark\Torment.vb" />
+    <Compile Include="Pokemon\Attacks\Dragon\RoarOfTime.vb" />
     <Compile Include="Pokemon\Attacks\Dragon\DracoMeteor.vb" />
     <Compile Include="Pokemon\Attacks\Dragon\DragonBreath.vb" />
     <Compile Include="Pokemon\Attacks\Dragon\DragonClaw.vb" />
@@ -471,6 +472,7 @@
     <Compile Include="Pokemon\Attacks\Electric\Electroweb.vb" />
     <Compile Include="Pokemon\Attacks\Electric\Flash.vb" />
     <Compile Include="Pokemon\Attacks\Electric\FusionBolt.vb" />
+    <Compile Include="Pokemon\Attacks\Electric\MagnetRise.vb" />
     <Compile Include="Pokemon\Attacks\Electric\Nuzzle.vb" />
     <Compile Include="Pokemon\Attacks\Electric\ParabolicCharge.vb" />
     <Compile Include="Pokemon\Attacks\Electric\ShockWave.vb" />
@@ -843,6 +845,7 @@
     <Compile Include="Pokemon\Attacks\Psychic\Amnesia.vb" />
     <Compile Include="Pokemon\Attacks\Psychic\Barrier.vb" />
     <Compile Include="Pokemon\Attacks\Psychic\CalmMind.vb" />
+    <Compile Include="Pokemon\Attacks\Psychic\TrickRoom.vb" />
     <Compile Include="Pokemon\Attacks\Psychic\Confusion.vb" />
     <Compile Include="Pokemon\Attacks\Psychic\CosmicPower.vb" />
     <Compile Include="Pokemon\Attacks\Psychic\DreamEater.vb" />
@@ -896,6 +899,7 @@
     <Compile Include="Pokemon\Attacks\Rock\StoneEdge.vb" />
     <Compile Include="Pokemon\Attacks\Special\ConfusionAttack.vb" />
     <Compile Include="Pokemon\Attacks\Steel\BulletPunch.vb" />
+    <Compile Include="Pokemon\Attacks\Steel\Autotomize.vb" />
     <Compile Include="Pokemon\Attacks\Steel\DoomDesire.vb" />
     <Compile Include="Pokemon\Attacks\Steel\FlashCannon.vb" />
     <Compile Include="Pokemon\Attacks\Steel\GearGrind.vb" />

2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb

@@ -3846,7 +3846,7 @@
                         If .FieldEffects.TrickRoom > 0 Then
                             .FieldEffects.TrickRoom -= 1
                             If .FieldEffects.TrickRoom = 0 Then
-                                .BattleQuery.Add(New TextQueryObject("Trickroom got reverted!"))
+                                .BattleQuery.Add(New TextQueryObject("The dimensions have returned to normal."))
                             End If
                         End If
                         If .FieldEffects.Gravity > 0 Then

2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb

@@ -150,21 +150,26 @@
                     Return True
                 End If
 
+                Dim _first As Boolean = False
                 'Determine strike first with speed:
                 Dim ownSpeed As Integer = DetermineBattleSpeed(True, BattleScreen)
                 Dim oppSpeed As Integer = DetermineBattleSpeed(False, BattleScreen)
 
                 If ownSpeed > oppSpeed Then 'Faster than opponent
-                    Return True
+                    _first = True
                 ElseIf ownSpeed < oppSpeed Then 'Slower than opponent
-                    Return False
+                    _first = False
                 Else 'Speed is equal, decide randomly
                     If Core.Random.Next(0, 2) = 0 Then
-                        Return True
+                        _first = True
                     Else
-                        Return False
+                        _first = False
                     End If
                 End If
+                If BattleScreen.FieldEffects.TrickRoom > 0 Then
+                    _first = Not _first
+                End If
+                Return _first
             End If
         End Function
 
@@ -621,31 +626,34 @@
                     effectiveness *= 4
                 End If
             End If
-            
-            Dim hasIronBall As Boolean = False
-            If Not p.Item Is Nothing Then
-                If p.Item.Name.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
-                    hasIronBall = True
+
+            Dim _targetHasIronBall As Boolean = False
+            If Not op.Item Is Nothing Then
+                If op.Item.Name.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
+                    _targetHasIronBall = True
                 End If
             End If
 
-            If op.Ability.Name.ToLower() = "levitate" And move.GetAttackType(own, BattleScreen).Type = Element.Types.Ground And BattleScreen.FieldEffects.Gravity = 0 And hasIronBall = False Then
+            If op.Ability.Name.ToLower() = "levitate" And move.GetAttackType(own, BattleScreen).Type = Element.Types.Ground And BattleScreen.FieldEffects.Gravity = 0 And _targetHasIronBall = False Then
                 If BattleScreen.FieldEffects.CanUseAbility(Not own, BattleScreen) = True Then
                     effectiveness = 0.0F
                 End If
             End If
 
-            Dim ingrain As Integer = BattleScreen.FieldEffects.OwnIngrain
+            Dim ingrain As Integer = BattleScreen.FieldEffects.OppIngrain
             If own = False Then
-                ingrain = BattleScreen.FieldEffects.OppIngrain
+                ingrain = BattleScreen.FieldEffects.OwnIngrain
             End If
-            If BattleScreen.FieldEffects.Gravity = 0 And ingrain = 0 And hasIronBall = False Then
-                Dim magnetRise As Integer = BattleScreen.FieldEffects.OppMagnetRise
-                If own = False Then
-                    magnetRise = BattleScreen.FieldEffects.OwnMagnetRise
-                End If
-                If magnetRise > 0 Then
-                    effectiveness = 0.0F
+
+            If move.GetAttackType(own, BattleScreen).Type = Element.Types.Ground Then
+                If BattleScreen.FieldEffects.Gravity = 0 And ingrain = 0 And _targetHasIronBall = False Then
+                    Dim magnetRise As Integer = BattleScreen.FieldEffects.OppMagnetRise
+                    If own = False Then
+                        magnetRise = BattleScreen.FieldEffects.OwnMagnetRise
+                    End If
+                    If magnetRise > 0 Then
+                        effectiveness = 0.0F
+                    End If
                 End If
             End If
 

2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb

@@ -1026,8 +1026,8 @@
                     returnMove = New Moves.Psychic.HeartSwap()
                 Case 392
                     returnMove = New Moves.Water.AquaRing()
-                    'Case 393
-                    'Magnet Rise
+                Case 393
+                    returnMove = New Moves.Electric.MagnetRise()
                 Case 394
                     returnMove = New Moves.Fire.FlareBlitz()
                 Case 395
@@ -1106,8 +1106,8 @@
                     returnMove = New Moves.Normal.RockClimb()
                 Case 432
                     returnMove = New Moves.Flying.Defog()
-                    'Case 433
-                    'Trick Room
+                Case 433
+                    returnMove = New Moves.Psychic.TrickRoom()
                 Case 434
                     returnMove = New Moves.Dragon.DracoMeteor()
                 Case 435
@@ -1158,8 +1158,8 @@
                     returnMove = New Moves.Rock.HeadSmash()
                 Case 458
                     returnMove = New Moves.Normal.DoubleHit()
-                    'Case 459
-                    'Roar of Time
+                Case 459
+                    returnMove = New Moves.Dragon.RoarOfTime()
                     'Case 460
                     'Spacial Rend
                     'Case 461
@@ -1190,8 +1190,8 @@
                     returnMove = New Moves.Psychic.Psyshock()
                 Case 474
                     returnMove = New Moves.Poison.Venoshock()
-                    'Case 475
-                    'Automatize
+                Case 475
+                    returnMove = New Moves.Steel.Autotomize()
                     'Case 476
                     'Rage Powder
                     'Case 477

2.5DHero/2.5DHero/Pokemon/Attacks/Dragon/RoarOfTime.vb

@@ -0,0 +1,68 @@
+Namespace BattleSystem.Moves.Dragon
+
+    Public Class RoarOfTime
+
+        Inherits Attack
+
+        Public Sub New()
+            '#Definitions
+            Me.Type = New Element(Element.Types.Dragon)
+            Me.ID = 459
+            Me.OriginalPP = 5
+            Me.CurrentPP = 5
+            Me.MaxPP = 5
+            Me.Power = 150
+            Me.Accuracy = 90
+            Me.Category = Categories.Special
+            Me.ContestCategory = ContestCategories.Cool
+            Me.Name = "Roar of Time"
+            Me.Description = "The user blasts the target with power that distorts even time. The user can't move on the next turn."
+            Me.CriticalChance = 1
+            Me.IsHMMove = False
+            Me.Target = Targets.OneAdjacentTarget
+            Me.Priority = 0
+            Me.TimesToAttack = 1
+            '#End
+
+            '#SpecialDefinitions
+            Me.MakesContact = False
+            Me.ProtectAffected = True
+            Me.MagicCoatAffected = False
+            Me.SnatchAffected = False
+            Me.MirrorMoveAffected = True
+            Me.KingsrockAffected = True
+            Me.CounterAffected = False
+
+            Me.DisabledWhileGravity = False
+            Me.UseEffectiveness = True
+            Me.ImmunityAffected = True
+            Me.HasSecondaryEffect = False
+            Me.RemovesFrozen = False
+
+            Me.IsHealingMove = False
+            Me.IsRecoilMove = False
+            Me.IsPunchingMove = False
+            Me.IsDamagingMove = True
+            Me.IsProtectMove = False
+            Me.IsSoundMove = False
+
+            Me.IsAffectedBySubstitute = True
+            Me.IsOneHitKOMove = False
+            Me.IsWonderGuardAffected = True
+            '#End
+
+            Me.AIField1 = AIField.Damage
+            Me.AIField2 = AIField.Recharge
+        End Sub
+
+        Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
+            If Own = True Then
+                BattleScreen.FieldEffects.OwnRecharge += 1
+            Else
+                BattleScreen.FieldEffects.OppRecharge += 1
+            End If
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Electric/MagnetRise.vb

@@ -0,0 +1,82 @@
+Namespace BattleSystem.Moves.Electric
+
+    Public Class MagnetRise
+
+        Inherits Attack
+
+        Public Sub New()
+            '#Definitions
+            Me.Type = New Element(Element.Types.Electric)
+            Me.ID = 393
+            Me.OriginalPP = 10
+            Me.CurrentPP = 10
+            Me.MaxPP = 10
+            Me.Power = 0
+            Me.Accuracy = 0
+            Me.Category = Categories.Status
+            Me.ContestCategory = ContestCategories.Cute
+            Me.Name = "Magnet Rise"
+            Me.Description = "The user levitates using electrically generated magnetism for five turns."
+            Me.CriticalChance = 1
+            Me.IsHMMove = False
+            Me.Target = Targets.Self
+            Me.Priority = 0
+            Me.TimesToAttack = 1
+            '#End
+
+            '#SpecialDefinitions
+            Me.MakesContact = False
+            Me.ProtectAffected = False
+            Me.MagicCoatAffected = False
+            Me.SnatchAffected = True
+            Me.MirrorMoveAffected = False
+            Me.KingsrockAffected = False
+            Me.CounterAffected = False
+
+            Me.DisabledWhileGravity = False
+            Me.UseEffectiveness = False
+            Me.ImmunityAffected = False
+            Me.RemovesFrozen = False
+            Me.HasSecondaryEffect = False
+
+            Me.IsHealingMove = False
+            Me.IsRecoilMove = False
+            Me.IsPunchingMove = False
+            Me.IsDamagingMove = False
+            Me.IsProtectMove = False
+            Me.IsSoundMove = False
+
+            Me.IsAffectedBySubstitute = False
+            Me.IsOneHitKOMove = False
+            Me.IsWonderGuardAffected = False
+            '#End
+
+            Me.AIField1 = AIField.Support
+            Me.AIField2 = AIField.Nothing
+        End Sub
+
+        Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
+            Dim p As Pokemon = BattleScreen.OwnPokemon
+            If own = False Then
+                p = BattleScreen.OppPokemon
+            End If
+            If own = True Then
+                If BattleScreen.FieldEffects.OwnMagnetRise = 0 Then
+                    BattleScreen.FieldEffects.OwnMagnetRise = 5
+                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " levitated on electromagnetism!"))
+                Else
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("but it failed!"))
+                End If
+            Else
+                If BattleScreen.FieldEffects.OppMagnetRise = 0 Then
+                    BattleScreen.FieldEffects.OppMagnetRise = 5
+                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " levitated on electromagnetism!"))
+                Else
+                    BattleScreen.BattleQuery.Add(New TextQueryObject("but it failed!"))
+                End If
+            End If
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Psychic/TrickRoom.vb

@@ -0,0 +1,69 @@
+Namespace BattleSystem.Moves.Psychic
+
+    Public Class TrickRoom
+
+        Inherits Attack
+
+        Public Sub New()
+            '#Definitions
+            Me.Type = New Element(Element.Types.Psychic)
+            Me.ID = 433
+            Me.OriginalPP = 5
+            Me.CurrentPP = 5
+            Me.MaxPP = 5
+            Me.Power = 0
+            Me.Accuracy = 0
+            Me.Category = Categories.Status
+            Me.ContestCategory = ContestCategories.Cute
+            Me.Name = "Trick Room"
+            Me.Description = "The user creates a bizarre area in which slower Pokémon get to move first for five turns."
+            Me.CriticalChance = 0
+            Me.IsHMMove = False
+            Me.Target = Targets.All
+            Me.Priority = -7
+            Me.TimesToAttack = 1
+            '#End
+
+            '#SpecialDefinitions
+            Me.MakesContact = False
+            Me.ProtectAffected = False
+            Me.MagicCoatAffected = False
+            Me.SnatchAffected = False
+            Me.MirrorMoveAffected = True
+            Me.KingsrockAffected = False
+            Me.CounterAffected = False
+
+            Me.DisabledWhileGravity = False
+            Me.UseEffectiveness = False
+            Me.ImmunityAffected = False
+            Me.RemovesFrozen = False
+            Me.HasSecondaryEffect = False
+
+            Me.IsHealingMove = False
+            Me.IsRecoilMove = False
+            Me.IsPunchingMove = False
+            Me.IsDamagingMove = False
+            Me.IsProtectMove = False
+            Me.IsSoundMove = False
+
+            Me.IsAffectedBySubstitute = False
+            Me.IsOneHitKOMove = False
+            Me.IsWonderGuardAffected = False
+            '#End
+
+            Me.AIField1 = AIField.Support
+            Me.AIField2 = AIField.Nothing
+        End Sub
+
+        Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
+            If BattleScreen.FieldEffects.TrickRoom <= 0 Then
+                BattleScreen.FieldEffects.TrickRoom = 5
+                BattleScreen.BattleQuery.Add(New TextQueryObject("The dimensions have been twisted!"))
+            Else
+                BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!"))
+            End If
+        End Sub
+
+    End Class
+
+End Namespace

2.5DHero/2.5DHero/Pokemon/Attacks/Steel/Autotomize.vb

@@ -0,0 +1,66 @@
+Namespace BattleSystem.Moves.Steel
+
+    Public Class Autotomize
+
+        Inherits Attack
+
+        Public Sub New()
+            '#Definitions
+            Me.Type = New Element(Element.Types.Steel)
+            Me.ID = 475
+            Me.OriginalPP = 15
+            Me.CurrentPP = 15
+            Me.MaxPP = 15
+            Me.Power = 0
+            Me.Accuracy = 0
+            Me.Category = Categories.Status
+            Me.ContestCategory = ContestCategories.Beauty
+            Me.Name = "Agility"
+            Me.Description = "The user sheds part of its body to make itself lighter and sharply raise its Speed stat. "
+            Me.CriticalChance = 0
+            Me.IsHMMove = False
+            Me.Target = Targets.Self
+            Me.Priority = 0
+            Me.TimesToAttack = 1
+            '#End
+
+            '#SpecialDefinitions
+            Me.MakesContact = False
+            Me.ProtectAffected = False
+            Me.MagicCoatAffected = False
+            Me.SnatchAffected = True
+            Me.MirrorMoveAffected = True
+            Me.KingsrockAffected = False
+            Me.CounterAffected = False
+
+            Me.DisabledWhileGravity = False
+            Me.UseEffectiveness = False
+            Me.ImmunityAffected = False
+            Me.RemovesFrozen = False
+            Me.HasSecondaryEffect = False
+
+            Me.IsHealingMove = False
+            Me.IsRecoilMove = False
+            Me.IsPunchingMove = False
+            Me.IsDamagingMove = False
+            Me.IsProtectMove = False
+            Me.IsSoundMove = False
+
+            Me.IsAffectedBySubstitute = False
+            Me.IsOneHitKOMove = False
+            Me.IsWonderGuardAffected = False
+            '#End
+
+            Me.AIField1 = AIField.RaiseSpeed
+            Me.AIField2 = AIField.Nothing
+        End Sub
+
+        Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)
+            If BattleScreen.Battle.RaiseStat(own, own, BattleScreen, "Speed", 2, "", "move:autotomize") = False Then
+                BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!"))
+            End If
+        End Sub
+
+    End Class
+
+End Namespace