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

More revamping and rearranging

Browse Source
This commit is contained in:
Maruno17
2021-01-23 20:44:07 +00:00
parent 8a89ef1220
commit 7de034957b
38 changed files with 674 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/017_UI/020_PScreen_EggHatching.rb
View File

@@ -198,11 +198,11 @@ def pbHatch(pokemon)
pokemon.happiness = 120
pokemon.timeEggHatched = pbGetTimeNow
pokemon.obtain_method = 1 # hatched from egg
pokemon.hatchedMap = $game_map.map_id
pokemon.hatched_map = $game_map.map_id
$Trainer.seen[pokemon.species] = true
$Trainer.owned[pokemon.species] = true
pbSeenForm(pokemon)
pokemon.pbRecordFirstMoves
pokemon.record_first_moves
if !pbHatchAnimation(pokemon)
pbMessage(_INTL("Huh?\1"))
pbMessage(_INTL("...\1"))
@@ -218,15 +218,15 @@ end
Events.onStepTaken += proc { |_sender,_e|
for egg in $Trainer.party
next if egg.eggsteps<=0
egg.eggsteps -= 1
next if egg.steps_to_hatch <= 0
egg.steps_to_hatch -= 1
for i in $Trainer.pokemonParty
next if !i.hasAbility?(:FLAMEBODY) && !i.hasAbility?(:MAGMAARMOR)
egg.eggsteps -= 1
egg.steps_to_hatch -= 1
break
end
if egg.eggsteps<=0
egg.eggsteps = 0
if egg.steps_to_hatch <= 0
egg.steps_to_hatch = 0
pbHatch(egg)
end
end