2024-06-06T0416Z

Windows81 · Jun 5, 2024 · 1774484 · 1774484
1 parent 20ab5dc
commit 1774484
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 133 deletions.
diff --git a/GameConfig.toml b/GameConfig.toml
@@ -38,6 +38,50 @@ function(user_code) -- str -> str
 end
 '''
 
+retrieve_avatar_items = '''
+function(user_code) -- str -> [str]
+    return {
+        10726856854,
+        9482991343,
+        9481782649,
+        9120251003,
+        6445262286,
+        6969309778,
+        5731052645,
+        2846257298,
+        121390054,
+        261826995,
+        154386348,
+        201733574,
+        48474294,
+        6340101,
+        192483960,
+        190245296,
+        183808364,
+        34247191,
+    }
+end
+'''
+
+retrieve_body_colors = '''
+function(user_code) -- str -> [str]
+    return {}
+end
+'''
+
+retrieve_avatar_scales = '''
+function(user_code) -- str -> [str]
+    return {
+        Height = 0.5,
+        Width = 0.5,
+        Head = 1.5,
+        Depth = 0.5,
+        Proportion = 1,
+        BodyType = 0,
+    }
+end
+'''
+
 retrieve_username = '''
 function(user_code) -- str -> str
     return user_code

diff --git a/Source/config/structure.py b/Source/config/structure.py
@@ -45,5 +45,7 @@ class server_core(base_types.allocateable):
         retrieve_username: Callable[[str], str]
         retrieve_user_id: Callable[[str], int]
         retrieve_avatar_type: Callable[[str], avatar_type]
+        retrieve_avatar_items: Callable[[str], list[str]]
+        retrieve_avatar_scales: Callable[[str], dict[str, float]]
         retrieve_account_age: Callable[[str], int]
         filter_text: Callable[[str, str], str]
diff --git a/Source/launcher/routines/rcc_server.py b/Source/launcher/routines/rcc_server.py
@@ -1,5 +1,5 @@
 import web_server._logic as web_server_logic
-import web_server as web_serverr
+import web_server as web_server
 
 from . import _logic as logic
 import util.const as const

diff --git a/Source/web_server/endpoints/setup_player.py b/Source/web_server/endpoints/setup_player.py
@@ -336,29 +336,16 @@ def _(self: web_server_handler) -> bool:
         return False
     user_code = user_info.user_code
 
+    resolvedAvatarType, accessoryVersionIds, scales = (
+        self.game_config.server_core.retrieve_avatar_type(user_code),
+        self.game_config.server_core.retrieve_avatar_items(user_code),
+        self.game_config.server_core.retrieve_avatar_scales(user_code),
+    )
+
     json = {
         "animations": {},
-        "resolvedAvatarType": self.game_config.server_core.retrieve_avatar_type(user_code),
-        "accessoryVersionIds": [
-            10726856854,
-            9482991343,
-            9481782649,
-            9120251003,
-            6445262286,
-            6969309778,
-            5731052645,
-            2846257298,
-            121390054,
-            261826995,
-            154386348,
-            201733574,
-            48474294,
-            6340101,
-            192483960,
-            190245296,
-            183808364,
-            34247191,
-        ],
+        "resolvedAvatarType": resolvedAvatarType,
+        "accessoryVersionIds": accessoryVersionIds,
         "equippedGearVersionIds": [],
         "backpackGearVersionIds": [],
         "bodyColors": {
@@ -370,12 +357,12 @@ def _(self: web_server_handler) -> bool:
             "TorsoColor": 1013,
         },
         "scales": {
-            "Height": 1,
-            "Width": 1,
-            "Head": 1,
-            "Depth": 1,
-            "Proportion": 0,
-            "BodyType": 0,
+            "Height": scales['Height'],
+            "Width": scales['Width'],
+            "Head": scales['Head'],
+            "Depth": scales['Depth'],
+            "Proportion": scales['Proportion'],
+            "BodyType": scales['BodyType'],
         },
     }
     self.send_json(json)
@@ -398,99 +385,22 @@ def _(self: web_server_handler) -> bool:
         return False
     user_code = user_info.user_code
 
