From ef55a03a70d32cf4a4e31d55ff84c94eb382c324 Mon Sep 17 00:00:00 2001 From: Pennek Date: Mon, 6 Jul 2020 22:06:29 +0200 Subject: [PATCH 1/6] health changes --- wiki/Beatmapping/Health/en.md | 2 +- wiki/Glossary/Health_Bar/en.md | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 wiki/Glossary/Health_Bar/en.md diff --git a/wiki/Beatmapping/Health/en.md b/wiki/Beatmapping/Health/en.md index bf5ed9c68558..d5410b6bda4c 100644 --- a/wiki/Beatmapping/Health/en.md +++ b/wiki/Beatmapping/Health/en.md @@ -8,7 +8,7 @@ tags: # Health -**Health**, or *HP*, is the value that determines if a player has passed or failed a [beatmap](/wiki/Beatmaps). Health can be seen in the health bar, which updates as gameplay progresses. The [HP drain rate](/wiki/Beatmapping/HP_drain_rate) difficulty setting determines how difficult it is to keep a high health value. +**Health** or *HP*, is the value that determines if a player has passed or failed a [beatmap](/wiki/Beatmaps). Health can be seen in the [health bar](/wiki/Glossary/Health_Bar/en.md), which updates as gameplay progresses. The [HP drain rate](/wiki/Beatmapping/HP_drain_rate) difficulty setting determines how difficult it is to keep a high health value. ## osu!standard diff --git a/wiki/Glossary/Health_Bar/en.md b/wiki/Glossary/Health_Bar/en.md new file mode 100644 index 000000000000..79bc2134cdd3 --- /dev/null +++ b/wiki/Glossary/Health_Bar/en.md @@ -0,0 +1,20 @@ +--- +tags: + - life + - life bar + - hp bar +--- + +# Health bar + +*For Health as a mechanic, see: [Health](/wiki/Beatmapping/Health/en.md)* + +The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health/en.md). In all [game modes](/wiki/Game_Modes/) expect for [osu!mania](/wiki/Game_Modes/osu!mania), there is an indicator moving along it, showing a player's current health. If the bar drains completely the player fails the current [beatmap](/wiki/Beatmaps/) (assuming no special game modifiers are enabled). + +In [osu!standard](/wiki/Game_Modes/osu!), [osu!catch](/wiki/Game_Modes/osu!catch), and [osu!taiko](/wiki/Game_Modes/osu!taiko) the health bar is displayed in the top-left corner of the screen. In osu!mania it is rotated 90 degrees,counterclockwise and is placed to the right of the playfield. + +In osu!standard and osu!catch, the healthbar will drain at a constant rate throughout the course of a beatmap, with the exception of breaks. This effect is known as [health drain](/wiki/Beatmapping/Health_drain/). + + + + \ No newline at end of file From c1b85942ee3ffc9285b9172ff0539a50f52afc99 Mon Sep 17 00:00:00 2001 From: Pennek Date: Mon, 6 Jul 2020 22:42:06 +0200 Subject: [PATCH 2/6] add articles --- wiki/Glossary/Health_Bar/en.md | 2 +- wiki/Glossary/Lead-in/en.md | 12 ++++++++++++ wiki/Glossary/Local_Song_Offset/en.md | 18 ++++++++++++++++++ wiki/Glossary/Loved/en.md | 14 ++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 wiki/Glossary/Lead-in/en.md create mode 100644 wiki/Glossary/Local_Song_Offset/en.md create mode 100644 wiki/Glossary/Loved/en.md diff --git a/wiki/Glossary/Health_Bar/en.md b/wiki/Glossary/Health_Bar/en.md index 79bc2134cdd3..bf52cdc8820a 100644 --- a/wiki/Glossary/Health_Bar/en.md +++ b/wiki/Glossary/Health_Bar/en.md @@ -17,4 +17,4 @@ In osu!standard and osu!catch, the healthbar will drain at a constant rate throu - \ No newline at end of file + diff --git a/wiki/Glossary/Lead-in/en.md b/wiki/Glossary/Lead-in/en.md new file mode 100644 index 000000000000..9afc3322734b --- /dev/null +++ b/wiki/Glossary/Lead-in/en.md @@ -0,0 +1,12 @@ +--- +tags: + - leadin +--- + +# Lead-in + +The **lead-in** is a 3 second period of silence which is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps/). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a mapper has placed them close to the start of the song. + + + + diff --git a/wiki/Glossary/Local_Song_Offset/en.md b/wiki/Glossary/Local_Song_Offset/en.md new file mode 100644 index 000000000000..72a00d3004e1 --- /dev/null +++ b/wiki/Glossary/Local_Song_Offset/en.md @@ -0,0 +1,18 @@ +# Local Song Offset + +*For offset while beatmapping, see: [Offset](/wiki/Beatmapping/Offset/)* + +**Local song offset** is an offset which moves the appearance of [hit objects](/wiki/Hit_object/) in relation to the audio of individual [beatmaps](/wiki/beatmaps). This can be helpful for players who experience auditory or visual delays. Local song offset works alongside the global offset to calculate a total offset. + +At the start of gameplay, the local song offset can be changed by pressing: + +- `+` to increase the offset by 5 milliseconds +- `-` to decrease the offset by 5 milliseconds +- `Alt` + `+` to increase the offset by 1 milliseconds +- `Alt` + `-` to decrease the offset by 1 milliseconds + +If a local offset is defined, osu! will display the local offset in the interface above the scoreboard. osu! will also notify you of the local offset before starting gameplay. + + + + diff --git a/wiki/Glossary/Loved/en.md b/wiki/Glossary/Loved/en.md new file mode 100644 index 000000000000..c6166c602cfa --- /dev/null +++ b/wiki/Glossary/Loved/en.md @@ -0,0 +1,14 @@ +--- +tags: + - heart +--- + +# Loved + +**Loved** is a state given to [beatmaps](/wiki/Beatmaps/) that don't follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not contribute to their [performance points](/wiki/Performance_Points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category (this usually only happens on the creator's request). + +Loved beatmaps use the heart icon ![](/wiki/shared/status/loved.png) in the song selection screen, and are regularly added through [Project Loved](/wiki/Project_Loved/) which is handled by the [Project Loved Team](/wiki/People/The_Team/Project_Loved_Team/en.md). + + + + From a45ffbc5948ee3ec514d3800b5ecf430f49a57e7 Mon Sep 17 00:00:00 2001 From: Pennek Date: Mon, 6 Jul 2020 23:32:34 +0200 Subject: [PATCH 3/6] m --- wiki/Beatmaps/Marathon/en.md | 15 +++++++++++++++ wiki/Modding/Mod_For_Mod/en.md | 16 ++++++++++++++++ wiki/Modding/Mod_Request/en.md | 7 +++++++ wiki/Modding/Modder/en.md | 7 +++++++ 4 files changed, 45 insertions(+) create mode 100644 wiki/Beatmaps/Marathon/en.md create mode 100644 wiki/Modding/Mod_For_Mod/en.md create mode 100644 wiki/Modding/Mod_Request/en.md create mode 100644 wiki/Modding/Modder/en.md diff --git a/wiki/Beatmaps/Marathon/en.md b/wiki/Beatmaps/Marathon/en.md new file mode 100644 index 000000000000..98e7a99dc7a8 --- /dev/null +++ b/wiki/Beatmaps/Marathon/en.md @@ -0,0 +1,15 @@ +# Marathon + +**Marathon** [beatmaps](/wiki/Beatmaps) are beatmaps which are 5 minutes or longer. They are often collaborative efforts, as mapping longer songs can be tiring when done alone. + +## History + +When marathon beatmaps were first introduced they had to be at least 6 minutes long and could only include a single difficulty (with one exception; each beatmapset could include a single [osu!taiko](/wiki/Game_Modes/osu!taiko) difficulty as well). + +They also had to be named "Marathon" to bypass the Beatmap Submission System at the time and prevent the beatmapset from entering the Pending category. Upon ranking, marathon beatmaps would enter the Approved category instead of the Ranked category to signal that these were marathon maps. This category was later abandoned in favor of the Ranked category. + +Marathon maps were later changed to include maps with 5 minute drain times and allowing custom difficulty naming. This lasted up until the more lenient spread rules were introduced in 2019. + + + + diff --git a/wiki/Modding/Mod_For_Mod/en.md b/wiki/Modding/Mod_For_Mod/en.md new file mode 100644 index 000000000000..f335a1b53182 --- /dev/null +++ b/wiki/Modding/Mod_For_Mod/en.md @@ -0,0 +1,16 @@ +--- +tags: + - m4m +--- + +# Mod for mod + +**Mod for mod** (also known as *M4M*) is a term that describes a trade between multiple users. It requires each user to [mod](/wiki/Modding/) the other's [beatmap](/wiki/Beatmaps). + +This term is usually found on the [forums](https://osu.ppy.sh/community/forums/60) where users review each other's maps, but may also be found on user profiles and external sites. + +Mod for mods have historically been favoured over regular mods since both parties benefit from this deal, though have become less common in recent years. + + + + diff --git a/wiki/Modding/Mod_Request/en.md b/wiki/Modding/Mod_Request/en.md new file mode 100644 index 000000000000..90d7ae6cd3ee --- /dev/null +++ b/wiki/Modding/Mod_Request/en.md @@ -0,0 +1,7 @@ +# Mod Request + +A **mod request** is a term used when a beatmapper is in need of help and wants to improve their [beatmap](/wiki/Beatmaps/). This can be done in a multitude of ways but is most commonly done by requesting a normal mod or [mod for mod](/wiki/Modding/Mod_For_Mod/) in one of the [forum modding queues](https://osu.ppy.sh/community/forums/60). Once the mod request has been accepted the [modding](/wiki/Modding/) process starts and the beatmap will be checked for potential mistakes and improvements. + + + + diff --git a/wiki/Modding/Modder/en.md b/wiki/Modding/Modder/en.md new file mode 100644 index 000000000000..7d6b1508f280 --- /dev/null +++ b/wiki/Modding/Modder/en.md @@ -0,0 +1,7 @@ +# Modder + +A **modder** is a user who helps other users improve their [beatmaps](/wiki/) through [modding](/wiki/Modding/). Successful posts on a beatmap discussion awards the modder Kudosu! which can be seen on the user's profile page. + + + + From 48c22d02ab9e4e4997c7ea21af1e7577dcfc34fb Mon Sep 17 00:00:00 2001 From: Pennek <20502902+Pennek@users.noreply.github.com> Date: Thu, 9 Jul 2020 23:42:23 +0200 Subject: [PATCH 4/6] remove trailing slashes --- wiki/Beatmapping/Health/en.md | 2 +- wiki/Glossary/Health_Bar/en.md | 6 +++--- wiki/Glossary/Lead-in/en.md | 2 +- wiki/Glossary/Local_Song_Offset/en.md | 4 ++-- wiki/Glossary/Loved/en.md | 4 ++-- wiki/Modding/Mod_For_Mod/en.md | 2 +- wiki/Modding/Mod_Request/en.md | 2 +- wiki/Modding/Modder/en.md | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wiki/Beatmapping/Health/en.md b/wiki/Beatmapping/Health/en.md index d5410b6bda4c..a098e0d04b70 100644 --- a/wiki/Beatmapping/Health/en.md +++ b/wiki/Beatmapping/Health/en.md @@ -8,7 +8,7 @@ tags: # Health -**Health** or *HP*, is the value that determines if a player has passed or failed a [beatmap](/wiki/Beatmaps). Health can be seen in the [health bar](/wiki/Glossary/Health_Bar/en.md), which updates as gameplay progresses. The [HP drain rate](/wiki/Beatmapping/HP_drain_rate) difficulty setting determines how difficult it is to keep a high health value. +**Health** or *HP*, is the value that determines if a player has passed or failed a [beatmap](/wiki/Beatmaps). Health can be seen in the [health bar](/wiki/Glossary/Health_Bar), which updates as gameplay progresses. The [HP drain rate](/wiki/Beatmapping/HP_drain_rate) difficulty setting determines how difficult it is to keep a high health value. ## osu!standard diff --git a/wiki/Glossary/Health_Bar/en.md b/wiki/Glossary/Health_Bar/en.md index bf52cdc8820a..d56f7a505fcd 100644 --- a/wiki/Glossary/Health_Bar/en.md +++ b/wiki/Glossary/Health_Bar/en.md @@ -7,13 +7,13 @@ tags: # Health bar -*For Health as a mechanic, see: [Health](/wiki/Beatmapping/Health/en.md)* +*For Health as a mechanic, see: [Health](/wiki/Beatmapping/Health)* -The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health/en.md). In all [game modes](/wiki/Game_Modes/) expect for [osu!mania](/wiki/Game_Modes/osu!mania), there is an indicator moving along it, showing a player's current health. If the bar drains completely the player fails the current [beatmap](/wiki/Beatmaps/) (assuming no special game modifiers are enabled). +The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health). In all [game modes](/wiki/Game_Modes) expect for [osu!mania](/wiki/Game_Modes/osu!mania), there is an indicator moving along it, showing a player's current health. If the bar drains completely the player fails the current [beatmap](/wiki/Beatmaps) (assuming no special game modifiers are enabled). In [osu!standard](/wiki/Game_Modes/osu!), [osu!catch](/wiki/Game_Modes/osu!catch), and [osu!taiko](/wiki/Game_Modes/osu!taiko) the health bar is displayed in the top-left corner of the screen. In osu!mania it is rotated 90 degrees,counterclockwise and is placed to the right of the playfield. -In osu!standard and osu!catch, the healthbar will drain at a constant rate throughout the course of a beatmap, with the exception of breaks. This effect is known as [health drain](/wiki/Beatmapping/Health_drain/). +In osu!standard and osu!catch, the healthbar will drain at a constant rate throughout the course of a beatmap, with the exception of breaks. This effect is known as [health drain](/wiki/Beatmapping/Health_drain). diff --git a/wiki/Glossary/Lead-in/en.md b/wiki/Glossary/Lead-in/en.md index 9afc3322734b..c1997d2e9b79 100644 --- a/wiki/Glossary/Lead-in/en.md +++ b/wiki/Glossary/Lead-in/en.md @@ -5,7 +5,7 @@ tags: # Lead-in -The **lead-in** is a 3 second period of silence which is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps/). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a mapper has placed them close to the start of the song. +The **lead-in** is a 3 second period of silence which is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a mapper has placed them close to the start of the song. diff --git a/wiki/Glossary/Local_Song_Offset/en.md b/wiki/Glossary/Local_Song_Offset/en.md index 72a00d3004e1..f80d20217da5 100644 --- a/wiki/Glossary/Local_Song_Offset/en.md +++ b/wiki/Glossary/Local_Song_Offset/en.md @@ -1,8 +1,8 @@ # Local Song Offset -*For offset while beatmapping, see: [Offset](/wiki/Beatmapping/Offset/)* +*For offset while beatmapping, see: [Offset](/wiki/Beatmapping/Offset)* -**Local song offset** is an offset which moves the appearance of [hit objects](/wiki/Hit_object/) in relation to the audio of individual [beatmaps](/wiki/beatmaps). This can be helpful for players who experience auditory or visual delays. Local song offset works alongside the global offset to calculate a total offset. +**Local song offset** is an offset which moves the appearance of [hit objects](/wiki/Hit_object) in relation to the audio of individual [beatmaps](/wiki/beatmaps). This can be helpful for players who experience auditory or visual delays. Local song offset works alongside the global offset to calculate a total offset. At the start of gameplay, the local song offset can be changed by pressing: diff --git a/wiki/Glossary/Loved/en.md b/wiki/Glossary/Loved/en.md index c6166c602cfa..db53dfa37a98 100644 --- a/wiki/Glossary/Loved/en.md +++ b/wiki/Glossary/Loved/en.md @@ -5,9 +5,9 @@ tags: # Loved -**Loved** is a state given to [beatmaps](/wiki/Beatmaps/) that don't follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not contribute to their [performance points](/wiki/Performance_Points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category (this usually only happens on the creator's request). +**Loved** is a state given to [beatmaps](/wiki/Beatmaps) that don't follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not contribute to their [performance points](/wiki/Performance_Points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category (this usually only happens on the creator's request). -Loved beatmaps use the heart icon ![](/wiki/shared/status/loved.png) in the song selection screen, and are regularly added through [Project Loved](/wiki/Project_Loved/) which is handled by the [Project Loved Team](/wiki/People/The_Team/Project_Loved_Team/en.md). +Loved beatmaps use the heart icon ![](/wiki/shared/status/loved.png) in the song selection screen, and are regularly added through [Project Loved](/wiki/Project_Loved) which is handled by the [Project Loved Team](/wiki/People/The_Team/Project_Loved_Team). diff --git a/wiki/Modding/Mod_For_Mod/en.md b/wiki/Modding/Mod_For_Mod/en.md index f335a1b53182..b35e7d4b9404 100644 --- a/wiki/Modding/Mod_For_Mod/en.md +++ b/wiki/Modding/Mod_For_Mod/en.md @@ -5,7 +5,7 @@ tags: # Mod for mod -**Mod for mod** (also known as *M4M*) is a term that describes a trade between multiple users. It requires each user to [mod](/wiki/Modding/) the other's [beatmap](/wiki/Beatmaps). +**Mod for mod** (also known as *M4M*) is a term that describes a trade between multiple users. It requires each user to [mod](/wiki/Modding) the other's [beatmap](/wiki/Beatmaps). This term is usually found on the [forums](https://osu.ppy.sh/community/forums/60) where users review each other's maps, but may also be found on user profiles and external sites. diff --git a/wiki/Modding/Mod_Request/en.md b/wiki/Modding/Mod_Request/en.md index 90d7ae6cd3ee..055d4ac303c6 100644 --- a/wiki/Modding/Mod_Request/en.md +++ b/wiki/Modding/Mod_Request/en.md @@ -1,6 +1,6 @@ # Mod Request -A **mod request** is a term used when a beatmapper is in need of help and wants to improve their [beatmap](/wiki/Beatmaps/). This can be done in a multitude of ways but is most commonly done by requesting a normal mod or [mod for mod](/wiki/Modding/Mod_For_Mod/) in one of the [forum modding queues](https://osu.ppy.sh/community/forums/60). Once the mod request has been accepted the [modding](/wiki/Modding/) process starts and the beatmap will be checked for potential mistakes and improvements. +A **mod request** is a term used when a beatmapper is in need of help and wants to improve their [beatmap](/wiki/Beatmaps). This can be done in a multitude of ways but is most commonly done by requesting a normal mod or [mod for mod](/wiki/Modding/Mod_For_Mod) in one of the [forum modding queues](https://osu.ppy.sh/community/forums/60). Once the mod request has been accepted the [modding](/wiki/Modding) process starts and the beatmap will be checked for potential mistakes and improvements. diff --git a/wiki/Modding/Modder/en.md b/wiki/Modding/Modder/en.md index 7d6b1508f280..e5aa68dc3f5b 100644 --- a/wiki/Modding/Modder/en.md +++ b/wiki/Modding/Modder/en.md @@ -1,6 +1,6 @@ # Modder -A **modder** is a user who helps other users improve their [beatmaps](/wiki/) through [modding](/wiki/Modding/). Successful posts on a beatmap discussion awards the modder Kudosu! which can be seen on the user's profile page. +A **modder** is a user who helps other users improve their [beatmaps](/wiki/Beatmaps) through [modding](/wiki/Modding). Successful posts on a beatmap discussion awards the modder Kudosu! which can be seen on the user's profile page. From 16d77caa7ee3e55aed6005c51c5d006e96e12faf Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 09:47:04 -0500 Subject: [PATCH 5/6] Apply suggestions, cleanup, stub mark Co-authored-by: paper-toaster <66349361+paper-toaster@users.noreply.github.com> --- wiki/Beatmapping/Health/en.md | 1 + wiki/Beatmaps/Marathon/en.md | 14 ++++++----- wiki/Glossary/Health_Bar/en.md | 20 ---------------- wiki/Glossary/Health_bar/en.md | 24 +++++++++++++++++++ wiki/Glossary/Lead-in/en.md | 5 ++-- .../en.md | 10 ++++---- wiki/Glossary/Loved/en.md | 5 ++-- 7 files changed, 43 insertions(+), 36 deletions(-) delete mode 100644 wiki/Glossary/Health_Bar/en.md create mode 100644 wiki/Glossary/Health_bar/en.md rename wiki/Glossary/{Local_Song_Offset => Local_song_offset}/en.md (88%) diff --git a/wiki/Beatmapping/Health/en.md b/wiki/Beatmapping/Health/en.md index a098e0d04b70..bda166413832 100644 --- a/wiki/Beatmapping/Health/en.md +++ b/wiki/Beatmapping/Health/en.md @@ -1,4 +1,5 @@ --- +stub: true tags: - health points - hit points diff --git a/wiki/Beatmaps/Marathon/en.md b/wiki/Beatmaps/Marathon/en.md index 98e7a99dc7a8..d964362e4338 100644 --- a/wiki/Beatmaps/Marathon/en.md +++ b/wiki/Beatmaps/Marathon/en.md @@ -1,15 +1,17 @@ +--- +stub: true +--- + # Marathon -**Marathon** [beatmaps](/wiki/Beatmaps) are beatmaps which are 5 minutes or longer. They are often collaborative efforts, as mapping longer songs can be tiring when done alone. +**Marathon** is a term used to describe [beatmaps](/wiki/Beatmaps) that are five minutes in length or longer. They are often collaborative efforts, as mapping longer songs can be tiring when done alone. ## History -When marathon beatmaps were first introduced they had to be at least 6 minutes long and could only include a single difficulty (with one exception; each beatmapset could include a single [osu!taiko](/wiki/Game_Modes/osu!taiko) difficulty as well). +When marathon beatmaps were first introduced, they were originally defined to be at least *six* minutes long, and could only include a single difficulty (with the exception that each beatmapset could include a single [osu!taiko](/wiki/Game_Modes/osu!taiko) difficulty as well). -They also had to be named "Marathon" to bypass the Beatmap Submission System at the time and prevent the beatmapset from entering the Pending category. Upon ranking, marathon beatmaps would enter the Approved category instead of the Ranked category to signal that these were marathon maps. This category was later abandoned in favor of the Ranked category. +Marathon beatmaps also had to have their single difficulty be named "Marathon" to bypass the Beatmap Submission System at the time and prevent the beatmapset from entering the [Pending](/wiki/Beatmaps#Pending) category. Upon ranking, marathon beatmaps would enter the Approved category instead of the [Ranked](/wiki/Beatmaps#ranked) category to signal that these were marathon maps. The category was later abandoned in favor of the Ranked category. -Marathon maps were later changed to include maps with 5 minute drain times and allowing custom difficulty naming. This lasted up until the more lenient spread rules were introduced in 2019. +Marathon maps were later changed to include maps with five minute drain times and allowing custom difficulty naming. This lasted up until the more lenient spread rules were introduced in 2019. - - diff --git a/wiki/Glossary/Health_Bar/en.md b/wiki/Glossary/Health_Bar/en.md deleted file mode 100644 index d56f7a505fcd..000000000000 --- a/wiki/Glossary/Health_Bar/en.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -tags: - - life - - life bar - - hp bar ---- - -# Health bar - -*For Health as a mechanic, see: [Health](/wiki/Beatmapping/Health)* - -The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health). In all [game modes](/wiki/Game_Modes) expect for [osu!mania](/wiki/Game_Modes/osu!mania), there is an indicator moving along it, showing a player's current health. If the bar drains completely the player fails the current [beatmap](/wiki/Beatmaps) (assuming no special game modifiers are enabled). - -In [osu!standard](/wiki/Game_Modes/osu!), [osu!catch](/wiki/Game_Modes/osu!catch), and [osu!taiko](/wiki/Game_Modes/osu!taiko) the health bar is displayed in the top-left corner of the screen. In osu!mania it is rotated 90 degrees,counterclockwise and is placed to the right of the playfield. - -In osu!standard and osu!catch, the healthbar will drain at a constant rate throughout the course of a beatmap, with the exception of breaks. This effect is known as [health drain](/wiki/Beatmapping/Health_drain). - - - - diff --git a/wiki/Glossary/Health_bar/en.md b/wiki/Glossary/Health_bar/en.md new file mode 100644 index 000000000000..7a15ec69352c --- /dev/null +++ b/wiki/Glossary/Health_bar/en.md @@ -0,0 +1,24 @@ +--- +stub: true +tags: + - life + - life bar + - hp bar + - healthbar +--- + +# Health bar + +*For health as a mechanic, see: [Health](/wiki/Beatmapping/Health)* + +The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health). In all [game modes](/wiki/Game_Modes) expect [osu!mania](/wiki/Game_Modes/osu!mania), there is an indicator moving along the health bar that shows a player's current health. + +In [osu!standard](/wiki/Game_Modes/osu!) and [osu!catch](/wiki/Game_Modes/osu!catch), if the health bar drains completely, the player will fail the current [beatmap](/wiki/Beatmaps) (assuming no special game modifiers are enabled). + +In [osu!taiko](/wiki/Game_Modes/osu!taiko), it is impossible to fail a beatmap *during* play, but it is possible to fail after the beatmap has ended if the player has not filled the health bar enough. + +In osu!standard, osu!catch, and osu!taiko, the health bar is displayed in the top-left corner of the screen. Whereas in osu!mania, it is rotated 90 degrees counterclockwise, and is placed to the right of the playfield. + +In osu!standard and osu!catch, the health bar will drain at a constant rate throughout the course of a beatmap, with the exception of breaks. This effect is known as [health drain](/wiki/Beatmapping/Health_drain). + + diff --git a/wiki/Glossary/Lead-in/en.md b/wiki/Glossary/Lead-in/en.md index c1997d2e9b79..737e4fc61657 100644 --- a/wiki/Glossary/Lead-in/en.md +++ b/wiki/Glossary/Lead-in/en.md @@ -1,12 +1,11 @@ --- +stub: true tags: - leadin --- # Lead-in -The **lead-in** is a 3 second period of silence which is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a mapper has placed them close to the start of the song. +The **lead-in** is a three second period of silence that is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps/). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a creator has placed them close to the start of the song. - - diff --git a/wiki/Glossary/Local_Song_Offset/en.md b/wiki/Glossary/Local_song_offset/en.md similarity index 88% rename from wiki/Glossary/Local_Song_Offset/en.md rename to wiki/Glossary/Local_song_offset/en.md index f80d20217da5..623d610fa14d 100644 --- a/wiki/Glossary/Local_Song_Offset/en.md +++ b/wiki/Glossary/Local_song_offset/en.md @@ -1,8 +1,12 @@ -# Local Song Offset +--- +stub: true +--- + +# Local song offset *For offset while beatmapping, see: [Offset](/wiki/Beatmapping/Offset)* -**Local song offset** is an offset which moves the appearance of [hit objects](/wiki/Hit_object) in relation to the audio of individual [beatmaps](/wiki/beatmaps). This can be helpful for players who experience auditory or visual delays. Local song offset works alongside the global offset to calculate a total offset. +**Local song offset** is an offset which moves the appearance of [hit objects](/wiki/Hit_object) in relation to the audio of individual [beatmaps](/wiki/Beatmaps). This can be helpful for players who experience auditory or visual delays. Local song offset works alongside the global offset to calculate a total offset. At the start of gameplay, the local song offset can be changed by pressing: @@ -14,5 +18,3 @@ At the start of gameplay, the local song offset can be changed by pressing: If a local offset is defined, osu! will display the local offset in the interface above the scoreboard. osu! will also notify you of the local offset before starting gameplay. - - diff --git a/wiki/Glossary/Loved/en.md b/wiki/Glossary/Loved/en.md index db53dfa37a98..35f04b23c314 100644 --- a/wiki/Glossary/Loved/en.md +++ b/wiki/Glossary/Loved/en.md @@ -1,14 +1,13 @@ --- +stub: true tags: - heart --- # Loved -**Loved** is a state given to [beatmaps](/wiki/Beatmaps) that don't follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not contribute to their [performance points](/wiki/Performance_Points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category (this usually only happens on the creator's request). +**Loved** is a state given to [beatmaps](/wiki/Beatmapss) that do not follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not gain them any [performance points](/wiki/Performance_Points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category. This usually only happens upon the creator's request. Loved beatmaps use the heart icon ![](/wiki/shared/status/loved.png) in the song selection screen, and are regularly added through [Project Loved](/wiki/Project_Loved) which is handled by the [Project Loved Team](/wiki/People/The_Team/Project_Loved_Team). - - From 1c31df4fa1ff2fc75a7af65e35936ac1871484f8 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Wed, 2 Sep 2020 22:00:01 -0500 Subject: [PATCH 6/6] Finish the 'cleanup', update/add links, adjust wording --- wiki/Beatmapping/Health/en.md | 2 +- wiki/Beatmaps/Marathon/en.md | 4 ++-- wiki/Glossary/Health_bar/en.md | 6 +++--- wiki/Glossary/Lead-in/en.md | 3 ++- wiki/Glossary/Local_song_offset/en.md | 2 +- wiki/Glossary/Loved/en.md | 6 ++++-- wiki/Modding/Mod_Request/en.md | 7 ------- wiki/Modding/{Mod_For_Mod => Mod_for_mod}/en.md | 5 ++--- wiki/Modding/Mod_request/en.md | 9 +++++++++ wiki/Modding/Modder/en.md | 8 +++++--- 10 files changed, 29 insertions(+), 23 deletions(-) delete mode 100644 wiki/Modding/Mod_Request/en.md rename wiki/Modding/{Mod_For_Mod => Mod_for_mod}/en.md (77%) create mode 100644 wiki/Modding/Mod_request/en.md diff --git a/wiki/Beatmapping/Health/en.md b/wiki/Beatmapping/Health/en.md index 2e6065def420..d64c6749ee3a 100644 --- a/wiki/Beatmapping/Health/en.md +++ b/wiki/Beatmapping/Health/en.md @@ -9,7 +9,7 @@ tags: # Health -**Health** or *HP*, is the value that determines if a player has passed or failed a [beatmap](/wiki/Beatmaps). Health can be seen in the [health bar](/wiki/Glossary/Health_Bar), which updates as gameplay progresses. The [HP drain rate](/wiki/Beatmapping/HP_drain_rate) difficulty setting determines how difficult it is to keep a high health value. +**Health** or *HP*, is the value that determines if a player has passed or failed a [beatmap](/wiki/Beatmaps). Health can be seen in the [health bar](/wiki/Glossary/Health_bar), which updates as gameplay progresses. The [HP drain rate](/wiki/Beatmapping/HP_drain_rate) difficulty setting determines how difficult it is to keep a high health value. ## osu!standard diff --git a/wiki/Beatmaps/Marathon/en.md b/wiki/Beatmaps/Marathon/en.md index d964362e4338..5382a8970565 100644 --- a/wiki/Beatmaps/Marathon/en.md +++ b/wiki/Beatmaps/Marathon/en.md @@ -8,9 +8,9 @@ stub: true ## History -When marathon beatmaps were first introduced, they were originally defined to be at least *six* minutes long, and could only include a single difficulty (with the exception that each beatmapset could include a single [osu!taiko](/wiki/Game_Modes/osu!taiko) difficulty as well). +When marathon beatmaps were first introduced, they were originally defined to be at least *six* minutes long, and could only include a single difficulty (with the exception that each beatmapset could include a single [osu!taiko](/wiki/Game_mode/osu!taiko) difficulty as well). -Marathon beatmaps also had to have their single difficulty be named "Marathon" to bypass the Beatmap Submission System at the time and prevent the beatmapset from entering the [Pending](/wiki/Beatmaps#Pending) category. Upon ranking, marathon beatmaps would enter the Approved category instead of the [Ranked](/wiki/Beatmaps#ranked) category to signal that these were marathon maps. The category was later abandoned in favor of the Ranked category. +Marathon beatmaps also had to have their single difficulty be named "Marathon" to bypass the Beatmap Submission System at the time and prevent the beatmapset from entering the [Pending](/wiki/Beatmaps#pending) category. Upon ranking, marathon beatmaps would enter the Approved category instead of the [Ranked](/wiki/Beatmaps#ranked) category to signal that these were marathon maps. The category was later abandoned in favor of the Ranked category. Marathon maps were later changed to include maps with five minute drain times and allowing custom difficulty naming. This lasted up until the more lenient spread rules were introduced in 2019. diff --git a/wiki/Glossary/Health_bar/en.md b/wiki/Glossary/Health_bar/en.md index 7a15ec69352c..88a29bd2a16a 100644 --- a/wiki/Glossary/Health_bar/en.md +++ b/wiki/Glossary/Health_bar/en.md @@ -11,11 +11,11 @@ tags: *For health as a mechanic, see: [Health](/wiki/Beatmapping/Health)* -The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health). In all [game modes](/wiki/Game_Modes) expect [osu!mania](/wiki/Game_Modes/osu!mania), there is an indicator moving along the health bar that shows a player's current health. +The **health bar** (also known as the *HP bar*) is a bar which displays a player's remaining [health](/wiki/Beatmapping/Health). In all [game modes](/wiki/Game_mode) expect [osu!mania](/wiki/Game_mode/osu!mania), there is an indicator moving along the health bar that shows a player's current health. -In [osu!standard](/wiki/Game_Modes/osu!) and [osu!catch](/wiki/Game_Modes/osu!catch), if the health bar drains completely, the player will fail the current [beatmap](/wiki/Beatmaps) (assuming no special game modifiers are enabled). +In [osu!standard](/wiki/Game_mode/osu!) and [osu!catch](/wiki/Game_mode/osu!catch), if the health bar drains completely, the player will fail the current [beatmap](/wiki/Beatmaps) (assuming no special game modifiers are enabled). -In [osu!taiko](/wiki/Game_Modes/osu!taiko), it is impossible to fail a beatmap *during* play, but it is possible to fail after the beatmap has ended if the player has not filled the health bar enough. +In [osu!taiko](/wiki/Game_mode/osu!taiko), it is impossible to fail a beatmap *during* play, but it is possible to fail after the beatmap has ended if the player has not filled the health bar enough. In osu!standard, osu!catch, and osu!taiko, the health bar is displayed in the top-left corner of the screen. Whereas in osu!mania, it is rotated 90 degrees counterclockwise, and is placed to the right of the playfield. diff --git a/wiki/Glossary/Lead-in/en.md b/wiki/Glossary/Lead-in/en.md index 737e4fc61657..9e6ac0eb82f0 100644 --- a/wiki/Glossary/Lead-in/en.md +++ b/wiki/Glossary/Lead-in/en.md @@ -2,10 +2,11 @@ stub: true tags: - leadin + - lead in --- # Lead-in -The **lead-in** is a three second period of silence that is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps/). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a creator has placed them close to the start of the song. +The **lead-in** is a three second period of silence that is occasionally inserted at the beginning of a [beatmap](/wiki/Beatmaps). This is done to give players time to react to incoming [hit objects](/wiki/Hit_object) if a creator has placed them close to the start of the song. diff --git a/wiki/Glossary/Local_song_offset/en.md b/wiki/Glossary/Local_song_offset/en.md index 623d610fa14d..c21451a281e0 100644 --- a/wiki/Glossary/Local_song_offset/en.md +++ b/wiki/Glossary/Local_song_offset/en.md @@ -15,6 +15,6 @@ At the start of gameplay, the local song offset can be changed by pressing: - `Alt` + `+` to increase the offset by 1 milliseconds - `Alt` + `-` to decrease the offset by 1 milliseconds -If a local offset is defined, osu! will display the local offset in the interface above the scoreboard. osu! will also notify you of the local offset before starting gameplay. +If a local offset is defined, osu! will display the local offset in the interface above the scoreboard. osu! will also notify you of the local offset before starting gameplay. diff --git a/wiki/Glossary/Loved/en.md b/wiki/Glossary/Loved/en.md index 35f04b23c314..277ff9807766 100644 --- a/wiki/Glossary/Loved/en.md +++ b/wiki/Glossary/Loved/en.md @@ -6,8 +6,10 @@ tags: # Loved -**Loved** is a state given to [beatmaps](/wiki/Beatmapss) that do not follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not gain them any [performance points](/wiki/Performance_Points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category. This usually only happens upon the creator's request. +*See also: [Project Loved](/wiki/Project_Loved) and [Beatmaps ยง Loved](/wiki/Beatmaps#loved)* -Loved beatmaps use the heart icon ![](/wiki/shared/status/loved.png) in the song selection screen, and are regularly added through [Project Loved](/wiki/Project_Loved) which is handled by the [Project Loved Team](/wiki/People/The_Team/Project_Loved_Team). +**Loved** is a state given to [beatmaps](/wiki/Beatmaps) that do not follow the [ranking criteria](/wiki/Ranking_Criteria), but are considered popular enough to deserve their own leaderboards. Loved beatmaps contribute to a user's total playcount, but does not gain them any [performance points](/wiki/Performance_points). All scores on a Loved beatmap will be deleted if it moves out of the Loved category. This usually only happens upon the creator's request. + +Loved beatmaps use the heart icon ![](/wiki/shared/status/loved.png) in the song selection screen, and are regularly added through Project Loved which is handled by the [Project Loved Team](/wiki/People/The_Team/Project_Loved_Team). diff --git a/wiki/Modding/Mod_Request/en.md b/wiki/Modding/Mod_Request/en.md deleted file mode 100644 index 055d4ac303c6..000000000000 --- a/wiki/Modding/Mod_Request/en.md +++ /dev/null @@ -1,7 +0,0 @@ -# Mod Request - -A **mod request** is a term used when a beatmapper is in need of help and wants to improve their [beatmap](/wiki/Beatmaps). This can be done in a multitude of ways but is most commonly done by requesting a normal mod or [mod for mod](/wiki/Modding/Mod_For_Mod) in one of the [forum modding queues](https://osu.ppy.sh/community/forums/60). Once the mod request has been accepted the [modding](/wiki/Modding) process starts and the beatmap will be checked for potential mistakes and improvements. - - - - diff --git a/wiki/Modding/Mod_For_Mod/en.md b/wiki/Modding/Mod_for_mod/en.md similarity index 77% rename from wiki/Modding/Mod_For_Mod/en.md rename to wiki/Modding/Mod_for_mod/en.md index b35e7d4b9404..ec00718d35fc 100644 --- a/wiki/Modding/Mod_For_Mod/en.md +++ b/wiki/Modding/Mod_for_mod/en.md @@ -1,16 +1,15 @@ --- +stub: true tags: - m4m --- # Mod for mod -**Mod for mod** (also known as *M4M*) is a term that describes a trade between multiple users. It requires each user to [mod](/wiki/Modding) the other's [beatmap](/wiki/Beatmaps). +**Mod for mod** (also known as *M4M*) is a term that describes a trade between two or more creators. It requires each creator to [mod](/wiki/Modding) the other's [beatmap](/wiki/Beatmaps). This term is usually found on the [forums](https://osu.ppy.sh/community/forums/60) where users review each other's maps, but may also be found on user profiles and external sites. Mod for mods have historically been favoured over regular mods since both parties benefit from this deal, though have become less common in recent years. - - diff --git a/wiki/Modding/Mod_request/en.md b/wiki/Modding/Mod_request/en.md new file mode 100644 index 000000000000..75a27e24059a --- /dev/null +++ b/wiki/Modding/Mod_request/en.md @@ -0,0 +1,9 @@ +--- +stub: true +--- + +# Mod request + +**Mod request** is a term used when a creator is in need of help and wants to improve their [beatmap](/wiki/Beatmaps). This can be done in a multitude of ways but is most commonly done by requesting a normal mod or [mod for mod](/wiki/Modding/Mod_for_mod) in one of the [forum modding queues](https://osu.ppy.sh/community/forums/60). Once the mod request has been accepted, the [modding](/wiki/Modding) process starts and the beatmap will be checked for potential mistakes and improvements. + + diff --git a/wiki/Modding/Modder/en.md b/wiki/Modding/Modder/en.md index e5aa68dc3f5b..7df2c56ae2ad 100644 --- a/wiki/Modding/Modder/en.md +++ b/wiki/Modding/Modder/en.md @@ -1,7 +1,9 @@ +--- +stub: true +--- + # Modder -A **modder** is a user who helps other users improve their [beatmaps](/wiki/Beatmaps) through [modding](/wiki/Modding). Successful posts on a beatmap discussion awards the modder Kudosu! which can be seen on the user's profile page. +A **modder** is a user who helps other beatmap creators improve their [beatmaps](/wiki/Beatmaps) through [modding](/wiki/Modding). Successful posts on a beatmap discussion awards the modder [Kudosu!](/wiki/Modding/Kudosu) which can be seen on the user's profile page. - -