Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
20db4191
Commit
20db4191
authored
Feb 14, 2019
by
gstuitje
Browse files
Changed ahava dialogue to talk about relations.
parent
7aaf691d
Changes
4
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
20db4191
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/
Simon
Speech.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/
Ahava
Speech.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs"
Line=
"188"
Column=
"75"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs"
Line=
"33"
Column=
"117"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs"
Line=
"234"
Column=
"113"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/SimonSpeech.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SpawnKeys.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/TriggerManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/PaperSpeech.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/IntroTent.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs"
Line=
"116"
Column=
"9"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/LevelManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/MimeMime.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterInteractions.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/GameManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/Key.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/DaytimeManager.cs"
Line=
"1"
Column=
"1"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterInteractions.cs
View file @
20db4191
...
...
@@ -259,7 +259,7 @@ public class CharacterInteractions : MonoBehaviour {
}
private
bool
askPlayerForName
()
{
if
(
GameManager
.
speechState
==
5
)
{
if
(
GameManager
.
speechState
==
7
)
{
//create input field for player name
DaytimeManager
.
enteringName
=
true
;
inputName
.
gameObject
.
SetActive
(
true
);
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs
View file @
20db4191
...
...
@@ -117,8 +117,14 @@ public class AhavaSpeech : MonoBehaviour, Character {
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?"
});
conversation
.
Enqueue
(
"Dennnnis it is!"
);
responseQueue
.
Enqueue
(
new
string
[]
{
"..."
});
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
[]
{
"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
[]
{
"..."
,
"...."
,
"....."
});
}
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/DaytimeManager.cs
View file @
20db4191
...
...
@@ -17,9 +17,9 @@ public class DaytimeManager : MonoBehaviour {
if
(
Ahava
!=
null
&&
Ahava
.
activeSelf
)
{
float
newLevel
=
1
+
GameManager
.
JohnLevel
*
0.5f
-
1
+
GameManager
.
SilasLevel
*
0.5f
-
1
+
GameManager
.
SimonLevel
*
0.5f
-
1
;
+
((
GameManager
.
JohnLevel
-
1
)
*
0.5f
)
+
((
GameManager
.
SilasLevel
-
1
)
*
0.5f
)
+
((
GameManager
.
SimonLevel
-
1
)
*
0.5f
)
;
float
diffinLevels
=
newLevel
-
GameManager
.
AhavaLevel
;
print
(
"diff"
+
diffinLevels
);
print
(
"start"
+
GameManager
.
AhavaLevel
%
1
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment