DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14:59 +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/013_Overworld/002_PField_Field.rb
View File

@@ -882,8 +882,7 @@ def pbRegisterPartner(trainerid,trainername,partyid=0)
trainerobject = PokeBattle_Trainer.new(_INTL(trainer[0].name),trainerid)
trainerobject.setForeignID($Trainer)
for i in trainer[2]
i.trainerID = trainerobject.id
i.ot = trainerobject.name
i.owner = Pokemon::Owner.new_from_trainer(trainerobject)
i.calcStats
end
$PokemonGlobal.partner = [trainerid,trainerobject.name,trainerobject.id,trainer[2]]

6
Data/Scripts/013_Overworld/013_PField_DayCare.rb
View File

@@ -155,8 +155,8 @@ def pbDayCareGetCompat
isConst?(compat21,PBEggGroups,:Ditto)
if pbDayCareCompatibleGender(pkmn1,pkmn2)
ret = 1
ret += 1 if pkmn1.species==pkmn2.species
ret += 1 if pkmn1.trainerID!=pkmn2.trainerID
ret += 1 if pkmn1.species == pkmn2.species
ret += 1 if pkmn1.owner.id != pkmn2.owner.id
return ret
end
end
@@ -350,7 +350,7 @@ def pbDayCareGenerateEgg
end
# Masuda method and Shiny Charm
shinyretries = 0
shinyretries += 5 if father.language!=mother.language
shinyretries += 5 if father.owner.language != mother.owner.language
shinyretries += 2 if hasConst?(PBItems,:SHINYCHARM) && $PokemonBag.pbHasItem?(:SHINYCHARM)
if shinyretries>0
shinyretries.times do