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

Fixed previous commit always causing recompiling if shadow_pokemon.dat doesn't exist, also rubocopping

Browse Source
This commit is contained in:
Maruno17
2023-01-23 22:27:04 +00:00
parent f6213057d8
commit b0b6e675c3
103 changed files with 1099 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -8,8 +8,9 @@ class PokemonGlobalMetadata
attr_accessor :nextBattleBack
end
#===============================================================================
#
#===============================================================================
class Game_Temp
attr_accessor :encounter_triggered
attr_accessor :encounter_type
@@ -61,8 +62,9 @@ class Game_Temp
end
end
#===============================================================================
#
#===============================================================================
def setBattleRule(*args)
r = nil
args.each do |arg|

8
Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb
View File

@@ -26,7 +26,7 @@ class PokemonEncounters
@chance_accumulator = 0
end
#=============================================================================
#-----------------------------------------------------------------------------
# Returns whether encounters for the given encounter type have been defined
# for the current map.
@@ -84,7 +84,7 @@ class PokemonEncounters
return false
end
#=============================================================================
#-----------------------------------------------------------------------------
# Returns whether the player's current location allows wild encounters to
# trigger upon taking a step.
@@ -262,7 +262,7 @@ class PokemonEncounters
return ret
end
#=============================================================================
#-----------------------------------------------------------------------------
# For the current map, randomly chooses a species and level from the encounter
# list for the given encounter type. Returns nil if there are none defined.
@@ -375,8 +375,6 @@ class PokemonEncounters
end
end
#===============================================================================
#
#===============================================================================

12
Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb
View File

@@ -1,3 +1,6 @@
#===============================================================================
#
#===============================================================================
class PokemonGlobalMetadata
attr_accessor :roamPosition
attr_accessor :roamedAlready # Whether a roamer has been encountered on current map
@@ -11,8 +14,6 @@ class PokemonGlobalMetadata
end
end
#===============================================================================
# Making roaming Pokémon roam around.
#===============================================================================
@@ -101,8 +102,6 @@ EventHandlers.add(:on_enter_map, :move_roaming_pokemon,
}
)
#===============================================================================
# Encountering a roaming Pokémon in a wild battle.
#===============================================================================
@@ -110,8 +109,9 @@ class Game_Temp
attr_accessor :roamer_index_for_encounter # Index of roaming Pokémon to encounter next
end
#===============================================================================
#
#===============================================================================
# Returns whether the given category of encounter contains the actual encounter
# method that will occur in the player's current position.
def pbRoamingMethodAllowed(roamer_method)