Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/Dialogue/JaneStory/IntroductionToJane.ink
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ Pssst. Jane over here! #Speaker: Christopher #Layout: Right

=== NoelleExtraDialogue ===
{ JaneIsSeated == false:
I honestly don't know if I cna pass this subject anymore. #Speaker: Noelle #Layout: Left
I honestly don't know if I can pass this subject anymore. #Speaker: Noelle #Layout: Left
My guardian angel has been very weak lately. #Speaker: Noelle #Layout: Left
}
-> DONE

=== NoellesExtraDialogue ===
{ JaneIsSeated == false:
I hope things turn out for the better. This really isn't a good sign... Rigen love Maniego #Speaker: Noelle #Layout: Left
I hope things turn out for the better. This really isn't a good sign. #Speaker: Noelle #Layout: Left
}
-> DONE

Expand Down
2 changes: 1 addition & 1 deletion Assets/Dialogue/JaneStory/JaneStoryDialogue.json

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions Assets/Prefabs/Quest/Approach Heinrich.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1089564715246249049
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2610926767127409284}
- component: {fileID: 4727707270801832816}
m_Layer: 0
m_Name: Approach Heinrich
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2610926767127409284
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1089564715246249049}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.6609, y: -1.0361466, z: -0.018460112}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4727707270801832816
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1089564715246249049}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 738a57a53760e7b47ad41efdb85069c4, type: 3}
m_Name:
m_EditorClassIdentifier:
<QuestStepName>k__BackingField: Approach Heinrich and Claim your Paper
7 changes: 7 additions & 0 deletions Assets/Prefabs/Quest/Approach Heinrich.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 6284413223506580624}
- component: {fileID: 2099149217049260052}
m_Layer: 0
m_Name: ObtainFourLeafClover
m_Name: FollowChris
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
47 changes: 47 additions & 0 deletions Assets/Prefabs/Quest/TalkedToChristopherBeforeFallingInLine.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5412921960268194987
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5378186318471348064}
- component: {fileID: 506259119297805451}
m_Layer: 0
m_Name: TalkedToChristopherBeforeFallingInLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5378186318471348064
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5412921960268194987}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.6609, y: -1.0361466, z: -0.018460112}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &506259119297805451
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5412921960268194987}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 308e18d021332f74aa9ffcc520ed151c, type: 3}
m_Name:
m_EditorClassIdentifier:
<QuestStepName>k__BackingField: Talk to Christopher Before Approachign Heinrich

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions Assets/Resources/Quest/ApproachHeinrich.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
using UnityEngine;

public class ApproachHeinrich : QuestStep
{
private bool hasInteractedWithHeinrich = false;

private void Start()
{
UpdateState();
}

private void OnEnable()
{
GamesEventManager.Instance.questEvents.OnInteractInCollision += CheckCollision;
}

private void OnDisable()
{
GamesEventManager.Instance.questEvents.OnInteractInCollision -= CheckCollision;
}

private void CheckCollision(string tag)
{
if (tag.Equals("Heinrich") && !hasInteractedWithHeinrich)
{
hasInteractedWithHeinrich = true; // Set the flag to true after interacting with the pipes
UpdateState(); // Update the quest step state
CheckFinalCondition(); // Check if the quest step is complete
}
}

private void CheckFinalCondition()
{
if (hasInteractedWithHeinrich)
{
FinishQuestStep();
}
}


private void UpdateState()
{
string state = hasInteractedWithHeinrich.ToString();
string status = "Go to Heinrich and claim your paper.";
ChangeState(state, status);
}

protected override void SetQuestStepState(string state)
{
/*
this.currentAmount = System.Int32.Parse(state);
this.hasInteractedWithPipes = System.Boolean.Parse(state);
UpdateState();
*/
string[] parts = state.Split(',');
if (parts.Length == 1)
{
this.hasInteractedWithHeinrich = bool.Parse(parts[0]);
}
UpdateState();
}
}
2 changes: 2 additions & 0 deletions Assets/Resources/Quest/ApproachHeinrich.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Assets/Resources/Quest/IntroductionToJane.asset
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ MonoBehaviour:
questPrerequisite: []
questSteps:
- {fileID: 5631547846131636580, guid: f1f84fb769c49c6439c91242c7abb271, type: 3}
- {fileID: 5412921960268194987, guid: 0082f17d836a6fc4186457285e8150e4, type: 3}
- {fileID: 1089564715246249049, guid: 31d7514160b15af4e9ed8efb0dd40fbc, type: 3}
experienceReward: 0
goldReward: 0
62 changes: 62 additions & 0 deletions Assets/Resources/Quest/TalkedToChristopherBeforeFallingInLine.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
using UnityEngine;

public class TalkingBeforeFallingInLine : QuestStep
{
private bool hasInteractedWithChris = false;

private void Start()
{
UpdateState();
}

private void OnEnable()
{
GamesEventManager.Instance.questEvents.OnInteractInCollision += CheckCollision;
}

private void OnDisable()
{
GamesEventManager.Instance.questEvents.OnInteractInCollision -= CheckCollision;
}

private void CheckCollision(string tag)
{
if (tag.Equals("Chris") && !hasInteractedWithChris)
{
hasInteractedWithChris = true; // Set the flag to true after interacting with the pipes
UpdateState(); // Update the quest step state
CheckFinalCondition(); // Check if the quest step is complete
}
}

private void CheckFinalCondition()
{
if (hasInteractedWithChris)
{
FinishQuestStep();
}
}


private void UpdateState()
{
string state = hasInteractedWithChris.ToString();
string status = "Talk to Chris before falling in line.";
ChangeState(state, status);
}

protected override void SetQuestStepState(string state)
{
/*
this.currentAmount = System.Int32.Parse(state);
this.hasInteractedWithPipes = System.Boolean.Parse(state);
UpdateState();
*/
string[] parts = state.Split(',');
if (parts.Length == 1)
{
this.hasInteractedWithChris = bool.Parse(parts[0]);
}
UpdateState();
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading