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

Merge branch 'pr/43' into refactor

Browse Source
This commit is contained in:
Maruno17
2020-10-17 14:40:52 +01:00
parent 7640736188 47a1cb5462
commit a6d21de0c1
18 changed files with 201 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
View File

@@ -141,8 +141,7 @@ module PokeBattle_BattleCommon
end
# Modify the Pokémon's properties because of the capture
if pbIsSnagBall?(ball)
pkmn.ot = pbPlayer.name
pkmn.trainerID = pbPlayer.id
pkmn.owner = Pokemon::Owner.new_from_trainer(pbPlayer)
end
BallHandlers.onCatch(ball,self,pkmn)
pkmn.ballused = pbGetBallType(ball)

6
Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
View File

@@ -134,10 +134,10 @@ class PokeBattle_Battle
exp /= 7
end
# Foreign Pokémon gain more Exp
isOutsider = (pkmn.trainerID!=pbPlayer.id ||
(pkmn.language!=0 && pkmn.language!=pbPlayer.language))
isOutsider = (pkmn.owner.id != pbPlayer.id ||
(pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language))
if isOutsider
if pkmn.language!=0 && pkmn.language!=pbPlayer.language
if pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language
exp = (exp*1.7).floor
else
exp = (exp*1.5).floor