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

Added a Setting to toggle whether the Move Reminder can teach previously known egg moves/TRs

Browse Source
This commit is contained in:
Maruno17
2022-05-13 21:12:47 +01:00
parent 7a88d47b4b
commit 1caedc0ed2
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Data/Scripts/001_Settings.rb
View File

@@ -93,6 +93,11 @@ module Settings
# whether the machine's move retains the replaced move's PP (true), or whether # whether the machine's move retains the replaced move's PP (true), or whether
# the machine's move has full PP (false). # the machine's move has full PP (false).
TAUGHT_MACHINES_KEEP_OLD_PP = (MECHANICS_GENERATION == 5) TAUGHT_MACHINES_KEEP_OLD_PP = (MECHANICS_GENERATION == 5)
# Whether the Move Relearner can also teach egg moves that the Pokémon knew
# when it hatched and moves that the Pokémon was once taught by a TR. Moves
# from the Pokémon's level-up moveset of the same or a lower level than the
# Pokémon can always be relearned.
MOVE_RELEARNER_CAN_TEACH_MORE_MOVES = (MECHANICS_GENERATION >= 6)
# Whether various HP-healing items heal the amounts they do in Gen 7+ (true) # Whether various HP-healing items heal the amounts they do in Gen 7+ (true)
# or in earlier Generations (false). # or in earlier Generations (false).
REBALANCED_HEALING_ITEM_AMOUNTS = (MECHANICS_GENERATION >= 7) REBALANCED_HEALING_ITEM_AMOUNTS = (MECHANICS_GENERATION >= 7)

8
Data/Scripts/016_UI/021_UI_MoveRelearner.rb
View File

@@ -154,13 +154,13 @@ class MoveRelearnerScreen
next if m[0] > pkmn.level || pkmn.hasMove?(m[1]) next if m[0] > pkmn.level || pkmn.hasMove?(m[1])
moves.push(m[1]) if !moves.include?(m[1]) moves.push(m[1]) if !moves.include?(m[1])
end end
tmoves = [] if Settings::MOVE_RELEARNER_CAN_TEACH_MORE_MOVES && pkmn.first_moves
if pkmn.first_moves tmoves = []
pkmn.first_moves.each do |i| pkmn.first_moves.each do |i|
tmoves.push(i) if !pkmn.hasMove?(i) && !moves.include?(i) tmoves.push(i) if !moves.include?(i) && !pkmn.hasMove?(i)
end end
moves = tmoves + moves # List first moves before level-up moves
end end
moves = tmoves + moves
return moves | [] # remove duplicates return moves | [] # remove duplicates
end end

2
PBS/trainer_types.txt
View File

@@ -397,5 +397,5 @@ VictoryME = Battle victory leader
Name = Champion Name = Champion
Gender = Male Gender = Male
BaseMoney = 100 BaseMoney = 100
BattleBGM = Battle Elite BattleBGM = Battle Champion
VictoryME = Battle victory leader VictoryME = Battle victory leader