From 35fb4381ed9ae278623939629b9d2c330953b2d1 Mon Sep 17 00:00:00 2001 From: hyperion51 Date: Sun, 3 May 2020 00:36:47 +0100 Subject: [PATCH] Production/Demand Profiles and Blueprint Resource Requirements Added the ability to associate blueprints and compound commodities with personality attributes Added the ability to restrict blueprints according to the presence of resources, for resource harvesting infrastructure Improved the properties panel UI for Sector and Tech tabs --- Assets/Prefabs/Descendant.prefab | 10 +- Assets/Prefabs/Prerequisite.prefab | 10 +- Assets/Prefabs/Requirement.prefab | 10 +- Assets/Prefabs/Resource.prefab | 18 +- Assets/Resources/Sprites/Flat UI/DotRight.png | 3 + .../Sprites/Flat UI/DotRight.png.meta | 88 +++ .../Resources/Sprites/Flat UI/areaFade1.png | 3 + .../Sprites/Flat UI/areaFade1.png.meta | 88 +++ Assets/Scenes/Main.unity | 724 ++++++++++++------ Assets/Scripts/Editor/DatabaseInspector.cs | 27 +- Assets/Scripts/ServerShared/BlueprintData.cs | 12 +- Assets/Scripts/ServerShared/DatabaseItems.cs | 1 + Assets/Scripts/ServerShared/Enums.cs | 3 +- Assets/Scripts/ServerShared/Extensions.cs | 2 +- Assets/Scripts/ServerShared/ItemData.cs | 27 +- Assets/Scripts/ServerShared/ZoneGenerator.cs | 6 +- 16 files changed, 769 insertions(+), 263 deletions(-) create mode 100644 Assets/Resources/Sprites/Flat UI/DotRight.png create mode 100644 Assets/Resources/Sprites/Flat UI/DotRight.png.meta create mode 100644 Assets/Resources/Sprites/Flat UI/areaFade1.png create mode 100644 Assets/Resources/Sprites/Flat UI/areaFade1.png.meta diff --git a/Assets/Prefabs/Descendant.prefab b/Assets/Prefabs/Descendant.prefab index 92426db0a..e1d30ad23 100644 --- a/Assets/Prefabs/Descendant.prefab +++ b/Assets/Prefabs/Descendant.prefab @@ -92,8 +92,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -109,7 +109,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -138,7 +138,7 @@ MonoBehaviour: spaceCount: 1 wordCount: 2 linkCount: 0 - lineCount: 1 + lineCount: 8 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 @@ -209,7 +209,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 diff --git a/Assets/Prefabs/Prerequisite.prefab b/Assets/Prefabs/Prerequisite.prefab index 3bc1b9297..2beea6c1b 100644 --- a/Assets/Prefabs/Prerequisite.prefab +++ b/Assets/Prefabs/Prerequisite.prefab @@ -53,7 +53,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -149,8 +149,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -166,7 +166,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -195,7 +195,7 @@ MonoBehaviour: spaceCount: 1 wordCount: 2 linkCount: 0 - lineCount: 1 + lineCount: 6 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 diff --git a/Assets/Prefabs/Requirement.prefab b/Assets/Prefabs/Requirement.prefab index d3bdacf01..dd0cf7295 100644 --- a/Assets/Prefabs/Requirement.prefab +++ b/Assets/Prefabs/Requirement.prefab @@ -53,7 +53,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -149,8 +149,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -166,7 +166,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -195,7 +195,7 @@ MonoBehaviour: spaceCount: 1 wordCount: 2 linkCount: 0 - lineCount: 1 + lineCount: 6 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 diff --git a/Assets/Prefabs/Resource.prefab b/Assets/Prefabs/Resource.prefab index 085634abf..b70e9ef6e 100644 --- a/Assets/Prefabs/Resource.prefab +++ b/Assets/Prefabs/Resource.prefab @@ -55,7 +55,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -165,8 +165,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -182,7 +182,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -211,7 +211,7 @@ MonoBehaviour: spaceCount: 0 wordCount: 1 linkCount: 0 - lineCount: 1 + lineCount: 5 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 @@ -321,8 +321,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -338,7 +338,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -367,7 +367,7 @@ MonoBehaviour: spaceCount: 0 wordCount: 1 linkCount: 0 - lineCount: 1 + lineCount: 9 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 diff --git a/Assets/Resources/Sprites/Flat UI/DotRight.png b/Assets/Resources/Sprites/Flat UI/DotRight.png new file mode 100644 index 000000000..6d5fbe007 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/DotRight.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e6b8f16dc432049b5111c4bb5d172f069df0c9566b63efd0d7aa8c81570db29 +size 1847 diff --git a/Assets/Resources/Sprites/Flat UI/DotRight.png.meta b/Assets/Resources/Sprites/Flat UI/DotRight.png.meta new file mode 100644 index 000000000..995fed29a --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/DotRight.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7b21eb9dd8a2f07468305b1e3fd4497f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 437c59f5a03717844a1c0b681279dd2b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Flat UI/areaFade1.png b/Assets/Resources/Sprites/Flat UI/areaFade1.png new file mode 100644 index 000000000..e35b65653 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/areaFade1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83e12563a1a2a19cf91b6d9763cfce3b4aace48076f0c114ab7575766ce62f05 +size 2124 diff --git a/Assets/Resources/Sprites/Flat UI/areaFade1.png.meta b/Assets/Resources/Sprites/Flat UI/areaFade1.png.meta new file mode 100644 index 000000000..bd6e0fff0 --- /dev/null +++ b/Assets/Resources/Sprites/Flat UI/areaFade1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e63fd14753d0f4943a54d9c382aa8cb1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 367844c269e9ed84899b0706b8b83dd6 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 21384811a..e406f4792 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -210,6 +210,99 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5433412} m_CullTransparentMesh: 0 +--- !u!1 &10293011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 10293012} + - component: {fileID: 10293015} + - component: {fileID: 10293014} + - component: {fileID: 10293013} + m_Layer: 5 + m_Name: Border (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &10293012 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10293011} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1100864543} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -2} + m_SizeDelta: {x: 0, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &10293013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10293011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &10293014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10293011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b21eb9dd8a2f07468305b1e3fd4497f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &10293015 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10293011} + m_CullTransparentMesh: 0 --- !u!1 &16331343 GameObject: m_ObjectHideFlags: 0 @@ -246,7 +339,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 64} + m_SizeDelta: {x: 0, y: 32} m_Pivot: {x: 0.5, y: 1} --- !u!114 &16331345 MonoBehaviour: @@ -315,8 +408,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2033,8 +2126,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2141,7 +2234,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 64} + m_SizeDelta: {x: 0, y: 32} m_Pivot: {x: 0.5, y: 1} --- !u!114 &120681470 MonoBehaviour: @@ -2210,8 +2303,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6896,8 +6989,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -7916,6 +8009,99 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 383946923} m_CullTransparentMesh: 0 +--- !u!1 &388675426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 388675427} + - component: {fileID: 388675430} + - component: {fileID: 388675429} + - component: {fileID: 388675428} + m_Layer: 5 + m_Name: Border (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &388675427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388675426} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1100864543} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &388675428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388675426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &388675429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388675426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b21eb9dd8a2f07468305b1e3fd4497f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &388675430 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388675426} + m_CullTransparentMesh: 0 --- !u!1 &391111913 GameObject: m_ObjectHideFlags: 0 @@ -8012,6 +8198,99 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &398104346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 398104347} + - component: {fileID: 398104350} + - component: {fileID: 398104349} + - component: {fileID: 398104348} + m_Layer: 5 + m_Name: Border (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &398104347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398104346} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 944413849} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -2} + m_SizeDelta: {x: 0, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &398104348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398104346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &398104349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398104346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b21eb9dd8a2f07468305b1e3fd4497f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &398104350 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398104346} + m_CullTransparentMesh: 0 --- !u!1 &405425992 GameObject: m_ObjectHideFlags: 0 @@ -9593,8 +9872,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -9856,8 +10135,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -685.56323} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -304.71} + m_SizeDelta: {x: 402, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &492949799 MonoBehaviour: @@ -9875,7 +10154,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -10159,8 +10438,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -12856,8 +13135,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -509.5632} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -216.70999} + m_SizeDelta: {x: 402, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617986821 MonoBehaviour: @@ -12875,7 +13154,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -14841,8 +15120,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -405.5632} - m_SizeDelta: {x: 486, y: 96} + m_AnchoredPosition: {x: 217, y: -140.70999} + m_SizeDelta: {x: 402, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &657406464 MonoBehaviour: @@ -16004,10 +16283,10 @@ RectTransform: m_Father: {fileID: 1976065145} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 960, y: -50} + m_SizeDelta: {x: 1920, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &712526291 MonoBehaviour: @@ -16282,8 +16561,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -16971,10 +17250,10 @@ RectTransform: m_Father: {fileID: 1550918579} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -102} - m_SizeDelta: {x: 1920, y: 4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &748718815 MonoBehaviour: @@ -17481,8 +17760,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -1037.5632} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -500.71} + m_SizeDelta: {x: 402, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &782819948 MonoBehaviour: @@ -17499,7 +17778,7 @@ MonoBehaviour: m_Padding: m_Left: 32 m_Right: 0 - m_Top: 64 + m_Top: 40 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -17897,8 +18176,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -861.56323} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -400.71} + m_SizeDelta: {x: 402, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &794909162 MonoBehaviour: @@ -17916,7 +18195,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -18898,8 +19177,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -19220,12 +19499,12 @@ RectTransform: - {fileID: 483379739} - {fileID: 2130830626} m_Father: {fileID: 944413849} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -741.5103} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 169, y: -241.70999} + m_SizeDelta: {x: 306, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &872134619 MonoBehaviour: @@ -19243,7 +19522,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -20963,18 +21242,19 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1783154572} - {fileID: 1572621766} - {fileID: 1398840573} - {fileID: 872134618} - {fileID: 1470234924} + - {fileID: 1128251384} + - {fileID: 398104347} m_Father: {fileID: 1756091993} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -673.1553} - m_SizeDelta: {x: 550, y: 1346.3105} + m_AnchoredPosition: {x: 225, y: -438.05328} + m_SizeDelta: {x: 450, y: 876.10657} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &944413850 MonoBehaviour: @@ -20994,7 +21274,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9c0448268add8f744b1c3575e1f697a3, type: 3} + m_Sprite: {fileID: 21300000, guid: e63fd14753d0f4943a54d9c382aa8cb1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21024,12 +21304,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 32 - m_Right: 32 - m_Top: 0 + m_Left: 16 + m_Right: 128 + m_Top: 32 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 24 + m_ChildAlignment: 0 + m_Spacing: 12 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -21686,14 +21966,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 513 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -21884,10 +22164,10 @@ RectTransform: m_Father: {fileID: 1976065145} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 960, y: -102} + m_SizeDelta: {x: 1920, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &976097621 MonoBehaviour: @@ -23104,8 +23384,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -293.20822} - m_SizeDelta: {x: 486, y: 80.71} + m_AnchoredPosition: {x: 217, y: -40.355} + m_SizeDelta: {x: 402, y: 80.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1043118225 MonoBehaviour: @@ -23181,7 +23461,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 513 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -24945,13 +25225,15 @@ RectTransform: - {fileID: 794909161} - {fileID: 2121720103} - {fileID: 782819947} + - {fileID: 388675427} + - {fileID: 10293012} m_Father: {fileID: 1854478100} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -661.2082} - m_SizeDelta: {x: 550, y: 1322.4164} + m_AnchoredPosition: {x: 225, y: -438.0533} + m_SizeDelta: {x: 450, y: 876.1066} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1100864544 MonoBehaviour: @@ -25001,12 +25283,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 32 + m_Left: 16 m_Right: 32 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 24 + m_ChildAlignment: 0 + m_Spacing: 12 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -25877,6 +26159,99 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1128251383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1128251384} + - component: {fileID: 1128251387} + - component: {fileID: 1128251386} + - component: {fileID: 1128251385} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1128251384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128251383} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 944413849} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1128251385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128251383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1128251386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128251383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b21eb9dd8a2f07468305b1e3fd4497f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1128251387 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128251383} + m_CullTransparentMesh: 0 --- !u!1 &1134320926 GameObject: m_ObjectHideFlags: 0 @@ -26255,8 +26630,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -26942,10 +27317,10 @@ RectTransform: m_Father: {fileID: 1550918579} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -50} - m_SizeDelta: {x: 1920, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1196779006 MonoBehaviour: @@ -30410,7 +30785,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 960, y: -50} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 421.64, y: 80.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1359052236 MonoBehaviour: @@ -30581,7 +30956,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 64} + m_SizeDelta: {x: 0, y: 32} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1363173081 MonoBehaviour: @@ -30650,8 +31025,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -31679,12 +32054,12 @@ RectTransform: m_Children: - {fileID: 1709420493} m_Father: {fileID: 944413849} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -637.5103} - m_SizeDelta: {x: 486, y: 96} + m_AnchoredPosition: {x: 169, y: -165.70999} + m_SizeDelta: {x: 306, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1398840574 MonoBehaviour: @@ -33329,8 +33704,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -597.56323} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -260.71} + m_SizeDelta: {x: 402, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1458454481 MonoBehaviour: @@ -33348,7 +33723,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 64 + m_PreferredHeight: 32 m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -33481,12 +33856,12 @@ RectTransform: m_Children: - {fileID: 1363173080} m_Father: {fileID: 944413849} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -829.5103} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 169, y: -285.71} + m_SizeDelta: {x: 306, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1470234925 MonoBehaviour: @@ -33503,7 +33878,7 @@ MonoBehaviour: m_Padding: m_Left: 32 m_Right: 0 - m_Top: 64 + m_Top: 40 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -33615,8 +33990,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -35206,7 +35581,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1550918579 RectTransform: m_ObjectHideFlags: 0 @@ -35763,12 +36138,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 944413849} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -525.1553} - m_SizeDelta: {x: 486, y: 80.71} + m_AnchoredPosition: {x: 169, y: -68.854996} + m_SizeDelta: {x: 306, y: 73.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1572621767 MonoBehaviour: @@ -35837,14 +36212,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 72 + m_fontSize: 65.75 m_fontSizeBase: 42 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 513 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -38926,7 +39301,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Planet Name is long and just keeps going + m_text: Kreacher's Comfort m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9dcd07b95faae7641a3ff6fccab43c32, type: 2} m_sharedMaterial: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32, @@ -38955,14 +39330,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 513 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -38996,12 +39371,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 1709420494} - characterCount: 40 + characterCount: 18 spriteCount: 0 - spaceCount: 7 - wordCount: 8 + spaceCount: 1 + wordCount: 2 linkCount: 0 - lineCount: 2 + lineCount: 1 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 @@ -39563,8 +39938,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -40482,10 +40857,10 @@ RectTransform: m_Father: {fileID: 1976065145} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 960, y: -542.0533} + m_SizeDelta: {x: 1920, y: 876.10657} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1756091994 MonoBehaviour: @@ -40504,7 +40879,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -41216,99 +41591,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 m_ChildControlHeight: 1 ---- !u!1 &1783154571 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1783154572} - - component: {fileID: 1783154575} - - component: {fileID: 1783154574} - - component: {fileID: 1783154573} - m_Layer: 5 - m_Name: Right Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1783154572 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783154571} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 944413849} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2, y: 0} - m_SizeDelta: {x: 4, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1783154573 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783154571} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1783154574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783154571} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ea8a1213adadb5a4fba6b1785033a34b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1783154575 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783154571} - m_CullTransparentMesh: 0 --- !u!1 &1786262497 GameObject: m_ObjectHideFlags: 0 @@ -43471,10 +43753,10 @@ RectTransform: m_Father: {fileID: 1550918579} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -678.6848} - m_SizeDelta: {x: 1920, y: 1149.3696} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1854478101 MonoBehaviour: @@ -46483,7 +46765,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1976065145 RectTransform: m_ObjectHideFlags: 0 @@ -46901,7 +47183,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 64} + m_SizeDelta: {x: 0, y: 32} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1990061012 MonoBehaviour: @@ -46970,8 +47252,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -47536,8 +47818,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -773.56323} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -352.71} + m_SizeDelta: {x: 402, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2027876402 MonoBehaviour: @@ -47554,7 +47836,7 @@ MonoBehaviour: m_Padding: m_Left: 32 m_Right: 0 - m_Top: 64 + m_Top: 40 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -48425,7 +48707,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 960, y: -50} - m_SizeDelta: {x: 421.64, y: 80.71} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2058362536 MonoBehaviour: @@ -49152,8 +49434,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -949.56323} - m_SizeDelta: {x: 486, y: 64} + m_AnchoredPosition: {x: 217, y: -448.71} + m_SizeDelta: {x: 402, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2121720104 MonoBehaviour: @@ -49170,7 +49452,7 @@ MonoBehaviour: m_Padding: m_Left: 32 m_Right: 0 - m_Top: 64 + m_Top: 40 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -49282,8 +49564,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Scripts/Editor/DatabaseInspector.cs b/Assets/Scripts/Editor/DatabaseInspector.cs index a7f150346..44a235534 100644 --- a/Assets/Scripts/Editor/DatabaseInspector.cs +++ b/Assets/Scripts/Editor/DatabaseInspector.cs @@ -206,7 +206,7 @@ public class DatabaseInspector : EditorWindow else if (type == typeof(Dictionary)) { var dict = (Dictionary) field.GetValue(obj); - Inspect(field.Name.SplitCamelCase(), ref dict); + Inspect(field.Name.SplitCamelCase(), ref dict, link.EntryType); } else if (type == typeof(List)) { @@ -685,7 +685,7 @@ public class DatabaseInspector : EditorWindow } } - public void Inspect(string label, ref Dictionary value) + public void Inspect(string label, ref Dictionary value, Type referenceType) { Space(); LabelField(label, EditorStyles.boldLabel); @@ -703,7 +703,17 @@ public class DatabaseInspector : EditorWindow { using (var h = new HorizontalScope(_list.ListItemStyle)) { - GUILayout.Label(DatabaseCache.Get(ingredient.Key).ID.ToString()); + var entry = DatabaseCache.Get(ingredient.Key); + if (entry == null) + { + value.Remove(ingredient.Key); + GUI.changed = true; + return; + } + + if(entry is INamedEntry named) + GUILayout.Label(named.EntryName); + else GUILayout.Label(entry.ID.ToString()); value[ingredient.Key] = DelayedFloatField(value[ingredient.Key], GUILayout.Width(50)); var rect = GetControlRect(false, GUILayout.Width(EditorGUIUtility.singleLineHeight)); @@ -715,15 +725,18 @@ public class DatabaseInspector : EditorWindow if (v.rect.Contains(Event.current.mousePosition)) { + var dragData = DragAndDrop.GetGenericData("Item"); + var isId = dragData is Guid guid; + var dragEntry = isId ? DatabaseCache.Get(guid) : null; + var correctType = referenceType.IsInstanceOfType(dragEntry); if(Event.current.type == EventType.DragUpdated) - DragAndDrop.visualMode = DragAndDropVisualMode.Copy; + DragAndDrop.visualMode = correctType ? DragAndDropVisualMode.Copy : DragAndDropVisualMode.Rejected; else if(Event.current.type == EventType.DragPerform) { - var guid = DragAndDrop.GetGenericData("Item"); - if (guid is Guid) + if (isId && correctType) { DragAndDrop.AcceptDrag(); - value[(Guid) guid] = 1; + value[guid] = 1; GUI.changed = true; } } diff --git a/Assets/Scripts/ServerShared/BlueprintData.cs b/Assets/Scripts/ServerShared/BlueprintData.cs index 739839138..a2ed779bf 100644 --- a/Assets/Scripts/ServerShared/BlueprintData.cs +++ b/Assets/Scripts/ServerShared/BlueprintData.cs @@ -50,6 +50,12 @@ public class BlueprintData : DatabaseEntry, INamedEntry [InspectableDatabaseLink(typeof(CraftedItemData)), JsonProperty("factoryItem"), Key(14)] public Guid FactoryItem; + + [InspectableDatabaseLink(typeof(SimpleCommodityData)), JsonProperty("resourceRequirements"), Key(15)] + public Dictionary ResourceRequirements = new Dictionary(); + + [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("productionProfile"), Key(16)] + public Dictionary ProductionProfile = new Dictionary(); [IgnoreMember] public string EntryName { @@ -64,16 +70,16 @@ public class BlueprintStatEffect [InspectableField, JsonProperty("ingredient"), Key(1)] public Guid Ingredient; - [InspectableField, JsonProperty("stat"), Key(2)] + [InspectableField, JsonProperty("stat"), Key(2)] public StatReference StatReference = new StatReference(); } [InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class StatReference { - [InspectableType(typeof(IBehaviorData)), JsonProperty("behavior"), Key(1)] + [InspectableType(typeof(IBehaviorData)), JsonProperty("behavior"), Key(1)] public string Behavior; - [InspectableField, JsonProperty("stat"), Key(2)] + [InspectableField, JsonProperty("stat"), Key(2)] public string Stat; } diff --git a/Assets/Scripts/ServerShared/DatabaseItems.cs b/Assets/Scripts/ServerShared/DatabaseItems.cs index a71a11ac3..5565f4784 100644 --- a/Assets/Scripts/ServerShared/DatabaseItems.cs +++ b/Assets/Scripts/ServerShared/DatabaseItems.cs @@ -35,6 +35,7 @@ public interface INamedEntry Union(14, typeof(StationData)), Union(15, typeof(OrbitData)), Union(16, typeof(PlanetData)), + Union(17, typeof(PersonalityAttribute)), // Union(17, typeof(ShipData)), JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter))] //[Union(21, typeof(ContractData))] diff --git a/Assets/Scripts/ServerShared/Enums.cs b/Assets/Scripts/ServerShared/Enums.cs index 934998fbf..e135476ed 100644 --- a/Assets/Scripts/ServerShared/Enums.cs +++ b/Assets/Scripts/ServerShared/Enums.cs @@ -21,7 +21,8 @@ public enum HardpointType Energy, Ballistic, Launcher, - Infrastructure + Infrastructure, + ControlModule } public enum DamageType diff --git a/Assets/Scripts/ServerShared/Extensions.cs b/Assets/Scripts/ServerShared/Extensions.cs index 0d6b36fb8..93c81d85a 100644 --- a/Assets/Scripts/ServerShared/Extensions.cs +++ b/Assets/Scripts/ServerShared/Extensions.cs @@ -70,7 +70,7 @@ public static class Extensions private static Random Random => (Random) (_random ?? (_random = new Random((uint) (DateTime.Now.Ticks%uint.MaxValue)))); // public static T RandomElement(this IEnumerable enumerable) => enumerable.ElementAt(Random.NextInt(0, enumerable.Count())); public static float NextUnbounded(this ref Random random) => 1 / (1 - random.NextFloat()) - 1; - public static float NextUnbounded(this ref Random random, float bias, float power) => 1 / (1 - pow(random.NextFloat(), 1 - pow(clamp(bias,0,.99f), 1 / power))) - 1; + public static float NextUnbounded(this ref Random random, float bias, float power, float ceiling) => 1 / (1 - pow(min(random.NextFloat(), ceiling), 1 - pow(clamp(bias,0,.99f), 1 / power))) - 1; private static Dictionary InterfaceClasses = new Dictionary(); public static Type[] GetAllInterfaceClasses(this Type type) diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index 4ce69d5a4..b9de99322 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -50,10 +50,14 @@ public class SimpleCommodityData : ItemData // Controls the bias power variable during resource placement [InspectableField, JsonProperty("resourceDensityBiasPower"), Key(8)] - public float ResourceDensityBiasPower = 5; + public float DensityBiasPower = 5; + + // Controls the bias power variable during resource placement + [InspectableField, JsonProperty("resourceRandomCeiling"), Key(9)] + public float RandomCeiling = .9f; // Minimum amount of resources needed for presence to register - [InspectableField, JsonProperty("resourceFloor"), Key(9)] + [InspectableField, JsonProperty("resourceFloor"), Key(10)] public float ResourceFloor = 10f; } @@ -68,7 +72,11 @@ public abstract class CraftedItemData : ItemData } [RethinkTable("Items"), Inspectable, MessagePackObject] -public class CompoundCommodityData : CraftedItemData {} +public class CompoundCommodityData : CraftedItemData +{ + [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("demandProfile"), Key(6)] + public Dictionary DemandProfile = new Dictionary(); +} [Union(0, typeof(GearData)), Union(1, typeof(HullData)), @@ -210,4 +218,17 @@ public class PerformanceStat return ConstantModifiers[entity]; } +} + +[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] +public class PersonalityAttribute : DatabaseEntry, INamedEntry +{ + [InspectableField, JsonProperty("name"), Key(1)] + public string Name; + + [IgnoreMember] public string EntryName + { + get => Name; + set => Name = value; + } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs index 3041ae229..97b1f3e8a 100644 --- a/Assets/Scripts/ServerShared/ZoneGenerator.cs +++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs @@ -76,7 +76,7 @@ public class ZoneGenerator planet.Mass > context.GlobalData.PlanetMass ? BodyType.Planet : BodyType.Planetoid); if ((bodyType & r.ResourceBodyType) != 0) { - float quantity = context.Random.NextUnbounded(r.ResourceDensity.Aggregate(1f, (m, rdm) => m * resourceMaps[rdm]), r.ResourceDensityBiasPower); + float quantity = context.Random.NextUnbounded(r.ResourceDensity.Aggregate(1f, (m, rdm) => m * resourceMaps[rdm]), r.DensityBiasPower, r.RandomCeiling); if (r.ResourceFloor < quantity) dictionary.Add(r.ID, quantity); } } @@ -128,7 +128,7 @@ public class ZoneGenerator if (rosette) { // Create a rosette with a number of vertices between 2 and 9 inclusive - root.ExpandRosette((int)(random.NextFloat(1, 3) * random.NextFloat(2, 3))); + root.ExpandRosette((int)(random.NextFloat(1, 5) + random.NextFloat(1, 5))); // Create a small number of less massive "captured" planets orbiting past the rosette root.ExpandSolar( @@ -146,7 +146,7 @@ public class ZoneGenerator var m = p.Mass / averageChildMass; // Give each child in the rosette its own mini solar system p.ExpandSolar( - count: (int) (random.NextFloat() * random.NextFloat() * m * 5 + 1), + count: (int) (random.NextFloat(1, 3 * m) + random.NextFloat(1, 3 * m)), massMulMin: 0.75f, massMulMax: 2.5f, distMulMin: 1 + m * .25f,