mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Merge branch 'develop' of https://github.com/infinitefusion/infinitefusion-e18 into develop
This commit is contained in:
@@ -30,7 +30,7 @@ class PokeBattle_Battler
|
||||
end
|
||||
|
||||
def pbRecoverHPFromDrain(amt,target,msg=nil)
|
||||
if target.hasActiveAbility?(:LIQUIDOOZE)
|
||||
if target.hasActiveAbility?(:LIQUIDOOZE, true)
|
||||
@battle.pbShowAbilitySplash(target)
|
||||
pbReduceHP(amt)
|
||||
@battle.pbDisplay(_INTL("{1} sucked up the liquid ooze!",pbThis))
|
||||
|
||||
@@ -396,12 +396,10 @@ class PokeBattle_Move_019 < PokeBattle_Move
|
||||
failed = false
|
||||
break
|
||||
end
|
||||
if !failed
|
||||
@battle.pbParty(user.index).each do |pkmn|
|
||||
next if !pkmn || !pkmn.able? || pkmn.status == :NONE
|
||||
failed = false
|
||||
break
|
||||
end
|
||||
@battle.pbParty(user.index).each do |pkmn|
|
||||
next if !pkmn || !pkmn.able? || pkmn.status == :NONE
|
||||
failed = false
|
||||
break
|
||||
end
|
||||
if failed
|
||||
@battle.pbDisplay(_INTL("But it failed!"))
|
||||
|
||||
@@ -2376,8 +2376,8 @@ class PokemonStorageScreen
|
||||
end
|
||||
if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name))
|
||||
reverseFusion(pokemon)
|
||||
$PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
|
||||
end
|
||||
$PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
|
||||
end
|
||||
|
||||
def pbUnfuseFromPC(selected)
|
||||
|
||||
@@ -387,7 +387,7 @@ module GameData
|
||||
["Ray", "quaza"],
|
||||
["Ji", "rachi"],
|
||||
["Deo", "xys"],
|
||||
["Tur", "wig"],
|
||||
["Tur", "twig"],
|
||||
["Gro", "tle"],
|
||||
["Tor", "terra"],
|
||||
["Chim", "char"],
|
||||
|
||||
Reference in New Issue
Block a user