Skip to content

Commit

Permalink
Reduced speed of simon states TP command
Browse files Browse the repository at this point in the history
Ignore the other stuff. Seriously. NOTHING TO SEE HERE!
  • Loading branch information
Hexicube committed Apr 14, 2018
1 parent 01cffe4 commit 4a5c790
Show file tree
Hide file tree
Showing 29 changed files with 414 additions and 75 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -4,6 +4,7 @@
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
/.vs/

# Autogenerated VS/MD solution and project files
ExportedObj/
Expand Down
97 changes: 69 additions & 28 deletions Assets/Modules/AdvancedSimon/AdvancedSimon.cs
Expand Up @@ -472,35 +472,31 @@ public override void RealFixedTick()
if (PuzzleDisplay == null) return;
if (ticker == 0)
{
if (DisplayPos >= 0)
if(DisplayPos >= 0)
{
string tone = "";
if (PuzzleDisplay[DisplayPos][0])
{
if(PuzzleDisplay[DisplayPos][0]) {
ButtonRed.GetComponent<MeshRenderer>().material.color = RED;
tone += "R";
}
if (PuzzleDisplay[DisplayPos][1])
{
if(PuzzleDisplay[DisplayPos][1]) {
ButtonYellow.GetComponent<MeshRenderer>().material.color = YELLOW;
tone += "Y";
}
if (PuzzleDisplay[DisplayPos][2])
{
if(PuzzleDisplay[DisplayPos][2]) {
ButtonGreen.GetComponent<MeshRenderer>().material.color = GREEN;
tone += "G";
}
if (PuzzleDisplay[DisplayPos][3])
{
if(PuzzleDisplay[DisplayPos][3]) {
ButtonBlue.GetComponent<MeshRenderer>().material.color = BLUE;
tone += "B";
}
if (soundActive) Sound.PlaySoundAtTransform(tone, transform);
if(soundActive) PlaySound(tone, false);
}
}
else if (ticker == 15)
else if(ticker == 15)
{
if (DisplayPos >= 0)
if(DisplayPos >= 0)
{
if (PuzzleDisplay[DisplayPos][0]) ButtonRed.GetComponent<MeshRenderer>().material.color = DARKRED;
if (PuzzleDisplay[DisplayPos][1]) ButtonYellow.GetComponent<MeshRenderer>().material.color = DARKYELLOW;
Expand All @@ -518,6 +514,36 @@ public override void RealFixedTick()
ticker++;
}

private void PlaySound(string name, bool wasAns) {
if(bop) {
if(name.Equals("R") || name.Equals("RY") || name.Equals("RGB")) {
if(wasAns) Sound.PlaySoundAtTransform("PULL2", transform);
else Sound.PlaySoundAtTransform("PULL", transform);
}
else if(name.Equals("Y") || name.Equals("YG") || name.Equals("RYB")) {
if(wasAns) Sound.PlaySoundAtTransform("TWIST2", transform);
else Sound.PlaySoundAtTransform("TWIST", transform);
}
else if(name.Equals("G") || name.Equals("GB") || name.Equals("RYG")) {
if(wasAns) Sound.PlaySoundAtTransform("FLICK2", transform);
else Sound.PlaySoundAtTransform("FLICK", transform);
}
else if(name.Equals("B") || name.Equals("RB") || name.Equals("YGB")) {
if(wasAns) Sound.PlaySoundAtTransform("SPIN2", transform);
else Sound.PlaySoundAtTransform("SPIN", transform);
}
else if(name.Equals("RYGB") || name.Equals("RG") || name.Equals("YB")) {
Sound.PlaySoundAtTransform("BOP", transform);
}
else {
Debug.Log("Bop-it error with tone: " + name);
}
}
else Sound.PlaySoundAtTransform(name, transform);
}

private void bopsolve() { Sound.PlaySoundAtTransform("PASS", transform); }

private void Handle(int val)
{
if (PuzzleDisplay == null) return;
Expand Down Expand Up @@ -545,6 +571,7 @@ private void Handle(int val)
{
Debug.Log("[Simon States #"+thisLoggingID+"] Module solved.");
GetComponent<KMBombModule>().HandlePass();
if(bop) Invoke("bopsolve", 0.6f);
PuzzleDisplay = null;
}
else Debug.Log("[Simon States #"+thisLoggingID+"] Stage " + Progress + " complete.");
Expand Down Expand Up @@ -585,25 +612,21 @@ private void Handle(int val)
}

pressTicker = 15;
if (val == 0)
{
if (val == 0) {
ButtonRed.GetComponent<MeshRenderer>().material.color = RED;
Sound.PlaySoundAtTransform("R", transform);
PlaySound("R", true);
}
else if (val == 1)
{
else if(val == 1) {
ButtonYellow.GetComponent<MeshRenderer>().material.color = YELLOW;
Sound.PlaySoundAtTransform("Y", transform);
PlaySound("Y", true);
}
else if (val == 2)
{
else if(val == 2) {
ButtonGreen.GetComponent<MeshRenderer>().material.color = GREEN;
Sound.PlaySoundAtTransform("G", transform);
PlaySound("G", true);
}
else
{
else {
ButtonBlue.GetComponent<MeshRenderer>().material.color = BLUE;
Sound.PlaySoundAtTransform("B", transform);
PlaySound("B", true);
}
}

Expand Down Expand Up @@ -645,15 +668,27 @@ private bool HandleBlue()
private IEnumerator Solver() {
while(PuzzleDisplay != null) {
Handle(Answer[SubProgress]);
yield return new WaitForSeconds(0.2f);
yield return new WaitForSeconds(bop?0.4f:0.29f);
}
yield break;
}

public KMSelectable[] ProcessTwitchCommand(string cmd) {

private bool bop = false;
public IEnumerator ProcessTwitchCommand(string cmd) {
cmd = cmd.ToLowerInvariant();
if(cmd.StartsWith("press ")) cmd = cmd.Substring(6);
else if(cmd.StartsWith("submit ")) cmd = cmd.Substring(7);
else if(cmd.Equals("soundpack")) {
if(bop) {
yield return "sendtochaterror That is already on.";
yield break;
}
yield return "Simon States";
Sound.PlaySoundAtTransform("BOP", transform);
yield return "sendtochat Pull-it! Twist-it! Bop-it!";
bop = true;
yield break;
}
else throw new System.FormatException("Commands must start with 'press'.");

char[] buttons = cmd.ToCharArray();
Expand All @@ -667,6 +702,12 @@ private bool HandleBlue()
else throw new System.FormatException("Bad character: " + c);
}

return seq.ToArray();
yield return "Simon States";
foreach(KMSelectable s in seq) {
yield return s;
yield return new WaitForSeconds(bop?0.4f:0.29f);
yield return s;
}
yield break;
}
}
9 changes: 9 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/BOP.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/BOP.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/FLICK.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/FLICK.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/FLICK2.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/FLICK2.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/PASS.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/PASS.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/PULL.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/PULL.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/PULL2.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/PULL2.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/SPIN.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/SPIN.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/SPIN2.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Modules/AdvancedSimon/Not-Tones/SPIN2.mp3.meta

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

Binary file added Assets/Modules/AdvancedSimon/Not-Tones/TWIST.mp3
Binary file not shown.

0 comments on commit 4a5c790

Please sign in to comment.