diff --git a/Assets/Data/Adena.asset b/Assets/Data/Adena.asset index fafbfc5..e1944e9 100644 --- a/Assets/Data/Adena.asset +++ b/Assets/Data/Adena.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: Adena m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: d39b423a0c8065a42840ec70a3dbe874, type: 3} m_name: Adena m_charisma: 3 m_strength: 10 m_dexterity: 10 m_intelligence: 10 - m_spawnQuestId: 1 m_dialogueOptions: - text: "G\u2019day Sir, I am the fair Adena, princess of the faraway planet of Velarius." @@ -36,3 +36,4 @@ MonoBehaviour: - text: Away from this place and being worshipped as the goddess that I am, of course. bulletizedText: Being worshipped as a "goddess"... + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Adventure Cat.asset b/Assets/Data/Adventure Cat.asset index a3ffb15..55a666d 100644 --- a/Assets/Data/Adventure Cat.asset +++ b/Assets/Data/Adventure Cat.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: Adventure Cat m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: eff079f969ba97a41b289a5d5fd416f0, type: 3} m_name: Adventure Cat m_charisma: 5 m_strength: 10 m_dexterity: 5 m_intelligence: 5 - m_spawnQuestId: 2 m_dialogueOptions: - text: "\u2026 (the cat looks at you, on her name collar you read: Adventure Cat)" @@ -32,3 +32,4 @@ MonoBehaviour: - text: "\u2026 (Although cats are far from stupid, you don\u2019t think that an adventure cat would necessarily think about this)" bulletizedText: N/A + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Amadeus.asset b/Assets/Data/Amadeus.asset index d95c48c..b35ca13 100644 --- a/Assets/Data/Amadeus.asset +++ b/Assets/Data/Amadeus.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: Amadeus m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: 364be8af730401347bd42dd24246ea32, type: 3} m_name: Amadeus m_charisma: 2 m_strength: 7 m_dexterity: 7 m_intelligence: 7 - m_spawnQuestId: 1 m_dialogueOptions: - text: "Amadeus the robot, that\u2019s my name. How can I be of service? " bulletizedText: Amadeus. @@ -32,3 +32,4 @@ MonoBehaviour: bulletizedText: Playing instruments... Really badly... - text: "As a free robot on an exciting adventure. No people tho, I hate people\u2026" bulletizedText: As a free robot with no people... + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Derk.asset b/Assets/Data/Derk.asset index 5e59821..a815ea8 100644 --- a/Assets/Data/Derk.asset +++ b/Assets/Data/Derk.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Derk m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: 8fef586f3af1449418c717b43ef4e25e, type: 3} m_name: Derk m_charisma: 5 m_strength: 5 diff --git a/Assets/Data/Rufus.asset b/Assets/Data/Rufus.asset index 57f3f1e..8be33de 100644 --- a/Assets/Data/Rufus.asset +++ b/Assets/Data/Rufus.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Rufus m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: 622ebc6effcb8c0458b8bf110ada911a, type: 3} m_name: Rufus m_charisma: 8 m_strength: 4 diff --git a/Assets/Images/Adventurers/Portraits.meta b/Assets/Images/Adventurers/Portraits.meta new file mode 100644 index 0000000..da1e4a7 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3e91a2f491690c48b77682f69ba591d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Portraits/Adena Portrait.png b/Assets/Images/Adventurers/Portraits/Adena Portrait.png new file mode 100644 index 0000000..198ca59 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adena Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72b0c066c61ea71da84b15ff5e0bf95a739c81be75103e88dd1843255b6c25d6 +size 98496 diff --git a/Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta new file mode 100644 index 0000000..683dfca --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d39b423a0c8065a42840ec70a3dbe874 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png new file mode 100644 index 0000000..d1c4e58 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44752b1ba3739d6e9fcb650ff9597e824ae37512883bbf44204ded3b0c89176e +size 118901 diff --git a/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta new file mode 100644 index 0000000..f8978c3 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: eff079f969ba97a41b289a5d5fd416f0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png new file mode 100644 index 0000000..fbde0df --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa6c2d1b56e49c47e3192d93cf837046777d01573ab9e7f25faccf12b882cec7 +size 107033 diff --git a/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta new file mode 100644 index 0000000..832c471 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 364be8af730401347bd42dd24246ea32 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Portraits/Derk Portrait.png b/Assets/Images/Adventurers/Portraits/Derk Portrait.png new file mode 100644 index 0000000..c483c08 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Derk Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a17173100725110ba7237829f7ebc53a7a066e953397d4d1ab238e85d0a03d6 +size 101593 diff --git a/Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta new file mode 100644 index 0000000..10815a6 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 8fef586f3af1449418c717b43ef4e25e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Portraits/Rufus Portrait.png b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png new file mode 100644 index 0000000..fbb85f4 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ade0f02a0481d87a837de83a9630c0613cd83493dec8c454722baafde62d3580 +size 85909 diff --git a/Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta new file mode 100644 index 0000000..552181b --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 622ebc6effcb8c0458b8bf110ada911a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index cb351c3..78afd6e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1715,10 +1715,10 @@ RectTransform: m_Father: {fileID: 1555822333} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.10700001} - m_AnchorMax: {x: 1, y: 0.2756175} - m_AnchoredPosition: {x: 0, y: -274} - m_SizeDelta: {x: -46, y: 535.7133} + m_AnchorMin: {x: 0, y: 0.13656823} + m_AnchorMax: {x: 1, y: 0.31286353} + m_AnchoredPosition: {x: 0, y: -256} + m_SizeDelta: {x: -46, y: 529.7133} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &340478448 MonoBehaviour: @@ -1740,7 +1740,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: UUoough result much + m_text: Disaster struck, town and tavern are in ruins.
The C Y B E R P R I + E S T S are victorious once more. Haha. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1767,8 +1768,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3370,7 +3371,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000037193, y: 0.0000069141} + m_AnchoredPosition: {x: 0, y: 0.0000076293945} m_SizeDelta: {x: 83.0101, y: 0.000015259} m_Pivot: {x: 1, y: 0.5} --- !u!114 &653815783 @@ -4728,7 +4729,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: ASS + m_text: Assign m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5477,10 +5478,10 @@ RectTransform: m_Father: {fileID: 137465973} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.2756175} - m_AnchorMax: {x: 1, y: 0.74100006} - m_AnchoredPosition: {x: 0, y: -123.3999} - m_SizeDelta: {x: -46, y: 257.71332} + m_AnchorMin: {x: 0, y: 0.43056828} + m_AnchorMax: {x: 1, y: 0.9014318} + m_AnchoredPosition: {x: 0, y: -133} + m_SizeDelta: {x: -46, y: 253.71332} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1493783872 MonoBehaviour: @@ -5502,9 +5503,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "DEFAULT Find someone to hand out flyers to advertise our tavern to adventurers. - Strength, dexterity, intelligence: doesn\u2019t matter, find someone who would - do this for as little money as possible.\r\n" + m_text: 'Okay, now it''s getting serious.
Turns out the viscous
C Y B E + R P R I E S T S were behind the attack on Trudy.
Seems like they stole an + object that she kept in her wardrobe, not knowing that it was the last piece + required to summon the
C Y B E R D R A G O N to destroy this inn. We need + someone that can stop them! ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5531,8 +5534,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6649,7 +6652,7 @@ GameObject: - component: {fileID: 1806738462} - component: {fileID: 1806738461} m_Layer: 5 - m_Name: Avatar + m_Name: AdventurerAvatar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/DialogueSystem/CharacterData.cs b/Assets/Scripts/DialogueSystem/CharacterData.cs index 8f38219..5e7ed62 100644 --- a/Assets/Scripts/DialogueSystem/CharacterData.cs +++ b/Assets/Scripts/DialogueSystem/CharacterData.cs @@ -5,6 +5,7 @@ using UnityEngine; public class CharacterData : ScriptableObject { public Sprite m_image; + public Sprite m_avatar; public string m_name; public int m_charisma; diff --git a/Assets/Scripts/Journal.cs b/Assets/Scripts/Journal.cs index 9126f03..d435358 100644 --- a/Assets/Scripts/Journal.cs +++ b/Assets/Scripts/Journal.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using TMPro; using UnityEngine; +using UnityEngine.UI; public class Journal : MonoBehaviour { @@ -67,6 +68,7 @@ public class Journal : MonoBehaviour { CharacterData chara = m_availableAdventurers[id]; adventurerPage.Find("AdventurerName").gameObject.GetComponent().text = chara.name; + adventurerPage.Find("AdventurerAvatar").gameObject.GetComponent().sprite = chara.m_avatar; string cv = ""; foreach (var line in chara.m_dialogueOptions) {