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
3f3058aa
Commit
3f3058aa
authored
Feb 13, 2019
by
mmaluschnig
Browse files
I'm Mitchie.
parent
6d6e40ad
Changes
6
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
3f3058aa
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Trapez
eScripts/
Gene
rate
Trapezes
.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Daytim
eScripts/
Cha
ra
c
te
rSpeech/SilasSpeech
.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezeController.cs"
Line=
"51"
Column=
"27"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezePerson.cs"
Line=
"52"
Column=
"44"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezeTutorial.cs"
Line=
"89"
Column=
"9"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs"
Line=
"118"
Column=
"96"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/GenerateTrapezes.cs"
Line=
"42"
Column=
"108"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SpawnKeys.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/TriggerManager.cs"
Line=
"143"
Column=
"32"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/MimeMime.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SongSelect.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/PieScripts/Pie.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/LevelManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/PieScripts/throwManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/DaytimeManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterInteractions.cs"
Line=
"96"
Column=
"22"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs"
Line=
"74"
Column=
"13"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MenuScripts/MainMenu.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MenuScripts/PauseMenu.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/GameManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/PaperSpeech.cs"
Line=
"66"
Column=
"15"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs"
Line=
"67"
Column=
"39"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterInteractions.cs
View file @
3f3058aa
...
...
@@ -55,7 +55,7 @@ public class CharacterInteractions : MonoBehaviour {
private
IEnumerator
checkLevelUp
()
{
yield
return
new
WaitForSeconds
(
0.1f
);
if
(
characterScript
.
getName
()
!=
"Ahava"
)
{
if
(
characterScript
.
getName
()
!=
"Ahava"
){
LevelUpImage
.
gameObject
.
SetActive
(
false
);
}
else
{
LevelUpImage
.
gameObject
.
SetActive
(
GameManager
.
hasLeveledUp
(
characterScript
.
getName
()));
...
...
@@ -69,9 +69,13 @@ public class CharacterInteractions : MonoBehaviour {
{
animationStuff
();
if
(
GameManager
.
ConversationStage
==
1
&&
characterScript
.
getName
()
!=
"Ahava"
)
{
if
(
GameManager
.
HasTalkedToAhava
)
{
if
(
GameManager
.
HasTalkedToAhava
)
{
LevelUpImage
.
gameObject
.
SetActive
(
GameManager
.
hasLeveledUp
(
characterScript
.
getName
()));
}
else
{
}
else
if
(
characterScript
.
getLevel
()
>=
2
)
{
}
else
{
LevelUpImage
.
gameObject
.
SetActive
(
false
);
}
}
...
...
@@ -84,10 +88,11 @@ public class CharacterInteractions : MonoBehaviour {
interacting
=
true
;
setText
(
speechBox
,
characterScript
.
GreetingMessage
(),
Mathf
.
Infinity
,
characterScript
.
getResponses
());
interactButton
.
gameObject
.
SetActive
(
false
);
if
(
GameManager
.
HasTalkedToAhava
)
if
(
GameManager
.
HasTalkedToAhava
||
characterScript
.
getName
()
==
"Ahava"
)
{
GameManager
.
setLeveledUp
(
characterScript
.
getName
(),
false
);
}
LevelUpImage
.
gameObject
.
SetActive
(
false
);
}
//generate speech every so often while the player is nearby
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/PaperSpeech.cs
View file @
3f3058aa
...
...
@@ -63,7 +63,7 @@ public class PaperSpeech : MonoBehaviour, Character {
}
else
{
GameManager
.
HasTalkedToAhava
=
true
;
//
GameManager.HasTalkedToAhava = true;
return
nothingMoreToSay
();
}
}
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs
View file @
3f3058aa
...
...
@@ -64,7 +64,7 @@ public class SilasSpeech : MonoBehaviour, Character {
currentResponses
=
new
string
[]
{
"wow, tell me mo..."
,
"my ears are ble..."
,
"I'm just tryi..."
};
}
switch
(
Random
.
Range
(
0
,
1
1
))
{
switch
(
Random
.
Range
(
0
,
1
4
))
{
case
0
:
return
"According to circus superstition, it's unlucky to wear green in the ring, hopefully you'll be okay!"
;
case
1
:
return
"A 'josser' is an outsider who joins the circus!"
;
case
2
:
return
"The word clown is believed to come from the Icelandic word klunni, meaning a clumsy person!"
;
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/DaytimeManager.cs
View file @
3f3058aa
...
...
@@ -24,7 +24,8 @@ public class DaytimeManager : MonoBehaviour {
print
(
"diff"
+
diffinLevels
);
print
(
"start"
+
GameManager
.
AhavaLevel
%
1
);
if
((
GameManager
.
AhavaLevel
%
1
)
+
diffinLevels
>
1
)
{
{
print
(
"Level Up Ahava"
);
GameManager
.
AhavaLevelUp
=
true
;
}
GameManager
.
AhavaLevel
=
newLevel
;
...
...
RingMaster/RingMaster/Assets/Scripts/GameManager.cs
View file @
3f3058aa
...
...
@@ -5,10 +5,15 @@ using UnityEngine;
public
class
GameManager
:
MonoBehaviour
{
public
static
float
AhavaLevel
;
public
static
float
SilasLevel
=
1.
1f
;
public
static
float
SilasLevel
=
1f
;
public
static
float
SimonLevel
=
1f
;
public
static
float
JohnLevel
=
1f
;
public
static
float
SilasLevelStored
=
1.8f
;
public
static
float
SimonLevelStored
=
1f
;
public
static
float
JohnLevelStored
=
1f
;
public
static
bool
AhavaLevelUp
;
private
static
bool
SilasLevelUp
=
true
;
private
static
bool
SimonLevelUp
=
true
;
...
...
@@ -17,7 +22,7 @@ public class GameManager : MonoBehaviour {
public
static
string
playerName
=
"Dennis"
;
public
static
bool
FirstTimePie
=
true
;
public
static
bool
FirstTimeMime
=
tru
e
;
public
static
bool
FirstTimeMime
=
fals
e
;
public
static
bool
FirstTimeTrapeze
=
false
;
public
static
bool
SimonTutorial
;
...
...
Write
Preview
Markdown
is supported
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