Merge branch 'ai' into dev

Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/005_Challenge_BattleRules.rb

@@ -1,3 +1,9 @@
+# NOTE: The following clauses have battle code implementing them, but no class
+#       below to apply them:
+#         "drawclause"
+#         "modifiedselfdestructclause"
+#         "suddendeath"
+
 #===============================================================================
 #
 #===============================================================================
@@ -58,7 +64,7 @@ end
 #
 #===============================================================================
 class PerishSongClause < BattleRule
-  def setRule(battle); battle.rules["perishsong"] = true; end
+  def setRule(battle); battle.rules["perishsongclause"] = true; end
 end
 
 #===============================================================================

Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/002_ChallengeGenerator_Pokemon.rb

@@ -42,7 +42,7 @@ def pbRandomMove
   loop do
     move_id = keys.sample
     move = GameData::Move.get(move_id)
-    next if move.id == :SKETCH || move.id == :STRUGGLE
+    next if ["Struggle", "ReplaceMoveWithTargetLastMoveUsed"].include?(move.function_code)
     return move.id
   end
 end

Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/004_ChallengeGenerator_BattleSim.rb

@@ -401,7 +401,7 @@ def pbRuledBattle(team1, team2, rule)
       items2[i] = p.item_id
       trainer2.party.push(p)
     end
-    scene = Battle::DebugSceneNoLogging.new
+    scene = Battle::DebugSceneNoVisuals.new
     battle = rule.createBattle(scene, trainer1, trainer2)
     battle.debug = true
     battle.controlPlayer = true