mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Fixed Cramorant not reverting form after coughing up a Gulp Missle, fixed crash when a phone contact calls when you're on a map with no metadata
This commit is contained in:
@@ -18,6 +18,7 @@ class Battle::Battler
|
|||||||
# target Cramorant attacking the user) and the ability splash
|
# target Cramorant attacking the user) and the ability splash
|
||||||
# shouldn't be shown.
|
# shouldn't be shown.
|
||||||
@battle.pbShowAbilitySplash(target)
|
@battle.pbShowAbilitySplash(target)
|
||||||
|
target.pbChangeForm(0, nil)
|
||||||
if user.takesIndirectDamage?(Battle::Scene::USE_ABILITY_SPLASH)
|
if user.takesIndirectDamage?(Battle::Scene::USE_ABILITY_SPLASH)
|
||||||
@battle.scene.pbDamageAnimation(user)
|
@battle.scene.pbDamageAnimation(user)
|
||||||
user.pbReduceHP(user.totalhp / 4, false)
|
user.pbReduceHP(user.totalhp / 4, false)
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ class Phone
|
|||||||
module_function
|
module_function
|
||||||
|
|
||||||
def can_make?
|
def can_make?
|
||||||
return false if $game_map.metadata.has_flag?("NoPhoneSignal")
|
return false if $game_map.metadata&.has_flag?("NoPhoneSignal")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user