Commit 557bce23 authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Now the player gets to properly see the responses.
  Changed ahava dialogue to talk about relations.

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
parents f02f9c59 188f29a0
...@@ -1055,7 +1055,7 @@ MonoBehaviour: ...@@ -1055,7 +1055,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 7 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -1907,8 +1907,8 @@ Transform: ...@@ -1907,8 +1907,8 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 382599332} m_GameObject: {fileID: 382599332}
m_LocalRotation: {x: 0.02769416, y: 0.647262, z: -0.03256354, w: -0.7610681} m_LocalRotation: {x: 0.02769416, y: 0.647262, z: -0.03256354, w: -0.7610681}
m_LocalPosition: {x: -45.47, y: -1.5, z: -18.97} m_LocalPosition: {x: -46.68, y: -2.05, z: -100}
m_LocalScale: {x: 5.29, y: 3.6999998, z: 1} m_LocalScale: {x: 8, y: 3.6999998, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1230210401} m_Father: {fileID: 1230210401}
m_RootOrder: 5 m_RootOrder: 5
...@@ -1947,7 +1947,7 @@ SpriteRenderer: ...@@ -1947,7 +1947,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235 m_SortingLayerID: -1966733235
m_SortingLayer: 2 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: 1
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3} m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
...@@ -2659,7 +2659,7 @@ MonoBehaviour: ...@@ -2659,7 +2659,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 7 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -3340,12 +3340,12 @@ Transform: ...@@ -3340,12 +3340,12 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 740712756} m_GameObject: {fileID: 740712756}
m_LocalRotation: {x: 0.032746498, y: 0.76534414, z: 0.027477575, w: 0.64220005} m_LocalRotation: {x: 0.0327465, y: 0.7653442, z: 0.027477577, w: 0.6422001}
m_LocalPosition: {x: 29.2, y: -1.5, z: -18.97} m_LocalPosition: {x: 29.07, y: -3.97, z: -100}
m_LocalScale: {x: 5.290002, y: 3.6999993, z: 1.0000005} m_LocalScale: {x: 8, y: 3.6999993, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1230210401} m_Father: {fileID: 1646371380}
m_RootOrder: 6 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 100, z: 4.9} m_LocalEulerAnglesHint: {x: 0, y: 100, z: 4.9}
--- !u!61 &740712758 --- !u!61 &740712758
BoxCollider2D: BoxCollider2D:
...@@ -3406,7 +3406,7 @@ SpriteRenderer: ...@@ -3406,7 +3406,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235 m_SortingLayerID: -1966733235
m_SortingLayer: 2 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: 1
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3} m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
...@@ -8229,8 +8229,8 @@ RectTransform: ...@@ -8229,8 +8229,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -21} m_AnchoredPosition: {x: 0, y: -20.95}
m_SizeDelta: {x: 300, y: 22} m_SizeDelta: {x: 320, y: 24.900002}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &832870305 --- !u!114 &832870305
MonoBehaviour: MonoBehaviour:
...@@ -8258,7 +8258,7 @@ MonoBehaviour: ...@@ -8258,7 +8258,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 7 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -8415,8 +8415,8 @@ RectTransform: ...@@ -8415,8 +8415,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 55, y: 20} m_AnchoredPosition: {x: 55, y: 27.400002}
m_SizeDelta: {x: -130, y: 28} m_SizeDelta: {x: -130, y: 42.8}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &850495251 --- !u!114 &850495251
MonoBehaviour: MonoBehaviour:
...@@ -13310,7 +13310,7 @@ MonoBehaviour: ...@@ -13310,7 +13310,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 7 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -19101,7 +19101,6 @@ Transform: ...@@ -19101,7 +19101,6 @@ Transform:
- {fileID: 102930289} - {fileID: 102930289}
- {fileID: 1008886849} - {fileID: 1008886849}
- {fileID: 382599333} - {fileID: 382599333}
- {fileID: 740712757}
m_Father: {fileID: 491873958} m_Father: {fileID: 491873958}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -29581,6 +29580,7 @@ Transform: ...@@ -29581,6 +29580,7 @@ Transform:
- {fileID: 636012976} - {fileID: 636012976}
- {fileID: 231697273} - {fileID: 231697273}
- {fileID: 1146273524} - {fileID: 1146273524}
- {fileID: 740712757}
m_Father: {fileID: 1175208678} m_Father: {fileID: 1175208678}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......
...@@ -259,7 +259,7 @@ public class CharacterInteractions : MonoBehaviour { ...@@ -259,7 +259,7 @@ public class CharacterInteractions : MonoBehaviour {
} }
private bool askPlayerForName() { private bool askPlayerForName() {
if (GameManager.speechState == 5) { if (GameManager.speechState == 7) {
//create input field for player name //create input field for player name
DaytimeManager.enteringName = true; DaytimeManager.enteringName = true;
inputName.gameObject.SetActive(true); inputName.gameObject.SetActive(true);
......
...@@ -117,8 +117,14 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -117,8 +117,14 @@ public class AhavaSpeech : MonoBehaviour, Character {
conversation.Enqueue("You can call me Baird... Ahava Baird, And I shall call you Dennnis"); conversation.Enqueue("You can call me Baird... Ahava Baird, And I shall call you Dennnis");
responseQueue.Enqueue(new string[] { "Fine", "Not Dennnis!","Did you mean Dennis?" }); responseQueue.Enqueue(new string[] { "Fine", "Not Dennnis!","Did you mean Dennis?" });
conversation.Enqueue("Dennnnis it is!"); conversation.Enqueue("Well Dennnnis! We're nice folk here, if you perform for us maybe we might even change our dialogue!");
responseQueue.Enqueue(new string[] { "..." }); responseQueue.Enqueue(new string[] { "What's a dire log?", "Sounds good", "Maybe I'll perform more" });
conversation.Enqueue("If you want to know how close you are to impressing us just check our 'Relationship'");
responseQueue.Enqueue(new string[] { "Thanks", "I wonder if there is a convenient meter?", "What if the feeling isn't mutual?" });
conversation.Enqueue("See you around Dennnnnis");
responseQueue.Enqueue(new string[] { "...", "....", "....." });
} }
......
...@@ -17,9 +17,9 @@ public class DaytimeManager : MonoBehaviour { ...@@ -17,9 +17,9 @@ public class DaytimeManager : MonoBehaviour {
if (Ahava!= null && Ahava.activeSelf) if (Ahava!= null && Ahava.activeSelf)
{ {
float newLevel = 1 float newLevel = 1
+ GameManager.JohnLevel*0.5f - 1 + ((GameManager.JohnLevel-1) * 0.5f)
+ GameManager.SilasLevel*0.5f - 1 + ((GameManager.SilasLevel-1) * 0.5f)
+ GameManager.SimonLevel*0.5f - 1; + ((GameManager.SimonLevel-1)*0.5f);
float diffinLevels = newLevel - GameManager.AhavaLevel; float diffinLevels = newLevel - GameManager.AhavaLevel;
print("diff" + diffinLevels); print("diff" + diffinLevels);
print("start" + GameManager.AhavaLevel % 1); print("start" + GameManager.AhavaLevel % 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment