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

Jump to bottom

Add "transform" mod #3140

Merged

peppy merged 34 commits into ppy:master from miterosan:ArrangeMod

Sep 14, 2018

Contributor

miterosan commented Jul 30, 2018 •

edited by smoogipoo

The implements the arrange mod.

This mod moves the hitobjects into place when they appear. The is based on the peppys wtf branch.

https://youtu.be/bISGxVBq_PI

Depends on Split out mods category sections #3150.

miterosan and others added 3 commits

July 30, 2018 11:34


          Implement the arrange mod.

23a37d0


          Add comments and clean up code.

4d306ef


          Merge branch 'master' into ArrangeMod

10d444e

smoogipoo added ruleset/osu! area:mods labels

smoogipoo added this to the Candidate Issues milestone

Sponsor Member

peppy commented Jul 31, 2018

Please fix CI issues and classify this under "Fun" after #3150 is merged.

miterosan added 7 commits

August 4, 2018 00:21


          Merge branch 'master' of https://github.com/ppy/osu into ArrangeMod

3457bc0


          The arrange mod is not ranked I think.

5bb12b5


          Put the arrange mod into the fun section.

67c64ac


          Merge branch 'ArrangeMod' of https://github.com/miterosan/osu into Ar…

f76b100

…rangeMod


          Add license header

159ce8e


          remove space.

25791b6


          remove default value init .-.

546bdf0

Contributor Author

miterosan commented Aug 4, 2018

done

Joehuu reviewed

View reviewed changes

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                      public override string ShortenedName => "Arrange";
+                      public override FontAwesome Icon => FontAwesome.fa_arrows;
+                      public override ModType Type => ModType.Fun;
+                      public override string Description => "Everything rotates. EVERYTHING";

This comment was marked as off-topic.

Sign in to view

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                      public override FontAwesome Icon => FontAwesome.fa_arrows;
+                      public override ModType Type => ModType.Fun;
+                      public override string Description => "Everything rotates. EVERYTHING";
+                      public override double ScoreMultiplier => 1.05;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                  internal class OsuModArrange : Mod, IApplicableToDrawableHitObjects
+                  {
+                      public override string Name => "Arrange";
+                      public override string ShortenedName => "Arrange";

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

peppy reviewed

View reviewed changes

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                          using (drawable.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimeFadeIn - pre_time_offset, true))
+                          {
+                              drawable
+                                  .MoveToOffset(new Vector2((float)Math.Cos(theta), (float)Math.Sin(theta)) * 250)

This comment was marked as off-topic.

Sign in to view

peppy reviewed

View reviewed changes

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                          // avoiding that the player can see the abroupt move.
+                          const int pre_time_offset = 1000;
+                          using (drawable.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimeFadeIn - pre_time_offset, true))

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

miterosan added 7 commits

August 5, 2018 15:10


          move the 250 appear disance to a const var.

f02d1f9


          Add missing ;

876d410


          Swtich order of the moveto and the movetooffset.

d32ffc1


          add a period after EVERYTHING

7653ce8


          Reset the ScoreMultiplier to 1

8ad8c2b


          Use timepreempt and put appeartime and move duration into their own v…

d1ffb7c

…ars.


          remove nl and add comment for -1 and +1

89a18e4

smoogipoo removed this from the Candidate Issues milestone


          Merge branch 'master' into ArrangeMod

82054cd

Contributor Author

miterosan commented Aug 14, 2018

This is ready for review.

smoogipoo previously requested changes

View reviewed changes

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated


		Vector2 originalPosition = drawable.Position;

		const float appear_distance = 250;

This comment was marked as off-topic.

Sign in to view

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                  internal class OsuModArrange : Mod, IApplicableToDrawableHitObjects
+                  {
+                      public override string Name => "Arrange";
+                      public override string ShortenedName => "Arrange";

This comment was marked as off-topic.

Sign in to view

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                      public override FontAwesome Icon => FontAwesome.fa_arrows;
+                      public override ModType Type => ModType.Fun;
+                      public override string Description => "Everything rotates. EVERYTHING.";
+                      public override double ScoreMultiplier => 1;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

osu.Game.Rulesets.Osu/Mods/OsuModArrange.cs Outdated

+                          var hitObject = (OsuHitObject) drawable.HitObject;
+                          // repeat points get their position data from the slider.
+                          if (hitObject is RepeatPoint)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

zachllogan commented Aug 21, 2018

Follow points don't move at all, but appear in place (normal behavior), which is kind of jarring, at least for me.

Contributor Author

miterosan commented Aug 21, 2018

@zachllogan Modifying the behaviour of followpoints is not that easily possible, sadly.

miterosan added 6 commits

August 22, 2018 20:46


          Only affect hitcicles, slider and spinner

d070a3e


          only affect spinner, hitcircle and slider and nothing else.

c374755


          rename arrange to transform

173d12c


          Rename the mod class to transform.

5c5191b


          Merge branch 'ArrangeMod' of https://github.com/miterosan/osu into Ar…

957a026

…rangeMod


          correct the namings and styling

6600f7b

miterosan changed the title ~~Arrange mod~~ Transform mod


          remove empty object ctar args

0a48f8e

Contributor Author

miterosan commented Aug 24, 2018 •

edited

Do not affect an nested hitobject
Rename to transform, TR
dynamic appear distance

miterosan and others added 4 commits

August 24, 2018 22:23


          Only apply the transformation once and make the distance and theta dy…

8112a51

…namic.


          Remove unessesary nl

8b016f0


          remove not needed usings

726a510


          Merge branch 'master' into ArrangeMod

34c42ae

peppy reviewed

View reviewed changes

Sponsor Member

peppy left a comment

This is looking pretty good to merge. Only remaining issue I can see is that follow points feel a bit weird as they are still in their static positions.

I'm fine to get this in without that being resolved, though.

osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs Outdated

+                              Vector2 appearOffset = new Vector2((float)Math.Cos(theta), (float)Math.Sin(theta)) * appearDistance;
+                              //the - 1 and + 1 prevents the hit explosion to appear in the wrong position.
+                              double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

peppy dismissed smoogipoo’s stale review

September 4, 2018 17:39

resolved

miterosan and others added 4 commits

September 5, 2018 21:09


          Correct the comment from explosion to object

4c42d40


          Merge branch 'master' into ArrangeMod

214fa47


          Merge branch 'master' into ArrangeMod

da8b838


          Merge remote-tracking branch 'upstream/master' into ArrangeMod

14c2aec

peppy changed the title ~~Transform mod~~ Add "transform" mod

peppy approved these changes

View reviewed changes


          Merge branch 'master' into ArrangeMod

328de07

peppy merged commit 7a2d83d into ppy:master

miterosan deleted the ArrangeMod branch

February 15, 2019 21:57

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment