sorare-rewards 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc85589244de6f453ed70184da06e8c679ec19b4b2c5fe86ee1ea4936c2c402
-  data.tar.gz: 521385c5b0b1e917d7be61eaef02d2284c24082fb18eeec561f9da6160ea650f
+  metadata.gz: df838191acb56979062609ee4184646e5c45381610efe994cc3c7e84d397aac7
+  data.tar.gz: 300f47f3db86b1ea465360f15c59fa926b78544b70bf3c3242972c28213a51f9
 SHA512:
-  metadata.gz: 4b998f1b6bca4cbb8ca9fc9fcab6b2d9f2f32b7f4384e4b736ec2dcd3b51b9e1e17d62daf7f85b715e21a060445abd5e495342a01bc725994847ca028a991733
-  data.tar.gz: fff45a44fc25d684adeb45985aac4fde3b876977feca1f9fd3b4f9cd7b3e60f82b3f3f0294df25cc28aead951ee16f0b287192d4bb44fb1cd823602067f3ac42
+  metadata.gz: 29ee679bddd7d79e01c96b3a15331d8c5946ea3cde90650d7afbc68b66a699e21739774a942b1cd2c45c991ce53eb984914d30890c1dc2abcc00ba245ff03775
+  data.tar.gz: 8375b5b15925506505a29fc39e41b7bf8a7dbdbe6f0895abb03d768fd69c99d515ce7aaacf6134d9a2f46b5a9686428d966c4d5f82e1ff0f2571d20ee456042d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.0.1)
+    sorare-rewards (1.1.2)
       activesupport (~> 6.1)
       interactor (~> 3.0)
       json (~> 2)
@@ -23,12 +23,15 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     interactor (3.1.2)
+    io-wait (0.1.0)
     json (2.5.1)
     minitest (5.14.4)
     net-http (0.1.1)
       net-protocol
       uri
-    net-protocol (0.1.0)
+    net-protocol (0.1.1)
+      io-wait
+      timeout
     ostruct (0.2.0)
     parallel (1.20.1)
     parser (3.0.1.0)
@@ -67,6 +70,7 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
+    timeout (0.1.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)

data/lib/sorare/rewards/allocation_configuration.yml

@@ -1,3 +1,29 @@
+limited: &limited
+  tier_0:
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0.33
+  tier_1:
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0.33
+  tier_2:
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0.8
+  tier_3:
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 0
+    - pct: 1
+
 rare: &rare
   tier_0:
     - cards_per_loop: 0
@@ -44,21 +70,27 @@ super_rare: &super_rare
 
 leagues:
   global-all_star:
+    limited: *limited
     rare: *rare
     super_rare: *super_rare
   global-under_twenty_one:
+    limited: *limited
     rare: *rare
     super_rare: *super_rare
   champion-europe:
+    limited: *limited
     rare: *rare
     super_rare: *super_rare
   challenger-europe:
+    limited: *limited
     rare: *rare
     super_rare: *super_rare
   champion-asia:
+    limited: *limited
     rare: *rare
     super_rare: *super_rare
   champion-america:
+    limited: *limited
     rare: *rare
     super_rare: *super_rare
   special-weekly:

data/lib/sorare/rewards/game_week_config.rb

@@ -12,7 +12,7 @@ module Sorare
         @config = config
       end
 
-      %w[cooldown limits prize_pool_currency].each do |key|
+      %w[cooldown limits prize_pool_currency rewards_ratio_per_cards_in_circulation].each do |key|
         define_method(key) do
           config[key]
         end

data/lib/sorare/rewards/interactors/allocations/compute_for_league.rb

@@ -17,10 +17,8 @@ module Sorare
         end
 
         def allocate_and_format!
-          allocations = allocate!
-
-          allocations.keys.index_with do |rarity|
-            allocations[rarity].first.keys.index_with do |division|
+          each_rarity_allocation do |rarity|
+            (allocations[rarity].first || {}).keys.index_with do |division|
               allocations[rarity].each_with_index.map do |qualified_allocations, tier|
                 [Sorare::Rewards.configuration.transform_tier.call(tier), qualified_allocations[division]]
               end.to_h
@@ -28,8 +26,12 @@ module Sorare
           end
         end
 
-        def allocate!
-          (config || {}).keys.index_with do |rarity|
+        def each_rarity_allocation(&block)
+          allocations.keys.index_with(&block)
+        end
+
+        def allocations
+          @allocations ||= (config || {}).keys.index_with do |rarity|
             ComputeForRarity.call!(**context.to_h, supply: supply[rarity], config: config[rarity]).rarity_allocations
           end
         end

data/lib/sorare/rewards/interactors/allocations/compute_for_quality.rb

@@ -85,7 +85,7 @@ module Sorare
         end
 
         def check_config!
-          return if config && [0, 1].include?(config.sum { |q| q['pct'] || 0 })
+          return if config
 
           context.fail!(error: 'Invalid config')
         end

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

@@ -15,7 +15,13 @@ module Sorare
         def call
           context.fail!(error: 'Invalid config') unless config
 
-          context.rarity_allocations = supply.each_with_index.map do |tier_supply, tier|
+          context.rarity_allocations = allocations
+        end
+
+        def allocations
+          return [] unless supply
+
+          supply.each_with_index.map do |tier_supply, tier|
             ComputeForQuality.call!(
               **context.to_h,
               supply: tier_supply,

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

@@ -16,39 +16,49 @@ module Sorare
         def call
           context.rarity_supply = []
 
-          context.rewardable = compute_rewardable_supply!
+          context.rewardable = rewardable_supply
           distribute_in_tiers!
         end
 
-        def compute_rewardable_supply!
-          total_supply = supply.keys.sum do |player|
-            player_supply(player)
-          end
+        def rewardable_supply
+          total_float_supply = supply.keys.sum { |player| player_contribution(player) }
 
-          rounded_supply(total_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 player_supply(slug)
+        # 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_contribution(slug)
           game_week.player(slug).reward_pool_supply_contribution(league, rarity)
         end
 
-        def rounded_supply(float_supply)
-          float_supply.floor + remaining_supply(float_supply.modulo(1))
+        def player_pickable_supply(slug)
+          game_week.player(slug).pickable_supply(league, rarity)
         end
 
         def remaining_supply(reward_probability)

data/lib/sorare/rewards/league.rb

@@ -17,12 +17,18 @@ module Sorare
         @game_week = game_week
       end
 
-      %w[playing_rate prize_pools].each do |key|
+      %w[playing_rate prize_pools cards_in_circulation].each do |key|
         define_method(key) do
           config[key]
         end
       end
 
+      def cards_in_circulation_limit(rarity)
+        return unless cards_in_circulation&.dig(rarity) && game_week.config.rewards_ratio_per_cards_in_circulation
+
+        (cards_in_circulation[rarity] * game_week.config.rewards_ratio_per_cards_in_circulation).floor
+      end
+
       def each_division_prize_pools
         prize_pools.each_with_index do |prize_pool, index|
           return to_enum(:each_division_prize_pools) unless block_given?

data/lib/sorare/rewards/version.rb

@@ -2,6 +2,6 @@
 
 module Sorare
   module Rewards
-    VERSION = '1.0.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.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - pierre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport