Merge branch 'master' into dev

2025-12-08 05:34:58 +00:00 · 2021-08-12 20:37:25 +01:00
parent c360c4ddd2 4b768bec32
commit 153aa69bb8
7 changed files with 20 additions and 8 deletions
--- a/triggering/003_Overworld_WildEncounters.rb
+++ b/triggering/003_Overworld_WildEncounters.rb
@@ -367,11 +367,7 @@ class PokemonEncounters
    chance_total = 0
    enc_list.each { |a| chance_total += a[0] }
    # Choose a random entry in the encounter table based on entry probabilities
-    rnd = 0
-    chance_rolls.times do
-      r = rand(chance_total)
-      rnd = r if r > rnd   # Prefer rarer entries if rolling repeatedly
-    end
+    rnd = rand(chance_total)
    encounter = nil
    enc_list.each do |enc|
      rnd -= enc[0]