rare move tutor fix

Data/Scripts/050_AddOns/FusionMoveTutor.rb

@@ -1,10 +1,10 @@
-def pbSpecialTutor(pokemon)
+def pbSpecialTutor(pokemon,legendaries=false)
   retval = true
   tutorUtil = FusionTutorService.new(pokemon)
   pbFadeOutIn {
     scene = MoveRelearner_Scene.new
     screen = MoveRelearnerScreen.new(scene)
-    moves = tutorUtil.getCompatibleMoves
+    moves = tutorUtil.getCompatibleMoves(legendaries)
     if !moves.empty?
       retval = screen.pbStartScreen(pokemon, moves)
     else
@@ -14,8 +14,7 @@ def pbSpecialTutor(pokemon)
   return retval
 end
 
-
-def pbShowRareTutorFullList(includeLegendaries=false)
+def pbShowRareTutorFullList(includeLegendaries = false)
   tutorUtil = FusionTutorService.new(nil)
   tutorUtil.setShowList(true)
   pbFadeOutIn {
@@ -27,13 +26,12 @@ def pbShowRareTutorFullList(includeLegendaries=false)
   return false
 end
 
-def pbCheckRareTutorCompatibleMoves(pokemon,includeLeshgendaries)
+def pbCheckRareTutorCompatibleMoves(pokemon, includeLeshgendaries)
   tutorUtil = FusionTutorService.new(pokemon)
   return tutorUtil.has_compatible_move(includeLeshgendaries)
 end
 
-
-def showRandomRareMoveConditionExample(legendary=false)
+def showRandomRareMoveConditionExample(legendary = false)
   example = legendary ? getlegendaryConditionExample : getRegularConditionExample
   text = "For example, " + example
   pbMessage(text)
@@ -69,13 +67,13 @@ end
 
 class FusionTutorService
 
-  def has_compatible_move(include_legendaries=false)
+  def has_compatible_move(include_legendaries = false)
     return !getCompatibleMoves(include_legendaries).empty?
   end
 
   def initialize(pokemon)
     @pokemon = pokemon
-    @show_full_list=false
+    @show_full_list = false
   end
 
   def setShowList(value)
@@ -85,6 +83,7 @@ class FusionTutorService
   def getCompatibleMoves(includeLegendaries = false)
     compatibleMoves = []
     #normal moves
+    if !includeLegendaries
       compatibleMoves << :ATTACKORDER if is_fusion_of([:BEEDRILL])
       compatibleMoves << :FIRSTIMPRESSION if is_fusion_of([:SCYTHER, :SCIZOR, :PINSIR, :FARFETCHD, :TRAPINCH, :VIBRAVA, :FLYGON, :KABUTOPS, :ARMALDO])
       compatibleMoves << :POLLENPUFF if is_fusion_of([:BUTTERFREE, :CELEBI, :VILEPLUME, :PARASECT, :BRELOOM])
@@ -133,7 +132,7 @@ class FusionTutorService
       compatibleMoves << :ANCHORSHOT if (is_fusion_of([:EMPOLEON, :STEELIX, :BELDUM, :METANG, :METAGROSS, :KLINK, :KLINKLANG, :KLANG, :ARON, :LAIRON, :AGGRON]) && hasType(:WATER)) || (is_fusion_of([:LAPRAS, :WAILORD, :KYOGRE]) && hasType(:STEEL))
       compatibleMoves << :SPARKLINGARIA if (is_fusion_of([:JYNX, :JIGGLYPUFF, :WIGGLYTUFF]) && hasType(:WATER)) || is_fusion_of([:LAPRAS])
       compatibleMoves << :WATERSHURIKEN if is_fusion_of([:NINJASK, :LUCARIO, :ZOROARK, :BISHARP]) && hasType(:WATER)
-
+    end
     if includeLegendaries
       #legendary moves (only available after a certain trigger, maybe a different npc)
       compatibleMoves << :HYPERSPACEFURY if is_fusion_of([:GIRATINA, :PALKIA, :DIALGA, :ARCEUS])