ika3 0.10.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678f52482489cdce0cf5f383be0a707ef771141caa360a81eac01c82d2f5e578
-  data.tar.gz: '02141894247f9d287ef158975443a326d1c562ca6d052433811e8d15b48130c6'
+  metadata.gz: 86383c0eb5f100a657f05f0aaba2ae54e38110b9efe6b21e11163390ad46d880
+  data.tar.gz: d78a670bbd8d884539f268d746cd116a026f6e007066ffadf8d5f336fbd1528f
 SHA512:
-  metadata.gz: 194e709ee64f505679ef08736bcb804a39315d460afdae627dccc61f9d400905136208dd266d6d1656b5534f64783aa46ea48ac40a4e31d457808ca8c3e80884
-  data.tar.gz: 4b9a27feb36570bc3c01e20472d041bc142e6b270d1f085870c0c79df25de55d70fb70a33ace27f90462a3362c653a61245494f4d571a6866d7dc799d42db7d4
+  metadata.gz: d4415279ca2ff1808a3575b052d7adb679b841d276a886031185d8df5d83569a3e3d8ef24e8ed0efec796dd1fbeb2de7fdff3803bd86ffaf4e02b8cd2ae41314
+  data.tar.gz: 0b77f4bce907b88e535a8730cf6e28e7011ac755895c5b6256c482352796e3aa676c5fcd4113297ed578273ec0e7afe48e496172ba4b953e25a5e5ace94e59f8

data/.rubocop.yml

@@ -1,10 +1,14 @@
 require:
   - rubocop-rspec
   - rubocop-rake
+  - rubocop-on-rbs
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
+
+RBS:
+  Enabled: true
 
 Layout/LineLength:
   Exclude:

data/.yamllint.yaml

@@ -0,0 +1,9 @@
+extends: default
+
+rules:
+  document-start: disable
+  comments: disable
+
+ignore:
+  - .gem_rbs_collection/
+  - rbs_collection.lock.yaml

data/Gemfile

@@ -12,5 +12,6 @@ gem 'rubocop', require: false
 gem 'steep'
 gem 'typeprof'
 
+gem 'rubocop-on-rbs', '~> 1.1'
 gem 'rubocop-rake', '~> 0.6.0'
-gem 'rubocop-rspec', '~> 2.29'
+gem 'rubocop-rspec', '~> 3.2'

data/Gemfile.lock

@@ -1,64 +1,66 @@
 PATH
   remote: .
   specs:
-    ika3 (0.10.0)
+    ika3 (1.1.0)
       activesupport (>= 6.0.0)
       faraday (>= 2.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abbrev (0.1.2)
-    activesupport (7.1.3.3)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    csv (3.2.8)
+    csv (3.3.0)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-net_http (3.3.0)
       net-http
-    ffi (1.16.3)
-    fileutils (1.7.2)
-    i18n (1.14.5)
+    ffi (1.17.0-x86_64-linux-gnu)
+    fileutils (1.7.3)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.8.1)
     language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
-    minitest (5.23.0)
-    mutex_m (0.2.0)
-    net-http (0.4.1)
+    logger (1.6.1)
+    minitest (5.25.1)
+    net-http (0.5.0)
       uri
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.4.4)
-      abbrev
+    rbs (3.6.1)
+      logger
     regexp_parser (2.9.2)
-    rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -72,35 +74,29 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
-    rubocop (1.64.1)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
+    rubocop-on-rbs (1.1.0)
+      rbs (~> 3.5)
+      rubocop (~> 1.61)
+      zlib
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.2)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.2.0)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     securerandom (0.3.1)
-    steep (1.6.0)
+    steep (1.8.3)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -111,19 +107,20 @@ GEM
       logger (>= 1.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 3.1.0)
