@quenty/scoredactionservice 6.2.1-canary.256.edbbcfc.0 → 7.0.0

package/CHANGELOG.md

@@ -3,7 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [6.2.1-canary.256.edbbcfc.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/scoredactionservice@6.2.0...@quenty/scoredactionservice@6.2.1-canary.256.edbbcfc.0) (2022-03-27)
+# [7.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/scoredactionservice@6.3.0...@quenty/scoredactionservice@7.0.0) (2022-05-21)
+
+
+### Bug Fixes
+
+* Upgrade ScoredActionService to handle input keybindings changing ([e2a38e4](https://github.com/Quenty/NevermoreEngine/commit/e2a38e4d4103e1f39c4bfa28c77848c9b08a6723))
+
+
+
+
+
+# [6.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/scoredactionservice@6.2.0...@quenty/scoredactionservice@6.3.0) (2022-03-27)
 
 **Note:** Version bump only for package @quenty/scoredactionservice
 

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2021 Quenty
+Copyright (c) 2014-2022 Quenty
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/scoredactionservice",
-  "version": "6.2.1-canary.256.edbbcfc.0",
+  "version": "7.0.0",
   "description": "Scores actions and picks the highest rated one every frame",
   "keywords": [
     "Roblox",
@@ -26,20 +26,20 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "4.1.1-canary.256.edbbcfc.0",
-    "@quenty/brio": "5.1.1-canary.256.edbbcfc.0",
-    "@quenty/inputkeymaputils": "4.2.1-canary.256.edbbcfc.0",
-    "@quenty/inputmode": "4.1.1-canary.256.edbbcfc.0",
-    "@quenty/loader": "4.0.1-canary.256.edbbcfc.0",
-    "@quenty/maid": "2.2.1-canary.256.edbbcfc.0",
-    "@quenty/rx": "4.1.1-canary.256.edbbcfc.0",
-    "@quenty/signal": "2.1.1-canary.256.edbbcfc.0",
-    "@quenty/statestack": "5.2.1-canary.256.edbbcfc.0",
-    "@quenty/table": "2.1.2-canary.256.edbbcfc.0",
-    "@quenty/valueobject": "4.1.1-canary.256.edbbcfc.0"
+    "@quenty/baseobject": "^5.0.0",
+    "@quenty/brio": "^6.0.0",
+    "@quenty/inputkeymaputils": "^5.0.0",
+    "@quenty/inputmode": "^5.0.0",
+    "@quenty/loader": "^5.0.0",
+    "@quenty/maid": "^2.3.0",
+    "@quenty/rx": "^5.0.0",
+    "@quenty/signal": "^2.2.0",
+    "@quenty/statestack": "^6.0.0",
+    "@quenty/table": "^3.0.0",
+    "@quenty/valueobject": "^5.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "edbbcfc38516772a791d50dc43cd6b304ffc4aff"
+  "gitHead": "9f7eaea7543c33c89d2e32c38491b13f9271f4f7"
 }

package/src/Client/InputList/InputListScoreHelper.lua

@@ -6,9 +6,9 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local InputKeyMapUtils = require("InputKeyMapUtils")
-local InputModeSelector = require("InputModeSelector")
+local InputKeyMapList = require("InputKeyMapList")
 local Set = require("Set")
+local Rx = require("Rx")
 
 local InputListScoreHelper = setmetatable({}, BaseObject)
 InputListScoreHelper.ClassName = "InputListScoreHelper"
@@ -21,15 +21,21 @@ function InputListScoreHelper.new(provider, scoredAction, inputKeyMapList)
 	self._scoredAction = assert(scoredAction, "No scoredAction")
 	self._inputKeyMapList = assert(inputKeyMapList, "No inputKeyMapList")
 
-	self._currentTypes = {}
+	assert(InputKeyMapList.isInputKeyMapList(inputKeyMapList), "Bad inputKeyMapList")
 
-	self._modeSelector = InputModeSelector.new(InputKeyMapUtils.getInputModes(inputKeyMapList))
-	self._maid:GiveTask(self._modeSelector)
+	self._currentTypes = {}
 
-	self._maid:GiveTask(self._modeSelector.Changed:Connect(function()
-		self:_handleModeChanged()
+	self._maid:GiveTask(self._inputKeyMapList:ObserveActiveInputKeyMap():Pipe({
+		Rx.switchMap(function(activeInputKeyMap)
+			if activeInputKeyMap then
+				return activeInputKeyMap:ObserveInputTypesList()
+			else
+				return Rx.of({})
+			end
+		end)
+	}):Subscribe(function(inputTypeList)
+		self:_updateInputTypeSet(inputTypeList)
 	end))
-	self:_handleModeChanged()
 
 	self._maid:GiveTask(function()
 		local current, _ = next(self._currentTypes)
@@ -45,14 +51,11 @@ function InputListScoreHelper.new(provider, scoredAction, inputKeyMapList)
 	return self
 end
 
-function InputListScoreHelper:_handleModeChanged()
-	local currentMode = self._modeSelector:GetActiveMode()
-	local inputTypeSet = InputKeyMapUtils.getInputTypeSetForMode(self._inputKeyMapList, currentMode)
-
+function InputListScoreHelper:_updateInputTypeSet(inputTypeList)
 	local remaining = Set.copy(self._currentTypes)
 
 	-- Register inputTypes
-	for inputType, _ in pairs(inputTypeSet) do
+	for _, inputType in pairs(inputTypeList) do
 		if not self._currentTypes[inputType] then
 			self._currentTypes[inputType] = true
 
@@ -70,8 +73,6 @@ function InputListScoreHelper:_handleModeChanged()
 	for inputType, _ in pairs(remaining) do
 		self:_unregisterAction(inputType)
 	end
-
-	self._currentTypes = inputTypeSet
 end
 
 function InputListScoreHelper:_unregisterAction(inputType)

package/src/Client/Picker/ScoredActionPicker.lua

@@ -81,6 +81,7 @@ function ScoredActionPicker:AddAction(action)
 	assert(type(action) == "table", "Bad action")
 
 	self._actionSet[action] = true
+	self:Update()
 end
 
 function ScoredActionPicker:RemoveAction(action)
@@ -91,6 +92,7 @@ function ScoredActionPicker:RemoveAction(action)
 	end
 
 	self._actionSet[action] = nil
+	self:Update()
 end
 
 function ScoredActionPicker:HasActions()

package/src/Client/Picker/ScoredActionPickerProvider.lua

@@ -8,7 +8,7 @@ local BaseObject = require("BaseObject")
 local ScoredActionPicker = require("ScoredActionPicker")
 local Table = require("Table")
 local TouchButtonScoredActionPicker = require("TouchButtonScoredActionPicker")
-local InputKeyMapUtils = require("InputKeyMapUtils")
+local InputTypeUtils = require("InputTypeUtils")
 
 local MAX_ACTION_LIST_SIZE_BEFORE_WARN = 25
 
@@ -25,14 +25,14 @@ function ScoredActionPickerProvider.new()
 end
 
 function ScoredActionPickerProvider:FindPicker(inputType)
-	local key = InputKeyMapUtils.getUniqueKeyForInputType(inputType)
+	local key = InputTypeUtils.getUniqueKeyForInputType(inputType)
 	return self._scoredActionPickers[key]
 end
 
 --inputType is most likely an enum, but could be a string!
 function ScoredActionPickerProvider:GetOrCreatePicker(inputType)
 	assert(inputType, "Bad inputType")
-	local key = InputKeyMapUtils.getUniqueKeyForInputType(inputType)
+	local key = InputTypeUtils.getUniqueKeyForInputType(inputType)
 
 	if self._scoredActionPickers[key] then
 		return self._scoredActionPickers[key]

package/src/Client/ScoredActionService.lua

@@ -14,6 +14,7 @@ local ScoredActionPickerProvider = require("ScoredActionPickerProvider")
 local Maid = require("Maid")
 local InputListScoreHelper = require("InputListScoreHelper")
 local Observable = require("Observable")
+local InputKeyMapList = require("InputKeyMapList")
 
 local ScoredActionService = {}
 
@@ -46,7 +47,7 @@ end
 	@return ScoredAction
 ]=]
 function ScoredActionService:GetScoredAction(inputKeyMapList)
-	assert(type(inputKeyMapList) == "table", "Bad inputKeyMapList")
+	assert(InputKeyMapList.isInputKeyMapList(inputKeyMapList), "Bad inputKeyMapList")
 	assert(self._provider, "Not initialized")
 
 	local scoredAction = ScoredAction.new()