mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
rare move tutor fix
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,10 @@
|
|||||||
def pbSpecialTutor(pokemon)
|
def pbSpecialTutor(pokemon,legendaries=false)
|
||||||
retval = true
|
retval = true
|
||||||
tutorUtil = FusionTutorService.new(pokemon)
|
tutorUtil = FusionTutorService.new(pokemon)
|
||||||
pbFadeOutIn {
|
pbFadeOutIn {
|
||||||
scene = MoveRelearner_Scene.new
|
scene = MoveRelearner_Scene.new
|
||||||
screen = MoveRelearnerScreen.new(scene)
|
screen = MoveRelearnerScreen.new(scene)
|
||||||
moves = tutorUtil.getCompatibleMoves
|
moves = tutorUtil.getCompatibleMoves(legendaries)
|
||||||
if !moves.empty?
|
if !moves.empty?
|
||||||
retval = screen.pbStartScreen(pokemon, moves)
|
retval = screen.pbStartScreen(pokemon, moves)
|
||||||
else
|
else
|
||||||
@@ -14,7 +14,6 @@ def pbSpecialTutor(pokemon)
|
|||||||
return retval
|
return retval
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def pbShowRareTutorFullList(includeLegendaries = false)
|
def pbShowRareTutorFullList(includeLegendaries = false)
|
||||||
tutorUtil = FusionTutorService.new(nil)
|
tutorUtil = FusionTutorService.new(nil)
|
||||||
tutorUtil.setShowList(true)
|
tutorUtil.setShowList(true)
|
||||||
@@ -32,7 +31,6 @@ def pbCheckRareTutorCompatibleMoves(pokemon,includeLeshgendaries)
|
|||||||
return tutorUtil.has_compatible_move(includeLeshgendaries)
|
return tutorUtil.has_compatible_move(includeLeshgendaries)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def showRandomRareMoveConditionExample(legendary = false)
|
def showRandomRareMoveConditionExample(legendary = false)
|
||||||
example = legendary ? getlegendaryConditionExample : getRegularConditionExample
|
example = legendary ? getlegendaryConditionExample : getRegularConditionExample
|
||||||
text = "For example, " + example
|
text = "For example, " + example
|
||||||
@@ -85,6 +83,7 @@ class FusionTutorService
|
|||||||
def getCompatibleMoves(includeLegendaries = false)
|
def getCompatibleMoves(includeLegendaries = false)
|
||||||
compatibleMoves = []
|
compatibleMoves = []
|
||||||
#normal moves
|
#normal moves
|
||||||
|
if !includeLegendaries
|
||||||
compatibleMoves << :ATTACKORDER if is_fusion_of([:BEEDRILL])
|
compatibleMoves << :ATTACKORDER if is_fusion_of([:BEEDRILL])
|
||||||
compatibleMoves << :FIRSTIMPRESSION if is_fusion_of([:SCYTHER, :SCIZOR, :PINSIR, :FARFETCHD, :TRAPINCH, :VIBRAVA, :FLYGON, :KABUTOPS, :ARMALDO])
|
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])
|
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 << :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 << :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)
|
compatibleMoves << :WATERSHURIKEN if is_fusion_of([:NINJASK, :LUCARIO, :ZOROARK, :BISHARP]) && hasType(:WATER)
|
||||||
|
end
|
||||||
if includeLegendaries
|
if includeLegendaries
|
||||||
#legendary moves (only available after a certain trigger, maybe a different npc)
|
#legendary moves (only available after a certain trigger, maybe a different npc)
|
||||||
compatibleMoves << :HYPERSPACEFURY if is_fusion_of([:GIRATINA, :PALKIA, :DIALGA, :ARCEUS])
|
compatibleMoves << :HYPERSPACEFURY if is_fusion_of([:GIRATINA, :PALKIA, :DIALGA, :ARCEUS])
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user