+      rbs (~> 3.6.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
-    strscan (3.0.7)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     typeprof (0.21.11)
       rbs (>= 1.8.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
+    unicode-display_width (2.6.0)
+    uri (1.0.1)
+    zlib (3.1.1)
 
 PLATFORMS
   x86_64-linux
@@ -134,8 +131,9 @@ DEPENDENCIES
   rbs
   rspec (~> 3.13)
   rubocop
+  rubocop-on-rbs (~> 1.1)
   rubocop-rake (~> 0.6.0)
-  rubocop-rspec (~> 2.29)
+  rubocop-rspec (~> 3.2)
   steep
   typeprof
 

data/config/special_weapons.yml

@@ -0,0 +1,56 @@
+big_bubbler: &big_bubbler
+  name: グレートバリア
+
+booyah_bomb: &booyah_bomb
+  name: ナイスダマ
+
+crab_tank: &crab_tank
+  name: カニタンク
+
+ink_storm: &ink_storm
+  name: アメフラシ
+
+ink_vac: &ink_vac
+  name: キューインキ
+
+inkjet: &inkjet
+  name: ジェットパック
+
+killer_wall_5_1: &killer_wall_5_1
+  name: メガホンレーザー5.1ch
+
+kraken_royale: &kraken_royale
+  name: テイオウイカ
+
+reefslider: &reefslider
+  name: サメライド
+
+splattercolor_screen: &splattercolor_screen
+  name: スミナガシート
+
+super_chump: &super_chump
+  name: デコイチラシ
+
+tacticooler: &tacticooler
+  name: エナジースタンド
+
+tenta_missiles: &tenta_missiles
+  name: マルチミサイル
+
+triple_inkstrike: &triple_inkstrike
+  name: トリプルトルネード
+
+triple_splashdown: &triple_splashdown
+  name: ウルトラチャクチ
+
+trizooka: &trizooka
+  name: ウルトラショット
+
+ultra_stamp: &ultra_stamp
+  name: ウルトラハンコ
+
+wave_breaker: &wave_breaker
+  name: ホップソナー
+
+zipcaster: &zipcaster
+  name: ショクワンダー

data/ika3.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = 'Splatoon3 weapons information library. This gem provide weapon name, sub, and special. not official'
   spec.homepage = 'https://github.com/YutaGoto/ika3'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/YutaGoto/ika3'

data/lib/ika3/schedule.rb

@@ -6,7 +6,7 @@ module Ika3
       @contact = contact
     end
 
-    modes = %w[regular bankara_challenge bankara_open x fest]
+    modes = %w[regular bankara_challenge bankara_open x fest fest_challenge]
     schedules = %w[now next]
 
     schedules.each do |schedule|
@@ -28,24 +28,24 @@ module Ika3
           "@salmon_run_#{schedule}", Salmon.new(send_request(:get, "/api/coop-grouping/#{schedule}").body['results'][0])
         )
       end
+    end
 
-      def salmon_run_team_contest
-        return @salmon_run_team_contest unless @salmon_run_team_contest.nil?
+    def salmon_run_team_contest
+      return @salmon_run_team_contest unless @salmon_run_team_contest.nil?
 
-        @salmon_run_team_contest = Salmon.new(
-          send_request(:get, '/api/coop-grouping-team-contest/schedule').body['results'][0]
-        )
-      end
+      @salmon_run_team_contest = Salmon.new(
+        send_request(:get, '/api/coop-grouping-team-contest/schedule').body['results'][0]
+      )
+    end
 
-      def event
-        return @event_match unless @event_match.nil?
+    def event
+      return @event_match unless @event_match.nil?
 
-        @event_match = Battle.new(send_request(:get, '/api/event/schedule').body['results'][0])
-      end
+      @event_match = Battle.new(send_request(:get, '/api/event/schedule').body['results'][0])
     end
 
     class Battle
-      attr_reader :start_time, :end_time, :rule, :stages, :is_fest
+      attr_reader :start_time, :end_time, :rule, :stages, :is_fest, :is_tricolor, :tricolor_stage
 
       def initialize(data)
         @start_time = data&.[]('start_time')
@@ -53,6 +53,8 @@ module Ika3
         @rule = Rule.new(data&.[]('rule'))
         @stages = data&.[]('stages')&.map { |stage| Stage.new(stage) }
         @is_fest = data&.[]('is_fest')
+        @is_tricolor = data&.[]('is_tricolor')
+        @tricolor_stage = Stage.new(data&.[]('tricolor_stage'))
       end
 
       class Stage

data/lib/ika3/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ika3
-  VERSION = '0.10.0'
+  VERSION = '1.1.0'
 end

data/lib/ika3/weapons.rb

@@ -41,12 +41,20 @@ module Ika3
         weapons.map { |weapon| W.new(weapon) }
       end
 
+      def filter_by_special(special_name)
+        raise "unknown special weapon: #{special_name}" unless special_weapons.values.include?(special_name)
+
+        weapons = config.values.filter { |weapon| weapon[:special] == special_name }
+        weapons.map { |weapon| W.new(weapon) }
+      end
+
       def reload_config!
         @cache = {}
         @config = nil
         @sub_weapons = nil
         config
         config_sub_weapons
+        config_special_weapons
       end
 
       private
@@ -75,21 +83,36 @@ module Ika3
         @sub_weapon_hash
       end
 
+      def special_weapons
+        @special_weapon_hash ||= {}
+        if @special_weapon_hash.empty?
+          config_special_weapons.each do |key, value|
+            @special_weapon_hash[key] = value[:name]
+          end
+        end
+        @special_weapon_hash
+      end
+
       def config
-        @config ||= load_yaml_file("#{File.dirname(__FILE__)}/../../config/weapons.yml").deep_symbolize_keys
+        @config ||= load_yaml("#{File.dirname(__FILE__)}/../../config/weapons.yml").deep_symbolize_keys
         @config
       end
 
       def config_sub_weapons
-        @sub_weapons ||= load_yaml_file("#{File.dirname(__FILE__)}/../../config/sub_weapons.yml").deep_symbolize_keys
+        @sub_weapons ||= load_yaml("#{File.dirname(__FILE__)}/../../config/sub_weapons.yml").deep_symbolize_keys
         @sub_weapons
       end
 
+      def config_special_weapons
+        @special_weapons ||= load_yaml("#{File.dirname(__FILE__)}/../../config/special_weapons.yml").deep_symbolize_keys
+        @special_weapons
+      end
+
       def valid?(weapon_key)
         names.include?(weapon_key)
       end
 
-      def load_yaml_file(file)
+      def load_yaml(file)
         YAML.safe_load_file(file, aliases: true)
       end
     end

data/sig/ika3/schedule.rbs

@@ -6,8 +6,8 @@ module Ika3
     @event_match: Battle
 
     def initialize: (String) -> void
-    def salmon_run_team_contest: -> Salmon
-    def event: -> Battle
+    def salmon_run_team_contest: () -> Salmon
+    def event: () -> Battle
 
     private
 
@@ -21,18 +21,20 @@ module Ika3
       @end_time: untyped
       @rule: Rule
       @stages: Array[Stage]
-      @is_fest: untyped
+      @is_fest: bool
+      @is_tricolor: bool
+      @tricolor_stage: Stage?
       def initialize: (Hash[untyped, untyped] data) -> void
 
       class Stage
         @id: untyped
         @name: String
-        @image: untyped
+        @image: String
         def initialize: (Hash[untyped, untyped] data) -> void
       end
 
       class Rule
-        @name: untyped
+        @name: String
         @key: untyped
         def initialize: (Hash[untyped, untyped] data) -> void
       end
@@ -43,7 +45,7 @@ module Ika3
       @end_time: untyped
       @stage: Stage
       @weapons: Array[Weapon]
-      @boss: untyped
+      @boss: Boss?
       def initialize: (Hash[untyped, untyped] data) -> void
 
       class Stage
@@ -59,8 +61,8 @@ module Ika3
       end
 
       class Boss
+        @id: String
         @name: String
-        @image: String
         def initialize: (Hash[untyped, untyped] data) -> void
       end
     end

data/sig/ika3/weapon.rbs

@@ -5,18 +5,23 @@ module Ika3
     self.@weapon_hash: Hash[untyped, untyped]
     self.@sub_weapon_hash: Hash[untyped, untyped]
     self.@sub_weapons: untyped
+    self.@special_weapon_hash: Hash[untyped, untyped]
+    self.@special_weapons: untyped
 
     def self.find: (Symbol weapon_key) -> W
     def self.find_by_name: (String weapon_name) -> W
     def self.filter_by_sub: (String sub_name) -> Array[W]
-    def self.reload_config!: -> nil
-    def self.names: -> Array[Symbol]
-    def self.weapons: -> Hash[untyped, untyped]
-    def self.sub_weapons: -> Hash[untyped, untyped]
-    def self.config: -> untyped
-    def self.config_sub_weapons: -> untyped
+    def self.filter_by_special: (String special_name) -> Array[W]
+    def self.reload_config!: () -> nil
+    def self.names: () -> Array[Symbol]
+    def self.weapons: () -> Hash[untyped, untyped]
+    def self.sub_weapons: () -> Hash[untyped, untyped]
+    def self.special_weapons: () -> Hash[untyped, untyped]
+    def self.config: () -> untyped
+    def self.config_sub_weapons: () -> untyped
+    def self.config_special_weapons: () -> untyped
     def self.valid?: (Symbol weapon_key) -> bool
-    def self.load_yaml_file: (String file) -> untyped
+    def self.load_yaml: (String file) -> untyped
 
     class W
       @name: String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ika3
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.1.0
 platform: ruby
 authors:
 - YutaGoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-01 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,12 +50,14 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".vscode/settings.json"
+- ".yamllint.yaml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - Steepfile
+- config/special_weapons.yml
 - config/sub_weapons.yml
 - config/weapons.yml
 - ika3.gemspec
@@ -86,14 +88,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Splatoon3 weapons information library.