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

Consolidated code for the player interacting in the overworld, fixed bad splash screen animations, added ShowQuantity property to items.txt, fixed Quick Draw and Aroma Veil, fixed text alignment in long list of regional Dexes in Pokédex, added better error message in load screen if player's charset is missing

Browse Source
This commit is contained in:
Maruno17
2023-06-12 22:32:41 +01:00
parent 20affb4345
commit 9c2a9130a5
20 changed files with 106 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/011_Battle/003_Move/002_Move_Usage.rb
View File

@@ -143,14 +143,14 @@ class Battle::Move
target.allAllies.each do |b|
next if !b.hasActiveAbility?(:AROMAVEIL)
if showMessage
@battle.pbShowAbilitySplash(target)
@battle.pbShowAbilitySplash(b)
if Battle::Scene::USE_ABILITY_SPLASH
@battle.pbDisplay(_INTL("{1} is unaffected!", target.pbThis))
else
@battle.pbDisplay(_INTL("{1} is unaffected because of {2}'s {3}!",
target.pbThis, b.pbThis(true), b.abilityName))
end
@battle.pbHideAbilitySplash(target)
@battle.pbHideAbilitySplash(b)
end
return true
end

1
Data/Scripts/011_Battle/003_Move/007_MoveEffects_BattlerOther.rb
View File

@@ -639,7 +639,6 @@ class Battle::Move::AttractTarget < Battle::Move
def pbFailsAgainstTarget?(user, target, show_message)
return false if damagingMove?
return true if !target.pbCanAttract?(user, show_message)
return true if pbMoveFailedAromaVeil?(user, target, show_message)
return false
end

9
Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb
View File

@@ -289,10 +289,10 @@ class Battle::Move::StartNegateHeldItems < Battle::Move
end
#===============================================================================
# The user consumes its held berry and gains its effect. Also, increases the
# user's Defense by 2 stages. The berry can be consumed even if Unnerve/Magic
# Room apply. Fails if the user is not holding a berry. This move cannot be
# chosen to be used if the user is not holding a berry. (Stuff Cheeks)
# The user consumes its held berry increases its Defense by 2 stages. It also
# gains the berry's effect if it has one. The berry can be consumed even if
# Unnerve/Magic Room apply. Fails if the user is not holding a berry. This move
# cannot be chosen to be used if the user is not holding a berry. (Stuff Cheeks)
#===============================================================================
class Battle::Move::UserConsumeBerryRaiseDefense2 < Battle::Move::StatUpMove
def initialize(battle, move)
@@ -319,7 +319,6 @@ class Battle::Move::UserConsumeBerryRaiseDefense2 < Battle::Move::StatUpMove
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
# TODO: Should this return super? It can consume the berry at this point.
return super
end