diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..ddb6ff85a --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..da60e25ae --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..87d58478b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,60 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.vs": true, + "**/.gitmodules": true, + "**/.vsconfig": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "Logs/": true, + "logs/": true, + "ProjectSettings/": true, + "UserSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "Aetheria-Economy.sln" +} \ No newline at end of file diff --git a/Assets/Materials/Brushes/Fog Brush.mat b/Assets/Materials/Brushes/Fog Brush.mat new file mode 100644 index 000000000..bfc363ee4 --- /dev/null +++ b/Assets/Materials/Brushes/Fog Brush.mat @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fog Brush + m_Shader: {fileID: 4800000, guid: 268da230635cfb34ab4ed6ad39503fa0, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 1 + - _Depth: 80 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Power: 16 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Brushes/Fog Brush.mat.meta b/Assets/Materials/Brushes/Fog Brush.mat.meta new file mode 100644 index 000000000..36f81fbf5 --- /dev/null +++ b/Assets/Materials/Brushes/Fog Brush.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8dd249f658a914548b4890537a80eab8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Brushes/Sector Waves Medium.mat b/Assets/Materials/Brushes/Sector Waves Medium.mat index d29994035..073de612f 100644 --- a/Assets/Materials/Brushes/Sector Waves Medium.mat +++ b/Assets/Materials/Brushes/Sector Waves Medium.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Sector Waves Medium m_Shader: {fileID: 4800000, guid: ccdbaf77577994d46b0e61c53d5dc4a9, type: 3} - m_ShaderKeywords: B + m_ValidKeywords: [] + m_InvalidKeywords: + - B m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -55,11 +57,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Constant: 1 - _Cutoff: 0.5 - - _Depth: 4 + - _Depth: 7.58 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _Frequency: 0.01 diff --git a/Assets/Materials/Brushes/Sector Waves Small.mat b/Assets/Materials/Brushes/Sector Waves Small.mat index d34c2caca..8a69316dc 100644 --- a/Assets/Materials/Brushes/Sector Waves Small.mat +++ b/Assets/Materials/Brushes/Sector Waves Small.mat @@ -62,7 +62,7 @@ Material: - _BumpScale: 1 - _Constant: 0 - _Cutoff: 0.5 - - _Depth: -8 + - _Depth: -16.75 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _Frequency: 0.005 diff --git a/Assets/Materials/Grid 1.mat b/Assets/Materials/Grid 1.mat index 5bcfd338f..1f5c46b28 100644 --- a/Assets/Materials/Grid 1.mat +++ b/Assets/Materials/Grid 1.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Grid 1 m_Shader: {fileID: 4800000, guid: 715b1ce444e57364a9458657be896071, type: 3} - m_ShaderKeywords: _RENDERING_CUTOUT _TESSELLATION_EDGE + m_ValidKeywords: + - _RENDERING_CUTOUT + - _TESSELLATION_EDGE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -21,11 +24,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _AlphaMask: - m_Texture: {fileID: 2800000, guid: 314e63bcb8ac19045b9577f68a24bb42, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Background: - m_Texture: {fileID: 8900000, guid: b607eb85a346eaf459b28449d909bbe5, type: 3} + m_Texture: {fileID: 8900000, guid: 589f8d25c07df474ebf6e5cf31ac21c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -84,12 +87,13 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0.4 - - _AlphaRange: 80 + - _AlphaRange: 465.6 - _AlphaRangeCenter: -100 - - _AlphaRangeFeather: 10 - - _AlphaTiling: 0.5 + - _AlphaRangeFeather: 25 + - _AlphaTiling: 1 - _BackgroundBlur: 0.75 - _BackgroundFresnel: 0.999 - _BumpScale: 1 @@ -113,7 +117,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _ParallaxStrength: 0 - - _Smoothness: 1 + - _Smoothness: 0.824 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/Shield.mat b/Assets/Materials/Shield.mat index ce24c980c..2f7cacf7f 100644 --- a/Assets/Materials/Shield.mat +++ b/Assets/Materials/Shield.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Shield m_Shader: {fileID: 4800000, guid: 8cdd48af96eb47745a96bca98f53d5bd, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - A m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -21,7 +22,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _Background: - m_Texture: {fileID: 8900000, guid: 3aff5e4f12da60e42b543a55f412144f, type: 3} + m_Texture: {fileID: 8900000, guid: 589f8d25c07df474ebf6e5cf31ac21c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -75,44 +76,80 @@ Material: m_Ints: [] m_Floats: - _Ambient_Multiplier: 0 - - _BackgroundBlur: 0 - - _BackgroundFresnel: -0.5 + - _BackgroundBlur: 0.1 + - _BackgroundFresnel: 0.75 + - _BlurFresnel: -2 + - _BulbRadius: 0 + - _BulbRange: 0.05 - _BumpScale: 1 + - _CellExponent: 1 + - _CellSpeed: 1 + - _CellTiling: 12 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 + - _DeviationOpacityExponent: 4 - _Displacement: 1 + - _DisplacementOpacity: 0 - _DstBlend: 0 - - _Emission: 50 - - _EmissionFresnel: 0.5 + - _Emission: 8 + - _EmissionFresnel: -0.5 - _FresnelOpacity: 1 - _Gloss: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _MaxDisplacement: 0.073 + - _MeleeDisplacement: 0 + - _MeleeFlattening: 8 + - _MeleeShape: 4 - _Metallic: 1 - _Mode: 0 - _OcclusionStrength: 1 - - _OpacityFresnel: 3 + - _OpacityFresnel: 4 - _Parallax: 0.02 - - _PushOpacity: 1 + - _Push: 1 + - _PushEnvelopeExponent: 2 + - _PushFrequencyExponent: 2 + - _PushOpacity: 0 - _PushOpacityRangeMax: 0.25 - _PushOpacityRangeMin: 0.75 + - _PushVerticalExponent: 0 - _PushWaveEnvelopeExponent: 2 - _PushWaveExponent: 1 - _PushWaveFrequency: 8 - - _PushWaveMagnitude: 2 + - _PushWaveMagnitude: 0 - _PushWaveOffset: 0 - _PushWaveRange: 3.14 - _PushWaveRangeExponent: 4 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 + - _Speed: 1 - _SrcBlend: 1 - - _SubdivisionAmount: 10 + - _SubdivisionAmount: 8 + - _TendrilExponent: 2 + - _TendrilInfluence: 0.1 + - _TendrilRadius: 0 + - _TendrilSize: 0 + - _TwistAngleExponent: 1 + - _TwistAngleMax: 1 + - _TwistAngleMin: 1 + - _TwistBack: 1 + - _TwistEnvelopeExponent: 2 + - _TwistFrequencyExponent: 1.5 + - _TwistFront: 0 + - _TwistRear: 0 + - _TwistVerticalExponent: 8 - _UVSec: 0 + - _WaveExponent: 1 + - _WaveFrequency: 50.24 + - _WaveMagnitude: 1 + - _WaveOffset: 0 + - _WaveRangeExponent: 2 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1, g: 0.25499997, b: 0.6288488, a: 1} - - _PushDirection: {r: 0, g: 0, b: 1, a: 1} + - _EmissionColor: {r: 0.25490198, g: 0.7046673, b: 1, a: 1} + - _InverseScale: {r: 0.25, g: 0.33333334, b: 0.083333336, a: 1} + - _MeleeDirection: {r: -0.00000008742278, g: -0, b: -1, a: 0} + - _PushDirection: {r: 0, g: 0, b: -1, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Materials/Skybox.mat b/Assets/Materials/Skybox.mat index 7cade9228..5794cf392 100644 --- a/Assets/Materials/Skybox.mat +++ b/Assets/Materials/Skybox.mat @@ -63,7 +63,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _AtmosphereThickness: 0.15 + - _AtmosphereThickness: 0.05 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/Assets/Materials/UI/Asteroid.mat b/Assets/Materials/UI/Asteroid.mat index 87fc42fac..d6061f80c 100644 --- a/Assets/Materials/UI/Asteroid.mat +++ b/Assets/Materials/UI/Asteroid.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Entrance.mat b/Assets/Materials/UI/Entrance.mat index 334ddeb0f..e2c5565a1 100644 --- a/Assets/Materials/UI/Entrance.mat +++ b/Assets/Materials/UI/Entrance.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Entrance m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -17,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Materials/UI/Galaxy Zone Background Primary.mat b/Assets/Materials/UI/Galaxy Zone Background Primary.mat index a83976a96..bb4338232 100644 --- a/Assets/Materials/UI/Galaxy Zone Background Primary.mat +++ b/Assets/Materials/UI/Galaxy Zone Background Primary.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Galaxy Zone Background Primary m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -17,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Materials/UI/Galaxy Zone Background Secondary.mat b/Assets/Materials/UI/Galaxy Zone Background Secondary.mat index 5dc107c8f..833790d80 100644 --- a/Assets/Materials/UI/Galaxy Zone Background Secondary.mat +++ b/Assets/Materials/UI/Galaxy Zone Background Secondary.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Galaxy Zone Background Secondary m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -17,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Materials/UI/Galaxy Zone.mat b/Assets/Materials/UI/Galaxy Zone.mat index 8c30359b4..593b296e8 100644 --- a/Assets/Materials/UI/Galaxy Zone.mat +++ b/Assets/Materials/UI/Galaxy Zone.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Galaxy Zone m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -17,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Materials/UI/Gas Giant.mat b/Assets/Materials/UI/Gas Giant.mat index cc87d0f7b..c1ce0522b 100644 --- a/Assets/Materials/UI/Gas Giant.mat +++ b/Assets/Materials/UI/Gas Giant.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index 7874e3116..fd637a4cd 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -76,7 +76,7 @@ Material: - _ColorMask: 15 - _Cutoff: 0.5 - _DangerSteepness: 1.5 - - _DepthRange: 284.9062 + - _DepthRange: 216.52303 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 @@ -89,7 +89,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 0.0007099797 + - _Scale: 2.1248078 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/UI/Minimap Gravity Lines.mat b/Assets/Materials/UI/Minimap Gravity Lines.mat index d8b5ac1f5..73af0ef3a 100644 --- a/Assets/Materials/UI/Minimap Gravity Lines.mat +++ b/Assets/Materials/UI/Minimap Gravity Lines.mat @@ -71,7 +71,7 @@ Material: - _ColorMask: 15 - _Cutoff: 0.5 - _DangerSteepness: 1.5 - - _DepthRange: 284.9062 + - _DepthRange: 216.52303 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 diff --git a/Assets/Materials/UI/Orbital.mat b/Assets/Materials/UI/Orbital.mat index 63a9deaa0..4e35be417 100644 --- a/Assets/Materials/UI/Orbital.mat +++ b/Assets/Materials/UI/Orbital.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Planet.mat b/Assets/Materials/UI/Planet.mat index a1a9c0315..dac22547a 100644 --- a/Assets/Materials/UI/Planet.mat +++ b/Assets/Materials/UI/Planet.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Ship.mat b/Assets/Materials/UI/Ship.mat index aadafb492..b560f51a2 100644 --- a/Assets/Materials/UI/Ship.mat +++ b/Assets/Materials/UI/Ship.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Sun.mat b/Assets/Materials/UI/Sun.mat index a751f5a95..c7484fdb5 100644 --- a/Assets/Materials/UI/Sun.mat +++ b/Assets/Materials/UI/Sun.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Turret.mat b/Assets/Materials/UI/Turret.mat index 876c32bdf..08d50d478 100644 --- a/Assets/Materials/UI/Turret.mat +++ b/Assets/Materials/UI/Turret.mat @@ -19,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Materials/UI/Zone Link.mat b/Assets/Materials/UI/Zone Link.mat index 070bddb99..01580aa32 100644 --- a/Assets/Materials/UI/Zone Link.mat +++ b/Assets/Materials/UI/Zone Link.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Zone Link m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -17,7 +19,7 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Models/CatmullGrid.fbx b/Assets/Models/CatmullGrid.fbx new file mode 100644 index 000000000..b6b59e7e6 --- /dev/null +++ b/Assets/Models/CatmullGrid.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:198667d6caf107bd895f6ecee0cfb69caee24f5185b9a3ab79591017a389140b +size 1030316 diff --git a/Assets/Models/CatmullGrid.fbx.meta b/Assets/Models/CatmullGrid.fbx.meta new file mode 100644 index 000000000..4821deb90 --- /dev/null +++ b/Assets/Models/CatmullGrid.fbx.meta @@ -0,0 +1,351 @@ +fileFormatVersion: 2 +guid: aa6193d250644494faa1b8492b0e98d1 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 1: 100002 + second: CatmullGrid_MeshPart0 + - first: + 1: 100004 + second: CatmullGrid_MeshPart1 + - first: + 1: 100006 + second: CatmullGrid_MeshPart10 + - first: + 1: 100008 + second: CatmullGrid_MeshPart11 + - first: + 1: 100010 + second: CatmullGrid_MeshPart12 + - first: + 1: 100012 + second: CatmullGrid_MeshPart13 + - first: + 1: 100014 + second: CatmullGrid_MeshPart14 + - first: + 1: 100016 + second: CatmullGrid_MeshPart2 + - first: + 1: 100018 + second: CatmullGrid_MeshPart3 + - first: + 1: 100020 + second: CatmullGrid_MeshPart4 + - first: + 1: 100022 + second: CatmullGrid_MeshPart5 + - first: + 1: 100024 + second: CatmullGrid_MeshPart6 + - first: + 1: 100026 + second: CatmullGrid_MeshPart7 + - first: + 1: 100028 + second: CatmullGrid_MeshPart8 + - first: + 1: 100030 + second: CatmullGrid_MeshPart9 + - first: + 4: 400000 + second: //RootNode + - first: + 4: 400002 + second: CatmullGrid_MeshPart0 + - first: + 4: 400004 + second: CatmullGrid_MeshPart1 + - first: + 4: 400006 + second: CatmullGrid_MeshPart10 + - first: + 4: 400008 + second: CatmullGrid_MeshPart11 + - first: + 4: 400010 + second: CatmullGrid_MeshPart12 + - first: + 4: 400012 + second: CatmullGrid_MeshPart13 + - first: + 4: 400014 + second: CatmullGrid_MeshPart14 + - first: + 4: 400016 + second: CatmullGrid_MeshPart2 + - first: + 4: 400018 + second: CatmullGrid_MeshPart3 + - first: + 4: 400020 + second: CatmullGrid_MeshPart4 + - first: + 4: 400022 + second: CatmullGrid_MeshPart5 + - first: + 4: 400024 + second: CatmullGrid_MeshPart6 + - first: + 4: 400026 + second: CatmullGrid_MeshPart7 + - first: + 4: 400028 + second: CatmullGrid_MeshPart8 + - first: + 4: 400030 + second: CatmullGrid_MeshPart9 + - first: + 23: 2300000 + second: CatmullGrid_MeshPart0 + - first: + 23: 2300002 + second: CatmullGrid_MeshPart1 + - first: + 23: 2300004 + second: CatmullGrid_MeshPart10 + - first: + 23: 2300006 + second: CatmullGrid_MeshPart11 + - first: + 23: 2300008 + second: CatmullGrid_MeshPart12 + - first: + 23: 2300010 + second: CatmullGrid_MeshPart13 + - first: + 23: 2300012 + second: CatmullGrid_MeshPart14 + - first: + 23: 2300014 + second: CatmullGrid_MeshPart2 + - first: + 23: 2300016 + second: CatmullGrid_MeshPart3 + - first: + 23: 2300018 + second: CatmullGrid_MeshPart4 + - first: + 23: 2300020 + second: CatmullGrid_MeshPart5 + - first: + 23: 2300022 + second: CatmullGrid_MeshPart6 + - first: + 23: 2300024 + second: CatmullGrid_MeshPart7 + - first: + 23: 2300026 + second: CatmullGrid_MeshPart8 + - first: + 23: 2300028 + second: CatmullGrid_MeshPart9 + - first: + 23: 2300030 + second: //RootNode + - first: + 33: 3300000 + second: CatmullGrid_MeshPart0 + - first: + 33: 3300002 + second: CatmullGrid_MeshPart1 + - first: + 33: 3300004 + second: CatmullGrid_MeshPart10 + - first: + 33: 3300006 + second: CatmullGrid_MeshPart11 + - first: + 33: 3300008 + second: CatmullGrid_MeshPart12 + - first: + 33: 3300010 + second: CatmullGrid_MeshPart13 + - first: + 33: 3300012 + second: CatmullGrid_MeshPart14 + - first: + 33: 3300014 + second: CatmullGrid_MeshPart2 + - first: + 33: 3300016 + second: CatmullGrid_MeshPart3 + - first: + 33: 3300018 + second: CatmullGrid_MeshPart4 + - first: + 33: 3300020 + second: CatmullGrid_MeshPart5 + - first: + 33: 3300022 + second: CatmullGrid_MeshPart6 + - first: + 33: 3300024 + second: CatmullGrid_MeshPart7 + - first: + 33: 3300026 + second: CatmullGrid_MeshPart8 + - first: + 33: 3300028 + second: CatmullGrid_MeshPart9 + - first: + 33: 3300030 + second: //RootNode + - first: + 43: 4300000 + second: CatmullGrid_MeshPart0 + - first: + 43: 4300002 + second: CatmullGrid_MeshPart1 + - first: + 43: 4300004 + second: CatmullGrid_MeshPart2 + - first: + 43: 4300006 + second: CatmullGrid_MeshPart3 + - first: + 43: 4300008 + second: CatmullGrid_MeshPart4 + - first: + 43: 4300010 + second: CatmullGrid_MeshPart5 + - first: + 43: 4300012 + second: CatmullGrid_MeshPart6 + - first: + 43: 4300014 + second: CatmullGrid_MeshPart7 + - first: + 43: 4300016 + second: CatmullGrid_MeshPart8 + - first: + 43: 4300018 + second: CatmullGrid_MeshPart9 + - first: + 43: 4300020 + second: CatmullGrid_MeshPart10 + - first: + 43: 4300022 + second: CatmullGrid_MeshPart11 + - first: + 43: 4300024 + second: CatmullGrid_MeshPart12 + - first: + 43: 4300026 + second: CatmullGrid_MeshPart13 + - first: + 43: 4300028 + second: CatmullGrid_MeshPart14 + - first: + 43: 4300030 + second: CatmullGrid + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: No Name + second: {fileID: 2100000, guid: 429eef4d6d29a9d4b9bb60e38e60bc75, type: 2} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 + importBlendShapes: 1 + importCameras: 0 + importLights: 0 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/primitives.fbx.meta b/Assets/Models/primitives.fbx.meta index 294244609..317ad4851 100644 --- a/Assets/Models/primitives.fbx.meta +++ b/Assets/Models/primitives.fbx.meta @@ -66,7 +66,7 @@ ModelImporter: secondaryUVMinLightmapResolution: 40 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 - useFileScale: 1 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Triggers/ObservablePointerEnterTrigger.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Triggers/ObservablePointerEnterTrigger.cs index 31b390523..5eaead47d 100644 --- a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Triggers/ObservablePointerEnterTrigger.cs +++ b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Triggers/ObservablePointerEnterTrigger.cs @@ -11,6 +11,7 @@ namespace UniRx.Triggers public class ObservablePointerEnterTrigger : ObservableTriggerBase, IEventSystemHandler, IPointerEnterHandler { Subject onPointerEnter; + public bool SuppressDisable; void IPointerEnterHandler.OnPointerEnter(PointerEventData eventData) { @@ -24,7 +25,8 @@ namespace UniRx.Triggers private void OnDisable() { - onPointerEnter = null; + if(!SuppressDisable) + onPointerEnter = null; } protected override void RaiseOnCompletedOnDestroy() @@ -38,4 +40,4 @@ namespace UniRx.Triggers } -#endif \ No newline at end of file +#endif diff --git a/Assets/Prefabs/RPG/Fog Patch.prefab b/Assets/Prefabs/RPG/Fog Patch.prefab new file mode 100644 index 000000000..64769c721 --- /dev/null +++ b/Assets/Prefabs/RPG/Fog Patch.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &791530951415938407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3040023561780424834} + - component: {fileID: 8539532519029615782} + - component: {fileID: 4655154266675363797} + m_Layer: 11 + m_Name: Fog Patch + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3040023561780424834 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791530951415938407} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -3148.4, y: -253.6, z: -1108.1} + m_LocalScale: {x: 1513.8295, y: 1513.8295, z: 1513.8295} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &8539532519029615782 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791530951415938407} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4655154266675363797 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791530951415938407} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8dd249f658a914548b4890537a80eab8, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/RPG/Fog Patch.prefab.meta b/Assets/Prefabs/RPG/Fog Patch.prefab.meta new file mode 100644 index 000000000..cf922e849 --- /dev/null +++ b/Assets/Prefabs/RPG/Fog Patch.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4084aa3d08e52e04f880ad13daa409b4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab b/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab index ed52273bd..431b3c1a2 100644 --- a/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 8842807112802394818} - component: {fileID: 8689774408369415534} - component: {fileID: 5705448000916375656} + - component: {fileID: -5496574226213385675} m_Layer: 21 m_Name: Dodecahedron m_TagString: Untagged @@ -186,6 +187,18 @@ MonoBehaviour: LabelDisplayMaxDistance: 500 ScanLabelContainer: {fileID: 6463386671854692106} ScanLabel: {fileID: 3355762817961458026} +--- !u!114 &-5496574226213385675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5284461483464579928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52538a3309c36fc4583c964a1c0b705f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &306400354849379669 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab b/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab index 1a3bdc861..fea9f67a9 100644 --- a/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 7449398549621940518} - component: {fileID: 4507103896627202189} - component: {fileID: 648083621841515580} + - component: {fileID: -5443764149998352794} m_Layer: 21 m_Name: Hexahedron m_TagString: Untagged @@ -186,6 +187,18 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &-5443764149998352794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7643266616531142933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52538a3309c36fc4583c964a1c0b705f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1190053687094253987 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab b/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab index 338345d75..e99ae3392 100644 --- a/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 8747099621875196907} - component: {fileID: 1545255963217739444} - component: {fileID: -5409019571952974707} + - component: {fileID: -2501508196100734606} m_Layer: 21 m_Name: Icosahedron m_TagString: Untagged @@ -186,6 +187,18 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &-2501508196100734606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7167547457198401877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52538a3309c36fc4583c964a1c0b705f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3463514625940279421 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/RPG/Pickups/Octahedron.prefab b/Assets/Prefabs/RPG/Pickups/Octahedron.prefab index 72204df41..7ba7910d2 100644 --- a/Assets/Prefabs/RPG/Pickups/Octahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Octahedron.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 946329779588188460} - component: {fileID: 7390748043139687254} - component: {fileID: -4611973708976329780} + - component: {fileID: -8908388773057984787} m_Layer: 21 m_Name: Octahedron m_TagString: Untagged @@ -186,6 +187,18 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &-8908388773057984787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555821447211356933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52538a3309c36fc4583c964a1c0b705f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2076349920387032576 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab b/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab index fc4110b3b..26c2b96dd 100644 --- a/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 4008709970769624704} - component: {fileID: 7436534270673427838} - component: {fileID: -6589342969031261525} + - component: {fileID: 5724758014884646323} m_Layer: 21 m_Name: Tetrahedron m_TagString: Untagged @@ -186,6 +187,18 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &5724758014884646323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7767746557817481743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52538a3309c36fc4583c964a1c0b705f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6290826240748108471 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Action Slot.prefab b/Assets/Prefabs/UI/Action Slot.prefab index 90fdbf9dd..6ecf19406 100644 --- a/Assets/Prefabs/UI/Action Slot.prefab +++ b/Assets/Prefabs/UI/Action Slot.prefab @@ -306,6 +306,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3468b3db8d419c745b12124f6432696b, type: 3} m_Name: m_EditorClassIdentifier: + SuppressDisable: 1 --- !u!114 &2829353637824256212 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Aetheria.inputactions b/Assets/Resources/Aetheria.inputactions index 3679673c6..a09980439 100644 --- a/Assets/Resources/Aetheria.inputactions +++ b/Assets/Resources/Aetheria.inputactions @@ -11,7 +11,8 @@ "id": "197ba05c-054a-44fc-8328-0d37e8ac00db", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true }, { "name": "Look", @@ -19,7 +20,8 @@ "id": "323b9ea0-f916-4609-b697-322fc0ef9420", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true }, { "name": "Minimap Zoom", @@ -27,7 +29,8 @@ "id": "5708685d-78bd-4d2b-8796-712704f21bfb", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Target Reticle", @@ -35,7 +38,8 @@ "id": "86f2e6cc-b895-4c55-aa19-70220df477d2", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Target Previous", @@ -43,7 +47,8 @@ "id": "2cf8e2b2-1463-463b-8f55-e79884f3767d", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Target Next", @@ -51,7 +56,8 @@ "id": "1e2bd5af-e174-4533-8c57-b04b7e9df92c", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Target Nearest", @@ -59,7 +65,8 @@ "id": "b2a42777-c22b-48f3-9e74-8dc715449845", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Toggle Heatsinks", @@ -67,7 +74,8 @@ "id": "e6c6ff6a-4ac2-4e53-a3c9-9461f52e723f", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Toggle Shield", @@ -75,7 +83,8 @@ "id": "5566504f-ee89-4eb9-9bbb-03f4b22dfe7d", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Override Shutdown", @@ -83,7 +92,8 @@ "id": "62a64686-4670-43c9-81ee-bbb8578e284b", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Ping", @@ -91,7 +101,8 @@ "id": "cfc95f69-9b8a-41d5-a071-003b4e292524", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Hide UI", @@ -99,7 +110,8 @@ "id": "1cdb2515-91e1-4895-879d-8a7347e60b21", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Tractor Beam", @@ -107,7 +119,17 @@ "id": "e61d5d8e-eaf7-449d-8d54-624e15b6c964", "expectedControlType": "", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Turn", + "type": "Value", + "id": "b93a3495-742e-4536-a9c7-57d6ab81d04c", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -125,7 +147,7 @@ { "name": "WASD", "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", + "path": "Dpad(mode=1)", "interactions": "", "processors": "", "groups": "", @@ -341,6 +363,39 @@ "action": "Tractor Beam", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "1D Axis", + "id": "0a0e25af-91a6-4e29-ad62-649fdcb137bd", + "path": "1DAxis", + "interactions": "", + "processors": "", + "groups": "", + "action": "Turn", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "negative", + "id": "8536ca60-1fed-4f29-8060-04d46cfffcab", + "path": "/q", + "interactions": "", + "processors": "", + "groups": "", + "action": "Turn", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "positive", + "id": "19c175bf-d4e6-4626-8bee-91e0c473a94b", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "", + "action": "Turn", + "isComposite": false, + "isPartOfComposite": true } ] }, @@ -354,7 +409,8 @@ "id": "add1d35f-58cd-4789-8868-f0afb51d87bc", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true }, { "name": "Submit", @@ -362,7 +418,8 @@ "id": "766f9151-3f3d-4e12-8ade-ce5aacd3940f", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Cancel", @@ -370,7 +427,8 @@ "id": "9dc56d99-ed81-42c3-b38d-1a7e76688b34", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Point", @@ -378,7 +436,8 @@ "id": "dfeef3e2-b0cc-4a9c-97ea-48ab693ac37f", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Click", @@ -386,7 +445,8 @@ "id": "aae7decd-7584-44f4-87ad-09c14c406ead", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "ScrollWheel", @@ -394,7 +454,8 @@ "id": "25891af2-479b-4104-9a29-158aee22fa73", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "MiddleClick", @@ -402,7 +463,8 @@ "id": "dc9af334-4f90-46dc-9b77-f381faa04a79", "expectedControlType": "", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "RightClick", @@ -410,7 +472,8 @@ "id": "27901940-469e-42cd-92b3-f5f787a8d1d6", "expectedControlType": "", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Drag", @@ -418,7 +481,8 @@ "id": "0c96ec22-9571-46c8-94bf-199e70e919ed", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -808,7 +872,8 @@ "id": "e43f020b-dec0-43d2-a83b-1390d45819be", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Galaxy Map", @@ -816,7 +881,8 @@ "id": "d198f18c-8c55-4a31-a694-4959c763f664", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Inventory", @@ -824,7 +890,8 @@ "id": "dafe13a7-da46-408e-853e-6954e37da5c8", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Main Menu", @@ -832,7 +899,8 @@ "id": "0515c617-9dff-406f-ab3e-763971d532d3", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Input Screen", @@ -840,7 +908,8 @@ "id": "e76aa7e9-e24d-47e1-865d-ffe72ba5c1c2", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Interact", @@ -848,7 +917,8 @@ "id": "31f7b7e1-d15e-40e8-b74f-2d0dc4195d4d", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false } ], "bindings": [ diff --git a/Assets/Resources/Fog Patch Displacement.renderTexture b/Assets/Resources/Fog Patch Displacement.renderTexture index b9df14340..4a9ec6a14 100644 --- a/Assets/Resources/Fog Patch Displacement.renderTexture +++ b/Assets/Resources/Fog Patch Displacement.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 45 m_MipMap: 0 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Fog Patch.renderTexture b/Assets/Resources/Fog Patch.renderTexture index 4cbd4c474..51d858f0d 100644 --- a/Assets/Resources/Fog Patch.renderTexture +++ b/Assets/Resources/Fog Patch.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 512 m_Height: 512 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 45 m_MipMap: 0 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Fog Surface Displacement.renderTexture b/Assets/Resources/Fog Surface Displacement.renderTexture index e11d0fc02..9585a807b 100644 --- a/Assets/Resources/Fog Surface Displacement.renderTexture +++ b/Assets/Resources/Fog Surface Displacement.renderTexture @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 diff --git a/Assets/Resources/Fog Tint.renderTexture b/Assets/Resources/Fog Tint.renderTexture index ce5104847..37908baad 100644 --- a/Assets/Resources/Fog Tint.renderTexture +++ b/Assets/Resources/Fog Tint.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 512 m_Height: 512 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 74 m_MipMap: 1 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 2 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Influence.renderTexture b/Assets/Resources/Influence.renderTexture index 04f848caa..9b468a099 100644 --- a/Assets/Resources/Influence.renderTexture +++ b/Assets/Resources/Influence.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 512 m_Height: 512 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 45 m_MipMap: 0 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Minimap.renderTexture b/Assets/Resources/Minimap.renderTexture index da57951af..fd80cc0d3 100644 --- a/Assets/Resources/Minimap.renderTexture +++ b/Assets/Resources/Minimap.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 512 m_Height: 512 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 74 m_MipMap: 1 m_GenerateMips: 1 @@ -25,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -35,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/MinimapGravity.renderTexture b/Assets/Resources/MinimapGravity.renderTexture index 9627f1273..0e626184f 100644 --- a/Assets/Resources/MinimapGravity.renderTexture +++ b/Assets/Resources/MinimapGravity.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 128 m_Height: 128 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 49 m_MipMap: 0 m_GenerateMips: 1 @@ -25,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -35,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/MinimapInfluence.renderTexture b/Assets/Resources/MinimapInfluence.renderTexture index 7934db47d..8b58067d9 100644 --- a/Assets/Resources/MinimapInfluence.renderTexture +++ b/Assets/Resources/MinimapInfluence.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 128 m_Height: 128 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 45 m_MipMap: 0 m_GenerateMips: 1 @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -36,3 +37,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Resources/Settings.asset b/Assets/Resources/Settings.asset index 98563c312..3c25eee5a 100644 --- a/Assets/Resources/Settings.asset +++ b/Assets/Resources/Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55da90dde3c26e9654ce0a4b17aa8c22a424605241a20313fdef301fb5e72eea -size 13277 +oid sha256:2b7652746affdafe33f07f01fdb80a9fffa7c1c4511034ce051e44b016724dff +size 13324 diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 30cab2450..b12ffdc17 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -5245,7 +5245,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} + m_SensorSize: {x: 1, y: 1} m_Transitions: m_BlendHint: 3 m_InheritPosition: 0 @@ -7802,6 +7802,80 @@ MonoBehaviour: CopyRotation: 0 PixelSnapCamera: {fileID: 0} PixelSnapIncrement: 1 +--- !u!1001 &495677244 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalPosition.x + value: -148.1 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalPosition.z + value: -162.9 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837153162502999620, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_Name + value: Wormhole 1 + objectReference: {fileID: 0} + - target: {fileID: 4837153162502999620, guid: 4a77c480b4bb2a148954bd57dfe91d0b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4a77c480b4bb2a148954bd57dfe91d0b, type: 3} --- !u!1 &496438310 GameObject: m_ObjectHideFlags: 0 @@ -15623,6 +15697,7 @@ MonoBehaviour: type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!114 &990038541 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31228,6 +31303,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c03374f22d0a3d4882018de66894a84, type: 3} m_Name: m_EditorClassIdentifier: + GridMesh: {fileID: 2135526004} GridCamera: {fileID: 1537342003} Settings: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, type: 2} NebulaSurfaceHeight: {fileID: 8400000, guid: 2fc21a9d3e9647948b56e384cd9378b3, type: 2} @@ -31871,6 +31947,89 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2135526003 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 100000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_Name + value: CatmullGrid + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalPosition.y + value: -7.88 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000003774895 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300030, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 493bb263313ccb54493188c33eaf150c, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aa6193d250644494faa1b8492b0e98d1, type: 3} +--- !u!4 &2135526004 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: aa6193d250644494faa1b8492b0e98d1, + type: 3} + m_PrefabInstance: {fileID: 2135526003} + m_PrefabAsset: {fileID: 0} --- !u!114 &114477922027825946 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Test.asset b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Test.asset new file mode 100644 index 000000000..f5d78ae20 --- /dev/null +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Test.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d64dfbf97974d205b979257222ab7dbf7c6f264fca9f30d068a1467268b1f13 +size 27836 diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Test.asset.meta b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Test.asset.meta new file mode 100644 index 000000000..d6be7d29b --- /dev/null +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Test.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b80802908cfba8846807eff8e86a2585 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset index bd9d9aaa4..8fcce37bc 100644 --- a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41f6f01317fe6d368cad7e729ebf88224a9c067e0869a7af3d91a2e47eaefc39 -size 27819 +oid sha256:47e4bbd8659ba5c805d87bfc7a00619d2133716786deff8d5b4bbebf7ffbf8b9 +size 27827 diff --git a/Assets/Scenes/FieldShieldTest.unity b/Assets/Scenes/FieldShieldTest.unity index ba9f96c1c..cc76a96a1 100644 --- a/Assets/Scenes/FieldShieldTest.unity +++ b/Assets/Scenes/FieldShieldTest.unity @@ -23,10 +23,10 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 5 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} + m_SkyboxMaterial: {fileID: 2100000, guid: 79db663d2fbb102459f8b1caf620f8c9, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.023674645, g: 0.04639011, b: 0.122535154, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -155,7 +155,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 815358592} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -213,6 +213,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 87891008} m_CullTransparentMesh: 1 +--- !u!1 &307955061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 307955065} + - component: {fileID: 307955064} + - component: {fileID: 307955063} + - component: {fileID: 307955062} + m_Layer: 5 + m_Name: Click Catcher.1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &307955062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307955061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20fa7724865c6b04097615292a325dfe, type: 3} + m_Name: + m_EditorClassIdentifier: + DragDistance: 25 +--- !u!114 &307955063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307955061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &307955064 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307955061} + m_CullTransparentMesh: 1 +--- !u!224 &307955065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307955061} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 815358592} + m_RootOrder: 3 + 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!1001 &401779934 PrefabInstance: m_ObjectHideFlags: 0 @@ -456,7 +546,7 @@ PrefabInstance: type: 3} propertyPath: CancelClickCatcher value: - objectReference: {fileID: 1618381686} + objectReference: {fileID: 307955062} - target: {fileID: 9194050153027168359, guid: 5c3a7b786419db74a8c1d17039fd4f67, type: 3} propertyPath: m_Pivot.x @@ -470,7 +560,7 @@ PrefabInstance: - target: {fileID: 9194050153027168359, guid: 5c3a7b786419db74a8c1d17039fd4f67, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 9194050153027168359, guid: 5c3a7b786419db74a8c1d17039fd4f67, type: 3} @@ -697,6 +787,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 686a80c9880b431b94a9b0029d39cf1f, type: 3} m_Name: m_EditorClassIdentifier: + PickupCount: 64 + PickupPrefabs: + - {fileID: 7436534270673427838, guid: 521bfeece7dd5fd4e8f166d38493f18c, type: 3} + - {fileID: 4507103896627202189, guid: 366909b6a01d7254d8eef01c333f8e00, type: 3} + - {fileID: 7390748043139687254, guid: d2b7e9a9cd7733041b0553682e4b61af, type: 3} + - {fileID: 5705448000916375656, guid: d2cec1d8c3d94074e9d2e6088e1c02d7, type: 3} + - {fileID: 1545255963217739444, guid: f399719f41451754eba07ca072698b68, type: 3} + PickupTravelDistance: 128 + PickupTravelTimeMin: 16 + PickupTravelTimeMax: 32 + PickupSizeMin: 0.5 + PickupSizeMax: 1 + ScaleExponent: 2 + PickupSpawnDistanceMin: 5 + PickupSpawnDistanceMax: 20 Camera: {fileID: 1153356615} TestField: {fileID: 909026488} Properties: {fileID: 401779935} @@ -810,6 +915,7 @@ RectTransform: - {fileID: 1618381684} - {fileID: 401779936} - {fileID: 1112533349} + - {fileID: 307955065} - {fileID: 415327856} - {fileID: 87891009} m_Father: {fileID: 0} @@ -840,7 +946,7 @@ PrefabInstance: - target: {fileID: 1080751213609904173, guid: fe47fadcdb5ae5c4caca516b4af6fde6, type: 3} propertyPath: m_LocalScale.x - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1080751213609904173, guid: fe47fadcdb5ae5c4caca516b4af6fde6, type: 3} @@ -921,7 +1027,7 @@ MeshCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 0 + m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -5495902117074765545, guid: dd6644c1aa6c16c47bb9fea9822ce805, type: 3} --- !u!114 &909026488 @@ -936,6 +1042,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a9ee74b07ad0390459302080d186cc58, type: 3} m_Name: m_EditorClassIdentifier: + Camera: {fileID: 1153356615} TestMagnitude: 0.5 Throttle: x: 0 @@ -943,9 +1050,7 @@ MonoBehaviour: ThrottleDecay: 5 FlowSpeed: 2 FlowSpeedThrottleExponent: 1 - FlowMagnitude: 2 - FlowMagnitudeThrottleExponent: 2 - FlowOpacityThrottleExponent: 1 + WaveThrottleExponent: 0 MaxHits: 16 MagnitudeTimeScaling: Exponent: 0.333 @@ -958,6 +1063,16 @@ MonoBehaviour: MeleeDuration: 3 MeleeAngle: 180 MeleeAngleExponent: 0.5 + TendrilBaseRadius: 3 + TendrilTipRadius: 0.25 + TendrilExtensionExponent: 2 + TendrilExtendBaseAnimationExponent: 0.5 + TendrilBaseDamping: 2 + TendrilTipRadiusAnimationExponent: 2 + TendrilFadeExponent: 2 + GrabExtendTime: 1.5 + GrabEnvelopTime: 0.75 + GrabPullTime: 1.5 RefractionAxis: 1 --- !u!114 &909026489 MonoBehaviour: @@ -1360,7 +1475,7 @@ Camera: m_GameObject: {fileID: 1153356610} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 2 m_BackGroundColor: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -1376,7 +1491,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 15 + field of view: 30 orthographic: 0 orthographic size: 5 m_Depth: 0 @@ -1424,7 +1539,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Name: m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: 59a61f0cd928369448838883100e06e6, type: 2} + sharedProfile: {fileID: 11400000, guid: b80802908cfba8846807eff8e86a2585, type: 2} isGlobal: 1 blendDistance: 0 weight: 1 @@ -1511,7 +1626,7 @@ MonoBehaviour: m_EditorClassIdentifier: Layers: serializedVersion: 2 - m_Bits: 1 + m_Bits: 2097153 RayCamera: {fileID: 1153356615} --- !u!114 &1618381686 MonoBehaviour: diff --git a/Assets/Scripts/AetheriaInput.cs b/Assets/Scripts/AetheriaInput.cs index 6c33c1dc2..d78a826ac 100644 --- a/Assets/Scripts/AetheriaInput.cs +++ b/Assets/Scripts/AetheriaInput.cs @@ -143,6 +143,15 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": true + }, + { + ""name"": ""Turn"", + ""type"": ""Value"", + ""id"": ""b93a3495-742e-4536-a9c7-57d6ab81d04c"", + ""expectedControlType"": ""Axis"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": true } ], ""bindings"": [ @@ -160,7 +169,7 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable { ""name"": ""WASD"", ""id"": ""00ca640b-d935-4593-8157-c05846ea39b3"", - ""path"": ""Dpad"", + ""path"": ""Dpad(mode=1)"", ""interactions"": """", ""processors"": """", ""groups"": """", @@ -376,6 +385,39 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable ""action"": ""Tractor Beam"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": ""1D Axis"", + ""id"": ""0a0e25af-91a6-4e29-ad62-649fdcb137bd"", + ""path"": ""1DAxis"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Turn"", + ""isComposite"": true, + ""isPartOfComposite"": false + }, + { + ""name"": ""negative"", + ""id"": ""8536ca60-1fed-4f29-8060-04d46cfffcab"", + ""path"": ""/q"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Turn"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""positive"", + ""id"": ""19c175bf-d4e6-4626-8bee-91e0c473a94b"", + ""path"": ""/e"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Turn"", + ""isComposite"": false, + ""isPartOfComposite"": true } ] }, @@ -1027,6 +1069,7 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable m_Player_Ping = m_Player.FindAction("Ping", throwIfNotFound: true); m_Player_HideUI = m_Player.FindAction("Hide UI", throwIfNotFound: true); m_Player_TractorBeam = m_Player.FindAction("Tractor Beam", throwIfNotFound: true); + m_Player_Turn = m_Player.FindAction("Turn", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); @@ -1118,6 +1161,7 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable private readonly InputAction m_Player_Ping; private readonly InputAction m_Player_HideUI; private readonly InputAction m_Player_TractorBeam; + private readonly InputAction m_Player_Turn; public struct PlayerActions { private @AetheriaInput m_Wrapper; @@ -1135,6 +1179,7 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable public InputAction @Ping => m_Wrapper.m_Player_Ping; public InputAction @HideUI => m_Wrapper.m_Player_HideUI; public InputAction @TractorBeam => m_Wrapper.m_Player_TractorBeam; + public InputAction @Turn => m_Wrapper.m_Player_Turn; public InputActionMap Get() { return m_Wrapper.m_Player; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -1183,6 +1228,9 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable @TractorBeam.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTractorBeam; @TractorBeam.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTractorBeam; @TractorBeam.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTractorBeam; + @Turn.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTurn; + @Turn.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTurn; + @Turn.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTurn; } m_Wrapper.m_PlayerActionsCallbackInterface = instance; if (instance != null) @@ -1226,6 +1274,9 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable @TractorBeam.started += instance.OnTractorBeam; @TractorBeam.performed += instance.OnTractorBeam; @TractorBeam.canceled += instance.OnTractorBeam; + @Turn.started += instance.OnTurn; + @Turn.performed += instance.OnTurn; + @Turn.canceled += instance.OnTurn; } } } @@ -1442,6 +1493,7 @@ public partial class @AetheriaInput : IInputActionCollection2, IDisposable void OnPing(InputAction.CallbackContext context); void OnHideUI(InputAction.CallbackContext context); void OnTractorBeam(InputAction.CallbackContext context); + void OnTurn(InputAction.CallbackContext context); } public interface IUIActions { diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index c84e143a4..88d63266b 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -20,6 +20,7 @@ using UnityEngine.Rendering.PostProcessing; using UnityEngine.Serialization; using UnityEngine.UI; using Unity.Mathematics; +using UnityEditor.Localization.Plugins.XLIFF.V12; using UnityEngine.EventSystems; using static Unity.Mathematics.math; using float2 = Unity.Mathematics.float2; @@ -294,7 +295,7 @@ public class ActionGameManager : MonoBehaviour Input.Global.ZoneMap.performed += context => { ToggleMenuTab(MenuTab.Map); - MenuMap.Position = CurrentEntity.Position.xz; + MenuMap.Position = CurrentEntity.Position.xz; }; Input.Global.Inventory.performed += context => ToggleMenuTab(MenuTab.Inventory); @@ -457,7 +458,8 @@ public class ActionGameManager : MonoBehaviour return slot; } - foreach (var actionBarInput in PlayerSettings.InputSettings.ActionBarInputs.OrderBy(i=>i)) createBinding(actionBarInput); + var bindings = PlayerSettings.InputSettings.ActionBarInputs.OrderBy(i => i) + .Select(createBinding).ToList(); #endregion @@ -465,6 +467,16 @@ public class ActionGameManager : MonoBehaviour StartGame(); + //if (!PlayerSettings.InputSettings.ActionBarInputs.Any()) + { + var newbinds = Enumerable.Range(0, 64)//CurrentEntity.WeaponGroups + .Zip( + bindings, + (i, slot) => + slot.Binding = new ActionBarWeaponGroupBinding(CurrentEntity, slot, i) + ); + } + ConsoleController.AddCommand("revealzones", _ => { @@ -1306,4 +1318,4 @@ public class EquippedItemDragObject : ItemDragObject public EquippedItem EquippedItem { get; } public Entity OriginEntity { get; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index 1acede398..f68ccc726 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -337,7 +337,7 @@ public class EntityInstance : MonoBehaviour // U coordinate between 0-1 indicates a hit that didn't land directly on a hardpoint // Find the 2D position of the hit scaled to the schematic float2 hitPos = float2.zero; - if (hardpointIndex < 0) + if (hardpointIndex < 0 || hardpointIndex >= hullData.Hardpoints.Count) { hitPos = float2(hit.TexCoord.x * hullData.Shape.Width, hit.TexCoord.y * hullData.Shape.Height); // Search all schematic border cells for the cell which is closest to the hit position diff --git a/Assets/Scripts/Gameplay/FieldDriver.cs b/Assets/Scripts/Gameplay/FieldDriver.cs index 4f1b1cd04..bca30c68f 100644 --- a/Assets/Scripts/Gameplay/FieldDriver.cs +++ b/Assets/Scripts/Gameplay/FieldDriver.cs @@ -4,31 +4,28 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; using Unity.Mathematics; -using UnityEngine.Animations; using static Unity.Mathematics.math; public class FieldDriver : MonoBehaviour { + public Camera Camera; + public float2 Push; + public float FrontTwist; + public float RearTwist; [Inspectable] public float TestMagnitude; - public float2 Throttle; - [Inspectable] - public float ThrottleDecay = 1; [Inspectable] public float FlowSpeed; [Inspectable] public float FlowSpeedThrottleExponent; [Inspectable] - public float FlowMagnitude; - [Inspectable] - public float FlowMagnitudeThrottleExponent; - [Inspectable] - public float FlowOpacityThrottleExponent; + public float WaveThrottleExponent; + public int MaxHits; [Inspectable] public ExponentialCurve MagnitudeTimeScaling; - - [Inspectable] + + [Inspectable, InspectorHeader("Melee")] public float MeleeRange; [Inspectable] public float MeleeRangeExponent; @@ -42,16 +39,60 @@ public class FieldDriver : MonoBehaviour public float MeleeAngle; [Inspectable] public float MeleeAngleExponent; + + [Inspectable, InspectorHeader("Tendril")] + public float TendrilBaseRadius = 3; [Inspectable] - public Axis RefractionAxis = Axis.X; + public float TendrilTipRadius = .1f; + [Inspectable] + public float TendrilExtensionExponent = .75f; + [Inspectable] + public float TendrilExtendBaseAnimationExponent = .5f; + [Inspectable] + public float TendrilBaseDamping = 2; + [Inspectable] + public float TendrilTipRadiusAnimationExponent = 2f; + [Inspectable] + public float TendrilFadeExponent = 2; + // [Inspectable] + // public float GrabScaleAnimationExponent = .5f; + + [Inspectable, InspectorHeader("Grab")] + public float GrabExtendTime; + [Inspectable] + public float GrabEnvelopTime; + [Inspectable] + public float GrabPullTime; + + [Inspectable] + public RectTransform.Axis RefractionAxis = RectTransform.Axis.Horizontal; private Material _field; private ComputeBuffer _hitBuffer; private List _hits = new List(); - private float _pushWaveOffset; - private double2 _throttle; + private float _waveOffset; private float _meleeTime; private bool _meleeActive; + private MeshCollider _collider; + private Transform _grabObject; + private Vector3 _grabObjectStartPos; + private Vector3 _grabObjectStartTendrilBasePos; + private Vector3 _grabObjectEndPos; + private Vector3 _grabObjectVelocity; + private float _grabObjectScale; + private float _grabTime; + private GrabPhase _grabPhase; + private Vector3 _tendrilBasePos; + private Vector3 _tendrilBendTarget; + private Vector3 _tendrilTargetPos; + private float _fadePoint; + + private enum GrabPhase + { + Extend, + Envelop, + Pull + } private struct FieldHit { @@ -63,6 +104,7 @@ public class FieldDriver : MonoBehaviour void Start() { + _collider = GetComponent(); _field = GetComponent().material; var clickableCollider = GetComponent(); if(clickableCollider!=null) @@ -80,12 +122,12 @@ public class FieldDriver : MonoBehaviour if (_hits.Count >= MaxHits) return; var hit = new FieldHit { - Position = normalize(transform.InverseTransformPoint(position)), + Position = Vector3.Scale(normalize(transform.InverseTransformPoint(position)), transform.localScale), Direction = normalize(transform.rotation * direction), Magnitude = magnitude, Time = 0 }; - Debug.Log($"Received hit: Position={hit.Position}, Direction={hit.Direction}"); + //Debug.Log($"Received hit: Position={hit.Position}, Direction={hit.Direction}"); _hits.Add(hit); } @@ -97,8 +139,39 @@ public class FieldDriver : MonoBehaviour _meleeTime = 0; } + public bool CanGrab => _grabObject == null; + + public void GrabObject(Transform t, Vector3 v) + { + _grabPhase = GrabPhase.Extend; + _grabObject = t; + _grabObjectStartPos = t.position; + _grabObjectVelocity = v; + _grabObjectScale = t.localScale.x; + _tendrilBasePos = _grabObjectStartTendrilBasePos = _collider.ClosestPoint(_grabObjectStartPos); + _fadePoint = .999f; + } + void Update() { + + var pushMag = min(length(Push), 1); + + _waveOffset = frac(_waveOffset + Time.deltaTime * FlowSpeed * pow(max(pushMag, max(abs(FrontTwist), abs(RearTwist))), FlowSpeedThrottleExponent)); + + var refractionRotation = Matrix4x4.Rotate(Camera.transform.rotation).inverse; + if (RefractionAxis == RectTransform.Axis.Vertical) refractionRotation = + Matrix4x4.Rotate(Quaternion.Euler(90, 0, 0)) * refractionRotation; + + _field.SetFloat("_WaveOffset", _waveOffset * PI * 2); + _field.SetFloat("_Push", pushMag); + _field.SetVector("_PushDirection", new Vector4(-Push.x, 0, -Push.y)); + _field.SetFloat("_TwistFront", FrontTwist); + _field.SetFloat("_TwistRear", RearTwist); + + _field.SetVector("_InverseScale", new Vector4(1/transform.localScale.x,1/transform.localScale.y,1/transform.localScale.z)); + _field.SetMatrix("_ReflRotate", refractionRotation); + for (int i = 0; i < _hits.Count; i++) { var hit = _hits[i]; @@ -110,38 +183,123 @@ public class FieldDriver : MonoBehaviour i--; } } + _hitBuffer.SetData(_hits); + _field.SetBuffer("_Hits", _hitBuffer); + _field.SetInt("_HitCount", _hits.Count); if (_meleeActive) { _meleeTime += Time.deltaTime / MeleeDuration; - if (_meleeTime > 1) + if (_meleeTime < 1) + { + _field.SetVector("_MeleeDirection", Quaternion.AngleAxis(sign(_meleeTime*2-1) * MeleeAngle * pow(abs(_meleeTime * 2 - 1), MeleeAngleExponent), Vector3.up) * -Vector3.forward); + _field.SetFloat("_MeleeDisplacement", pow(1 - 2 * abs(_meleeTime - .5f), MeleeRangeExponent) * MeleeRange); + _field.SetFloat("_MeleeShape", MeleeShaping); + _field.SetFloat("_MeleeFlattening", MeleeFlatness); + } + else { _meleeActive = false; + _field.SetFloat("_MeleeDisplacement", 0); } } + + + if(_grabObject != null) + { + _grabTime += Time.deltaTime / _grabPhase switch + { + GrabPhase.Extend => GrabExtendTime, + GrabPhase.Envelop => GrabEnvelopTime, + GrabPhase.Pull => GrabPullTime, + _ => throw new ArgumentOutOfRangeException() + }; + if (_grabTime > 1) + { + _grabTime = 0; + if (_grabPhase == GrabPhase.Envelop) + { + _grabObjectEndPos = _grabObject.position; + } + if (_grabPhase == GrabPhase.Pull) + { + Destroy(_grabObject.gameObject); + _grabObject = null; + _field.SetFloat("_TendrilInfluence", 0); + } + else _grabPhase++; + } - _throttle = AetheriaMath.Damp(_throttle, Throttle, ThrottleDecay, Time.deltaTime); - var throttleDir = (float2) normalize(_throttle); + if (_grabObject != null) + { + _tendrilBasePos = AetheriaMath.Damp(_tendrilBasePos, _grabObject.position, TendrilBaseDamping, Time.deltaTime); + switch (_grabPhase) + { + case GrabPhase.Extend: + _tendrilBendTarget = _grabObjectStartPos; + _grabObject.position += _grabObjectVelocity * Time.deltaTime; + _tendrilTargetPos = lerp( + lerp(_grabObjectStartTendrilBasePos, _grabObjectStartPos, _grabTime), + lerp(_grabObjectStartPos, _grabObject.position, _grabTime), + pow(_grabTime, TendrilExtensionExponent)); + _field.SetFloat("_TendrilInfluence", pow(_grabTime, TendrilExtendBaseAnimationExponent)); + _field.SetFloat("_TendrilSize", lerp(TendrilBaseRadius/2,TendrilBaseRadius,pow(_grabTime, TendrilExtendBaseAnimationExponent))); + _field.SetFloat("_TendrilRadius", _grabObjectScale * pow(_grabTime, TendrilTipRadiusAnimationExponent) * TendrilTipRadius); + break; + case GrabPhase.Envelop: + _tendrilBendTarget = _grabObjectStartPos; + _tendrilTargetPos = _grabObject.position += _grabObjectVelocity * Time.deltaTime * (1-_grabTime); + _field.SetFloat("_TendrilInfluence", 1); + _field.SetFloat("_TendrilSize", TendrilBaseRadius); + _field.SetFloat("_TendrilRadius", _grabObjectScale * TendrilTipRadius); + break; + case GrabPhase.Pull: + _tendrilTargetPos = _grabObject.position = lerp(_grabObjectEndPos, transform.position, _grabTime*_grabTime); + _tendrilBendTarget = lerp(_grabObjectStartPos, _grabObjectEndPos, _grabTime*_grabTime); + if (_fadePoint > .99 && transform.InverseTransformPoint(_grabObject.position).sqrMagnitude < 1) + _fadePoint = _grabTime; + _field.SetFloat("_TendrilInfluence", pow(smoothstep(1, _fadePoint, _grabTime), TendrilFadeExponent)); + _field.SetFloat("_TendrilSize", TendrilBaseRadius); + _field.SetFloat("_TendrilRadius", _grabObjectScale * TendrilTipRadius); + break; + default: + throw new ArgumentOutOfRangeException(); + } + _field.SetVector("_TendrilBase", Vector3.Scale(transform.InverseTransformPoint(_tendrilBasePos).normalized, transform.localScale)); + _field.SetVector("_TendrilBend", Vector3.Scale(transform.InverseTransformPoint(_tendrilBendTarget), transform.localScale)); + _field.SetVector("_TendrilTarget", Vector3.Scale(transform.InverseTransformPoint(_tendrilTargetPos), transform.localScale)); + } + } + } + + private float almostIdentity( float x ) + { + return x*x*(2.0f-x); + } - var throttleMag = min(length(_throttle), 1); + private float smooth(float t) + { + return t * t * (3.0f - 2.0f * t); + } - _pushWaveOffset = frac(_pushWaveOffset + Time.deltaTime * FlowSpeed * (float) pow(throttleMag, FlowSpeedThrottleExponent)); + private const int GIZMO_STEPS = 16; + private void OnDrawGizmosSelected() + { + if (_grabObject != null) + { + Vector3 previous = _tendrilBasePos; + for (int i = 1; i <= GIZMO_STEPS; i++) + { + var l = (float)i / GIZMO_STEPS; + var next = AetheriaMath.GetQuadraticSplinePosition(_tendrilBasePos, _tendrilBendTarget, _tendrilTargetPos, l); + Gizmos.DrawLine(previous, next); + previous = next; + } + } + } - var refractionRotation = Matrix4x4.Rotate(transform.rotation); - if (RefractionAxis == Axis.Y) refractionRotation = Matrix4x4.Rotate(Quaternion.Euler(90, 0, 0)) * refractionRotation; - if (RefractionAxis == Axis.X) refractionRotation = Matrix4x4.Rotate(Quaternion.Euler(0, 90, 0)) * refractionRotation; - _hitBuffer.SetData(_hits); - _field.SetBuffer("_Hits", _hitBuffer); - _field.SetInt("_HitCount", _hits.Count); - _field.SetFloat("_PushWaveMagnitude", FlowMagnitude * (float) pow(throttleMag, FlowMagnitudeThrottleExponent)); - _field.SetFloat("_PushOpacity", (float) pow(throttleMag, FlowOpacityThrottleExponent)); - _field.SetFloat("_PushWaveOffset", _pushWaveOffset); - _field.SetVector("_PushDirection", new Vector4(throttleDir.x,0,throttleDir.y)); - _field.SetVector("_InverseScale", new Vector4(1/transform.localScale.x,1/transform.localScale.y,1/transform.localScale.z)); - _field.SetMatrix("_ReflRotate", refractionRotation); - _field.SetVector("_MeleeDirection", Quaternion.AngleAxis(sign(_meleeTime*2-1) * MeleeAngle * pow(abs(_meleeTime * 2 - 1), MeleeAngleExponent), Vector3.up) * -Vector3.forward); - _field.SetFloat("_MeleeDisplacement", pow(1 - 2 * abs(_meleeTime - .5f), MeleeRangeExponent) * MeleeRange); - _field.SetFloat("_MeleeShape", MeleeShaping); - _field.SetFloat("_MeleeFlattening", MeleeFlatness); + private void OnDestroy() + { + _hitBuffer.Dispose(); } } diff --git a/Assets/Scripts/Gameplay/FieldDriver.cs.meta b/Assets/Scripts/Gameplay/FieldDriver.cs.meta index 499cfc0ad..d1569de02 100644 --- a/Assets/Scripts/Gameplay/FieldDriver.cs.meta +++ b/Assets/Scripts/Gameplay/FieldDriver.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 300 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Gameplay/GridObject.cs b/Assets/Scripts/Gameplay/GridObject.cs index ef722a1d2..772ed781c 100644 --- a/Assets/Scripts/Gameplay/GridObject.cs +++ b/Assets/Scripts/Gameplay/GridObject.cs @@ -26,9 +26,11 @@ public class GridObject : MonoBehaviour void Update() { + var t = transform; + t.localRotation = Quaternion.Euler(sin(Time.time - _timeOffset * RotationSpeed) * 90, 0, cos(Time.time - _timeOffset * RotationSpeed) * 90); + if (Zone == null) return; - var t = transform; var position = t.position; var gridHeight = Zone.GetHeight(position.Flatland()) + GridOffset; Velocity += Vector3.up * (sign(gridHeight - position.y) * GridAttraction * Time.deltaTime); @@ -44,6 +46,5 @@ public class GridObject : MonoBehaviour _selfVelocity *= max(0, 1 - Drag * Time.deltaTime); t.position = position + (Velocity + new Vector3(_selfVelocity.x, 0, _selfVelocity.y)) * Time.deltaTime; - t.localRotation = Quaternion.Euler(sin(Time.time - _timeOffset * RotationSpeed) * 90, 0, cos(Time.time - _timeOffset * RotationSpeed) * 90); } } \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/ItemPickup.cs b/Assets/Scripts/Gameplay/ItemPickup.cs index 22448e337..81436f564 100644 --- a/Assets/Scripts/Gameplay/ItemPickup.cs +++ b/Assets/Scripts/Gameplay/ItemPickup.cs @@ -36,6 +36,6 @@ public class ItemPickup : MonoBehaviour private void OnDestroy() { - ZoneRenderer.DestroyLoot(this); + ZoneRenderer?.DestroyLoot(this); } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs b/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs deleted file mode 100644 index 8236fea82..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs +++ /dev/null @@ -1,147 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -// using System; -// using System.Collections; -// using System.Collections.Generic; -// using System.Linq; -// using MessagePack; -// using Newtonsoft.Json; -// using Unity.Mathematics; -// using static Unity.Mathematics.math; -// -// [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)] -// public class HaulingControllerData : ControllerData -// { -// [InspectableField, JsonProperty("targetDistance"), Key(6)] -// public float DockTime = 2; -// public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item) -// { -// return new HaulingController(context, this, entity, item); -// } -// } -// -// public class HaulingController : ControllerBase, IBehavior, IPersistentBehavior -// { -// private HaulingControllerData _data; -// private EquippedItem Item { get; } -// -// private bool _taskStarted; -// private int _itemsDelivered; -// private int _itemsCarried; -// private SimpleCommodity _simpleCommodityDelivery; -// private List _craftedItemDelivery = new List(); -// -// public HaulingController(ItemManager itemManager, HaulingControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity) -// { -// _data = data; -// Item = item; -// } -// -// public new bool Execute(float delta) -// { -// if (Task != null) -// { -// if (!_taskStarted) -// { -// MoveTo(Task.Origin, true, OnPickup); -// //MoveTo(haulingTask.Zone, OnOriginZoneArrival); -// _taskStarted = true; -// } -// } -// return base.Execute(delta); -// } -// -// // void OnOriginZoneArrival() -// // { -// // var haulingTask = _context.ItemData.Get(Task); -// // -// // _entity.SetMessage("Entering pickup phase."); -// // -// // MoveTo(_context.ItemData.Get(haulingTask.Origin), true, OnPickup); -// // } -// -// void OnPickup() -// { -// Entity.SetParent(Task.Origin); -// -// _itemsCarried = Task.Origin.TryTransferItems(Entity, Task.ItemType, Task.Quantity - _itemsDelivered); -// -// if (_itemsCarried == 0) -// { -// FinishTask(); -// return; -// } -// -// Wait(_data.DockTime, OnItemObtained); -// } -// -// void OnItemObtained() -// { -// Entity.SetMessage("Entering delivery phase."); -// -// MoveTo(Task.Target, true, OnDelivery); -// //MoveTo(target.Zone.Data.ID, OnTargetZoneArrival); -// } -// -// // void OnTargetZoneArrival() -// // { -// // var haulingTask = _context.ItemData.Get(Task); -// // -// // MoveTo(_context.ItemData.Get(haulingTask.Target), true, OnDelivery); -// // } -// -// void OnDelivery() -// { -// Entity.SetParent(Task.Target); -// -// var itemsDelivered = Entity.TryTransferItems(Task.Target, Task.ItemType, _itemsCarried); -// _itemsCarried -= itemsDelivered; -// _itemsDelivered += itemsDelivered; -// -// Wait(_data.DockTime, () => -// { -// // We were unable to transfer all onboard items to target entity, cargo is probably full. Bring back the surplus and end the mission -// if(_itemsCarried > 0) -// MoveTo(Task.Origin, true, ReturnSurplusToOrigin); -// // We have delivered the target quantity of items, end the mission -// else if(_itemsDelivered >= Task.Quantity) -// FinishTask(); -// // We aren't done yet. Resetting the task will make us go for another delivery run -// else -// _taskStarted = false; -// }); -// } -// -// void ReturnSurplusToOrigin() -// { -// Entity.SetParent(Task.Origin); -// -// Entity.TryTransferItems(Task.Origin, Task.ItemType, _itemsCarried); -// -// Wait(_data.DockTime, OnItemObtained); -// -// FinishTask(); -// } -// -// public PersistentBehaviorData Store() -// { -// return new HaulingControllerPersistence -// { -// Task = Task -// }; -// } -// -// public void Restore(PersistentBehaviorData data) -// { -// var towingControllerPersistence = data as HaulingControllerPersistence; -// Task = towingControllerPersistence.Task; -// } -// } -// -// public class HaulingControllerPersistence : PersistentBehaviorData -// { -// [JsonProperty("task"), Key(0)] -// public HaulingTask Task; -// } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs.meta b/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs.meta deleted file mode 100644 index 041e2da74..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/HaulingController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e8c5153aa2579174c901c552bfb495a4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ServerShared/Behaviors/MiningController.cs b/Assets/Scripts/ServerShared/Behaviors/MiningController.cs deleted file mode 100644 index 47478f537..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/MiningController.cs +++ /dev/null @@ -1,141 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using MessagePack; -using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; - -// [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)] -// public class MiningControllerData : ControllerData -// { -// public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item) -// { -// return new MiningController(context, this, entity, item); -// } -// } -// -// public class MiningController : ControllerBase, IBehavior, IPersistentBehavior, IInitializableBehavior -// { -// -// private MiningControllerData _data; -// private EquippedItem Item { get; } -// private bool _taskStarted; -// private int _asteroid = -1; -// private MiningTool _miningTool; -// private Switch _toolSwitch; -// -// public MiningController(ItemManager itemManager, MiningControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity) -// { -// _data = data; -// Item = item; -// } -// -// public new void Initialize() -// { -// // _miningTool = Entity.GetBehavior(); -// // _toolSwitch = Entity.GetSwitch(); -// base.Initialize(); -// } -// -// public new bool Execute(float delta) -// { -// // if (Task != null) -// // { -// // if (!_taskStarted) -// // { -// // NextAsteroid(); -// // _taskStarted = true; -// // } -// // else -// // { -// // if (!Moving) -// // { -// // if (_entity.OccupiedCapacity < _entity.Capacity - 1) -// // { -// // var asteroidTransform = Zone.GetAsteroidTransform(Task.Asteroids, _asteroid); -// // if (length(_entity.Position - asteroidTransform.xy) - asteroidTransform.w > _miningTool.Range) -// // { -// // _entity.SetMessage("Moving to target asteroid."); -// // MoveTo(() => Zone.GetAsteroidTransform(Task.Asteroids, _asteroid).xy, -// // () => Zone.GetAsteroidVelocity(Task.Asteroids, _asteroid)); -// // _toolSwitch.Activated = false; -// // } -// // else -// // { -// // if (Zone.AsteroidExists(Task.Asteroids, _asteroid)) -// // { -// // _miningTool.AsteroidBelt = Task.Asteroids; -// // _miningTool.Asteroid = _asteroid; -// // _toolSwitch.Activated = true; -// // Aim.Objective = Zone.GetAsteroidTransform(Task.Asteroids, _asteroid).xy; -// // Aim.Update(delta); -// // } -// // else NextAsteroid(); -// // } -// // } -// // else -// // { -// // _entity.SetMessage("Out of cargo space. Returning home to offload cargo."); -// // GoHome(OnArriveHome); -// // } -// // } -// // } -// // } -// return base.Execute(delta); -// } -// -// // private void OnArriveHome() -// // { -// // var homeEntity = _context.ItemData.Get(HomeEntity); -// // foreach (var item in _entity.Cargo -// // .Select(id => _context.ItemData.Get(id)) -// // .Where(item => item is SimpleCommodity) -// // .Cast() -// // .ToArray()) -// // { -// // int quantity = min((int) ((homeEntity.Capacity - homeEntity.OccupiedCapacity) / _context.GetData(item).Size), item.Quantity); -// // var newItem = _entity.RemoveCargo(item, quantity); -// // homeEntity.AddCargo(newItem); -// // -// // if (quantity < item.Quantity) -// // { -// // homeEntity.SetMessage("Colony is out of cargo space. Closing Mining Task."); -// // FinishTask(); -// // _taskStarted = false; -// // return; -// // } -// // } -// // } -// -// private void NextAsteroid() -// { -// _asteroid = Zone.NearestAsteroid(Task.Asteroids, Entity.Position.xz); -// Entity.SetMessage("Selecting new asteroid."); -// } -// -// public PersistentBehaviorData Store() -// { -// return new MiningControllerPersistence -// { -// Task = Task -// }; -// } -// -// public void Restore(PersistentBehaviorData data) -// { -// var miningControllerPersistence = data as MiningControllerPersistence; -// Task = miningControllerPersistence.Task; -// } -// } -// -// public class MiningControllerPersistence : PersistentBehaviorData -// { -// [JsonProperty("task"), Key(0)] -// public Mining Task; -// } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/MiningController.cs.meta b/Assets/Scripts/ServerShared/Behaviors/MiningController.cs.meta deleted file mode 100644 index 31d1d79bb..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/MiningController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b476455dca4333e4da76388aae46ac5e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ServerShared/Behaviors/ParticleEffect.cs b/Assets/Scripts/ServerShared/Behaviors/ParticleEffect.cs deleted file mode 100644 index 5e77eec4e..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/ParticleEffect.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System.Collections.Generic; -using MessagePack; -using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; - -// [MessagePackObject, JsonObject(MemberSerialization.OptIn)] -// public class ParticleEffectData : BehaviorData -// { -// [InspectablePrefab, JsonProperty("Particles"), Key(1)] -// public string ParticlesPrefab; -// -// [InspectableField, JsonProperty("thrust"), Key(2)] -// public bool AreaEmitter; -// -// public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item) -// { -// return new ParticleEffect(context, this, entity, item); -// } -// } -// -// public class ParticleEffect : IBehavior, IAlwaysUpdatedBehavior -// { -// private ParticleEffectData _data; -// -// public Entity Entity { get; } -// public EquippedItem Item { get; } -// public ItemManager Context { get; } -// -// public BehaviorData Data => _data; -// -// public float Emission { get; private set; } -// -// public ParticleEffect(ItemManager context, ParticleEffectData data, Entity entity, EquippedItem item) -// { -// Context = context; -// _data = data; -// Entity = entity; -// Item = item; -// } -// -// public float Execute(float delta, float input) -// { -// Emission = saturate(input); -// return input; -// } -// -// public void Update(float delta) -// { -// Emission = 0; -// } -// } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/ParticleEffect.cs.meta b/Assets/Scripts/ServerShared/Behaviors/ParticleEffect.cs.meta deleted file mode 100644 index 418b50d25..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/ParticleEffect.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3c26dc8102d619a429a178bc6670242d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ServerShared/Behaviors/TowingController.cs b/Assets/Scripts/ServerShared/Behaviors/TowingController.cs deleted file mode 100644 index beeae5baa..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/TowingController.cs +++ /dev/null @@ -1,104 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using MessagePack; -using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; - -// [MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), Order(-100)] -// public class TowingControllerData : ControllerData -// { -// public override IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item) -// { -// return new TowingController(context, this, entity, item); -// } -// } -// -// public class TowingController : ControllerBase, IBehavior, IPersistentBehavior -// { -// -// private TowingControllerData _data; -// private EquippedItem Item { get; } -// private bool _taskStarted; -// -// public TowingController(ItemManager itemManager, TowingControllerData data, Entity entity, EquippedItem item) : base(itemManager, data, entity) -// { -// _data = data; -// Item = item; -// } -// -// public new bool Execute(float delta) -// { -// if (Task != null) -// { -// if (!_taskStarted) -// { -// MoveTo(Task.Station, true, OnPickup); -// _taskStarted = true; -// } -// } -// return base.Execute(delta); -// } -// -// // void OnZoneArrival() -// // { -// // var towingTask = _context.ItemData.Get(Task); -// // -// // _entity.SetMessage("Entering pickup phase."); -// // -// // MoveTo(_context.ItemData.Get(towingTask.Station), true, OnPickup); -// // } -// -// void OnPickup() -// { -// Task.Station.SetParent(Entity); -// -// Entity.SetMessage("Entering delivery phase."); -// -// MoveTo(() => -// { -// var orbitParent = Zone.GetOrbitPosition(Task.OrbitParent); -// var parentToUs = Entity.Position.xz - orbitParent; -// return orbitParent + normalize(parentToUs) * Task.OrbitDistance; -// }, () => Zone.GetOrbitVelocity(Task.OrbitParent), OnDelivery); -// } -// -// void OnDelivery() -// { -// Task.Station.RemoveParent(); -// -// Entity.SetMessage("Target delivered. Returning Home."); -// -// var orbit = Zone.CreateOrbit(Task.OrbitParent, Entity.Position.xz); -// Task.Station.OrbitData = orbit.ID; -// -// FinishTask(); -// _taskStarted = false; -// } -// -// public PersistentBehaviorData Store() -// { -// return new TowingControllerPersistence -// { -// Task = Task -// }; -// } -// -// public void Restore(PersistentBehaviorData data) -// { -// var towingControllerPersistence = data as TowingControllerPersistence; -// Task = towingControllerPersistence.Task; -// } -// } -// -// public class TowingControllerPersistence : PersistentBehaviorData -// { -// [JsonProperty("task"), Key(0)] -// public StationTowing Task; -// } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/TowingController.cs.meta b/Assets/Scripts/ServerShared/Behaviors/TowingController.cs.meta deleted file mode 100644 index 7b0609463..000000000 --- a/Assets/Scripts/ServerShared/Behaviors/TowingController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: de134a549a7d86f43a3590b78a2edeee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ServerShared/CultCache/Attributes.cs b/Assets/Scripts/ServerShared/CultCache/Attributes.cs index c28eb8265..33a09c216 100644 --- a/Assets/Scripts/ServerShared/CultCache/Attributes.cs +++ b/Assets/Scripts/ServerShared/CultCache/Attributes.cs @@ -135,4 +135,12 @@ public class OrderAttribute : Attribute { Order = order; } +} + +[AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = true)] +public class InspectorHeaderAttribute : Attribute +{ + public readonly string header; + + public InspectorHeaderAttribute(string header) => this.header = header; } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Environment.cs b/Assets/Scripts/ServerShared/Environment.cs index f82fb63e6..d2fcac804 100644 --- a/Assets/Scripts/ServerShared/Environment.cs +++ b/Assets/Scripts/ServerShared/Environment.cs @@ -12,7 +12,8 @@ public class ZoneEnvironment [JsonProperty("nebula"), Key(0)] public NebulaSettings Nebula; [JsonProperty("flow"), Key(1)] public FlowSettings Flow; [JsonProperty("noise"), Key(2)] public NoiseSettings Noise; - [JsonProperty("lighting"), Key(2)] public AmbientLightingSettings Lighting; + [JsonProperty("lighting"), Key(3)] public AmbientLightingSettings Lighting; + [JsonProperty("grid"), Key(4)] public GridSettings Grid; } [Serializable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] @@ -33,6 +34,13 @@ public class NebulaSettings [JsonProperty("safetyDistance"), Key(10)] public float SafetyDistance; } +[Serializable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] +public class GridSettings +{ + [JsonProperty("enabled"), Key(0)] public bool Enabled; + [JsonProperty("offset"), Key(1)] public float Offset; +} + [Serializable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class AmbientLightingSettings { @@ -50,7 +58,7 @@ public class FlowSettings [JsonProperty("scrollSpeed"), Key(2)] public float GlobalScrollSpeed; [JsonProperty("period"), Key(3)] public float Period; [JsonProperty("amplitudeSlope"), Key(4)] public float SlopeAmplitude; - [JsonProperty("amplitudeSwirl"), Key(4)] public float SwirlAmplitude; + [JsonProperty("amplitudeSwirl"), Key(5)] public float SwirlAmplitude; } [Serializable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] @@ -151,4 +159,3 @@ public class RadialWaveBrush : TextureBrush return cos((ang + Phase.x) * Frequency.x * PI + (pow(dist, WaveExponent) + Phase.y) * Frequency.y); } } - diff --git a/Assets/Scripts/ServerShared/Galaxy.cs b/Assets/Scripts/ServerShared/Galaxy.cs index a6a52e2a2..fe2e55df3 100644 --- a/Assets/Scripts/ServerShared/Galaxy.cs +++ b/Assets/Scripts/ServerShared/Galaxy.cs @@ -523,7 +523,6 @@ public class Galaxy { MinHeap unsearchedNodes = new MinHeap(); unsearchedNodes.PushObj(new DijkstraVertex{Zone = source}, 0); - //SortedList members = new SortedList{{0, new DijkstraVertex{Zone = source}}}; var searched = new HashSet(); while (true) { @@ -543,7 +542,7 @@ public class Galaxy foreach (var dijkstraStar in zonesToSearch // Cost is parent cost plus distance squared .Select(zone => new DijkstraVertex {Parent = s, Zone = zone, Cost = s.Cost + lengthsq(s.Zone.Position - zone.Position)})) - // Add new member to list, sorted by cost plus optional heuristic + // Add new member to list, sorted by cost plus optional heuristic unsearchedNodes.PushObj(dijkstraStar, bestFirst ? dijkstraStar.Cost + lengthsq(dijkstraStar.Zone.Position - target.Position) : dijkstraStar.Cost); searched.Add(s.Zone); } @@ -582,4 +581,4 @@ public class LocationStory public LocationType Type; public int Turrets; public Dictionary> KnotQuests = new Dictionary>(); -} \ No newline at end of file +} diff --git a/Assets/Scripts/UI/FieldTester.cs b/Assets/Scripts/UI/FieldTester.cs index 2c506c575..aaefc2085 100644 --- a/Assets/Scripts/UI/FieldTester.cs +++ b/Assets/Scripts/UI/FieldTester.cs @@ -1,30 +1,112 @@ using System; +using System.Collections.Generic; using UnityEngine; using Unity.Mathematics; using static Unity.Mathematics.math; +using Random = UnityEngine.Random; public class FieldTester : MonoBehaviour { + public int PickupCount; + public ItemPickup[] PickupPrefabs; + public float PickupTravelDistance; + public float PickupTravelTimeMin; + public float PickupTravelTimeMax; + public float PickupSizeMin; + public float PickupSizeMax; + public float ScaleExponent; + public float PickupSpawnDistanceMin; + public float PickupSpawnDistanceMax; public Camera Camera; public FieldDriver TestField; public PropertiesPanel Properties; private AetheriaInput _input; private bool _forceThrust; + private float _throttleDecay = 2; + private bool _directionalPush; + private float _twistFront; + private float _twistRear; + + private List<(float lerp, float time, Transform transform)> _pickups = new List<(float lerp, float time, Transform transform)>(); private void Start() { _input = new AetheriaInput(); _input.Player.Enable(); + Properties.AddField("Time Scale", () => Time.timeScale, f => Time.timeScale = f, 0, 2); Properties.AddField("FOV", () => Camera.fieldOfView, f => Camera.fieldOfView = f, 15, 45); Properties.AddButton("Melee", () => TestField.Melee()); Properties.AddField("Force Thrust", () => _forceThrust, b => _forceThrust = b); + Properties.AddField("Directional Push", () => _directionalPush, b => _directionalPush = b); + Properties.AddField("Throttle Decay", () => _throttleDecay, f => _throttleDecay = f); Properties.Inspect(TestField, true, true); Properties.AddProperty("Current Hits", () => TestField.HitCount.ToString()); + Properties.AddProperty("Push X", () => $"{(int)(TestField.Push.x * 100)}%"); + Properties.AddProperty("Push Y", () => $"{(int)(TestField.Push.y * 100)}%"); + Properties.AddProperty("Front Twist", () => $"{(int)(TestField.FrontTwist * 100)}%"); + Properties.AddProperty("Rear Twist", () => $"{(int)(TestField.RearTwist * 100)}%"); + + for (int i = 0; i < PickupCount; i++) + { + var l = (float)i / PickupCount; + var pickup = Instantiate(PickupPrefabs[(int)(l * PickupPrefabs.Length)], transform); + var i1 = i; + var click = pickup.GetComponent(); + click.OnClick += (collider, data, ray, hit) => + { + if (!TestField.CanGrab) return; + click.Clear(); + var p = _pickups[i1]; + var travelTime = lerp(PickupTravelTimeMin, PickupTravelTimeMax, l); + TestField.GrabObject(p.transform, Vector3.forward * (PickupTravelDistance / travelTime)); + p.transform = null; + _pickups[i1] = p; + }; + + pickup.ScanLabelContainer.gameObject.SetActive(false); + pickup.enabled = false; + var pickupTransform = pickup.transform; + var time = Random.value; + var circle = Random.insideUnitCircle.normalized * Random.Range(PickupSpawnDistanceMin,PickupSpawnDistanceMax); + pickupTransform.position = new Vector3(circle.x,circle.y, (time-.5f)*PickupTravelDistance); + _pickups.Add((l, time, pickupTransform)); + } } private void Update() { - TestField.Throttle = _forceThrust ? float2(0,1) : _input.Player.Move.ReadValue(); + var move = _forceThrust ? float2(0,1) : (float2)_input.Player.Move.ReadValue(); + var turn = _input.Player.Turn.ReadValue(); + if (_directionalPush) + { + TestField.Push = AetheriaMath.Damp(TestField.Push, move, _throttleDecay, Time.deltaTime); + TestField.FrontTwist = AetheriaMath.Damp(TestField.FrontTwist, + turn, + _throttleDecay, Time.deltaTime); + TestField.RearTwist = AetheriaMath.Damp(TestField.RearTwist, + turn, + _throttleDecay, Time.deltaTime); + } + else + { + TestField.Push = AetheriaMath.Damp(TestField.Push, float2(0,move.y), _throttleDecay, Time.deltaTime); + TestField.FrontTwist = AetheriaMath.Damp(TestField.FrontTwist, + clamp(turn + move.x, -1, 1) * (1+min(move.y,0)), + _throttleDecay, Time.deltaTime); + TestField.RearTwist = AetheriaMath.Damp(TestField.RearTwist, + clamp(turn - move.x, -1, 1) * (1+min(-move.y,0)), + _throttleDecay, Time.deltaTime); + } + + for (var i = 0; i < _pickups.Count; i++) + { + var (l, time, t) = _pickups[i]; + if (t == null) continue; + time = frac(time + Time.deltaTime / lerp(PickupTravelTimeMin, PickupTravelTimeMax, l)); + t.localScale = Vector3.one * lerp(PickupSizeMin, PickupSizeMax, l) * Zone.PowerPulse(time - .5f, ScaleExponent); + t.position = new Vector3(t.position.x, t.position.y, (time - .5f) * PickupTravelDistance); + _pickups[i] = (l, time, t); + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs index 54c14f617..4a9a4d942 100644 --- a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs +++ b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs @@ -466,7 +466,7 @@ public class PropertiesPanel : MonoBehaviour Transform dragObject = null; weaponGroups.OnBeginDragAsObservable().Subscribe(x => { - //Debug.Log($"Began dragging weapon group {x.group}"); + Debug.Log($"Began dragging weapon group {x.group}"); GameManager.BeginDrag(new WeaponGroupDragObject(x.group)); dragObject = Instantiate(weaponGroups.Groups[x.group], DragParent, true).transform; dragOffset = (Vector2)dragObject.position - x.pointerEventData.position; @@ -477,7 +477,7 @@ public class PropertiesPanel : MonoBehaviour }); weaponGroups.OnEndDragAsObservable().Subscribe(x => { - //Debug.Log($"Ended dragging weapon group {x.group}"); + Debug.Log($"Ended dragging weapon group {x.group}"); GameManager.EndDrag(); Destroy(dragObject.gameObject); }); diff --git a/Assets/Scripts/Zone Display/VolumeSampling.cs b/Assets/Scripts/Zone Display/VolumeSampling.cs index 4a76b0a61..2636f9cfd 100644 --- a/Assets/Scripts/Zone Display/VolumeSampling.cs +++ b/Assets/Scripts/Zone Display/VolumeSampling.cs @@ -18,6 +18,7 @@ using static Unity.Mathematics.noise; [RequireComponent( typeof( Camera ) )] public class VolumeSampling : MonoBehaviour { + public Transform GridMesh; public Camera GridCamera; public GameSettings Settings; @@ -48,6 +49,13 @@ public class VolumeSampling : MonoBehaviour Shader.SetGlobalVector("_GridTransform", new Vector4(_gridTransform.position.x,_gridTransform.position.z,GridCamera.orthographicSize*2)); var environment = ActionGameManager.Instance?.CurrentEnvironment ?? Settings.DefaultEnvironment; + + if (GridMesh != null) + { + GridMesh.gameObject.SetActive(environment.Grid.Enabled); + GridMesh.position = new Vector3(_gridTransform.position.x, environment.Grid.Offset, _gridTransform.position.z); + GridMesh.localScale = new Vector3(GridCamera.orthographicSize, 1, GridCamera.orthographicSize); + } // Volumetric sampling parameters are used by several shaders Shader.SetGlobalTexture("_NebulaSurfaceHeight", NebulaSurfaceHeight); diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index f56e43c02..0bc4a2a20 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -531,6 +531,7 @@ public class ZoneRenderer : MonoBehaviour var distance = length(difference); entityInstance.CompassIcon.gameObject.SetActive( + PerspectiveEntity.EntityInfoGathered.ContainsKey(entityInstance.Entity) && PerspectiveEntity.EntityInfoGathered[entityInstance.Entity] > Settings.GameplaySettings.TargetDetectionInfoThreshold && distance > _minimapDistance); entityInstance.CompassIcon.transform.rotation = Quaternion.Euler(0, 0, Mathf.Atan2(difference.y, difference.x) * Mathf.Rad2Deg - 90); @@ -699,4 +700,4 @@ public class AsteroidBeltUI _mesh.vertices = _vertices; //_collider.sharedMesh = _mesh; } -} \ No newline at end of file +} diff --git a/Assets/Shaders/Brushes/CellBrush.shader b/Assets/Shaders/Brushes/CellBrush.shader index b6876dfbe..c018376b3 100644 --- a/Assets/Shaders/Brushes/CellBrush.shader +++ b/Assets/Shaders/Brushes/CellBrush.shader @@ -107,7 +107,7 @@ Category { // // Note that there are no random points at all, no loops, and virtually no setup, yet the // pattern appears random anyway. - float m(float2 p){ + float cells(float2 p){ // Offset - used for animation. Put in as an afterthought, so probably needs more // tweaking, but it works well enough for the purpose of this demonstration. @@ -139,7 +139,7 @@ Category { fixed4 frag (v2f i) : SV_Target { float dist = length(i.texcoord - float2(.5,.5)); - return _Depth * powerPulse(dist * 2,_Power) * m(i.texcoord1.xy*_Frequency); + return _Depth * powerPulse(dist * 2,_Power) * cells(i.texcoord1.xy*_Frequency); } ENDCG } diff --git a/Assets/Shaders/MirrorField.shader b/Assets/Shaders/MirrorField.shader index 72d3612c8..d8c447b39 100644 --- a/Assets/Shaders/MirrorField.shader +++ b/Assets/Shaders/MirrorField.shader @@ -11,36 +11,59 @@ Shader "Aetheria/Field" Properties { _Displacement("Max Displacement", Range(0, 1.0)) = 0.3 - _SubdivisionAmount("Subivision Amount", Range(1, 10)) = 1 -// _Color("Color", Color) = (1,1,1,1) -// _Metallic("Metallic", Range(0, 1)) = 1 -// _Gloss("Gloss", Range(0, 1)) = 0.8 - _Ambient_Multiplier("Ambient Multiplier", Float) = 5 + _SubdivisionAmount("Subivision Amount", Range(1, 12)) = 1 + _Color("Color", Color) = (1,1,1,1) - _EmissionColor ("Emission Color", Color) = (1,1,1,1) _Emission ("Emission Strength", Float) = 0 _EmissionFresnel ("Emission Fresnel", Float) = 1.0 _Background ("Background", CUBE) = "" {} _BackgroundFresnel ("Background Fresnel", Float) = 1.0 _BackgroundBlur ("Background Blur", Float) = 2 - - _PushWaveMagnitude ("Push Magnitude", Float) = .5 - _PushWaveFrequency ("Push Frequency", Float) = 2 - _PushWaveRangeExponent ("Push Range Exponent", Float) = 2 - _PushWaveEnvelopeExponent ("Push Envelope Exponent", Float) = 2 - _PushWaveExponent ("Push Wave Exponent", Float) = 2 - _PushWaveRange ("Push Range", Range(0,3.141592654)) = 1 - _PushWaveOffset ("Push Time", Float) = .5 - _PushDirection ("Push Direction", Vector) = (0,0,1) - _PushOpacity ("Push Opacity", Range(0,1)) = 1 - _PushOpacityRangeMin ("Push Opacity Range Start", Range(0,1)) = .5 - _PushOpacityRangeMax ("Push Opacity Range End", Range(0,1)) = .25 + _BlurFresnel ("Blur Fresnel", Float) = 2 _FresnelOpacity ("Fresnel Opacity", Range(0,1)) = 1 _OpacityFresnel ("Opacity Fresnel", Float) = 1 _DisplacementOpacity ("Displacement Opacity", Float) = 1 _DeviationOpacityExponent ("Deviation Opacity Exponent", Float) = 8 + + _WaveMagnitude ("Wave Magnitude", Float) = .5 + _WaveFrequency ("Wave Frequency", Float) = 2 + _WaveOffset ("Wave Time", Float) = .5 + _WaveExponent ("Wave Exponent", Float) = 2 + + _Push ("Push", Range(0,1)) = 1 + _PushDirection ("Push Direction", Vector) = (0,0,1) + _PushVerticalExponent ("Push Vertical Exponent", Float) = 1 + _PushEnvelopeExponent ("Push Envelope Exponent", Float) = 2 + _PushFrequencyExponent ("Push Frequency Exponent", Float) = 2 +// _PushOpacity ("Push Opacity", Range(0,1)) = 1 +// _PushOpacityRangeMin ("Push Opacity Range Start", Range(0,1)) = .5 +// _PushOpacityRangeMax ("Push Opacity Range End", Range(0,1)) = .25 + + _TwistFront ("Twist Front", Range(-1,1)) = 1 + _TwistRear ("Twist Back", Range(-1,1)) = 1 + _TwistVerticalExponent ("Twist Vertical Exponent", Float) = 1 + _TwistEnvelopeExponent ("Twist Envelope Exponent", Range(1,12)) = 1 + _TwistFrequencyExponent ("Twist Frequency Exponent", Float) = 2 + + _MeleeDisplacement ("Melee Displacement", Float) = 8 + _MeleeShape ("Melee Shape", Float) = 8 + _MeleeFlattening ("Melee Flattening", Float) = 8 + _MeleeDirection ("Melee Direction", Vector) = (0,0,-1) + + _TendrilSize ("Tendril Size", Float) = 1 + _TendrilExponent ("Tendril Exponent", Float) = 1 + _TendrilRadius ("Tendril Radius", Float) = .1 + _TendrilInfluence ("Tendril Influence", Float) = .1 + + _InverseScale ("Inverse Scale", Vector) = (1,1,1) + + _CellSpeed("Cell Speed", Float) = 1 + _CellTiling("Cell Tiling", Float) = 1 + _CellExponent("Cell Exponent", Float) = 1 +// _BulbRadius ("Bulb Radius", Float) = .5 +// _BulbRange ("Bulf Range", Float) = .1 } SubShader @@ -56,6 +79,7 @@ Shader "Aetheria/Field" #pragma domain domain_shader #pragma fragment pixel_shader #pragma multi_compile ___ UNITY_HDR_ON + #pragma multi_compile A B C D E F G H //#pragma exclude_renderers nomrt #pragma target 4.6 #pragma glsl @@ -63,53 +87,64 @@ Shader "Aetheria/Field" //#define UNITY_PASS_DEFERRED #include "UnityPBSLighting.cginc" #include "Dither Functions.cginc" - -// #include "UnityShaderVariables.cginc" -// #include "UnityStandardCore.cginc" - //#include "HLSLSupport.cginc" - //#include "UnityShaderVariables.cginc" - //#include "Lighting.cginc" - //#include "AutoLight.cginc" //#pragma only_renderers d3d11 - uniform sampler2D _LightBuffer; - float _SubdivisionAmount; float _Displacement; - // half4 _Color; - // float _Metallic; - // float _Gloss; - float _Ambient_Multiplier; + half4 _Color; samplerCUBE _Background; float _Emission; - half4 _EmissionColor; float _EmissionFresnel; float _BackgroundBlur; + float _BlurFresnel; float _BackgroundFresnel; float _FresnelOpacity; float _OpacityFresnel; - - float _PushWaveMagnitude; - float _PushWaveFrequency; - float _PushWaveRangeExponent; - float _PushWaveExponent; - float _PushWaveEnvelopeExponent; - float _PushWaveRange; - float _PushWaveOffset; - float _PushOpacity; - float _PushOpacityRangeMin; - float _PushOpacityRangeMax; - float _DisplacementOpacity; float _DeviationOpacityExponent; + float _DisplacementOpacity; + + float _WaveMagnitude; + float _WaveOffset; + float _WaveFrequency; + float _WaveExponent; + + float _Push; + float3 _PushDirection; + float _PushVerticalExponent; + float _PushEnvelopeExponent; + float _PushFrequencyExponent; + // float _PushOpacity; + // float _PushOpacityRangeMin; + // float _PushOpacityRangeMax; + + float _TwistVerticalExponent; + float _TwistEnvelopeExponent; + float _TwistFrequencyExponent; + float _TwistFront; + float _TwistRear; float _MeleeDisplacement; float _MeleeShape; float _MeleeFlattening; float3 _MeleeDirection; + float3 _TendrilBase; + float3 _TendrilBend; + float3 _TendrilTarget; + float _TendrilSize; + float _TendrilRadius; + float _TendrilExponent; + float _TendrilInfluence; + // float _BulbRadius; + // float _BulbRange; + + float _CellSpeed; + float _CellExponent; + float _CellTiling; + int _HitCount; struct FieldHit { @@ -120,7 +155,6 @@ Shader "Aetheria/Field" }; StructuredBuffer _Hits; - uniform float3 _PushDirection; uniform float3 _InverseScale; uniform float4x4 _ReflRotate; @@ -177,19 +211,28 @@ Shader "Aetheria/Field" //float depthSV : Depth; }; - // q = lerped position according to SV_DomainLocation. - // p = patch position, in sequential order [0], [1], etc... - // n = patch normal, in sequential order [0], [1], etc... - float3 PhongOperator(float3 q, float3 p, float3 n) + inline float3 spline(float3 p0, float3 p1, float3 p2, float t) + { + t = saturate(t); + float oneMinusT = 1 - t; + return + oneMinusT * oneMinusT * p0 + + 2 * oneMinusT * t * p1 + + t * t * p2; + } + + inline float bulb(float x) { - return q - dot(q - p, n) * n; + return sqrt(0.25-pow(x-.5, 2)); + } + + inline float unlerp(float from, float to, float value){ + return saturate((value - from) / (to - from)); } - float smootherstep(float edge0, float edge1, float x) { - // Scale, and clamp x to 0..1 range - x = saturate((x - edge0) / (edge1 - edge0)); - // Evaluate polynomial - return x * x * x * (x * (x * 6 - 15) + 10); + inline float almostUnitIdentity( float x ) + { + return x*x*x*(2.0-x); } struct v2f { @@ -199,29 +242,87 @@ Shader "Aetheria/Field" float4 screenPos : TEXCOORD1; float3 viewDirection : TEXCOORD2; }; + + static const float EPSILON = .001; float3 SampleDisplacement (float3 normal) { float3 disp = 0; - float l = smoothstep(UNITY_PI, 0, acos(dot(_PushDirection,normal))); - float pushwave = pow((sin(pow(l, _PushWaveRangeExponent)*UNITY_PI*_PushWaveFrequency - _PushWaveOffset * UNITY_TWO_PI)+1)/2, _PushWaveExponent); - if(_PushWaveMagnitude<0) pushwave = 1-pushwave; - disp += normal * pow(l, _PushWaveEnvelopeExponent) * pushwave * abs(_PushWaveMagnitude); + + float vertical = acos(dot(normal,float3(0,1,0)))/UNITY_PI; + float angle = atan2(normal.z,normal.x) / UNITY_PI; + + if(_Push > EPSILON) + { + float waveRange = acos(dot(_PushDirection,normal)) / UNITY_PI; + float pushwave = pow((sin(pow(waveRange, _PushFrequencyExponent)*_WaveFrequency-_WaveOffset)+1)/2, _WaveExponent); + if(_WaveMagnitude<0) pushwave = 1-pushwave; + //if(_CellExponent > 0) pushwave *= pow(cells(float2(waveRange * _CellTiling, vertical * _CellTiling)), _CellExponent); + float verticalEnvelope = pow( 4.0*vertical*(1.0-vertical), abs(_PushVerticalExponent) ); + if(_PushVerticalExponent < 0) verticalEnvelope = 1-verticalEnvelope; + disp += normal * ( + pow(waveRange, _PushEnvelopeExponent) * + verticalEnvelope * + pushwave * + abs(_WaveMagnitude) * + _Push); + } + + float twist = angle < 0 ? _TwistFront : _TwistRear; + if(abs(twist) > EPSILON) + { + angle = frac(angle); + if(twist < 0) angle = 1 - angle; + float verticalEnvelope = pow( 4.0*vertical*(1.0-vertical), _TwistVerticalExponent ); + float twistEnvelope = (1-angle) * + pow(angle, _TwistEnvelopeExponent) * + pow(1/_TwistEnvelopeExponent+1, _TwistEnvelopeExponent) * + (_TwistEnvelopeExponent+1); + float twistwave = pow((sin(pow(angle, _TwistFrequencyExponent)*_WaveFrequency - _WaveOffset)+1)/2, _WaveExponent); + if(_WaveMagnitude<0) twistwave = 1-twistwave; + disp += normal * ( + verticalEnvelope * + twistEnvelope * + twistwave * + abs(_WaveMagnitude) * + abs(twist)); + } + float3 scaledNormal = normal/_InverseScale; for(int i=0; i<_HitCount; i++) { FieldHit hit = _Hits[i]; + float3 toHit = hit.Position-scaledNormal; + float envelope = pow(smoothstep(hit.Magnitude + 4, 0, length(toHit)), 8 / hit.Time); + if(envelope < EPSILON) continue; float hitroot = sqrt(hit.Magnitude); - float invsqtime = pow(1-hit.Time, 4); - float3 toHit = hit.Position/_InverseScale-scaledNormal; - float envelope = pow(smoothstep(hit.Magnitude + 4, 0, length(toHit)), 8 / (hit.Time)); - disp += lerp(hit.Direction, normal, hit.Time) * (envelope * pow(cos(envelope*hitroot*hit.Time*6)+1,2) * hitroot * invsqtime * _InverseScale.y); + float invsqtime = pow(1-hit.Time, 2); + disp += lerp(normal, hit.Direction, invsqtime) * (envelope * pow(cos(envelope*hitroot*hit.Time*6)+1,2) * hitroot * invsqtime * _InverseScale.y); } - if(_MeleeDisplacement>.01) + + if(_MeleeDisplacement > EPSILON) { - normal.y /= _MeleeFlattening; + normal.y *= _MeleeFlattening; normal = normalize(normal); - disp += _MeleeDirection * pow(saturate(1 - acos(dot(normal,_MeleeDirection))/(UNITY_PI/2)),_MeleeShape) * _MeleeDisplacement; + disp += _MeleeDirection * (pow(saturate(1 - acos(dot(normal,_MeleeDirection))/(UNITY_PI/2)),_MeleeShape) * _MeleeDisplacement); + } + + if(_TendrilInfluence > EPSILON) + { + float3 toBase = _TendrilBase-scaledNormal; + float3 toBend = _TendrilBend-scaledNormal; + float3 toTarget = _TendrilTarget-scaledNormal; + float tendrilLerp = 1 - saturate(length(toBase)/_TendrilSize); + float3 radial = normalize(-toBase) * _TendrilRadius; + // if(_BulbRadius > 0) + // { + // float bulbLerp = smoothstep(1-_BulbRange * _BulbRadius, 1, tendrilLerp); + // radial = normalize(-toBase) * (_TendrilRadius + bulb(bulbLerp) * _BulbRadius); + // toTarget += normalize(toTarget) * _BulbRadius*.25; + // toTarget += normalize(toTarget-toBend) * _BulbRadius*.25; + // } + float3 tendril = spline(toBase, toBend, toTarget, tendrilLerp) + radial; + disp = lerp(disp, tendril, almostUnitIdentity(tendrilLerp) * _TendrilInfluence); } return disp; //return texCUBElod(_Offset, float4(normal, 0)).r; @@ -330,9 +431,8 @@ Shader "Aetheria/Field" float3 dir = mul(_ReflRotate, refract(input.viewDirection,normal,_BackgroundFresnel)); //float lerp = smoothstep(UNITY_PI, 0, pow(acos(dot(_PushDirection,input.normal)), 2)); float2 screenUV = input.screenPos.xy / input.screenPos.w; - float l = pow(smoothstep(UNITY_PI * _PushOpacityRangeMin, UNITY_PI * _PushOpacityRangeMax, acos(dot(_PushDirection,input.normal))), 4); - ditherClip(screenUV, abs(height) * _DisplacementOpacity + deviation + l * _PushOpacity + pow(1-rim, _OpacityFresnel) * _FresnelOpacity); - deferredStruct.emission.rgb += texCUBElod(_Background, float4(dir, _BackgroundBlur)).rgb * _Emission * pow(rim,_EmissionFresnel) * _EmissionColor; + ditherClip(screenUV, abs(height) * _DisplacementOpacity + deviation + pow(1-rim, _OpacityFresnel) * _FresnelOpacity); + deferredStruct.emission.rgb += texCUBElod(_Background, float4(dir, _BackgroundBlur*pow(rim, _BlurFresnel))).rgb * _Emission * pow(rim,_EmissionFresnel) * _Color; #ifndef UNITY_HDR_ON deferredStruct.emission.rgb = exp2(-deferredStruct.emission.rgb); @@ -345,5 +445,6 @@ Shader "Aetheria/Field" } } Fallback "Diffuse" + CustomEditor "CellBrushEditor" } diff --git a/Assets/Shaders/Terrain/My Lighting.cginc b/Assets/Shaders/Terrain/My Lighting.cginc index 4dcdb1f1b..2d64493ae 100644 --- a/Assets/Shaders/Terrain/My Lighting.cginc +++ b/Assets/Shaders/Terrain/My Lighting.cginc @@ -441,7 +441,7 @@ FragmentOutput MyFragmentProgram (Interpolators i) { (1 - saturate(max(0, abs(i.worldPos.y - _AlphaRangeCenter) - _AlphaRange) / _AlphaRangeFeather)) * (cells(i.worldPos * _AlphaTiling) + (pow((rim), _FresnelClipPower) + _FresnelClipOffset) * _FresnelClip);// * inclination - + #if defined(_RENDERING_CUTOUT) clip(alpha - _AlphaClip); #endif @@ -499,4 +499,4 @@ FragmentOutput MyFragmentProgram (Interpolators i) { return output; } -#endif \ No newline at end of file +#endif diff --git a/GameData/AetherDB.msgpack b/GameData/AetherDB.msgpack index 68768d706..85b0ee721 100644 --- a/GameData/AetherDB.msgpack +++ b/GameData/AetherDB.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa305c25dcf54840ca78fa65d697244391144f93e5808cddc1281e9c3845f1b9 +oid sha256:5c9d16d51ae14f649d03c73a2d34de9236d2e57df3f27db31829673c833d068a size 41103 diff --git a/GameData/CargoBayData/SafeStuff II.json b/GameData/CargoBayData/SafeStuff II.json deleted file mode 100644 index 63eae67f7..000000000 --- a/GameData/CargoBayData/SafeStuff II.json +++ /dev/null @@ -1 +0,0 @@ -{"interiorShape":{"name":[[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true]]},"schematic":"","behaviors":[],"durability":550.0,"minTemp":175.0,"maxTemp":600.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"SafeStuff II","description":"Your stuff is safe stuffed in the new, bigger SafeStuff","creator":"adfb9b08-aabc-45c6-9586-915698a9c4b0","mass":700.0,"shape":{"name":[[true,true,true],[true,true,true],[true,true,true]]},"specificHeat":0.75,"conductivity":1.0,"price":450000,"id":"03740fd6-158d-43e9-b070-9a40e0b9bc45","$type":"CargoBayData"} \ No newline at end of file diff --git a/GameData/CargoBayData/Store-All Enterprise Edition.json b/GameData/CargoBayData/Store-All Enterprise Edition.json deleted file mode 100644 index 933d31247..000000000 --- a/GameData/CargoBayData/Store-All Enterprise Edition.json +++ /dev/null @@ -1 +0,0 @@ -{"interiorShape":{"name":[[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true]]},"schematic":"","behaviors":[],"durability":1000.0,"minTemp":175.0,"maxTemp":600.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Store-All Enterprise Edition","description":"A large amount of storage","creator":"2f74e6b4-d268-48a9-b2a8-24591c680e84","mass":800.0,"shape":{"name":[[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true],[true,true,true,true,true,true]]},"specificHeat":0.75,"conductivity":1.0,"price":700000,"id":"46b66f9a-5c72-4e7a-ac9b-4dd7904cc4a1","$type":"CargoBayData"} \ No newline at end of file diff --git a/GameData/CargoBayData/Store-All Plus Mini.json b/GameData/CargoBayData/Store-All Plus Mini.json deleted file mode 100644 index 463342779..000000000 --- a/GameData/CargoBayData/Store-All Plus Mini.json +++ /dev/null @@ -1 +0,0 @@ -{"interiorShape":{"name":[[true,true],[true,true]]},"schematic":"","behaviors":[],"durability":125.0,"minTemp":175.0,"maxTemp":600.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Store-All Plus Mini","description":"Take some of your cargo wherever your shipgo","creator":"2f74e6b4-d268-48a9-b2a8-24591c680e84","mass":50.0,"shape":{"name":[[true]]},"specificHeat":0.75,"conductivity":1.0,"price":50000,"id":"ae05f4cb-0dd5-4f37-af96-cc61c9d61e1f","$type":"CargoBayData"} \ No newline at end of file diff --git a/GameData/CargoBayData/Store-All Plus.json b/GameData/CargoBayData/Store-All Plus.json deleted file mode 100644 index 91eb68d09..000000000 --- a/GameData/CargoBayData/Store-All Plus.json +++ /dev/null @@ -1 +0,0 @@ -{"interiorShape":{"name":[[true,true,true,true],[true,true,true,true],[true,true,true,true],[true,true,true,true]]},"schematic":"","behaviors":[],"durability":250.0,"minTemp":175.0,"maxTemp":600.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Store-All Plus","description":"Take your cargo wherever your shipgo","creator":"2f74e6b4-d268-48a9-b2a8-24591c680e84","mass":200.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":0.75,"conductivity":1.0,"price":150000,"id":"49b4c15a-c10b-49c0-9dad-31dfb9b3a9b9","$type":"CargoBayData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/AI Pilot.json b/GameData/CompoundCommodityData/AI Pilot.json deleted file mode 100644 index 9cf8ed2f4..000000000 --- a/GameData/CompoundCommodityData/AI Pilot.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"AI Pilot","description":"Place your valuable life and even more valuable cargo in the relentlessly logical hands of your AI copilot*. *Personalities may vary. Any neuroticism or homicidal madness in an artificial intelligence is not our responsibility. ","creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"11d9fd0c-c0dd-482f-8e2a-f7c289ed6a3d","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/All-Surface Stylus.json b/GameData/CompoundCommodityData/All-Surface Stylus.json deleted file mode 100644 index 94214d187..000000000 --- a/GameData/CompoundCommodityData/All-Surface Stylus.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":3,"name":"All-Surface Stylus","description":"Draw and write on anything! Even lava!","creator":"00000000-0000-0000-0000-000000000000","mass":0.7,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"20376ecd-77fa-4ffe-9be6-185158ee1bfc","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Antireflective Coating.json b/GameData/CompoundCommodityData/Antireflective Coating.json deleted file mode 100644 index dfa946ee2..000000000 --- a/GameData/CompoundCommodityData/Antireflective Coating.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Antireflective Coating","description":"Spray this stuff on your hull to make it invisible to radar.","creator":"00000000-0000-0000-0000-000000000000","mass":5.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"4810a43b-bbb9-447d-b62e-b723e4d88afc","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Ballistic Powder.json b/GameData/CompoundCommodityData/Ballistic Powder.json deleted file mode 100644 index 6756d7b22..000000000 --- a/GameData/CompoundCommodityData/Ballistic Powder.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Ballistic Powder","description":"Used in the creation of ballistic weapons. \r\n","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"0b449ae1-7eab-47e8-ac3c-2b6f6ff01f00","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Big Red Button.json b/GameData/CompoundCommodityData/Big Red Button.json deleted file mode 100644 index 5a29ffcd9..000000000 --- a/GameData/CompoundCommodityData/Big Red Button.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Big Red Button","description":"No one knows what it does, but everyone know it's critical to modern spaceship design. Just don't press it.","creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"5e2950d6-02df-461e-a35e-a4123c6a5639","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Cargo Pod.json b/GameData/CompoundCommodityData/Cargo Pod.json deleted file mode 100644 index 66dbe45c9..000000000 --- a/GameData/CompoundCommodityData/Cargo Pod.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":5,"name":"Cargo Pod","description":"Cargo space? No, cargo road, but also, cargo pod.","creator":"00000000-0000-0000-0000-000000000000","mass":20.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"17032840-c285-4f33-82ae-6b03f1e1e56b","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Circuit Board.json b/GameData/CompoundCommodityData/Circuit Board.json deleted file mode 100644 index 682e272c6..000000000 --- a/GameData/CompoundCommodityData/Circuit Board.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Circuit Board","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"3c8b2b3d-ca1a-405f-966f-c64662a64418","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Cockpit.json b/GameData/CompoundCommodityData/Cockpit.json deleted file mode 100644 index 2dde53605..000000000 --- a/GameData/CompoundCommodityData/Cockpit.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":5,"name":"Cockpit","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":25.0,"shape":null,"specificHeat":1.5,"conductivity":1.0,"price":0,"id":"6d20c298-281e-46fc-be33-dbcc575d49d7","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Construction Rebar.json b/GameData/CompoundCommodityData/Construction Rebar.json deleted file mode 100644 index 97b7ceae6..000000000 --- a/GameData/CompoundCommodityData/Construction Rebar.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Construction Rebar","description":"Helps your building stay up.","creator":"00000000-0000-0000-0000-000000000000","mass":65.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"2aa99b2d-80ed-4640-9350-9affcfe6d8cd","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Crash Test Dummy.json b/GameData/CompoundCommodityData/Crash Test Dummy.json deleted file mode 100644 index 988794bc7..000000000 --- a/GameData/CompoundCommodityData/Crash Test Dummy.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Crash Test Dummy","description":"Your best friend and co pilot","creator":"00000000-0000-0000-0000-000000000000","mass":7.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"4b3fc716-d362-4379-8c65-f2c471647ed1","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Daily Feed Ad Slot (5ms).json b/GameData/CompoundCommodityData/Daily Feed Ad Slot (5ms).json deleted file mode 100644 index 4c882aef8..000000000 --- a/GameData/CompoundCommodityData/Daily Feed Ad Slot (5ms).json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Daily Feed Ad Slot (5ms)","description":"A 5 ms slot on the most widely viewed news feed in the multiverse","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"601a345d-6f0b-4bdb-8171-be4befaf9a33","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Dashboard Ornament.json b/GameData/CompoundCommodityData/Dashboard Ornament.json deleted file mode 100644 index 02df1c71a..000000000 --- a/GameData/CompoundCommodityData/Dashboard Ornament.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Dashboard Ornament","description":"Add personality to your ship dashboard! *Not responsible for accidental death due to inertia from sudden deceleration","creator":"00000000-0000-0000-0000-000000000000","mass":0.5,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"03ff4335-fa65-4a89-8cea-68f70de01d60","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Dials.json b/GameData/CompoundCommodityData/Dials.json deleted file mode 100644 index a5acb0706..000000000 --- a/GameData/CompoundCommodityData/Dials.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Dials","description":"Small dials for your control panel. Do they do anything? We don't know, but they sure look important.","creator":"00000000-0000-0000-0000-000000000000","mass":0.5,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"6d4c9e32-7ffd-45f6-8e08-86d544793774","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Diamond.json b/GameData/CompoundCommodityData/Diamond.json deleted file mode 100644 index 552813389..000000000 --- a/GameData/CompoundCommodityData/Diamond.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Diamond","description":"Used to harden a material. \r\n","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"8776c2fd-45f6-4ca6-8ef0-5214be830182","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Emergency Personal Life Support System.json b/GameData/CompoundCommodityData/Emergency Personal Life Support System.json deleted file mode 100644 index 84758ec06..000000000 --- a/GameData/CompoundCommodityData/Emergency Personal Life Support System.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":5,"name":"Emergency Personal Life Support System","description":"The sole survivor's best friend.","creator":"00000000-0000-0000-0000-000000000000","mass":16.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"35f02735-1993-4467-b3de-028c2d6e2276","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Fuel.json b/GameData/CompoundCommodityData/Fuel.json deleted file mode 100644 index c82075307..000000000 --- a/GameData/CompoundCommodityData/Fuel.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Fuel","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"6821495a-4875-4350-a8e8-e813c3576aa8","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Geiger Counter.json b/GameData/CompoundCommodityData/Geiger Counter.json deleted file mode 100644 index b92cbc21b..000000000 --- a/GameData/CompoundCommodityData/Geiger Counter.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":3,"name":"Geiger Counter","description":"It's rad. You shouldn't be.","creator":"00000000-0000-0000-0000-000000000000","mass":6.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"1ea0df17-aba1-45bc-8d6e-a430c110e38d","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Hat.json b/GameData/CompoundCommodityData/Hat.json deleted file mode 100644 index 1f1a3a98a..000000000 --- a/GameData/CompoundCommodityData/Hat.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Hat","description":"A hat. Goes on your head. OR: It keeps the rain off your head. ","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"5383d6b6-083b-4721-8f6b-426dba0beaeb","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Heat Sink Tile.json b/GameData/CompoundCommodityData/Heat Sink Tile.json deleted file mode 100644 index 9034f4128..000000000 --- a/GameData/CompoundCommodityData/Heat Sink Tile.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Heat Sink Tile","description":"It's getting hot in here, so drain off all your heat before your systems overload","creator":"00000000-0000-0000-0000-000000000000","mass":7.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"0d6a518d-24e9-40bf-9861-301de17b5161","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Helmet.json b/GameData/CompoundCommodityData/Helmet.json deleted file mode 100644 index 352d10355..000000000 --- a/GameData/CompoundCommodityData/Helmet.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Helmet","description":"Goes on your head. But better.","creator":"00000000-0000-0000-0000-000000000000","mass":5.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"8b026aea-1d79-49a0-b843-abdfcca31bab","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Holo-desk.json b/GameData/CompoundCommodityData/Holo-desk.json deleted file mode 100644 index 6b943efd8..000000000 --- a/GameData/CompoundCommodityData/Holo-desk.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.25,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.85},"category":3,"name":"Holo-desk","description":"A totally not ripped off version of Star Trek's Holodeck, now in desk size. An upgraded part of the Virtual Reality Experience","creator":"00000000-0000-0000-0000-000000000000","mass":4.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"2055f611-ef5d-4791-b1ad-f1757c081a99","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Inertial Compensating Seatbelt.json b/GameData/CompoundCommodityData/Inertial Compensating Seatbelt.json deleted file mode 100644 index 580d6c0da..000000000 --- a/GameData/CompoundCommodityData/Inertial Compensating Seatbelt.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Inertial Compensating Seatbelt","description":"because humans are squishy.","creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"32934bf0-d7e9-432f-8863-e07c092b67f6","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Insulation.json b/GameData/CompoundCommodityData/Insulation.json deleted file mode 100644 index 4f00180b8..000000000 --- a/GameData/CompoundCommodityData/Insulation.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Insulation","description":"Keeps hot things hot and cold things cold.","creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"4c82acfa-b8e4-4601-9465-2fad107b1eff","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Joystick.json b/GameData/CompoundCommodityData/Joystick.json deleted file mode 100644 index e01457f06..000000000 --- a/GameData/CompoundCommodityData/Joystick.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Joystick","description":"Manual ship control","creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"63abe46b-ad99-4ac9-b5e4-d83a40465065","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Knife.json b/GameData/CompoundCommodityData/Knife.json deleted file mode 100644 index 495955371..000000000 --- a/GameData/CompoundCommodityData/Knife.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":3,"name":"Knife","description":"for slicing, stabbing, and sauteing","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"5449f7d3-b250-41cd-9e7e-ab2a7037cacb","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Local Newscast.json b/GameData/CompoundCommodityData/Local Newscast.json deleted file mode 100644 index 3a2559ff7..000000000 --- a/GameData/CompoundCommodityData/Local Newscast.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Local Newscast","description":"Has all the local dirt, available for download upon entry to a territory.","creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"5bcddae5-10fe-4316-9dca-6dc5d53c899e","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Magnetic EVA Boots.json b/GameData/CompoundCommodityData/Magnetic EVA Boots.json deleted file mode 100644 index 64df9ba41..000000000 --- a/GameData/CompoundCommodityData/Magnetic EVA Boots.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Magnetic EVA Boots","description":"Keeps you from being flung into the abyss. Also gives you some daaamn nice calves. Leg day? Every day.","creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"3987140a-19c3-4b0b-8fa5-528f43a83afb","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Memory Download.json b/GameData/CompoundCommodityData/Memory Download.json deleted file mode 100644 index 0b576bc51..000000000 --- a/GameData/CompoundCommodityData/Memory Download.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Memory Download","description":"Moments of human life distilled into electrical impulses and available for download.","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"6f0ed812-01b0-4767-90c5-0b6857bc2e29","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Mining Rights.json b/GameData/CompoundCommodityData/Mining Rights.json deleted file mode 100644 index 2af09dcb7..000000000 --- a/GameData/CompoundCommodityData/Mining Rights.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Mining Rights","description":"legal right to a particular location","creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"51e4dc3b-0107-4ab5-a2c6-02d34a1035b2","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Moo-ed Lighting.json b/GameData/CompoundCommodityData/Moo-ed Lighting.json deleted file mode 100644 index cf3e19d9f..000000000 --- a/GameData/CompoundCommodityData/Moo-ed Lighting.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":3,"name":"Moo-ed Lighting","description":"The best cow-based lighting system in the galaxy","creator":"00000000-0000-0000-0000-000000000000","mass":43.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"86d11f6a-9ddd-478d-8192-f047d38a7c6a","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Mouth Adapting Gummy Molars.json b/GameData/CompoundCommodityData/Mouth Adapting Gummy Molars.json deleted file mode 100644 index 7b02b4861..000000000 --- a/GameData/CompoundCommodityData/Mouth Adapting Gummy Molars.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{"8e5a2064-9603-4205-baf7-4d037ebfda90":0.1,"d6506d2d-3699-4c8c-8e90-5e4b8f2f43b9":0.75},"category":1,"name":"Mouth Adapting Gummy Molars","description":"i’s amazing mouth adaptive gummy candy, now you can!eding to be brushed and stopping me from living out my dreams of biting directly into ice cream. I wish I could eat them.”? No? Well, thanks to Miss Terri’s amazing mouth adaptive gummy candy, now you can!","creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"3ddbbb28-c166-4ab3-8a0b-c7b77c372f32","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Neural Lace.json b/GameData/CompoundCommodityData/Neural Lace.json deleted file mode 100644 index d97b192a9..000000000 --- a/GameData/CompoundCommodityData/Neural Lace.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{"3f608054-8e4a-43fb-926c-261da4cc92d9":0.9,"d6506d2d-3699-4c8c-8e90-5e4b8f2f43b9":0.1},"category":0,"name":"Neural Lace","description":"Used in the development of brain-machine interfaces; can also be used to knit a neural doily for your gran.","creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"34b16da9-1e5e-4fba-b256-eb8a38274b39","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Paparazzi Drone.json b/GameData/CompoundCommodityData/Paparazzi Drone.json deleted file mode 100644 index e1ff91fb0..000000000 --- a/GameData/CompoundCommodityData/Paparazzi Drone.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Paparazzi Drone","description":"Now you can keep tabs on your favourite Lucent personalities from the comfort of your rest module! ","creator":"00000000-0000-0000-0000-000000000000","mass":11.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"675a1ebe-868c-4b27-a2eb-bee2fe5e356b","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Reaction Chamber.json b/GameData/CompoundCommodityData/Reaction Chamber.json deleted file mode 100644 index 30137b655..000000000 --- a/GameData/CompoundCommodityData/Reaction Chamber.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":5,"name":"Reaction Chamber","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":25.0,"shape":null,"specificHeat":1.25,"conductivity":1.0,"price":0,"id":"0caaa08c-e0b6-4eaf-a9fd-7e03088371ea","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Rope.json b/GameData/CompoundCommodityData/Rope.json deleted file mode 100644 index 1ffa793d5..000000000 --- a/GameData/CompoundCommodityData/Rope.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":3,"name":"Rope","description":"Ties things. And people.","creator":"00000000-0000-0000-0000-000000000000","mass":5.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"502a6ed8-73aa-4554-ae89-a50b67cfa9e0","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Safety Goggles.json b/GameData/CompoundCommodityData/Safety Goggles.json deleted file mode 100644 index 141b1959b..000000000 --- a/GameData/CompoundCommodityData/Safety Goggles.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Safety Goggles","description":"Safety First, so your eyes burn up last.","creator":"00000000-0000-0000-0000-000000000000","mass":0.5,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"5837ec5e-036b-4f73-9098-dbe11339909f","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Secret Storage Compartment.json b/GameData/CompoundCommodityData/Secret Storage Compartment.json deleted file mode 100644 index 39916a113..000000000 --- a/GameData/CompoundCommodityData/Secret Storage Compartment.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":5,"name":"Secret Storage Compartment","description":"Hide your snacks from your thieving co workers who have no respect for the institution of dibs, LARRY. Also smuggling.","creator":"00000000-0000-0000-0000-000000000000","mass":4.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"452bbd60-11df-449b-a4b7-a4ca22527123","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Sheet Metal.json b/GameData/CompoundCommodityData/Sheet Metal.json deleted file mode 100644 index 32b4f578d..000000000 --- a/GameData/CompoundCommodityData/Sheet Metal.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Sheet Metal","description":"Oh sheet, it's metal!","creator":"00000000-0000-0000-0000-000000000000","mass":5.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"421e9788-d094-4c17-88cc-0d820e3cfeca","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Ship Decal.json b/GameData/CompoundCommodityData/Ship Decal.json deleted file mode 100644 index ea539a275..000000000 --- a/GameData/CompoundCommodityData/Ship Decal.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Ship Decal","description":"Express your unique style with mass produced stickers","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"4d5929a9-5cb1-470c-a0b7-12f8abaf4497","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Ship Fins.json b/GameData/CompoundCommodityData/Ship Fins.json deleted file mode 100644 index c523dd257..000000000 --- a/GameData/CompoundCommodityData/Ship Fins.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Ship Fins","description":"Aerodynamic! Because that's obviously needed in a low-friction environment. ","creator":"00000000-0000-0000-0000-000000000000","mass":24.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"4681d1af-1a6d-4c7e-b10d-5ee8295b9a79","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/SpaceCast.json b/GameData/CompoundCommodityData/SpaceCast.json deleted file mode 100644 index b133a0549..000000000 --- a/GameData/CompoundCommodityData/SpaceCast.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"SpaceCast","description":"News from the sector, available on entry","creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"6713c2b2-d886-4440-b076-dd206c22848a","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Spacesuit.json b/GameData/CompoundCommodityData/Spacesuit.json deleted file mode 100644 index 82f10c1f0..000000000 --- a/GameData/CompoundCommodityData/Spacesuit.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Spacesuit","description":"Because dying naked in space would be adding insult to injury","creator":"00000000-0000-0000-0000-000000000000","mass":7.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"1af83f0b-11ae-4d03-acc3-c5d478d55f14","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Spacewalking Boots.json b/GameData/CompoundCommodityData/Spacewalking Boots.json deleted file mode 100644 index c8302c658..000000000 --- a/GameData/CompoundCommodityData/Spacewalking Boots.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Spacewalking Boots","description":"Go on your feet","creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"22917d5e-313a-4470-a91e-0c78f1e08044","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Stealth Coating.json b/GameData/CompoundCommodityData/Stealth Coating.json deleted file mode 100644 index a62887128..000000000 --- a/GameData/CompoundCommodityData/Stealth Coating.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Stealth Coating","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.5,"conductivity":1.0,"price":0,"id":"33944941-5bd1-43ca-91a4-348c253f7e8b","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Super Tough Toffee.json b/GameData/CompoundCommodityData/Super Tough Toffee.json deleted file mode 100644 index d8ae34d4a..000000000 --- a/GameData/CompoundCommodityData/Super Tough Toffee.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.25,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.75},"category":1,"name":"Super Tough Toffee","description":"Revenge is sweet. Jawbreaker toffee is sweeter. (leftovers are excellent for ship repair!) ","creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"498c664d-05ff-45a0-b3b6-2b98feec8611","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Support Strut.json b/GameData/CompoundCommodityData/Support Strut.json deleted file mode 100644 index 7ad7f9f53..000000000 --- a/GameData/CompoundCommodityData/Support Strut.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":4,"name":"Support Strut","description":"This genre of metal only has 400 fans! Keeps things from falling apart.","creator":"00000000-0000-0000-0000-000000000000","mass":5.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"6dc76b7c-65c3-4cc1-bc2a-eace8e4f58d2","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Sure Bet Sherbet Fountain.json b/GameData/CompoundCommodityData/Sure Bet Sherbet Fountain.json deleted file mode 100644 index 560fc32d1..000000000 --- a/GameData/CompoundCommodityData/Sure Bet Sherbet Fountain.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.75,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.75},"category":1,"name":"Sure Bet Sherbet Fountain","description":"Each fizzy, sweet-tart purchase enters you automatically into an annual lottery held by Miss Terri’s. What’s the prize? Well, it wouldn’t be fun if we told you, would it?* *by purchasing this candy you agree to 1 non negotiable entry into the annual Sugar Bowl Lottery. Winning entrants are required by law to appear at the Miss Terri’s main factory on BonBon 26 on a date to be specified by the MTSSC Legal team. No unauthorized absences will be tolerated.","creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"3689a855-9264-40f0-91b3-8b235dac80b6","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Travel Permit.json b/GameData/CompoundCommodityData/Travel Permit.json deleted file mode 100644 index a357fbf76..000000000 --- a/GameData/CompoundCommodityData/Travel Permit.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":2,"name":"Travel Permit","description":"Allows for travel between specified territories. For Limited Espionage Permits as specified in Subsection 1121!, Clause W of the Unified Government Corporate Rights and Privileges Amendment (Not recognized in the Terri-Tory) please submit your application in person at the offices on the surface of your local sun. ","creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"4081eb4c-3376-4912-a230-c43096d90ad1","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Trigger.json b/GameData/CompoundCommodityData/Trigger.json deleted file mode 100644 index ad14bc1dc..000000000 --- a/GameData/CompoundCommodityData/Trigger.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":5,"name":"Trigger","description":"Makes you happy. And fires your weapon.","creator":"00000000-0000-0000-0000-000000000000","mass":0.2,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"40004417-d242-47d2-9f27-1bbcf8548779","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Trousers.json b/GameData/CompoundCommodityData/Trousers.json deleted file mode 100644 index c966166f8..000000000 --- a/GameData/CompoundCommodityData/Trousers.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":0,"name":"Trousers","description":"Goes on your legs.","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"515734e6-4287-470c-bf56-188c4b257420","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/CompoundCommodityData/Universal Translator.json b/GameData/CompoundCommodityData/Universal Translator.json deleted file mode 100644 index f556ccf88..000000000 --- a/GameData/CompoundCommodityData/Universal Translator.json +++ /dev/null @@ -1 +0,0 @@ -{"demandProfile":{},"category":3,"name":"Universal Translator","description":"Speaks your language. And Everyone elses! Downloaded directly into your brain.","creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"3a33da73-ba06-4574-afec-d529097408b5","$type":"CompoundCommodityData"} \ No newline at end of file diff --git a/GameData/DockingBayData/Medium Docking Bay.json b/GameData/DockingBayData/Medium Docking Bay.json deleted file mode 100644 index 937250353..000000000 --- a/GameData/DockingBayData/Medium Docking Bay.json +++ /dev/null @@ -1 +0,0 @@ -{"maxSize":[18,18],"interiorShape":{"name":[[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true]]},"schematic":"","behaviors":[],"durability":1000.0,"minTemp":-3.8451617E-06,"maxTemp":673.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Medium Docking Bay","description":null,"creator":"8443f966-0d88-4ec7-a20e-8edf73fa62f6","mass":750.0,"shape":{"name":[[true,true,true,true],[true,true,true,true],[true,true,true,true],[true,true,true,true]]},"specificHeat":0.75,"conductivity":1.0,"price":500000,"id":"3e930a2c-ac72-4385-98aa-1c5b0b90db46","$type":"DockingBayData"} \ No newline at end of file diff --git a/GameData/Faction/Adrasteia.json b/GameData/Faction/Adrasteia.json deleted file mode 100644 index 5e70ecc65..000000000 --- a/GameData/Faction/Adrasteia.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Adrasteia","shortName":"Adrasteia","description":"The best defense is not to need one.","logo":"","personality":{},"primaryColor":[0.09,0.123157874,0.3],"secondaryColor":[0.4032,0.760051847,0.8],"nameFile":"95c298ae-d7b4-4481-9fff-deb3eb5872e9","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":3,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.389,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.811,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.607,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.233,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.434,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.559,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.155,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.957,"a9672650-c335-484a-9555-71a35c841aa1":0.251,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.881,"bbd619ed-76c1-464c-829d-3f419cdc2525":1.0,"d6466821-6776-4f40-9609-2342debf5c86":0.978},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"bbd619ed-76c1-464c-829d-3f419cdc2525","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Aeronautics Unlimited.json b/GameData/Faction/Aeronautics Unlimited.json deleted file mode 100644 index 2ee239398..000000000 --- a/GameData/Faction/Aeronautics Unlimited.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Aeronautics Unlimited","shortName":"AU","description":"\"Quick expansion and retrieval of resources is key to a successful quarter, every quarter.\"","logo":"Assets/Resources/Sprites/Icons/Tech/Tex_skill_47.PNG","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.3,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.65},"primaryColor":[0.3294118,0.498696,0.8392157],"secondaryColor":[0.270588279,0.8117647,0.5093596],"nameFile":"350eac1f-ecca-4439-9a86-7bcef44f780c","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":5,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.794,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.498,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.415,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.749,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.474,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":1.0,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.466,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.289,"a9672650-c335-484a-9555-71a35c841aa1":0.658,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.874,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.414,"d6466821-6776-4f40-9609-2342debf5c86":0.306},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"8443f966-0d88-4ec7-a20e-8edf73fa62f6","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Alakrita.json b/GameData/Faction/Alakrita.json deleted file mode 100644 index f2af42a63..000000000 --- a/GameData/Faction/Alakrita.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Alakrita","shortName":"Alakrita","description":"Speed. Elegance. Alakrita.","logo":"","personality":{},"primaryColor":[0.04705884,0.628758132,0.745098054],"secondaryColor":[0.264150918,0.0,0.0],"nameFile":"86257ba5-2c68-4b6f-a269-7f02ff7372c3","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":4,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.555,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.708,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.022,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.598,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.606,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.284,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.823,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":1.0,"a9672650-c335-484a-9555-71a35c841aa1":0.325,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.085,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.908,"d6466821-6776-4f40-9609-2342debf5c86":0.809},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"a1f76631-d6d1-443a-9be1-c9b1267d6ca2","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Death Monkey Explosives.json b/GameData/Faction/Death Monkey Explosives.json deleted file mode 100644 index d5a921705..000000000 --- a/GameData/Faction/Death Monkey Explosives.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Death Monkey Explosives","shortName":"DME","description":"Some people just want to watch the world burn. We’re here to help!","logo":"","personality":{},"primaryColor":[0.8980392,0.564925969,0.0980392247],"secondaryColor":[0.819607854,0.279215753,0.196078435],"nameFile":"ecffecc1-d0b9-4014-be4d-442f72382721","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":3,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.289,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.727,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.313,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.724,"8419f9bc-0167-46ec-86c3-3265d2905fbc":1.0,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.544,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.784,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.817,"a9672650-c335-484a-9555-71a35c841aa1":0.106,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.148,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.973,"d6466821-6776-4f40-9609-2342debf5c86":0.973},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"8419f9bc-0167-46ec-86c3-3265d2905fbc","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Ewan Hart Inc.json b/GameData/Faction/Ewan Hart Inc.json deleted file mode 100644 index 9da09e07f..000000000 --- a/GameData/Faction/Ewan Hart Inc.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Ewan Hart Inc","shortName":"Ewan Hart","description":"Money does grow on trees","logo":"","personality":{},"primaryColor":[0.0,0.764151,0.299815148],"secondaryColor":[0.146092921,0.46226418,0.324359715],"nameFile":"cfbb1969-2a8c-40dd-9f5d-c1b9e69d356d","bossHull":"00000000-0000-0000-0000-000000000000","influence":2,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.874,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.162,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.953,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.559,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.233,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.973,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.491,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.166,"a9672650-c335-484a-9555-71a35c841aa1":1.0,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.875,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.068,"d6466821-6776-4f40-9609-2342debf5c86":0.257},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"a9672650-c335-484a-9555-71a35c841aa1","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Finch Cybernetics.json b/GameData/Faction/Finch Cybernetics.json deleted file mode 100644 index 16a5d410b..000000000 --- a/GameData/Faction/Finch Cybernetics.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Finch Cybernetics","shortName":"Finch","description":"“The search for knowledge is the duty of all intelligent beings.”","logo":"Assets/Resources/Sprites/Icons/Logos/finch.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.2,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.25,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.9},"primaryColor":[0.4552703,0.0,1.0],"secondaryColor":[1.0,0.0,0.0],"nameFile":"43872e8e-df2f-4e03-81bb-e1d71f39b696","bossHull":"00000000-0000-0000-0000-000000000000","influence":5,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.262,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":1.0,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.567,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.215,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.651,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.536,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.848,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.628,"a9672650-c335-484a-9555-71a35c841aa1":0.481,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.638,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.959,"d6466821-6776-4f40-9609-2342debf5c86":0.087},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"1dfaa629-6c63-42a7-91e1-f1ae90f92f09","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Lightsail Express.json b/GameData/Faction/Lightsail Express.json deleted file mode 100644 index 3c46c7e68..000000000 --- a/GameData/Faction/Lightsail Express.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Lightsail Express","shortName":"Lightsail","description":"We’ll lose our lives before we lose your cargo.","logo":"","personality":{},"primaryColor":[0.324836552,0.270588249,0.596078455],"secondaryColor":[0.6690326,0.6629583,0.735849],"nameFile":"fc790c9c-8b47-4519-8f2c-2486185f9064","bossHull":"00000000-0000-0000-0000-000000000000","influence":3,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.754,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.181,"2f74e6b4-d268-48a9-b2a8-24591c680e84":1.0,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.333,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.313,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.653,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.544,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.056,"a9672650-c335-484a-9555-71a35c841aa1":0.792,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.967,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.197,"d6466821-6776-4f40-9609-2342debf5c86":0.126},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"2f74e6b4-d268-48a9-b2a8-24591c680e84","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Lucent Media.json b/GameData/Faction/Lucent Media.json deleted file mode 100644 index 69a2c0216..000000000 --- a/GameData/Faction/Lucent Media.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Lucent Media","shortName":"Lucent","description":"“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.”","logo":"Assets/Resources/Sprites/Icons/Logos/lucent.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.7,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.9,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.3},"primaryColor":[0.8396226,0.04356533,0.3411568],"secondaryColor":[0.821494758,0.08962262,1.0],"nameFile":"35f90a4b-460c-416c-9a4e-f7e661850787","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":6,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.252,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.679,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.305,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.914,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.831,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.808,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":1.0,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.714,"a9672650-c335-484a-9555-71a35c841aa1":0.329,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.333,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.583,"d6466821-6776-4f40-9609-2342debf5c86":0.53},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"a012e0f4-4b22-47b7-8b24-ff3e1439c949","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Miss Terri’s Sugariffic Snack Company.json b/GameData/Faction/Miss Terri’s Sugariffic Snack Company.json deleted file mode 100644 index 2a5eba80a..000000000 --- a/GameData/Faction/Miss Terri’s Sugariffic Snack Company.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Miss Terri’s Sugariffic Snack Company","shortName":"Miss Terri's","description":"Candy for all! Suspiciously experimental substances for some!","logo":"Assets/Resources/Sprites/Icons/Logos/miss_terri.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.75,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.9,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.8},"primaryColor":[1.0,0.0500000119,0.6796082],"secondaryColor":[0.9150943,0.9150943,0.9150943],"nameFile":"8af167f7-2ac7-4cba-b204-25f5a6ba5f33","bossHull":"00000000-0000-0000-0000-000000000000","influence":2,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.048,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.587,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.429,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.914,"8419f9bc-0167-46ec-86c3-3265d2905fbc":1.0,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.402,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.802,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.718,"a9672650-c335-484a-9555-71a35c841aa1":0.216,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.059,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.939,"d6466821-6776-4f40-9609-2342debf5c86":1.0},"overworldMusic":237948771,"combatMusic":0,"bossMusic":0,"id":"d6466821-6776-4f40-9609-2342debf5c86","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/NiteLife Energy.json b/GameData/Faction/NiteLife Energy.json deleted file mode 100644 index 64c4d3843..000000000 --- a/GameData/Faction/NiteLife Energy.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"NiteLife Energy","shortName":"NiteLife","description":"We keep the lights on, so you can keep on keeping on.","logo":"","personality":{},"primaryColor":[0.2235294,0.611764669,1.0],"secondaryColor":[0.7075472,0.2236116,0.7007313],"nameFile":"d0959e52-7726-4510-bdaa-c267c58f2855","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":4,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.25,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.5,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.2,"73d368dd-58a8-4431-b9ba-2d44754d36a1":1.0,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.9,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.75,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":1.0,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.75,"a9672650-c335-484a-9555-71a35c841aa1":0.6,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.25,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.5,"d6466821-6776-4f40-9609-2342debf5c86":0.75},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"73d368dd-58a8-4431-b9ba-2d44754d36a1","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Rossum & Douglas.json b/GameData/Faction/Rossum & Douglas.json deleted file mode 100644 index 50eaeeb9f..000000000 --- a/GameData/Faction/Rossum & Douglas.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Rossum & Douglas","shortName":"R&D","description":null,"logo":"","personality":{},"primaryColor":[0.735849,0.689622641,0.510234952],"secondaryColor":[0.254717,0.254717,0.254717],"nameFile":"dfb8e9b0-31cd-4ff9-b6f3-bae707469e7c","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":5,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.5,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.8,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.6,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.4,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.1,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":1.0,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.3,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.25,"a9672650-c335-484a-9555-71a35c841aa1":0.6,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.75,"d6466821-6776-4f40-9609-2342debf5c86":0.1},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"adfb9b08-aabc-45c6-9586-915698a9c4b0","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Zhestokost.json b/GameData/Faction/Zhestokost.json deleted file mode 100644 index 763893646..000000000 --- a/GameData/Faction/Zhestokost.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Zhestokost","shortName":"Zhestokost","description":"\"It is a truth universally acknowledged that nothing is as useful in diplomacy and warfare as a gigantic nuclear arsenal.\"","logo":"Assets/Resources/Sprites/Icons/Logos/colferv.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.25,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.3},"primaryColor":[1.0,0.0500000119,0.0500000119],"secondaryColor":[1.0,1.0,0.0500000119],"nameFile":"5fb6de6e-616e-478c-9323-58f197af51b9","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":6,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":1.0,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.162,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.724,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.186,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.305,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.632,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.325,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.153,"a9672650-c335-484a-9555-71a35c841aa1":0.541,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.919,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.027,"d6466821-6776-4f40-9609-2342debf5c86":0.182},"overworldMusic":3285854189,"combatMusic":681474673,"bossMusic":3119006570,"id":"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3","$type":"Faction"} \ No newline at end of file diff --git a/GameData/GearData/Arctica.json b/GameData/GearData/Arctica.json deleted file mode 100644 index 770554609..000000000 --- a/GameData/GearData/Arctica.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":6,"schematic":"","behaviors":[{"targetTemp":273.15,"highPass":true,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"emissivity":{"min":2.0,"max":5.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"pumpedHeat":{"min":750.0,"max":4000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"temperatureFloor":273.15,"wasteHeat":{"min":75.0,"max":50.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.5},"energyUsage":{"min":3.0,"max":2.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.25},"thermalMass":{"min":65.0,"max":105.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"group":0,"$type":"RadiatorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":30.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":2.0,"actionIcon":"","soundBank":0,"audioStats":[],"name":"Arctica","description":"Go blazingly fast, without burning up.","creator":"a1f76631-d6d1-443a-9be1-c9b1267d6ca2","mass":50.0,"shape":{"name":[[true],[true]]},"specificHeat":1.0,"conductivity":1.0,"price":350000,"id":"2935b4d4-2ad5-4b90-8416-a85bbb38171b","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Assembly Line.json b/GameData/GearData/Assembly Line.json deleted file mode 100644 index 39176b917..000000000 --- a/GameData/GearData/Assembly Line.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[null],"durability":0.0,"minTemp":273.15,"maxTemp":373.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Assembly Line","description":"Yup it updated.","creator":"00000000-0000-0000-0000-000000000000","mass":1300.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"a4d971ab-d312-461e-814a-15210606c51d","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Cockpit 2x2.json b/GameData/GearData/Cockpit 2x2.json deleted file mode 100644 index f6beceedd..000000000 --- a/GameData/GearData/Cockpit 2x2.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":12,"schematic":"","behaviors":[{"targetTemp":288.15,"highPass":false,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"draw":{"min":25.0,"max":25.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"perSecond":true,"group":0,"$type":"EnergyDrawData"},{"group":1,"$type":"CockpitData"},{"heat":{"min":200.0,"max":200.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"perSecond":true,"group":0,"$type":"HeatData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":223.15,"maxTemp":398.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Cockpit 2x2","description":"","creator":"2f74e6b4-d268-48a9-b2a8-24591c680e84","mass":50.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":50000,"id":"31325c3d-0537-40ec-9e5e-80930ea01496","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Core Power.json b/GameData/GearData/Core Power.json deleted file mode 100644 index 89dc2a510..000000000 --- a/GameData/GearData/Core Power.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":100.0,"max":100.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"efficiency":{"min":0.05,"max":0.1,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.8},"overload":{"min":0.001,"max":0.005,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"underload":{"min":1.5,"max":3.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.75},"group":0,"$type":"ReactorData"},{"perSecond":false,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":450.0,"heatCurve":{"keys":[]},"resilience":250.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Core Power","description":"It gets the job done, but that's all.","creator":"00000000-0000-0000-0000-000000000000","mass":50.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":250000,"id":"4bc1fe6f-347a-425e-be1b-997920175bee","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Deep Ore Extractor.json b/GameData/GearData/Deep Ore Extractor.json deleted file mode 100644 index 2ca09924f..000000000 --- a/GameData/GearData/Deep Ore Extractor.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[null],"durability":0.0,"minTemp":273.15,"maxTemp":373.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Deep Ore Extractor","description":"Get the most out of your resource rights! The Deep Ore Extractor ensures that any planet or asteroid you choose to mine will be left a hollow, barren husk, just as nature intended.","creator":"00000000-0000-0000-0000-000000000000","mass":550.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"518e1b4c-4c6c-4a9a-903f-940e3ac91ad5","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Industrial Thermostatic Heater.json b/GameData/GearData/Industrial Thermostatic Heater.json deleted file mode 100644 index 6c6bd57cf..000000000 --- a/GameData/GearData/Industrial Thermostatic Heater.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[{"targetTemp":288.15,"highPass":false,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"draw":{"min":1000.0,"max":2500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"perSecond":true,"group":0,"$type":"EnergyDrawData"},{"heat":{"min":50000.0,"max":100000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"perSecond":true,"group":0,"$type":"HeatData"}],"durability":0.0,"minTemp":150.0,"maxTemp":400.0,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Industrial Thermostatic Heater","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":250.0,"shape":{"name":[[false,true,true,false],[true,true,true,true],[true,true,true,true],[false,true,true,false]]},"specificHeat":2.0,"conductivity":1.0,"price":0,"id":"2c911da4-fad0-4a38-be5b-5e327c0c9e43","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Large Drive.json b/GameData/GearData/Large Drive.json deleted file mode 100644 index 8f6666016..000000000 --- a/GameData/GearData/Large Drive.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":3,"schematic":"","behaviors":[{"thrust":{"min":250000.0,"max":250000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"visibility":{"min":100.0,"max":100.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"heat":{"min":2500.0,"max":2500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"energy":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"Particles":"Assets/Resources/Prefabs/Thrusters/Thruster 1.prefab","group":0,"$type":"ThrusterData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":400.0,"heatCurve":null,"resilience":10.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Large Drive","description":"Keeps you going and going and going...","creator":"00000000-0000-0000-0000-000000000000","mass":100.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":5.0,"price":100000,"id":"5cd802dd-ef0e-4303-bd87-c30988326e4b","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Long Radiator.json b/GameData/GearData/Long Radiator.json deleted file mode 100644 index 8fdd8cf57..000000000 --- a/GameData/GearData/Long Radiator.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":6,"schematic":"","behaviors":[{"targetTemp":273.15,"highPass":true,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"emissivity":{"min":15.0,"max":15.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"pumpedHeat":{"min":2500.0,"max":2500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"temperatureFloor":278.15,"wasteHeat":{"min":100.0,"max":100.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"energyUsage":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"thermalMass":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"RadiatorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Long Radiator","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":50.0,"shape":{"name":[[true],[true],[true],[true]]},"specificHeat":1.0,"conductivity":1.0,"price":150000,"id":"4b019503-1865-4bad-a6e9-c85b558aacea","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Manhattan.json b/GameData/GearData/Manhattan.json deleted file mode 100644 index 7d3241642..000000000 --- a/GameData/GearData/Manhattan.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":500.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"efficiency":{"min":0.05,"max":0.15,"heatExponentMultiplier":0.03125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"overload":{"min":0.0005,"max":0.005,"heatExponentMultiplier":0.03125,"durabilityExponentMultiplier":0.25,"qualityExponent":3.0},"underload":{"min":1.5,"max":3.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.125,"qualityExponent":1.75},"group":0,"$type":"ReactorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":450.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":10.0,"actionIcon":"","soundBank":2204642885,"audioStats":[],"name":"Manhattan","description":"Because might is right and finesse is for fools","creator":"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3","mass":500.0,"shape":{"name":[[true,true,true],[true,true,true],[true,true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":750000,"id":"3baa2c43-b389-4438-94cb-fbb04489cd77","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/MoveOnPro.json b/GameData/GearData/MoveOnPro.json deleted file mode 100644 index 674ee927b..000000000 --- a/GameData/GearData/MoveOnPro.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":25.0,"max":125.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"efficiency":{"min":0.015,"max":0.1,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"overload":{"min":0.00025,"max":0.005,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.5},"underload":{"min":2.5,"max":20.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.25},"group":0,"$type":"ReactorData"},{"stat":{"behavior":"CapacitorData","stat":"Capacity"},"modifier":{"min":1.1,"max":1.25,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"type":1,"requireBehavior":null,"group":0,"$type":"StatModifierData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":500.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":"","soundBank":2204642885,"audioStats":[],"name":"MoveOnPro","description":"The only muon catalyst fusion reactor on the market! Always gets a great reaction.","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":300.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":900000,"id":"372d23cc-5ef0-42b5-9d96-807f2e412b0d","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Notorious.json b/GameData/GearData/Notorious.json deleted file mode 100644 index 136ae3145..000000000 --- a/GameData/GearData/Notorious.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":400.0,"max":1200.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"efficiency":{"min":0.025,"max":0.1,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.25,"qualityExponent":2.5},"overload":{"min":0.0005,"max":0.005,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.25,"qualityExponent":3.0},"underload":{"min":3.0,"max":12.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.75},"group":0,"$type":"ReactorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":250.0,"maxTemp":450.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":10.0,"actionIcon":"","soundBank":2204642885,"audioStats":[],"name":"Notorious","description":"A reactor for those who want the biggest reaction","creator":"a012e0f4-4b22-47b7-8b24-ff3e1439c949","mass":750.0,"shape":{"name":[[true,true,true],[true,true,true],[true,true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":1000000,"id":"394612a6-9198-4797-a69b-c70cd0ee3273","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/OK Disperser.json b/GameData/GearData/OK Disperser.json deleted file mode 100644 index fb9e7ef26..000000000 --- a/GameData/GearData/OK Disperser.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":6,"schematic":"","behaviors":[{"targetTemp":273.15,"highPass":true,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"emissivity":{"min":4.0,"max":8.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.75},"pumpedHeat":{"min":1000.0,"max":4000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"temperatureFloor":278.15,"wasteHeat":{"min":500.0,"max":100.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.5},"energyUsage":{"min":6.0,"max":3.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.75},"thermalMass":{"min":75.0,"max":125.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"group":0,"$type":"RadiatorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":0,"audioStats":[],"name":"OK Disperser","description":"Adapted from the patented cooling system Lucent uses in their professional gaming setups. A high quality cooler, built to withstand even the most aggressive of rage quits.","creator":"a012e0f4-4b22-47b7-8b24-ff3e1439c949","mass":150.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":250000,"id":"542169f2-363c-41f7-8d6d-60a5bd7578bd","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/PotaT+-.json b/GameData/GearData/PotaT+-.json deleted file mode 100644 index f42b0eff1..000000000 --- a/GameData/GearData/PotaT+-.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[{"capacity":{"min":50.0,"max":150.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.0625,"qualityExponent":2.0},"efficiency":{"min":0.5,"max":0.99,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"CapacitorData"}],"durability":50.0,"minTemp":200.0,"maxTemp":500.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"PotaT+-","description":"[TODO]","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":75.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":75000,"id":"34b15c33-c01f-4712-ac75-5fcf779f0685","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Refinery.json b/GameData/GearData/Refinery.json deleted file mode 100644 index 2ab0f7f55..000000000 --- a/GameData/GearData/Refinery.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[null],"durability":0.0,"minTemp":273.15,"maxTemp":373.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Refinery","description":"Generates plastics, refines raw materials, creates larger molecules","creator":"00000000-0000-0000-0000-000000000000","mass":1300.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"18a67053-2407-4bd7-90ca-9c19891594a9","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Shipyard.json b/GameData/GearData/Shipyard.json deleted file mode 100644 index de86dfb69..000000000 --- a/GameData/GearData/Shipyard.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[null],"durability":0.0,"minTemp":273.15,"maxTemp":373.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Shipyard","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":10000.0,"shape":{"name":[[true]]},"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"c6b994e6-a366-46b2-bc43-8a81944039f0","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Small Radiator.json b/GameData/GearData/Small Radiator.json deleted file mode 100644 index 726ff1a0e..000000000 --- a/GameData/GearData/Small Radiator.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":6,"schematic":"","behaviors":[{"targetTemp":273.15,"highPass":true,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"emissivity":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"pumpedHeat":{"min":1000.0,"max":1000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"temperatureFloor":278.15,"wasteHeat":{"min":100.0,"max":100.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"energyUsage":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"thermalMass":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"RadiatorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Small Radiator","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":50.0,"shape":{"name":[[true],[true]]},"specificHeat":1.0,"conductivity":1.0,"price":50000,"id":"bc3870ae-8e31-45ec-99d9-745a4262f78a","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Surface Ore Extractor.json b/GameData/GearData/Surface Ore Extractor.json deleted file mode 100644 index c4bd66a29..000000000 --- a/GameData/GearData/Surface Ore Extractor.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":1,"schematic":"","behaviors":[],"durability":0.0,"minTemp":273.15,"maxTemp":373.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Surface Ore Extractor","description":"Just scratching the surface here.","creator":"00000000-0000-0000-0000-000000000000","mass":450.0,"shape":{"name":[[true]]},"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"35ab1554-3ab1-4bc9-9325-2bf0348df084","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/The Bat.json b/GameData/GearData/The Bat.json deleted file mode 100644 index d337dc646..000000000 --- a/GameData/GearData/The Bat.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":8,"schematic":"","behaviors":[{"sensitivity":{"min":0.0001,"max":0.0001,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"sensCurve":null,"pingBoost":{"min":10000.0,"max":20000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"pingEnergy":{"min":50.0,"max":50.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"pingVisibility":{"min":5000.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"pingRange":{"min":1000.0,"max":2000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"pingCooldown":{"min":5.0,"max":2.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"pingDuration":2.0,"pingRadiusExponent":0.5,"group":0,"$type":"SensorData"}],"durability":50.0,"minTemp":200.0,"maxTemp":400.0,"heatCurve":{"keys":[]},"resilience":1.0,"actionIcon":"","soundBank":0,"audioStats":[],"name":"The Bat","description":"","creator":"d6466821-6776-4f40-9609-2342debf5c86","mass":10.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":75000,"id":"72859489-677a-47a4-ae04-550e582ba29e","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Traction.json b/GameData/GearData/Traction.json deleted file mode 100644 index 0c61669e1..000000000 --- a/GameData/GearData/Traction.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":13,"schematic":"","behaviors":[{"diameters":[3.0,2.0,0.5],"masses":[30.0,20.0,5.0],"rpm":{"min":40000.0,"max":80000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"couplingLambdas":[0.5,1.0,1.0],"lambdaMultiplier":{"min":1.0,"max":1.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"couplingEfficiency":{"min":0.85,"max":0.95,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"torque":{"min":750000.0,"max":1750000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"torqueProfile":{"keys":[[0.0,1.0,-3.91729,-3.91729],[1.0,0.03112793,-1.73879516,-1.73879516]]},"draw":{"min":1.0,"max":1.25,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"passiveCoupling":{"min":0.01,"max":0.001,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"rpmAudio":2008207144,"torqueAudio":2808571831,"particles":"Assets/Resources/Prefabs/Thrusters/Aether Drive.prefab","group":0,"$type":"AetherDriveData"},{"perSecond":false,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":450.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":250.0,"actionIcon":"","soundBank":2492857755,"audioStats":[{"parameter":1345552351,"stat":{"min":1.0,"max":0.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.5,"qualityExponent":0.25}}],"name":"Traction","description":"[TODO]","creator":"8443f966-0d88-4ec7-a20e-8edf73fa62f6","mass":75.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":250000,"id":"42d1ffaa-f764-4a65-ba03-43cc4e6fd2bc","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Tractor Beam.json b/GameData/GearData/Tractor Beam.json deleted file mode 100644 index ef4c9881f..000000000 --- a/GameData/GearData/Tractor Beam.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":8,"schematic":"","behaviors":[],"durability":0.0,"minTemp":-3.8451617E-06,"maxTemp":-3.8451617E-06,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Tractor Beam","description":"Trap your enemies in gravity wells. Haul thousands of tons of hay through space!","creator":"00000000-0000-0000-0000-000000000000","mass":86.0,"shape":{"name":[[true]]},"specificHeat":0.0,"conductivity":1.0,"price":0,"id":"7d14649c-a3b6-47c5-ab74-201b90072e2c","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Turret Control Module.json b/GameData/GearData/Turret Control Module.json deleted file mode 100644 index 2d8258e47..000000000 --- a/GameData/GearData/Turret Control Module.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":12,"schematic":"","behaviors":[{"draw":{"min":25.0,"max":25.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"perSecond":true,"group":0,"$type":"EnergyDrawData"},{"group":0,"$type":"TurretControllerData"}],"durability":100.0,"minTemp":173.15,"maxTemp":523.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Turret Control Module","description":"","creator":"8443f966-0d88-4ec7-a20e-8edf73fa62f6","mass":10.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":25000,"id":"2b2777c0-b756-4e19-9bf6-e5bac3cc385c","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/Vulcan.json b/GameData/GearData/Vulcan.json deleted file mode 100644 index fe2ece343..000000000 --- a/GameData/GearData/Vulcan.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":50.0,"max":200.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"efficiency":{"min":0.0025,"max":0.025,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"overload":{"min":0.00025,"max":0.005,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.5},"underload":{"min":1.0,"max":6.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.25},"group":0,"$type":"ReactorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":500.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":"","soundBank":2204642885,"audioStats":[],"name":"Vulcan","description":"High output, high heat. Blaze across the cosmos like the comet you were meant to be.","creator":"8443f966-0d88-4ec7-a20e-8edf73fa62f6","mass":500.0,"shape":{"name":[[false,true,true,false],[true,true,true,true],[true,true,true,true],[false,true,true,false]]},"specificHeat":2.5,"conductivity":1.0,"price":1150000,"id":"205efba0-16af-477b-80e9-c9597cead5b4","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/cold like my heart.json b/GameData/GearData/cold like my heart.json deleted file mode 100644 index 2e63279a4..000000000 --- a/GameData/GearData/cold like my heart.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":6,"schematic":"","behaviors":[{"targetTemp":273.15,"highPass":true,"adjustable":false,"group":0,"$type":"ThermotoggleData"},{"emissivity":{"min":3.0,"max":6.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"pumpedHeat":{"min":1000.0,"max":5000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"temperatureFloor":273.15,"wasteHeat":{"min":100.0,"max":300.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.5},"energyUsage":{"min":2.0,"max":1.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.25},"thermalMass":{"min":175.0,"max":225.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"group":0,"$type":"RadiatorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":60.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":2.0,"actionIcon":"","soundBank":0,"audioStats":[],"name":"cold like my heart","description":"nothing can touch me/ i'm an agent of entropy/ heat death in a bottle like a molotov cocktail","creator":"8419f9bc-0167-46ec-86c3-3265d2905fbc","mass":250.0,"shape":{"name":[[true],[true]]},"specificHeat":1.0,"conductivity":1.0,"price":500000,"id":"20e9f41a-6bd2-4f6c-9740-7b707614509c","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/deep space burnout.json b/GameData/GearData/deep space burnout.json deleted file mode 100644 index a130da7a2..000000000 --- a/GameData/GearData/deep space burnout.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":3,"schematic":"","behaviors":[{"thrust":{"min":250000.0,"max":1000000.0,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"visibility":{"min":100.0,"max":400.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"heat":{"min":4000.0,"max":12000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":1.0},"energy":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"Particles":"Assets/Resources/Prefabs/Thrusters/Thruster 1.prefab","group":0,"$type":"ThrusterData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":400.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":15.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"deep space burnout","description":"go go go go go/ get the drift/ you'll burn before you stop ","creator":"8419f9bc-0167-46ec-86c3-3265d2905fbc","mass":150.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":5.0,"price":200000,"id":"04255796-db68-48d2-81e5-8cfdab150706","$type":"GearData"} \ No newline at end of file diff --git a/GameData/GearData/not if i see you first.json b/GameData/GearData/not if i see you first.json deleted file mode 100644 index aac6dcea4..000000000 --- a/GameData/GearData/not if i see you first.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpointType":8,"schematic":"","behaviors":[{"sensitivity":{"min":0.25,"max":1.5,"heatExponentMultiplier":0.4,"durabilityExponentMultiplier":0.4,"qualityExponent":1.5},"sensCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"pingBoost":{"min":5.0,"max":15.0,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"pingEnergy":{"min":150.0,"max":100.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"pingVisibility":{"min":5000.0,"max":1000.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"pingRange":{"min":1000.0,"max":5000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"pingCooldown":{"min":20.0,"max":5.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"pingDuration":2.0,"pingRadiusExponent":0.5,"group":0,"$type":"SensorData"}],"durability":50.0,"minTemp":200.0,"maxTemp":400.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"not if i see you first","description":"[TODO]","creator":"8419f9bc-0167-46ec-86c3-3265d2905fbc","mass":200.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":250000,"id":"480d6cc4-cd8a-49b6-9c89-211033e7c1d5","$type":"GearData"} \ No newline at end of file diff --git a/GameData/HullData/LonginusX.json b/GameData/HullData/LonginusX.json deleted file mode 100644 index 773782d8e..000000000 --- a/GameData/HullData/LonginusX.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpoints":[{"type":12,"position":[2,6],"shape":{"name":[[true,true],[true,true]]},"transform":null,"rotation":0,"armor":50.0},{"type":13,"position":[2,3],"shape":{"name":[[true,true],[true,true]]},"transform":"Drive","rotation":0,"armor":10.0},{"type":9,"position":[1,8],"shape":{"name":[[true,true]]},"transform":"En.L","rotation":0,"armor":20.0},{"type":9,"position":[4,8],"shape":{"name":[[true,true]]},"transform":"En.R","rotation":0,"armor":20.0},{"type":11,"position":[0,5],"shape":{"name":[[true,true,true]]},"transform":"La.L","rotation":0,"armor":30.0},{"type":11,"position":[5,5],"shape":{"name":[[true,true,true]]},"transform":"La.R","rotation":0,"armor":30.0},{"type":6,"position":[1,2],"shape":{"name":[[true,true]]},"transform":"Ra.L","rotation":1,"armor":10.0},{"type":6,"position":[4,2],"shape":{"name":[[true,true]]},"transform":"Ra.R","rotation":3,"armor":10.0},{"type":5,"position":[2,1],"shape":{"name":[[true,true],[true,true]]},"transform":"Reactor","rotation":0,"armor":0.0},{"type":8,"position":[3,10],"shape":{"name":[[true]]},"transform":null,"rotation":0,"armor":5.0}],"prefab":"Assets/Resources/Prefabs/Ships/Longinus.prefab","hullType":0,"gridOffset":3.0,"armor":10.0,"drag":0.1,"canTow":false,"schematic":"Assets/Resources/Schematics/schema_Longinus.png","behaviors":[{"crossSection":{"min":500.0,"max":150.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":1.0,"qualityExponent":2.0},"group":0,"$type":"ReflectorData"}],"durability":500.0,"minTemp":173.15,"maxTemp":573.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":85412153,"audioStats":[],"name":"LonginusX","description":null,"creator":"a1f76631-d6d1-443a-9be1-c9b1267d6ca2","mass":2500.0,"shape":{"name":[[false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,false],[true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false],[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false],[false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,false]]},"specificHeat":1.0,"conductivity":32.0,"price":7500000,"id":"445d911a-9951-40a3-874e-0b7ce8b35129","$type":"HullData"} \ No newline at end of file diff --git a/GameData/HullData/Turret.json b/GameData/HullData/Turret.json deleted file mode 100644 index 803407be7..000000000 --- a/GameData/HullData/Turret.json +++ /dev/null @@ -1 +0,0 @@ -{"hardpoints":[{"type":6,"position":[0,2],"shape":{"name":[[true,true,true,true]]},"transform":null,"rotation":1,"armor":10.0},{"type":6,"position":[7,2],"shape":{"name":[[true,true,true,true]]},"transform":null,"rotation":3,"armor":10.0},{"type":10,"position":[1,2],"shape":{"name":[[true,true,true,true],[true,true,true,true]]},"transform":"Left Gun","rotation":0,"armor":20.0},{"type":10,"position":[5,2],"shape":{"name":[[true,true,true,true],[true,true,true,true]]},"transform":"Right Gun","rotation":0,"armor":20.0},{"type":5,"position":[3,3],"shape":{"name":[[true,true],[true,true]]},"transform":null,"rotation":0,"armor":0.0},{"type":12,"position":[3,5],"shape":{"name":[[true]]},"transform":null,"rotation":0,"armor":0.0},{"type":8,"position":[4,5],"shape":{"name":[[true]]},"transform":null,"rotation":0,"armor":10.0}],"prefab":"Assets/Resources/Prefabs/Turrets/Turret.prefab","hullType":2,"gridOffset":12.0,"armor":10.0,"drag":0.0,"canTow":false,"schematic":"","behaviors":[{"crossSection":{"min":250.0,"max":250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"ReflectorData"}],"durability":100.0,"minTemp":123.149986,"maxTemp":773.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Turret","description":null,"creator":"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3","mass":500.0,"shape":{"name":[[false,false,true,true,true,true,false,false],[false,true,true,true,true,true,true,false],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true],[false,true,true,true,true,true,true,false],[false,false,true,true,true,true,false,false]]},"specificHeat":1.0,"conductivity":32.0,"price":500000,"id":"b867b35f-0bb4-4b85-b967-9a35832deb69","$type":"HullData"} \ No newline at end of file diff --git a/GameData/PersonalityAttribute/Agreeableness.json b/GameData/PersonalityAttribute/Agreeableness.json deleted file mode 100644 index 52062e076..000000000 --- a/GameData/PersonalityAttribute/Agreeableness.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Agreeableness","low":"challenging/detached","high":"friendly/compassionate","id":"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0","$type":"PersonalityAttribute"} \ No newline at end of file diff --git a/GameData/PersonalityAttribute/Extraversion.json b/GameData/PersonalityAttribute/Extraversion.json deleted file mode 100644 index 5facf56a9..000000000 --- a/GameData/PersonalityAttribute/Extraversion.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Extraversion","low":"solitary/reserved","high":"outgoing/energetic","id":"2103d2d5-bf5c-4dd9-9381-c90f1e39496f","$type":"PersonalityAttribute"} \ No newline at end of file diff --git a/GameData/PersonalityAttribute/Openness.json b/GameData/PersonalityAttribute/Openness.json deleted file mode 100644 index cf427539a..000000000 --- a/GameData/PersonalityAttribute/Openness.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Openness","low":"consistent/cautious","high":"inventive/curious","id":"3f608054-8e4a-43fb-926c-261da4cc92d9","$type":"PersonalityAttribute"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Algae.json b/GameData/SimpleCommodityData/Algae.json deleted file mode 100644 index 18d2c4ba5..000000000 --- a/GameData/SimpleCommodityData/Algae.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":4,"name":"Algae","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"2e08445d-c130-497c-9fb3-8d752a24e654","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Animal Products.json b/GameData/SimpleCommodityData/Animal Products.json deleted file mode 100644 index 90adc5e69..000000000 --- a/GameData/SimpleCommodityData/Animal Products.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":4,"name":"Animal Products","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"7e9783b7-ab6c-4c50-bb99-4f1f3a3e240d","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Autocannon Ammo.json b/GameData/SimpleCommodityData/Autocannon Ammo.json deleted file mode 100644 index ad972d5c7..000000000 --- a/GameData/SimpleCommodityData/Autocannon Ammo.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":5,"category":5,"name":"Autocannon Ammo","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":1000,"id":"3085fc8a-ec0d-4f6f-a339-ea43edb573e6","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Bacteria.json b/GameData/SimpleCommodityData/Bacteria.json deleted file mode 100644 index afbb92324..000000000 --- a/GameData/SimpleCommodityData/Bacteria.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":4,"name":"Bacteria","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"3c6bb1cc-70d8-400b-8d69-9c81339758f3","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Fungi.json b/GameData/SimpleCommodityData/Fungi.json deleted file mode 100644 index a064a2b55..000000000 --- a/GameData/SimpleCommodityData/Fungi.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":4,"name":"Fungi","description":"Uses:\nRecyclers\nFood Source","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"64bccb57-3aa8-4e5f-829d-07e62295b0c7","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Gold.json b/GameData/SimpleCommodityData/Gold.json deleted file mode 100644 index 9fdd20b57..000000000 --- a/GameData/SimpleCommodityData/Gold.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":1,"name":"Gold","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"36746041-a5bd-4b95-aa18-294acaaeae62","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Hydrogen.json b/GameData/SimpleCommodityData/Hydrogen.json deleted file mode 100644 index 0e4c33f0d..000000000 --- a/GameData/SimpleCommodityData/Hydrogen.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":0,"name":"Hydrogen","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":0.25,"shape":null,"specificHeat":0.05,"conductivity":1.0,"price":0,"id":"4486cfad-3063-4667-80ae-5e4d615ee501","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Methane.json b/GameData/SimpleCommodityData/Methane.json deleted file mode 100644 index 37a119eaa..000000000 --- a/GameData/SimpleCommodityData/Methane.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":3,"name":"Methane","description":"Potential Fuel Source","creator":"00000000-0000-0000-0000-000000000000","mass":2.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"214fe497-cda4-4cdb-a7c4-fe656e5ff61c","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/New Metals.json b/GameData/SimpleCommodityData/New Metals.json deleted file mode 100644 index 741d47485..000000000 --- a/GameData/SimpleCommodityData/New Metals.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":1,"name":"New Metals","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":0.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"00b5b3b2-2fc5-4adb-a1d7-c1a35d19afd3","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Potassium.json b/GameData/SimpleCommodityData/Potassium.json deleted file mode 100644 index 503215f40..000000000 --- a/GameData/SimpleCommodityData/Potassium.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":0,"name":"Potassium","description":"A relatively common simple element used primarily for weapons production. \r\n","creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"a8e259fc-fbf1-477a-8248-0277611f1859","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Rock.json b/GameData/SimpleCommodityData/Rock.json deleted file mode 100644 index a6e6f86e7..000000000 --- a/GameData/SimpleCommodityData/Rock.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":0,"name":"Rock","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"043997a8-0661-4206-ab8a-10215ecf4efc","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Uranium.json b/GameData/SimpleCommodityData/Uranium.json deleted file mode 100644 index 2d25d5dc3..000000000 --- a/GameData/SimpleCommodityData/Uranium.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":1,"name":"Uranium","description":"Fuel Source","creator":"00000000-0000-0000-0000-000000000000","mass":3.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"08c07793-bc06-48dc-adc2-c7e61ef2cb2b","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/SimpleCommodityData/Water.json b/GameData/SimpleCommodityData/Water.json deleted file mode 100644 index 05a1d143e..000000000 --- a/GameData/SimpleCommodityData/Water.json +++ /dev/null @@ -1 +0,0 @@ -{"maxStackSize":10,"category":3,"name":"Water","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":1.0,"shape":null,"specificHeat":1.0,"conductivity":1.0,"price":0,"id":"3acbb2bf-19fb-4591-bef1-dc9d5dde7e7a","$type":"SimpleCommodityData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/6k Shooter.json b/GameData/WeaponItemData/6k Shooter.json deleted file mode 100644 index 5bb283a5e..000000000 --- a/GameData/WeaponItemData/6k Shooter.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":0,"weaponType":1,"fireTypes":0,"modifiers":16,"hardpointType":10,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.01,"max":0.01,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammoInterval":false,"damageType":0,"damage":{"min":4.0,"max":30.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":1000.0,"max":2000.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.5,"qualityExponent":1.5},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/ColferV/6k Shooter.prefab","energy":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":250.0,"max":500.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"visibility":{"min":1000.0,"max":500.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.5,"qualityExponent":0.75},"ammo":"00000000-0000-0000-0000-000000000000","magSize":6,"reloadTime":2.0,"spread":{"min":0.5,"max":0.1,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.0},"velocity":{"min":500.0,"max":1250.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"InstantWeaponData"}],"durability":50.0,"minTemp":173.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":"","soundBank":3678545986,"audioStats":[],"name":"6k Shooter","description":"The fastest gun in Elysium","creator":"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3","mass":95.0,"shape":{"name":[[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":125000,"id":"679fb6a1-cefb-4adc-a49c-71942602196b","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/Autocannon.json b/GameData/WeaponItemData/Autocannon.json deleted file mode 100644 index dbd5d6340..000000000 --- a/GameData/WeaponItemData/Autocannon.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":1,"weaponType":1,"fireTypes":0,"modifiers":0,"hardpointType":10,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.5,"max":0.5,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammoInterval":false,"damageType":0,"damage":{"min":3.0,"max":3.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"penetration":{"min":0.25,"max":0.25,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":1000.0,"max":1000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageCurve":null,"effect":"Assets/Resources/Prefabs/Weapons/AC5.prefab","energy":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":250.0,"max":250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"visibility":{"min":1000.0,"max":1000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammo":"3085fc8a-ec0d-4f6f-a339-ea43edb573e6","magSize":50,"reloadTime":3.0,"spread":{"min":0.5,"max":0.5,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":500.0,"max":500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"AutoWeaponData"}],"durability":100.0,"minTemp":173.15,"maxTemp":473.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"Autocannon","description":"","creator":"00000000-0000-0000-0000-000000000000","mass":75.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":250000,"id":"13116166-f0c8-43cf-a35f-8fd448bc630c","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/CShot RainbowLite Lazer.json b/GameData/WeaponItemData/CShot RainbowLite Lazer.json deleted file mode 100644 index e3d7b594e..000000000 --- a/GameData/WeaponItemData/CShot RainbowLite Lazer.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":0,"weaponType":2,"fireTypes":0,"modifiers":0,"hardpointType":9,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":3.0,"max":1.0,"heatExponentMultiplier":0.2,"durabilityExponentMultiplier":0.4,"qualityExponent":2.0},"ammoInterval":false,"damageType":4,"damage":{"min":100.0,"max":600.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":1000.0,"max":3000.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/Lucent/RainbowLite.prefab","energy":{"min":50.0,"max":150.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"heat":{"min":1000.0,"max":5000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"visibility":{"min":2000.0,"max":3000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.25},"ammo":"00000000-0000-0000-0000-000000000000","magSize":1,"reloadTime":1.0,"spread":{"min":0.15,"max":0.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"velocity":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"AutoWeaponData"}],"durability":150.0,"minTemp":250.0,"maxTemp":400.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":3364802794,"audioStats":[],"name":"CShot RainbowLite Lazer","description":"Light up the cold, infinite void with more than your smile! Our precision full spectrum lasers are both combat and concert ready.","creator":"a012e0f4-4b22-47b7-8b24-ff3e1439c949","mass":500.0,"shape":{"name":[[true,true,true],[true,true,true],[true,true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":125000,"id":"03a842b2-295e-4cf7-9faa-ecc4bc54eb76","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/ChargeBlast SG.json b/GameData/WeaponItemData/ChargeBlast SG.json deleted file mode 100644 index 2ab9ff29f..000000000 --- a/GameData/WeaponItemData/ChargeBlast SG.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":1,"weaponType":4,"fireTypes":16,"modifiers":64,"hardpointType":9,"schematic":"","behaviors":[{"chargeTime":{"min":2.0,"max":1.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"chargeEnergy":{"min":75.0,"max":75.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"chargeHeat":{"min":2500.0,"max":2000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.0},"canFireEarly":true,"failureCharge":4.0,"failureDamage":25.0,"chargeDamage":3.0,"chargeSpread":0.333,"chargeBurstCount":2.0,"chargeVisibility":5.0,"chargeVelocity":1.5,"chargeHeatMul":5.0,"count":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.75,"max":0.4,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":true,"damageType":2,"damage":{"min":50.0,"max":175.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":450.0,"max":950.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/NiteLife/ChargeBlast SG.prefab","energy":{"min":25.0,"max":25.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":250.0,"max":250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"visibility":{"min":5000.0,"max":1000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammo":"00000000-0000-0000-0000-000000000000","magSize":0,"reloadTime":2.0,"spread":{"min":3.0,"max":1.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"velocity":{"min":250.0,"max":750.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"ChargedWeaponData"}],"durability":150.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":3364802794,"audioStats":[],"name":"ChargeBlast SG","description":"For those days when you really want to spread the pain around.","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":250.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":350000,"id":"0d499d62-3b92-454b-9498-37d12616167f","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/ChargeBlast+-.json b/GameData/WeaponItemData/ChargeBlast+-.json deleted file mode 100644 index ba97bb1fa..000000000 --- a/GameData/WeaponItemData/ChargeBlast+-.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":1,"weaponType":4,"fireTypes":16,"modifiers":0,"hardpointType":9,"schematic":"","behaviors":[{"chargeTime":{"min":2.0,"max":1.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"chargeEnergy":{"min":75.0,"max":75.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"chargeHeat":{"min":2500.0,"max":2000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.0},"canFireEarly":true,"failureCharge":4.0,"failureDamage":25.0,"chargeDamage":3.0,"chargeSpread":0.333,"chargeBurstCount":2.0,"chargeVisibility":5.0,"chargeVelocity":1.5,"chargeHeatMul":5.0,"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.75,"max":0.4,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":true,"damageType":2,"damage":{"min":25.0,"max":110.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":800.0,"max":1900.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/NiteLife/ChargeBlast+-.prefab","energy":{"min":25.0,"max":25.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":250.0,"max":250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"visibility":{"min":5000.0,"max":1000.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammo":"00000000-0000-0000-0000-000000000000","magSize":0,"reloadTime":2.0,"spread":{"min":1.0,"max":0.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"velocity":{"min":250.0,"max":750.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"ChargedWeaponData"}],"durability":185.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":3364802794,"audioStats":[],"name":"ChargeBlast+-","description":"A knockout weapon, the arms equivalent of downing 9 shots of Tollgan Swamp liquor.","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":225.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":275000,"id":"499f7891-c5df-4cbe-8431-9db7108102ec","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/ClearPath.json b/GameData/WeaponItemData/ClearPath.json deleted file mode 100644 index 4d21a70ef..000000000 --- a/GameData/WeaponItemData/ClearPath.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":0,"weaponType":1,"fireTypes":0,"modifiers":16,"hardpointType":10,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.1,"max":0.033,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":false,"damageType":0,"damage":{"min":2.0,"max":6.0,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":250.0,"max":600.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/Lightsail/ClearPath.prefab","energy":{"min":1.0,"max":0.5,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.25},"heat":{"min":50.0,"max":10.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.5,"qualityExponent":1.5},"visibility":{"min":500.0,"max":100.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"ammo":"00000000-0000-0000-0000-000000000000","magSize":0,"reloadTime":1.0,"spread":{"min":1.25,"max":0.25,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":1.25},"velocity":{"min":700.0,"max":1250.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.75},"group":0,"$type":"AutoWeaponData"}],"durability":75.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":4.0,"actionIcon":"","soundBank":3678545986,"audioStats":[],"name":"ClearPath","description":"Defend your precious cargo and have fun doing it. Comes with optional sound effects.","creator":"2f74e6b4-d268-48a9-b2a8-24591c680e84","mass":50.0,"shape":{"name":[[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":50000,"id":"0271bb97-4ce8-4d64-97c3-8bfd3f76b2c6","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/ColdFire.json b/GameData/WeaponItemData/ColdFire.json deleted file mode 100644 index 6308ee466..000000000 --- a/GameData/WeaponItemData/ColdFire.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":0,"weaponType":2,"fireTypes":0,"modifiers":0,"hardpointType":9,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":2.5,"max":1.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":false,"damageType":4,"damage":{"min":40.0,"max":160.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":750.0,"max":2250.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/Adrasteia/ColdFire.prefab","energy":{"min":20.0,"max":50.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"heat":{"min":500.0,"max":0.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"visibility":{"min":300.0,"max":0.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"ammo":"00000000-0000-0000-0000-000000000000","magSize":1,"reloadTime":1.0,"spread":{"min":0.05,"max":0.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":1.75},"velocity":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"AutoWeaponData"}],"durability":25.0,"minTemp":263.15,"maxTemp":398.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":2.0,"actionIcon":"","soundBank":3364802794,"audioStats":[],"name":"ColdFire","description":"Operates by taking advantage of the wave/particle duality in a way that has other scientist tearing their hair out. Fact: Adrasteia's R&D department is the reason Einstein's hair looked like that.","creator":"bbd619ed-76c1-464c-829d-3f419cdc2525","mass":150.0,"shape":{"name":[[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":400000,"id":"2933c4ce-bf41-459c-b0d6-9583466b393d","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/DeathCluster.json b/GameData/WeaponItemData/DeathCluster.json deleted file mode 100644 index a2eac4b24..000000000 --- a/GameData/WeaponItemData/DeathCluster.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":1,"weaponType":1,"fireTypes":0,"modifiers":64,"hardpointType":10,"schematic":"","behaviors":[{"count":{"min":12.0,"max":15.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":1.0,"max":0.25,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":true,"damageType":0,"damage":{"min":100.0,"max":250.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":500.0,"max":1000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/ColferV/DeathCluster.prefab","energy":{"min":25.0,"max":5.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.0},"heat":{"min":1500.0,"max":500.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":1.5,"qualityExponent":0.25},"visibility":{"min":1000.0,"max":250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"ammo":"878112d9-180a-4038-85e9-a015191bd8ed","magSize":8,"reloadTime":4.0,"spread":{"min":3.0,"max":0.5,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"velocity":{"min":750.0,"max":1500.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"AutoWeaponData"}],"durability":50.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":4.0,"actionIcon":"","soundBank":2393348022,"audioStats":[],"name":"DeathCluster","description":"Because why kill two birds with one stone when you could annihilate them with one hundred?","creator":"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3","mass":250.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":450000,"id":"8ac84e31-f0cf-43b2-8611-3316adfa4010","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/Earp.json b/GameData/WeaponItemData/Earp.json deleted file mode 100644 index 52e8816eb..000000000 --- a/GameData/WeaponItemData/Earp.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":0,"weaponType":1,"fireTypes":0,"modifiers":16,"hardpointType":10,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.01,"max":0.01,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammoInterval":false,"damageType":0,"damage":{"min":5.0,"max":25.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.5,"qualityExponent":2.25},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":1000.0,"max":2500.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.5,"qualityExponent":1.75},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/ColferV/6k Shooter.prefab","energy":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":250.0,"max":500.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"visibility":{"min":1000.0,"max":500.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.5,"qualityExponent":0.75},"ammo":"00000000-0000-0000-0000-000000000000","magSize":6,"reloadTime":3.0,"spread":{"min":0.5,"max":0.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"velocity":{"min":600.0,"max":1600.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"InstantWeaponData"}],"durability":35.0,"minTemp":175.0,"maxTemp":475.0,"heatCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"resilience":5.0,"actionIcon":"","soundBank":3678545986,"audioStats":[],"name":"Earp","description":"Bringing the Wild West to the New Frontier","creator":"8443f966-0d88-4ec7-a20e-8edf73fa62f6","mass":75.0,"shape":{"name":[[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":145000,"id":"2fd0d88b-f565-4021-85b4-02d9eae7be58","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/FastBlast+-.json b/GameData/WeaponItemData/FastBlast+-.json deleted file mode 100644 index d6b08b223..000000000 --- a/GameData/WeaponItemData/FastBlast+-.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":0,"weaponType":4,"fireTypes":0,"modifiers":80,"hardpointType":9,"schematic":"","behaviors":[{"count":{"min":12.0,"max":12.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.333,"max":0.1,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"ammoInterval":true,"damageType":2,"damage":{"min":20.0,"max":80.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":500.0,"max":1250.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/NiteLife/FastBlast+-.prefab","energy":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":500.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.25},"visibility":{"min":500.0,"max":100.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"ammo":"878112d9-180a-4038-85e9-a015191bd8ed","magSize":12,"reloadTime":3.0,"spread":{"min":3.0,"max":1.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"velocity":{"min":400.0,"max":900.0,"heatExponentMultiplier":0.5,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"AutoWeaponData"}],"durability":30.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":"","soundBank":3364802794,"audioStats":[],"name":"FastBlast+-","description":"Do less damage, faster!","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":125.0,"shape":{"name":[[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":150000,"id":"457ac901-aa54-4ba7-9df6-fbacdfb40b3f","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/GT 3K.json b/GameData/WeaponItemData/GT 3K.json deleted file mode 100644 index 027c7e4b1..000000000 --- a/GameData/WeaponItemData/GT 3K.json +++ /dev/null @@ -1 +0,0 @@ -{"range":3,"caliber":1,"weaponType":5,"fireTypes":4,"modifiers":0,"hardpointType":11,"schematic":"","behaviors":[{"guidance":[[0.0,0.9593412,0.0,0.0],[0.186046138,0.9699189,0.0,0.0],[0.245504111,0.561182439,0.0,0.0],[0.305781841,0.9728476,0.0,0.0],[0.452824175,0.9863649,0.0,0.0],[0.514968336,0.72557956,0.0,0.0],[0.582879245,0.986441553,0.0,0.0],[0.740852237,0.990967453,0.0,0.0],[0.8113701,0.8454359,0.0,0.0],[0.8819307,1.0,0.0,0.0],[1.0,1.0,0.0,0.0]],"thrustCurve":[[0.0,0.0,0.0,0.0],[0.0170422811,0.3977728,51.60958,51.60958],[0.0497766957,0.07809481,0.205703467,0.205703467],[0.4783637,0.4762412,1.43706155,1.43706155],[0.4969261,0.832028151,1.427726,1.427726],[0.9812975,0.9989637,0.110116482,0.110116482],[1.0,0.0,0.0,0.0]],"liftCurve":[[0.0,0.09374851,-0.282933772,-0.282933772],[0.0793687,0.287501574,0.0,0.0],[0.485981524,0.0558143854,-0.309884,-0.309884],[1.0,0.0,0.0,0.0]],"thrust":{"min":135.0,"max":325.0,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"frequency":0.25,"missileSpeed":{"min":150.0,"max":300.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.25},"speed":{"min":0.15,"max":0.25,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"sensorImpact":{"min":1.5,"max":0.5,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":1.75},"threshold":{"min":15.0,"max":35.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"directionImpact":{"min":2.0,"max":1.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"decay":{"min":0.25,"max":0.1,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.125,"qualityExponent":2.25},"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":15.0,"max":8.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"ammoInterval":false,"damageType":0,"damage":{"min":14.0,"max":48.0,"heatExponentMultiplier":0.03125,"durabilityExponentMultiplier":0.0625,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":1.0,"max":3.25,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"minRange":{"min":500.0,"max":50.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.75},"range":{"min":1650.0,"max":3500.0,"heatExponentMultiplier":0.03125,"durabilityExponentMultiplier":0.125,"qualityExponent":1.75},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/Regular Missile.prefab","energy":{"min":5.0,"max":1.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"heat":{"min":1500.0,"max":500.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"visibility":{"min":1000.0,"max":250.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.125,"qualityExponent":1.75},"ammo":"00000000-0000-0000-0000-000000000000","magSize":2,"reloadTime":1.0,"spread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":100.0,"max":175.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":1.0},"group":0,"$type":"LauncherData"}],"durability":60.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":2393348022,"audioStats":[],"name":"GT 3K","description":"Smaller, faster, and more determined than ever. The little missile that could!","creator":"adfb9b08-aabc-45c6-9586-915698a9c4b0","mass":100.0,"shape":{"name":[[true,true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":225000,"id":"5ee2ff03-0ac4-4cdd-89bc-81e29223900b","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/LRMM72.json b/GameData/WeaponItemData/LRMM72.json deleted file mode 100644 index 886c84121..000000000 --- a/GameData/WeaponItemData/LRMM72.json +++ /dev/null @@ -1 +0,0 @@ -{"range":3,"caliber":2,"weaponType":6,"fireTypes":4,"modifiers":0,"hardpointType":11,"schematic":"","behaviors":[{"guidance":[[0.0,0.5062485,0.0,0.0],[1.0,1.0,0.0,0.0]],"thrustCurve":[[0.0,0.5,0.0,0.0],[0.9812975,0.9989637,0.110116482,0.110116482],[1.0,0.0,0.0,0.0]],"liftCurve":[[0.0,0.818747,-0.282933772,-0.282933772],[0.15127635,0.9625015,0.0,0.0],[0.358333349,0.299992323,-0.104599796,-0.104599796],[0.7237745,0.299558282,-0.309884,-0.309884],[1.0,0.0,0.0,0.0]],"thrust":{"min":500.0,"max":500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"frequency":0.25,"missileSpeed":{"min":250.0,"max":250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"speed":{"min":0.1,"max":0.1,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"sensorImpact":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"threshold":{"min":30.0,"max":30.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"directionImpact":{"min":2.0,"max":2.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"decay":{"min":0.25,"max":0.25,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"count":{"min":72.0,"max":72.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":2.0,"max":2.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":10.0,"max":10.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammoInterval":false,"damageType":0,"damage":{"min":256.0,"max":256.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"penetration":{"min":0.25,"max":0.25,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":500.0,"max":500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":2000.0,"max":2000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageCurve":null,"effect":"Assets/Resources/Prefabs/Weapons/Micromissile.prefab","energy":{"min":0.1,"max":0.1,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":500.0,"max":500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"visibility":{"min":1000.0,"max":1000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammo":"00000000-0000-0000-0000-000000000000","magSize":144,"reloadTime":1.0,"spread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":150.0,"max":150.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"LauncherData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":null,"resilience":5.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"LRMM72","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":100.0,"shape":{"name":[[true,true],[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":2500000,"id":"32157982-b015-461e-ba4e-d321a23c2748","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/SRMM72.json b/GameData/WeaponItemData/SRMM72.json deleted file mode 100644 index 79a697c49..000000000 --- a/GameData/WeaponItemData/SRMM72.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":3,"weaponType":6,"fireTypes":2,"modifiers":0,"hardpointType":11,"schematic":"","behaviors":[{"guidance":[[0.0,0.8499985,0.0,0.0],[1.0,1.0,0.0,0.0]],"thrustCurve":[[0.00061,0.0,22.0190086,22.0190086],[0.150437117,1.0,0.0,0.0],[0.358333349,0.299992323,-1.61195123,-1.61195123],[1.0,0.0,0.0,0.0]],"liftCurve":[[0.0,0.0,0.0,0.0],[1.0,0.0,0.0,0.0]],"thrust":{"min":2000.0,"max":2000.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"frequency":1.0,"missileSpeed":{"min":500.0,"max":500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"count":{"min":72.0,"max":72.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.333,"max":0.333,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammoInterval":false,"damageType":0,"damage":{"min":128.0,"max":128.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"penetration":{"min":0.25,"max":0.25,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.5,"max":0.5,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":750.0,"max":750.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageCurve":null,"effect":"Assets/Resources/Prefabs/Weapons/SRM.prefab","energy":{"min":25.0,"max":25.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"heat":{"min":500.0,"max":500.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"visibility":{"min":1250.0,"max":1250.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"ammo":"00000000-0000-0000-0000-000000000000","magSize":288,"reloadTime":10.0,"spread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":50.0,"max":50.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"GuidedWeaponData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"SRMM72","description":null,"creator":"00000000-0000-0000-0000-000000000000","mass":100.0,"shape":{"name":[[true,true],[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":1250000,"id":"1c0cff5d-8668-45ea-9726-8b08c81d0267","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/Spectra.json b/GameData/WeaponItemData/Spectra.json deleted file mode 100644 index 3cec5ae1f..000000000 --- a/GameData/WeaponItemData/Spectra.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":0,"weaponType":2,"fireTypes":0,"modifiers":0,"hardpointType":9,"schematic":"","behaviors":[{"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.5,"max":0.25,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":false,"damageType":4,"damage":{"min":20.0,"max":85.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":800.0,"max":1750.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.5,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/Alakrita/Spectra.prefab","energy":{"min":20.0,"max":40.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"heat":{"min":1000.0,"max":500.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.75},"visibility":{"min":550.0,"max":150.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammo":"00000000-0000-0000-0000-000000000000","magSize":1,"reloadTime":1.0,"spread":{"min":0.1,"max":0.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"velocity":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"AutoWeaponData"}],"durability":30.0,"minTemp":263.15,"maxTemp":398.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":3364802794,"audioStats":[],"name":"Spectra","description":"Travelling light, for those travelling light. Take out the competition without slowing down with Spectra.","creator":"a1f76631-d6d1-443a-9be1-c9b1267d6ca2","mass":25.0,"shape":{"name":[[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":125000,"id":"4a41dec8-6b65-46ee-b578-ba805f112c0c","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/plight.json b/GameData/WeaponItemData/plight.json deleted file mode 100644 index 0f699cd59..000000000 --- a/GameData/WeaponItemData/plight.json +++ /dev/null @@ -1 +0,0 @@ -{"range":2,"caliber":2,"weaponType":3,"fireTypes":0,"modifiers":0,"hardpointType":9,"schematic":"","behaviors":[{"chargeTime":{"min":3.0,"max":2.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"chargeEnergy":{"min":25.0,"max":125.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"chargeHeat":{"min":1250.0,"max":4500.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"canFireEarly":true,"failureCharge":2.5,"failureDamage":15.0,"chargeDamage":3.0,"chargeSpread":1.0,"chargeBurstCount":1.0,"chargeVisibility":1.5,"chargeVelocity":1.0,"chargeHeatMul":1.5,"count":{"min":1.0,"max":1.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":4.0,"max":2.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":1.75},"ammoInterval":false,"damageType":0,"damage":{"min":75.0,"max":400.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":1.0,"max":3.3,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.25},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":500.0,"max":2000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"damageCurve":null,"effect":"Assets/Resources/Prefabs/Weapons/Lucent/TaranisLG.prefab","energy":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"heat":{"min":250.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"visibility":{"min":3000.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.75},"ammo":"00000000-0000-0000-0000-000000000000","magSize":0,"reloadTime":1.0,"spread":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":0.0,"max":0.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"group":0,"$type":"ChargedWeaponData"}],"durability":100.0,"minTemp":263.15,"maxTemp":398.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"plight","description":"Chain lightning has your enemies chain smoking while you enjoy a relaxing DragOnBreath vapepop, now available in 17! flavours (manufactured by DragOnBreath, a subsidary of Lucent Media)","creator":"00000000-0000-0000-0000-000000000000","mass":100.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":800000,"id":"632420a6-4419-4647-a92b-5e22ea289025","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/pretty pretty bang bang.json b/GameData/WeaponItemData/pretty pretty bang bang.json deleted file mode 100644 index 48336fe4a..000000000 --- a/GameData/WeaponItemData/pretty pretty bang bang.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":1,"weaponType":1,"fireTypes":16,"modifiers":66,"hardpointType":10,"schematic":"","behaviors":[{"chargeTime":{"min":1.0,"max":1.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"chargeEnergy":{"min":50.0,"max":50.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"chargeHeat":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"canFireEarly":true,"failureCharge":3.0,"failureDamage":25.0,"chargeDamage":5.0,"chargeSpread":0.5,"chargeBurstCount":3.0,"chargeVisibility":5.0,"chargeVelocity":1.5,"chargeHeatMul":5.0,"count":{"min":5.0,"max":5.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":0.666,"max":0.333,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"ammoInterval":true,"damageType":3,"damage":{"min":64.0,"max":256.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":500.0,"max":1250.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/DME/prettypretty.prefab","energy":{"min":25.0,"max":50.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"heat":{"min":500.0,"max":1000.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"visibility":{"min":1750.0,"max":600.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.5,"qualityExponent":2.25},"ammo":"7e6c1910-005f-4ce9-b9bd-481e8cae5cdf","magSize":8,"reloadTime":3.0,"spread":{"min":4.0,"max":1.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"velocity":{"min":250.0,"max":750.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.0},"group":0,"$type":"ChargedWeaponData"}],"durability":250.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":639519169,"audioStats":[],"name":"pretty pretty bang bang","description":"make your last stand/ it's a pretty pretty mess you've got us into/ it's a pretty pretty pretty day to die/ locked and loaded we're going out with a bang","creator":"8419f9bc-0167-46ec-86c3-3265d2905fbc","mass":250.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":1.0,"conductivity":1.0,"price":1500000,"id":"3aa1ac05-6d55-4569-8a4b-e1c3c6e07c61","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/pswarm.json b/GameData/WeaponItemData/pswarm.json deleted file mode 100644 index e9a4f710a..000000000 --- a/GameData/WeaponItemData/pswarm.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":1,"weaponType":6,"fireTypes":2,"modifiers":2,"hardpointType":11,"schematic":"","behaviors":[{"guidance":[[0.0,0.9620285,0.0,0.0],[1.0,1.0,0.0,0.0]],"thrustCurve":[[0.00061,0.0,22.0190086,22.0190086],[0.0855567455,0.983402252,0.0,0.0],[0.320836753,0.154407173,-0.727946758,-0.727946758],[1.0,0.0,0.0,0.0]],"liftCurve":[[0.0,0.0,0.0,0.0],[1.0,0.0,0.0,0.0]],"thrust":{"min":500.0,"max":2000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.25},"frequency":1.0,"missileSpeed":{"min":400.0,"max":600.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"count":{"min":9.0,"max":9.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.333,"max":0.333,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":8.0,"max":4.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"ammoInterval":false,"damageType":3,"damage":{"min":128.0,"max":512.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.9,"max":1.5,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":500.0,"max":1250.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"damageCurve":null,"effect":"Assets/Resources/Prefabs/Weapons/DME/scorchedvoid.prefab","energy":{"min":25.0,"max":50.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"heat":{"min":500.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"visibility":{"min":1250.0,"max":250.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"ammo":"00000000-0000-0000-0000-000000000000","magSize":72,"reloadTime":6.0,"spread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":50.0,"max":100.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"group":0,"$type":"GuidedWeaponData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":null,"resilience":1.0,"actionIcon":null,"soundBank":0,"audioStats":[],"name":"pswarm","description":"let's set the stars on fire/ there's nothing left on earth to burn/ we're just killing time while we're filling space/ and catacombs in turn","creator":"00000000-0000-0000-0000-000000000000","mass":100.0,"shape":{"name":[[true]]},"specificHeat":1.0,"conductivity":1.0,"price":750000,"id":"a0478430-3ec5-445d-94a7-f30e61b2b8d3","$type":"WeaponItemData"} \ No newline at end of file diff --git a/GameData/WeaponItemData/scorched void policy.json b/GameData/WeaponItemData/scorched void policy.json deleted file mode 100644 index c06a9e75d..000000000 --- a/GameData/WeaponItemData/scorched void policy.json +++ /dev/null @@ -1 +0,0 @@ -{"range":1,"caliber":1,"weaponType":6,"fireTypes":2,"modifiers":2,"hardpointType":11,"schematic":"","behaviors":[{"guidance":[[0.0,0.9620285,0.0,0.0],[1.0,1.0,0.0,0.0]],"thrustCurve":[[0.00061,0.0,22.0190086,22.0190086],[0.0855567455,0.983402252,0.0,0.0],[0.320836753,0.154407173,-0.727946758,-0.727946758],[1.0,0.0,0.0,0.0]],"liftCurve":[[0.0,0.0,0.0,0.0],[1.0,0.0,0.0,0.0]],"thrust":{"min":500.0,"max":2000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":1.25},"frequency":1.0,"missileSpeed":{"min":400.0,"max":600.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.5},"count":{"min":9.0,"max":9.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"burstTime":{"min":0.333,"max":0.333,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"cooldown":{"min":8.0,"max":4.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"ammoInterval":false,"damageType":3,"damage":{"min":128.0,"max":512.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"penetration":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"damageSpread":{"min":0.9,"max":1.5,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"minRange":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"range":{"min":500.0,"max":1250.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"damageCurve":{"keys":[[0.0,1.0,0.0,0.0],[1.0,0.0,-1.76562428,-1.76562428]]},"effect":"Assets/Resources/Prefabs/Weapons/DME/scorchedvoid.prefab","energy":{"min":25.0,"max":50.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"heat":{"min":500.0,"max":1000.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"visibility":{"min":1250.0,"max":250.0,"heatExponentMultiplier":0.25,"durabilityExponentMultiplier":0.125,"qualityExponent":1.5},"ammo":"00000000-0000-0000-0000-000000000000","magSize":72,"reloadTime":6.0,"spread":{"min":0.0,"max":0.0,"heatExponentMultiplier":1.0,"durabilityExponentMultiplier":0.0,"qualityExponent":0.0},"velocity":{"min":50.0,"max":100.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":2.0},"group":0,"$type":"GuidedWeaponData"}],"durability":100.0,"minTemp":223.15,"maxTemp":473.15,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":1.0,"actionIcon":"","soundBank":3678545986,"audioStats":[],"name":"scorched void policy","description":"let's set the stars on fire/ there's nothing left on earth to burn/ we're just killing time while we're filling space/ and catacombs in turn","creator":"8419f9bc-0167-46ec-86c3-3265d2905fbc","mass":100.0,"shape":{"name":[[true],[true],[true]]},"specificHeat":1.0,"conductivity":1.0,"price":750000,"id":"2e5193aa-3703-4ecc-911d-4d8394ce4c2f","$type":"WeaponItemData"} \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 7116bdc09..ef00c0c0a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,20 +3,20 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.burst": "1.6.6", - "com.unity.cinemachine": "2.8.6", - "com.unity.ide.rider": "3.0.15", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.cinemachine": "2.8.9", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.21", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.3.0", + "com.unity.inputsystem": "1.7.0", "com.unity.localization": "1.3.1", "com.unity.mathematics": "1.2.6", "com.unity.postprocessing": "3.2.2", "com.unity.recorder": "3.0.3", - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.6.5", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.9", + "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 013de66bd..a306ed2ce 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -17,11 +17,11 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.19.6", "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.scriptablebuildpipeline": "1.19.6", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -36,10 +36,12 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.8.6", + "version": "2.8.9", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -50,7 +52,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -59,7 +61,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -75,7 +77,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.3.0", + "version": "1.7.0", "depth": 0, "source": "registry", "dependencies": { @@ -101,7 +103,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -133,7 +135,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -153,13 +155,13 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.6.5", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -174,7 +176,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.9", + "version": "2.1.10", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4cb046008..9706d869a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.6f1 -m_EditorVersionWithRevision: 2021.3.6f1 (7da38d85baf6) +m_EditorVersion: 2021.3.31f1 +m_EditorVersionWithRevision: 2021.3.31f1 (3409e2af086f) diff --git a/ProjectSettings/ProjectVersionPrevious.txt b/ProjectSettings/ProjectVersionPrevious.txt index 4cb046008..9706d869a 100644 --- a/ProjectSettings/ProjectVersionPrevious.txt +++ b/ProjectSettings/ProjectVersionPrevious.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.6f1 -m_EditorVersionWithRevision: 2021.3.6f1 (7da38d85baf6) +m_EditorVersion: 2021.3.31f1 +m_EditorVersionWithRevision: 2021.3.31f1 (3409e2af086f) diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6ad0f9c52..7f7ec417b 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec41d06e249123daf3b71241b15d24f27b0b1832d56300a099e7c993cf9d3a81 +oid sha256:5628c21db0b2350cc7f38c4a1c258c8715367026617216182adf69069887f371 size 2313 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 13bc29043..cd777f999 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,17 +14,18 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 16} + - {fileID: 10} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1849 - height: 987 + width: 2489 + height: 1347 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: -1 + controlID: 4604 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -47,13 +48,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 71 - y: 475 - width: 1159 - height: 564 + y: 505 + width: 1501 + height: 894 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_SerializedViewNames: [] m_SerializedViewValues: [] m_PlayModeViewName: GameView @@ -64,11 +66,11 @@ MonoBehaviour: m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 1 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 0 + m_Stats: 1 m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 @@ -87,7 +89,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -96,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1159 - height: 543 - m_Scale: {x: 0.50277776, y: 0.50277776} - m_Translation: {x: 579.5, y: 271.5} + width: 1501 + height: 873 + m_Scale: {x: 0.7817708, y: 0.7817708} + m_Translation: {x: 750.5, y: 436.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1152.5967 - y: -540 - width: 2305.1934 - height: 1080 + x: -960 + y: -558.3478 + width: 1920 + height: 1116.6956 m_MinimalGUI: 1 - m_defaultScale: 0.50277776 - m_LastWindowPixelSize: {x: 1159, y: 564} + m_defaultScale: 0.7817708 + m_LastWindowPixelSize: {x: 1501, y: 894} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -126,23 +128,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 11} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1495 - height: 987 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: -1 + width: 1502 + height: 1347 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 4605 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -157,43 +159,18 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 5} - - {fileID: 10} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1160 - height: 987 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: -1 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 8} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1160 - height: 402 + width: 1502 + height: 432 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 90656 ---- !u!114 &6 + controlID: 4561 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -210,16 +187,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 566 - height: 402 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 7} + width: 877 + height: 432 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 6} m_Panes: - - {fileID: 7} + - {fileID: 6} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -242,8 +219,8 @@ MonoBehaviour: serializedVersion: 2 x: 71 y: 73 - width: 565 - height: 381 + width: 876 + height: 411 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -330,7 +307,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: 67.5, y: 21} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -457,19 +434,20 @@ MonoBehaviour: id: Scene View/Particles index: 10 layout: 4 + m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 1 + m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1104, y: 48, z: 0} + m_Target: {x: -260.65558, y: -260.63815, z: -3.3483124} speed: 2 - m_Value: {x: 81.838005, y: -99.80969, z: -20.916882} + m_Value: {x: -260.65558, y: -260.63815, z: -3.3483124} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -481,7 +459,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -511,18 +489,18 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.08816222, y: 0.027467065, z: -0.0012840665, w: 0.9965588} + m_Target: {x: -0.20558125, y: 0.25416535, z: -0.04925531, w: -0.94489384} speed: 2 - m_Value: {x: -0.14626138, y: 0.401688, z: -0.06515645, w: -0.9016746} + m_Value: {x: -0.20536429, y: 0.25389713, z: -0.049203333, w: -0.94389665} m_Size: - m_Target: 45.254833 + m_Target: 147.73953 speed: 2 - m_Value: 132.89627 + m_Value: 147.73953 m_Ortho: m_Target: 0 speed: 2 @@ -537,17 +515,17 @@ MonoBehaviour: m_AccelerationEnabled: 1 m_FieldOfViewHorizontalOrVertical: 60 m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 + m_FarClip: 4096 + m_DynamicClip: 0 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: -0.060306873, y: 0.5177287, z: -0.035882633, w: -0.8528912} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &8 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -562,18 +540,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 566 + x: 877 y: 0 - width: 594 - height: 402 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 9} + width: 625 + height: 432 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 8} m_Panes: - - {fileID: 9} + - {fileID: 8} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -594,15 +572,16 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 637 + x: 948 y: 73 - width: 592 - height: 381 + width: 623 + height: 411 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &10 + m_OverlaysVisible: 1 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -618,17 +597,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 402 - width: 1160 - height: 585 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + y: 432 + width: 1502 + height: 915 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -641,19 +620,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 14} + - {fileID: 11} + - {fileID: 13} m_Position: serializedVersion: 2 - x: 1160 + x: 1502 y: 0 - width: 335 - height: 987 + width: 451 + height: 1347 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 90698 ---- !u!114 &12 + controlID: 4626 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -670,16 +649,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 335 - height: 534 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + width: 451 + height: 729 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 13} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -700,20 +679,21 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1231 + x: 1573 y: 73 - width: 333 - height: 513 + width: 449 + height: 708 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8c96ffff + m_ExpandedIDs: 7664ffff0874ffffe0faffff32720000c2720000bcd700008ad8000034db0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -729,7 +709,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 11} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -737,7 +717,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -753,17 +733,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 534 - width: 335 - height: 453 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 15} + y: 729 + width: 451 + height: 618 + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 15} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -784,43 +764,43 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1231 - y: 607 - width: 333 - height: 432 + x: 1573 + y: 802 + width: 449 + height: 597 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_SearchFilter: m_NameFilter: m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] m_ReferencingInstanceIDs: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Resources m_Globs: [] m_OriginalText: + m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets + - Assets/Resources m_LastFoldersGridSize: 16 m_LastProjectPath: E:\Projects\Aetheria-Economy m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: fc900000 - m_LastClickedID: 37116 - m_ExpandedIDs: 00000000fc900000029100000a9100000c9100000e91000010910000129100004e910000569100005a91000062910000c49f000064a10000aca4000040a50000f2a8000004aa0000c0aa00004cb10000fab2000000ca9a3b + scrollPos: {x: 0, y: 415} + m_SelectedIDs: b0910000 + m_LastClickedID: 37296 + m_ExpandedIDs: 00000000a6910000a8910000aa910000ac910000ae910000b0910000b2910000b4910000b6910000b8910000ba910000bc91000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -848,7 +828,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fc900000029100000a9100000c9100000e91000010910000129100004e910000569100005a91000062910000c49f000064a10000aca4000040a50000f2a8000004aa0000c0aa00004cb10000fab2000000ca9a3b + m_ExpandedIDs: 00000000a6910000a8910000aa910000ac910000ae910000b0910000b2910000b4910000b6910000b8910000ba910000bc91000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -873,10 +853,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000 + m_SelectedInstanceIDs: e4760000 + m_LastClickedInstanceID: 30436 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000b2db0000fefa00000cfb00003a920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -892,7 +872,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 13} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -903,8 +883,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &16 + m_DirectoriesAreaWidth: 145 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -914,23 +894,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1495 + x: 1953 y: 0 - width: 354 - height: 987 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + width: 536 + height: 1347 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 16} m_Panes: + - {fileID: 16} - {fileID: 17} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &17 + m_LastSelected: 1 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -951,24 +932,55 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1566 + x: 2024 y: 73 - width: 353 - height: 966 + width: 535 + height: 1326 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_OverlaysVisible: 1 m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 160 + m_CachedPref: -330 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 30436 + m_LastVerticalScrollValue: 530 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12079, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 390, y: 390} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Lighting + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1522 + y: 73 + width: 397 + height: 966 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index c57e49756..6752f463e 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1849 height: 1037 m_ShowMode: 4 - m_Title: Scene + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 6613 + controlID: 3197 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1214 + width: 1116 height: 987 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 6614 + controlID: 3198 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1214 - height: 504 + width: 1116 + height: 523 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 6615 + controlID: 3199 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,13 +188,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 753 - height: 504 + width: 652 + height: 523 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -212,15 +212,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 753 + x: 652 y: 0 - width: 461 - height: 504 + width: 464 + height: 523 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &10 @@ -239,14 +239,14 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 504 - width: 1214 - height: 483 + y: 523 + width: 1116 + height: 464 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 17} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 --- !u!114 &11 @@ -266,14 +266,14 @@ MonoBehaviour: - {fileID: 13} m_Position: serializedVersion: 2 - x: 1214 + x: 1116 y: 0 - width: 266 + width: 335 height: 987 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 6489 + controlID: 3241 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -291,7 +291,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 266 + width: 335 height: 534 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -317,7 +317,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 534 - width: 266 + width: 335 height: 453 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -341,9 +341,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1480 + x: 1451 y: 0 - width: 369 + width: 398 height: 987 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -354,6 +354,99 @@ MonoBehaviour: m_Selected: 0 m_LastSelected: 1 --- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 71 + y: 596 + width: 1115 + height: 443 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 1 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1115 + height: 422 + m_Scale: {x: 0.39074075, y: 0.39074075} + m_Translation: {x: 557.5, y: 211} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1426.7772 + y: -540 + width: 2853.5544 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.39074075 + m_LastWindowPixelSize: {x: 1115, y: 443} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -376,8 +469,8 @@ MonoBehaviour: serializedVersion: 2 x: 71 y: 73 - width: 752 - height: 483 + width: 651 + height: 502 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -464,9 +557,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: -151} + snapOffset: {x: 67.5, y: 21} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 + snapCorner: 0 id: Orientation index: 0 layout: 4 @@ -601,9 +694,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -3.6876678, y: -144.84021, z: -499.2345} + m_Target: {x: -3602.9448, y: -27.335466, z: -1881.4333} speed: 2 - m_Value: {x: -3.6876678, y: -144.84021, z: -499.2345} + m_Value: {x: -3602.9448, y: -27.335466, z: -1881.4333} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -613,14 +706,14 @@ MonoBehaviour: m_DoValidateTrueMetals: 0 m_ExposureSliderValue: 0 m_SceneViewState: - m_AlwaysRefresh: 1 + m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 - m_FxEnabled: 1 + m_FxEnabled: 0 m_Grid: xGrid: m_Fade: @@ -642,7 +735,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -650,13 +743,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08627722, y: 0.54903007, z: -0.056360822, w: -0.8296622} + m_Target: {x: -0.21990862, y: -0.6955907, z: 0.24191523, w: -0.6412767} speed: 2 - m_Value: {x: -0.08750409, y: 0.5488369, z: -0.0571735, w: -0.82936865} + m_Value: {x: 0.21990864, y: 0.69559073, z: -0.24191523, w: 0.6412767} m_Size: - m_Target: 9.692771 + m_Target: 2.6543572 speed: 2 - m_Value: 9.68545 + m_Value: 2.6543572 m_Ortho: m_Target: 0 speed: 2 @@ -681,7 +774,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -702,107 +795,14 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 824 + x: 723 y: 73 - width: 459 - height: 483 + width: 462 + height: 502 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 71 - y: 577 - width: 1213 - height: 462 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 1 - m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 1 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1213 - height: 441 - m_Scale: {x: 0.42777777, y: 0.4277778} - m_Translation: {x: 606.5, y: 220.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1417.7922 - y: -515.4545 - width: 2835.5845 - height: 1030.909 - m_MinimalGUI: 1 - m_defaultScale: 0.42777777 - m_LastWindowPixelSize: {x: 1213, y: 462} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -824,9 +824,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1285 + x: 1187 y: 73 - width: 264 + width: 333 height: 513 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -835,9 +835,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e892fcff - m_LastClickedID: -224536 - m_ExpandedIDs: aa82faffea92fcff3895fcffd4faffff4e720000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 0ec8fbff12c8fbff20c8fbff24c8fbff28c8fbff46c8fbffca43fcffba04fdffcc59fdff08dafdff5860feffdcfafffffaf300000c360100ec840100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -882,9 +882,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1285 + x: 1187 y: 607 - width: 264 + width: 333 height: 432 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -903,22 +903,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Shaders + - Assets/Scripts/Gameplay m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Shaders + - Assets/Scripts/Gameplay m_LastFoldersGridSize: 16 m_LastProjectPath: E:\Projects\Aetheria-Economy m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 324} - m_SelectedIDs: 3a910000 - m_LastClickedID: 37178 - m_ExpandedIDs: 000000002c9100002e91000030910000329100003491000036910000389100003a9100003c9100003e910000409100004291000000ca9a3b + scrollPos: {x: 0, y: 308} + m_SelectedIDs: 70910000 + m_LastClickedID: 37232 + m_ExpandedIDs: 0000000000910000029100000491000006910000089100000a9100000c9100000e9100001091000012910000149100001691000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -946,7 +946,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002c9100002e91000030910000329100003491000036910000389100003a9100003c9100003e910000409100004291000000ca9a3b + m_ExpandedIDs: 0000000000910000029100000491000006910000089100000a9100000c9100000e9100001091000012910000149100001691000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -998,10 +998,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 159} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 111 + m_DirectoriesAreaWidth: 145 --- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1023,9 +1023,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1551 + x: 1522 y: 73 - width: 368 + width: 397 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1034,7 +1034,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 330 + m_CachedPref: -330 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 @@ -1065,9 +1065,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1551 + x: 1522 y: 73 - width: 368 + width: 397 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: