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

Updated to mkxp-z v2.1.1, renamed and rearranged some script files

Browse Source
This commit is contained in:
Maruno17
2021-04-04 16:24:46 +01:00
parent afd76503b2
commit 5b0960337a
92 changed files with 916 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Data/Scripts/011_Data/001_Hardcoded data/007_Evolution.rb
View File

@@ -120,9 +120,7 @@ GameData::Evolution.register({
:id => :LevelNoWeather,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
if pkmn.level >= parameter && $game_screen
next $game_screen.weather_type == :None
end
next pkmn.level >= parameter && $game_screen && $game_screen.weather_type == :None
}
})
@@ -130,9 +128,8 @@ GameData::Evolution.register({
:id => :LevelSun,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
if pkmn.level >= parameter && $game_screen
next GameData::Weather.get($game_screen.weather_type).category == :Sun
end
next pkmn.level >= parameter && $game_screen &&
GameData::Weather.get($game_screen.weather_type).category == :Sun
}
})
@@ -140,9 +137,8 @@ GameData::Evolution.register({
:id => :LevelRain,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
if pkmn.level >= parameter && $game_screen
next [:Rain, :Fog].include?(GameData::Weather.get($game_screen.weather_type).category)
end
next pkmn.level >= parameter && $game_screen &&
[:Rain, :Fog].include?(GameData::Weather.get($game_screen.weather_type).category)
}
})
@@ -150,9 +146,8 @@ GameData::Evolution.register({
:id => :LevelSnow,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
if pkmn.level >= parameter && $game_screen
next GameData::Weather.get($game_screen.weather_type).category == :Hail
end
next pkmn.level >= parameter && $game_screen &&
GameData::Weather.get($game_screen.weather_type).category == :Hail
}
})
@@ -160,9 +155,8 @@ GameData::Evolution.register({
:id => :LevelSandstorm,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
if pkmn.level >= parameter && $game_screen
next GameData::Weather.get($game_screen.weather_type).category == :Sandstorm
end
next pkmn.level >= parameter && $game_screen &&
GameData::Weather.get($game_screen.weather_type).category == :Sandstorm
}
})
@@ -203,7 +197,7 @@ GameData::Evolution.register({
:id => :LevelDarkInParty,
:parameter => Integer,
:level_up_proc => proc { |pkmn, parameter|
next $Trainer.has_pokemon_of_type?(:DARK) if pkmn.level >= parameter
next pkmn.level >= parameter && $Trainer.has_pokemon_of_type?(:DARK)
}
})

4
Data/Scripts/011_Data/002_PBS data/013_Trainer.rb
View File

@@ -125,7 +125,7 @@ module GameData
if pkmn_data[:moves] && pkmn_data[:moves].length > 0
pkmn_data[:moves].each { |move| pkmn.learn_move(move) }
else
pkmn.resetMoves
pkmn.reset_moves
end
pkmn.ability_index = pkmn_data[:ability_flag]
pkmn.gender = pkmn_data[:gender] || ((trainer.male?) ? 0 : 1)
@@ -156,7 +156,7 @@ module GameData
pkmn.shiny = false
end
pkmn.poke_ball = pbBallTypeToItem(pkmn_data[:poke_ball]).id if pkmn_data[:poke_ball]
pkmn.calcStats
pkmn.calc_stats
end
return trainer
end