Update framework

taulazer · Dec 14, 2019 · d768f52 · d768f52
1 parent 0a90361
commit d768f52
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/tau/osu.Game.Rulesets.tau/Scoring/tauScoreProcessor.cs b/tau/osu.Game.Rulesets.tau/Scoring/tauScoreProcessor.cs
@@ -4,21 +4,19 @@
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Tau.Objects;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Tau.Scoring
 {
-    public class TauScoreProcessor : ScoreProcessor<TauHitObject>
+    public class TauScoreProcessor : ScoreProcessor
     {
-        public TauScoreProcessor(DrawableRuleset<TauHitObject> ruleset)
-            : base(ruleset)
+        public TauScoreProcessor(IBeatmap beatmap)
+            : base(beatmap)
         {
         }
 
         private float hpDrainRate;
 
-        protected override void ApplyBeatmap(Beatmap<TauHitObject> beatmap)
+        protected override void ApplyBeatmap(IBeatmap beatmap)
         {
             base.ApplyBeatmap(beatmap);
 

diff --git a/tau/osu.Game.Rulesets.tau/UI/tauDrawableRuleset.cs b/tau/osu.Game.Rulesets.tau/UI/tauDrawableRuleset.cs
@@ -21,12 +21,12 @@ namespace osu.Game.Rulesets.Tau.UI
     [Cached]
     public class DrawabletauRuleset : DrawableRuleset<TauHitObject>
     {
-        public DrawabletauRuleset(TauRuleset ruleset, IWorkingBeatmap beatmap, IReadOnlyList<Mod> mods)
+        public DrawabletauRuleset(TauRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
         {
         }
 
-        public override ScoreProcessor CreateScoreProcessor() => new TauScoreProcessor(this);
+        public override ScoreProcessor CreateScoreProcessor() => new TauScoreProcessor(Beatmap);
 
         protected override Playfield CreatePlayfield() => new TauPlayfield();
 

diff --git a/tau/osu.Game.Rulesets.tau/osu.Game.Rulesets.tau.csproj b/tau/osu.Game.Rulesets.tau/osu.Game.Rulesets.tau.csproj
@@ -11,8 +11,8 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework" Version="2019.1112.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2019.1113.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1213.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2019.1213.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />

diff --git a/tau/osu.Game.Rulesets.tau/tauRuleset.cs b/tau/osu.Game.Rulesets.tau/tauRuleset.cs
@@ -29,7 +29,7 @@ public TauRuleset(RulesetInfo rulesetInfo = null)
 
         public override string Description => "tau";
 
-        public override DrawableRuleset CreateDrawableRulesetWith(IWorkingBeatmap beatmap, IReadOnlyList<Mod> mods) =>
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) =>
             new DrawabletauRuleset(this, beatmap, mods);
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>