mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Makes it impossible to fuse eggs
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.
@@ -2252,7 +2252,11 @@ class PokemonStorageScreen
|
|||||||
|
|
||||||
|
|
||||||
selectedHead =selectFusion(pokemon, heldpoke, isSuperSplicer)
|
selectedHead =selectFusion(pokemon, heldpoke, isSuperSplicer)
|
||||||
if selectedHead == -1
|
if selectedHead == nil
|
||||||
|
pbDisplay(_INTL("It won't have any effect."))
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
if selectedHead == -1 #cancelled out
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1312,7 +1312,11 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
|
|||||||
end
|
end
|
||||||
|
|
||||||
selectedHead =selectFusion(pokemon, poke2, supersplicers)
|
selectedHead =selectFusion(pokemon, poke2, supersplicers)
|
||||||
if selectedHead == -1
|
if selectedHead == -1 #cancelled
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
if selectedHead == nil #can't fuse (egg, etc.)
|
||||||
|
scene.pbDisplay(_INTL("It won't have any effect."))
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
selectedBase = selectedHead == pokemon ? poke2 : pokemon
|
selectedBase = selectedHead == pokemon ? poke2 : pokemon
|
||||||
@@ -1353,6 +1357,9 @@ end
|
|||||||
|
|
||||||
|
|
||||||
def selectFusion(pokemon, poke2, supersplicers = false)
|
def selectFusion(pokemon, poke2, supersplicers = false)
|
||||||
|
return nil if !pokemon.is_a?(Pokemon) || !poke2.is_a?(Pokemon)
|
||||||
|
return nil if pokemon.egg? || poke2.egg?
|
||||||
|
|
||||||
selectorWindow = FusionPreviewScreen.new(poke2, pokemon, supersplicers)#PictureWindow.new(picturePath)
|
selectorWindow = FusionPreviewScreen.new(poke2, pokemon, supersplicers)#PictureWindow.new(picturePath)
|
||||||
selectedHead = selectorWindow.getSelection
|
selectedHead = selectorWindow.getSelection
|
||||||
selectorWindow.dispose
|
selectorWindow.dispose
|
||||||
|
|||||||
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