mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Added $player.has_box_link and $player.has_exp_all in addition to those items
This commit is contained in:
@@ -8,7 +8,7 @@ class Battle
|
|||||||
return if !@internalBattle || !@expGain
|
return if !@internalBattle || !@expGain
|
||||||
# Go through each battler in turn to find the Pokémon that participated in
|
# Go through each battler in turn to find the Pokémon that participated in
|
||||||
# battle against it, and award those Pokémon Exp/EVs
|
# battle against it, and award those Pokémon Exp/EVs
|
||||||
expAll = $bag.has?(:EXPALL)
|
expAll = $player.has_exp_all || $bag.has?(:EXPALL)
|
||||||
p1 = pbParty(0)
|
p1 = pbParty(0)
|
||||||
@battlers.each do |b|
|
@battlers.each do |b|
|
||||||
next unless b && b.opposes? # Can only gain Exp from fainted foes
|
next unless b && b.opposes? # Can only gain Exp from fainted foes
|
||||||
|
|||||||
@@ -24,8 +24,12 @@ class Player < Trainer
|
|||||||
attr_accessor :has_pokegear
|
attr_accessor :has_pokegear
|
||||||
# @return [Boolean] whether the player has running shoes (i.e. can run)
|
# @return [Boolean] whether the player has running shoes (i.e. can run)
|
||||||
attr_accessor :has_running_shoes
|
attr_accessor :has_running_shoes
|
||||||
|
# @return [Boolean] whether the player has an innate ability to access Pokémon storage
|
||||||
|
attr_accessor :has_box_link
|
||||||
# @return [Boolean] whether the creator of the Pokémon Storage System has been seen
|
# @return [Boolean] whether the creator of the Pokémon Storage System has been seen
|
||||||
attr_accessor :seen_storage_creator
|
attr_accessor :seen_storage_creator
|
||||||
|
# @return [Boolean] whether the effect of Exp All applies innately
|
||||||
|
attr_accessor :has_exp_all
|
||||||
# @return [Boolean] whether Mystery Gift can be used from the load screen
|
# @return [Boolean] whether Mystery Gift can be used from the load screen
|
||||||
attr_accessor :mystery_gift_unlocked
|
attr_accessor :mystery_gift_unlocked
|
||||||
# @return [Array<Array>] downloaded Mystery Gift data
|
# @return [Array<Array>] downloaded Mystery Gift data
|
||||||
@@ -110,7 +114,9 @@ class Player < Trainer
|
|||||||
@has_pokedex = false
|
@has_pokedex = false
|
||||||
@has_pokegear = false
|
@has_pokegear = false
|
||||||
@has_running_shoes = false
|
@has_running_shoes = false
|
||||||
|
@has_box_link = false
|
||||||
@seen_storage_creator = false
|
@seen_storage_creator = false
|
||||||
|
@has_exp_all = false
|
||||||
@mystery_gift_unlocked = false
|
@mystery_gift_unlocked = false
|
||||||
@mystery_gifts = []
|
@mystery_gifts = []
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1151,7 +1151,7 @@ class PokemonPartyScreen
|
|||||||
|
|
||||||
def pbPokemonScreen
|
def pbPokemonScreen
|
||||||
can_access_storage = false
|
can_access_storage = false
|
||||||
if $bag.has?(:POKEMONBOXLINK)
|
if $player.has_box_link || $bag.has?(:POKEMONBOXLINK)
|
||||||
if !$game_switches[Settings::DISABLE_BOX_LINK_SWITCH] &&
|
if !$game_switches[Settings::DISABLE_BOX_LINK_SWITCH] &&
|
||||||
!$game_map.metadata&.has_flag?("DisableBoxLink")
|
!$game_map.metadata&.has_flag?("DisableBoxLink")
|
||||||
can_access_storage = true
|
can_access_storage = true
|
||||||
|
|||||||
Reference in New Issue
Block a user