mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
Added setting that determines if Pokémon put into storage are healed
This commit is contained in:
@@ -157,6 +157,9 @@ module Settings
|
|||||||
end
|
end
|
||||||
# The number of boxes in Pokémon storage.
|
# The number of boxes in Pokémon storage.
|
||||||
NUM_STORAGE_BOXES = 30
|
NUM_STORAGE_BOXES = 30
|
||||||
|
# Whether putting a Pokémon into Pokémon storage will heal it. IF false, they
|
||||||
|
# are healed by the Recover All: Entire Party event command (at Poké Centers).
|
||||||
|
HEAL_STORED_POKEMON = (MECHANICS_GENERATION < 8)
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|
||||||
|
|||||||
@@ -955,7 +955,13 @@ class Interpreter
|
|||||||
# * Recover All
|
# * Recover All
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
def command_314
|
def command_314
|
||||||
$Trainer.heal_party if @parameters[0] == 0
|
if @parameters[0] == 0
|
||||||
|
if Settings::HEAL_STORED_POKEMON # No need to heal stored Pokémon
|
||||||
|
$Trainer.heal_party
|
||||||
|
else
|
||||||
|
pbEachPokemon { |pkmn, box| pkmn.heal } # Includes party Pokémon
|
||||||
|
end
|
||||||
|
end
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -191,7 +191,7 @@ class PokemonStorage
|
|||||||
raise "Trying to copy nil to storage" if !pkmn
|
raise "Trying to copy nil to storage" if !pkmn
|
||||||
pkmn.time_form_set = nil
|
pkmn.time_form_set = nil
|
||||||
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
|
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
|
||||||
pkmn.heal
|
pkmn.heal if Settings::HEAL_STORED_POKEMON
|
||||||
self[boxDst,indexDst] = pkmn
|
self[boxDst,indexDst] = pkmn
|
||||||
end
|
end
|
||||||
return true
|
return true
|
||||||
@@ -214,7 +214,7 @@ class PokemonStorage
|
|||||||
if box>=0
|
if box>=0
|
||||||
pkmn.time_form_set = nil if pkmn.time_form_set
|
pkmn.time_form_set = nil if pkmn.time_form_set
|
||||||
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
|
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
|
||||||
pkmn.heal
|
pkmn.heal if Settings::HEAL_STORED_POKEMON
|
||||||
end
|
end
|
||||||
self[box,i] = pkmn
|
self[box,i] = pkmn
|
||||||
return true
|
return true
|
||||||
@@ -227,7 +227,7 @@ class PokemonStorage
|
|||||||
if @currentBox>=0
|
if @currentBox>=0
|
||||||
pkmn.time_form_set = nil
|
pkmn.time_form_set = nil
|
||||||
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
|
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
|
||||||
pkmn.heal
|
pkmn.heal if Settings::HEAL_STORED_POKEMON
|
||||||
end
|
end
|
||||||
for i in 0...maxPokemon(@currentBox)
|
for i in 0...maxPokemon(@currentBox)
|
||||||
if self[@currentBox,i]==nil
|
if self[@currentBox,i]==nil
|
||||||
|
|||||||
@@ -1722,7 +1722,7 @@ class PokemonStorageScreen
|
|||||||
p = (heldpoke) ? heldpoke : @storage[-1,index]
|
p = (heldpoke) ? heldpoke : @storage[-1,index]
|
||||||
p.time_form_set = nil
|
p.time_form_set = nil
|
||||||
p.form = 0 if p.isSpecies?(:SHAYMIN)
|
p.form = 0 if p.isSpecies?(:SHAYMIN)
|
||||||
p.heal
|
p.heal if Settings::HEAL_STORED_POKEMON
|
||||||
end
|
end
|
||||||
@scene.pbStore(selected,heldpoke,destbox,firstfree)
|
@scene.pbStore(selected,heldpoke,destbox,firstfree)
|
||||||
if heldpoke
|
if heldpoke
|
||||||
@@ -1769,7 +1769,7 @@ class PokemonStorageScreen
|
|||||||
if box>=0
|
if box>=0
|
||||||
@heldpkmn.time_form_set = nil
|
@heldpkmn.time_form_set = nil
|
||||||
@heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
|
@heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
|
||||||
@heldpkmn.heal
|
@heldpkmn.heal if Settings::HEAL_STORED_POKEMON
|
||||||
end
|
end
|
||||||
@scene.pbPlace(selected,@heldpkmn)
|
@scene.pbPlace(selected,@heldpkmn)
|
||||||
@storage[box,index] = @heldpkmn
|
@storage[box,index] = @heldpkmn
|
||||||
@@ -1798,7 +1798,7 @@ class PokemonStorageScreen
|
|||||||
if box>=0
|
if box>=0
|
||||||
@heldpkmn.time_form_set = nil
|
@heldpkmn.time_form_set = nil
|
||||||
@heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
|
@heldpkmn.form = 0 if @heldpkmn.isSpecies?(:SHAYMIN)
|
||||||
@heldpkmn.heal
|
@heldpkmn.heal if Settings::HEAL_STORED_POKEMON
|
||||||
end
|
end
|
||||||
@scene.pbSwap(selected,@heldpkmn)
|
@scene.pbSwap(selected,@heldpkmn)
|
||||||
tmp = @storage[box,index]
|
tmp = @storage[box,index]
|
||||||
|
|||||||
@@ -3,27 +3,22 @@
|
|||||||
Marks, which are symbols randomly given to wild Pokémon which append a title to
|
Marks, which are symbols randomly given to wild Pokémon which append a title to
|
||||||
its name when sent out in battle. A Pokémon can only have 0 or 1 marks. The
|
its name when sent out in battle. A Pokémon can only have 0 or 1 marks. The
|
||||||
title can be toggled. Ribbons also provide a title, and can similarly be
|
title can be toggled. Ribbons also provide a title, and can similarly be
|
||||||
toggled.
|
toggled. (Probably don't bother implementing.)
|
||||||
|
|
||||||
Super shininess (only difference is an alternate shiny common animation with
|
Super shininess. Only difference is an alternate shiny common animation with
|
||||||
square sparkles; a mon is super shiny if the calculated number that is compared
|
square sparkles; a mon is super shiny if the calculated number that is compared
|
||||||
to SHINY_POKEMON_CHANCE is exactly 0)
|
to Settings::SHINY_POKEMON_CHANCE is exactly 0.
|
||||||
|
|
||||||
Look at methods of increasing shiny chance.
|
The game records, for each species, how many have been caught or defeated
|
||||||
|
(counts both wild and trainer battles), and the shiny chance increases for that
|
||||||
|
species because of this. This value is also shown in the Pokédex entry screen.
|
||||||
|
|
||||||
Form differences.
|
"Pokémon no longer lose access to moves by evolving." I'm not sure what this
|
||||||
|
means. Maybe evolving causes the first_moves to be cleared (in the GF games; it
|
||||||
|
isn't cleared in Essentials)? In Gen 8+, a taught TR should be added to the
|
||||||
|
first_moves array.
|
||||||
|
|
||||||
Changes to evolutions due to removal of moss rock/ice rock/magnetic field.
|
Some moves have changed properties/effects.
|
||||||
|
|
||||||
Some (12) existing species changed egg groups.
|
|
||||||
|
|
||||||
Aegislash's stats changed.
|
|
||||||
|
|
||||||
2 existing Pokémon gained new abilities.
|
|
||||||
|
|
||||||
Pokémon no longer lose access to moves by evolving.
|
|
||||||
|
|
||||||
Move moves have changed properties/effects. Vice Grip becomes Vise Grip.
|
|
||||||
|
|
||||||
Can now give a Rare Candy to a max level Pokémon, which will trigger its
|
Can now give a Rare Candy to a max level Pokémon, which will trigger its
|
||||||
evolution (presumably the item isn't consumed if it can't at least try to evolve
|
evolution (presumably the item isn't consumed if it can't at least try to evolve
|
||||||
@@ -31,9 +26,26 @@ it).
|
|||||||
|
|
||||||
Bicycle that can work on water.
|
Bicycle that can work on water.
|
||||||
|
|
||||||
Town Map added to the pause menu. Can use Fly from within the Town Map if
|
Town Map added to the pause menu (don't bother adding). Can use Fly from within
|
||||||
possible.
|
the Town Map if possible (good QoL, add if possible).
|
||||||
|
|
||||||
Remote access to storage boxes, and Pokémon sent to storage aren't healed.
|
Remote access to storage boxes. Add an option to the pause screen for this
|
||||||
|
unless Settings::HEAL_STORED_POKEMON?
|
||||||
|
|
||||||
|
# PBS file data:
|
||||||
|
# - Form differences.
|
||||||
|
# - Moveset changes.
|
||||||
|
# - Changes to evolutions due to removal of moss rock/ice rock/magnetic field.
|
||||||
|
# - Some (12) existing species changed egg groups.
|
||||||
|
# - Aegislash's stats changed.
|
||||||
|
# - 2 existing Pokémon gained new abilities.
|
||||||
|
# - Vice Grip becomes Vise Grip.
|
||||||
|
# - Some items change names (Stick -> Leek, etc.).
|
||||||
|
|
||||||
|
#===============================================================================
|
||||||
|
# Implemented
|
||||||
|
#===============================================================================
|
||||||
|
|
||||||
|
Pokémon sent to storage aren't healed - see Settings::HEAL_STORED_POKEMON.
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|||||||
Reference in New Issue
Block a user