Skip to content

Changes for EngineContainer generics rework #1560

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
Supersonicboss1 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Changes for EngineContainer generics rework #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Assets/Script/Gameplay/HUD/UnisonBonus/UnisonDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private void SubscribeToEngineEvents(EngineManager.EngineContainer engineContain
{
int engineId = engineContainer.EngineId;

switch (engineContainer.Engine)
switch (engineContainer.BaseEngine)
{
case GuitarEngine guitarEngine:
GuitarEngine.NoteHitEvent guitarNoteHit =
Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/Gameplay/Player/DrumsPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ protected override DrumsEngine CreateEngine()
}

var engine = new YargDrumsEngine(NoteTrack, SyncTrack, EngineParams, Player.Profile.IsBot, Player.Profile.GameMode is GameMode.EliteDrums);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack.Instrument, NoteTrack.Difficulty, Chart, Player.RockMeterPreset);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack, Chart, Player.RockMeterPreset);

HitWindow = EngineParams.HitWindow;

Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/Gameplay/Player/FiveFretGuitarPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ protected override GuitarEngine CreateEngine()
}

var engine = new YargFiveFretGuitarEngine(NoteTrack, SyncTrack, EngineParams, Player.Profile.IsBot);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack.Instrument, NoteTrack.Difficulty, Chart, Player.RockMeterPreset);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack, Chart, Player.RockMeterPreset);

HitWindow = EngineParams.HitWindow;

Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/Gameplay/Player/FiveLaneKeysPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ protected override FiveLaneKeysEngine CreateEngine()
}

var engine = new YargFiveLaneKeysEngine(NoteTrack, SyncTrack, EngineParams, Player.Profile.IsBot);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack.Instrument, NoteTrack.Difficulty, Chart, Player.RockMeterPreset);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack, Chart, Player.RockMeterPreset);

HitWindow = EngineParams.HitWindow;

Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/Gameplay/Player/ProKeysPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protected override ProKeysEngine CreateEngine()
}

var engine = new YargProKeysEngine(NoteTrack, SyncTrack, EngineParams, Player.Profile.IsBot);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack.Instrument, NoteTrack.Difficulty, Chart, Player.RockMeterPreset);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack, Chart, Player.RockMeterPreset);

HitWindow = EngineParams.HitWindow;

Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/Gameplay/Player/VocalsPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ protected VocalsEngine CreateEngine()
HitWindow = EngineParams.HitWindow;

var engine = new YargVocalsEngine(NoteTrack, SyncTrack, EngineParams, Player.Profile.IsBot);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack.Instrument, NoteTrack.Difficulty, Player.Profile.HarmonyIndex, _chart, Player.RockMeterPreset);
EngineContainer = GameManager.EngineManager.Register(engine, NoteTrack, Player.Profile.HarmonyIndex, _chart, Player.RockMeterPreset);

engine.OnComboIncrement += OnComboIncrement;
engine.OnComboReset += OnComboReset;
Expand Down