Skip to content

Commit 93623ee

Browse files
jorolfjorolf
committed
update pippidon to osu-lazer v2018.1227.1
sadly multiplayer doesn't work :(
1 parent 618b53c commit 93623ee

9 files changed

+39
-43
lines changed

‎osu

Submodule osu updated 947 files

‎osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
using osu.Game.Beatmaps;
2-
using osu.Game.Rulesets.Mods;
3-
using osu.Game.Rulesets.Pippidon.Objects;
4-
using osu.Game.Rulesets.Scoring;
5-
using osu.Game.Users;
6-
using osu.Game.Rulesets.Pippidon.Replays;
7-
8-
namespace osu.Game.Rulesets.Pippidon.Mods
9-
{
10-
public class PippidonModAutoplay : ModAutoplay<PippidonObject>
11-
{
12-
protected override Score CreateReplayScore(Beatmap<PippidonObject> beatmap) => new Score
13-
{
14-
User = new User { Username = "pippidon" },
15-
Replay = new PippidonAutoGenerator(beatmap).Generate(),
16-
};
17-
}
18-
}
1+
using osu.Game.Beatmaps;
2+
using osu.Game.Rulesets.Mods;
3+
using osu.Game.Rulesets.Pippidon.Objects;
4+
using osu.Game.Users;
5+
using osu.Game.Rulesets.Pippidon.Replays;
6+
using osu.Game.Scoring;
7+
8+
namespace osu.Game.Rulesets.Pippidon.Mods
9+
{
10+
public class PippidonModAutoplay : ModAutoplay<PippidonObject>
11+
{
12+
protected override Score CreateReplayScore(Beatmap<PippidonObject> beatmap) => new Score
13+
{
14+
ScoreInfo = new ScoreInfo
15+
{
16+
User = new User { Username = "pippidon" },
17+
},
18+
Replay = new PippidonAutoGenerator(beatmap).Generate(),
19+
};
20+
}
21+
}

‎osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using osu.Framework.Graphics.Textures;
33
using osu.Framework.Graphics;
44
using osu.Game.Rulesets.Objects.Drawables;
5-
using OpenTK;
5+
using osuTK;
66
using System;
7-
using OpenTK.Graphics;
7+
using osuTK.Graphics;
88
using osu.Game.Rulesets.Scoring;
99

1010
namespace osu.Game.Rulesets.Pippidon.Objects.Drawables

‎osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using osu.Game.Beatmaps;
22
using osu.Game.Rulesets.Pippidon.Objects;
33
using osu.Game.Rulesets.Replays;
4-
using osu.Game.Users;
54
using System.Collections.Generic;
65
using System;
6+
using osu.Game.Replays;
77

