DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/infinitefusion/infinitefusion-e18 into develop

Browse Source
This commit is contained in:
chardub
2025-02-24 11:52:54 -05:00
parent c38d513a67 1dba2e41ae
commit 553d862168
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb
View File

@@ -30,7 +30,7 @@ class PokeBattle_Battler
end end
def pbRecoverHPFromDrain(amt,target,msg=nil) def pbRecoverHPFromDrain(amt,target,msg=nil)
if target.hasActiveAbility?(:LIQUIDOOZE) if target.hasActiveAbility?(:LIQUIDOOZE, true)
@battle.pbShowAbilitySplash(target) @battle.pbShowAbilitySplash(target)
pbReduceHP(amt) pbReduceHP(amt)
@battle.pbDisplay(_INTL("{1} sucked up the liquid ooze!",pbThis)) @battle.pbDisplay(_INTL("{1} sucked up the liquid ooze!",pbThis))

10
Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -396,12 +396,10 @@ class PokeBattle_Move_019 < PokeBattle_Move
failed = false failed = false
break break
end end
if !failed @battle.pbParty(user.index).each do |pkmn|
@battle.pbParty(user.index).each do |pkmn| next if !pkmn || !pkmn.able? || pkmn.status == :NONE
next if !pkmn || !pkmn.able? || pkmn.status == :NONE failed = false
failed = false break
break
end
end end
if failed if failed
@battle.pbDisplay(_INTL("But it failed!")) @battle.pbDisplay(_INTL("But it failed!"))

2
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -2376,8 +2376,8 @@ class PokemonStorageScreen
end end
if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name)) if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name))
reverseFusion(pokemon) reverseFusion(pokemon)
$PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
end end
$PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
end end
def pbUnfuseFromPC(selected) def pbUnfuseFromPC(selected)

2
Data/Scripts/048_Fusion/SplitNames.rb
View File

@@ -387,7 +387,7 @@ module GameData
["Ray", "quaza"], ["Ray", "quaza"],
["Ji", "rachi"], ["Ji", "rachi"],
["Deo", "xys"], ["Deo", "xys"],
["Tur", "wig"], ["Tur", "twig"],
["Gro", "tle"], ["Gro", "tle"],
["Tor", "terra"], ["Tor", "terra"],
["Chim", "char"], ["Chim", "char"],