DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-25 15:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-06-20 23:12:30 +01:00
parent c194e1b711 3c3802b80b
commit eceb7f2084
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/Scripts/001_Technical/005_PluginManager.rb
View File

@@ -576,11 +576,17 @@ module PluginManager
next if !plugins[o] || !plugins[o][:dependencies] next if !plugins[o] || !plugins[o][:dependencies]
# go through all dependencies # go through all dependencies
for dname in plugins[o][:dependencies] for dname in plugins[o][:dependencies]
optional = false
# clean the name to a simple string # clean the name to a simple string
dname = dname[0] if dname.is_a?(Array) && dname.length == 2 if dname.is_a?(Array)
dname = dname[1] if dname.is_a?(Array) && dname.length == 3 optional = [:optional,:optional_exact].include?(dname[0])
dname = dname[dname.length - 2]
end
# catch missing dependency # catch missing dependency
self.error("Plugin '#{o}' requires plugin '#{dname}' to work properly.") if !order.include?(dname) if !order.include?(dname)
next if optional
self.error("Plugin '#{o}' requires plugin '#{dname}' to work properly.")
end
# skip if already sorted # skip if already sorted
next if order.index(dname) > order.index(o) next if order.index(dname) > order.index(o)
# catch looping dependency issue # catch looping dependency issue

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

@@ -279,7 +279,7 @@ class PokemonEncounters
if favored_type if favored_type
new_enc_list = [] new_enc_list = []
enc_list.each do |enc| enc_list.each do |enc|
species_data = GameData::Species.get(enc[0]) species_data = GameData::Species.get(enc[1])
t1 = species_data.type1 t1 = species_data.type1
t2 = species_data.type2 t2 = species_data.type2
new_enc_list.push(enc) if t1 == favored_type || t2 == favored_type new_enc_list.push(enc) if t1 == favored_type || t2 == favored_type