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

Fixes move remembering issue when unfusing

Browse Source
This commit is contained in:
chardub
2025-04-10 19:52:18 -04:00
parent e1b6d7e7a9
commit be2edbef70
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Scripts/004_Game classes/002_Game_System.rb
View File

@@ -51,7 +51,6 @@ class Game_System
def bgm_play_internal2(name,volume,pitch,position) # :nodoc: def bgm_play_internal2(name,volume,pitch,position) # :nodoc:
vol = volume vol = volume
vol *= $PokemonSystem.bgmvolume/100.0 vol *= $PokemonSystem.bgmvolume/100.0
vol+=30
vol = vol.to_i vol = vol.to_i
begin begin
Audio.bgm_play(name,vol,pitch,position) Audio.bgm_play(name,vol,pitch,position)

1
Data/Scripts/013_Items/001_Item_Utilities.rb
View File

@@ -445,7 +445,6 @@ def pbLearnMove(pkmn, move, ignoreifknown = false, bymachine = false, fast = fal
end end
pkmnname = pkmn.name pkmnname = pkmn.name
movename = GameData::Move.get(move).name movename = GameData::Move.get(move).name
pkmn.add_learned_move(move) if !bymachine
if pkmn.hasMove?(move) if pkmn.hasMove?(move)
pbMessage(_INTL("{1} already knows {2}.", pkmnname, movename), &block) if !ignoreifknown pbMessage(_INTL("{1} already knows {2}.", pkmnname, movename), &block) if !ignoreifknown
return false return false

1
Data/Scripts/013_Items/004_1_PokeradarUI.rb
View File

@@ -62,6 +62,7 @@ class PokeRadar_UI
def addPokemonIcon(species, blackened = false, rare=false) def addPokemonIcon(species, blackened = false, rare=false)
pokemonId=dexNum(species) pokemonId=dexNum(species)
return if !pokemonId
iconId = _INTL("{1}", species) iconId = _INTL("{1}", species)
pokemonBitmap = pbCheckPokemonIconFiles(species) pokemonBitmap = pbCheckPokemonIconFiles(species)

5
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -977,8 +977,10 @@ class Pokemon
end end
def pokemon_can_learn_move(species_data, move_data) def pokemon_can_learn_move(species_data, move_data)
moveset = species_data.moves.map { |pair| pair[1] }
return species_data.tutor_moves.include?(move_data.id) || return species_data.tutor_moves.include?(move_data.id) ||
species_data.moves.include?(move_data.id) || species_data.moves.include?(move_data.id) || ##this is formatted as such [[1, :PECK],[etc.]] so it never finds anything when move_data is just the symbol. Leaving it there in case something depends on that for some reason.
moveset.include?(move_data.id) ||
species_data.egg_moves.include?(move_data.id) species_data.egg_moves.include?(move_data.id)
end end
@@ -1599,7 +1601,6 @@ class Pokemon
@hat_y = 0 @hat_y = 0
@size_category = determine_size_category() @size_category = determine_size_category()
@sprite_scale=determine_scale() @sprite_scale=determine_scale()
echoln @sprite_scale
calc_stats calc_stats
if @form == 0 && recheck_form if @form == 0 && recheck_form
f = MultipleForms.call("getFormOnCreation", self) f = MultipleForms.call("getFormOnCreation", self)

3
Data/Scripts/016_UI/005_UI_Party.rb
View File

@@ -1196,7 +1196,6 @@ class PokemonPartyScreen
#exclude current moves #exclude current moves
echoln "learned moves: #{learnable_moves}" echoln "learned moves: #{learnable_moves}"
for current_move in pokemon.moves for current_move in pokemon.moves
echoln current_move.id
if learnable_moves.include?(current_move.id) if learnable_moves.include?(current_move.id)
learnable_moves.delete(current_move.id) learnable_moves.delete(current_move.id)
end end
@@ -1204,7 +1203,7 @@ class PokemonPartyScreen
move_ids = [] move_ids = []
for move in learnable_moves for move in learnable_moves
if move.is_a?(Symbol) if move.is_a?(Symbol)
move_ids << move move_ids << move if pokemon.compatible_with_move?(move)
end end
end end