From f7c6cedc081c085c3d977e4c9e0cf4b93a40ec87 Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Sat, 9 Jul 2022 21:20:30 -0500
Subject: [PATCH 1/8] Combined Coin Toss's "Set XXXXground color" into one
also renamed "Hit3" to "HitX"
---
Assets/Scripts/Games/CoinToss/CoinToss.cs | 19 +++++++++++++------
Assets/Scripts/Games/KarateMan/KarateMan.cs | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/Games/CoinToss/CoinToss.cs b/Assets/Scripts/Games/CoinToss/CoinToss.cs
index 535a310f..e87cfbe6 100644
--- a/Assets/Scripts/Games/CoinToss/CoinToss.cs
+++ b/Assets/Scripts/Games/CoinToss/CoinToss.cs
@@ -19,9 +19,10 @@ namespace HeavenStudio.Games.Loaders
new Param("toggle", false, "Audience Reaction", "Enable Audience Reaction"),
}),
- new GameAction("set background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f); }, 0.5f, false, new List()
+ new GameAction("set background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f); CoinToss.instance.ChangeBackgroundColor(e.colorB, 0f, true); }, 0.5f, false, new List()
{
- new Param("colorA", CoinToss.defaultBgColor, "Background Color", "The background color to change to")
+ new Param("colorA", CoinToss.defaultBgColor, "Background Color", "The background color to change to"),
+ new Param("colorB", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to")
} ),
new GameAction("fade background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length); }, 1f, true, new List()
{
@@ -29,15 +30,21 @@ namespace HeavenStudio.Games.Loaders
new Param("colorB", CoinToss.defaultBgColor, "End Color", "The ending color in the fade")
} ),
- new GameAction("set foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f, true); }, 0.5f, false, new List()
- {
- new Param("colorA", CoinToss.defaultFgColor, "Background Color", "The background color to change to")
- } ),
new GameAction("fade foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length, true); }, 1f, true, new List()
{
new Param("colorA", Color.white, "Start Color", "The starting color in the fade"),
new Param("colorB", CoinToss.defaultFgColor, "End Color", "The ending color in the fade")
} ),
+
+ //left in for backwards-compatibility, but cannot be placed
+
+ new GameAction("set foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f, true); }, 0.5f, false, new List
+
+ {
+ new Param("colorA", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to")
+ },
+ hidden: true
+ )
},
new List() {"ntr", "aim"},
"ntrcoin", "en",
diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs
index e44dd538..1b8365ab 100644
--- a/Assets/Scripts/Games/KarateMan/KarateMan.cs
+++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs
@@ -32,7 +32,7 @@ namespace HeavenStudio.Games.Loaders
}),
new GameAction("kick", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 4); }, 4.5f),
new GameAction("combo", delegate { KarateMan.instance.Combo(eventCaller.currentEntity.beat); }, 4f),
- new GameAction("hit3", delegate
+ new GameAction("hitX", delegate
{
var e = eventCaller.currentEntity;
switch ((KarateMan.HitThree)e.type)
From f27d16a1a5039913c84958adf5f596cae29bd85c Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Sat, 9 Jul 2022 21:42:28 -0500
Subject: [PATCH 2/8] Further simplified Coin Toss
Also added 3 new color attributes: colorD, colorE, and colorF
---
Assets/Scripts/Beatmap.cs | 3 +++
Assets/Scripts/Games/CoinToss/CoinToss.cs | 25 ++++++++++++---------
Assets/Scripts/Games/KarateMan/KarateMan.cs | 22 +++++++++++-------
3 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/Assets/Scripts/Beatmap.cs b/Assets/Scripts/Beatmap.cs
index f6473103..d3289fdf 100644
--- a/Assets/Scripts/Beatmap.cs
+++ b/Assets/Scripts/Beatmap.cs
@@ -42,6 +42,9 @@ namespace HeavenStudio
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorA;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorB;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorC;
+ [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorD;
+ [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorE;
+ [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public Color colorF;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public string text1;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public string text2;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public string text3;
diff --git a/Assets/Scripts/Games/CoinToss/CoinToss.cs b/Assets/Scripts/Games/CoinToss/CoinToss.cs
index e87cfbe6..a5961177 100644
--- a/Assets/Scripts/Games/CoinToss/CoinToss.cs
+++ b/Assets/Scripts/Games/CoinToss/CoinToss.cs
@@ -24,17 +24,15 @@ namespace HeavenStudio.Games.Loaders
new Param("colorA", CoinToss.defaultBgColor, "Background Color", "The background color to change to"),
new Param("colorB", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to")
} ),
- new GameAction("fade background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length); }, 1f, true, new List()
+ new GameAction("fade background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length); CoinToss.instance.FadeBackgroundColor(e.colorC, e.colorD, e.length, true); }, 1f, true, new List()
{
- new Param("colorA", Color.white, "Start Color", "The starting color in the fade"),
- new Param("colorB", CoinToss.defaultBgColor, "End Color", "The ending color in the fade")
+ new Param("colorA", Color.white, "BG Start Color", "The starting color in the fade"),
+ new Param("colorB", CoinToss.defaultBgColor, "BG End Color", "The ending color in the fade"),
+ new Param("colorC", Color.white, "FG Start Color", "The starting color in the fade"),
+ new Param("colorD", CoinToss.defaultFgColor, "FG End Color", "The ending color in the fade")
} ),
- new GameAction("fade foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length, true); }, 1f, true, new List()
- {
- new Param("colorA", Color.white, "Start Color", "The starting color in the fade"),
- new Param("colorB", CoinToss.defaultFgColor, "End Color", "The ending color in the fade")
- } ),
+
//left in for backwards-compatibility, but cannot be placed
@@ -42,9 +40,14 @@ namespace HeavenStudio.Games.Loaders
{
new Param("colorA", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to")
- },
- hidden: true
- )
+
+ }, hidden: true ),
+
+ new GameAction("fade foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length, true); }, 1f, true, new List()
+ {
+ new Param("colorA", Color.white, "Start Color", "The starting color in the fade"),
+ new Param("colorB", CoinToss.defaultFgColor, "End Color", "The ending color in the fade")
+ }, hidden: true ),
},
new List() {"ntr", "aim"},
"ntrcoin", "en",
diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs
index 1b8365ab..0394dae5 100644
--- a/Assets/Scripts/Games/KarateMan/KarateMan.cs
+++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs
@@ -47,26 +47,22 @@ namespace HeavenStudio.Games.Loaders
new Param("type", KarateMan.HitThree.HitThree, "Type", "What should be called out")
}),
new GameAction("prepare", delegate { KarateMan.instance.Prepare(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 1f, true),
- new GameAction("set background color", delegate {
+ new GameAction("set background effects", delegate {
var e = eventCaller.currentEntity;
var c = KarateMan.instance.BackgroundColors[e.type];
if(e.type == (int)KarateMan.BackgroundType.Custom) c = e.colorA;
KarateMan.instance.SetBackgroundColor(e.type, e.type2, c, e.colorB);
+ KarateMan.instance.SetBackgroundFX((KarateMan.BackgroundFXType)eventCaller.currentEntity.type);
}, 0.5f, false, new List()
{
new Param("type", KarateMan.BackgroundType.Yellow, "Background Type", "The preset background type"),
new Param("type2", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom"),
new Param("colorA", new Color(), "Custom Background Color", "The background color to use when background type is set to Custom"),
new Param("colorB", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom"),
-
- }),
- new GameAction("set background fx", delegate {
- KarateMan.instance.SetBackgroundFX((KarateMan.BackgroundFXType)eventCaller.currentEntity.type);
- }, 0.5f, false, new List()
- {
new Param("type", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed")
}),
+
// These are still here for backwards-compatibility but are hidden in the editor
new GameAction("pot", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 0); }, 2, hidden: true),
new GameAction("rock", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 2); }, 2, hidden: true),
@@ -75,8 +71,18 @@ namespace HeavenStudio.Games.Loaders
new GameAction("hit4", delegate { KarateMan.instance.Hit4(eventCaller.currentEntity.beat); }, hidden: true),
new GameAction("bgfxon", delegate { KarateMan.instance.SetBackgroundFX(KarateMan.BackgroundFXType.Sunburst); }, hidden: true),
new GameAction("bgfxoff", delegate { KarateMan.instance.SetBackgroundFX(KarateMan.BackgroundFXType.None); }, hidden: true),
+ new GameAction("set background fx", delegate {
+ KarateMan.instance.SetBackgroundFX((KarateMan.BackgroundFXType)eventCaller.currentEntity.type);
+ }, 0.5f, false, new List()
+ {
+ new Param("type", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed")
- });
+ },
+ hidden: true
+ )
+
+
+ });;
}
}
}
From 6754a34e26bef7cba4b08ccd0f9704c4a9f459bb Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Sat, 9 Jul 2022 22:02:59 -0500
Subject: [PATCH 3/8] Unified minigame titles
---
Assets/Scripts/Games/BlueBear/BlueBear.cs | 2 +-
Assets/Scripts/Games/CoinToss/CoinToss.cs | 2 +-
Assets/Scripts/Games/Fireworks/Fireworks.cs | 2 +-
Assets/Scripts/Games/LaunchParty/LaunchParty.cs | 2 +-
Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs | 2 +-
Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs | 2 +-
Assets/Scripts/Games/TapTrial/TapTrial.cs | 2 +-
Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs | 2 +-
Assets/Scripts/Games/TrickClass/TrickClass.cs | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/Games/BlueBear/BlueBear.cs b/Assets/Scripts/Games/BlueBear/BlueBear.cs
index a2f1cf97..1f5e0a69 100644
--- a/Assets/Scripts/Games/BlueBear/BlueBear.cs
+++ b/Assets/Scripts/Games/BlueBear/BlueBear.cs
@@ -11,7 +11,7 @@ namespace HeavenStudio.Games.Loaders
public static class CtrBearLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("blueBear", "Blue Bear \n[WIP don't use]", "B4E6F6", false, false, new List()
+ return new Minigame("blueBear", "Blue Bear", "B4E6F6", false, false, new List()
{
new GameAction("donut", delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, false); }, 3, false),
new GameAction("cake", delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, true); }, 4, false),
diff --git a/Assets/Scripts/Games/CoinToss/CoinToss.cs b/Assets/Scripts/Games/CoinToss/CoinToss.cs
index a5961177..c1923e09 100644
--- a/Assets/Scripts/Games/CoinToss/CoinToss.cs
+++ b/Assets/Scripts/Games/CoinToss/CoinToss.cs
@@ -12,7 +12,7 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
- return new Minigame("coinToss", "Coin Toss \n [One coin at a time!]", "B4E6F6", false, false, new List()
+ return new Minigame("coinToss", "Coin Toss", "B4E6F6", false, false, new List()
{
new GameAction("toss", delegate { CoinToss.instance.TossCoin(eventCaller.currentEntity.beat, eventCaller.currentEntity.toggle); }, 7, false, parameters: new List()
{
diff --git a/Assets/Scripts/Games/Fireworks/Fireworks.cs b/Assets/Scripts/Games/Fireworks/Fireworks.cs
index c1f5603a..697adcaa 100644
--- a/Assets/Scripts/Games/Fireworks/Fireworks.cs
+++ b/Assets/Scripts/Games/Fireworks/Fireworks.cs
@@ -9,7 +9,7 @@ namespace HeavenStudio.Games.Loaders
public static class AgbFireworkLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("fireworks", "Fireworks \n[WIP don't use]", "000000", false, false, new List()
+ return new Minigame("fireworks", "Fireworks \n[WIP]", "000000", false, false, new List()
{
});
}
diff --git a/Assets/Scripts/Games/LaunchParty/LaunchParty.cs b/Assets/Scripts/Games/LaunchParty/LaunchParty.cs
index c7c39569..b4e03000 100644
--- a/Assets/Scripts/Games/LaunchParty/LaunchParty.cs
+++ b/Assets/Scripts/Games/LaunchParty/LaunchParty.cs
@@ -9,7 +9,7 @@ namespace HeavenStudio.Games.Loaders
public static class RvlRocketLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("launch party", "Launch Party \n[WIP don't use]", "000000", false, false, new List()
+ return new Minigame("launch party", "Launch Party \n[WIP]", "000000", false, false, new List()
{
});
}
diff --git a/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs b/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs
index c1215323..25b567e0 100644
--- a/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs
+++ b/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs
@@ -9,7 +9,7 @@ namespace HeavenStudio.Games.Loaders
public static class PcoSomenLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("rhythmSomen", "Rhythm Sōmen \n[WIP don't use]", "000000", false, false, new List()
+ return new Minigame("rhythmSomen", "Rhythm Sōmen", "000000", false, false, new List()
{
new GameAction("crane (far)", delegate { RhythmSomen.instance.DoFarCrane(eventCaller.currentEntity.beat); }, 4.0f, false),
new GameAction("crane (close)", delegate { RhythmSomen.instance.DoCloseCrane(eventCaller.currentEntity.beat); }, 3.0f, false),
diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
index 4180189c..f01cc41f 100644
--- a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
+++ b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
@@ -12,7 +12,7 @@ namespace HeavenStudio.Games.Loaders
public static class NtrSamuraiLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("samuraiSliceNtr", "Samurai Slice (DS) \n[WIP]", "00165D", false, false, new List()
+ return new Minigame("samuraiSliceNtr", "Samurai Slice (DS)", "00165D", false, false, new List()
{
new GameAction("spawn object", delegate
{
diff --git a/Assets/Scripts/Games/TapTrial/TapTrial.cs b/Assets/Scripts/Games/TapTrial/TapTrial.cs
index 2185cb81..eb98da2e 100644
--- a/Assets/Scripts/Games/TapTrial/TapTrial.cs
+++ b/Assets/Scripts/Games/TapTrial/TapTrial.cs
@@ -10,7 +10,7 @@ namespace HeavenStudio.Games.Loaders
public static class AgbTapLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("tapTrial", "Tap Trial \n[WIP don't use]", "93ffb3", false, false, new List()
+ return new Minigame("tapTrial", "Tap Trial \n[WIP]", "93ffb3", false, false, new List()
{
new GameAction("tap", delegate { TapTrial.instance.Tap(eventCaller.currentEntity.beat); }, 2.0f, false),
new GameAction("double tap", delegate { TapTrial.instance.DoubleTap(eventCaller.currentEntity.beat); }, 2.0f, false),
diff --git a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs b/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs
index 6d31b5b3..c1a79047 100644
--- a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs
+++ b/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs
@@ -10,7 +10,7 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
- return new Minigame("tram&Pauline", "Tram&Pauline \n[WIP don't use]", "000000", false, false, new List()
+ return new Minigame("tram&Pauline", "Tram & Pauline \n[WIP don't use]", "000000", false, false, new List()
{
new GameAction("curtains", delegate { TramAndPauline.instance.Curtains(eventCaller.currentEntity.beat); }, 0.5f),
new GameAction("SFX", delegate { var e = eventCaller.currentEntity; TramAndPauline.instance.SFX(e.beat, e.toggle); }, 2.5f, false, new List()
diff --git a/Assets/Scripts/Games/TrickClass/TrickClass.cs b/Assets/Scripts/Games/TrickClass/TrickClass.cs
index 14808296..8d40c21e 100644
--- a/Assets/Scripts/Games/TrickClass/TrickClass.cs
+++ b/Assets/Scripts/Games/TrickClass/TrickClass.cs
@@ -13,7 +13,7 @@ namespace HeavenStudio.Games.Loaders
public static class MobTrickLoader
{
public static Minigame AddGame(EventCaller eventCaller) {
- return new Minigame("trickClass", "Trick on the Class\n[WIP]", "C0171D", false, false, new List()
+ return new Minigame("trickClass", "Trick on the Class", "C0171D", false, false, new List()
{
new GameAction("toss", delegate
{
From 93f524496950733ad7fa98da7ecf11be797a3ff2 Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Tue, 26 Jul 2022 18:04:02 -0500
Subject: [PATCH 4/8] move flash to VFX
---
Assets/Scripts/Minigames.cs | 43 +++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 11 deletions(-)
diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index 0ae3b5e6..523d5283 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -219,7 +219,17 @@ namespace HeavenStudio
new GameAction("switchGame", delegate { GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat); }, 0.5f, inactiveFunction: delegate { GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat); }),
new GameAction("end", delegate { Debug.Log("end"); GameManager.instance.Stop(0); Timeline.instance?.SetTimeButtonColors(true, false, false);}),
new GameAction("skill star", delegate { }, 1f, true),
- new GameAction("flash", delegate
+
+ new GameAction("toggle inputs", delegate
+ {
+ GameManager.instance.ToggleInputs(eventCaller.currentEntity.toggle);
+ }, 0.5f, true, new List()
+ {
+ new Param("toggle", true, "Enable Inputs")
+ }),
+
+ // DEPRECATED! Now in VFX
+ new GameAction("flash", delegate
{
/*Color colA = eventCaller.currentEntity.colorA;
@@ -230,23 +240,15 @@ namespace HeavenStudio
GameManager.instance.fade.SetFade(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, startCol, endCol, eventCaller.currentEntity.ease);*/
- }, 1f, true, new List()
+ }, 1f, true, new List()
{
new Param("colorA", Color.white, "Start Color"),
new Param("colorB", Color.white, "End Color"),
new Param("valA", new EntityTypes.Float(0, 1, 1), "Start Opacity"),
new Param("valB", new EntityTypes.Float(0, 1, 0), "End Opacity"),
new Param("ease", EasingFunction.Ease.Linear, "Ease")
- } ),
- new GameAction("toggle inputs", delegate
- {
- GameManager.instance.ToggleInputs(eventCaller.currentEntity.toggle);
- }, 0.5f, true, new List()
- {
- new Param("toggle", true, "Enable Inputs")
- }),
+ }, hidden: true ),
- // DEPRECATED! Now in VFX
new GameAction("move camera", delegate
{
}, 1f, true, new List()
@@ -308,6 +310,25 @@ namespace HeavenStudio
}),
new Minigame("vfx", "Visual Effects", "", false, true, new List()
{
+ new GameAction("flash", delegate
+ {
+
+ /*Color colA = eventCaller.currentEntity.colorA;
+ Color colB = eventCaller.currentEntity.colorB;
+
+ Color startCol = new Color(colA.r, colA.g, colA.b, eventCaller.currentEntity.valA);
+ Color endCol = new Color(colB.r, colB.g, colB.b, eventCaller.currentEntity.valB);
+
+ GameManager.instance.fade.SetFade(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, startCol, endCol, eventCaller.currentEntity.ease);*/
+
+ }, 1f, true, new List()
+ {
+ new Param("colorA", Color.white, "Start Color"),
+ new Param("colorB", Color.white, "End Color"),
+ new Param("valA", new EntityTypes.Float(0, 1, 1), "Start Opacity"),
+ new Param("valB", new EntityTypes.Float(0, 1, 0), "End Opacity"),
+ new Param("ease", EasingFunction.Ease.Linear, "Ease")
+ } ),
new GameAction("move camera", delegate
{
//TODO: move cam
From 774bbea916949afc13bc75d960a85191cafe5a3f Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Tue, 26 Jul 2022 18:19:05 -0500
Subject: [PATCH 5/8] Update TramAndPauline.cs
---
Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs b/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs
index c1a79047..abc5b749 100644
--- a/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs
+++ b/Assets/Scripts/Games/Tram&Pauline/TramAndPauline.cs
@@ -10,7 +10,7 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
- return new Minigame("tram&Pauline", "Tram & Pauline \n[WIP don't use]", "000000", false, false, new List()
+ return new Minigame("tram&Pauline", "Tram & Pauline \n[WIP]", "000000", false, false, new List()
{
new GameAction("curtains", delegate { TramAndPauline.instance.Curtains(eventCaller.currentEntity.beat); }, 0.5f),
new GameAction("SFX", delegate { var e = eventCaller.currentEntity; TramAndPauline.instance.SFX(e.beat, e.toggle); }, 2.5f, false, new List()
From aa9379e21e3195f8f2772d57979aa63e16de3a5a Mon Sep 17 00:00:00 2001
From: ThatZeoMan <