From 93623eefcf7781bd110f0bfd415826b5f8e9f148 Mon Sep 17 00:00:00 2001 From: jorolf Date: Thu, 27 Dec 2018 15:47:25 +0100 Subject: [PATCH] update pippidon to osu-lazer v2018.1227.1 sadly multiplayer doesn't work :( --- osu | 2 +- .../Mods/PippidonMods.cs | 39 ++++++++++--------- .../Objects/Drawables/Coin.cs | 4 +- .../Replays/PippidonAutoGenerator.cs | 10 +---- .../Replays/PippidonReplayInputHandler.cs | 1 + .../UI/PippidonPlayfield.cs | 13 +++---- .../UI/PippidonRulesetContainer.cs | 9 ++--- .../osu.Game.Rulesets.Pippidon.csproj | 2 +- pippidon.sln.DotSettings | 2 + 9 files changed, 39 insertions(+), 43 deletions(-) diff --git a/osu b/osu index 5e51a50..12a93af 160000 --- a/osu +++ b/osu @@ -1 +1 @@ -Subproject commit 5e51a50658d2c3d481c05f6cf4aa7368631ee05c +Subproject commit 12a93af156df59602c1aa65890078ae2c7f574f9 diff --git a/osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs b/osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs index 4e6c65b..14cf1e9 100644 --- a/osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs +++ b/osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs @@ -1,18 +1,21 @@ -using osu.Game.Beatmaps; -using osu.Game.Rulesets.Mods; -using osu.Game.Rulesets.Pippidon.Objects; -using osu.Game.Rulesets.Scoring; -using osu.Game.Users; -using osu.Game.Rulesets.Pippidon.Replays; - -namespace osu.Game.Rulesets.Pippidon.Mods -{ - public class PippidonModAutoplay : ModAutoplay - { - protected override Score CreateReplayScore(Beatmap beatmap) => new Score - { - User = new User { Username = "pippidon" }, - Replay = new PippidonAutoGenerator(beatmap).Generate(), - }; - } -} +using osu.Game.Beatmaps; +using osu.Game.Rulesets.Mods; +using osu.Game.Rulesets.Pippidon.Objects; +using osu.Game.Users; +using osu.Game.Rulesets.Pippidon.Replays; +using osu.Game.Scoring; + +namespace osu.Game.Rulesets.Pippidon.Mods +{ + public class PippidonModAutoplay : ModAutoplay + { + protected override Score CreateReplayScore(Beatmap beatmap) => new Score + { + ScoreInfo = new ScoreInfo + { + User = new User { Username = "pippidon" }, + }, + Replay = new PippidonAutoGenerator(beatmap).Generate(), + }; + } +} diff --git a/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs b/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs index 51d8843..4c0bd2a 100644 --- a/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs +++ b/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs @@ -2,9 +2,9 @@ using osu.Framework.Graphics.Textures; using osu.Framework.Graphics; using osu.Game.Rulesets.Objects.Drawables; -using OpenTK; +using osuTK; using System; -using OpenTK.Graphics; +using osuTK.Graphics; using osu.Game.Rulesets.Scoring; namespace osu.Game.Rulesets.Pippidon.Objects.Drawables diff --git a/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs index 9f542ac..336f940 100644 --- a/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs +++ b/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs @@ -1,9 +1,9 @@ using osu.Game.Beatmaps; using osu.Game.Rulesets.Pippidon.Objects; using osu.Game.Rulesets.Replays; -using osu.Game.Users; using System.Collections.Generic; using System; +using osu.Game.Replays; namespace osu.Game.Rulesets.Pippidon.Replays { @@ -14,13 +14,7 @@ public class PippidonAutoGenerator : AutoGenerator public PippidonAutoGenerator(Beatmap beatmap) : base(beatmap) { - Replay = new Replay - { - User = new User - { - Username = @"Pippppipiddddooon", - } - }; + Replay = new Replay(); } public override Replay Generate() diff --git a/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs b/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs index 21f025c..805b6eb 100644 --- a/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs +++ b/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs @@ -2,6 +2,7 @@ using osu.Game.Rulesets.Replays; using System.Linq; using osu.Framework.Input.StateChanges; +using osu.Game.Replays; namespace osu.Game.Rulesets.Pippidon.Replays { diff --git a/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs index fa82282..6a3f81f 100644 --- a/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs +++ b/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs @@ -3,13 +3,14 @@ using osu.Game.Graphics; using osu.Framework.Allocation; using osu.Framework.Graphics.Sprites; -using OpenTK; +using osuTK; using osu.Framework.Input.Bindings; using osu.Game.Graphics.Containers; using osu.Framework.Audio.Track; using osu.Game.Beatmaps.ControlPoints; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Textures; +using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.UI.Scrolling; namespace osu.Game.Rulesets.Pippidon.UI @@ -18,17 +19,12 @@ public class PippidonPlayfield : ScrollingPlayfield { private readonly Container content; - protected override Container Content => content; - private readonly PippidonContainer pippidon; public int PippidonLane => pippidon.LanePosition; public PippidonPlayfield(PippidonRuleset ruleset) { - VisibleTimeRange.Value = 6000; - Direction.Value = ScrollingDirection.Left; - - base.Content.AddRange(new Drawable[] + AddRangeInternal(new Drawable[] { content = new Container { @@ -36,6 +32,7 @@ public PippidonPlayfield(PippidonRuleset ruleset) Padding = new MarginPadding { Left = 200 }, Anchor = Anchor.CentreRight, Origin = Anchor.CentreRight, + Child = HitObjectContainer }, new LaneContainer { @@ -97,7 +94,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, private class PippidonContainer : BeatSyncedContainer, IKeyBindingHandler { - public override bool HandleKeyboardInput => true; + public override bool HandleNonPositionalInput => true; public int LanePosition { diff --git a/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs b/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs index 77bcdbf..d595365 100644 --- a/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs +++ b/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs @@ -6,12 +6,11 @@ using osu.Framework.Input; using osu.Framework.Graphics; using osu.Game.Input.Handlers; +using osu.Game.Replays; using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Pippidon.Objects.Drawables; -using osu.Game.Rulesets.Replays; using osu.Game.Rulesets.Pippidon.Replays; using osu.Game.Rulesets.UI.Scrolling; -using OpenTK; namespace osu.Game.Rulesets.Pippidon.UI { @@ -22,13 +21,15 @@ public class PippidonRulesetContainer : ScrollingRulesetContainer new PippidonScoreProcessor(this); protected override Playfield CreatePlayfield() => new PippidonPlayfield(pippidonRuleset); - protected override DrawableHitObject GetVisualRepresentation(PippidonObject h) + public override DrawableHitObject GetVisualRepresentation(PippidonObject h) { return new Coin(h, pippidonRuleset.TextureStore, lane => Playfield.PippidonLane == lane) { @@ -40,7 +41,5 @@ protected override DrawableHitObject GetVisualRepresentation(Pip protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonReplayInputHandler(replay); public override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo); - - protected override Vector2 PlayfieldArea => new Vector2(1); } } diff --git a/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj index 85f054d..6789c71 100644 --- a/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj +++ b/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/pippidon.sln.DotSettings b/pippidon.sln.DotSettings index b3f60a0..1ff24fa 100644 --- a/pippidon.sln.DotSettings +++ b/pippidon.sln.DotSettings @@ -598,6 +598,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"><ExtraRule Prefix="_" Suffix="" Style="aaBb" /></Policy> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> @@ -653,6 +654,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame True True True + True True True True