Merge pull request #76 from wilmol/DialogueChange

Dialogue change
will-molloy · Oct 9, 2017 · f3e84fd · f3e84fd
2 parents 111e9d2 + 10461f2
commit f3e84fd
Show file tree

Hide file tree

Showing 17 changed files with 356 additions and 93 deletions.
diff --git 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
@@ -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
diff --git a/Assets/Prefabs/scroll.prefab 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
diff --git 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