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

Revamped classes Pokemon, PBMove and PokemonMail

Browse Source
This commit is contained in:
Maruno17
2021-01-21 23:04:51 +00:00
parent 94ce80c183
commit 8a89ef1220
40 changed files with 1016 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/019_Other battles/003_PBattle_OrgBattle.rb
View File

@@ -154,16 +154,16 @@ class PBPokemon
def createPokemon(level,iv,trainer)
pokemon=Pokemon.new(@species,level,trainer,false)
pokemon.setItem(@item)
pokemon.item = @item
pokemon.personalID = rand(2**16) | rand(2**16) << 16
pokemon.personalID -= pokemon.personalID % 25
pokemon.personalID += nature
pokemon.personalID &= 0xFFFFFFFF
pokemon.happiness=0
pokemon.moves[0]=PBMove.new(self.convertMove(@move1))
pokemon.moves[1]=PBMove.new(self.convertMove(@move2))
pokemon.moves[2]=PBMove.new(self.convertMove(@move3))
pokemon.moves[3]=PBMove.new(self.convertMove(@move4))
pokemon.moves[0] = Pokemon::Move.new(self.convertMove(@move1))
pokemon.moves[1] = Pokemon::Move.new(self.convertMove(@move2))
pokemon.moves[2] = Pokemon::Move.new(self.convertMove(@move3))
pokemon.moves[3] = Pokemon::Move.new(self.convertMove(@move4))
evcount=0
for i in 0...6
evcount+=1 if ((@ev&(1<<i))!=0)
@@ -958,13 +958,13 @@ def pbOrganizedBattleEx(opponent,challengedata,endspeech,endspeechwin)
pkmn.heal
pkmn.makeUnmega
pkmn.makeUnprimal
pkmn.setItem(olditems[i])
pkmn.item = olditems[i]
end
opponent.party.each_with_index do |pkmn,i|
pkmn.heal
pkmn.makeUnmega
pkmn.makeUnprimal
pkmn.setItem(olditems2[i])
pkmn.item = olditems2[i]
end
# Save the record of the battle
$PokemonTemp.lastbattle = nil

4
Data/Scripts/019_Other battles/005_PBattle_OrgBattleGenerator.rb
View File

@@ -872,12 +872,12 @@ def pbRuledBattle(team1,team2,rule)
team1.each_with_index do |p,i|
next if !p
p.heal
p.setItem(items1[i])
p.item = items1[i]
end
team2.each_with_index do |p,i|
next if !p
p.heal
p.setItem(items2[i])
p.item = items2[i]
end
end
if decision==1 # Team 1 wins