Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions 320UnityProject/Assets/MultiBlockPuzzleManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ public class MultiBlockPuzzleManager : MonoBehaviour
// Start is called before the first frame update
void Start()
{

}

// Update is called once per frame
void Update()
{

}
public void updatePuzzle(int x)
{
orderSelect[numberInteracted] = x;
numberInteracted++;
if(numberInteracted == 3)
if (numberInteracted == 3)
{
if (correctNumbers[0] == orderSelect[0] && correctNumbers[1] == orderSelect[1] && correctNumbers[2] == orderSelect[2])
{
Debug.Log("yay");
if(item)
if (item)
{
Player player = GameObject.FindGameObjectWithTag("Player").GetComponent<Player>();
if (player != null)
{
player.AddToInventory(objectGiven);
}
}
if(destroy)
if (destroy)
{
Destroy(objectDestroy);
}

}
else
{
Expand All @@ -56,10 +56,14 @@ public void updatePuzzle(int x)


}




}

}
public void Interacted()
{
Debug.Log(dialogueString);
numberInteracted = 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2920,6 +2920,79 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1093945832911871129, guid: cc1284695a3119943b6a43fbd9b3b3bf, type: 3}
m_PrefabInstance: {fileID: 1949596302}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &146242642
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalPosition.x
value: -27.89
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalPosition.y
value: 13.06
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalPosition.z
value: 24.68
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2164431342311767458, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: sprite
value:
objectReference: {fileID: 21300000, guid: aa631a896644aca48a2cb744e2725f16, type: 3}
- target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: dialogue
value: its an empty bottle of poison
objectReference: {fileID: 0}
- target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: canPickup
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6292790909786744360, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: destroyOnPickup
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7356486725916629054, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
propertyPath: m_Name
value: pickupObject (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1ceb29632ee7ff94c830286566827d1c, type: 3}
--- !u!4 &147359929 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6255888950009317798, guid: 1bc6c7a70a0ea6d419dd57e4d0aa5e63, type: 3}
Expand Down Expand Up @@ -40268,3 +40341,4 @@ SceneRoots:
- {fileID: 1027474420}
- {fileID: 1850895196}
- {fileID: 1650301967}
- {fileID: 146242642}
141 changes: 137 additions & 4 deletions 320UnityProject/Assets/Scenes/Prototype scenes/VillageHouse1.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1015,8 +1015,37 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 74d3d5a0bdad3dc4b9e2806ed95563dc, type: 3}
insertIndex: -1
addedObject: {fileID: 519346085}
m_SourcePrefab: {fileID: 100100000, guid: 74d3d5a0bdad3dc4b9e2806ed95563dc, type: 3}
--- !u!1 &519346084 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 74d3d5a0bdad3dc4b9e2806ed95563dc, type: 3}
m_PrefabInstance: {fileID: 519346083}
m_PrefabAsset: {fileID: 0}
--- !u!65 &519346085
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519346084}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 3.0995455, y: 26.73653, z: 2.0196238}
m_Center: {x: 0, y: -10.951048, z: -0.0000017881393}
--- !u!1001 &631362445
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1686,6 +1715,19 @@ PrefabInstance:
propertyPath: m_Name
value: chestObject
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: isEvent
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: dialogue
value: There a shopping list from amazoon, it includes things like a ski mask
and a swiss army knife
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: isDialogue
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3128096821334287213, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: isEndpoint
value: 0
Expand All @@ -1698,6 +1740,10 @@ PrefabInstance:
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 2b3319231388e324c80f61fd9d68a540, type: 2}
- target: {fileID: 7395938312844855585, guid: 31d4563691855eb4b87918050a68da59, type: 3}
propertyPath: m_Constraints
value: 126
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -2676,8 +2722,37 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 56a5a802d92d11f419f9e41a69bac6cc, type: 3}
insertIndex: -1
addedObject: {fileID: 1737211647}
m_SourcePrefab: {fileID: 100100000, guid: 56a5a802d92d11f419f9e41a69bac6cc, type: 3}
--- !u!1 &1737211646 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 56a5a802d92d11f419f9e41a69bac6cc, type: 3}
m_PrefabInstance: {fileID: 1737211645}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1737211647
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1737211646}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 2.0195115, y: 26.736528, z: 2.0196238}
m_Center: {x: 0, y: -10.951047, z: -0.0000017881393}
--- !u!1 &1785069618
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3533,8 +3608,37 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 74d3d5a0bdad3dc4b9e2806ed95563dc, type: 3}
insertIndex: -1
addedObject: {fileID: 2009859133}
m_SourcePrefab: {fileID: 100100000, guid: 74d3d5a0bdad3dc4b9e2806ed95563dc, type: 3}
--- !u!1 &2009859132 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 74d3d5a0bdad3dc4b9e2806ed95563dc, type: 3}
m_PrefabInstance: {fileID: 2009859131}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2009859133
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2009859132}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 3.0995455, y: 26.736528, z: 2.0196238}
m_Center: {x: 0, y: -10.951047, z: -0.0000017881393}
--- !u!1001 &2053482196
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3688,8 +3792,37 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9c8538d2951123447be6d4abb9c8a8dd, type: 3}
insertIndex: -1
addedObject: {fileID: 2090007509}
m_SourcePrefab: {fileID: 100100000, guid: 9c8538d2951123447be6d4abb9c8a8dd, type: 3}
--- !u!1 &2090007508 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9c8538d2951123447be6d4abb9c8a8dd, type: 3}
m_PrefabInstance: {fileID: 2090007507}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2090007509
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2090007508}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 3.3003075, y: 7.2627993, z: 1.7926941}
m_Center: {x: 0, y: 2.0087428, z: -0.103653364}
--- !u!1 &2146469891
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1211,8 +1211,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3734104532394616777, guid: ba4270657503ae04d9dc6ac23effd479, type: 3}
propertyPath: dialogue
value: 'You find a time sheet of people leaving and entering the house. Time
left: 8:45, Time returned 9:15.'
value: You find a note that says top of the rock south west of the bridge
objectReference: {fileID: 0}
- target: {fileID: 5501809385040362943, guid: ba4270657503ae04d9dc6ac23effd479, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
Expand Down
6 changes: 5 additions & 1 deletion 320UnityProject/Assets/Scripts/Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ public void OnMove(InputAction.CallbackContext context)
if (!canMove)
{
moveInput = Vector3.zero;
audioSource.Stop();
return;
}

Expand All @@ -234,8 +235,11 @@ public void OnMove(InputAction.CallbackContext context)
moveInput = offsetRot * localInput;
if(moveInput != Vector3.zero)
{

if(isGrounded)
{
audioSource.Play();
}


moveInput.Normalize();
direction = moveInput;
Expand Down
5 changes: 5 additions & 0 deletions 320UnityProject/Assets/Scripts/interactArea.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ private void OnTriggerEnter(Collider other)

other.gameObject.GetComponent<DoorUnlock>().Interact();
}
if (other.gameObject.GetComponent<MultiBlockPuzzleManager>() != null)
{

other.gameObject.GetComponent<MultiBlockPuzzleManager>().Interacted();
}

}

Expand Down
Loading