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

Fixed using pkmn.species= with a form's internal name not setting the actual species. Fixed Shadow Pokémon not being able to have different Shadow Moves for particular forms.

Browse Source
This commit is contained in:
Maruno17
2020-11-11 21:07:26 +00:00
parent c87a578021
commit 5534f338e7
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb
View File

@@ -629,7 +629,7 @@ class PokeBattle_Pokemon
#=============================================================================
def species=(value)
hasNickname = nicknamed?
@species = value
@species, @form = pbGetSpeciesFromFSpecies(value)
@name = PBSpecies.getName(@species) unless hasNickname
@level = nil # In case growth rate is different for the new species
@forcedForm = nil

12
Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb
View File

@@ -290,12 +290,14 @@ class PokeBattle_Pokemon
self.savedev = [0,0,0,0,0,0]
self.shadowmoves = [0,0,0,0,0,0,0,0]
# Retrieve shadow moves
moves = pbLoadShadowMovesets
if moves[self.species] && moves[self.species].length>0
for i in 0...[4,moves[self.species].length].min
self.shadowmoves[i] = moves[self.species][i]
shadow_movesets = pbLoadShadowMovesets
shadow_moves = shadow_movesets[self.fSpecies]
shadow_moves = shadow_movesets[self.species] if !shadow_moves || shadow_moves.length == 0
if shadow_moves && shadow_moves.length > 0
for i in 0...[4,shadow_moves.length].min
self.shadowmoves[i] = shadow_moves[i]
end
self.shadowmovenum = moves[self.species].length
self.shadowmovenum = shadow_moves.length
else
# No special shadow moves
self.shadowmoves[0] = getConst(PBMoves,:SHADOWRUSH) || 0