Merge pull request #11 from defvs/mods-addition

Mods addition: "No Regen" and "Damage Multiplier"
EVAST9919 · Sep 20, 2022 · d2f2801 · d2f2801
2 parents c4fdf89 + 1d0feb9
commit d2f2801
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModDamageMultiplier.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModDamageMultiplier.cs
@@ -0,0 +1,39 @@
+using System;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Touhosu.Scoring;
+
+namespace osu.Game.Rulesets.Touhosu.Mods
+{
+    public class TouhosuModDamageMultiplier : Mod, IApplicableToHealthProcessor
+    {
+        public override double ScoreMultiplier => 1.0;
+
+        public override string Name => "Damage Multiplier";
+        public override string Acronym => "DM";
+        public override IconUsage? Icon => OsuIcon.ModHardRock;
+        public override ModType Type => ModType.DifficultyIncrease;
+        public override LocalisableString Description => "Bullet hits hurt more!";
+        public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            ((TouhosuHealthProcessor)healthProcessor).LossMultiplier = DamageMultiplier.Value;
+        }
+
+        [SettingSource("Damage increase", "Multiplier to damage taken when hitting a projectile")]
+        public BindableNumber<double> DamageMultiplier { get; } = new BindableDouble
+        {
+            MinValue = 1.1,
+            MaxValue = 5,
+            Default = 3,
+            Value = 3,
+            Precision = 0.1
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModHidden.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModHidden.cs
@@ -1,7 +1,7 @@
-using osu.Game.Rulesets.Touhosu.Objects.Drawables;
+using osu.Framework.Localisation;
+using osu.Game.Rulesets.Touhosu.Objects.Drawables;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Framework.Localisation;
 
 namespace osu.Game.Rulesets.Touhosu.Mods
 {

diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModNoRegen.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModNoRegen.cs
@@ -0,0 +1,26 @@
+using System;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Touhosu.Scoring;
+
+namespace osu.Game.Rulesets.Touhosu.Mods
+{
+    public class TouhosuModNoRegen : Mod, IApplicableToHealthProcessor
+    {
+        public override double ScoreMultiplier => 1.0;
+        public override string Name => "No Regen";
+        public override string Acronym => "NR";
+        public override IconUsage? Icon => OsuIcon.HeartBreak;
+        public override ModType Type => ModType.DifficultyIncrease;
+        public override LocalisableString Description => "No health regeneration.";
+        public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            ((TouhosuHealthProcessor)healthProcessor).NoRegen = true;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModSuddenDeath.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModSuddenDeath.cs
@@ -1,8 +1,10 @@
-using osu.Game.Rulesets.Mods;
+using System;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Touhosu.Mods
 {
     public class TouhosuModSuddenDeath : ModSuddenDeath
     {
+        public override Type[] IncompatibleMods => new[] { typeof(TouhosuModNoRegen), typeof(TouhosuModDamageMultiplier) };
     }
 }
diff --git a/osu.Game.Rulesets.Touhosu/Scoring/TouhosuHealthProcessor.cs b/osu.Game.Rulesets.Touhosu/Scoring/TouhosuHealthProcessor.cs
@@ -1,8 +1,31 @@
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Touhosu.Scoring
 {
     public class TouhosuHealthProcessor : HealthProcessor
     {
+        public bool NoRegen { get; set; }
+
+        public double LossMultiplier { get; set; } = 1.0;
+
+        protected override double GetHealthIncreaseFor(JudgementResult result)
+        {
+            double adjustment = 1.0;
+
+            switch (result.Type)
+            {
+                case HitResult.Perfect:
+                    if (NoRegen)
+                        adjustment = 0;
+                    break;
+
+                case HitResult.Miss:
+                    adjustment *= LossMultiplier;
+                    break;
+            }
+
+            return base.GetHealthIncreaseFor(result) * adjustment;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Touhosu/TouhosuRuleset.cs b/osu.Game.Rulesets.Touhosu/TouhosuRuleset.cs
@@ -73,6 +73,8 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                 case ModType.DifficultyIncrease:
                     return new Mod[]
                     {
+                        new TouhosuModDamageMultiplier(),
+                        new TouhosuModNoRegen(),
                         new TouhosuModSuddenDeath(),
                         new MultiMod(new TouhosuModDoubleTime(), new TouhosuModNightcore()),
                         new TouhosuModHidden()

diff --git a/osu.Game.Rulesets.Touhosu/UI/TouhosuPlayfield.cs b/osu.Game.Rulesets.Touhosu/UI/TouhosuPlayfield.cs
@@ -13,7 +13,6 @@
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Touhosu.Objects;
 using osu.Game.Rulesets.Touhosu.Objects.Drawables;
-using osu.Game.Rulesets.Touhosu.Extensions;
 
 namespace osu.Game.Rulesets.Touhosu.UI
 {