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 'dev' into ui-redesign

Browse Source
This commit is contained in:
Maruno17
2024-11-22 19:55:58 +00:00
parent 098ca562d0 00d1e431b4
commit fcb4a1cec3
11 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb
View File

@@ -244,7 +244,7 @@ GameData::Evolution.register({
:id => :LevelDarkInParty,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
next pkmn.level >= parameter && $player.has_pokemon_of_type?(:DARK)
next pkmn.level >= parameter && $player.has_pokemon_of_type?(:DARK, [pkmn])
}
})

3
Data/Scripts/010_Data/002_PBS data/015_Trainer.rb
View File

@@ -136,6 +136,7 @@ module GameData
trainer.party.push(pkmn)
# Set Pokémon's properties if defined
pkmn.form_simple = pkmn_data[:form] if pkmn_data[:form]
pkmn.time_form_set = pbGetTimeNow.to_i # To allow Furfrou/Hoopa alternate forms
pkmn.item = pkmn_data[:item]
if pkmn_data[:moves] && pkmn_data[:moves].length > 0
pkmn_data[:moves].each { |move| pkmn.learn_move(move) }
@@ -180,6 +181,8 @@ module GameData
elsif trainer.default_poke_ball
pkmn.poke_ball = trainer.default_poke_ball
end
pkmn.form # Called just to recalculate it in case a defined property has changed it, e.g. gender for Espurr
pkmn.reset_moves if !pkmn_data[:moves] || pkmn_data[:moves].empty? # In case form changed
pkmn.calc_stats
end
return trainer