+    resolvedAvatarType, accessoryVersionIds, scales = (
+        self.game_config.server_core.retrieve_avatar_type(user_code),
+        self.game_config.server_core.retrieve_avatar_items(user_code),
+        self.game_config.server_core.retrieve_avatar_scales(user_code),
+    )
+
     self.send_json({
-        "resolvedAvatarType": self.game_config.server_core.retrieve_avatar_type(user_code),
+        "resolvedAvatarType": resolvedAvatarType,
         "equippedGearVersionIds": [],
         "backpackGearVersionIds": [],
         "assetAndAssetTypeIds": [
             {
-                "assetId": 10726856854,
-                "assetTypeId": 28
-            },
-            {
-                "assetId": 9482991343,
-                "assetTypeId": 71,
-                "meta": {
-                    "order": 3,
-                    "version": 1
-                }
-            },
-            {
-                "assetId": 9481782649,
-                "assetTypeId": 70,
-                "meta": {
-                    "order": 3,
-                    "version": 1
-                }
-            },
-            {
-                "assetId": 9120251003,
-                "assetTypeId": 66,
-                "meta": {
-                    "order": 4,
-                    "version": 1
-                }
-            },
-            {
-                "assetId": 6445262286,
-                "assetTypeId": 30
-            },
-            {
-                "assetId": 6969309778,
-                "assetTypeId": 11
-            },
-            {
-                "assetId": 5731052645,
-                "assetTypeId": 8
-            },
-            {
-                "assetId": 2846257298,
-                "assetTypeId": 8
-            },
-            {
-                "assetId": 121390054,
-                "assetTypeId": 42
-            },
-            {
-                "assetId": 261826995,
-                "assetTypeId": 42
-            },
-            {
-                "assetId": 154386348,
-                "assetTypeId": 12
-            },
-            {
-                "assetId": 201733574,
-                "assetTypeId": 47
-            },
-            {
-                "assetId": 48474294,
-                "assetTypeId": 41,
-                "meta": {
-                    "order": 11,
-                    "version": 1
-                }
-            },
-            {
-                "assetId": 6340101,
-                "assetTypeId": 17
-            },
-            {
-                "assetId": 192483960,
-                "assetTypeId": 47
-            },
-            {
-                "assetId": 190245296,
-                "assetTypeId": 43
-            },
-            {
-                "assetId": 183808364,
-                "assetTypeId": 8
-            },
-            {
-                "assetId": 34247191,
+                "assetId": item,
                 "assetTypeId": 8
             }
+            for item in accessoryVersionIds
         ],
         "animationAssetIds": {
             "run": 2510238627,
@@ -507,12 +417,12 @@ def _(self: web_server_handler) -> bool:
             "leftLegColorId": 1013,
         },
         "scales": {
-            "height": 1,
-            "width": 1,
-            "head": 1,
-            "depth": 1,
-            "proportion": 1,
-            "bodyType": 0.8
+            "height": scales['Height'],
+            "width": scales['Width'],
+            "head": scales['Head'],
+            "depth": scales['Depth'],
+            "proportion": max(scales['Proportion'], 1e-2),
+            "bodyType": max(scales['BodyType'], 1e-2),
         },
         "emotes": [
             {

diff --git a/Source/web_server/endpoints/setup_rcc.py b/Source/web_server/endpoints/setup_rcc.py
@@ -31,22 +31,21 @@ def _(self: web_server_handler) -> bool:
         "universeAvatarCollisionType": "OuterBox",
         "universeAvatarBodyType": "Standard",
         "jointPositioningType": "ArtistIntent",
-        "message": "",
         "universeAvatarMinScales": {
-            "height": 0,
-            "width": 0,
-            "head": 0,
-            "depth": 0,
-            "proportion": 0,
-            "bodyType": 0,
+            "height": -1e17,
+            "width": -1e17,
+            "head": -1e17,
+            "depth": -1e17,
+            "proportion": -1e17,
+            "bodyType": -1e17,
         },
         "universeAvatarMaxScales": {
-            "height": 1e9,
-            "width": 1e9,
-            "head": 1e9,
-            "depth": 1e9,
-            "proportion": 1e9,
-            "bodyType": 1e9,
+            "height": +1e17,
+            "width": +1e17,
+            "head": +1e17,
+            "depth": +1e17,
+            "proportion": +1e17,
+            "bodyType": +1e17,
         },
         "universeAvatarAssetOverrides": [],
         "moderationStatus": None,