Commit 3b049356 authored by Mikko Lainio's avatar Mikko Lainio 🇺🇦
Browse files

Merge branch 'house' of git.bitbybyte.fi:game-jam/fgj-19

# Conflicts:
#	GetOffMyLawn/Assets/Data/AgentData/Agent_Priest.asset
#	GetOffMyLawn/Assets/Data/AgentData/Goth_Girl.asset
#	GetOffMyLawn/Assets/Data/AgentData/Goth_Man.asset
#	GetOffMyLawn/Assets/Data/AgentData/Mr_Boring.asset
#	GetOffMyLawn/Assets/Data/AgentData/Old_Lady.asset
parents 0aff65b4 acc96d7b
......@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
name_: Priest
startDestination_: 200
roomOrder_: e9030000ea030000eb030000d1070000e9030000
roomOrder_: e9030000ea030000eb030000d1070000e9030000a00f0000a10f0000a20f000088130000e9030000
finalDestination_: 300
minMaxWaitTimes_: {x: 1, y: 5}
narrativeData_: {fileID: 11400000, guid: 388f9655a6d46fd49a9da2b1ec00bfb0, type: 2}
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 11500000, guid: 54d551ea7dcffa84f8c9346ef4d12461, type: 3}
m_Name: Douchebag
m_EditorClassIdentifier:
name_: Douchebag
startDestination_: 200
roomOrder_: e9030000a00f000088130000b80b0000a10f0000ea030000b90b0000eb03000029230000ba0b0000d1070000a20f0000d0070000
finalDestination_: 0
minMaxWaitTimes_: {x: 1, y: 5}
narrativeData_: {fileID: 0}
startingSatisfaction_: 100
startingHorror_: 0
horrorThreshold_: 5000
satisfactionThreshold_: 100
likes_: 88130000
dislikes_: 70170000
fears_: 10270000
fileFormatVersion: 2
guid: 7408cfa43c1a4a048b86299790cad1fb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
name_: Goth Girl
startDestination_: 200
roomOrder_: ea030000b80b0000b90b000029230000eb030000
roomOrder_: ea030000b80b0000b90b000029230000eb030000a10f0000d0070000e9030000
finalDestination_: 300
minMaxWaitTimes_: {x: 1, y: 5}
narrativeData_: {fileID: 11400000, guid: 0ae3f8b9803c8444fb339262fe4364f1, type: 2}
......
......@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
name_: Goth
startDestination_: 200
roomOrder_: d1070000b90b0000ba0b0000a00f0000e9030000
roomOrder_: d1070000b90b0000ba0b0000a00f0000a20f0000ea03000088130000e9030000
finalDestination_: 300
minMaxWaitTimes_: {x: 1, y: 5}
narrativeData_: {fileID: 11400000, guid: 302d592ab3165a645a9fb98320c6c6f1, type: 2}
......
......@@ -16,7 +16,7 @@ MonoBehaviour:
startDestination_: 200
roomOrder_: e9030000d0070000a00f000088130000b80b0000ea030000a10f0000ba0b0000d1070000e8030000
finalDestination_: 300
minMaxWaitTimes_: {x: 1, y: 5}
minMaxWaitTimes_: {x: 4, y: 7}
narrativeData_: {fileID: 11400000, guid: ad1eef3a922ee9e488b71c28ac627dd1, type: 2}
startingSatisfaction_: 10
startingHorror_: 0
......
......@@ -14,9 +14,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
name_: Old Lady
startDestination_: 200
roomOrder_: e9030000b80b0000e9030000ba0b0000e9030000d0070000a00f0000
roomOrder_: e9030000b80b0000ea030000eb030000d1070000d0070000e9030000
finalDestination_: 300
minMaxWaitTimes_: {x: 1, y: 5}
minMaxWaitTimes_: {x: 5, y: 10}
narrativeData_: {fileID: 11400000, guid: a98719be54ee7a44ca4dcb08a0e655c5, type: 2}
startingSatisfaction_: 10
startingHorror_: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 11500000, guid: 041eab080a9e2184c9dc9625061262cf, type: 3}
m_Name: Douchebag
m_EditorClassIdentifier:
name_: Douchebag
randomRoomEnterComments_:
- targetRoom_: 9002
comments_:
- Have you seen this lovely paneling?
- We have NO neighbours!
- Never mind the sound of ghostly dogs barking!
- This house is a steal!
- The house has only had one owner!
- My grandfather was an avid hunter.
- You can have the furniture. It's haunt--err.
- '*whistles*'
- Hello there!
- Look around!
- Take your time!
- Upstairs is, er, under construction!
- Bedroom? Oh...er. Upstairs.
- Welcome!
- Enjoy!
randomRoomExitComments_: []
randomTriggerComments_:
- trigger_: 1000
comments_:
- Oh, haha. The wind!
- Just a, um, Earthquake!
- Oops! How clumsy of me.
- trigger_: 2000
comments_:
- Ahum. Maybe a tree fell on the power line!
- Nothing to worry about!
- '...not again.'
- trigger_: 7000
comments_:
- Old houses creak!
- That was DEFINITELY not a ghost!
- Ignore that!
- trigger_: 10000
comments_:
- Ow!
- Stop it!
- Hey!
specificStartComments_:
- comments_: Time to sell grandpa's old house!
- comments_: Just hope the old geezer stays away.
- comments_: Wouldn't want him to scare off my buyers!
endSatisfactionFailComment_: Grrrr!
endSatisfactionSucceedComment_: This place will be sold in a jiffy!
endHorrorFailComment_: AAAAAHHH! NOOO!
fileFormatVersion: 2
guid: d68cf26b29972c0469b49314cb44a91e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 07c6d28240226f44e8721e7f01f55c42
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Douchebag
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 73ba94533c80f7347951273f06da7cba, type: 3}
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: 2800000, guid: ba551db92a9f9f6458ac44c8bf9bf3a9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: a73ba7008acbbf649a4009305270c0d3, type: 3}
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_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _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}
fileFormatVersion: 2
guid: 3d0a7d44223557145a4937565ddcb7be
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ba551db92a9f9f6458ac44c8bf9bf3a9
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 73ba94533c80f7347951273f06da7cba
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 1
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a73ba7008acbbf649a4009305270c0d3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2684460743707246826
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6123737349104666649}
- component: {fileID: 2465475195913278876}
- component: {fileID: 5555156520072467735}
m_Layer: 0
m_Name: Boring_Guy_Top
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6123737349104666649
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2684460743707246826}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.027502522, y: 1.4978924, z: -0.00007734448}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1715091936938245638}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2465475195913278876
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2684460743707246826}
m_Mesh: {fileID: 4300000, guid: 1e881d224a2dfb84f8d59b9107b7dd43, type: 3}
--- !u!23 &5555156520072467735
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2684460743707246826}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1