mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Bop Block Rework

Browse source 
Bop block reworked to be a toggle. Also made a few minor tweaks to random things.
This commit is contained in:
RaffyTaffy14 2023-02-04 00:16:52 -05:00
parent 8551732920
commit a526580cf9
2 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuCrouch.anim
View file

@ -19,7 +19,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: 0, z: -80} value: {x: 0, y: 0, z: -70}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -68,7 +68,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0.7, y: -0.4, z: 0} value: {x: 0.8, y: -0.3, z: 0}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -513,7 +513,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0.7 value: 0.8
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -532,7 +532,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -0.4 value: -0.3
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136
@ -608,7 +608,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -80 value: -70
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 136 tangentMode: 136

56
Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
View file

@ -17,10 +17,10 @@ namespace HeavenStudio.Games.Loaders
function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Bop(e["toggle"], e["toggle1"]); }, function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Bop(e["toggle"], e["toggle1"]); },
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("toggle", true, "Inu Bop", "Inu Sensei bops or not."), new Param("toggle", true, "Inu Bop", "Whether Inu Sensei bops or not."),
new Param("toggle1", true, "Brothers Bop", "Sumo Brothers bop or not."), new Param("toggle1", true, "Brothers Bop", "Whether the Sumo Brothers bop or not."),
}, },
defaultLength = 1f defaultLength = 0.5f
}, },
new GameAction("crouch", "Crouch") new GameAction("crouch", "Crouch")
@ -28,8 +28,8 @@ namespace HeavenStudio.Games.Loaders
function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Crouch(e.beat, e.length, e["toggle"], e["toggle1"]); }, function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Crouch(e.beat, e.length, e["toggle"], e["toggle1"]); },
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("toggle", true, "Inu Crouch", "Inu Sensei crouches or not."), new Param("toggle", true, "Inu Crouch", "Whether Inu Sensei crouches or not."),
new Param("toggle1", true, "Brothers Crouch", "Sumo Brothers crouche or not.") new Param("toggle1", true, "Brothers Crouch", "Whether the Sumo Brothers crouch or not.")
}, },
defaultLength = 1f, defaultLength = 1f,
resizable = true resizable = true
@ -54,11 +54,22 @@ namespace HeavenStudio.Games
[Header("Components")] [Header("Components")]
[SerializeField] Animator inuSensei; [SerializeField] Animator inuSensei;
[Header("Properties")]
public bool goBopSumo;
public bool goBopInu;
public bool allowBopSumo;
public bool allowBopInu;
private float lastReportedBeat = 0f;
public static SumoBrothers instance; public static SumoBrothers instance;
// Start is called before the first frame update // Start is called before the first frame update
void Awake() void Awake()
{ {
goBopInu = true;
goBopSumo = true;
allowBopInu = true;
allowBopSumo = true;
instance = this; instance = this;
} }
@ -66,27 +77,33 @@ namespace HeavenStudio.Games
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
var cond = Conductor.instance;
if (cond.ReportBeat(ref lastReportedBeat))
{
if (goBopInu && allowBopInu)
{
inuSensei.DoScaledAnimationAsync("InuBop", 0.5f);
}
}
} }
public void Bop(bool inu, bool sumo) public void Bop(bool inu, bool sumo)
{ {
if (inu) goBopInu = inu;
{ goBopSumo = sumo;
inuSensei.DoScaledAnimationAsync("InuBop", 0.5f);
}
if (sumo)
{
}
} }
public void Crouch(float beat, float length, bool inu, bool sumo) public void Crouch(float beat, float length, bool inu, bool sumo)
{ {
allowBopInu = false;
BeatAction.New(instance.gameObject, new List<BeatAction.Action>() { BeatAction.New(instance.gameObject, new List<BeatAction.Action>() {
new BeatAction.Action(beat, delegate { if (inu) inuSensei.DoScaledAnimationAsync("InuCrouch", 0.5f); }), new BeatAction.Action(beat, delegate { if (inu == true) inuSensei.DoScaledAnimationAsync("InuCrouch", 0.5f); }),
new BeatAction.Action(beat + length, delegate { if (inu) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }) new BeatAction.Action(beat + length, delegate { allowBopInu = true; }),
new BeatAction.Action(beat + length, delegate { if (goBopInu == false) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }),
new BeatAction.Action(beat + length, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); })
}); });
} }
@ -111,11 +128,14 @@ namespace HeavenStudio.Games
MultiSound.Play(sound.ToArray()); MultiSound.Play(sound.ToArray());
allowBopInu = false;
inuSensei.DoScaledAnimationAsync("InuTweet", 0.5f);
var tweetLength = (float)loopAmount * (float)soundBeatLength - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f); var tweetLength = (float)loopAmount * (float)soundBeatLength - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f);
print(tweetLength); print(tweetLength);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>() { BeatAction.New(instance.gameObject, new List<BeatAction.Action>() {
new BeatAction.Action(beat, delegate { if (GameManager.instance.currentGame == "sumoBrothers") inuSensei.DoScaledAnimationAsync("InuTweet", 0.5f); }), new BeatAction.Action(beat + tweetLength + 1, delegate { allowBopInu = true; }),
new BeatAction.Action(beat + tweetLength + 1, delegate { if (GameManager.instance.currentGame == "sumoBrothers") inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }) new BeatAction.Action(beat + tweetLength + 1, delegate { if (goBopInu == false) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }),
new BeatAction.Action(beat + tweetLength + 1, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); })
}); });