diff --git a/Assets/InventoryMaster/Resources/ItemDatabase.asset b/Assets/InventoryMaster/Resources/ItemDatabase.asset index 0f2760d1..72877457 100644 --- a/Assets/InventoryMaster/Resources/ItemDatabase.asset +++ b/Assets/InventoryMaster/Resources/ItemDatabase.asset @@ -24,20 +24,8 @@ MonoBehaviour: indexItemInList: 999 rarity: 0 itemAttributes: [] - - itemName: Red alien fruit - itemID: 1 - itemDesc: This is a red alien fruit. Please eat it. - itemIcon: {fileID: 21300000, guid: a7f5d7a5c6765cd459a05338b0177198, type: 3} - itemModel: {fileID: 178698, guid: 3a62955c311d44c4088bf395d228fde4, type: 2} - itemValue: 1 - itemType: 3 - itemWeight: 0 - maxStack: 10 - indexItemInList: 999 - rarity: 0 - itemAttributes: [] - itemName: Iron ore - itemID: 2 + itemID: 1 itemDesc: An Iron ore. CAn be used in forging steel. itemIcon: {fileID: 21300000, guid: 5b6ddbee1b0824e4b9876c55b022e497, type: 3} itemModel: {fileID: 126564, guid: 4d2599b9cb6240d458c98c9d9f2c7dd1, type: 2} @@ -49,7 +37,7 @@ MonoBehaviour: rarity: 0 itemAttributes: [] - itemName: Blue gemstone - itemID: 3 + itemID: 2 itemDesc: A blue gemstone. Dimly glowing, might be radioactive. itemIcon: {fileID: 21300000, guid: 4e1fa431fcd2e4a4aa20ef1430ec6bbe, type: 3} itemModel: {fileID: 134438, guid: 19c08b81592dd044196cbbc25fc3e8e3, type: 2} @@ -61,7 +49,7 @@ MonoBehaviour: rarity: 0 itemAttributes: [] - itemName: Yellow Key - itemID: 4 + itemID: 3 itemDesc: An alien key with yellowish color. itemIcon: {fileID: 21300000, guid: 2f210ebcf80b0af41936cd0766815da9, type: 3} itemModel: {fileID: 196244, guid: b2ace4ccfd8ecc542a0ce51c2d92d370, type: 2} @@ -72,3 +60,28 @@ MonoBehaviour: indexItemInList: 999 rarity: 0 itemAttributes: [] + - itemName: Factory Map + itemID: 4 + itemDesc: A map to the factory that leads to the fuel + itemIcon: {fileID: 21300000, guid: 5efdab5a025483c4a994e1e54b74b326, type: 3} + itemModel: {fileID: 177030, guid: e67f3f12592081a44888f34838b6d477, type: 2} + itemValue: 1 + itemType: 3 + itemWeight: 0 + maxStack: 1 + indexItemInList: 999 + rarity: 0 + itemAttributes: [] + - itemName: Letter + itemID: 5 + itemDesc: A letter addressed to the coordinator of this area, named Cahn Tofu. + the content is barely readable + itemIcon: {fileID: 21300000, guid: 29126e72572db454b9d34c70ed21671b, type: 3} + itemModel: {fileID: 137124, guid: db9c2599b6137664fbae0eb98d3aab5f, type: 2} + itemValue: 1 + itemType: 3 + itemWeight: 0 + maxStack: 1 + indexItemInList: 999 + rarity: 0 + itemAttributes: [] diff --git a/Assets/Prefabs/I_Map.prefab b/Assets/Prefabs/I_Map.prefab new file mode 100644 index 00000000..73842410 --- /dev/null +++ b/Assets/Prefabs/I_Map.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &177030 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 451838} + - 212: {fileID: 21253972} + - 136: {fileID: 13656706} + m_Layer: 0 + m_Name: I_Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &451838 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 177030} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.2531214, y: -7.0003686, z: 0} + m_LocalScale: {x: 4, y: 4, z: 4} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!136 &13656706 +CapsuleCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 177030} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.17 + m_Height: 0.34 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!212 &21253972 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 177030} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_ReflectionProbeUsage: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 5efdab5a025483c4a994e1e54b74b326, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 177030} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/I_Map.prefab.meta b/Assets/Prefabs/I_Map.prefab.meta new file mode 100644 index 00000000..7029f9a0 --- /dev/null +++ b/Assets/Prefabs/I_Map.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e67f3f12592081a44888f34838b6d477 +timeCreated: 1507535441 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/scroll.prefab b/Assets/Prefabs/scroll.prefab new file mode 100644 index 00000000..7d1fcb04 --- /dev/null +++ b/Assets/Prefabs/scroll.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &137124 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 494974} + - 212: {fileID: 21251524} + - 136: {fileID: 13600090} + m_Layer: 0 + m_Name: scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &494974 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 137124} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -16.18, y: -3.8689706, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!136 &13600090 +CapsuleCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 137124} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 1.28 + m_Height: 2.56 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!212 &21251524 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 137124} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_ReflectionProbeUsage: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 29126e72572db454b9d34c70ed21671b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 137124} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/scroll.prefab.meta b/Assets/Prefabs/scroll.prefab.meta new file mode 100644 index 00000000..aad8762b --- /dev/null +++ b/Assets/Prefabs/scroll.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db9c2599b6137664fbae0eb98d3aab5f +timeCreated: 1507535197 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/level1room1.unity b/Assets/Scenes/level1room1.unity index 1c021339..315278d2 100644 --- a/Assets/Scenes/level1room1.unity +++ b/Assets/Scenes/level1room1.unity @@ -1335,19 +1335,7 @@ MonoBehaviour: SlotGridLayout: {fileID: 1201963467} SlotGridRectTransform: {fileID: 1201963466} mainInventory: 1 - ItemsInInventory: - - itemName: Red alien fruit - itemID: 1 - itemDesc: This is a red alien fruit. Please eat it. - itemIcon: {fileID: 21300000, guid: a7f5d7a5c6765cd459a05338b0177198, type: 3} - itemModel: {fileID: 178698, guid: 3a62955c311d44c4088bf395d228fde4, type: 2} - itemValue: 1 - itemType: 3 - itemWeight: 0 - maxStack: 10 - indexItemInList: 999 - rarity: 0 - itemAttributes: [] + ItemsInInventory: [] height: 4 width: 4 stackable: 1 @@ -5522,13 +5510,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: alien name + m_Text: Welco --- !u!222 &1154535624 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/level1room2.unity b/Assets/Scenes/level1room2.unity index 98780d52..63f90cd5 100644 --- a/Assets/Scenes/level1room2.unity +++ b/Assets/Scenes/level1room2.unity @@ -3095,6 +3095,18 @@ Prefab: propertyPath: m_SizeDelta.y value: 50 objectReference: {fileID: 0} + - target: {fileID: 11487702, guid: 8b32f0c7e022ffc44a2453ef2eeb7380, type: 2} + propertyPath: m_Text + value: Pocardo Banado + objectReference: {fileID: 0} + - target: {fileID: 11487702, guid: 8b32f0c7e022ffc44a2453ef2eeb7380, type: 2} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11499550, guid: 8b32f0c7e022ffc44a2453ef2eeb7380, type: 2} + propertyPath: m_Text + value: Pocardo Banado + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8b32f0c7e022ffc44a2453ef2eeb7380, type: 2} m_IsPrefabParent: 0 @@ -7584,7 +7596,6 @@ GameObject: - 212: {fileID: 1188425477} - 61: {fileID: 1188425479} - 50: {fileID: 1188425480} - - 114: {fileID: 1188425481} m_Layer: 12 m_Name: Plank (4) m_TagString: ground @@ -7668,20 +7679,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &1188425481 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1188425476} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04fafc220b833d241bc4fd8aaf383d5e, type: 3} - m_Name: - m_EditorClassIdentifier: - _spawns: - - {fileID: 910621581} - _itemRange: 010000000200000003000000 --- !u!1 &1233830119 GameObject: m_ObjectHideFlags: 0 @@ -8249,7 +8246,53 @@ Transform: m_Children: - {fileID: 1144757264} m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 39 +--- !u!1 &1366826561 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1366826563} + - 114: {fileID: 1366826562} + m_Layer: 0 + m_Name: ItemSpawnManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1366826562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1366826561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3933f564c5a027242a7f662b88364c3f, type: 3} + m_Name: + m_EditorClassIdentifier: + _spawns: + - {fileID: 1134005679} + - {fileID: 910621581} + - {fileID: 644164883} + _itemRange: 010000000400000005000000 + _spawnedItems: +--- !u!4 &1366826563 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1366826561} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.92716575, y: -0.7023472, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 52 --- !u!1 &1366955011 GameObject: m_ObjectHideFlags: 0 @@ -9894,7 +9937,6 @@ GameObject: m_Component: - 4: {fileID: 1788259483} - 61: {fileID: 1788259484} - - 114: {fileID: 1788259485} m_Layer: 12 m_Name: Ground m_TagString: Untagged @@ -9934,20 +9976,6 @@ BoxCollider2D: m_Offset: {x: -7.8192534, y: -1.4206862} serializedVersion: 2 m_Size: {x: 20.80358, y: 2.10499} ---- !u!114 &1788259485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1788259482} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04fafc220b833d241bc4fd8aaf383d5e, type: 3} - m_Name: - m_EditorClassIdentifier: - _spawns: - - {fileID: 644164883} - _itemRange: 010000000200000003000000 --- !u!1 &1833364449 GameObject: m_ObjectHideFlags: 0 @@ -10051,7 +10079,6 @@ GameObject: - 212: {fileID: 1833397393} - 61: {fileID: 1833397395} - 50: {fileID: 1833397396} - - 114: {fileID: 1833397397} m_Layer: 12 m_Name: Plank (8) m_TagString: ground @@ -10135,20 +10162,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &1833397397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1833397392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04fafc220b833d241bc4fd8aaf383d5e, type: 3} - m_Name: - m_EditorClassIdentifier: - _spawns: - - {fileID: 1134005679} - _itemRange: 010000000200000003000000 --- !u!1 &1840316392 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/level1room3.unity b/Assets/Scenes/level1room3.unity index b20c9647..fcb42aa1 100644 --- a/Assets/Scenes/level1room3.unity +++ b/Assets/Scenes/level1room3.unity @@ -1604,7 +1604,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Alien name + m_Text: Cahn Tofu --- !u!222 &168346746 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5418,7 +5418,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: alien name + m_Text: Cahn Tofu --- !u!222 &650453899 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5718,7 +5718,7 @@ MonoBehaviour: m_EditorClassIdentifier: textFile: {fileID: 0} textLines: - - Does [leader 2] really not know [coordinator]? + - Does Spork Stork really not know Cahn Tofu? lineToBreak: 0 autoDialog: 0 --- !u!114 &705960432 @@ -6200,7 +6200,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Alien name + m_Text: Spork Stork --- !u!222 &749673491 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6268,13 +6268,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Alien name + m_Text: Spork Stork --- !u!222 &751549010 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6873,7 +6873,7 @@ MonoBehaviour: m_EditorClassIdentifier: textFile: {fileID: 0} textLines: - - Do you know by any chance know the [coordinator]? + - Do you know by any chance know Cahn Tofu? lineToBreak: 0 autoDialog: 0 --- !u!114 &831655481 @@ -7503,7 +7503,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Alien name + m_Text: Spork Stork --- !u!222 &931990741 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14305,7 +14305,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Alien name + m_Text: Spork Stork --- !u!222 &1882343284 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ItemSpawnManager.cs b/Assets/Scripts/ItemSpawnManager.cs new file mode 100644 index 00000000..bc036733 --- /dev/null +++ b/Assets/Scripts/ItemSpawnManager.cs @@ -0,0 +1,48 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class ItemSpawnManager : MonoBehaviour { + + public Transform[] _spawns; + static ItemDataBaseList inventoryItemList; + public int[] _itemRange; + public List _spawnedItems; + + // Use this for initialization + void Start () { + _spawnedItems = new List(); + Spawn(); + +} + + // Update is called once per frame + void Spawn () { + + inventoryItemList = (ItemDataBaseList)Resources.Load("ItemDatabase"); + + for (int i = 0; i < _spawns.Length; i++) + { + int randomNumber = Random.Range(0, _itemRange.Length); + + while (_spawnedItems.Contains(randomNumber)) { + randomNumber = Random.Range(0, _itemRange.Length); + } + + _spawnedItems.Add(randomNumber); + + if (!(inventoryItemList.itemList[_itemRange[randomNumber]].itemModel == null)) + { + + Debug.Log("Item " + _itemRange[randomNumber] + " picked!"); + GameObject randomLootItem = (GameObject)Instantiate(inventoryItemList.itemList[_itemRange[randomNumber]].itemModel); + PickUpItem item = randomLootItem.AddComponent(); + item.item = inventoryItemList.itemList[_itemRange[randomNumber]]; + + randomLootItem.transform.localPosition = _spawns[i].position; + } + + } + + } +} diff --git a/Assets/Scripts/ItemSpawnManager.cs.meta b/Assets/Scripts/ItemSpawnManager.cs.meta new file mode 100644 index 00000000..98f704bf --- /dev/null +++ b/Assets/Scripts/ItemSpawnManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3933f564c5a027242a7f662b88364c3f +timeCreated: 1507535942 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Text/levelOneRoomOne/roomOneWelcome.txt b/Assets/Text/levelOneRoomOne/roomOneWelcome.txt index e80cb5cc..1b32dee2 100644 --- a/Assets/Text/levelOneRoomOne/roomOneWelcome.txt +++ b/Assets/Text/levelOneRoomOne/roomOneWelcome.txt @@ -1,4 +1,4 @@ -Welcome to [planet name]. +Welcome to Zorg-Zorg. This is a planet with truth and deceit. Be wary of what others tell you and make the correct decisions. To get you started, could you please get that item beside me? diff --git a/Assets/Text/levelOneRoomThree/roomThreeCoordinator.txt b/Assets/Text/levelOneRoomThree/roomThreeCoordinator.txt index 2209684e..ab8d5e03 100644 --- a/Assets/Text/levelOneRoomThree/roomThreeCoordinator.txt +++ b/Assets/Text/levelOneRoomThree/roomThreeCoordinator.txt @@ -1,3 +1,3 @@ -Hi I’m the coordinator for this area. +Hi I’m Cahn Tofu, the coordinator for this area. I was supposed to get a letter today but I didn’t seem to get anything... I wonder where it went... \ No newline at end of file diff --git a/Assets/Text/levelOneRoomThree/roomThreeCoordinatorTwo.txt b/Assets/Text/levelOneRoomThree/roomThreeCoordinatorTwo.txt index 246f7baf..9af92c5b 100644 --- a/Assets/Text/levelOneRoomThree/roomThreeCoordinatorTwo.txt +++ b/Assets/Text/levelOneRoomThree/roomThreeCoordinatorTwo.txt @@ -1,3 +1,4 @@ Oh! Thanks so much! -In exchange, I’ll give you this key! -It will lead you to a unique item I made myself. It’s my pride and joy. \ No newline at end of file +In exchange, I’ll tell you a hint. +There's a key around this area that will lead you to a unique item I made myself. +It’s my pride and joy. \ No newline at end of file diff --git a/Assets/Text/levelOneRoomThree/roomThreeLeaderTwo.txt b/Assets/Text/levelOneRoomThree/roomThreeLeaderTwo.txt index 145bcd72..97f3f14a 100644 --- a/Assets/Text/levelOneRoomThree/roomThreeLeaderTwo.txt +++ b/Assets/Text/levelOneRoomThree/roomThreeLeaderTwo.txt @@ -1,4 +1,4 @@ Never heard of him... But I do know of the janitor around this area, I think he can help you. By the way, what is the time on your watch? The janitor may be leaving soon for his break. -The janitor will leave at 6 o ' clock. Let ' s hurry up and get him. \ No newline at end of file +The janitor will leave at 6 o' clock. Let's hurry up and get him. \ No newline at end of file diff --git a/Assets/Text/levelOneRoomTwo/roomTwoNPC.txt b/Assets/Text/levelOneRoomTwo/roomTwoNPC.txt index e9110850..56fc6911 100644 --- a/Assets/Text/levelOneRoomTwo/roomTwoNPC.txt +++ b/Assets/Text/levelOneRoomTwo/roomTwoNPC.txt @@ -1,3 +1,3 @@ -Hello, my name is [name here]. Don’t be afraid. I would like to help you escape this area. +Hello, my name is Pocardo Banado. Don’t be afraid. I would like to help you escape this area. I am the coordinator of the area, so I can take you out of here with my keys. I can get you some fuel for your spaceship. It is stored in one of the factories a bit far from here. \ No newline at end of file diff --git a/Assets/Text/levelOneRoomTwo/roomTwoPlayer.txt b/Assets/Text/levelOneRoomTwo/roomTwoPlayer.txt index d0357947..392c4819 100644 --- a/Assets/Text/levelOneRoomTwo/roomTwoPlayer.txt +++ b/Assets/Text/levelOneRoomTwo/roomTwoPlayer.txt @@ -1 +1 @@ -Can I trust [alien name]? \ No newline at end of file +Can we trust Pocardo Banado? \ No newline at end of file diff --git a/Assets/Text/levelOneRoomTwo/roomTwoYes.txt b/Assets/Text/levelOneRoomTwo/roomTwoYes.txt index a3361995..bd48852c 100644 --- a/Assets/Text/levelOneRoomTwo/roomTwoYes.txt +++ b/Assets/Text/levelOneRoomTwo/roomTwoYes.txt @@ -1,3 +1,3 @@ -we followed [alien name] and he suddenly disappeared. +We followed Pocardo Banado and he suddenly disappeared. We were lost in the forest so we backtracked our way to the same area. ...... \ No newline at end of file