left_analog_stick_capにcombined_press_is_pressedオプションを増やす

splaplapla · Jul 15, 2023 · 3e5a92b · 3e5a92b
1 parent 42c3e01
commit 3e5a92b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/lib/procon_bypass_man/buttons_setting_configuration/layer.rb b/lib/procon_bypass_man/buttons_setting_configuration/layer.rb
@@ -172,7 +172,7 @@ def remap(button, to: )
         end
       end
 
-      def left_analog_stick_cap(cap: nil, if_pressed: nil, force_neutral: nil)
+      def left_analog_stick_cap(cap: nil, if_pressed: nil, force_neutral: nil, combined_press_is_pressed: nil)
         case cap
         when Integer
           # OK
@@ -203,6 +203,15 @@ def left_analog_stick_cap(cap: nil, if_pressed: nil, force_neutral: nil)
           return
         end
 
+        begin
+          if(combined_press_is_pressed = ParamNormalizer::IfPressedAllowsFalsy.new(combined_press_is_pressed).to_value!)
+            hash[:combined_press_is_pressed] = combined_press_is_pressed
+          end
+        rescue ParamNormalizer::UnSupportValueError
+          Kernel.warn "設定ファイルに記述ミスがあります. left_analog_stick_capのcombined_press_is_pressedにはボタンを渡してください."
+          return
+        end
+
         left_analog_stick_caps << hash
       end
 

diff --git a/lib/procon_bypass_man/procon.rb b/lib/procon_bypass_man/procon.rb
@@ -226,6 +226,9 @@ def to_binary(external_input_data: nil)
         config[:force_neutral]&.each do |force_neutral_button|
           user_operation.unpress_button(force_neutral_button)
         end
+        config[:combined_press_is_pressed]&.each do |combined_press_is_pressed|
+          combined_press_is_pressed.each { |button| user_operation.press_button(button) }
+        end
         user_operation.apply_left_analog_stick_cap(cap: config[:cap])
       end
     end

diff --git a/spec/lib/procon_bypass_man/buttons_setting_configuration_spec.rb b/spec/lib/procon_bypass_man/buttons_setting_configuration_spec.rb
@@ -81,6 +81,24 @@
             ])
           end
         end
+        context 'with force_neutral' do
+          let(:setting_content) do
+            <<~EOH
+          version: 1.0
+          setting: |-
+            prefix_keys_for_changing_layer [:zr, :r, :zl, :l]
+            layer :up do
+              left_analog_stick_cap cap: 1000, if_pressed: [:a], force_neutral: [:a], combined_press_is_pressed: [:b]
+            end
+            EOH
+          end
+          it do
+            ProconBypassMan::ButtonsSettingConfiguration::Loader.load(setting_path: setting.path)
+            expect(ProconBypassMan::ButtonsSettingConfiguration.instance.layers[:up].left_analog_stick_caps).to eq([
+              {:cap=>1000, :force_neutral=> [:a], if_pressed: [:a], combined_press_is_pressed: [:b] }
+            ])
+          end
+        end
         context 'provide array' do
           let(:setting_content) do
             <<~EOH