sorare-rewards 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6897c498226e4f66e5b2a8aa93cd8b46478cc5d48d445950313224fae955922
-  data.tar.gz: 6a317d2b7767bb86bba95b485516923c1f4fe04780507d068b8d5ebd4a34a836
+  metadata.gz: df838191acb56979062609ee4184646e5c45381610efe994cc3c7e84d397aac7
+  data.tar.gz: 300f47f3db86b1ea465360f15c59fa926b78544b70bf3c3242972c28213a51f9
 SHA512:
-  metadata.gz: d0000887adec07808ab805e1045b196cd413015dd4e99a0b7df65fcf08a6cdf1f7cadd34c976a8da21cbbe72b583f5166e970a624645f02e64c5a77dbc1b119b
-  data.tar.gz: 72f565145aade90fc49552c1940da0e6f93f9e4f80dc179fb90ff9c20ed2c287ab241e5755bab1f750b3e9a8f4a61425b262729cf0e326465be201a35dfdfccc
+  metadata.gz: 29ee679bddd7d79e01c96b3a15331d8c5946ea3cde90650d7afbc68b66a699e21739774a942b1cd2c45c991ce53eb984914d30890c1dc2abcc00ba245ff03775
+  data.tar.gz: 8375b5b15925506505a29fc39e41b7bf8a7dbdbe6f0895abb03d768fd69c99d515ce7aaacf6134d9a2f46b5a9686428d966c4d5f82e1ff0f2571d20ee456042d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.1.1)
+    sorare-rewards (1.1.2)
       activesupport (~> 6.1)
       interactor (~> 3.0)
       json (~> 2)

data/lib/sorare/rewards/interactors/supply/compute_for_rarity.rb

@@ -21,37 +21,46 @@ module Sorare
         end
 
         def rewardable_supply
-          total_float_supply = supply.keys.sum { |player| player_supply(player) }
+          total_float_supply = supply.keys.sum { |player| player_contribution(player) }
 
-          round_and_cap_supply(total_float_supply)
+          round_and_cap_league_supply(total_float_supply)
         end
 
         def distribute_in_tiers!
           ctx = Tiers::QualifySupply.call!(sorted_supply: supply)
-          ctx.supply.each do |tier_supply|
+          qualified_players = Tiers::QualifyPlayers.call!(sorted_supply: supply).players
+          ctx.supply.each_with_index do |tier_supply, index|
             rarity_supply.push(
-              ComputeForQuality.call!(
-                randomizer: randomizer,
-                total_supply: ctx.count,
-                tier_supply: tier_supply,
-                rewardable: rewardable,
-                rewarded: rarity_supply
-              ).quality_supply
+              capped_tier_supply(ctx.count, tier_supply, rewardable, qualified_players[index])
             )
           end
         end
 
-        def round_and_cap_supply(float_supply)
+        # Cap with the actual pickable supply for the tier
+        def capped_tier_supply(total_supply, tier_supply, rewardable, tier_players)
+          target = ComputeForQuality.call!(
+            randomizer: randomizer, total_supply: total_supply,
+            tier_supply: tier_supply, rewardable: rewardable, rewarded: rarity_supply
+          ).quality_supply
+
+          [target, tier_players.sum { |player| player_pickable_supply(player) }].min
+        end
+
+        def round_and_cap_league_supply(float_supply)
           [
             float_supply.floor + remaining_supply(float_supply.modulo(1)), # Supply limit
             league.cards_in_circulation_limit(rarity) # Circulation limit
           ].compact.min
         end
 
-        def player_supply(slug)
+        def player_contribution(slug)
           game_week.player(slug).reward_pool_supply_contribution(league, rarity)
         end
 
+        def player_pickable_supply(slug)
+          game_week.player(slug).pickable_supply(league, rarity)
+        end
+
         def remaining_supply(reward_probability)
           probability = randomizer.rand
           return 0 unless probability < reward_probability

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorare-rewards
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - pierre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport