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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-08-22 00:03:32 +01:00
parent 1b9e7400f9 e0e5cfebb7
commit e57e1f4a1e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
View File

@@ -193,8 +193,9 @@ def pbDayCareGenerateEgg
egg.personalID = pid
# Inheriting form
if [:BURMY, :SHELLOS, :BASCULIN, :FLABEBE, :PUMPKABOO, :ORICORIO, :ROCKRUFF, :MINIOR].include?(babyspecies)
newForm = mother.form
newForm = 0 if mother.isSpecies?(:MOTHIM)
parent = (ditto0 || (!pkmn0.female? && ditto1)) ? father : mother
newForm = parent.form
newForm = 0 if parent.isSpecies?(:MOTHIM)
egg.form = newForm
end
# Inheriting regional form