diff --git a/AetheriaTexts.ctd b/AetheriaTexts.ctd index 441beab54..9bd7d107a 100644 --- a/AetheriaTexts.ctd +++ b/AetheriaTexts.ctd @@ -1,6 +1,6 @@ - + @@ -462,9 +462,6 @@ Threefra: You seem to be under attack. How unfortunate. Do you maybe want to do - - - @@ -495,4 +492,148 @@ Threefra: [threefra grins and pointedly deletes the ‘assessment’ from her [t + + + + + + + + + + + + + + + + + + +Finch Cybernetics + + To improve upon the basic, inefficient human form to the advancement of the species and to increase competitiveness with local flora and fauna + Ptarmigan Stealth Tech + +Bird of Paradise Beauty Products + +Finch Medical + +New Flight Aeronautics + +Plexcorp + “The search for knowledge is the duty of all intelligent beings.” + +The human body is frail and limiting. Make it better. +(Move past it entirely) + Colorado Epps, second in command to the original founder, his mind preserved in an android body. +(or is it?) + Skin-like implants for changeable tattoos, which were then sold to the military as camouflage. Also gave them the patent for programmable fake skin, which significantly helped their development of true androids. + + + Lucent Media Enterprises + Encourage scientific and social progress via known dopamine reward channels, e.g., social media response, celebrity status, and the concept of positive reinforcement as a whole + Skylight Media + +Lucent Talent Search + +VIt Energy Drinks + +Nightlife Energy + +Lucent Computing + +<various mining & weapons corps> + “People will do anything for the adulation or loathing of their peers. We at Lucent have harnessed that heretofore destructive tendency for the benefit of all.” + +Weaponized reality shows for technological advancement. + Three siblings run Lucent together, each head of their own specialty. + IDK, the future internet? (how does it differ from the current? I don’t know yet. I’d have to think about it.) + +Nuclear Fusion reactors? + + + ColferV + It is a truth universally acknowledged that nothing is as useful in diplomacy and warfare as a gigantic nuclear arsenal + Seal Shipworks + +ColferV Security + +Deep Six Funerary Services + +BBx Media + +IV Medical + “Impervious strength is the only good defense.” + +Humanity is doomed unless we can outgun or outrun all comers. + +The other major corporations are either complacent or destructively reckless and neither of those can be trusted in a hostile universe. + +Slow, careful, inevitable expansion. + +Build barricades. Expand. Eventually, the balance shifts. + Buckeye Jones, notoriously paranoid and less notoriously entirely justified in it. + Railguns, SmartArmour, and probably a very small but key part of a spaceship, which they charge out the nose for. + + + Miss Terri’s Sugariffic Snack Company + Company representatives could not be reached for comment. We attempted entry into the local headquarters, only to wake up two light years away, dressed in shirts proclaiming us “Winners of East Helsinki Annual Pie Eating Contest” and reeking of coconut and burnt sugar. + +Upon questioning, all members of the reporting team agreed that none of them had ever been to East Helsinki, and, indeed, weren’t sure whether it actually existed. + Rock Candy Mining Corp + +XL Pharmaceuticals + +Jawbreaker Company (mercenaries) + +Probably a good deal more that no one has been able to trace + “It’s called my business because it’s none of yours.” + +Who *is* Miss Terri, and how did she come to be running what is essentially the universe’s largest drug cartel? + + +Candy for all! +Suspiciously experimental substances for some! + + +I feel that an argument could be made for a cult based on Twinkies. + Miss Terri (last name unknown) + Various snacks and the chemical composition and incidentals thereof + + + Aeronautics Unlimited + Quick expansion and retrieval of resources is key to a successful quarter, every quarter. + ARgos Mining + +Regen Filtration and Shipware + +Blast-Rite(tm) + +AU Medical + “Exploration. Extrication. Extermination. + +…in a purely metaphorical sense, of course.” + +It’s a space chase resource race at an unbelievable pace… + +And if you stumble on their secret base, well,they’ll shoot you in the face. : ) + Valeria Corrigant + Ion thrusters (A big deal when space travel was just kicking off, and a major reason they are still important now) + +Lightsails? + +Very speedy destructive mining tech + + + Corporation + Philosophy + Subsidiaries + Overview + Leadership + Tech + +
+ + diff --git a/Assets/Prefabs/Input Field 1.prefab b/Assets/Prefabs/Input Field 1.prefab new file mode 100644 index 000000000..9f6381e65 --- /dev/null +++ b/Assets/Prefabs/Input Field 1.prefab @@ -0,0 +1,1002 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2360368934658443671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1311016275934830604} + - component: {fileID: 3087561921097690340} + - component: {fileID: 3216903306092802615} + - component: {fileID: 8080837038240567539} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1311016275934830604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2360368934658443671} + 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: 7349981392644178389} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3087561921097690340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2360368934658443671} + m_CullTransparentMesh: 0 +--- !u!114 &3216903306092802615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2360368934658443671} + 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, g: 0.4180913, b: 1, a: 0.15294118} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 84d126f984de5fd42ac66361c00f830c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &8080837038240567539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2360368934658443671} + 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!1 &3763110941063002130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3763110941063002131} + - component: {fileID: 3763110941063002348} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3763110941063002131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110941063002130} + 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: + - {fileID: 3763110942450220894} + - {fileID: 3763110942258607499} + m_Father: {fileID: 3763110942864100144} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3763110941063002348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110941063002130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3763110942258607498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3763110942258607499} + - component: {fileID: 3763110942258607493} + - component: {fileID: 3763110942258607492} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3763110942258607499 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942258607498} + 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: 3763110941063002131} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3763110942258607493 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942258607498} + m_CullTransparentMesh: 0 +--- !u!114 &3763110942258607492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942258607498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "This field contains lots of text\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9dcd07b95faae7641a3ff6fccab43c32, type: 2} + m_sharedMaterial: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294111986 + m_fontColor: {r: 0.95, g: 0.95, b: 0.95, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 3763110942258607492} + characterCount: 33 + spriteCount: 0 + spaceCount: 5 + wordCount: 6 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3763110942331806064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3763110942331806065} + - component: {fileID: 3763110942331806067} + - component: {fileID: 3763110942331806066} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3763110942331806065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942331806064} + 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: 3763110942864100144} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3763110942331806067 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942331806064} + m_CullTransparentMesh: 0 +--- !u!114 &3763110942331806066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942331806064} + 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: 61501af80fabaac44ace015a55851277, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &3763110942450220893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3763110942450220894} + - component: {fileID: 3763110942450220888} + - component: {fileID: 3763110942450220895} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3763110942450220894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942450220893} + 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: 3763110941063002131} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3763110942450220888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942450220893} + m_CullTransparentMesh: 0 +--- !u!114 &3763110942450220895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942450220893} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Enter text... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9dcd07b95faae7641a3ff6fccab43c32, type: 2} + m_sharedMaterial: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4255754665 + m_fontColor: {r: 0.66400003, g: 0.66400003, b: 0.66400003, a: 0.99215686} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: 0 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 3763110942450220895} + characterCount: 13 + spriteCount: 0 + spaceCount: 1 + wordCount: 2 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3763110942864100151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3763110942864100144} + - component: {fileID: 3763110942864100108} + - component: {fileID: 3763110942864100147} + - component: {fileID: 8080837038240567536} + - component: {fileID: 3763110942864100146} + m_Layer: 5 + m_Name: Flat InputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3763110942864100144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942864100151} + 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: + - {fileID: 3763110942331806065} + - {fileID: 3763110941063002131} + m_Father: {fileID: 7349981392644178389} + 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_Pivot: {x: 1, y: 0.5} +--- !u!222 &3763110942864100108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942864100151} + m_CullTransparentMesh: 0 +--- !u!114 &3763110942864100147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942864100151} + 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, g: 0.11749021, b: 0.28, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7ed12bf887e951949bd02894a21fb3ff, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &8080837038240567536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942864100151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 32 + m_PreferredWidth: 0 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3763110942864100146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3763110942864100151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3763110942864100147} + m_TextViewport: {fileID: 3763110941063002131} + m_TextComponent: {fileID: 3763110942258607492} + m_Placeholder: {fileID: 3763110942450220895} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 1 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: This field contains lots of text + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!1 &7349981392199474364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7349981392199474367} + - component: {fileID: 7349981392199474353} + - component: {fileID: 7349981392199474366} + - component: {fileID: 8080837038240567551} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7349981392199474367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392199474364} + 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: 7349981392644178389} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7349981392199474353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392199474364} + m_CullTransparentMesh: 0 +--- !u!114 &7349981392199474366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392199474364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Dolor Sit Amet + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9dcd07b95faae7641a3ff6fccab43c32, type: 2} + m_sharedMaterial: {fileID: 21906973755630180, guid: 9dcd07b95faae7641a3ff6fccab43c32, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 7349981392199474366} + characterCount: 14 + spriteCount: 0 + spaceCount: 2 + wordCount: 3 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &8080837038240567551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392199474364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7349981392644178386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7349981392644178389} + - component: {fileID: 7349981392644178391} + - component: {fileID: 3266083835145071804} + - component: {fileID: 4412201880883430374} + - component: {fileID: 8080837038240567549} + m_Layer: 5 + m_Name: Input Field 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7349981392644178389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392644178386} + 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: + - {fileID: 1311016275934830604} + - {fileID: 7349981392199474367} + - {fileID: 3763110942864100144} + m_Father: {fileID: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7349981392644178391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392644178386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &3266083835145071804 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392644178386} + m_CullTransparentMesh: 0 +--- !u!114 &4412201880883430374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392644178386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaba78dd36b0e9e4ba8123c4b149fc43, type: 3} + m_Name: + m_EditorClassIdentifier: + Label: {fileID: 7349981392199474366} + Field: {fileID: 3763110942864100146} +--- !u!114 &8080837038240567549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7349981392644178386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 12 + m_Right: 4 + m_Top: 4 + m_Bottom: 4 + m_ChildAlignment: 4 + m_Spacing: 4 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 diff --git a/Assets/Prefabs/Input Field 1.prefab.meta b/Assets/Prefabs/Input Field 1.prefab.meta new file mode 100644 index 000000000..876bbb109 --- /dev/null +++ b/Assets/Prefabs/Input Field 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5e84952f528d8644ebddaa8320c3edfa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 4e361b0ca..788156fdb 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1265,6 +1265,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1888898928} m_Modifications: + - target: {fileID: 2378632238049155148, guid: 4fca44e21a27a6d48916d2cc4b6e2df0, + type: 3} + propertyPath: InputField + value: + objectReference: {fileID: 4412201880883430374, guid: 5e84952f528d8644ebddaa8320c3edfa, + type: 3} - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0, type: 3} propertyPath: m_SizeDelta.y @@ -22136,7 +22142,7 @@ PrefabInstance: - target: {fileID: 2378632238049155248, guid: 4fca44e21a27a6d48916d2cc4b6e2df0, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000061035156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2378632238049155251, guid: 4fca44e21a27a6d48916d2cc4b6e2df0, type: 3} diff --git a/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs b/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs index 86c9fb2c7..648464681 100644 --- a/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs +++ b/Assets/Scripts/ServerShared/Behaviors/FactoryBehavior.cs @@ -16,6 +16,9 @@ public class FactoryData : BehaviorData [InspectableField, JsonProperty("automation"), Key(2)] public int AutomationPoints; + [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("productionProfile"), Key(3)] + public Dictionary ProductionProfile = new Dictionary(); + public override IBehavior CreateInstance(GameContext context, Entity entity, Gear item) { return new Factory(context, this, entity, item); @@ -28,6 +31,7 @@ public class Factory : IBehavior, IPersistentBehavior public double RetoolingTime; public string ItemName; public Guid ItemUnderConstruction; + public bool Active; public Entity Entity { get; } public Gear Item { get; } @@ -47,8 +51,9 @@ public class Factory : IBehavior, IPersistentBehavior _blueprint = value; RetoolingTime = ToolingTime; _retooling = true; + Active = false; + ItemName = Context.Cache.Get(Context.Cache.Get(value).Item).Name; Item.Change(); - ItemName = Context.Cache.Get(value).Name; } } } @@ -74,18 +79,6 @@ public class Factory : IBehavior, IPersistentBehavior var blueprint = Context.Cache.Get(_blueprint); if (blueprint == null) return false; - - if (RetoolingTime > 0) - { - RetoolingTime -= delta; - return false; - } - - if (_retooling) - { - _retooling = false; - Item.Change(); - } if (ItemUnderConstruction != Guid.Empty) { @@ -108,19 +101,35 @@ public class Factory : IBehavior, IPersistentBehavior return true; } - - // Applying exponents to two random numbers and adding them produces a range of interesting probability distributions for quality - ItemUnderConstruction = Entity.Build(blueprint, blueprint.Quality * - pow(ProductionQuality, blueprint.QualityExponent) * - (pow(Context.Random.NextFloat(), blueprint.RandomExponent) + - pow(Context.Random.NextFloat(), blueprint.RandomExponent)) / 2, ItemName); - if(ItemUnderConstruction!=Guid.Empty) + if (RetoolingTime > 0) + { + RetoolingTime -= delta; + return false; + } + + if (_retooling) + { + _retooling = false; Item.Change(); + } + + if (Active) + { + // Applying exponents to two random numbers and adding them produces a range of interesting probability distributions for quality + ItemUnderConstruction = Entity.Build(blueprint, blueprint.Quality * + pow(ProductionQuality, blueprint.QualityExponent) * + (pow(Context.Random.NextFloat(), blueprint.RandomExponent) + + pow(Context.Random.NextFloat(), blueprint.RandomExponent)) / 2, ItemName); + + if(ItemUnderConstruction!=Guid.Empty) + Item.Change(); + } return false; } + // TODO Update Factory Persistence public PersistentBehaviorData Store() { return new FactoryPersistence diff --git a/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs b/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs index c202f59bd..da28e54bd 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Thermotoggle.cs @@ -20,6 +20,7 @@ public class ThermotoggleData : BehaviorData public class Thermotoggle : IBehavior { + public float TargetTemperature; private ThermotoggleData _data; private Entity Entity { get; } @@ -34,10 +35,11 @@ public class Thermotoggle : IBehavior Entity = entity; Item = item; Context = context; + TargetTemperature = data.TargetTemperature; } public bool Update(float delta) { - return Entity.Temperature < _data.TargetTemperature ^ _data.HighPass; + return Entity.Temperature < TargetTemperature ^ _data.HighPass; } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/BlueprintData.cs b/Assets/Scripts/ServerShared/BlueprintData.cs index 4eb7d7184..1501d8817 100644 --- a/Assets/Scripts/ServerShared/BlueprintData.cs +++ b/Assets/Scripts/ServerShared/BlueprintData.cs @@ -51,9 +51,6 @@ public class BlueprintData : DatabaseEntry, INamedEntry [InspectableDatabaseLink(typeof(SimpleCommodityData)), JsonProperty("resourceRequirements"), Key(14)] public Dictionary ResourceRequirements = new Dictionary(); - [InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("productionProfile"), Key(15)] - public Dictionary ProductionProfile = new Dictionary(); - [IgnoreMember] public string EntryName { get => Name; diff --git a/Assets/Scripts/ServerShared/GameContext.cs b/Assets/Scripts/ServerShared/GameContext.cs index 67592cd7f..640ab1ad7 100644 --- a/Assets/Scripts/ServerShared/GameContext.cs +++ b/Assets/Scripts/ServerShared/GameContext.cs @@ -813,7 +813,7 @@ public class GameContext Ingredients = ingredients.Select(i=>i.ID).ToList(), Quality = Random.NextFloat(qualityMin, qualityMax), Blueprint = blueprint.ID, - Name = $"Generic {item.Name}" + Name = $"{item.Name}" }; newGear.Durability = Evaluate(equippableItemData.Durability, newGear); Cache.Add(newGear); @@ -827,7 +827,7 @@ public class GameContext Ingredients = ingredients.Select(i=>i.ID).ToList(), Quality = Random.NextFloat(qualityMin, qualityMax), Blueprint = blueprint.ID, - Name = $"Generic {item.Name}" + Name = $"{item.Name}" }; Cache.Add(newCommodity); return newCommodity; diff --git a/Assets/Scripts/UI/ColonyTab.cs b/Assets/Scripts/UI/ColonyTab.cs index 3a49e131c..9f81c1079 100644 --- a/Assets/Scripts/UI/ColonyTab.cs +++ b/Assets/Scripts/UI/ColonyTab.cs @@ -70,6 +70,7 @@ public class ColonyTab : MonoBehaviour foreach (var attribute in entity.Personality.Keys) personalityList.AddPersonalityProperty(Context.Cache.Get(attribute), () => entity.Personality[attribute]); + personalityList.SetExpanded(false, true); General.RefreshValues(); } @@ -92,7 +93,7 @@ public class ColonyTab : MonoBehaviour void RefreshInventory() { - Debug.Log("Refreshing Inventory!"); + //Debug.Log("Refreshing Inventory!"); // Create item data mapping for cargo var cargoData = entity.Cargo.ToDictionary(id => _context.Cache.Get(id), @@ -185,12 +186,48 @@ public class ColonyTab : MonoBehaviour else { Inventory.AddSection("Cargo"); - foreach (var x in cargoData) + foreach (var itemID in entity.Cargo.Where(id => Context.Cache.Get(id) is SimpleCommodity)) { - if(x.Key is SimpleCommodity simpleCommodity) - Inventory.AddProperty(x.Value.Name, () => simpleCommodity.Quantity.ToString()); + var simpleCommodity = Context.Cache.Get(itemID); + var data = simpleCommodity.ItemData; + Inventory.AddProperty(data.Name, () => simpleCommodity.Quantity.ToString(), eventData => + { + Details.Clear(); + Details.AddItemProperties(simpleCommodity); + Details.RefreshValues(); + }); + } + + foreach (var group in entity.Cargo + .Select(id => Context.Cache.Get(id)) + .Where(item => item is CraftedItemInstance) + .Cast() + .GroupBy(craftedItem => (craftedItem.Data, craftedItem.Name, Context.Cache.Get(Context.Cache.Get(craftedItem.SourceEntity).Corporation)))) + { + if (group.Count() == 1) + { + var item = group.First(); + Inventory.AddProperty(item.Name, null, eventData => + { + Details.Clear(); + Details.AddItemProperties(item); + Details.RefreshValues(); + }); + } else - Inventory.AddProperty(x.Value.Name); + { + var instanceList = Inventory.AddList(group.Key.Name); + foreach (var item in group) + { + instanceList.AddProperty(item.Name, null, eventData => + { + Details.Clear(); + Details.AddItemProperties(item); + Details.RefreshValues(); + }); + } + instanceList.SetExpanded(false, true); + } } } Inventory.RefreshValues(); @@ -213,9 +250,14 @@ public class ColonyTab : MonoBehaviour var bpItemData = _context.Cache.Get(blueprint.Item); if(entity.GetBlueprintIngredients(blueprint, out _, out _)) - blueprintList.AddButton("Build", _ => entity.Build(blueprint, 1, bpItemData.Name, true)); + blueprintList.AddButton("Build", _ => + { + entity.Build(blueprint, 1, bpItemData.Name, true); + Details.Clear(); + }); blueprintList.RefreshValues(); + blueprintList.SetExpanded(false, true); } Details.RefreshValues(); } diff --git a/Assets/Scripts/UI/PropertiesList.cs b/Assets/Scripts/UI/PropertiesList.cs index 5191674e2..c240c77fd 100644 --- a/Assets/Scripts/UI/PropertiesList.cs +++ b/Assets/Scripts/UI/PropertiesList.cs @@ -22,7 +22,16 @@ public class PropertiesList : PropertiesPanel public void Start() { Button.OnClick += _ => ToggleExpand(); - SetExpanded(true, true); + OnPropertyAdded += go => go.SetActive(_expanded); + //SetExpanded(true, true); + } + + public override void Update() + { + RefreshValues(); + _foldoutRotation = + Mathf.Lerp(_foldoutRotation, _targetFoldoutRotation, FoldoutRotationDamping * Time.deltaTime); + FoldoutIcon.transform.localRotation = Quaternion.Euler(0,0, _foldoutRotation); } public void ToggleExpand() => SetExpanded(!_expanded, false); @@ -42,13 +51,6 @@ public class PropertiesList : PropertiesPanel } } - private void Update() - { - _foldoutRotation = - Mathf.Lerp(_foldoutRotation, _targetFoldoutRotation, FoldoutRotationDamping * Time.deltaTime); - FoldoutIcon.transform.localRotation = Quaternion.Euler(0,0, _foldoutRotation); - } - // public override PropertyLabel AddProperty(string name, Func read = null, Action onClick = null, bool radio = false) // { // var prop = base.AddProperty(name, read, onClick, radio); diff --git a/Assets/Scripts/UI/PropertiesPanel.cs b/Assets/Scripts/UI/PropertiesPanel.cs index 526b7840d..e60240340 100644 --- a/Assets/Scripts/UI/PropertiesPanel.cs +++ b/Assets/Scripts/UI/PropertiesPanel.cs @@ -5,8 +5,10 @@ using System.Globalization; using System.Linq; using System.Reflection; using TMPro; +using UniRx; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.UI; public class PropertiesPanel : MonoBehaviour { @@ -31,10 +33,11 @@ public class PropertiesPanel : MonoBehaviour protected event Action RefreshPropertyValues; protected bool RadioSelection = false; + protected event Action OnPropertyAdded; protected IDynamicProperties ChangeSource; protected Action OnPropertiesChanged; - protected void Update() + public virtual void Update() { RefreshValues(); } @@ -72,6 +75,7 @@ public class PropertiesPanel : MonoBehaviour var section = Instantiate(SectionPrefab, transform); section.GetComponentInChildren().text = name; Properties.Add(section.gameObject); + OnPropertyAdded?.Invoke(section.gameObject); return section; } @@ -104,6 +108,7 @@ public class PropertiesPanel : MonoBehaviour if (read != null) RefreshPropertyValues += () => ((PropertyLabel) property).Value.text = read.Invoke(); Properties.Add(property.gameObject); + OnPropertyAdded?.Invoke(property.gameObject); return property; } @@ -122,6 +127,7 @@ public class PropertiesPanel : MonoBehaviour // } //RefreshPropertyValues += () => list.RefreshValues(); Properties.Add(list.gameObject); + OnPropertyAdded?.Invoke(list.gameObject); return list; } @@ -133,6 +139,7 @@ public class PropertiesPanel : MonoBehaviour attributeInstance.LowLabel.text = attribute.LowName; RefreshPropertyValues += () => attributeInstance.Slider.value = read(); Properties.Add(attributeInstance.gameObject); + OnPropertyAdded?.Invoke(attributeInstance.gameObject); return attributeInstance; } @@ -142,6 +149,7 @@ public class PropertiesPanel : MonoBehaviour button.Label.text = name; button.Button.OnClick += onClick; Properties.Add(button.gameObject); + OnPropertyAdded?.Invoke(button.gameObject); return button; } @@ -152,6 +160,7 @@ public class PropertiesPanel : MonoBehaviour button.ButtonLabel.text = label; button.Button.OnClick += onClick; Properties.Add(button.gameObject); + OnPropertyAdded?.Invoke(button.gameObject); } public void AddField(string name, Func read, Action write) @@ -160,8 +169,17 @@ public class PropertiesPanel : MonoBehaviour field.Label.text = name; field.Field.contentType = TMP_InputField.ContentType.Standard; field.Field.onValueChanged.AddListener(val => write(val)); - RefreshPropertyValues += () => field.Field.text = read(); + RefreshPropertyValues += () => + { + var s = read(); + if (field.Field.text != s) + { + field.Field.text = s; + field.Field.Rebuild(CanvasUpdate.Layout); + } + }; Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddField(string name, Func read, Action write) @@ -172,6 +190,7 @@ public class PropertiesPanel : MonoBehaviour field.Field.onValueChanged.AddListener(val => write(float.Parse(val))); RefreshPropertyValues += () => field.Field.text = read().ToString(CultureInfo.InvariantCulture); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddField(string name, Func read, Action write) @@ -182,6 +201,7 @@ public class PropertiesPanel : MonoBehaviour field.Field.onValueChanged.AddListener(val => write(int.Parse(val))); RefreshPropertyValues += () => field.Field.text = read().ToString(CultureInfo.InvariantCulture); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddField(string name, Func read, Action write, float min, float max) @@ -194,6 +214,7 @@ public class PropertiesPanel : MonoBehaviour field.Slider.onValueChanged.AddListener(val => write(val)); RefreshPropertyValues += () => field.Slider.value = read(); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddProgressField(string name, Func read) @@ -206,6 +227,7 @@ public class PropertiesPanel : MonoBehaviour //field.Slider.onValueChanged.AddListener(val => write(val)); RefreshPropertyValues += () => field.Slider.value = read(); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddField(string name, Func read, Action write, int min, int max) @@ -218,6 +240,7 @@ public class PropertiesPanel : MonoBehaviour field.Slider.onValueChanged.AddListener(val => write(Mathf.RoundToInt(val))); RefreshPropertyValues += () => field.Slider.value = read(); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddField(string name, Func read, Action write) @@ -227,6 +250,7 @@ public class PropertiesPanel : MonoBehaviour field.Toggle.onValueChanged.AddListener(val => write(val)); RefreshPropertyValues += () => field.Toggle.isOn = read(); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } public void AddField(string name, Func read, Action write, string[] enumOptions) @@ -237,6 +261,7 @@ public class PropertiesPanel : MonoBehaviour field.Dropdown.onValueChanged.AddListener(val => write(val)); RefreshPropertyValues += () => field.Dropdown.value = read(); Properties.Add(field.gameObject); + OnPropertyAdded?.Invoke(field.gameObject); } void RemoveListener() @@ -261,9 +286,14 @@ public class PropertiesPanel : MonoBehaviour AddProperty("Mass", () => $"{entity.Mass.SignificantDigits(Context.GlobalData.SignificantDigits)}"); AddProperty("Temperature", () => $"{entity.Temperature:0}°K"); AddProperty("Energy", () => $"{entity.Energy:0}/{entity.GetBehaviors().First().Capacitance:0}"); + + var hardpointList = AddList("Gear"); + hardpointList.InspectHardpoints(entity); + hardpointList.SetExpanded(false,true); - AddList("Gear").InspectHardpoints(entity); - AddList("Cargo").InspectCargo(entity); + var cargoList = AddList("Cargo"); + cargoList.InspectCargo(entity); + cargoList.SetExpanded(false,true); RefreshValues(); } @@ -281,8 +311,12 @@ public class PropertiesPanel : MonoBehaviour { Clear(); var equippedItems = entity.Hardpoints.Where(hp => hp.Gear != null); - foreach(var hardpoint in equippedItems) - AddList(hardpoint.ItemData.Name).Inspect(entity, hardpoint); + foreach (var hardpoint in equippedItems) + { + var propertyList = AddList(hardpoint.Gear.Name); + propertyList.Inspect(entity, hardpoint); + propertyList.SetExpanded(false,true); + } RefreshValues(); } } @@ -299,32 +333,93 @@ public class PropertiesPanel : MonoBehaviour void InspectCargoInternal() { Clear(); - foreach (var itemID in entity.Cargo) + foreach (var itemID in entity.Cargo.Where(id => Context.Cache.Get(id) is SimpleCommodity)) { - var itemInstance = Context.Cache.Get(itemID); - var data = Context.Cache.Get(itemInstance.Data); - if(itemInstance is SimpleCommodity simpleCommodity) - AddProperty(data.Name, () => simpleCommodity.Quantity.ToString()); - else - AddProperty(data.Name); + var simpleCommodity = Context.Cache.Get(itemID); + var data = simpleCommodity.ItemData; + var propertiesList = AddList($"{simpleCommodity.Quantity.ToString()} {data.Name}"); + propertiesList.AddItemProperties(simpleCommodity); + propertiesList.RefreshValues(); + propertiesList.SetExpanded(false, true); } + + foreach (var group in entity.Cargo + .Select(id => Context.Cache.Get(id)) + .Where(item => item is CraftedItemInstance) + .Cast() + .GroupBy(craftedItem => (craftedItem.Data, craftedItem.Name, Context.Cache.Get(Context.Cache.Get(craftedItem.SourceEntity).Corporation)))) + { + if (group.Count() == 1) + { + var item = group.First(); + var propertiesList = AddList(item.Name); + propertiesList.AddItemProperties(item); + propertiesList.RefreshValues(); + propertiesList.SetExpanded(false, true); + } + else + { + var instanceList = AddList($"{group.Count().ToString()} {group.Key.Name}"); + foreach (var item in group) + { + var propertiesList = instanceList.AddList(item.Name); + propertiesList.AddItemProperties(item); + propertiesList.RefreshValues(); + propertiesList.SetExpanded(false, true); + } + instanceList.SetExpanded(false, true); + } + } + RefreshValues(); } } + public void AddItemProperties(ItemInstance item) + { + var data = Context.Cache.Get(item.Data); + AddProperty("Type", () => data.Name); + AddProperty(data.Description).Label.fontStyle = FontStyles.Normal; + if (item is SimpleCommodity simpleCommodity) + AddProperty("Quantity", () => simpleCommodity.Quantity.ToString()); + AddProperty("Mass", () => item.Mass.SignificantDigits(Context.GlobalData.SignificantDigits)); + AddProperty("Thermal Mass", () => item.ThermalMass.SignificantDigits(Context.GlobalData.SignificantDigits)); + AddProperty("Size", () => item.Size.SignificantDigits(Context.GlobalData.SignificantDigits)); + if (item is Gear gear) + { + var gearData = gear.ItemData; + AddProperty("Durability", () => + $"{gear.Durability.SignificantDigits(Context.GlobalData.SignificantDigits)}/{Context.Evaluate(gearData.Durability, gear).SignificantDigits(Context.GlobalData.SignificantDigits)}"); + } + if (item is CraftedItemInstance craftedItemInstance) + { + var entity = Context.Cache.Get(craftedItemInstance.SourceEntity); + if (entity != null) + { + var corporation = Context.Cache.Get(entity.Corporation); + AddProperty("Manufacturer", () => corporation.Name); + } + else + { + AddProperty("Manufacturer", () => "God"); + } + } + } + public void Inspect(Entity entity, Hardpoint hardpoint) { RemoveListener(); ChangeSource = hardpoint.Gear; - OnPropertiesChanged = InspectGearInternal; + OnPropertiesChanged = () => Observable.NextFrame().Subscribe(unit => InspectGearInternal()); ChangeSource.OnChanged += OnPropertiesChanged; InspectGearInternal(); void InspectGearInternal() { + Debug.Log($"Refreshing {hardpoint.Gear.Name} properties"); Clear(); - AddProperty("Durability", () => $"{hardpoint.Gear.Durability.SignificantDigits(Context.GlobalData.SignificantDigits)}/{Context.Evaluate(hardpoint.ItemData.Durability, hardpoint.Gear).SignificantDigits(Context.GlobalData.SignificantDigits)}"); + AddItemProperties(hardpoint.Gear); foreach (var behavior in hardpoint.ItemData.Behaviors) { var type = behavior.GetType(); @@ -347,6 +442,8 @@ public class PropertiesPanel : MonoBehaviour } foreach (var behavior in hardpoint.Behaviors) { + if (behavior is Thermotoggle thermotoggle) + AddField("Target Temperature", () => thermotoggle.TargetTemperature, temp => thermotoggle.TargetTemperature = temp); if (behavior is Factory factory) { AddField("Production Quality", () => factory.ProductionQuality, f => factory.ProductionQuality = f, 0, 1); @@ -364,9 +461,10 @@ public class PropertiesPanel : MonoBehaviour () => compatibleBlueprints.FindIndex(bp=>bp.ID== factory.Blueprint) + 1, i => factory.Blueprint = i == 0 ? Guid.Empty : compatibleBlueprints[i - 1].ID, new []{"None"}.Concat(compatibleBlueprints.Select(bp=>bp.Name)).ToArray()); + AddField("Active", () => factory.Active, active => factory.Active = active); if (factory.Blueprint != Guid.Empty) { - if (factory.ItemUnderConstruction != Guid.Empty) + if (factory.Active && factory.ItemUnderConstruction != Guid.Empty) { AddProgressField("Production", () => { @@ -378,6 +476,7 @@ public class PropertiesPanel : MonoBehaviour } else { + AddField("Product Name", () => factory.ItemName, name => factory.ItemName = name); var ingredientsList = AddList("Ingredients Needed"); var blueprintData = Context.Cache.Get(factory.Blueprint); foreach (var ingredient in blueprintData.Ingredients) @@ -385,6 +484,7 @@ public class PropertiesPanel : MonoBehaviour var itemData = Context.Cache.Get(ingredient.Key); ingredientsList.AddProperty(itemData.Name, () => ingredient.Value.ToString()); } + ingredientsList.SetExpanded(false, true); ingredientsList.RefreshValues(); } }