Skip to content

Alternate Instrumentals impact Pico/Otis Speaker Animations. #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+34 −11
Open

Alternate Instrumentals impact Pico/Otis Speaker Animations. #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6163dc
Make Alt Instrumentals impact Otis and Pico Speaker
TechnikTil Apr 24, 2025
e01c7bc
Replace Pico with Otis in otis-speaker
TechnikTil Apr 24, 2025
5c5d078
when did i change this?
TechnikTil Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions preload/scripts/characters/otis-speaker.hxc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,19 @@ class OtisSpeakerCharacter extends SparrowCharacter {
shootTimes = [];
// The tankmen's timings and directions are determined
// by the chart, specifically the internal "picospeaker" difficulty.
var animChart:SongDifficulty = PlayState.instance.currentSong.getDifficulty('picospeaker', PlayState.instance.currentVariation);
var animChart:SongDifficulty = PlayState.instance.currentSong.getDifficulty('picospeaker', PlayState.instance.currentInstrumental);
if (animChart == null)
{
trace('Initializing Otis (speaker) failed; no `picospeaker` chart found for this song.');
return;
trace('Initializing Otis (speaker) failed; no `picospeaker` chart found for this difficulty.');
animChart = PlayState.instance.currentSong.getDifficulty('picospeaker');
if (animChart == null)
{
trace('Initializing Otis (speaker) failed; no `picospeaker` chart found for this song.');
animChart = PlayState.instance.currentSong.getDifficulty('picospeaker');
return;
} else {
trace('Initializing Otis (speaker); found `picospeaker` chart, continuing...');
}
} else {
trace('Initializing Otis (speaker); found `picospeaker` chart, continuing...');
}
Expand Down
13 changes: 11 additions & 2 deletions preload/scripts/characters/pico-speaker.hxc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,19 @@ class PicoSpeakerCharacter extends SparrowCharacter {
shootTimes = [];
// The tankmen's timings and directions are determined
// by the chart, specifically the internal "picospeaker" difficulty.
var animChart:SongDifficulty = PlayState.instance.currentSong.getDifficulty('picospeaker');
var animChart:SongDifficulty = PlayState.instance.currentSong.getDifficulty('picospeaker', PlayState.instance.currentInstrumental);
if (animChart == null)
{
trace('Initializing Pico (speaker) failed; no `picospeaker` chart found for this song.');
trace('Initializing Pico (speaker) failed; no `picospeaker` chart found for this difficulty.');
animChart = PlayState.instance.currentSong.getDifficulty('picospeaker');
if (animChart == null)
{
trace('Initializing Pico (speaker) failed; no `picospeaker` chart found for this song.');
animChart = PlayState.instance.currentSong.getDifficulty('picospeaker');
return;
} else {
trace('Initializing Pico (speaker); found `picospeaker` chart, continuing...');
}
return;
} else {
trace('Initializing Pico (speaker); found `picospeaker` chart, continuing...');
Expand Down
18 changes: 12 additions & 6 deletions preload/scripts/stages/props/TankmanSpriteGroup.hxc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ class TankmanSpriteGroup extends FlxTypedSpriteGroup

var isErect:Bool = false;

var isEasterEgg:Bool = false;

function new(erect:Bool)
{
super(0, 0, 4);
Expand All @@ -41,11 +39,19 @@ class TankmanSpriteGroup extends FlxTypedSpriteGroup
tankmanTimes = [];
// The tankmen's timings and directions are determined
// by the chart, specifically the internal "picospeaker" difficulty.
var animChart:SongDifficulty = PlayState.instance.currentSong.getDifficulty('picospeaker', PlayState.instance.currentVariation);
var animChart:SongDifficulty = PlayState.instance.currentSong.getDifficulty('picospeaker', PlayState.instance.currentInstrumental);
if (animChart == null)
{
trace('Skip initializing TankmanSpriteGroup: no picospeaker chart.');
return;
trace('Skip initializing TankmanSpriteGroup: no picospeaker chart found for this difficulty.');
animChart = PlayState.instance.currentSong.getDifficulty('picospeaker');
if (animChart == null)
{
trace('Skip initializing TankmanSpriteGroup: no picospeaker chart found for this song.');
animChart = PlayState.instance.currentSong.getDifficulty('picospeaker');
return;
} else {
trace('Found picospeaker chart for TankmanSpriteGroup.');
}
} else {
trace('Found picospeaker chart for TankmanSpriteGroup.');
}
Expand All @@ -61,7 +67,7 @@ class TankmanSpriteGroup extends FlxTypedSpriteGroup
for (note in animNotes)
{
// Only one out of every 16 notes, on average, is a tankman.
if (FlxG.random.bool(1 / 16 * 100))
if (FlxG.random.bool(6.25))
{
tankmanTimes.push(note.time);
var goingRight:Bool = (note.data == 2 || note.data == 3) ? false : true;
Expand Down