sorare-rewards 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253e18e26532e141a2fa48969f8484d6c7f92f399cf4eecc248b5017978e6747
-  data.tar.gz: c7ed9fd27b8a78240a492eb0d75df26e5fb34b55a5a96b3a46b4cc74cc845d59
+  metadata.gz: f6897c498226e4f66e5b2a8aa93cd8b46478cc5d48d445950313224fae955922
+  data.tar.gz: 6a317d2b7767bb86bba95b485516923c1f4fe04780507d068b8d5ebd4a34a836
 SHA512:
-  metadata.gz: d3ef4eae789a0f616c270f8d08eb16d87d5964cd4b8c99a0501fe78ed02347942cb205baea2cc0b299822d9f158e6e2548915bd9d13917cf392ec8ebb4ff9be6
-  data.tar.gz: bbb905bf57270350136d28946ef963e841efc5acd780db50d90d0bcef4bfdee11fd7488df00d1bddcb5ce96981bbab64bad8177e3e699dd8b09d816518445cd6
+  metadata.gz: d0000887adec07808ab805e1045b196cd413015dd4e99a0b7df65fcf08a6cdf1f7cadd34c976a8da21cbbe72b583f5166e970a624645f02e64c5a77dbc1b119b
+  data.tar.gz: 72f565145aade90fc49552c1940da0e6f93f9e4f80dc179fb90ff9c20ed2c287ab241e5755bab1f750b3e9a8f4a61425b262729cf0e326465be201a35dfdfccc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorare-rewards (1.0.0)
+    sorare-rewards (1.1.1)
       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/cards/pick_for_division_rarity_and_quality.rb

@@ -32,7 +32,7 @@ module Sorare
 
         def pick_if_available!
           player = picker.pick
-          return if picker.player_counter[player] > game_week.player(player).supply(league, rarity).ceil
+          return if picker.player_counter[player] > game_week.player(player).pickable_supply(league, rarity)
 
           cards_picked.push(player)
         end

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

@@ -16,16 +16,14 @@ 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_supply(player) }
 
-          rounded_supply(total_supply)
+          round_and_cap_supply(total_float_supply)
         end
 
         def distribute_in_tiers!
@@ -43,12 +41,15 @@ module Sorare
           end
         end
 
-        def player_supply(slug)
-          game_week.player(slug).supply(league, rarity)
+        def round_and_cap_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 rounded_supply(float_supply)
-          float_supply.floor + remaining_supply(float_supply.modulo(1))
+        def player_supply(slug)
+          game_week.player(slug).reward_pool_supply_contribution(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/player.rb

@@ -25,11 +25,18 @@ module Sorare
         @game_data.present?
       end
 
-      def supply(league, rarity)
+      def reward_pool_supply_contribution(league, rarity)
         return 0 unless playing? && remaining_games_for_supply.positive?
 
         [
-          uncapped_supply_for_game_week(league, rarity), # Remaining supply
+          uncapped_supply_for_game_week(league, rarity),
+          pickable_supply(league, rarity)
+        ].min
+      end
+
+      def pickable_supply(league, rarity)
+        [
+          overall_supply(league, rarity), # Remaining supply
           available_during_cooldown(league, rarity), # Cooldown limit
           @config.distribution_limit(rarity) # Hard limit
         ].min
@@ -52,10 +59,12 @@ module Sorare
       end
 
       def rewarded_during_cooldown(league, rarity)
-        (rewards&.dig(league) || []).count { |at| (Time.parse(at) + @config.cooldown_since(rarity)) < Time.now }
+        (@game_data&.dig(league.name, rarity) || []).count do |at|
+          (Time.parse(at) + @config.cooldown_since(rarity)) > Time.now
+        end
       end
 
-      %w[rewards remaining_games_for_supply remaining_games].each do |key|
+      %w[remaining_games_for_supply remaining_games].each do |key|
         define_method(key) do
           @game_data&.dig(key)
         end

data/lib/sorare/rewards/version.rb

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

metadata

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