diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index f1824d4b..20d9ec54 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -1058,6 +1058,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} insertIndex: -1 addedObject: {fileID: 1961302932} + - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} + insertIndex: -1 + addedObject: {fileID: 1961302935} + - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} + insertIndex: -1 + addedObject: {fileID: 1961302934} m_SourcePrefab: {fileID: 100100000, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} --- !u!4 &30470408 stripped Transform: @@ -16446,6 +16452,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} insertIndex: -1 addedObject: {fileID: 1295157951} + - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295157954} + - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295157953} m_SourcePrefab: {fileID: 100100000, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} --- !u!4 &523081034 stripped Transform: @@ -33236,6 +33248,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8850766705489312849, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3} + propertyPath: UsesLeft + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8850766705489312849, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3} + propertyPath: _itemType + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -40488,6 +40508,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &1295157950 AudioSource: @@ -40602,8 +40623,47 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: +--- !u!114 &1295157953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295157946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c62dfbaefa34afca6b4a8378b9c9083, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1502578688} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _developer: {fileID: 1295157948} +--- !u!136 &1295157954 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295157946} + 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: 2 + m_Radius: 0.3 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.82, z: 0} --- !u!4 &1298233948 stripped Transform: m_CorrespondingSourceObject: {fileID: 5737504958030667471, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} @@ -46373,6 +46433,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!114 &1502578688 MonoBehaviour: @@ -46539,11 +46600,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7e417f330c4dd845a8f3dc744dff25a, type: 3} m_Name: m_EditorClassIdentifier: - Needs: - - {fileID: 2907046783514947559, guid: 92b71cfc6a2687d44b165ead746233f0, type: 3} - - {fileID: 3355435593704932208, guid: b31fb59d198e53b459943bf898293618, type: 3} - - {fileID: 7697340910557049827, guid: 5d809e3a343d45f4185615db92384dc7, type: 3} - - {fileID: 2405502523364773131, guid: b396df2098c22e1488c2c2769c6ddcd6, type: 3} --- !u!114 &1502578696 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46561,7 +46617,7 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: --- !u!1001 &1502597417 PrefabInstance: @@ -60109,7 +60165,7 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: --- !u!82 &1891423493 AudioSource: @@ -62316,6 +62372,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &1961302931 AudioSource: @@ -62430,8 +62487,47 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: +--- !u!136 &1961302934 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961302927} + 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: 2 + m_Radius: 0.3 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.82, z: 0} +--- !u!114 &1961302935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961302927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c62dfbaefa34afca6b4a8378b9c9083, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1502578688} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _developer: {fileID: 1961302929} --- !u!1 &1961564159 GameObject: m_ObjectHideFlags: 0 @@ -66285,6 +66381,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} insertIndex: -1 addedObject: {fileID: 2100999003} + - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} + insertIndex: -1 + addedObject: {fileID: 2100999006} + - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} + insertIndex: -1 + addedObject: {fileID: 2100999005} m_SourcePrefab: {fileID: 100100000, guid: c161c997c07308740af96a685231f764, type: 3} --- !u!4 &2100998998 stripped Transform: @@ -66329,6 +66431,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &2100999002 AudioSource: @@ -66443,8 +66546,47 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: +--- !u!114 &2100999005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640532114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c62dfbaefa34afca6b4a8378b9c9083, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1502578688} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _developer: {fileID: 2100999000} +--- !u!136 &2100999006 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640532114} + 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: 2 + m_Radius: 0.3 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.82, z: 0} --- !u!1 &2101876026 GameObject: m_ObjectHideFlags: 0 @@ -85171,6 +85313,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8850766705489312849, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3} + propertyPath: UsesLeft + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8850766705489312849, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3} + propertyPath: _itemType + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/3d Prototyp/Assets/Scripts/Character.cs b/3d Prototyp/Assets/Scripts/Character.cs index 4c131540..3eecce6b 100644 --- a/3d Prototyp/Assets/Scripts/Character.cs +++ b/3d Prototyp/Assets/Scripts/Character.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using Data; using Interaction; +using TMPro.Examples; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; @@ -182,11 +183,32 @@ public class Character : MonoBehaviour { Debug.Log($"Gebe {_carriedInteractible.Name} an {developer.Name}"); - Interactible item = _carriedInteractible; + PickupInteractible item = _carriedInteractible; + + if (item == null) + return; - PickupItem(null); + switch (item.ItemType) + { + case ItemType.Coffee: + developer.GiveDrink(0.4, WantedConsumable.Drink); + break; + case ItemType.Mate: + developer.GiveDrink(0.4, WantedConsumable.Mate); + break; + case ItemType.Pizza: + developer.GiveFood(0.25, WantedConsumable.Pizza); + break; + } + + item.UsesLeft--; + + if (item.UsesLeft <= 0) + { + PickupItem(null); - Destroy(item.gameObject); + Destroy(item.gameObject); + } } public void SayItsImpossible() diff --git a/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs b/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs index c8237f7c..e9b3e5f3 100644 --- a/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs +++ b/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs @@ -2,6 +2,13 @@ namespace Interaction { + public enum ItemType + { + Mate, + Coffee, + Pizza + } + public class PickupInteractible : Interactible { [SerializeField] @@ -9,10 +16,17 @@ namespace Interaction [SerializeField] private string _name; + + [SerializeField] + private ItemType _itemType; + + public int UsesLeft = 1; public GameObject Model => _model; public string Name => _name; + public ItemType ItemType => _itemType; + } } \ No newline at end of file