88
namespace osu.Game.Rulesets.Pippidon.Replays
99
{
@@ -14,13 +14,7 @@ public class PippidonAutoGenerator : AutoGenerator<PippidonObject>
1414

1515
public PippidonAutoGenerator(Beatmap<PippidonObject> beatmap) : base(beatmap)
1616
{
17-
Replay = new Replay
18-
{
19-
User = new User
20-
{
21-
Username = @"Pippppipiddddooon",
22-
}
23-
};
17+
Replay = new Replay();
2418
}
2519

2620
public override Replay Generate()

‎osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using osu.Game.Rulesets.Replays;
33
using System.Linq;
44
using osu.Framework.Input.StateChanges;
5+
using osu.Game.Replays;
56

67
namespace osu.Game.Rulesets.Pippidon.Replays
78
{

‎osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs

+5-8
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
using osu.Game.Graphics;
44
using osu.Framework.Allocation;
55
using osu.Framework.Graphics.Sprites;
6-
using OpenTK;
6+
using osuTK;
77
using osu.Framework.Input.Bindings;
88
using osu.Game.Graphics.Containers;
99
using osu.Framework.Audio.Track;
1010
using osu.Game.Beatmaps.ControlPoints;
1111
using osu.Framework.Graphics.Containers;
1212
using osu.Framework.Graphics.Textures;
13+
using osu.Game.Rulesets.Objects.Drawables;
1314
using osu.Game.Rulesets.UI.Scrolling;
1415

1516
namespace osu.Game.Rulesets.Pippidon.UI
@@ -18,24 +19,20 @@ public class PippidonPlayfield : ScrollingPlayfield
1819
{
1920
private readonly Container content;
2021

21-
protected override Container<Drawable> Content => content;
22-
2322
private readonly PippidonContainer pippidon;
2423
public int PippidonLane => pippidon.LanePosition;
2524

2625
public PippidonPlayfield(PippidonRuleset ruleset)
2726
{
28-
VisibleTimeRange.Value = 6000;
29-
Direction.Value = ScrollingDirection.Left;
30-
31-
base.Content.AddRange(new Drawable[]
27+
AddRangeInternal(new Drawable[]
3228
{
3329
content = new Container
3430
{
3531
RelativeSizeAxes = Axes.Both,
3632
Padding = new MarginPadding { Left = 200 },
3733
Anchor = Anchor.CentreRight,
3834
Origin = Anchor.CentreRight,
35+
Child = HitObjectContainer
3936
},
4037
new LaneContainer
4138
{
@@ -97,7 +94,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint,
9794

9895
private class PippidonContainer : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
9996
{
100-
public override bool HandleKeyboardInput => true;
97+
public override bool HandleNonPositionalInput => true;
10198

10299
public int LanePosition
103100
{

‎osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
using osu.Framework.Input;
77
using osu.Framework.Graphics;
88
using osu.Game.Input.Handlers;
9+
using osu.Game.Replays;
910
using osu.Game.Rulesets.Objects.Drawables;
1011
using osu.Game.Rulesets.Pippidon.Objects.Drawables;
11-
using osu.Game.Rulesets.Replays;
1212
using osu.Game.Rulesets.Pippidon.Replays;
1313
using osu.Game.Rulesets.UI.Scrolling;
14-
using OpenTK;
1514

1615
namespace osu.Game.Rulesets.Pippidon.UI
1716
{
@@ -22,13 +21,15 @@ public class PippidonRulesetContainer : ScrollingRulesetContainer<PippidonPlayfi
2221
public PippidonRulesetContainer(PippidonRuleset ruleset, WorkingBeatmap beatmap) : base(ruleset, beatmap)
2322
{
2423
pippidonRuleset = ruleset;
24+
Direction.Value = ScrollingDirection.Left;
25+
TimeRange.Value = 6000;
2526
}
2627

2728
public override ScoreProcessor CreateScoreProcessor() => new PippidonScoreProcessor(this);
2829

2930
protected override Playfield CreatePlayfield() => new PippidonPlayfield(pippidonRuleset);
3031

31-
protected override DrawableHitObject<PippidonObject> GetVisualRepresentation(PippidonObject h)
32+
public override DrawableHitObject<PippidonObject> GetVisualRepresentation(PippidonObject h)
3233
{
3334
return new Coin(h, pippidonRuleset.TextureStore, lane => Playfield.PippidonLane == lane)
3435
{
@@ -40,7 +41,5 @@ protected override DrawableHitObject<PippidonObject> GetVisualRepresentation(Pip
4041
protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonReplayInputHandler(replay);
4142

4243
public override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo);
43-
44-
protected override Vector2 PlayfieldArea => new Vector2(1);
4544
}
4645
}

‎osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<EmbeddedResource Include="Resources\**" />
1212
</ItemGroup>
1313
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
14-
<Copy SourceFiles="$(OutDir)osu.Game.Rulesets.Pippidon.dll;$(OutDir)osu.Game.Rulesets.Pippidon.pdb" DestinationFolder="$(SolutionDir)osu/osu.Desktop/bin/$(ConfigurationName)/netcoreapp2.1" />
14+
<Copy SourceFiles="$(OutDir)osu.Game.Rulesets.Pippidon.dll;$(OutDir)osu.Game.Rulesets.Pippidon.pdb" DestinationFolder="$(SolutionDir)osu/osu.Desktop/bin/$(ConfigurationName)/netcoreapp2.2" />
1515
</Target>
1616
</Project>

‎pippidon.sln.DotSettings

+2
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
598598
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
599599
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
600600
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
601+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
601602
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
602603
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
603604
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -653,6 +654,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
653654
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
654655
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
655656
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
657+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
656658
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
657659
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
658660
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

0 commit comments

Comments
 (0)