Commit 5d3a5c12 authored by nedboy3's avatar nedboy3
Browse files

Introscene paper no longer keeps encouraging the player to talk again.

parent cce7f675
...@@ -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: -20.95} m_AnchoredPosition: {x: -35.5, y: -20.95}
m_SizeDelta: {x: 320, y: 24.900002} m_SizeDelta: {x: 249, y: 24.9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &832870305 --- !u!114 &832870305
MonoBehaviour: MonoBehaviour:
...@@ -13281,8 +13281,8 @@ RectTransform: ...@@ -13281,8 +13281,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: -51.6, y: -21}
m_SizeDelta: {x: 300, y: 22} m_SizeDelta: {x: 225.6, y: 22}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &928319864 --- !u!114 &928319864
MonoBehaviour: MonoBehaviour:
...@@ -18814,7 +18814,7 @@ RectTransform: ...@@ -18814,7 +18814,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -182, y: 31} m_AnchoredPosition: {x: -190.05, y: 31}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1199441910 --- !u!114 &1199441910
...@@ -24444,6 +24444,7 @@ MonoBehaviour: ...@@ -24444,6 +24444,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
interactButton: {fileID: 708397161} interactButton: {fileID: 708397161}
exclamation: {fileID: 1931458616}
playerResponses: playerResponses:
- {fileID: 1199441910} - {fileID: 1199441910}
- {fileID: 173653533} - {fileID: 173653533}
......
...@@ -85,16 +85,16 @@ public class PaperSpeech : MonoBehaviour, Character { ...@@ -85,16 +85,16 @@ public class PaperSpeech : MonoBehaviour, Character {
responseQueue.Enqueue(new string[] {}); responseQueue.Enqueue(new string[] {});
conversation.Enqueue("You can interact with the paper by using the number keys"); conversation.Enqueue("You can interact with the paper by using the number keys");
responseQueue.Enqueue(new string[] {"Read", "Converse", "" }); responseQueue.Enqueue(new string[] {"Read", "Converse", "Let the words serenade you" });
//GameManager.speechState will be the size of the queue when this dequeued //GameManager.speechState will be the size of the queue when this dequeued
//make sure to change the check integer in CharacterInteractins when changing dialogue //make sure to change the check integer in CharacterInteractins when changing dialogue
conversation.Enqueue("The words on the page speak to you: CIRQUE DU SOLAME NOW HIRING, NO EXPERIENCE NECCESSARY"); conversation.Enqueue("The words on the page speak to you: CIRQUE DU SOLAME NOW HIRING, NO EXPERIENCE NECCESSARY");
responseQueue.Enqueue(new string[] { "It's better than McDonald's."}); responseQueue.Enqueue(new string[] {"No student loan?", "No working at Macca's?", "I'm actually afraid of clowns"});
conversation.Enqueue("BE THE PERFORMER YOUR PARENTS ALWAYS HOPED YOU WOULDN'T "); conversation.Enqueue("BE THE PERFORMER YOUR PARENTS ALWAYS HOPED YOU WOULDN'T ");
responseQueue.Enqueue(new string[] { "This is tearible", "I just wanna perform", "Actually, it's what they always wanted" }); responseQueue.Enqueue(new string[] { "This is tearible", "I just wanna perform", "Actually, it's what they always wanted" });
conversation.Enqueue("WHAT ARE YOU WAITING FOR, JUST WALK TO THE RIGHT TO LEAVE THE CONVERSATION AND START " + conversation.Enqueue("WHAT ARE YOU WAITING FOR? JUST WALK TO THE RIGHT TO LEAVE THE CONVERSATION AND START " +
" YOUR CIRCUS CAREER"); " YOUR CIRCUS CAREER");
responseQueue.Enqueue(new string[] {}); responseQueue.Enqueue(new string[] {});
......
...@@ -10,6 +10,7 @@ public class PaperController : MonoBehaviour { ...@@ -10,6 +10,7 @@ public class PaperController : MonoBehaviour {
private Text speechBox; private Text speechBox;
private GameObject faceCamDisplay; private GameObject faceCamDisplay;
private InputField inputName; private InputField inputName;
public GameObject exclamation;
//character response stuff //character response stuff
private Image responsePanel; private Image responsePanel;
public Button[] playerResponses; public Button[] playerResponses;
...@@ -110,7 +111,11 @@ public class PaperController : MonoBehaviour { ...@@ -110,7 +111,11 @@ public class PaperController : MonoBehaviour {
{//if the player is currently interacting {//if the player is currently interacting
if (!DaytimeManager.enteringName) if (!DaytimeManager.enteringName)
{//conversing {//conversing
if (state >= 5)
{
exclamation.SetActive(false);
interactButton.gameObject.SetActive(false);
}
if (Input.GetKeyDown(KeyCode.Alpha1)) if (Input.GetKeyDown(KeyCode.Alpha1))
{ {
ButtonPress(1); ButtonPress(1);
...@@ -123,10 +128,6 @@ public class PaperController : MonoBehaviour { ...@@ -123,10 +128,6 @@ public class PaperController : MonoBehaviour {
{ {
ButtonPress(3); ButtonPress(3);
} }
if (Input.GetKeyDown(KeyCode.Alpha4))
{
ButtonPress(4);
}
} }
} }
} }
...@@ -155,7 +156,11 @@ public class PaperController : MonoBehaviour { ...@@ -155,7 +156,11 @@ public class PaperController : MonoBehaviour {
void enterInteractable() void enterInteractable()
{ {
//speechBox.gameObject.SetActive(false); //speechBox.gameObject.SetActive(false);
interactButton.gameObject.SetActive(true); if (!(state > 4))
{
print(state);
interactButton.gameObject.SetActive(true);
}
faceCam.gameObject.SetActive(true); faceCam.gameObject.SetActive(true);
updateFaceCamDisplay(); updateFaceCamDisplay();
DialogueUI.gameObject.SetActive(false); DialogueUI.gameObject.SetActive(false);
......
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