Merge branch 'master' into dev

Data/Scripts/001_Technical/005_PluginManager.rb

@@ -576,11 +576,17 @@ module PluginManager
       next if !plugins[o] || !plugins[o][:dependencies]
       # go through all dependencies
       for dname in plugins[o][:dependencies]
+        optional = false
         # clean the name to a simple string
-        dname = dname[0] if dname.is_a?(Array) && dname.length == 2
-        dname = dname[1] if dname.is_a?(Array) && dname.length == 3
+        if dname.is_a?(Array)
+          optional = [:optional,:optional_exact].include?(dname[0])
+          dname = dname[dname.length - 2]
+        end
         # 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
         next if order.index(dname) > order.index(o)
         # catch looping dependency issue

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

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