@quenty/gameconfig 12.8.0 → 12.9.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/gameconfig@12.8.0...@quenty/gameconfig@12.9.0) (2024-09-12)
+
+
+### Bug Fixes
+
+* GameConfigAsset does not export empty description or name ([1a9de5c](https://github.com/Quenty/NevermoreEngine/commit/1a9de5c899cc7b47aedabacc78006883b4236c95))
+
+
+### Features
+
+* Add additional game config types ([c6fdf4a](https://github.com/Quenty/NevermoreEngine/commit/c6fdf4a34ea26135c6aa16a6a268a966062f4a2f))
+
+
+
+
+
 # [12.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/gameconfig@12.7.1...@quenty/gameconfig@12.8.0) (2024-08-09)
 
 **Note:** Version bump only for package @quenty/gameconfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/gameconfig",
-  "version": "12.8.0",
+  "version": "12.9.0",
   "description": "Configuration service to specify Roblox badges, products, and other specific assets.",
   "keywords": [
     "Roblox",
@@ -27,31 +27,31 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/attributeutils": "^14.4.0",
-    "@quenty/badgeutils": "^10.3.0",
-    "@quenty/baseobject": "^10.3.0",
-    "@quenty/binder": "^14.5.0",
-    "@quenty/brio": "^14.4.0",
-    "@quenty/clienttranslator": "^14.5.0",
-    "@quenty/cmdrservice": "^13.6.0",
-    "@quenty/instanceutils": "^13.4.0",
-    "@quenty/loader": "^10.3.0",
-    "@quenty/maid": "^3.2.0",
-    "@quenty/marketplaceutils": "^11.4.0",
-    "@quenty/observablecollection": "^12.4.0",
-    "@quenty/playerutils": "^8.4.0",
+    "@quenty/attributeutils": "^14.5.0",
+    "@quenty/badgeutils": "^10.4.0",
+    "@quenty/baseobject": "^10.4.0",
+    "@quenty/binder": "^14.6.0",
+    "@quenty/brio": "^14.5.0",
+    "@quenty/clienttranslator": "^14.6.0",
+    "@quenty/cmdrservice": "^13.7.0",
+    "@quenty/instanceutils": "^13.5.0",
+    "@quenty/loader": "^10.4.0",
+    "@quenty/maid": "^3.3.0",
+    "@quenty/marketplaceutils": "^11.5.0",
+    "@quenty/observablecollection": "^12.5.0",
+    "@quenty/playerutils": "^8.5.0",
     "@quenty/preferredparentutils": "^4.2.0",
-    "@quenty/promise": "^10.3.0",
+    "@quenty/promise": "^10.4.0",
     "@quenty/pseudolocalize": "^3.3.0",
-    "@quenty/remotefunctionutils": "^10.3.0",
-    "@quenty/remoting": "^12.5.0",
-    "@quenty/rx": "^13.4.0",
-    "@quenty/rxbinderutils": "^14.5.0",
-    "@quenty/servicebag": "^11.4.0",
-    "@quenty/statestack": "^14.5.0",
+    "@quenty/remotefunctionutils": "^10.4.0",
+    "@quenty/remoting": "^12.6.0",
+    "@quenty/rx": "^13.5.0",
+    "@quenty/rxbinderutils": "^14.6.0",
+    "@quenty/servicebag": "^11.5.0",
+    "@quenty/statestack": "^14.6.0",
     "@quenty/string": "^3.2.0",
     "@quenty/table": "^3.5.0",
-    "@quenty/valueobject": "^13.4.0"
+    "@quenty/valueobject": "^13.5.0"
   },
-  "gitHead": "ba466bdbc05c42fb607cf5e228c16339201d21d7"
+  "gitHead": "fb172906f3ee725269ec1e5f4daf9dca227e729d"
 }

package/src/Client/GameConfigServiceClient.lua

@@ -21,10 +21,12 @@ function GameConfigServiceClient:Init(serviceBag)
 	-- Internal
 	self._serviceBag:GetService(require("GameConfigCommandServiceClient"))
 	self._serviceBag:GetService(require("GameConfigTranslator"))
+	self._serviceBag:GetService(require("GameConfigDataService"))
 	self._binders = self._serviceBag:GetService(require("GameConfigBindersClient"))
 
-	self._configPicker = GameConfigPicker.new(self._binders.GameConfig, self._binders.GameConfigAsset)
-	self._maid:GiveTask(self._configPicker)
+	self._configPicker = self._maid:Add(GameConfigPicker.new(self._binders.GameConfig, self._binders.GameConfigAsset))
+
+	self._serviceBag:GetService(require("GameConfigDataService")):SetConfigPicker(self._configPicker)
 end
 
 function GameConfigServiceClient:Start()

package/src/Server/Cmdr/GameConfigCommandService.lua

@@ -5,7 +5,6 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local MarketplaceService = game:GetService("MarketplaceService")
 local TeleportService = game:GetService("TeleportService")
 
 local GameConfigCmdrUtils = require("GameConfigCmdrUtils")
@@ -65,114 +64,6 @@ function GameConfigCommandService:_registerCommands()
 		return string.format("Awards: %s", table.concat(givenTo, ", "))
 	end)
 
-	self._cmdrService:RegisterCommand({
-		Name = "prompt-product";
-		Description = "Prompts the player to make a product purchase.";
-		Group = "GameConfig";
-		Args = {
-			{
-				Name = "Player";
-				Type = "players";
-				Description = "The player to prompt.";
-			},
-			{
-				Name = "Product";
-				Type = "productId";
-				Description = "The Product to prompt.";
-			},
-		};
-	}, function(_context, players, productId)
-		local givenTo = {}
-
-		for _, player in pairs(players) do
-			MarketplaceService:PromptProductPurchase(player, productId)
-			table.insert(givenTo, string.format("%s prompted purchase of %d", PlayerUtils.formatName(player), productId))
-		end
-
-		return string.format("Prompted: %s", table.concat(givenTo, ", "))
-	end)
-
-	self._cmdrService:RegisterCommand({
-		Name = "prompt-pass";
-		Description = "Prompts the player to make a gamepass purchase.";
-		Group = "GameConfig";
-		Args = {
-			{
-				Name = "Player";
-				Type = "players";
-				Description = "The player to prompt.";
-			},
-			{
-				Name = "GamePass";
-				Type = "passId";
-				Description = "The gamepass to prompt.";
-			},
-		};
-	}, function(_context, players, gamePassId)
-		local givenTo = {}
-
-		for _, player in pairs(players) do
-			MarketplaceService:PromptGamePassPurchase(player, gamePassId)
-			table.insert(givenTo, string.format("%s prompted purchase of %d", PlayerUtils.formatName(player), gamePassId))
-		end
-
-		return string.format("Prompted: %s", table.concat(givenTo, ", "))
-	end)
-
-	self._cmdrService:RegisterCommand({
-		Name = "prompt-asset";
-		Description = "Prompts the player to make an asset purchase.";
-		Group = "GameConfig";
-		Args = {
-			{
-				Name = "Player";
-				Type = "players";
-				Description = "The player to prompt.";
-			},
-			{
-				Name = "Asset";
-				Type = "assetId";
-				Description = "The asset to prompt.";
-			},
-		};
-	}, function(_context, players, assetId)
-		local givenTo = {}
-
-		for _, player in pairs(players) do
-			MarketplaceService:PromptPurchase(player, assetId)
-			table.insert(givenTo, string.format("%s prompted purchase of %d", PlayerUtils.formatName(player), assetId))
-		end
-
-		return string.format("Prompted: %s", table.concat(givenTo, ", "))
-	end)
-
-	self._cmdrService:RegisterCommand({
-		Name = "prompt-bundle";
-		Description = "Prompts the player to make a bundle purchase.";
-		Group = "GameConfig";
-		Args = {
-			{
-				Name = "Player";
-				Type = "players";
-				Description = "The player to prompt.";
-			},
-			{
-				Name = "Bundle";
-				Type = "bundleId";
-				Description = "The asset to prompt.";
-			},
-		};
-	}, function(_context, players, bundleId)
-		local givenTo = {}
-
-		for _, player in pairs(players) do
-			MarketplaceService:PromptBundlePurchase(player, bundleId)
-			table.insert(givenTo, string.format("%s prompted purchase of %d", PlayerUtils.formatName(player), bundleId))
-		end
-
-		return string.format("Prompted: %s", table.concat(givenTo, ", "))
-	end)
-
 	self._cmdrService:RegisterCommand({
 		Name = "goto-named-place";
 		Description = "Teleport to a Roblox place.";

package/src/Server/Config/Asset/GameConfigAsset.lua

@@ -23,7 +23,7 @@ function GameConfigAsset.new(obj, serviceBag)
 		assetType = self:ObserveAssetType();
 		text = self:ObserveCloudName();
 	}):Subscribe(function(state)
-		if state.text then
+		if state.text and state.text ~= "" then
 			local prefix = string.format("assets.%s.%s.name", state.assetType, state.assetKey)
 			self:SetNameTranslationKey(self._translator:ToTranslationKey(prefix, state.text))
 		else
@@ -36,7 +36,7 @@ function GameConfigAsset.new(obj, serviceBag)
 		assetType = self:ObserveAssetType();
 		text = self:ObserveCloudDescription();
 	}):Subscribe(function(state)
-		if state.text then
+		if state.text and state.text ~= "" then
 			local prefix = string.format("assets.%s.%s.description", state.assetType, state.assetKey)
 			self:SetDescriptionTranslationKey(self._translator:ToTranslationKey(prefix, state.text))
 		else

package/src/Server/GameConfigService.lua

@@ -32,14 +32,16 @@ function GameConfigService:Init(serviceBag)
 
 	-- Internal
 	self._serviceBag:GetService(require("GameConfigCommandService"))
+	self._serviceBag:GetService(require("GameConfigDataService"))
 	self._serviceBag:GetService(require("GameConfigTranslator"))
 	self._binders = self._serviceBag:GetService(require("GameConfigBindersServer"))
 
 	-- Setup picker
-	self._configPicker = GameConfigPicker.new(self._binders.GameConfig, self._binders.GameConfigAsset)
-	self._maid:GiveTask(self._configPicker)
+	self._configPicker = self._maid:Add(GameConfigPicker.new(self._binders.GameConfig, self._binders.GameConfigAsset))
 
 	self._getPreferredParent = PreferredParentUtils.createPreferredParentRetriever(ReplicatedStorage, "GameConfigs")
+
+	self._serviceBag:GetService(require("GameConfigDataService")):SetConfigPicker(self._configPicker)
 end
 
 --[=[
@@ -95,6 +97,15 @@ function GameConfigService:AddAsset(assetKey, assetId)
 	self:AddTypedAsset(GameConfigAssetTypes.ASSET, assetKey, assetId)
 end
 
+--[=[
+	Adds a new asset with the key configured to the `assetKey`
+	@param assetKey string -- Key name to use for the asset
+	@param subscriptionId string -- Cloud id
+]=]
+function GameConfigService:AddSubscription(assetKey, subscriptionId)
+	self:AddTypedAsset(GameConfigAssetTypes.SUBSCRIPTION, assetKey, subscriptionId)
+end
+
 --[=[
 	Adds a new bundle with the key configured to the `assetKey`
 	@param assetKey string -- Key name to use for the bundle

package/src/Shared/Config/AssetTypes/GameConfigAssetTypeUtils.lua

@@ -15,6 +15,8 @@ local pluralMap = {
 	[GameConfigAssetTypes.PLACE] = "places";
 	[GameConfigAssetTypes.ASSET] = "assets";
 	[GameConfigAssetTypes.BUNDLE] = "bundles";
+	[GameConfigAssetTypes.SUBSCRIPTION] = "subscriptions";
+	[GameConfigAssetTypes.MEMBERSHIP] = "memberships";
 }
 
 for _, item in pairs(GameConfigAssetTypes) do

package/src/Shared/Config/AssetTypes/GameConfigAssetTypes.lua

@@ -51,4 +51,18 @@ return Table.readonly({
 	@within GameConfigAssetTypes
 ]=]
 	PLACE = "place";
+
+--[=[
+	Specifies the asset is of type subscription
+	@prop SUBSCRIPTION string
+	@within GameConfigAssetTypes
+]=]
+	SUBSCRIPTION = "subscription";
+
+--[=[
+	Specifies the asset is of type membership (Roblox Premium)
+	@prop MEMBERSHIP string
+	@within GameConfigAssetTypes
+]=]
+	MEMBERSHIP = "membership";
 })

package/src/Shared/GameConfigDataService.lua

@@ -0,0 +1,25 @@
+--[=[
+	@class GameConfigDataService
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local GameConfigDataService = {}
+GameConfigDataService.ServiceName = "GameConfigDataService"
+
+function GameConfigDataService:Init(serviceBag)
+	assert(not self._serviceBag, "Already initialized")
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+
+end
+
+function GameConfigDataService:SetConfigPicker(configPicker)
+	self._configPicker = configPicker
+end
+
+function GameConfigDataService:GetConfigPicker()
+	return self._configPicker
+end
+
+return GameConfigDataService